remove old

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

5 files changed, 18 insertions, 410 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 3fb3193ca61c..2213bba9203a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.348 2008/06/28 10:33:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.349 2008/06/29 11:07:06 aballier Exp $
+
+  29 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch,
+  -files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch,
+  -vlc-0.9.0_alpha20080524.ebuild:
+  remove old
 
   28 Jun 2008; Alexis Ballier <aballier@gentoo.org>
   vlc-0.9.0_alpha20080625.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a66998ce502a..2d3ae122da1f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,17 +1,22 @@
-AUX 0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch 1014 RMD160 a7188dd01901e5bab87a80e45ff3a574837fceb3 SHA1 12b76264b0e9ccd75ac4c5a42768d79bdd3a508c SHA256 c0a783a36a8da72be65c3da249663046df4cee8d75b53a355ac0b0e411680a5d
-AUX 0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch 872 RMD160 4d10d035d37266d5d81dd97353fe078859131932 SHA1 08f9f9bc176c84ee565a0d8570752a8c5fbc4876 SHA256 1cdb557f88580e8614ea7fe78e94f6778c2b1f4df68db0f68b078bda9b650c63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-0.8.6g.tar.bz2 11680440 RMD160 f4a7e7650a1d1d7be7c581a54a5771dece0bcb6b SHA1 6dab0e1593607d3a1ee585ba009b99627477f467 SHA256 3054e7278ac2dcb061f2268fcff8c2bc37b22be537cc01c19882e9a96eaeb18e
 DIST vlc-0.8.6h.tar.bz2 11762435 RMD160 943c1b2d02de3515d287eeb10f2ac755dbe2d762 SHA1 142ff3362e46681ee2ace6276c4add5905d210ca SHA256 50ed87c869228274043b7fa468f908fe6ee571196510177593c701d99b357221
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-53.tar.bz2 9737 RMD160 dfbc11984c21c2bfe31bd77c813415fa04b10204 SHA1 1726c2bd17539c076fc4baa2d9611a4b39abab39 SHA256 dd2558049044701a60bdf2c30a6a716e009a6c4c180a54ea848a1de105e00ca5
-DIST vlc-patches-54.tar.bz2 6407 RMD160 6e3d667c178e38502ca87fb746c322b45fead777 SHA1 d5f684488e52848fc5ec426830d999f36164d782 SHA256 9cb7707090773712a99bc14734e0fb3b0ffe8d950b068505890133936e89299d
 DIST vlc-patches-55.tar.bz2 8111 RMD160 66eb8d34bc39f6b5c408e7f66b2868ad848031ef SHA1 723c02a0113e836d9b604d7a9380a0125f64e1d5 SHA256 11626cce5d2c15780a812f067ec45d582b06cc1dc205f5b897c666f711b583db
 DIST vlc-patches-56.tar.bz2 5736 RMD160 fbda37e0662e89c0452c28ea6a369e27f7b2f04f SHA1 06cc90f7ca5cf8754623ce0608d3c721f04c7b8c SHA256 6b968adf43c66f472013c7fb141595ba414291aa45c0800c8afdf4a260a11296
-DIST vlc-snapshot-20080524.tar.bz2 14995898 RMD160 2efab8de6b75f05deee9bfcc864bace2f513ef1d SHA1 7de7e8056971057871c458083b944b3226fd1148 SHA256 0219bf8e5e5f7bf2acf4c95c0a7f8af81858eece6ad14673fe7836245d67b86f
 DIST vlc-snapshot-20080625.tar.bz2 15158559 RMD160 19caabbfce71ff5efcf5302488827a4021d3ca4f SHA1 7c61096fd2ad9a6711841ede4126e37591e70b43 SHA256 fdad2b8561de5a23e7120c94b30ad8833973accd7a0dd4000c0b3e3aac308895
 EBUILD vlc-0.8.6g.ebuild 9086 RMD160 97f2951ccb49c282d68f6bbad2b1b9c43bf475cf SHA1 d3528f8373cea598576af21661969319d7a4690c SHA256 6d9338668490b13da61365e8856f4b749419dd90d135ca22970b3c4b4c93cb47
 EBUILD vlc-0.8.6h.ebuild 8989 RMD160 3f08b80bdc96d6ab57f5d5869949bf18f3a4c915 SHA1 2b9b6a353c7b467bb5468ec6770dfdb62638269b SHA256 eabf234909dfb3f9bbc36993839c00039282847cfdc580bd88ac4f6ae31cfce8
-EBUILD vlc-0.9.0_alpha20080524.ebuild 10403 RMD160 3b0a5623ea9eab1ffa09cded8635709b5fadd0d6 SHA1 cd48afdffe74a85c0d8192ba23c687a3d7c71de1 SHA256 70360ce22d82ff852a8ee034c751dfcf40d7b83515397fad3f7b7470366684c1
 EBUILD vlc-0.9.0_alpha20080625.ebuild 10397 RMD160 198f3050241ca26f781409d1a3c8b7c173d4bdde SHA1 2aa87a37678a1c8c68bb2f7f6b49706b9a65c873 SHA256 02b4dd386a239eaeafd736f144b3ce4a0bff6321e8c5c2c08dfa2599c5c9664f
-MISC ChangeLog 58243 RMD160 f6b28d0ce548c38e1a72f8e220b1f70982354f9a SHA1 8ad8ac42c779d694f1353b935a6fdaa7c91e83ce SHA256 fe1676fb10961ca73c9064f4d425af03f051a26f95b6be7f43cda943ca4cdbfa
+MISC ChangeLog 58492 RMD160 cd6c5fa8ab267efba9eccf5f91ffbb5ceb8b622c SHA1 389b1c90bd069717f3821c441d273abe1382f202 SHA256 e660c3c04beaeed166ef7e4e66003b0dd9a590902c787201a3912c25881e0075
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhnbOQACgkQvFcC4BYPU0rRnACeL7tpL9QHfKnPzXZZ7eXS7mtK
+kqsAoLYch60YhQPWv/qHNPVJCfaySQL0
+=bTT5
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch b/media-video/vlc/files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch
deleted file mode 100644
index 3331a914cfd3..000000000000
--- a/media-video/vlc/files/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 8e52e60b3fe3c9f416cbef521367f9e7259c2ed6 Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Sat, 31 May 2008 10:14:02 +0200
-Subject: [PATCH] Include altivec.h before any other vlc header as including it after stdbool will cause compile failures as pointed by Mike Frysinger in https://bugs.gentoo.org/show_bug.cgi?id=224289
-
----
- modules/video_filter/deinterlace.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
-index 5dc4eeb..e65a7df 100644
---- a/modules/video_filter/deinterlace.c
-+++ b/modules/video_filter/deinterlace.c
-@@ -30,16 +30,16 @@
- # include "config.h"
- #endif
- 
-+#ifdef HAVE_ALTIVEC_H
-+#   include <altivec.h>
-+#endif
-+
- #include <vlc/vlc.h>
- #include <vlc_plugin.h>
- #include <vlc_vout.h>
- #include <vlc_sout.h>
- #include "vlc_filter.h"
- 
--#ifdef HAVE_ALTIVEC_H
--#   include <altivec.h>
--#endif
--
- #ifdef CAN_COMPILE_MMXEXT
- #   include "mmx.h"
- #endif
--- 
-1.5.5.1
-
diff --git a/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch b/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch
deleted file mode 100644
index c30d5732f8c1..000000000000
--- a/media-video/vlc/files/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b41bc1645bcb2f3942e57ff19e4791a1f892de7a Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Sat, 31 May 2008 11:17:56 +0200
-Subject: [PATCH] Explicitly check for and link to libavutil since av_free and friends are used in the ffmpeg plugin and after r13528 ffmpeg's .pc files do not tell anymore to link needlessly to its private library requirements.
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2aa5359..e03cac8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3000,7 +3000,7 @@ if test "${enable_ffmpeg}" != "no"
- then
- 
- dnl Trying with pkg-config
--   PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
-+   PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat, libavutil],
-     [
-      VLC_SAVE_FLAGS
-      CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}"
--- 
-1.5.5.3
-
diff --git a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild b/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild
deleted file mode 100644
index 83a0fb809251..000000000000
--- a/media-video/vlc/vlc-0.9.0_alpha20080524.ebuild
+++ /dev/null
@@ -1,341 +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_alpha20080524.ebuild,v 1.4 2008/05/31 09:48:56 aballier Exp $
-
-EAPI="1"
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit eutils wxwidgets 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="0021"
-
-RESTRICT="test"
-
-PATCHLEVEL="54"
-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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="3dfx a52 aac aalib alsa altivec arts atmo avahi bidi cdda cddb cdio dbus dc1394
-	debug directfb dts dvb dvd esd fbcon fluidsynth +ffmpeg flac ggi gnome gnutls hal httpd
-	id3tag jack libcaca libnotify lirc live lua matroska mmx modplug mp3 mpeg
-	musepack musicbrainz ncurses nsplugin ogg opengl optimisememory oss png pulseaudio pvr qt4
-	rtsp samba sdl sdl-image seamonkey shout skins speex sse stream svg svga taglib
-	theora truetype twolame upnp v4l v4l2 vcd vcdx vlm vorbis win32codecs wxwindows
-	X x264 xinerama xml xosd xulrunner xv"
-
-RDEPEND="
-		sys-libs/zlib
-		media-libs/libdvbpsi
-		3dfx? ( media-libs/glide-v3 )
-		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 )
-		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_p20050226-r1 )
-		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 >=dev-libs/libgcrypt-1.2.0 )
-		hal? ( sys-apps/hal )
-		id3tag? ( media-libs/libid3tag
-			sys-libs/zlib )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		libcaca? ( media-libs/libcaca )
-		libnotify? ( x11-libs/libnotify )
-		lirc? ( app-misc/lirc )
-		live? ( >=media-plugins/live-2007.02.20 )
-		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.2.0:4 ) )
-		samba? ( net-fs/samba )
-		sdl? ( >=media-libs/libsdl-1.2.8
-			sdl-image? ( media-libs/sdl-image ) )
-		shout? ( media-libs/libshout )
-		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 )
-		wxwindows? ( =x11-libs/wxGTK-2.8* )
-		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
-# dirac? ( >=media-video/dirac-0.9.0 )
-#	Needs testing but can be ok
-# 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."
-}
-
-pkg_setup() {
-	if use wxwindows; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
-	fi
-	vlc_use_needs skins truetype
-	vlc_use_needs skins wxwindows
-	vlc_use_needs cdda cdio
-	vlc_use_needs vcdx cdio
-	vlc_use_needs bidi truetype
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}/0001-Include-altivec.h-before-any-other-vlc-header-as-inc.patch"
-	epatch "${FILESDIR}/0002-Explicitly-check-for-and-link-to-libavutil-since-av_.patch"
-	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=""
-
-	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
-
-	econf \
-		$(use_enable 3dfx glide) \
-		$(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) \
-		--disable-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) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		--disable-galaktos \
-		$(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 libcaca caca) \
-		$(use_enable gnutls libgcrypt) \
-		$(use_enable libnotify notify) \
-		--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 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 sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable sse) \
-		--enable-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 wxwindows wxwidgets) WX_CONFIG="${WX_CONFIG}" \
-		$(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 \
-		${myconf} || die "configuration failed"
-
-	# Reminder to re-add this when disabling it will not be broken
-	# $(use_enable stream sout) \
-
-	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
-}