Update to last test version.

Package-Manager: portage-2.1_pre10-r2

5 files changed, 50 insertions, 525 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7f053556554f..776b0457b297 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,58 +1,71 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b478aede638030ccfb47c270aa1e5eae ChangeLog 30124
-RMD160 effb00970ac015823ee7ee58e525b208cc386c65 ChangeLog 30124
-SHA256 cb723d1bbf20bfa0f8e703e2e07bb6cb7c8e924dc1ff5b1b5f84377b211f4c07 ChangeLog 30124
-MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
-RMD160 5f9576b5ac77c3eb86228d9246b7d1e45db20e25 files/digest-vlc-0.8.1-r1 127
-SHA256 62acf5be95fea3c68450279d0a4fb55461d7841e9b4f28ed4c28f9e6cba23250 files/digest-vlc-0.8.1-r1 127
-MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
-RMD160 273421b7a5b3bdf2d8fff28862cc042e0dbb567b files/digest-vlc-0.8.2-r2 127
-SHA256 039fa9f4902d3a8f558cdaf143671e1d251d1d41b12d9a50dbd6560bb0d8bf1e files/digest-vlc-0.8.2-r2 127
-MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
-RMD160 9ab36af70e59ff3053861c5329b76fd065703341 files/digest-vlc-0.8.4 127
-SHA256 6761f2ddb180cff04248c38dd2ceb9a6d5de595e561b78755c1374f080e67d17 files/digest-vlc-0.8.4 127
-MD5 846990f93776c355395f44ca186ecfef files/digest-vlc-0.8.4a 129
-RMD160 6bc25a516e65913a266391eb4fade564f0445ccc files/digest-vlc-0.8.4a 129
-SHA256 ab2229dc184b78578ec7eb733023f5bef05b0cfe859da5ed004c62d2f110848d files/digest-vlc-0.8.4a 129
-MD5 f34d6c5a25230e1ebb6761514287f838 files/digest-vlc-0.8.4a-r1 482
-RMD160 f5981b387f59cd065dd5e8a2d305ff966c4a59de files/digest-vlc-0.8.4a-r1 482
-SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/digest-vlc-0.8.4a-r1 482
-MD5 e2a8abbea3b2029b00b9b1bf0f9877c0 files/digest-vlc-0.8.5_beta2 494
-RMD160 e35c21c49c6a9c2be6eb4dd7989e578fbb99d713 files/digest-vlc-0.8.5_beta2 494
-SHA256 6e0bd5420943d18d28014ace4827c1f94e884b6eb26649e557f246ab946e54b0 files/digest-vlc-0.8.5_beta2 494
-MD5 b7672fa1e6482d0fd1167a77c9346f99 files/digest-vlc-0.8.5_beta3 494
-RMD160 eeebc8c237afbbe0737fb4119b840ba5a5194c7f files/digest-vlc-0.8.5_beta3 494
-SHA256 41b15399a6fc125d8de765b1cc0be22cf76acf169992b6f02e5a8c491e0d555b files/digest-vlc-0.8.5_beta3 494
-MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
-RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
-SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 metadata.xml 249
+DIST vlc-0.8.1.tar.bz2 4877791 size 4877791
+DIST vlc-0.8.2.tar.bz2 5785680 size 5785680
+DIST vlc-0.8.4.tar.bz2 7245500 size 7245500
+DIST vlc-0.8.4a.tar.bz2 7191539 RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9 size 7191539
+DIST vlc-0.8.5-test4.tar.bz2 8450554 RMD160 39177c98a150b564477b8849a8b4c6b6d075b36a SHA256 0a93d9499cae65ae911f4330a2860864d4f404440d5e17df4c471c2d0ff438f7 size 8450554
+DIST vlc-patches-1.tar.bz2 2149 size 2149
+DIST vlc-patches-13.tar.bz2 7504 size 7504
+DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cbf SHA256 d537ec6e05cbeef04179435e2aabcc9bc9c876063000fd5b037184fabad8c5aa size 10206
+DIST vlc-patches-18.tar.bz2 6400 RMD160 cb990d1fe7372b3ddbd9bd5eccdf98aa1464a73d SHA256 9584e0f5068b64174df99edd5c82a6fa2e9898ed435951ea8f3e504ac85760f7 size 6400
+DIST vlc-patches-7.tar.bz2 4696 size 4696
+DIST vlc-patches-8.tar.bz2 4889 size 4889
+EBUILD vlc-0.8.1-r1.ebuild 6040 RMD160 1378b1d36f6b69b17201d9604cd365d0590da496 SHA1 3e0c50f28f9b5392d12d2c52aaee5e5ec4b17bd6 SHA256 b56acb63f7ee2f918c9f128abc5fb40938ac8f0aa20dcf14c23cf960ffa5a977 size 6040
 MD5 160a009b44c4d5931803a92669c32960 vlc-0.8.1-r1.ebuild 6040
 RMD160 1378b1d36f6b69b17201d9604cd365d0590da496 vlc-0.8.1-r1.ebuild 6040
 SHA256 b56acb63f7ee2f918c9f128abc5fb40938ac8f0aa20dcf14c23cf960ffa5a977 vlc-0.8.1-r1.ebuild 6040
+EBUILD vlc-0.8.2-r2.ebuild 7470 RMD160 2594dc083ddbdfdf8435bb037ad8ad6d1c7eabd2 SHA1 50e6c799cae453ea0791cd1077d3f0d971e6ef2f SHA256 49c81ceaebc04a409f3d1a90ef223aa82581ee6fde348d9aba3c336edc0c118d size 7470
 MD5 2a4d85def1d0fd31aa4dd3917c4050e9 vlc-0.8.2-r2.ebuild 7470
 RMD160 2594dc083ddbdfdf8435bb037ad8ad6d1c7eabd2 vlc-0.8.2-r2.ebuild 7470
 SHA256 49c81ceaebc04a409f3d1a90ef223aa82581ee6fde348d9aba3c336edc0c118d vlc-0.8.2-r2.ebuild 7470
+EBUILD vlc-0.8.4.ebuild 6923 RMD160 e782d3d0b643ae918642e4ab7b598345de378a2d SHA1 4d8f36cd420d891284495cc2d2ee435d12fcc3fb SHA256 05d8cc7e92535576ac552751c84d32fd461ef7b86d06b890155cc94c1868820b size 6923
 MD5 abdad82efe9b21f65e728a3ba20d48c7 vlc-0.8.4.ebuild 6923
 RMD160 e782d3d0b643ae918642e4ab7b598345de378a2d vlc-0.8.4.ebuild 6923
 SHA256 05d8cc7e92535576ac552751c84d32fd461ef7b86d06b890155cc94c1868820b vlc-0.8.4.ebuild 6923
+EBUILD vlc-0.8.4a-r1.ebuild 7313 RMD160 90e725c59dbfe2f08c573e1f5131b06708758e6f SHA1 d7382f44de0dc94d053e9e21d5459b6aec9196c6 SHA256 22cd228ae61f31784795be23b28261684ab2597d2b96e01f8fc7b638babec373 size 7313
 MD5 1070e4986007224939cd981051edd322 vlc-0.8.4a-r1.ebuild 7313
 RMD160 90e725c59dbfe2f08c573e1f5131b06708758e6f vlc-0.8.4a-r1.ebuild 7313
 SHA256 22cd228ae61f31784795be23b28261684ab2597d2b96e01f8fc7b638babec373 vlc-0.8.4a-r1.ebuild 7313
+EBUILD vlc-0.8.4a.ebuild 7481 RMD160 e4e353bbbc2e4b79e715fffad61efcb8e3b25814 SHA1 db6615599da7127b227c23b50621b30da753f65f SHA256 3ec83bb2d6d256ddeb663f762bdd42ef29b54cf3e8872acae631e9c35826e063 size 7481
 MD5 2908bdb33796f25e21e2d4ee6dbdba2c vlc-0.8.4a.ebuild 7481
 RMD160 e4e353bbbc2e4b79e715fffad61efcb8e3b25814 vlc-0.8.4a.ebuild 7481
 SHA256 3ec83bb2d6d256ddeb663f762bdd42ef29b54cf3e8872acae631e9c35826e063 vlc-0.8.4a.ebuild 7481
-MD5 6fc75ee19e7e0ff5fcb7d12ed3a531c5 vlc-0.8.5_beta2.ebuild 7008
-RMD160 ecf89514646b1bbe9d9a09d1931fbd0a712bd42e vlc-0.8.5_beta2.ebuild 7008
-SHA256 8b57df3a8a670c5a4eb2efb9dd569540bc97081240204071bdc1cb423e3df553 vlc-0.8.5_beta2.ebuild 7008
-MD5 4ce2655b5ec963cdafdc884ac0c6e7a5 vlc-0.8.5_beta3.ebuild 7161
-RMD160 55bc68e6591cf52726c140c925455e24fcf75658 vlc-0.8.5_beta3.ebuild 7161
-SHA256 c9f16859f8bb970a7465e54d6e1eb1a52c768c8442df4bb40a1656f13a4d5d7d vlc-0.8.5_beta3.ebuild 7161
+EBUILD vlc-0.8.5_beta4.ebuild 7161 RMD160 916343db2a92459e064549d93d05d44d420ffea1 SHA1 514bc81f2b8c9176a26e19667b16707720de34ea SHA256 87a224f2e0218f9f5e59d0ad42d4ebb8b29d6d34da24293e472649a019b69c9d size 7161
+MD5 bbdc6f09cf1156e9105de53acd6a21b1 vlc-0.8.5_beta4.ebuild 7161
+RMD160 916343db2a92459e064549d93d05d44d420ffea1 vlc-0.8.5_beta4.ebuild 7161
+SHA256 87a224f2e0218f9f5e59d0ad42d4ebb8b29d6d34da24293e472649a019b69c9d vlc-0.8.5_beta4.ebuild 7161
+MISC ChangeLog 30318 RMD160 33018513e0f850a9397486824fa929a6c983eb3c SHA1 e132f11802cee68bd2b41def70845ba9af542516 SHA256 40e361a6cd8d78a288803fa61e8047fd58a11921ec4d9ec20e78e635863884d5 size 30318
+MD5 ff959e360b3f7d838522b4444cc51d3f ChangeLog 30318
+RMD160 33018513e0f850a9397486824fa929a6c983eb3c ChangeLog 30318
+SHA256 40e361a6cd8d78a288803fa61e8047fd58a11921ec4d9ec20e78e635863884d5 ChangeLog 30318
+MISC metadata.xml 249 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 SHA1 fc3811086b04b8f498738e2461158e2f17da5fb4 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 size 249
+MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
+RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
+SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 metadata.xml 249
+MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
+RMD160 5f9576b5ac77c3eb86228d9246b7d1e45db20e25 files/digest-vlc-0.8.1-r1 127
+SHA256 62acf5be95fea3c68450279d0a4fb55461d7841e9b4f28ed4c28f9e6cba23250 files/digest-vlc-0.8.1-r1 127
+MD5 260130c48f890b87819fbb2df43836e3 files/digest-vlc-0.8.2-r2 127
+RMD160 273421b7a5b3bdf2d8fff28862cc042e0dbb567b files/digest-vlc-0.8.2-r2 127
+SHA256 039fa9f4902d3a8f558cdaf143671e1d251d1d41b12d9a50dbd6560bb0d8bf1e files/digest-vlc-0.8.2-r2 127
+MD5 d84791584b167d4cf96f365498050a62 files/digest-vlc-0.8.4 127
+RMD160 9ab36af70e59ff3053861c5329b76fd065703341 files/digest-vlc-0.8.4 127
+SHA256 6761f2ddb180cff04248c38dd2ceb9a6d5de595e561b78755c1374f080e67d17 files/digest-vlc-0.8.4 127
+MD5 2e9cf9c53865e7620611371fe0f94484 files/digest-vlc-0.8.4a 303
+RMD160 acdb0b651a92d596326a9d098b4a5406fc8c709c files/digest-vlc-0.8.4a 303
+SHA256 9119228935ccec9205c713e974e280ddef38fa7da219fbf6bf825d57e706c121 files/digest-vlc-0.8.4a 303
+MD5 f34d6c5a25230e1ebb6761514287f838 files/digest-vlc-0.8.4a-r1 482
+RMD160 f5981b387f59cd065dd5e8a2d305ff966c4a59de files/digest-vlc-0.8.4a-r1 482
+SHA256 ecfd8c4a8edf5a58d299acaff67a316567d2e802bd676a356fbb113ce28779a8 files/digest-vlc-0.8.4a-r1 482
+MD5 775fe520526570d5f2c82a961be05c68 files/digest-vlc-0.8.5_beta4 494
+RMD160 ce01349733749c9f2ecf51d8e3f1d61558f936fb files/digest-vlc-0.8.5_beta4 494
+SHA256 48461a04352133212922c9eeb1acc53a953199e9bd1d55078482ba02ee464098 files/digest-vlc-0.8.5_beta4 494
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERw1hAiZjviIA2XgRAgfSAKCMfEqhPxKWzHcMwaj5py6wTLdfRwCcDhkF
-2QrtDFCeHv9CTI399GaKDqg=
-=pFzA
+iD8DBQFEV0Y0AiZjviIA2XgRAoZvAJ9S2aI4Js3BM1QkUnaPDqiyFYofkwCgh2iY
+OPP4ncXuNwCjPSYHN483E0g=
+=GErx
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.5_beta2 b/media-video/vlc/files/digest-vlc-0.8.5_beta2
deleted file mode 100644
index dcff95de4ec6..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.5_beta2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3c2f5871ee2167617b40f4403f0c3ea0 vlc-0.8.5-test2.tar.bz2 7873458
-RMD160 57f7c33d22d2c43ca21e0d1fbe42049a167f50bf vlc-0.8.5-test2.tar.bz2 7873458
-SHA256 3c0338011f61ac46ada468177b748399c43353a42a4cbf487facdc46b859a36d vlc-0.8.5-test2.tar.bz2 7873458
-MD5 cd7a8c873e80acd2619e4c1911ae5de2 vlc-patches-17.tar.bz2 6243
-RMD160 05a5722e38ff2f40df44d11672455fd2ec0a779a vlc-patches-17.tar.bz2 6243
-SHA256 9d177a688661416ae3761500a5fb22e20f87a843ebee06e7092799a13da23750 vlc-patches-17.tar.bz2 6243
diff --git a/media-video/vlc/files/digest-vlc-0.8.5_beta3 b/media-video/vlc/files/digest-vlc-0.8.5_beta3
deleted file mode 100644
index 52930e852d99..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.5_beta3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 549366839dc456510636b387d5aec926 vlc-0.8.5-test3.tar.bz2 8519721
-RMD160 309a1b035b2fc53996f050d2507a7951d5cbb02a vlc-0.8.5-test3.tar.bz2 8519721
-SHA256 0344dc9f5a2f14b896e5f9c67b68568fc824b12d1ee41d23ac77a673c7925b55 vlc-0.8.5-test3.tar.bz2 8519721
-MD5 e62b5ff825fd72028902c46db7ba9bc8 vlc-patches-18.tar.bz2 6400
-RMD160 cb990d1fe7372b3ddbd9bd5eccdf98aa1464a73d vlc-patches-18.tar.bz2 6400
-SHA256 9584e0f5068b64174df99edd5c82a6fa2e9898ed435951ea8f3e504ac85760f7 vlc-patches-18.tar.bz2 6400
diff --git a/media-video/vlc/vlc-0.8.5_beta2.ebuild b/media-video/vlc/vlc-0.8.5_beta2.ebuild
deleted file mode 100644
index 448420fa656a..000000000000
--- a/media-video/vlc/vlc-0.8.5_beta2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5_beta2.ebuild,v 1.3 2006/04/15 16:36:41 tcort Exp $
-
-inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs
-
-MY_P="${P/_beta/-test}"
-
-PATCHLEVEL="17"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-
-[[ ${MY_P} != "${P}" ]] && \
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \
-	|| SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
-oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
-mp3 xv bidi sdl png xml samba daap corba screen mod speex nsplugin shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp"
-
-RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
-			cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		live? ( >=media-plugins/live-2005.01.29 )
-		dvd? (  media-libs/libdvdread
-				media-libs/libdvdcss
-				>=media-libs/libdvdnav-0.1.9
-				media-libs/libdvdplay )
-		esd? ( media-sound/esound )
-		ogg? ( media-libs/libogg )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.7.5 )
-		mp3? ( media-libs/libmad )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( >=media-libs/libdts-0.0.2-r3 )
-		flac? ( media-libs/flac )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		vorbis? ( media-libs/libvorbis )
-		theora? ( media-libs/libtheora )
-		truetype? ( media-libs/freetype
-			media-fonts/ttf-bitstream-vera )
-		svga? ( media-libs/svgalib )
-		ggi? ( media-libs/libggi )
-		aalib? ( media-libs/aalib )
-		libcaca? ( media-libs/libcaca )
-		arts? ( kde-base/arts )
-		alsa? ( media-libs/alsa-lib )
-		wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 )
-		ncurses? ( sys-libs/ncurses )
-		xosd? ( x11-libs/xosd )
-		lirc? ( app-misc/lirc )
-		3dfx? ( media-libs/glide-v3 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		gnutls? ( >=net-libs/gnutls-1.0.17 )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		aac? ( >=media-libs/faad2-2.0-r2 )
-		sdl? ( >=media-libs/libsdl-1.2.8 )
-		xml? ( dev-libs/libxml2 )
-		samba? ( net-fs/samba )
-		vcd? ( >=dev-libs/libcdio-0.72
-			>=media-video/vcdimager-0.7.21 )
-		daap? ( >=media-libs/libopendaap-0.3.0 )
-		corba? ( >=gnome-base/orbit-2.8.0
-			>=dev-libs/glib-2.3.2 )
-		v4l? ( sys-kernel/linux-headers )
-		dvb? ( sys-kernel/linux-headers )
-		mod? ( media-libs/libmodplug )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.5.0 )
-		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
-		shout? ( media-libs/libshout )
-		win32codecs? ( media-libs/win32codecs )
-		hal? ( sys-apps/hal )
-		avahi? ( >=net-dns/avahi-0.6 )
-		X? ( || ( (
-				x11-libs/libX11
-				x11-libs/libXext
-				xv? ( x11-libs/libXv )
-				xinerama? ( x11-libs/libXinerama )
-			) virtual/x11 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-misc/upnp )"
-
-DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) virtual/x11 )
-	)
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows; then
-		WX_GTK_VER="2.6"
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-	fi
-
-	if use skins && ! use truetype; then
-		eerror "Trying to build with skins support but without truetype."
-		die "You have to use 'truetype' to use 'skins'"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk"
-
-	use wxwindows && \
-		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
-
-	use vlm && \
-		myconf="${myconf} --enable-vlm --enable-sout" || \
-		myconf="${myconf} --disable-vlm"
-
-	econf \
-		$(use_enable altivec) \
-		$(use_enable stream sout) \
-		$(use_enable httpd) \
-		$(use_enable gnutls) \
-		$(use_enable v4l) \
-		$(use_enable cdda) $(use_enable cdda cddax)\
-		$(use_enable cddb libcddb) \
-		$(use_enable vcd) $(use_enable vcd vcdx) \
-		$(use_enable dvb) $(use_enable dvb pvr) \
-		$(use_enable ogg) \
-		$(use_enable matroska mkv) \
-		$(use_enable flac) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable X x11) \
-		$(use_enable xv xvideo) \
-		$(use_enable xinerama) \
-		$(use_enable opengl glx) $(use_enable opengl) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
-		$(use_enable fbcon fb) \
-		$(use_enable svga svgalib) \
-		$(use_enable 3dfx glide) \
-		$(use_enable aalib aa) \
-		$(use_enable libcaca caca) \
-		$(use_enable oss) \
-		$(use_enable esd) \
-		$(use_enable arts) \
-		$(use_enable alsa) \
-		$(use_enable wxwindows wxwidgets) \
-		$(use_enable ncurses) \
-		$(use_enable xosd) \
-		$(use_enable lirc) \
-		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
-		$(use_enable mp3 mad) \
-		$(use_enable aac faad) \
-		$(use_enable a52) \
-		$(use_enable dts) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable ggi) \
-		$(use_enable 3dfx glide) \
-		$(use_enable sdl) \
-		$(use_enable png) \
-		$(use_enable xml libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable mod) \
-		$(use_enable speex) \
-		$(use_enable nsplugin mozilla) \
-		$(use_enable shout) \
-		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
-		$(use_enable win32codecs loader) \
-		$(use_enable skins skins2) \
-		$(use_enable hal) \
-		$(use_enable avahi bonjour) \
-		$(use_enable ffmpeg) \
-		$(use_enable directfb) \
-		$(use_enable upnp) \
-		--disable-jack \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-x264 \
-		--enable-utf8 \
-		${myconf} || die "configuration failed"
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
-	fi
-
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
-		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
-	rm -rf ${D}/usr/share/doc/vlc \
-		${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
-
-	use skins || rm -rf ${D}/usr/share/vlc/skins2
-
-	for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
-		newins ${S}/share/vlc${res}x${res}.png vlc.png
-	done
-
-	use wxwindows && domenu "${S}/debian/vlc.desktop"
-}
diff --git a/media-video/vlc/vlc-0.8.5_beta3.ebuild b/media-video/vlc/vlc-0.8.5_beta3.ebuild
deleted file mode 100644
index 06a0dfae262e..000000000000
--- a/media-video/vlc/vlc-0.8.5_beta3.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5_beta3.ebuild,v 1.2 2006/04/20 04:29:05 flameeyes Exp $
-
-inherit eutils wxwidgets nsplugins multilib autotools toolchain-funcs
-
-MY_P="${P/_beta/-test}"
-
-PATCHLEVEL="18"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-
-[[ ${MY_P} != "${P}" ]] && \
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \
-	|| SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
-oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
-mp3 xv bidi sdl png xml samba daap corba screen mod speex nsplugin shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp"
-
-RDEPEND="cdda? ( >=dev-libs/libcdio-0.71
-			cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		live? ( >=media-plugins/live-2005.01.29 )
-		dvd? (  media-libs/libdvdread
-				media-libs/libdvdcss
-				>=media-libs/libdvdnav-0.1.9
-				media-libs/libdvdplay )
-		esd? ( media-sound/esound )
-		ogg? ( media-libs/libogg )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.7.5 )
-		mp3? ( media-libs/libmad )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( >=media-libs/libdts-0.0.2-r3 )
-		flac? ( media-libs/flac )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		vorbis? ( media-libs/libvorbis )
-		theora? ( media-libs/libtheora )
-		truetype? ( media-libs/freetype
-			media-fonts/ttf-bitstream-vera )
-		svga? ( media-libs/svgalib )
-		ggi? ( media-libs/libggi )
-		aalib? ( media-libs/aalib )
-		libcaca? ( media-libs/libcaca )
-		arts? ( kde-base/arts )
-		alsa? ( media-libs/alsa-lib )
-		wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 )
-		ncurses? ( sys-libs/ncurses )
-		xosd? ( x11-libs/xosd )
-		lirc? ( app-misc/lirc )
-		3dfx? ( media-libs/glide-v3 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		gnutls? ( >=net-libs/gnutls-1.0.17 )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		aac? ( >=media-libs/faad2-2.0-r2 )
-		sdl? ( >=media-libs/libsdl-1.2.8 )
-		xml? ( dev-libs/libxml2 )
-		samba? ( net-fs/samba )
-		vcd? ( >=dev-libs/libcdio-0.72
-			>=media-video/vcdimager-0.7.21 )
-		daap? ( >=media-libs/libopendaap-0.3.0 )
-		corba? ( >=gnome-base/orbit-2.8.0
-			>=dev-libs/glib-2.3.2 )
-		v4l? ( sys-kernel/linux-headers )
-		dvb? ( sys-kernel/linux-headers )
-		mod? ( media-libs/libmodplug )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.5.0 )
-		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
-		shout? ( media-libs/libshout )
-		win32codecs? ( media-libs/win32codecs )
-		hal? ( sys-apps/hal )
-		avahi? ( >=net-dns/avahi-0.6 )
-		X? ( || ( (
-				x11-libs/libX11
-				x11-libs/libXext
-				xv? ( x11-libs/libXv )
-				xinerama? ( x11-libs/libXinerama )
-			) virtual/x11 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-misc/upnp )"
-
-DEPEND="${RDEPEND}
-	X? ( || ( (
-			x11-proto/xproto
-			x11-proto/xextproto
-			xinerama? ( x11-proto/xineramaproto )
-		) virtual/x11 )
-	)
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows; then
-		WX_GTK_VER="2.6"
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-	fi
-
-	if use skins && ! use truetype; then
-		eerror "Trying to build with skins support but without truetype."
-		die "You have to use 'truetype' to use 'skins'"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk"
-
-	use wxwindows && \
-		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
-
-	use vlm && \
-		myconf="${myconf} --enable-vlm --enable-sout" || \
-		myconf="${myconf} --disable-vlm"
-
-	if use directfb; then
-		myconf="${myconf} --enable-directfb --with-directfb=/usr"
-		append-flags "-I /usr/include/directfb"
-	else
-		myconf="${myconf} --disable-directfb"
-	fi
-
-	econf \
-		$(use_enable altivec) \
-		$(use_enable stream sout) \
-		$(use_enable httpd) \
-		$(use_enable gnutls) \
-		$(use_enable v4l) \
-		$(use_enable cdda) $(use_enable cdda cddax)\
-		$(use_enable cddb libcddb) \
-		$(use_enable vcd) $(use_enable vcd vcdx) \
-		$(use_enable dvb) $(use_enable dvb pvr) \
-		$(use_enable ogg) \
-		$(use_enable matroska mkv) \
-		$(use_enable flac) \
-		$(use_enable vorbis) \
-		$(use_enable theora) \
-		$(use_enable X x11) \
-		$(use_enable xv xvideo) \
-		$(use_enable xinerama) \
-		$(use_enable opengl glx) $(use_enable opengl) \
-		$(use_enable truetype freetype) \
-		$(use_enable bidi fribidi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
-		$(use_enable fbcon fb) \
-		$(use_enable svga svgalib) \
-		$(use_enable 3dfx glide) \
-		$(use_enable aalib aa) \
-		$(use_enable libcaca caca) \
-		$(use_enable oss) \
-		$(use_enable esd) \
-		$(use_enable arts) \
-		$(use_enable alsa) \
-		$(use_enable wxwindows wxwidgets) \
-		$(use_enable ncurses) \
-		$(use_enable xosd) \
-		$(use_enable lirc) \
-		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
-		$(use_enable mp3 mad) \
-		$(use_enable aac faad) \
-		$(use_enable a52) \
-		$(use_enable dts) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable ggi) \
-		$(use_enable 3dfx glide) \
-		$(use_enable sdl) \
-		$(use_enable png) \
-		$(use_enable xml libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable mod) \
-		$(use_enable speex) \
-		$(use_enable nsplugin mozilla) \
-		$(use_enable shout) \
-		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
-		$(use_enable win32codecs loader) \
-		$(use_enable skins skins2) \
-		$(use_enable hal) \
-		$(use_enable avahi bonjour) \
-		$(use_enable ffmpeg) \
-		$(use_enable upnp) \
-		--disable-jack \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-x264 \
-		--enable-utf8 \
-		${myconf} || die "configuration failed"
-
-	if [[ $(gcc-major-version) == 2 ]]; then
-		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
-	fi
-
-	emake || die "make of VLC failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
-		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
-	rm -rf ${D}/usr/share/doc/vlc \
-		${D}/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
-
-	use skins || rm -rf ${D}/usr/share/vlc/skins2
-
-	for res in 16 32 48; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
-		newins ${S}/share/vlc${res}x${res}.png vlc.png
-	done
-
-	use wxwindows && domenu "${S}/debian/vlc.desktop"
-}