Fix gnome useflag switch, remove old snapshot.

Package-Manager: portage-2.1.1

3 files changed, 15 insertions, 199 deletions

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 814ac4c45d41..0b70ed45c849 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -2,26 +2,21 @@
 Hash: SHA1
 
 DIST xine-lib-1.1.2.tar.bz2 6457108 RMD160 21322d6d7e085237926741495d70f5ce7764910b SHA1 07e454e2287e34414b598faf78ae6d8ab8ffbb69 SHA256 871933c745f5824808a88720518c0164166906536c7f8723bd38e84f78319226
-DIST xine-lib-1.1.3_pre20060831.tar.bz2 6645591 RMD160 f5708d2186c378882c0d3776fad7b24649a8d3c5 SHA1 358025f0f2fc50932bce262213c11acf297059a6 SHA256 4ac3626947daad59f3736cd487453f44b27d61c106cac5664abfe108c782d862
 DIST xine-lib-1.1.3_pre20060914.tar.bz2 6672808 RMD160 32ee0b19b5eb477572d9370e6f7f1147173591ad SHA1 6549ab65260aedbacb8848281735e675a808f071 SHA256 b43e07648739c45109f4263afd6edba78787d0698d4a5de2cafc30e03e057896
 DIST xine-lib-patches-61.tar.bz2 9701 RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac SHA1 0d749e3c46ea58e961d48f86aca997b16e72803b SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2
 DIST xine-lib-patches-63.tar.bz2 22862 RMD160 1aa3c0541e9d739968f6f62c09567caa2a646414 SHA1 ac1a6a40c8b783c40d823905e8db69f5139784d4 SHA256 7e7a137a27605addad5c4e96c46984293c5febdfa08eec976600be8b206448f6
-EBUILD xine-lib-1.1.2-r2.ebuild 7086 RMD160 757c2a2b13998402f601ccd100d420f612f139c5 SHA1 181040c6af25ae28114cc2fd3f6a636f16663fac SHA256 c283be3cb6aeb3bb015ddaf4b7c9645286d7530a9c3ecc3bdc000bfbf823f826
-MD5 456dfb5029151e77595bab227c208bec xine-lib-1.1.2-r2.ebuild 7086
-RMD160 757c2a2b13998402f601ccd100d420f612f139c5 xine-lib-1.1.2-r2.ebuild 7086
-SHA256 c283be3cb6aeb3bb015ddaf4b7c9645286d7530a9c3ecc3bdc000bfbf823f826 xine-lib-1.1.2-r2.ebuild 7086
-EBUILD xine-lib-1.1.3_pre20060831.ebuild 4798 RMD160 9d4b8c82680cda620752772c5aba36d6845329aa SHA1 11fe6c298dd2789b95df58016750bcabfaf802d4 SHA256 b59231855e3e0604ed665d68f2b861df32ca273ba0cd8bc6d959d27c3adcc7f9
-MD5 05735dc23ad3bf0fb3df32ea569829d1 xine-lib-1.1.3_pre20060831.ebuild 4798
-RMD160 9d4b8c82680cda620752772c5aba36d6845329aa xine-lib-1.1.3_pre20060831.ebuild 4798
-SHA256 b59231855e3e0604ed665d68f2b861df32ca273ba0cd8bc6d959d27c3adcc7f9 xine-lib-1.1.3_pre20060831.ebuild 4798
-EBUILD xine-lib-1.1.3_pre20060914.ebuild 5062 RMD160 50b8de1ddd7043d67e0f99dcbf72811e8688e788 SHA1 a6817b3c19e4e0552bbe52e9a2f1750c7ff238a1 SHA256 8b375f20c747c23c6291b0a679f0079b9e7cefcd1eaff0014836424d4b59cf75
-MD5 5102be17929897ef29361579d3f7a5af xine-lib-1.1.3_pre20060914.ebuild 5062
-RMD160 50b8de1ddd7043d67e0f99dcbf72811e8688e788 xine-lib-1.1.3_pre20060914.ebuild 5062
-SHA256 8b375f20c747c23c6291b0a679f0079b9e7cefcd1eaff0014836424d4b59cf75 xine-lib-1.1.3_pre20060914.ebuild 5062
-MISC ChangeLog 40120 RMD160 d3aa0ced05a14ef90173f007fa77ebbf1ee75adf SHA1 2087e4af439fe7684d406f60feaf62c4b531fc46 SHA256 fd8232ea8f64e62c5603b07381915b850a563ec0e941b98c46181c3b91c5b4e4
-MD5 b47a8c4a081fb7ceceb75a557545199d ChangeLog 40120
-RMD160 d3aa0ced05a14ef90173f007fa77ebbf1ee75adf ChangeLog 40120
-SHA256 fd8232ea8f64e62c5603b07381915b850a563ec0e941b98c46181c3b91c5b4e4 ChangeLog 40120
+EBUILD xine-lib-1.1.2-r2.ebuild 7095 RMD160 6e98cb03c3b3fe75129b75d9348e1769b8eea180 SHA1 bf6c307be854f6b5806da1ff6d4e704df90b5c3b SHA256 32f4104829af53af391852a8e8a7841d1e35774d671758785947ee2637a96454
+MD5 89169f24a1e53283c524afde78e1191e xine-lib-1.1.2-r2.ebuild 7095
+RMD160 6e98cb03c3b3fe75129b75d9348e1769b8eea180 xine-lib-1.1.2-r2.ebuild 7095
+SHA256 32f4104829af53af391852a8e8a7841d1e35774d671758785947ee2637a96454 xine-lib-1.1.2-r2.ebuild 7095
+EBUILD xine-lib-1.1.3_pre20060914.ebuild 5071 RMD160 5142f4cbf7570c4594b21c3866e814f2ac3dbf61 SHA1 8f65a2d258ea9451c3aa49ce37423c6f6b7c36f3 SHA256 cf6f39198c94c20f714a71b536e6edc28fe86e7a69baa1fe9e9a2c0f29dc112d
+MD5 8ec8cfa245b9f29431349fcef3592ca0 xine-lib-1.1.3_pre20060914.ebuild 5071
+RMD160 5142f4cbf7570c4594b21c3866e814f2ac3dbf61 xine-lib-1.1.3_pre20060914.ebuild 5071
+SHA256 cf6f39198c94c20f714a71b536e6edc28fe86e7a69baa1fe9e9a2c0f29dc112d xine-lib-1.1.3_pre20060914.ebuild 5071
+MISC ChangeLog 40324 RMD160 a9d7429fb74688ae53755ba918054310664d3faa SHA1 8707e1e537fcdbf1a0ee93a47c95ed862f3ce3ec SHA256 39a7575023d96ffcccd4e9fd667884f45de01905d98267d9b1cc43438a242f3a
+MD5 25014cfef96b873c757fb23d0816f8a6 ChangeLog 40324
+RMD160 a9d7429fb74688ae53755ba918054310664d3faa ChangeLog 40324
+SHA256 39a7575023d96ffcccd4e9fd667884f45de01905d98267d9b1cc43438a242f3a ChangeLog 40324
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -29,16 +24,13 @@ SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 metadata
 MD5 f27667d2c33a9d999ec4b153cb53f81d files/digest-xine-lib-1.1.2-r2 509
 RMD160 d6b86118869621f916d506c6041f747e016dd592 files/digest-xine-lib-1.1.2-r2 509
 SHA256 9c987dc9ad1a1fa5fbaf02ce0e17493f4f77aa500ab3881dc62736325de62acb files/digest-xine-lib-1.1.2-r2 509
-MD5 2d64af2242ba6ee57d26c5599e81e68f files/digest-xine-lib-1.1.3_pre20060831 542
-RMD160 486805613b457a1862026b0ea392d198b47ea221 files/digest-xine-lib-1.1.3_pre20060831 542
-SHA256 33be919aed524c7cba046c73538e0c27366d57105e76a6cc72088cecead40624 files/digest-xine-lib-1.1.3_pre20060831 542
 MD5 4796c2b29bff5b6f199ea159bce1a354 files/digest-xine-lib-1.1.3_pre20060914 542
 RMD160 bda2502a25fc71356994b9d90a47ebd886f49f1b files/digest-xine-lib-1.1.3_pre20060914 542
 SHA256 f88f3c87be3786e540839888dc157cdf80e45572aed13cedcacfc55c5fa4f8e5 files/digest-xine-lib-1.1.3_pre20060914 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCaY7AiZjviIA2XgRAgBRAJ9156QZGzmSFQqM0GftJnbKJ09EkACg1hEL
-aAFWJFHJtNij31HfodXIzxA=
-=Pgy3
+iD8DBQFFC+yQAiZjviIA2XgRAvIaAJkBT9iWbyT/64e5dlff+KHO2dEoOQCgj4XN
+r6TXBaO9L7cgivAhYlsSm7c=
+=uG5t
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060831 b/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060831
deleted file mode 100644
index 01301ebb35a3..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.3_pre20060831
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 a58c12d2c93a709b26206b2fdb207e13 xine-lib-1.1.3_pre20060831.tar.bz2 6645591
-RMD160 f5708d2186c378882c0d3776fad7b24649a8d3c5 xine-lib-1.1.3_pre20060831.tar.bz2 6645591
-SHA256 4ac3626947daad59f3736cd487453f44b27d61c106cac5664abfe108c782d862 xine-lib-1.1.3_pre20060831.tar.bz2 6645591
-MD5 ae3f09d77faf7e31ca78e9ebc79463ce xine-lib-patches-61.tar.bz2 9701
-RMD160 4e58b5cbbaa97a4a9ac90713ea9997a86722b1ac xine-lib-patches-61.tar.bz2 9701
-SHA256 39ad08a08cb3f9b71ec062b7fac6bf3d089f31f421d10d4e12b9f51d684030c2 xine-lib-patches-61.tar.bz2 9701
diff --git a/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild b/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild
deleted file mode 100644
index ff1f42f7ded8..000000000000
--- a/media-libs/xine-lib/xine-lib-1.1.3_pre20060831.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2006 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.1.3_pre20060831.ebuild,v 1.8 2006/09/10 00:05:50 flameeyes Exp $
-
-inherit eutils flag-o-matic toolchain-funcs libtool autotools
-
-# This should normally be empty string, unless a release has a suffix.
-if [[ "${P/_pre/}" != "${P}" ]]; then
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else
-	MY_PKG_SUFFIX=""
-	MY_P="${PN}-${PV/_/-}${MY_PKG_SUFFIX}"
-	S="${WORKDIR}/${MY_P}"
-
-	SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.bz2"
-fi
-
-PATCHLEVEL="61"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
-samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts
-debug modplug"
-
-RDEPEND="vorbis? ( media-libs/libvorbis )
-	X? ( x11-libs/libXext
-		 x11-libs/libX11 )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )
-	xinerama? ( x11-libs/libXinerama )
-	win32codecs? ( >=media-libs/win32codecs-0.50 )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9 )
-	gnome? ( >=gnome-base/gnome-vfs-2.0 )
-	flac? ( >=media-libs/flac-1.0.4 )
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	dxr3? ( >=media-libs/libfame-0.9.0 )
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )
-	libcaca? ( media-libs/libcaca )
-	samba? ( net-fs/samba )
-	mng? ( media-libs/libmng )
-	vcd? ( media-video/vcdimager )
-	a52? ( >=media-libs/a52dec-0.7.4-r5 )
-	mad? ( media-libs/libmad )
-	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
-	>=media-video/ffmpeg-0.4.9_p20060816
-	modplug? ( media-libs/libmodplug )
-	nls? ( virtual/libintl )
-	virtual/libiconv
-	!=media-libs/xine-lib-0.9.13*"
-
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt
-		 x11-proto/xextproto
-		 x11-proto/xproto
-		 x11-proto/videoproto
-		 x11-proto/xf86vidmodeproto
-		 xinerama? ( x11-proto/xineramaproto ) )
-	v4l? ( virtual/os-headers )
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	WANT_AUTOMAKE="1.9" AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	#prevent quicktime crashing
-	append-flags -frename-registers -ffunction-sections
-
-	# Specific workarounds for too-few-registers arch...
-	if [[ $(tc-arch) == "x86" ]]; then
-		filter-flags -fforce-addr
-		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
-		is-flag -O? || append-flags -O2
-	fi
-
-	# debug useflag used to emulate debug make targets. See bug #112980 and the
-	# xine maintainers guide.
-	use debug && append-flags -UNDEBUG -DDEBUG
-
-	local myconf
-
-	# enable/disable appropiate optimizations on sparc
-	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
-	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	use hppa && unset CFLAGS
-
-	econf \
-		$(use_enable gnome) \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable samba) \
-		$(use_enable altivec) \
-		$(use_enable v4l) \
-		\
-		$(use_enable mng) \
-		$(use_enable imagemagick) \
-		\
-		$(use_enable aac faad) \
-		$(use_enable flac) \
-		$(use_with vorbis ogg) $(use_with vorbis) \
-		$(use_enable speex) \
-		$(use_enable a52) --with-external-a52dec \
-		$(use_enable mad) --with-external-libmad \
-		$(use_enable dts) --with-external-libdts \
-		\
-		$(use_with X x) \
-		$(use_enable xinerama) \
-		$(use_enable vidix) \
-		$(use_enable dxr3) \
-		$(use_enable directfb) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) \
-		$(use_enable aalib) \
-		$(use_enable libcaca caca) \
-		$(use_enable sdl) \
-		$(use_enable xvmc) \
-		\
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable arts) \
-		$(use_enable esd) \
-		$(use_enable vcd) --without-internal-vcdlibs \
-		\
-		$(use_enable win32codecs w32dll) \
-		$(use_enable modplug) \
-		--enable-asf \
-		--with-external-ffmpeg \
-		--without-pulseaudio \
-		--disable-optimizations \
-		${myconf} \
-		--with-xv-path=/usr/$(get_libdir) \
-		--with-w32-path=/usr/lib/win32 \
-		--enable-fast-install \
-		--disable-dependency-tracking || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
-	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
-
-	rm -rf "${D}/usr/share/doc/xine"
-}