remove versions affected by bug #182389

(Portage version: 2.1.3_rc6)

5 files changed, 5 insertions, 634 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b9f5be1adc6d..fbf31ddaccb3 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.253 2007/07/02 15:24:47 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.254 2007/07/02 21:46:17 aballier Exp $
+
+  02 Jul 2007; Alexis Ballier <aballier@gentoo.org> -vlc-0.8.6-r1.ebuild,
+  -vlc-0.8.6b.ebuild:
+  remove versions affected by bug #182389
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> vlc-0.8.6-r1.ebuild:
   (QA) RESTRICT clean up.
diff --git a/media-video/vlc/files/digest-vlc-0.8.6-r1 b/media-video/vlc/files/digest-vlc-0.8.6-r1
deleted file mode 100644
index a845e9e19e97..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.6-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 77a275f3408c4c9feae451d4eae47f89 vlc-0.8.6.tar.bz2 10506025
-RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d vlc-0.8.6.tar.bz2 10506025
-SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 vlc-0.8.6.tar.bz2 10506025
-MD5 9d386a90a1a2c975ae2a2d609785751c vlc-patches-38.tar.bz2 11402
-RMD160 647b92b86823bdf2ed1e3ba40457aa892154bcbb vlc-patches-38.tar.bz2 11402
-SHA256 17174e05fb41aac4607e84b075e91e8375bb2d59a114916ca6ecaea6b885da0c vlc-patches-38.tar.bz2 11402
diff --git a/media-video/vlc/files/digest-vlc-0.8.6b b/media-video/vlc/files/digest-vlc-0.8.6b
deleted file mode 100644
index 6d40572c306b..000000000000
--- a/media-video/vlc/files/digest-vlc-0.8.6b
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 eef8e95e34a3e0d2414b080cb7a1f749 vlc-0.8.6b.tar.bz2 10479890
-RMD160 568b4d8860d0d5def2655cd278142ba8915ca0cb vlc-0.8.6b.tar.bz2 10479890
-SHA256 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377 vlc-0.8.6b.tar.bz2 10479890
-MD5 6216343ac13af1f43c44cf5241295c4a vlc-patches-41.tar.bz2 11926
-RMD160 c395422359abf9b99f7da80d8b47c8e269d80a10 vlc-patches-41.tar.bz2 11926
-SHA256 df162c2965844e0f3bacad4952ff41377566ae543a3f31b2fe1cdd33fc3e8a9c vlc-patches-41.tar.bz2 11926
diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild
deleted file mode 100644
index b8b0ee2e72e4..000000000000
--- a/media-video/vlc/vlc-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.26 2007/07/02 15:24:47 peper Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit autotools eutils flag-o-matic gnome2 multilib nsplugins toolchain-funcs wxwidgets
-
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-
-PATCHLEVEL="38"
-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_PV}/${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 ~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 mod speex shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
-optimisememory libnotify musepack"
-
-RDEPEND="
-		>=media-video/ffmpeg-0.4.9_p20050226-r1
-		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.8.0 )
-		mp3? ( media-libs/libmad )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( >=media-libs/libdts-0.0.2-r3 )
-		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.2-r1 )
-		skins? ( >=x11-libs/wxGTK-2.6.2-r1
-			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 )
-		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 )
-		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-7 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-libs/libupnp )
-		nsplugin? (
-			!seamonkey? ( www-client/mozilla-firefox )
-			seamonkey? ( www-client/seamonkey )
-		)
-		musepack? ( media-libs/libmpcdec )
-		libnotify? ( x11-libs/libnotify )"
-
-DEPEND="${RDEPEND}
-	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
-	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}"
-
-	has_version '>=dev-libs/libcdio-0.78' || \
-		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-
-	# Replace install-sh with libtool's copy
-	cp /usr/share/libtool/install-sh "${S}/autotools"
-}
-
-src_compile () {
-	local XPIDL=""
-	local MOZILLA_CONFIG=""
-	replace-flags -O0 -O1
-
-	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
-
-	if use nsplugin; then
-		if use seamonkey; then
-			XPIDL=/usr/lib/seamonkey
-			MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
-		else
-			XPIDL=/usr/lib/mozilla-firefox
-			MOZILLA_CONFIG=/usr/lib/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 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 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 musepack mpc) \
-		--enable-ffmpeg \
-		--disable-faad \
-		--disable-jack \
-		--disable-dv \
-		--disable-libvc1 \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-pth \
-		--disable-portaudio \
-		--disable-x264 \
-		--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.6b.ebuild b/media-video/vlc/vlc-0.8.6b.ebuild
deleted file mode 100644
index 7798d128643a..000000000000
--- a/media-video/vlc/vlc-0.8.6b.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6b.ebuild,v 1.10 2007/06/07 23:00:20 angelos 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="41"
-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 mod speex shout rtsp
-win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
-optimisememory libnotify jack musepack x264 dc1394"
-
-RDEPEND="
-		>=media-video/ffmpeg-0.4.9_p20050226-r1
-		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.8.0 )
-		mp3? ( media-libs/libmad )
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		dts? ( || (  >=media-libs/libdts-0.0.2-r3 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.2-r1 )
-		skins? ( >=x11-libs/wxGTK-2.6.2-r1
-			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 )
-		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 )
-		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-7 )
-			opengl? ( virtual/opengl )
-		)
-		directfb? ( dev-libs/DirectFB )
-		upnp? ( net-libs/libupnp )
-		nsplugin? (
-			!seamonkey? ( www-client/mozilla-firefox )
-			seamonkey? ( www-client/seamonkey )
-		)
-		libnotify? ( x11-libs/libnotify )
-		musepack? ( media-libs/libmpcdec )
-		x264? ( >=media-libs/x264-svn-20061014 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		dc1394? ( sys-libs/libraw1394
-			<media-libs/libdc1394-1.9.99 )"
-
-DEPEND="${RDEPEND}
-	X? ( xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) ) )
-	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}"
-
-	has_version '>=dev-libs/libcdio-0.78' || \
-		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
-
-	# Drop patches that have been merged
-	EPATCH_EXCLUDE="${EPATCH_EXCLUDE} 260_all_format-string-sa23592.patch
-	270_all_libtar-automagic.patch 280_all_sdl-image-automagic.patch
-	300_all_fullscreen_amd64.patch"
-
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	AT_M4DIR="m4" eautoreconf
-
-	# Replace install-sh with libtool's copy
-	cp /usr/share/libtool/install-sh "${S}/autotools"
-}
-
-src_compile () {
-	local XPIDL=""
-	local MOZILLA_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
-
-	if use nsplugin; then
-		if use seamonkey; then
-			XPIDL=/usr/lib/seamonkey
-			MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
-		else
-			XPIDL=/usr/lib/mozilla-firefox
-			MOZILLA_CONFIG=/usr/lib/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 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 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) \
-		--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"
-}