Fixing #56179

18 files changed, 17 insertions, 945 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 2b2c6fde7e1e..53b73de6ee5e 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.148 2004/09/27 03:32:41 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.149 2004/09/30 14:08:35 phosphan Exp $
+
+  30 Sep 2004; Patrick Kursawe <phosphan@gentoo.org>
+  -files/xine-lib-1_rc3-configure-sparc.patch,
+  -files/xine-lib-1_rc4-configure-sparc.patch, -xine-lib-0.9.13-r3.ebuild,
+  -xine-lib-1_rc2.ebuild, -xine-lib-1_rc3-r1.ebuild,
+  -xine-lib-1_rc4-r1.ebuild, -xine-lib-1_rc4.ebuild,
+  -xine-lib-1_rc5-r2.ebuild, xine-lib-1_rc5-r3.ebuild, xine-lib-1_rc6.ebuild:
+  Big cleanup.
+  Removing xvid and divx4linux dependencies, see bug #56179
 
   26 Sep 2004; Tom Gall <tgall@gentoo.org> xine-lib-1_rc5-r3.ebuild
   stable on ppc64, bug #59948
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index faec470c8e28..c031268ffe5b 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,12 +1,6 @@
-MD5 bae904dab9ad5b925685aa5696cf55be xine-lib-0.9.13-r3.ebuild 3358
-MD5 1afa21a14a483b7ab3da77f0fe0da0b6 xine-lib-1_rc2.ebuild 3936
-MD5 889791b95cff6056978f8cf34978d447 xine-lib-1_rc4.ebuild 4465
-MD5 4ae7f17d0e14aaa3106a8b92aa3ceb23 xine-lib-1_rc5-r3.ebuild 5526
-MD5 3bf8ecd5b5a394355bf35572b5fe5129 xine-lib-1_rc4-r1.ebuild 4992
-MD5 c743c3acaaffa87744ac1cf00f900ac4 xine-lib-1_rc6.ebuild 5805
-MD5 cd0097aed0057e4252054a657518f7a7 xine-lib-1_rc3-r1.ebuild 4045
-MD5 440519b4014d0a0a37d494fc810c6acd xine-lib-1_rc5-r2.ebuild 5119
-MD5 b955de4ce0ec794b1cbafbc14de6cc37 ChangeLog 25069
+MD5 cc9a0fefb0998a5c987d7f4f6703f845 xine-lib-1_rc5-r3.ebuild 5463
+MD5 fd8053bd896850f8fb6f6b6c850e1cf4 xine-lib-1_rc6.ebuild 5184
+MD5 6eaaea4d59c3f852b6813d2d65f69b04 ChangeLog 25507
 MD5 af08cabbae4b191018ca153392a86bea metadata.xml 304
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
@@ -22,19 +16,11 @@ MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 e9819170d90442f5072d18dda93a8f5c files/digest-xine-lib-1_rc3-r1 68
-MD5 4927f9e562e68f539a5f3a6e4711d873 files/digest-xine-lib-1_rc4-r1 68
-MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r2 67
 MD5 044cbe825fc480693aec675808e4c679 files/digest-xine-lib-1_rc5-r3 67
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
 MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
-MD5 f90bfe4a0ee80eecb38fc34022ccab7e files/digest-xine-lib-1_rc2 67
-MD5 ae644beadf7c9218bdbd3ed27865918a files/digest-xine-lib-1_rc4 67
 MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6 68
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
 MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
 MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc3-configure-sparc.patch 587
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc4-configure-sparc.patch 587
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r3 b/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r3
deleted file mode 100644
index 8f38da8ba0ba..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e37c40bb78732187e3375a220405063 xine-lib-0.9.13.tar.gz 2751090
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc2
deleted file mode 100644
index 5abe115e284a..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06ee51beaf77b4b9238f2bcc5b093860 xine-lib-1-rc2.tar.gz 5246419
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r1 b/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r1
deleted file mode 100644
index 22980266430e..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6dfd0c67b5b694adb283c0f6d8d3ab03 xine-lib-1-rc3a.tar.gz 6121483
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc4 b/media-libs/xine-lib/files/digest-xine-lib-1_rc4
deleted file mode 100644
index 16fad70adbaf..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ab4da35964044369768c90f931ce2c2 xine-lib-1-rc4.tar.gz 6788315
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc4-r1 b/media-libs/xine-lib/files/digest-xine-lib-1_rc4-r1
deleted file mode 100644
index 2aa30bc17cd5..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2890e4359b31eb1b276ef3cf9aa97cc8 xine-lib-1-rc4a.tar.gz 6939989
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2
deleted file mode 100644
index 538dc38af828..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_rc5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 703c3e68d60524598d4d9e527fe38286 xine-lib-1-rc5.tar.gz 7052663
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc3-configure-sparc.patch b/media-libs/xine-lib/files/xine-lib-1_rc3-configure-sparc.patch
deleted file mode 100644
index e9c943f7c980..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1_rc3-configure-sparc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xine-lib-1-rc3/configure.ac.org	2003-12-29 14:44:22.000000000 +0100
-+++ xine-lib-1-rc3/configure.ac	2003-12-29 14:47:43.000000000 +0100
-@@ -1505,9 +1505,9 @@
-     ;;
- 
-   sparc*-*-linux*)
--    case $host_alias in
--    sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
--    sparc64-*)
-+    case `uname -m` in
-+    sparc)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-+    sparc64)
-       cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
-       if test x$enable_vis = xyes; then
-         AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch b/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch
deleted file mode 100644
index e9c943f7c980..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1_rc4-configure-sparc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xine-lib-1-rc3/configure.ac.org	2003-12-29 14:44:22.000000000 +0100
-+++ xine-lib-1-rc3/configure.ac	2003-12-29 14:47:43.000000000 +0100
-@@ -1505,9 +1505,9 @@
-     ;;
- 
-   sparc*-*-linux*)
--    case $host_alias in
--    sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
--    sparc64-*)
-+    case `uname -m` in
-+    sparc)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-+    sparc64)
-       cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
-       if test x$enable_vis = xyes; then
-         AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
diff --git a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
deleted file mode 100644
index 68daee67179f..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.14 2004/08/14 01:08:40 squinky86 Exp $
-
-
-inherit libtool flag-o-matic eutils gcc
-
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-0.0.3.3
-	       >=media-libs/libdvdread-0.9.2 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	directfb? ( >=dev-libs/DirectFB-0.9.9
-		    dev-util/pkgconfig )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/xine-lib-configure.patch
-
-	# allows kxine to work; see bug #5412
-	epatch ${FILESDIR}/${P}-kxine.patch
-
-	if use directfb ; then
-		epatch ${FILESDIR}/xineconfig.patch-${PV}
-	else
-		epatch ${FILESDIR}/${PN}-disable-directfb.patch
-	fi
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec -fPIC
-	if [ "`gcc-version`" == "3.2" ] ; then
-		replace-flags -march=k6-3 -march=i686
-		replace-flags -march=k6-2 -march=i686
-		replace-flags -march=k6 -march=i686
-	fi
-
-	elibtoolize
-
-	# Most of these are not working currently, but are here for completeness
-	# don't use the --disable-XXXtest because that defaults to ON not OFF
-	local myconf
-	use X \
-		|| myconf="${myconf} --disable-x11 --disable-xv"
-	use esd	\
-		|| myconf="${myconf} --disable-esd"
-	# --disable-esdtest"
-	use nls	\
-		|| myconf="${myconf} --disable-nls"
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-	# --disable-alsatest"
-	use arts \
-		|| myconf="${myconf} --disable-arts"
-	# --disable-artstest"
-
-	# This breaks because with the test disabled, it defaults to
-	# "found" check with the next release until then let it autodetect.
-	# See bug #2377.
-	use aalib  || myconf="${myconf} --disable-aalib"
-		# --disable-aalibtest"
-
-	# Configure script is broken, even if you pass the flags below it
-	# still assumes ogg is installed and tries to compile it, giving you
-	# bug #5244. But leaving ogg for autodetection works.
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg --disable-vorbis"
-#			 --disable-oggtest \
-#			 --disable-vorbistest"
-
-	use avi	\
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	einfo "myconf: ${myconf}"
-
-	econf ${myconf} || die
-
-	elibtoolize
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Xine's makefiles install some file incorrectly. (Bug #8583).
-	dodir /usr/share/xine/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/fonts/
-	dodir /usr/share/xine/skins
-	mv ${D}/usr/share/xine_logo.mpv ${D}/usr/share/xine/skins/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc2.ebuild b/media-libs/xine-lib/xine-lib-1_rc2.ebuild
deleted file mode 100644
index 5fa00946f435..000000000000
--- a/media-libs/xine-lib/xine-lib-1_rc2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2004 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_rc2.ebuild,v 1.20 2004/08/14 01:08:40 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc hppa ~sparc amd64 alpha ia64"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex"
-
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	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
-		    dev-util/pkgconfig )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
-	>=media-libs/flac-1.0.4
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
-	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
-	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector -fPIC
-
-	# fix build errors with sse2
-	if [ "`gcc-version`" == "3.2" ]; then
-		use x86 && append-flags -mno-sse2
-	fi
-
-	if [ "`gcc-version`" == "3.3" ]; then
-		use x86 && append-flags -mno-sse2
-	fi
-
-	# Make sure that the older libraries are not installed (bug #15081).
-	if [ -f /usr/lib/libxine.so.0 ]
-	then
-		einfo "Please uninstall older xine libraries.";
-		einfo "The compilation cannot proceed.";
-		die
-	fi
-
-	# Use the built-in dvdnav plugin.
-	local myconf="--with-included-dvdnav"
-
-	# Most of these are not working currently, but are here for completeness
-	# don't use the --disable-XXXtest because that defaults to ON not OFF
-	use X \
-		|| myconf="${myconf} --disable-x11" # --disable-xv"
-	use esd	\
-		|| myconf="${myconf} --disable-esd" # --disable-esdtest"
-	use nls	\
-		|| myconf="${myconf} --disable-nls"
-	use alsa \
-		|| myconf="${myconf} --disable-alsa" # --disable-alsatest"
-	use arts \
-		|| myconf="${myconf} --disable-arts" # --disable-artstest"
-	use aalib \
-		|| myconf="${myconf} --disable-aalib" # --disable-aalibtest"
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg --disable-vorbis"
-			   #--disable-oggtest --disable-vorbistest"
-	use avi	\
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-	use sdl \
-		|| myconf="${myconf} --with-sdl-prefix=/null" # disable sdl check
-
-	econf ${myconf} || die "Configure failed"
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-	einfo "This library version 1 is incompatible with the plugins"
-	einfo "designed for the prior library versions such as xine-d4d,"
-	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
-	einfo
-	einfo "Also, make sure to remove your ~/.xine if upgrading from"
-	einfo "a previous version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild
deleted file mode 100644
index 76a37cdcf98f..000000000000
--- a/media-libs/xine-lib/xine-lib-1_rc3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2004 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_rc3-r1.ebuild,v 1.19 2004/08/14 01:08:40 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX="a"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ppc hppa sparc amd64 ~ia64"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex"
-
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	!sparc? ( directfb? ( >=dev-libs/DirectFB-0.9.9
-		    dev-util/pkgconfig ) )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
-	>=media-libs/flac-1.0.4
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-pkg_setup() {
-	# Make sure that the older libraries are not installed (bug #15081).
-	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
-	then
-		eerror "Please uninstall older xine libraries.";
-		eerror "The compilation cannot proceed.";
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
-	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
-	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
-	# plasmaroo: Kernel 2.6 headers patch
-	epatch ${FILESDIR}/${PN}-2.6.patch
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
-
-	elibtoolize #40317
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector -fPIC
-
-	# fix build errors with sse2
-	if [ "`gcc-version`" == "3.2" ]; then
-		use x86 && append-flags -mno-sse2
-	fi
-
-	if [ "`gcc-version`" == "3.3" ]; then
-		use x86 && append-flags -mno-sse2
-	fi
-
-	# Use the built-in dvdnav plugin.
-	local myconf="--with-included-dvdnav"
-
-	# Most of these are not working currently, but are here for completeness
-	# don't use the --disable-XXXtest because that defaults to ON not OFF
-	use X \
-		|| myconf="${myconf} --disable-x11"
-	use esd	\
-		|| myconf="${myconf} --disable-esd"
-	use nls	\
-		|| myconf="${myconf} --disable-nls"
-	use alsa \
-		|| myconf="${myconf} --disable-alsa"
-	use arts \
-		|| myconf="${myconf} --disable-arts"
-	use aalib \
-		|| myconf="${myconf} --disable-aalib"
-	use oggvorbis \
-		|| myconf="${myconf} --disable-ogg --disable-vorbis"
-
-	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-	use sdl \
-		|| myconf="${myconf} --disable-sdltest"
-
-	use sparc \
-		&& myconf="${myconf} --enable-vis"
-
-	econf ${myconf} || die "Configure failed"
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-	einfo "This library version 1 is incompatible with the plugins"
-	einfo "designed for the prior library versions such as xine-d4d,"
-	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
-	einfo
-	einfo "Also, make sure to remove your ~/.xine if upgrading from"
-	einfo "a previous version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
deleted file mode 100644
index f82c6ceda1bd..000000000000
--- a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2004 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_rc4-r1.ebuild,v 1.21 2004/08/14 01:08:40 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX="a"
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc ~sparc ~alpha hppa amd64 -ia64"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
-
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
-	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	!sparc? ( directfb? ( >=dev-libs/DirectFB-0.9.9
-		    dev-util/pkgconfig ) )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
-	>=media-libs/flac-1.0.4
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-pkg_setup() {
-	# Make sure that the older libraries are not installed (bug #15081).
-	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
-	then
-		eerror "Please uninstall older xine libraries.";
-		eerror "The compilation cannot proceed.";
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
-	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
-	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
-	# plasmaroo: Kernel 2.6 headers patch
-	epatch ${FILESDIR}/${PN}-2.6.patch
-	# force 32 bit userland
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
-
-	# always_inline means inline-or-fail, so it's no suprise that xine-lib
-	# fails to compile with gcc 3.4 when this one inline fails
-	epatch ${FILESDIR}/xine-lib-gcc34.patch
-
-	elibtoolize #40317
-
-	# Fix building on amd64, #49569
-	use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
-
-	# Fix detection of hppa2.0 and hppa1.1 CHOST
-	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec
-	filter-flags -fstack-protector -fPIC
-	filter-flags -fforce-addr
-	filter-flags -momit-leaf-frame-pointer #46339
-	filter-flags -funroll-all-loops #55420
-	filter-flags -fno-unit-at-a-time #55202
-
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		append-flags -fno-web #49509
-		filter-flags -fno-unit-at-a-time #55202
-		append-flags -funit-at-a-time #55202
-	fi
-
-	is-flag -O? || append-flags -O1 #31243
-
-	# fix build errors with sse2 #49482
-	if use x86 ; then
-		if [ `gcc-major-version` -eq 3 ] ; then
-			append-flags -mno-sse2 `test_flag -mno-sse3`
-			filter-mfpmath sse
-		fi
-	fi
-
-	# Use the built-in dvdnav plugin.
-	local myconf="--with-included-dvdnav"
-
-	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	use sparc \
-		&& myconf="${myconf} --enable-vis --build=${CHOST}"
-
-	use amd64 \
-		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
-		unset CFLAGS
-	else
-		append-flags -ffunction-sections
-	fi
-
-	econf \
-		`use_enable X x11` `use_with X x` `use_enable X shm` `use_enable X xft` \
-		`use_enable esd` \
-		`use_enable nls` \
-		`use_enable alsa` \
-		`use_enable arts` \
-		`use_enable aalib` \
-		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
-		`use_enable sdl sdltest` \
-		`use_enable ipv6` \
-		`use_enable directfb` \
-		${myconf} || die "Configure failed"
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-	einfo "This library version 1 is incompatible with the plugins"
-	einfo "designed for the prior library versions such as xine-d4d,"
-	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
-	einfo
-	einfo "Also, make sure to remove your ~/.xine if upgrading from"
-	einfo "a previous version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc4.ebuild b/media-libs/xine-lib/xine-lib-1_rc4.ebuild
deleted file mode 100644
index fda0742a11da..000000000000
--- a/media-libs/xine-lib/xine-lib-1_rc4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2004 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_rc4.ebuild,v 1.12 2004/08/14 01:08:40 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc -hppa sparc -amd64 -ia64 alpha"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6"
-
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
-	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	!sparc? ( directfb? ( >=dev-libs/DirectFB-0.9.9
-		    dev-util/pkgconfig ) )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
-	>=media-libs/flac-1.0.4
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-pkg_setup() {
-	# Make sure that the older libraries are not installed (bug #15081).
-	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
-	then
-		eerror "Please uninstall older xine libraries.";
-		eerror "The compilation cannot proceed.";
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
-	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
-	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
-	# plasmaroo: Kernel 2.6 headers patch
-	epatch ${FILESDIR}/${PN}-2.6.patch
-	# force 32 bit userland
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
-	# fix a missing header
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1-rc4-sparc_missing_include.patch
-	# fix included libtool
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch
-
-	# always_inline means inline-or-fail, so it's no suprise that xine-lib
-	# fails to compile with gcc 3.4 when this one inline fails
-	epatch ${FILESDIR}/xine-lib-gcc34.patch
-
-	elibtoolize #40317
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec -fstack-protector
-	filter-flags -fPIC
-	filter-flags -fforce-addr
-
-	# fix build errors with sse2
-	if use x86 ; then
-		[ "`gcc-version`" == "3.2" ] && append-flags -mno-sse2
-		[ "`gcc-version`" == "3.3" ] && append-flags -mno-sse2
-		[ "`gcc-version`" == "3.4" ] && append-flags -mno-sse2
-	fi
-
-	# Use the built-in dvdnav plugin.
-	local myconf="--with-included-dvdnav"
-
-	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	use sparc \
-		&& myconf="${myconf} --enable-vis --build=${CHOST}"
-
-	use amd64 \
-		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
-
-	econf \
-		`use_enable X x11` \
-		`use_enable esd` \
-		`use_enable nls` \
-		`use_enable alsa` \
-		`use_enable arts` \
-		`use_enable aalib` \
-		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
-		`use_enable sdl sdltest` \
-		`use_enable ipv6` \
-		`use_enable directfb` \
-		${myconf} || die "Configure failed"
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-	einfo "This library version 1 is incompatible with the plugins"
-	einfo "designed for the prior library versions such as xine-d4d,"
-	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
-	einfo
-	einfo "Also, make sure to remove your ~/.xine if upgrading from"
-	einfo "a previous version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
deleted file mode 100644
index 8918b044b491..000000000000
--- a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2004 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_rc5-r2.ebuild,v 1.14 2004/08/14 01:08:40 squinky86 Exp $
-
-inherit eutils flag-o-matic gcc libtool
-
-# This should normally be empty string, unless a release has a suffix.
-MY_PKG_SUFFIX=""
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~x86 ppc ~hppa ~sparc amd64 -ia64 ~alpha ppc64"
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec"
-
-RDEPEND="oggvorbis? ( media-libs/libvorbis )
-	!amd64? ( X? ( virtual/x11 ) )
-	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
-	esd? ( media-sound/esound )
-	dvd? ( >=media-libs/libdvdcss-1.2.7 )
-	arts? ( kde-base/arts )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	!sparc? ( directfb? ( >=dev-libs/DirectFB-0.9.9
-		    dev-util/pkgconfig ) )
-	gnome? ( >=gnome-base/gnome-vfs-2.0
-			dev-util/pkgconfig )
-	>=media-libs/flac-1.0.4
-	sdl? ( >=media-libs/libsdl-1.1.5 )
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0
-	theora? ( media-libs/libtheora )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
-
-pkg_setup() {
-	# Make sure that the older libraries are not installed (bug #15081).
-	if [ `has_version =media-libs/xine-lib-0.9.13*` ]
-	then
-		eerror "Please uninstall older xine libraries.";
-		eerror "The compilation cannot proceed.";
-		die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
-	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
-	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}-r1
-	# plasmaroo: Kernel 2.6 headers patch
-	epatch ${FILESDIR}/${PN}-2.6.patch
-	# force 32 bit userland
-	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
-
-	# always_inline means inline-or-fail, so it's no suprise that xine-lib
-	# fails to compile with gcc 3.4 when this one inline fails
-	#epatch ${FILESDIR}/xine-lib-gcc34.patch
-
-	elibtoolize #40317
-
-	# Fix building on amd64, #49569
-	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
-
-	# Fix detection of hppa2.0 and hppa1.1 CHOST
-	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
-}
-
-src_compile() {
-	filter-flags -maltivec -mabi=altivec
-	filter-flags -fstack-protector -fPIC
-	filter-flags -fforce-addr
-	filter-flags -momit-leaf-frame-pointer #46339
-	filter-flags -funroll-all-loops #55420
-
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		append-flags -fno-web #49509
-		filter-flags -fno-unit-at-a-time #55202
-		append-flags -funit-at-a-time #55202
-	fi
-
-	is-flag -O? || append-flags -O1 #31243
-
-	# fix build errors with sse2 #49482
-	if use x86 ; then
-		if [ `gcc-major-version` -eq 3 ] ; then
-			append-flags -mno-sse2 `test_flag -mno-sse3`
-			filter-mfpmath sse
-		fi
-	fi
-
-	# Use the built-in dvdnav plugin.
-	local myconf="--with-included-dvdnav"
-
-	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	use sparc \
-		&& myconf="${myconf} --enable-vis --build=${CHOST}"
-
-	use amd64 \
-		&& myconf="${myconf} --with-xv-path=/usr/X11R6/lib"
-
-	# Fix compilation-errors on PowerPC #45393 & #55460
-	if use ppc ; then
-		append-flags -U__ALTIVEC__
-		myconf="${myconf} `use_enable altivec`"
-	fi
-
-	# The default CFLAGS (-O) is the only thing working on hppa.
-	if use hppa && [ "`gcc-version`" != "3.4" ] ; then
-		unset CFLAGS
-	else
-		append-flags -ffunction-sections
-	fi
-
-	econf \
-		`use_enable X x11` `use_with X x` `use_enable X shm` `use_enable X xft` \
-		`use_enable esd` \
-		`use_enable nls` \
-		`use_enable alsa` \
-		`use_enable arts` \
-		`use_enable aalib` \
-		`use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
-		`use_enable sdl sdltest` \
-		`use_enable ipv6` \
-		`use_enable directfb` \
-		${myconf} || die "Configure failed"
-
-	emake -j1 || die "Parallel make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-
-	# Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
-	dodir /usr/share/xine/libxine1/fonts
-	mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-	cd ${S}/doc
-	dodoc dataflow.dia README*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please note, a new version of xine-lib has been installed."
-	einfo "For library consistency, you need to unmerge old versions"
-	einfo "of xine-lib before merging xine-ui."
-	einfo
-	einfo "This library version 1 is incompatible with the plugins"
-	einfo "designed for the prior library versions such as xine-d4d,"
-	einfo "xine-d5d, xine-dmd, and xine-dvdnav."
-	einfo
-	einfo "Also, make sure to remove your ~/.xine if upgrading from"
-	einfo "a previous version."
-	einfo
-}
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
index b614b1b730f3..d25a1a4a3b20 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_rc5-r3.ebuild,v 1.11 2004/09/27 03:32:41 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.12 2004/09/30 14:08:35 phosphan Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -19,8 +19,7 @@ IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theor
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
 	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
+	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
 	arts? ( kde-base/arts )
@@ -33,7 +32,6 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	>=media-libs/flac-1.0.4
 	sdl? ( >=media-libs/libsdl-1.1.5 )
 	>=media-libs/libfame-0.9.0
-	!ia64? ( >=media-libs/xvid-0.9.0 )
 	theora? ( media-libs/libtheora )
 	speex? ( media-libs/speex )"
 DEPEND="${RDEPEND}
diff --git a/media-libs/xine-lib/xine-lib-1_rc6.ebuild b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
index 4d7c1b93c4d7..da0fdd747549 100644
--- a/media-libs/xine-lib/xine-lib-1_rc6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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_rc6.ebuild,v 1.7 2004/09/21 01:19:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6.ebuild,v 1.8 2004/09/30 14:08:35 phosphan Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -19,8 +19,7 @@ IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theor
 RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	!amd64? ( X? ( virtual/x11 ) )
 	amd64? ( X? ( || ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r6 ) ) )
-	avi? ( x86? ( >=media-libs/win32codecs-0.50
-	       media-libs/divx4linux ) )
+	avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
 	esd? ( media-sound/esound )
 	dvd? ( >=media-libs/libdvdcss-1.2.7 )
 	arts? ( kde-base/arts )
@@ -33,7 +32,6 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	>=media-libs/flac-1.0.4
 	sdl? ( >=media-libs/libsdl-1.1.5 )
 	>=media-libs/libfame-0.9.0
-	!ia64? ( >=media-libs/xvid-0.9.0 )
 	theora? ( media-libs/libtheora )
 	speex? ( media-libs/speex )"
 DEPEND="${RDEPEND}
@@ -55,11 +53,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	# ffmpeg include is in the wrong directory.. gotta fix that.
-	# use ffmpeg && epatch ${FILESDIR}/${P}-ffmpeg.patch
-
-	# gcc2 fixes provided by <T.Henderson@cs.ucl.ac.uk> in #26534
-	#epatch ${FILESDIR}/${P}-gcc2_fix.patch
 	# preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
 	epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
 	# plasmaroo: Kernel 2.6 headers patch
@@ -67,15 +60,8 @@ src_unpack() {
 	# force 32 bit userland
 	[ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
 
-	# always_inline means inline-or-fail, so it's no suprise that xine-lib
-	# fails to compile with gcc 3.4 when this one inline fails
-	#epatch ${FILESDIR}/xine-lib-gcc34.patch
-
 	elibtoolize #40317
 
-	# Fix building on amd64, #49569
-	#use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
-
 	# Fix detection of hppa2.0 and hppa1.1 CHOST
 	use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure
 }
@@ -111,9 +97,6 @@ src_compile() {
 		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
 		|| myconf="${myconf} --disable-asf"
 
-	#use ffmpeg \
-	#	&& myconf="${myconf} --with-external-ffmpeg"
-
 	use sparc \
 		&& myconf="${myconf} --build=${CHOST}"