remove old

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 8 insertions, 397 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 82f16a5b4ca5..f71b4af19885 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.482 2009/07/28 10:02:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.483 2009/07/28 10:08:17 aballier Exp $
+
+  28 Jul 2009; Alexis Ballier <aballier@gentoo.org> -vlc-1.0.0.ebuild:
+  remove old
 
 *vlc-1.0.1 (28 Jul 2009)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index dc08bf231915..7815e14d5277 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,28 +3,25 @@ Hash: SHA1
 
 DIST vlc-0.9.10.tar.bz2 17526464 RMD160 25a96098e3507d48f7d62d1b2f3a1138c2004832 SHA1 8b562a5327c358a332f97d9012702ca2b445c0ed SHA256 54f6ef6e592e0c0315da82ccbe76304210073d0b778e65e3c47e1e950c12b726
 DIST vlc-0.9.9a.tar.bz2 17500620 RMD160 c185b5e8dae8e8aacb6e1c03f14eae24cb805648 SHA1 c72a3aa7854292356c0c5149cbb732da7d46b163 SHA256 e5d0a168263f56bccc62d30031287d56f0b6a3447b552f3a5224132d0b597dd6
-DIST vlc-1.0.0.tar.bz2 19973964 RMD160 7d0ed52c580c75d09003788f5a2d27b7de18b410 SHA1 fff08528d97d26f6f7faeafba94b445e0e3562e8 SHA256 a41ae622dde65e8eb54abf7bece9949ff9aa4b9fa1f9ca2d06c9689d19bb1d9e
 DIST vlc-1.0.1.tar.bz2 19794042 RMD160 9604d3fd33888a058472ebda711ac17f78f8de3f SHA1 4bd670f538651633c1115c8f4efc94211ff882ec SHA256 2b4a1d82699f37a7b696bcdc87e669f17c1ba6ab37bf7a96fd953940e00fd463
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-59.tar.bz2 4685 RMD160 a01cba6d4af12ebd26faed4a7f8894529dc42e57 SHA1 387934801502ff82045ab446fb1421b14233cf03 SHA256 cf38f9398e62fad8c51dc1b0c8467236cbffb1d465ddbf5ab62d2bf4bbd1ec35
 DIST vlc-patches-62.tar.bz2 5860 RMD160 1fda0b8308a8452581ba8c2516f11e413d396871 SHA1 6942e118231b42fed2c0e32444192d627f6dd1db SHA256 472f7d060753de5d5596104f6df677ddff6258e5632a45f2f79906dce8d33b2e
-DIST vlc-patches-66.tar.bz2 6068 RMD160 01667f524b8ae946b5b73db671a27887456b099e SHA1 0f4e85774989f48797471f69f6d98ba5dc3c7fac SHA256 b7b1a6e81dd34a26364d65ec14cbd84daede05e8c10eba7ef7e70e13e15d610d
 DIST vlc-patches-67.tar.bz2 5648 RMD160 f8f4ecd7ab846b00448158819cb875c4c9de8785 SHA1 98ff0d1a3a29ca0652f28d8189038d642c62af02 SHA256 7aef5ab023e8a93dcfb151a1a13500b63d8fd7bb97d0c3cf5670fe87b3ea7a37
 DIST vlc-patches-68.tar.bz2 4927 RMD160 10c87549fc7cc0446b35bc7cf810a693a173d69e SHA1 ca643dcd04d65a9820d60341b834435dab95f036 SHA256 cb192cd418fcc4b459750c77c82b258d0b606f0d2cfa68edfee81fd508e9b509
 DIST vlc-patches-69.tar.bz2 5312 RMD160 627261e8f4764e2f4e93e4c64cf33561a742cbeb SHA1 efc45ed9e91ed9b8702a499d9b456e16957013fc SHA256 f18461b7f8fb78e9faa9200563304dda511a974ba656273a56ac232d94dbb0ab
 EBUILD vlc-0.9.10.ebuild 11173 RMD160 2dcfefc0b35bcd738a1b194569eda2ea93e446bb SHA1 7944293874cb61e874640bf77efe4d7e3ab660ac SHA256 c08c8c2def93a687335ac81198257d0b92ea1faefc0966ad91730e3f60c26342
 EBUILD vlc-0.9.9999.ebuild 11081 RMD160 6a9886b52505b5c0687485f1a8dac99e0154942e SHA1 5a46cec07d6eae09e174f8dd89207a4328b7543f SHA256 4e35a76e100c3e7ba40887131c676026ad5d429d6636367f7eede298f08103e0
 EBUILD vlc-0.9.9a-r1.ebuild 11170 RMD160 29b57d6972d9b570b5a7fef39ad87f2c6e5ea21b SHA1 c9588dec164650947963b6e6193ff2f09fef4e9f SHA256 dd3fe596b7df2d9735ef11d0fee117b73819cd4e48ebcd415eb87cd35d1de0dd
-EBUILD vlc-1.0.0.ebuild 11886 RMD160 d553004d8f4a3bf780ed07f657d8a7f66f3b5958 SHA1 ba5627b9b82c395f56198e51d073915d67a390a0 SHA256 ad92a7d379dacda4bf90423508033b18e07d83ff97375cd12d19afa01c10a636
 EBUILD vlc-1.0.1.ebuild 11886 RMD160 30eb3d12e6bc74d711806a8eea2eb8d05d4ec07d SHA1 769165613dc4f2f273a1699b05e6be21487ea184 SHA256 d1a81a724405c45e35bc92eb47cab55833b0798ddf4769b35b267d03568dc8a7
 EBUILD vlc-1.0.9999.ebuild 11850 RMD160 532b14966391fd2c071f65d25e362d7dc5d6494a SHA1 9680f9272163a91d10c0d62b94d839641771fd06 SHA256 5d2fb272755d746cf883b4c1142c69169a605f80fe37ec25246af94473d22d83
 EBUILD vlc-9999.ebuild 11935 RMD160 c13585ac0e78ce4c7397152689f5bb11162c621d SHA1 06c19e5e4acc69fe6d38cd862a7b4d1b0f243b06 SHA256 9e310dec2a7cdf545e93e968103a249845a274168961cfc248a32ca25e0a9f27
-MISC ChangeLog 77055 RMD160 72c399d45d3f2a00995273500f29b6e8cfa60e72 SHA1 02711d36821182c81910de82dc071760593643d1 SHA256 fccac5dc6f93dd8f311b3dd0ad69ebf12ebd17842c308d4112dce750a0324df0
+MISC ChangeLog 77140 RMD160 7c146b357d569dcb9f1f938c64557577ae41438c SHA1 89ee0b11c234a9636aa75c9d4c6a23a318d52c79 SHA256 25c3970b8f1ec34cf951f8c1a83afe9115c1a5b9ab32df200d8c1ee69567b71f
 MISC metadata.xml 3976 RMD160 dbfa0c1454d2d1c167425a2135a5e4406cd4e456 SHA1 17926d44165e841588c3e93676ea6b429de14e85 SHA256 22a4c78c9960eb4be35caa117f033f4a654378936ffe1ed9813d4704f6c9219a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpuzVsACgkQvFcC4BYPU0oWzQCfee/nUGDn+tHyfUOfo3ikYKlv
-6ygAoKa3LashuX5seFZsN2CJryEyjrwz
-=zaYK
+iEYEARECAAYFAkpuzqQACgkQvFcC4BYPU0ovFQCghgTCnyykqw030lz8sbzA71iJ
+mlsAoMLExftytUivmsFGTVUtB0ijiH5I
+=y9Ls
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.0.ebuild b/media-video/vlc/vlc-1.0.0.ebuild
deleted file mode 100644
index 77fd7dedb9a3..000000000000
--- a/media-video/vlc/vlc-1.0.0.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.0.ebuild,v 1.12 2009/07/27 07:14:05 aballier Exp $
-
-EAPI="2"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git
-	EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	EGIT_BOOTSTRAP="bootstrap"
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_BRANCH=${PV%.9999}-bugfix
-	else
-		EGIT_BRANCH=master
-	fi
-fi
-
-inherit eutils multilib autotools toolchain-funcs gnome2 nsplugins qt4 flag-o-matic ${SCM}
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-VLC_SNAPSHOT_TIME="0013"
-
-PATCHLEVEL="66"
-M4_TARBALL_VERSION="1"
-DESCRIPTION="VLC media player - Video player and streamer"
-HOMEPAGE="http://www.videolan.org/vlc/"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-elif [[ "${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 [[ "${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="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
-	debug dirac directfb dts dvb dvd fbcon fluidsynth +ffmpeg flac fontconfig
-	+gcrypt ggi gnome gnutls hal httpd id3tag ieee1394 jack kate libass libcaca
-	libnotify libproxy libsysfs libtiger libv4l2 lirc live lua matroska mmx
-	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
-	pda png pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba schroedinger
-	sdl sdl-image seamonkey shine shout skins speex sse stream svg svga taglib
-	theora truetype twolame upnp v4l v4l2 vcdinfo vcdx vlm vorbis win32codecs
-	wma-fixed X x264 xcb xinerama xml xosd xv zvbi"
-
-RDEPEND="
-		!!<=media-video/vlc-0.9.99999
-		sys-libs/zlib
-		>=media-libs/libdvbpsi-0.1.6
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( media-libs/alsa-lib )
-		avahi? ( >=net-dns/avahi-0.6 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		cddax? ( cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		cdio? ( >=dev-libs/libcdio-0.78.2 )
-		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 )
-		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20090201 )
-		flac? ( media-libs/libogg
-			>=media-libs/flac-1.1.2 )
-		fluidsynth? ( media-sound/fluidsynth )
-		fontconfig? ( media-libs/fontconfig )
-		gcrypt? ( >=dev-libs/libgcrypt-1.2.0 )
-		ggi? ( media-libs/libggi )
-		gnome? ( gnome-base/gnome-vfs )
-		gnutls? ( >=net-libs/gnutls-1.7.4 )
-		hal? ( sys-apps/hal )
-		id3tag? ( media-libs/libid3tag
-			sys-libs/zlib )
-		ieee1394? ( sys-libs/libraw1394 sys-libs/libavc1394 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.5 media-libs/fontconfig )
-		libcaca? ( media-libs/libcaca )
-		libnotify? ( x11-libs/libnotify )
-		libproxy? ( net-libs/libproxy )
-		libsysfs? ( sys-fs/sysfsutils )
-		libtiger? ( media-libs/libtiger )
-		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 )
-		mtp? ( >=media-libs/libmtp-0.3.0 )
-		musepack? ( || ( >=media-sound/musepack-tools-444
-			media-libs/libmpcdec ) )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? (
-			seamonkey?  ( =www-client/seamonkey-1* )
-			!seamonkey? ( >=net-libs/xulrunner-1.8 )
-		)
-		ogg? ( media-libs/libogg )
-		pda? ( x11-libs/gtk+:2 )
-		png? ( media-libs/libpng )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
-		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( net-fs/samba )
-		schroedinger? ( >=media-libs/schroedinger-1.0.6 )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image ) )
-		shout? ( media-libs/libshout )
-		skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 )
-		speex? ( media-libs/speex )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		svga? ( media-libs/svgalib )
-		taglib? ( >=media-libs/taglib-1.5 )
-		theora? ( >=media-libs/libtheora-1.0_beta3 )
-		truetype? ( media-libs/freetype
-			media-fonts/dejavu )
-		twolame? ( media-sound/twolame )
-		upnp? ( net-libs/libupnp )
-		v4l2? ( libv4l2? ( media-libs/libv4l ) )
-		vcdinfo? ( >=media-video/vcdimager-0.7.22 )
-		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 )
-		xcb? ( >=x11-libs/libxcb-1.1.90.1 x11-libs/xcb-util )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-# Disabled features and reasons:
-# xvmc? ( x11-libs/libXvMC )
-#	Will probably compile only on x86
-
-DEPEND="${RDEPEND}
-	dvb? ( sys-kernel/linux-headers )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
-	X? ( xinerama? ( x11-proto/xineramaproto ) )
-	xcb? ( x11-proto/xproto )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-# Displays a warning if the first use flag is set but the second is not
-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
-}
-
-pkg_setup() {
-	if has_version '<=media-video/vlc-0.9.9999'; then
-		eerror "Please unmerge vlc-0.9.x first before installing ${P}"
-		eerror "If you don't do that, some plugins will get linked against"
-		eerror "the old ${PN} version and will not work."
-		die "Unmerge vlc 0.9.x first"
-	fi
-	vlc_use_needs skins truetype
-	vlc_use_force skins qt4
-	vlc_use_needs cddax cdio
-	vlc_use_needs vcdx cdio
-	vlc_use_needs vcdx vcdinfo
-	vlc_use_needs vcdinfo cdio
-	vlc_use_needs bidi truetype
-	vlc_use_force remoteosd gcrypt
-	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
-	vlc_use_needs libtiger kate
-	use cddb && use !cdda && use !cddax && ewarn "USE=cddb requires either cdda or cddax, cddb will be disabled."
-	if use qt4 || use skins ; then
-		qt4_pkg_setup
-	else
-		ewarn "You have disabled the qt4 useflag, ${PN} will not have any"
-		ewarn "graphical interface. Maybe that is not what you want..."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_unpack
-	fi
-}
-src_prepare() {
-	if [ "${PV%9999}" != "${PV}" ] ; then
-		git_src_prepare
-	fi
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4 ${WORKDIR}/${PN}-m4" eautoreconf
-}
-
-src_configure() {
-
-	# It would fail if -fforce-addr is used due to too few registers...
-	use x86 && filter-flags -fforce-addr
-
-	local MOZILLA_PC
-
-	if use nsplugin; then
-		if use seamonkey; then
-			MOZILLA_PC=seamonkey-plugin
-		else
-			if has_version 'net-libs/xulrunner:1.9' ; then
-				MOZILLA_PC=libxul
-			else
-				MOZILLA_PC=xulrunner-plugin
-			fi
-		fi
-	fi
-
-	econf \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		--disable-asademux \
-		$(use_enable atmo) \
-		$(use_enable avahi bonjour) \
-		$(use_enable bidi fribidi) \
-		$(use_enable cdda vcd) \
-		$(use_enable 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) \
-		$(use_enable dvb) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable fbcon fb) \
-		$(use_enable ffmpeg avcodec) $(use_enable ffmpeg avformat) $(use_enable ffmpeg swscale) $(use_enable ffmpeg postproc) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable ggi) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable hal) \
-		$(use_enable httpd) \
-		$(use_enable id3tag) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable libnotify notify) \
-		$(use_enable libproxy) \
-		--disable-libtar \
-		$(use_enable libtiger tiger) \
-		$(use_enable libsysfs) \
-		$(use_enable libv4l2) \
-		$(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 mtp) \
-		$(use_enable musepack mpc) \
-		$(use_enable ncurses) \
-		$(use_enable nsplugin mozilla) --with-mozilla-pkg="${MOZILLA_PC}" \
-		$(use_enable ogg) \
-		$(use_enable opengl glx) $(use_enable opengl) $(use_enable opengl galaktos) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable oss) \
-		$(use_enable pda) \
-		$(use_enable png) \
-		--disable-portaudio \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smb) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shine) \
-		$(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 vcdinfo) \
-		$(use_enable vcdx) \
-		$(use_enable vorbis) \
-		$(use_enable win32codecs loader) \
-		$(use_enable wma-fixed) \
-		$(use_enable X x11) $(use_enable X screen) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xinerama) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		--disable-xvmc \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--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)
-}
-
-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
-}