remove unused versions

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

5 files changed, 9 insertions, 984 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 44b43114ea50..dc5e04c5f832 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.379 2008/08/28 15:41:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.380 2008/08/28 15:44:30 aballier Exp $
+
+  28 Aug 2008; Alexis Ballier <aballier@gentoo.org> -vlc-0.8.6i.ebuild,
+  -vlc-0.8.6i-r1.ebuild, -vlc-0.9.0.ebuild:
+  remove unused versions
 
 *vlc-0.9.1 (28 Aug 2008)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 2adb6f87c39c..51b930e69e9a 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,25 +3,19 @@ Hash: SHA1
 
 DIST vlc-0.8.6i.tar.bz2 11786172 RMD160 a5da4e1e0980594c678c04016491c8a373df4017 SHA1 4c6f45dffe3a8309ce201897040dc1f82b9cde99 SHA256 a866768f7dd8254c62e059327094073800ed968214b5b35e2682eb81f448214f
 DIST vlc-0.9.0-test3.tar.bz2 15400271 RMD160 edc5fd17611da7e27f83cfadf4f27d8e4e1ad6c8 SHA1 a41d11aaa35fd18e27167f750d841dd7d9ef83a2 SHA256 25afd66a2dd3e573258f455a514eec2eafa80582861e0b0aa8f2818b11c55bb8
-DIST vlc-0.9.0.tar.bz2 16159217 RMD160 79e3b0df32d970a84eca74478d043ea54acead3c SHA1 24ef6b6abcc7da5a57b20b9fe04715949b4321ee SHA256 063b35d1654fccf9f54b8f15613c857a8f132d54834b6856ddde006ce041bb63
 DIST vlc-0.9.1.tar.bz2 15795447 RMD160 0dac8f648140833c6bca41608caba7bd2faf3bb0 SHA1 c9202b0333acfde998d329a4973034212bbe3542 SHA256 97031e622f54081ab34c7140792b738d732f30a38303758f213e0892e267ebdf
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
-DIST vlc-patches-57.tar.bz2 7243 RMD160 6138ef3140077a9ad50b7f2d772e6898fc6af3be SHA1 e35cefabb1deed98491a1814131154f3012918b9 SHA256 ddfc2e892e5718b50501de5f05aa366d2983b5b6fa6d50f16f2308b9501ab3f4
 DIST vlc-patches-59.tar.bz2 4685 RMD160 a01cba6d4af12ebd26faed4a7f8894529dc42e57 SHA1 387934801502ff82045ab446fb1421b14233cf03 SHA256 cf38f9398e62fad8c51dc1b0c8467236cbffb1d465ddbf5ab62d2bf4bbd1ec35
-DIST vlc-patches-60.tar.bz2 10718 RMD160 85a3f96047fa6d8eea64aa90d32e8b9b7e28f182 SHA1 daf5c37a2a8020bb067d28c603892fc1b0b3f730 SHA256 ce00078c130aada636ae0de83766a8c90ea6a56c434b90b05dd002e0618cf835
 DIST vlc-patches-61.tar.bz2 11855 RMD160 8f79c5594eca44c0f5bb4ed19e48ae39a8b17013 SHA1 6c7cc969ae4abbaccc8e1e8d3323d5a33bccf364 SHA256 01800e30ca1db5c5bbab8317195be1dc4c074452bbe41ed7f061e491baac6e24
-EBUILD vlc-0.8.6i-r1.ebuild 9072 RMD160 8eef80964f9e931bd04274895bbb8c3655ce675e SHA1 d93f7570ae077efc0f3fd82498219393b8fa3985 SHA256 d10e69488dd50f1ead3970bb541e9146498320d0fff6e1ebdca6d05a8e188439
 EBUILD vlc-0.8.6i-r2.ebuild 9074 RMD160 b5df355c47fcb36199ff9753c4787be16ab25a23 SHA1 7da14df9c9b456c84f8164dd2bac617b1ed1ea6d SHA256 c73a341e857ad9f384d600abfaa6279539ef3c61838530ca34043dcb7752296e
-EBUILD vlc-0.8.6i.ebuild 9064 RMD160 42b09347845235ffcf30863f95ed8d2df45de5a9 SHA1 212cc91ef69366c56a678a26fb77c417e3d28b76 SHA256 dbd19b1047c4a7b1341135c56fac62e9ec11392cac5872b46c486674f7f15534
-EBUILD vlc-0.9.0.ebuild 10949 RMD160 3e08b006c7f6a42687327af8c99d1ca99bebb20f SHA1 d9598b2d68a698570cfc6b612d1cd96ba03eb093 SHA256 e521d1b084e5e63ab92c522c98c4745378855853d48c337bab1f61c19c241a2f
 EBUILD vlc-0.9.0_beta3.ebuild 10840 RMD160 cc6b3317023175bbe0a04ed3c631d758c2cf5df5 SHA1 b8af07c935f38ac457f067a45264632c680dc43a SHA256 dd0b00a8641d324077fb5ebf4b31cc4d8e5a830630c516bc4987c3b7a75f7660
 EBUILD vlc-0.9.1.ebuild 10949 RMD160 4f40f5fc12efaeb8909c7a3311237975c362f768 SHA1 f0cff784fb4910ff3624574658ebd2b7f78b97c1 SHA256 fb9b0781ae8e87f6e21b1e800dbbe04de817157272ae4b6e8622b86e8a61f272
-MISC ChangeLog 62387 RMD160 15d0a92d353355ae56ee6271dfa8db58683980b8 SHA1 34b954358079900c6063f68c222df2e9eee9e437 SHA256 a712b3984e6cf4c69cbfeeae31077d56b847cfc39b0456a29d204ac25e064075
+MISC ChangeLog 62529 RMD160 c0d97130918aa5f22a8be6f6304a7800a5b7b9ce SHA1 580023a6d2a681a0636e5d64d4cb761d67d3342e SHA256 b352287ba184e18c7a0e9d403e0b5189e1212c09314d3ad4bceeaf3ae10d32d3
 MISC metadata.xml 2460 RMD160 eef5dc2d2e6816ab114c6547dc35119938e7d7d0 SHA1 97bd28e7066b7b9cf7b3f3efcdca70c84d8886c8 SHA256 00f93ca0ae6f777a7b245b0da3e6840b562b6545a5ddd2d6d93452f70bf156d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki2xxcACgkQvFcC4BYPU0p1ogCdH+U4pFq0xisQXYGRx0lpNZ81
-PvwAoKQec/Qa+LqqHu5iULWog9gIp7Wj
-=NVN4
+iEYEARECAAYFAki2x+QACgkQvFcC4BYPU0p6mwCfZrrxz+tfAoCkyyvhnafqabh4
+zSEAoMm9NO5bMuj5EDypHo0Lp+auKQzk
+=sFUz
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-0.8.6i-r1.ebuild b/media-video/vlc/vlc-0.8.6i-r1.ebuild
deleted file mode 100644
index 78afd1506160..000000000000
--- a/media-video/vlc/vlc-0.8.6i-r1.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i-r1.ebuild,v 1.3 2008/08/22 20:52:48 maekke Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-PATCHLEVEL="60"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-
-if [[ "${P}" == *_p* ]]; then # Snapshots
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	MY_P="${P}"
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd 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 sdl-image png xml samba daap corba modplug speex shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
-optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner"
-
-RDEPEND="
-		>=media-video/ffmpeg-0.4.9_p20050226-r1
-		<media-video/ffmpeg-0.4.9_p20070616-r20
-		!=media-video/ffmpeg-0.4.9_p20070616-r1
-		!=media-video/ffmpeg-0.4.9_p20070616-r2
-		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 )
-		gnome? ( gnome-base/gnome-vfs )
-		ogg? ( media-libs/libogg )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.8.0 )
-		mp3? ( media-libs/libmad )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( media-libs/libdca )
-		flac? ( media-libs/libogg
-			>=media-libs/flac-1.1.2 )
-		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* )
-		skins? ( =x11-libs/wxGTK-2.6*
-			media-libs/freetype
-			media-fonts/ttf-bitstream-vera )
-		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.2.9 )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image ) )
-		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 )
-		modplug? ( media-libs/libmodplug )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.5.0 )
-		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 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-libs/libupnp )
-		nsplugin? (
-			xulrunner? ( =net-libs/xulrunner-1.8* )
-			!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
-			!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
-		)
-		libnotify? ( x11-libs/libnotify )
-		musepack? ( media-libs/libmpcdec )
-		x264? ( media-libs/x264 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		dc1394? ( sys-libs/libraw1394
-			<media-libs/libdc1394-1.9.99 )"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	dvb? ( sys-kernel/linux-headers )
-	X? ( xinerama? ( x11-proto/xineramaproto ) )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows || use skins; 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
-		ewarn "Trying to build with skins support but without truetype."
-		ewarn "Enabling truetype."
-	fi
-	if use skins && ! use wxwindows; then
-		ewarn "Trying to build with skins support but without wxwindows."
-		ewarn "Enabling wxwindows."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	local XPIDL=""
-	local MOZILLA_CONFIG=""
-
-	use vlm && \
-		myconf="${myconf} --enable-vlm --enable-sout" || \
-		myconf="${myconf} --disable-vlm"
-
-	if use nsplugin; then
-		if use xulrunner; then
-			XPIDL=/usr/$(get_libdir)/xulrunner
-			MOZILLA_CONFIG=/usr/bin/xulrunner-config
-		elif use seamonkey; then
-			XPIDL=/usr/$(get_libdir)/seamonkey
-			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
-		else
-			XPIDL=/usr/$(get_libdir)/mozilla-firefox
-			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
-		fi
-	fi
-
-	if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
-		myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
-	else
-		myconf="${myconf} $(use_enable live live555)"
-	fi
-
-	if use truetype || use skins; then
-		myconf="${myconf} --enable-freetype"
-	else
-		myconf="${myconf} --disable-freetype"
-	fi
-
-	if use wxwindows || use skins; then
-		myconf="${myconf} --enable-wxwidgets"
-	else
-		myconf="${myconf} --disable-wxwidgets"
-	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 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 ncurses) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable xosd) \
-		$(use_enable lirc) \
-		$(use_enable mp3 mad) \
-		$(use_enable a52) \
-		$(use_enable dts) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable ggi) \
-		$(use_enable 3dfx glide) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable png) \
-		$(use_enable xml libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable modplug mod) \
-		$(use_enable speex) \
-		$(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 upnp) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable libnotify notify) \
-		$(use_enable jack) \
-		$(use_enable musepack mpc) \
-		$(use_enable x264) \
-		$(use_enable dc1394) \
-		$(use_enable directfb) \
-		--enable-ffmpeg \
-		--disable-faad \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-libtar \
-		--disable-optimizations \
-		--enable-utf8 \
-		--enable-libtool \
-		$(use_enable nsplugin mozilla) \
-		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		${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() {
-	# First install the library, to avoid screwups during relinking.select
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
-		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	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 || use skins || rm "${D}/usr/share/applications/vlc.desktop"
-}
diff --git a/media-video/vlc/vlc-0.8.6i.ebuild b/media-video/vlc/vlc-0.8.6i.ebuild
deleted file mode 100644
index d9209b66843e..000000000000
--- a/media-video/vlc/vlc-0.8.6i.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6i.ebuild,v 1.6 2008/07/19 07:08:24 cla Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-PATCHLEVEL="57"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-
-if [[ "${P}" == *_p* ]]; then # Snapshots
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	MY_P="${P}"
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
-dvb dvd vcd 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 sdl-image png xml samba daap corba modplug speex shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
-optimisememory libnotify jack musepack x264 dc1394 gnome xulrunner"
-
-RDEPEND="
-		>=media-video/ffmpeg-0.4.9_p20050226-r1
-		<media-video/ffmpeg-0.4.9_p20070616-r20
-		!=media-video/ffmpeg-0.4.9_p20070616-r1
-		!=media-video/ffmpeg-0.4.9_p20070616-r2
-		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 )
-		gnome? ( gnome-base/gnome-vfs )
-		ogg? ( media-libs/libogg )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.8.0 )
-		mp3? ( media-libs/libmad )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( media-libs/libdca )
-		flac? ( media-libs/libogg
-			>=media-libs/flac-1.1.2 )
-		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* )
-		skins? ( =x11-libs/wxGTK-2.6*
-			media-libs/freetype
-			media-fonts/ttf-bitstream-vera )
-		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.2.9 )
-		sys-libs/zlib
-		png? ( media-libs/libpng )
-		media-libs/libdvbpsi
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image ) )
-		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 )
-		modplug? ( media-libs/libmodplug )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.5.0 )
-		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 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-libs/libupnp )
-		nsplugin? (
-			xulrunner? ( =net-libs/xulrunner-1.8* )
-			!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
-			!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
-		)
-		libnotify? ( x11-libs/libnotify )
-		musepack? ( media-libs/libmpcdec )
-		x264? ( media-libs/x264 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		dc1394? ( sys-libs/libraw1394
-			<media-libs/libdc1394-1.9.99 )"
-
-DEPEND="${RDEPEND}
-	v4l? ( sys-kernel/linux-headers )
-	dvb? ( sys-kernel/linux-headers )
-	X? ( xinerama? ( x11-proto/xineramaproto ) )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use wxwindows || use skins; 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
-		ewarn "Trying to build with skins support but without truetype."
-		ewarn "Enabling truetype."
-	fi
-	if use skins && ! use wxwindows; then
-		ewarn "Trying to build with skins support but without wxwindows."
-		ewarn "Enabling wxwindows."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile () {
-	local XPIDL=""
-	local MOZILLA_CONFIG=""
-
-	use vlm && \
-		myconf="${myconf} --enable-vlm --enable-sout" || \
-		myconf="${myconf} --disable-vlm"
-
-	if use nsplugin; then
-		if use xulrunner; then
-			XPIDL=/usr/$(get_libdir)/xulrunner
-			MOZILLA_CONFIG=/usr/bin/xulrunner-config
-		elif use seamonkey; then
-			XPIDL=/usr/$(get_libdir)/seamonkey
-			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
-		else
-			XPIDL=/usr/$(get_libdir)/mozilla-firefox
-			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
-		fi
-	fi
-
-	if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
-		myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
-	else
-		myconf="${myconf} $(use_enable live live555)"
-	fi
-
-	if use truetype || use skins; then
-		myconf="${myconf} --enable-freetype"
-	else
-		myconf="${myconf} --disable-freetype"
-	fi
-
-	if use wxwindows || use skins; then
-		myconf="${myconf} --enable-wxwidgets"
-	else
-		myconf="${myconf} --disable-wxwidgets"
-	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 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 ncurses) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable xosd) \
-		$(use_enable lirc) \
-		$(use_enable mp3 mad) \
-		$(use_enable a52) \
-		$(use_enable dts) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable ggi) \
-		$(use_enable 3dfx glide) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable png) \
-		$(use_enable xml libxml2) \
-		$(use_enable samba smb) \
-		$(use_enable daap) \
-		$(use_enable corba) \
-		$(use_enable modplug mod) \
-		$(use_enable speex) \
-		$(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 upnp) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable libnotify notify) \
-		$(use_enable jack) \
-		$(use_enable musepack mpc) \
-		$(use_enable x264) \
-		$(use_enable dc1394) \
-		$(use_enable directfb) \
-		--enable-ffmpeg \
-		--disable-faad \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-libtar \
-		--disable-optimizations \
-		--enable-utf8 \
-		--enable-libtool \
-		$(use_enable nsplugin mozilla) \
-		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
-		WX_CONFIG="${WX_CONFIG}" \
-		${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() {
-	# First install the library, to avoid screwups during relinking.select
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
-		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	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 || use skins || rm "${D}/usr/share/applications/vlc.desktop"
-}
diff --git a/media-video/vlc/vlc-0.9.0.ebuild b/media-video/vlc/vlc-0.9.0.ebuild
deleted file mode 100644
index cde04d66f4dd..000000000000
--- a/media-video/vlc/vlc-0.9.0.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.9.0.ebuild,v 1.1 2008/08/24 22:31:31 aballier Exp $
-
-EAPI="1"
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-VLC_SNAPSHOT_TIME="0013"
-
-PATCHLEVEL="59"
-M4_TARBALL_VERSION="1"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [[ "${P}" == *_alpha* ]]; then # Snapshots taken from nightlies.videolan.org
-	SRC_URI="http://nightlies.videolan.org/build/source/trunk-${PV/*_alpha/}-${VLC_SNAPSHOT_TIME}/${PN}-snapshot-${PV/*_alpha/}.tar.bz2"
-	MY_P="${P/_alpha*/}-git"
-elif [[ "${P}" == *_p* ]]; then # Snapshots
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	MY_P="${P}"
-elif [[ "${MY_P}" == "${P}" ]]; then
-	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
-else
-	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
-fi
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-	mirror://gentoo/${PN}-m4-${M4_TARBALL_VERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
-	debug dirac directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
-	id3tag jack libass libcaca +libgcrypt libnotify lirc live lua matroska mmx modplug mp3 mpeg
-	musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png	pulseaudio pvr +qt4
-	remoteosd rtsp samba schroedinger sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
-	theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs
-	X x264 xinerama xml xosd xulrunner xv"
-
-RDEPEND="
-		sys-libs/zlib
-		media-libs/libdvbpsi
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( media-libs/alsa-lib )
-		arts? ( kde-base/arts )
-		avahi? ( >=net-dns/avahi-0.6 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		cdda? ( >=dev-libs/libcdio-0.72
-			cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		cdio? ( >=dev-libs/libcdio-0.78.2
-			>=media-video/vcdimager-0.7.22 )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( sys-libs/libraw1394
-			<media-libs/libdc1394-1.9.99 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB )
-		dts? ( media-libs/libdca )
-		dvd? (	media-libs/libdvdread
-				media-libs/libdvdcss
-				>=media-libs/libdvdnav-0.1.9
-				media-libs/libdvdplay )
-		esd? ( media-sound/esound )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20070616-r3 )
-		flac? ( media-libs/libogg
-			>=media-libs/flac-1.1.2 )
-		fluidsynth? ( media-sound/fluidsynth )
-		ggi? ( media-libs/libggi )
-		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-1.3.3 )
-		hal? ( sys-apps/hal )
-		id3tag? ( media-libs/libid3tag
-			sys-libs/zlib )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
-		libcaca? ( media-libs/libcaca )
-		libgcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
-		libnotify? ( x11-libs/libnotify )
-		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2008.07.06 )
-		lua? ( >=dev-lang/lua-5.1 )
-		matroska? (
-			>=dev-libs/libebml-0.7.6
-			>=media-libs/libmatroska-0.8.0 )
-		modplug? ( media-libs/libmodplug )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		musepack? ( media-libs/libmpcdec )
-		musicbrainz? ( =media-libs/musicbrainz-2* )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? (
-			xulrunner? ( >=net-libs/xulrunner-1.8 )
-			!xulrunner? ( seamonkey? ( =www-client/seamonkey-1* ) )
-			!xulrunner? ( !seamonkey? ( =www-client/mozilla-firefox-2* ) )
-		)
-		ogg? ( media-libs/libogg )
-		png? ( media-libs/libpng )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.8 )
-		qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
-		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( net-fs/samba )
-		schroedinger? ( >=media-libs/schroedinger-1.0 )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image ) )
-		shout? ( media-libs/libshout )
-		skins? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		svga? ( media-libs/svgalib )
-		taglib? ( media-libs/taglib )
-		theora? ( media-libs/libtheora )
-		truetype? ( media-libs/freetype
-			media-fonts/ttf-bitstream-vera )
-		twolame? ( media-sound/twolame )
-		upnp? ( net-libs/libupnp )
-		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
-		X? (
-			x11-libs/libX11
-			x11-libs/libXext
-			xv? ( x11-libs/libXv )
-			xinerama? ( x11-libs/libXinerama )
-			opengl? ( virtual/opengl )
-		)
-		x264? ( media-libs/x264 )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		"
-
-# Disabled features and reasons:
-# xvmc? ( x11-libs/libXvMC )
-#	Will probably compile only on x86
-# zvbi? ( >=media-libs/zvbi-0.2.25 )
-#	Dep not up to date enough
-# kate? ( >=media-libs/libkate-0.1.1 )
-#   No package yet
-
-DEPEND="${RDEPEND}
-	dvb? ( sys-kernel/linux-headers )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
-	X? ( xinerama? ( x11-proto/xineramaproto ) )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# Dispalys a warning if the first use flag is set but not the second
-vlc_use_needs() {
-	use $1 && use !$2 && ewarn "USE=$1 requires $2, $1 will be disabled."
-}
-
-# Notify the user that some useflag have been forced on
-vlc_use_force() {
-	use $1 && use !$2 && ewarn "USE=$1 requires $2, $2 will be enabled."
-}
-
-# Use when $2 depends strictly on $3
-# if use $1 then enable $2 and $3, otherwise disable $2
-vlc_use_enable_force() {
-	if use $1 ; then
-		echo "--enable-$2 --enable-$3"
-	else
-		echo "--disable-$2"
-	fi
-}
-
-# Prints the configure argument for the ffmpeg scaling api to use
-vlc_ffmpeg_scaling_api() {
-	if use ffmpeg ; then
-		if has_version ">=media-video/ffmpeg-0.4.9_p20070616-r20" ; then
-			echo "--enable-swscale --disable-imgresample"
-		else
-			echo "--disable-swscale --enable-imgresample"
-		fi
-	else
-		echo "--disable-swscale --disable-imgresample"
-	fi
-}
-
-pkg_setup() {
-	vlc_use_needs skins truetype
-	vlc_use_force skins qt4
-	vlc_use_needs cdda cdio
-	vlc_use_needs vcdx cdio
-	vlc_use_needs bidi truetype
-	vlc_use_force remoteosd libgcrypt
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
-}
-
-src_compile () {
-
-	# It would fail if -fforce-addr is used due to too few registers...
-	use x86 && filter-flags -fforce-addr
-
-	local XPIDL=""
-	local MOZILLA_CONFIG=""
-
-	if use nsplugin; then
-		if use xulrunner; then
-			XPIDL=/usr/$(get_libdir)/xulrunner
-			MOZILLA_CONFIG=/usr/bin/xulrunner-config
-		elif use seamonkey; then
-			XPIDL=/usr/$(get_libdir)/seamonkey
-			MOZILLA_CONFIG=/usr/$(get_libdir)/seamonkey/seamonkey-config
-		else
-			XPIDL=/usr/$(get_libdir)/mozilla-firefox
-			MOZILLA_CONFIG=/usr/$(get_libdir)/mozilla-firefox/firefox-config
-		fi
-	fi
-
-	econf \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable arts) \
-		--disable-asademux \
-		$(use_enable atmo) \
-		$(use_enable avahi bonjour) \
-		$(use_enable bidi fribidi) \
-		$(use_enable cdda) $(use_enable cdda cddax)\
-		$(use_enable cddb libcddb) \
-		$(use_enable cdio libcdio) \
-		--disable-csri \
-		$(use_enable dbus) $(use_enable dbus dbus-control) \
-		$(use_enable dirac) \
-		$(use_enable directfb) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		--disable-dv \
-		$(use_enable dvb) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable esd) \
-		$(use_enable fbcon fb) \
-		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(vlc_ffmpeg_scaling_api) $(use_enable ffmpeg postproc) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable ggi) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable hal) \
-		$(use_enable httpd) \
-		$(use_enable id3tag) \
-		$(use_enable jack) \
-		--disable-kate \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libgcrypt) \
-		$(use_enable libnotify notify) \
-		--disable-libproxy \
-		--disable-libtar \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable matroska mkv) \
-		$(use_enable mmx) \
-		$(use_enable modplug mod) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg libmpeg2) \
-		$(use_enable musepack mpc) \
-		$(use_enable musicbrainz) \
-		$(use_enable ncurses) \
-		$(use_enable nsplugin mozilla) XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
-		$(use_enable ogg) \
-		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable png) \
-		--disable-portaudio \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sse) \
-		$(use_enable stream sout) \
-		$(use_enable svg) \
-		$(use_enable svga svgalib) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable upnp) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
-		$(use_enable vcd) \
-		$(use_enable vcdx) \
-		$(use_enable vorbis) \
-		$(use_enable win32codecs loader) \
-		$(use_enable X x11) $(use_enable X screen) \
-		$(use_enable x264) \
-		$(use_enable xinerama) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		--disable-xvmc \
-		--disable-zvbi \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-optimizations \
-		--enable-fast-install \
-		$(vlc_use_enable_force vlm vlm sout) \
-		$(vlc_use_enable_force skins skins2 qt4) \
-		$(vlc_use_enable_force remoteosd remoteosd libgcrypt)
-
-	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() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS MAINTAINERS HACKING THANKS 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}
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	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
-}