Version bump -- with 1.2.9999 update so it can be copied over as 1.2.x again.

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

4 files changed, 241 insertions, 15 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 40e743dc5705..f515cfe1e25a 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # 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.684 2012/06/01 02:41:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.685 2012/06/16 19:49:12 ssuominen Exp $
+
+*xine-lib-1.2.2 (16 Jun 2012)
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> +xine-lib-1.2.2.ebuild,
+  xine-lib-1.2.9999.ebuild:
+  Version bump -- with 1.2.9999 update so it can be copied over as 1.2.x again.
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> xine-lib-1.2.1-r1.ebuild,
   xine-lib-1.2.9999.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b2f6c61d3428..03d96204103d 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -5,14 +5,20 @@ AUX xine-lib-1.2.1-ffmpeg-git.patch 2314 RMD160 28f004b6e231034b28eed95368668451
 AUX xine-lib-1.2.1-fix_dvb_crc_checking.patch 634 RMD160 d6a54d7db42b21a944968b03738b028179d38888 SHA1 2c788361b1ebf6e643313f1912e574847d719d05 SHA256 6c0695a9ac6fb5b7bfbe6940847ae96f8e9836c55a2a1409e20faba13b6ba465
 AUX xine-lib-1.2.1-freebsd.patch 727 RMD160 98b42d42d298b5376413455e7a81364aced09184 SHA1 70ce386503b9a873d94c4f79f3622a5444c1cc07 SHA256 fb354f40252f0931d022d38d1c391cb55a615f5007a63f55bade30b54fe0e44b
 DIST xine-lib-1.2.1.tar.xz 4843584 RMD160 3cc17c3194797395ea1d696fee1dfa2d8acf1ddf SHA1 ebb2648456504ff4ce08c34de258d3125832bb94 SHA256 2d4ff0d275b46a197c6a914fdef154e9dd4c88b383f6e1f5efbb8d47a8e03d4e
+DIST xine-lib-1.2.2.tar.xz 4857248 RMD160 3f11df3fa8a8946bdcc9cdecd6952dc76b834d14 SHA1 a349cbb0b72256bb262377796a022dcf63829b4c SHA256 e1656451be64005ef296ffafcf5085d63ef7d4ee4477024391f8e3000d3253d6
 EBUILD xine-lib-1.2.1-r1.ebuild 5328 RMD160 a3506e96650b5e61fca37db46208f4a5dbaec36a SHA1 9d17d922231e41291f1a55cf85115ecccde20ed0 SHA256 b011365c2982b8daeece1be774bc00fd526b2ef571cc80b4b073173ea2cba207
-EBUILD xine-lib-1.2.9999.ebuild 5168 RMD160 59b337c144057cba14164aa61728833a23fdfb45 SHA1 771790aee3d04e9a37e6758cc2d5f8bf822669d0 SHA256 be99ab7164ec92d8ae57abb869155fa7bdd4dfccf8f10c84cb3ff47c20f23595
-MISC ChangeLog 80453 RMD160 114365e2c305ba63d7e6c1a3714c81c4afa9f3e7 SHA1 8898931497a94bc57b3f72087075b1a289f10cd4 SHA256 3cd9c62792b5d9ce39a519783165991e9099c4e22d7525027dccc8299fc3bf9a
+EBUILD xine-lib-1.2.2.ebuild 5377 RMD160 246cbbbce6ee986349904b64f6a13a628353bffc SHA1 09cf9ecaa304731d23171796a2e5e62a61bdedb4 SHA256 ced695664cc83d1726adce2193297336768dab00efe3783490312a770f8fbbac
+EBUILD xine-lib-1.2.9999.ebuild 5381 RMD160 5ddfd8d34bb5bc0c04d1676c51dd9c5aee226b66 SHA1 e9c80b43366b34dcb60ce24135e2fe4c01b5447e SHA256 1b4f6cb2dcdc00d94d66c92190f4595164b7a015e36fc0493fa91f851d3fee23
+MISC ChangeLog 80673 RMD160 dac17811ffb41d3ce411d56c0b6bed1517688ea5 SHA1 4b1c3a341a580b0a75d0b3ffd016680dcf66ace0 SHA256 118783109ae873c7aa45a38eecee38b6d83b88092759c3d18efbc7b079b7d0d2
 MISC metadata.xml 3072 RMD160 1e12a6a6a26545534c9a77ee57a04c3df6613772 SHA1 c0f3e790048f732dedb7de2478a1de54f327a2b7 SHA256 40718f6753a8cdbb8492ca71d3c335106fa7fe54cb4f6161ad1023ef8323af1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/IK/4ACgkQ/ejvha5XGaPUPgCgj+yLgQIvgTEB7CXn4LVcKLH0
-zIoAoJrNrjpU3GzGrXh6qt38uKJPb7kU
-=jMvj
+iQEcBAEBAgAGBQJP3OI2AAoJEEdUh39IaPFN/QIIAKQpZlTD5GIzFpYGWcsFJxAH
+giHC6plnRNUvr4lPrZA0MCqK77DJ8VFV26E9WfR1mJxA2ycDe+YsxrWzCqOaBKiq
+ZPgMWNQlk00hgoeW0AsiJj4MIdD3mDZbA7YN20Xh0QoM2UgBvqZ/vA/Q15aMMOyP
+7VvTeQXkv9GUL73N7Eu7XyP2gjJH3O/lLB2Oc9ZevtWbRBL23riNoAodcKZxV6+R
+a6HgmUXReHGiAYjNbAAHndE3QzAHCNXe1zrxsE2hYLe2Aujz/525mMnw/aZEdn9Q
+xl2VUjcGBKjItomg8iV/pky7hkxbKj4HOG3FfNC2PHgYulZnmxleDUaeUJ26wAM=
+=xosK
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.2.ebuild b/media-libs/xine-lib/xine-lib-1.2.2.ebuild
new file mode 100644
index 000000000000..f2e11e471770
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.2.ebuild
@@ -0,0 +1,207 @@
+# 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.2.ebuild,v 1.1 2012/06/16 19:49:12 ssuominen Exp $
+
+EAPI=4
+
+inherit libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial eutils
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+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 opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	|| ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 )
+	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 )
+	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}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	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
+		epatch_user
+		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
+
+	local myconf
+	[[ ${PV} == *9999* ]] || myconf="$(use_enable nls)"
+
+	econf \
+		$(use_enable ipv6) \
+		$(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) \
+		${myconf}
+}
+
+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
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 0098aad2c5b8..70472eba661f 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.9999.ebuild,v 1.17 2012/06/01 02:41:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.18 2012/06/16 19:49:12 ssuominen Exp $
 
 EAPI=4
 
@@ -9,9 +9,15 @@ inherit libtool multilib
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
 	inherit autotools mercurial eutils
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
 else
 	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
 fi
 
 DESCRIPTION="Core libraries for Xine movie player"
@@ -19,15 +25,15 @@ 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 opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc"
+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 opengl oss pulseaudio real samba sdl speex theora truetype v4l vcd vdpau vdr vidix +vis vorbis wavpack win32codecs +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
-RDEPEND="dev-libs/libxdg-basedir
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	sys-libs/zlib
 	|| ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 )
 	virtual/ffmpeg
 	virtual/libiconv
-	virtual/libintl
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
 	aalib? ( media-libs/aalib )
@@ -92,11 +98,10 @@ RDEPEND="dev-libs/libxdg-basedir
 	xv? ( x11-libs/libXv )
 	xvmc? ( x11-libs/libXvMC )"
 DEPEND="${RDEPEND}
+	${NLS_DEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
-	sys-devel/gettext
 	>=sys-devel/libtool-2.2.6b
-	bluray? ( !media-libs/libbluray-xine )
 	oss? ( virtual/os-headers )
 	v4l? ( virtual/os-headers )
 	X? (
@@ -116,8 +121,6 @@ src_prepare() {
 
 	if [[ ${PV} == *9999* ]]; then
 		epatch_user
-
-		eautopoint
 		eautoreconf
 	else
 		elibtoolize
@@ -132,6 +135,9 @@ src_configure() {
 		win32dir=/usr/$(get_libdir)/win32
 	fi
 
+	local myconf
+	[[ ${PV} == *9999* ]] || myconf="$(use_enable nls)"
+
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable altivec) \
@@ -184,7 +190,8 @@ src_configure() {
 		$(use_with vorbis) \
 		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
 		--with-w32-path=${win32dir} \
-		$(use_with wavpack)
+		$(use_with wavpack) \
+		${myconf}
 }
 
 src_install() {