Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

3 files changed, 216 insertions, 9 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 54ddc2130f14..ab0dd8dfcf06 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.663 2012/01/30 20:47:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.664 2012/02/05 08:20:31 ssuominen Exp $
+
+*xine-lib-1.2.1 (05 Feb 2012)
+
+  05 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> +xine-lib-1.2.1.ebuild:
+  Version bump.
 
 *xine-lib-1.2.0-r2 (30 Jan 2012)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 29116ada553e..07688f584e95 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -9,21 +9,23 @@ DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770
 DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
 DIST xine-lib-1.1.20.tar.xz 5957256 RMD160 039a7d0ee4e65ce20755d4abbfbf9af6e17a37c5 SHA1 1dbd48e14113739101429391d45f65ebbf6519fc SHA256 da65da5831f5b93f02b4ec10049eaf044cf99944e2fd8e12d494dccefee124eb
 DIST xine-lib-1.2.0.tar.xz 4878972 RMD160 17b73f43e2dc440137727f65d401c673273b1265 SHA1 5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d SHA256 93dff67d07ff2230fac68e64259a72f8a007f4c3fae01b4dd580f74adea78c6f
+DIST xine-lib-1.2.1.tar.xz 4843584 RMD160 3cc17c3194797395ea1d696fee1dfa2d8acf1ddf SHA1 ebb2648456504ff4ce08c34de258d3125832bb94 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e
 EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da
 EBUILD xine-lib-1.1.20.ebuild 5416 RMD160 02b70183bbda2d03ec3fe742a19d0cae72049c90 SHA1 8a155af17311149aa0f4496dee7c4432848d22df SHA256 4b611a4b8ac09dac6273ba5f3ee64ffd46792afce55ad0192993a00ac3a589d0
 EBUILD xine-lib-1.2.0-r1.ebuild 5163 RMD160 f3ffd8fbd6285a10b217f32c5a718993ccef686a SHA1 9eb4e3cc4c8b82f730dc1a915f1dac50493b5e5f SHA256 401242cc5ea582fcb36f4e93b30997ba5429cfb313287156fe2555142ef2f55b
 EBUILD xine-lib-1.2.0-r2.ebuild 5227 RMD160 97797d790352e13d542c3e7379896e75a00f7fde SHA1 5e03fbe022ccf7ab988012e0d44bb75a2e654647 SHA256 86c8dc936076cced174bed75a61254a35455210b231e88eec01889cc6e627261
+EBUILD xine-lib-1.2.1.ebuild 5160 RMD160 a2b522482f628bcb38df43d0483705e6479805a8 SHA1 8c356290578e2bd0378d75ff3da26e2bb5054049 SHA256 8e11f9afa85a64ffdbcf6e0213f00136a44fe17980f26eec54514388b88a098b
 EBUILD xine-lib-1.2.9999.ebuild 5163 RMD160 fd641aafdc8fee17b49d54d77f98eee4fbb1df08 SHA1 ce66a4a34f4c784bc88524ce337231f2a5f4ebeb SHA256 abfb6935a743bbeb79cf54819ce4c101776cf6fea0dc20983e162b6d8acecb5c
-MISC ChangeLog 77537 RMD160 38e828a5aa08f4695b47064dc98e716b1c1fe4c0 SHA1 5c67607c8e57d78afaeff7e0503997e1ccec4787 SHA256 a45bef2d20de284d3ed7eb84c47b454e025e871cad89dc7f117acf2ebb3734a5
+MISC ChangeLog 77663 RMD160 7888999b98472db977adb1096ee1572c2c0ba957 SHA1 86ca16c2222d749a481bb2957e2e1e4ea7498366 SHA256 7de67ec667d7a27367be15461e8eabb1beed220a336a605324966299a681f0ca
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPJwFfAAoJEEdUh39IaPFN3lkH/itjImdiLxzZUG4NKTZSGKCn
-+utEyPLN87mAk4/wkPWf/ja49u3XLcqLz+nuN3xQXfN2JpCpVV/DcA+4Lq534UaS
-bOqUqX9W6Cxk+Xej8Seef4yUqb4oGr/q/3EWAf+8D69wCJIcSVir/+HQtsyNDgJD
-m96Jr/O+PpAv30O9k/GErN5jBlBcxer/VVdd+C5A6s8gvK7nFloP7xn3xHlkRQIK
-WqhDmmFhZVs77FRtH1TBuEwsBUsVSUGsK3VKo6m3u9R+G0Cl/81SE56xqtuWXTad
-UfV+N/KYwUWyvzPk51604XIhrB+ICI6/wIiYCJ9mrNXc491kOMXH4yagWsOn/rI=
-=3O35
+iQEcBAEBAgAGBQJPLjshAAoJEEdUh39IaPFNq2kH/jOK3w809ZWCfBDfyrvIOWpe
+TGYuZU/8l8fRJUFHSv9NSKTjXLQ6uT/21d8pgMiVaaemquTDdPHfwopiIOeIsPrO
+MqViS4DX+w4xEC5XvhQ1L0WSYTFsmT/MHbC49aiZ5Q3/0WeXW7qmw8IaNVvHBYHJ
+6y7VAssmPoJsfedZEEuyxPPVi1a6Hb3/5jWtYP1f4Ks5RveenS1FYAQqaZQ13se8
+MHruzhoSu6unIx3BQVrGjC5/uaqdHSsGL+zRogx/rTaQ9jifn1yH91J69wEofzDC
+JXncSItXdqVlGz+hcWVZRlZ0wp/e2E7tgIShVxENQlLiwUswJ6gkGKv9gqJGSrY=
+=Ssww
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.1.ebuild b/media-libs/xine-lib/xine-lib-1.2.1.ebuild
new file mode 100644
index 000000000000..e79690a24e58
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.1.ebuild,v 1.1 2012/02/05 08:20:31 ssuominen Exp $
+
+EAPI=4
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	_live_inherits="autotools mercurial"
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+fi
+
+inherit libtool multilib ${_live_inherits}
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack libcaca mad +mmap mng modplug musepack nls opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc"
+
+RDEPEND="dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	virtual/ffmpeg
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1 )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusion? ( media-libs/FusionSound )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	nls? ( virtual/libintl )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	real? (
+		amd64? ( media-libs/amd64codecs )
+		x86? ( media-libs/win32codecs )
+		x86-fbsd? ( media-libs/win32codecs )
+		)
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	wavpack? ( media-sound/wavpack )
+	win32codecs? ( media-libs/win32codecs )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	bluray? ( !media-libs/libbluray-xine )
+	nls? ( sys-devel/gettext )
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ ${PV} == *9999* ]]; then
+		eautopoint
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable altivec) \
+		$(use_enable vis) \
+		--disable-optimizations \
+		$(use_enable mmap) \
+		$(use_enable oss) \
+		$(use_enable aalib) \
+		$(use_enable directfb) \
+		$(use_enable dxr3) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) $(use_enable opengl glu) \
+		$(use_enable vidix) \
+		$(use_enable xinerama) \
+		$(use_enable xvmc) \
+		$(use_enable vdpau) \
+		$(use_enable dvb) \
+		--disable-gnomevfs \
+		$(use_enable samba) \
+		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
+		$(use_enable vcd) \
+		$(use_enable vdr) \
+		$(use_enable bluray) \
+		$(use_enable a52 a52dec) \
+		$(use_enable aac faad) \
+		$(use_enable gtk gdkpixbuf) \
+		$(use_enable dts) \
+		$(use_enable mad) \
+		$(use_enable modplug) \
+		$(use_enable musepack) \
+		$(use_enable mng) \
+		$(use_enable real real-codecs) \
+		$(use_enable win32codecs w32dll) \
+		$(use_with truetype freetype) $(use_with truetype fontconfig) \
+		$(use_with X x) \
+		$(use_with alsa) \
+		--without-esound \
+		$(use_with fusion fusionsound) \
+		$(use_with jack) \
+		$(use_with pulseaudio) \
+		$(use_with libcaca caca) \
+		$(use_with sdl) \
+		$(use_with xcb) \
+		--with-xv-path=/usr/$(get_libdir) \
+		$(use_with imagemagick) \
+		--with-external-dvdnav \
+		$(use_with flac libflac) \
+		$(use_with speex) \
+		$(use_with theora) \
+		$(use_with vorbis) \
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
+		--with-w32-path=${win32dir} \
+		$(use_with wavpack)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		htmldir="/usr/share/doc/${PF}/html" \
+		install
+
+	rm -f \
+		"${ED}"usr/lib*/libxine*.la \
+		"${ED}"usr/share/doc/${PF}/COPYING
+}