Cruft cleanup

18 files changed, 10 insertions, 975 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 6ce3d0cd6fd8..708dbebdd38d 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.53 2003/04/29 07:30:30 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.54 2003/04/29 07:46:15 lostlogic Exp $
+
+  29 Apr 2003; Brandon Low <lostlogic@gentoo.org> xine-lib-0.9.10-r1.ebuild,
+  xine-lib-0.9.12-r2.ebuild, xine-lib-0.9.13-r1.ebuild,
+  xine-lib-0.9.13-r2.ebuild, xine-lib-0.9.13.ebuild, 
+  xine-lib-1_beta6.ebuild, xine-lib-1_beta8.ebuild, xine-lib-1_beta9.ebuild:
+  Remove massive amounts of cruft
 
 *xine-lib-1_beta11 (29 Apr 2003)
 
@@ -24,9 +30,8 @@
 *xine-lib-1_beta9 (23 Mar 2003)
 
   29 Mar 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-1_alpha2.ebuild,
-  xine-lib-1_alpha2.ebuild, xine-lib-1_beta0.ebuild, xine-lib-1_beta0.ebuild,
-  xine-lib-1_beta1.ebuild, xine-lib-1_beta1.ebuild, xine-lib-1_beta2.ebuild,
-  xine-lib-1_beta2.ebuild, xine-lib-1_beta4.ebuild, xine-lib-1_beta4.ebuild:
+  xine-lib-1_beta0.ebuild, xine-lib-1_beta1.ebuild, xine-lib-1_beta2.ebuild,
+  xine-lib-1_beta4.ebuild:
   removed old crusty ebuilds
 
   29 Mar 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-0.9.12-r2.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index bb6fcf428a6d..61345da07c25 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,30 +1,14 @@
 MD5 1388f8c8e8516b9fa9888072abb566d8 xine-lib-0.9.13-r3.ebuild 3704
-MD5 55fe7dc6b1fe7fb9a2c108bc9a662341 xine-lib-1_beta9.ebuild 3480
 MD5 a74a9c4f58364a7e61fa3678b5d2b9ac xine-lib-1_beta11.ebuild 3664
-MD5 218c18f42011f0fcac9f16da0a604bbb xine-lib-0.9.13.ebuild 3031
-MD5 d95ccacba6d8b7dc21015fa12027648a xine-lib-0.9.13-r2.ebuild 3687
-MD5 b8f5890f8d2570139de0617b699f4140 xine-lib-1_beta6.ebuild 3480
-MD5 661b4227d0f1261785038f0f275ef57f xine-lib-0.9.10-r1.ebuild 2627
-MD5 04c05d2a7d3a566d480b19235864a391 xine-lib-1_beta8.ebuild 3480
-MD5 1daf8b387966892b2f47ff7f63b8f00a xine-lib-0.9.12-r2.ebuild 3191
 MD5 9d82ce9114c5e771ec3b52afcf78d5cc xine-lib-1_beta10.ebuild 3480
-MD5 61dc38b2a4565b7953551380ffe49b30 xine-lib-0.9.13-r1.ebuild 3389
-MD5 13f3ecd0618f1176b0ba7fd9a60af48c ChangeLog 11029
-MD5 043c241269aaf0acd4dfd9a52ccac47c files/digest-xine-lib-1_beta6 69
-MD5 790f330d136eac4ab025b9f013e9cb07 files/digest-xine-lib-1_beta8 69
-MD5 06ed3dc39a0e981aa6b99cc007b74ccc files/digest-xine-lib-1_beta9 69
+MD5 c0af5bc1cad298a8869837d067cdd032 ChangeLog 11200
 MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 af33e921f7041fafac652c324d3984c1 files/digest-xine-lib-1_beta10 70
 MD5 5903fa4c80658b8265910c8745913dae files/digest-xine-lib-1_beta11 70
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.12 601
 MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13 68
 MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 8d33811119961dce3cfa64ea8a1f79bd files/digest-xine-lib-0.9.10-r1 68
-MD5 90fa77efe86690eeac2c578ede10732e files/digest-xine-lib-0.9.12-r2 68
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r1 68
-MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r2 68
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
 MD5 6e79367c32da81354d36e68fd1a24ae2 files/xineconfig.patch 699
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1 b/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1
deleted file mode 100644
index 69d20b605797..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f17619b58b2e6c84c1421ed36045983 xine-lib-0.9.10.tar.gz 2023140
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.12-r2 b/media-libs/xine-lib/files/digest-xine-lib-0.9.12-r2
deleted file mode 100644
index 31ac243c26d8..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bad647e6ef9c31723129fb95e40c73c xine-lib-0.9.12.tar.gz 2382388
diff --git a/media-libs/xine-lib/files/digest-xine-lib-0.9.13 b/media-libs/xine-lib/files/digest-xine-lib-0.9.13
deleted file mode 100644
index 8f38da8ba0ba..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.13
+++ /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-0.9.13-r1 b/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r1
deleted file mode 100644
index 8f38da8ba0ba..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r1
+++ /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-0.9.13-r2 b/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r2
deleted file mode 100644
index 8f38da8ba0ba..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-0.9.13-r2
+++ /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_beta6 b/media-libs/xine-lib/files/digest-xine-lib-1_beta6
deleted file mode 100644
index fceb7b976123..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_beta6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d3c15dcc2f760619688d8d7a6ca8b43f xine-lib-1-beta6.tar.gz 3683243
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_beta8 b/media-libs/xine-lib/files/digest-xine-lib-1_beta8
deleted file mode 100644
index 895110cb78e7..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_beta8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 001cf19c82af75cb027d60a2e061bb5b xine-lib-1-beta8.tar.gz 3717589
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_beta9 b/media-libs/xine-lib/files/digest-xine-lib-1_beta9
deleted file mode 100644
index 5b0e9d246553..000000000000
--- a/media-libs/xine-lib/files/digest-xine-lib-1_beta9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd921a5098443fe4f138a41fb79caf9c xine-lib-1-beta9.tar.gz 3756004
diff --git a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild b/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
deleted file mode 100644
index ad5d60ee680b..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.10-r1.ebuild,v 1.11 2003/02/13 12:56:44 vapier Exp $ 
-
-IUSE="arts esd avi nls dvd X oggvorbis aalib alsa"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-DEPEND="X? ( virtual/x11 )
-	avi? ( >=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/kdelibs )
-	alsa? ( media-libs/alsa-lib )
-	aalib? ( media-libs/aalib )
-	oggvorbis? ( media-libs/libvorbis )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-src_unpack() {
-
-	unpack xine-lib-${PV}.tar.gz
-	patch -p0 < ${FILESDIR}/xineconfig.patch || die
-
-}
-
-src_compile() {
-
-	elibtoolize
-
-	# Most of these are not working currently, but are here for completeness
-	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"
-
-	use oggvorbis || myconf="${myconf}
-				 --disable-ogg
-				 --disable-oggtest
-				 --disable-vorbis
-				 --disable-vorbistest"
-	
-	use avi	&& myconf="${myconf}
-			   --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf}
-			   --disable-asf"
-
-	# This is ``fixes'' compilation problems when em8300 libs installed
-	# The proper fix is to follow.
-	# myconf="${myconf} --disable-dxr3 --disable-dxr3test"
-
-	econf ${myconf} || die
-		    
-	emake || die
-}
-
-src_install() {
-	
-	einstall docdir=${D}/usr/share/doc/${PF}/html || die
-
-	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 "Please also note that xine-d4d and xine-d5d plugins are"
-	einfo "not yet compatible with this new library."
-	einfo
-
-}
diff --git a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild b/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
deleted file mode 100644
index 72c10807f007..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12-r2.ebuild,v 1.9 2003/03/29 14:44:52 mholzer Exp $ 
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-inherit libtool
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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/kdelibs )
-	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}
-
-	for file in `grep -l -r "xine_logo.mpg" *`; do
-		sed -e "s:xine_logo.mpg:xine_logo.mpv:g" ${file} \
-		    > ${file}.hacked || die
-		mv ${file}.hacked ${file} || die
-	done
-
-	patch -p1 < ${FILESDIR}/xine-lib-configure.patch || die "patch 1 failed"
-
-	use directfb && ( \
-		patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || die "patch 2 failed"
-		patch -p2 < ${FILESDIR}/${P}-r2-directfb.patch || die "patch failed"
-	) || patch -p1 < ${FILESDIR}/xine-lib-disable-directfb.patch || die "patch 2 failed"
-}
-
-src_compile() {
-
-	elibtoolize
-
-	# Most of these are not working currently, but are here for completeness
-	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-oggtest \
-	#		 --disable-vorbis \
-	#		 --disable-vorbistest"
-	
-	use avi	\
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
-		|| myconf="${myconf} --disable-asf"
-
-	# This is ``fixes'' compilation problems when em8300 libs installed
-	# The proper fix is to follow.
-	# myconf="${myconf} --disable-dxr3 --disable-dxr3test"
-
-	econf ${myconf} || die
-		    
-	emake || die
-}
-
-src_install() {
-	
-	einstall || die
-
-	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-0.9.13-r1.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r1.ebuild
deleted file mode 100644
index 5770eff90edc..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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-r1.ebuild,v 1.11 2003/02/13 12:56:52 vapier Exp $ 
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-inherit libtool || die "I lost my inheritance"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"											   
-filter-flags "-maltivec -mabi=altivec" 
-
-S=${WORKDIR}/${P}
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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/kdelibs )
-	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}
-
-	patch -p1 < ${FILESDIR}/xine-lib-configure.patch || \
-	    die "configure patch failed"
-	
-	# allows kxine to work; see bug #5412
-	patch -p1 < ${FILESDIR}/${P}-kxine.patch || \
-	    die "patching for kxine support failed"
-
-	if [ `use directfb` ]; then
-		patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || \
-		    die "dfb patch 1 failed"
-#		patch -p2 < ${FILESDIR}/${PF}-directfb.patch || \
-#		    die "dfb patch 2 failed"
-	else
-		patch -p1 < ${FILESDIR}/${PN}-disable-directfb.patch || \
-		    die "no dfb patch failed"
-	fi
-}
-
-src_compile() {
-
-	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() {
-	
-	einstall || die
-
-	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-0.9.13-r2.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild
deleted file mode 100644
index 4779b49a872b..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.13-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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-r2.ebuild,v 1.6 2003/03/07 23:25:49 agenkin Exp $ 
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-inherit libtool || die "I lost my inheritance"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"
-filter-flags "-maltivec -mabi=altivec" 
-replace-flags k6-3 i686
-replace-flags k6-2 i686
-replace-flags k6   i686
-
-S=${WORKDIR}/${P}
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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}
-
-	patch -p1 < ${FILESDIR}/xine-lib-configure.patch || \
-	    die "configure patch failed"
-	
-	# allows kxine to work; see bug #5412
-	patch -p1 < ${FILESDIR}/${P}-kxine.patch || \
-	    die "patching for kxine support failed"
-
-	if [ `use directfb` ]; then
-		patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || \
-		    die "dfb patch 1 failed"
-#		patch -p2 < ${FILESDIR}/${PF}-directfb.patch || \
-#		    die "dfb patch 2 failed"
-	else
-		patch -p1 < ${FILESDIR}/${PN}-disable-directfb.patch || \
-		    die "no dfb patch failed"
-	fi
-}
-
-src_compile() {
-
-	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() {
-	
-	einstall || 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-0.9.13.ebuild b/media-libs/xine-lib/xine-lib-0.9.13.ebuild
deleted file mode 100644
index 3f96f27ce137..000000000000
--- a/media-libs/xine-lib/xine-lib-0.9.13.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# 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.ebuild,v 1.8 2003/03/29 14:44:52 mholzer Exp $ 
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-inherit libtool || die "I lost my inheritance"
-
-S=${WORKDIR}/${P}
-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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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/kdelibs )
-	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}
-
-	patch -p1 < ${FILESDIR}/xine-lib-configure.patch || die "configure patch failed"
-
-	if [ `use directfb` ]; then
-		patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || die "dfb patch 1 failed"
-#		patch -p2 < ${FILESDIR}/${PF}-directfb.patch || die "dfb patch 2 failed"
-	else
-		patch -p1 < ${FILESDIR}/${PN}-disable-directfb.patch || die "no dfb patch failed"
-	fi
-}
-
-src_compile() {
-
-	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() {
-	
-	einstall || die
-
-	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_beta6.ebuild b/media-libs/xine-lib/xine-lib-1_beta6.ebuild
deleted file mode 100644
index df2306c53647..000000000000
--- a/media-libs/xine-lib/xine-lib-1_beta6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta6.ebuild,v 1.6 2003/03/29 14:44:52 mholzer Exp $ 
-
-DESCRIPTION="Core libraries for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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 )
-	>=media-libs/flac-1.0.4
-	>=media-libs/libsdl-1.1.5
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"
-filter-flags "-maltivec -mabi=altivec"
-replace-flags k6-3 i686
-replace-flags k6-2 i686
-replace-flags k6   i686
-
-
-src_compile() {
-
-	# 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 procede.";
-		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"
-
-	einfo "myconf: ${myconf}"
-
-	# Very specific optimization is set by configure
-	# Should fix problems like the one found on bug #11779
-	# raker@gentoo.org (25 Dec 2002)
-	unset CFLAGS
-	unset CXXFLAGS
-
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} install || die
-
-	# 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_beta8.ebuild b/media-libs/xine-lib/xine-lib-1_beta8.ebuild
deleted file mode 100644
index 8c73406ca896..000000000000
--- a/media-libs/xine-lib/xine-lib-1_beta8.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta8.ebuild,v 1.2 2003/03/29 14:44:52 mholzer Exp $ 
-
-DESCRIPTION="Core libraries for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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 )
-	>=media-libs/flac-1.0.4
-	>=media-libs/libsdl-1.1.5
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"
-filter-flags "-maltivec -mabi=altivec"
-replace-flags k6-3 i686
-replace-flags k6-2 i686
-replace-flags k6   i686
-
-
-src_compile() {
-
-	# 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 procede.";
-		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"
-
-	einfo "myconf: ${myconf}"
-
-	# Very specific optimization is set by configure
-	# Should fix problems like the one found on bug #11779
-	# raker@gentoo.org (25 Dec 2002)
-	unset CFLAGS
-	unset CXXFLAGS
-
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} install || die
-
-	# 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_beta9.ebuild b/media-libs/xine-lib/xine-lib-1_beta9.ebuild
deleted file mode 100644
index a422cbe9db68..000000000000
--- a/media-libs/xine-lib/xine-lib-1_beta9.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta9.ebuild,v 1.2 2003/03/29 14:44:52 mholzer Exp $ 
-
-DESCRIPTION="Core libraries for Xine movie player."
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="oggvorbis? ( media-libs/libvorbis )
-	X? ( virtual/x11 )
-	avi? ( >=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 )
-	>=media-libs/flac-1.0.4
-	>=media-libs/libsdl-1.1.5
-	>=media-libs/libfame-0.9.0
-	>=media-libs/xvid-0.9.0"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
-
-# this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
-inherit flag-o-matic  || die "I lost my inheritance"
-filter-flags "-maltivec -mabi=altivec"
-replace-flags k6-3 i686
-replace-flags k6-2 i686
-replace-flags k6   i686
-
-
-src_compile() {
-
-	# 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 procede.";
-		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"
-
-	einfo "myconf: ${myconf}"
-
-	# Very specific optimization is set by configure
-	# Should fix problems like the one found on bug #11779
-	# raker@gentoo.org (25 Dec 2002)
-	unset CFLAGS
-	unset CXXFLAGS
-
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	
-	make DESTDIR=${D} install || die
-
-	# 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
-
-}