remove old

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

4 files changed, 16 insertions, 779 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0a8d615984ba..2176e2946140 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.579 2010/05/04 18:57:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.580 2010/05/05 06:31:06 aballier Exp $
+
+  05 May 2010; Alexis Ballier <aballier@gentoo.org> -vlc-1.0.4.ebuild,
+  -vlc-1.0.5.ebuild:
+  remove old
 
   04 May 2010; Raúl Porcel <armin76@gentoo.org> vlc-1.0.6.ebuild:
   alpha/sparc stable wrt #316709
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 04b7695f5239..40f44eedfcc2 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,17 +1,22 @@
-DIST vlc-1.0.4.tar.bz2 21622966 RMD160 d4d9dae5dfe7d081d17197e5b94a43e54b213368 SHA1 59d99dd005f70b3442c1c44472640e10fdc15aa5 SHA256 dbff0ba0cd60a4323f85fd8b918f2a4477a11c5a8f628d1b868fb5947e8e9896
-DIST vlc-1.0.5.tar.bz2 21887131 RMD160 de50206ddce59d1487ea7d4efa8bbd37f55b928e SHA1 a2c415923850720dc4499de0b6f6dbe40e98f90f SHA256 f7f1994c936fbb8c392481a13abfd6a6b76c5aac4406fa7a78d4786dfc206dcd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842
 DIST vlc-1.1.0-pre3.tar.bz2 22760121 RMD160 66c2d40f5e8a0e7318fb95a139f7f26ee32b2d13 SHA1 c44386e10082ad7647014efbabf67d7eefdf183b SHA256 88d98be7e876d4283e33e4e5a02afab6729ceb2c3d7f92a26ce9d0c0713f7e4d
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
-DIST vlc-patches-79.tar.bz2 6483 RMD160 f4bb903049b35c411ead3d812c865ac97d42c905 SHA1 b650ae71e4a59397be5a74cb7de5101d030ee04a SHA256 c2956b049de208408d64175792c936f8fcd325bd51c21d76158ba38107dda800
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164 SHA1 0171ebafd334d71cd0b6d8ffc2fa974c91d1ff9f SHA256 ecc34d936d8f2a32b45e2a70480b551e46aaadb5e9a37e3e0423bb2a668c7fd8
-EBUILD vlc-1.0.4.ebuild 11941 RMD160 9401debb4d071980307ac583f7b8e8ea52ad8a50 SHA1 94bf1ecc7203cc3315ace8d02805018e794c9caa SHA256 d0ac3016fcef6e5fa1b943101e9e0d83d731d06da6a8d82d572d1d8e9006a3ea
-EBUILD vlc-1.0.5.ebuild 12055 RMD160 827dd3c7f1ba1bb6e7b9b1d688c11b703aa6c205 SHA1 e4d094e7986207ba5e529bdccfbe2dcb52658130 SHA256 e98a0afe4f02d9a04b4b0a629f0bcdb1d90b6d80aabda8cfc38c728a77e92afb
 EBUILD vlc-1.0.6.ebuild 12258 RMD160 d9592ed1717cf78c2b4601442d16e984f273cebd SHA1 d871acc7ac735535b286556aebca6fbc0c9a3c7a SHA256 02cc1d7007f3b92e462be08fb7ba7c4116a1a1945d6388b3426ba8a84fad6291
 EBUILD vlc-1.0.9999.ebuild 12217 RMD160 3eec1d182fa6f12894345165da6071b3f4ba5c21 SHA1 83bc5c5249a68618a85d937ad3bb7931187d0bc0 SHA256 8ac5307f2c23d9f5f996e9487f1e9a5815269ab8e670873376868f855059d059
 EBUILD vlc-1.1.0_pre3.ebuild 11847 RMD160 962e037b4b4b90776b5fa9f4cfbb34034bbdda9c SHA1 db5dbbcc0cd79310b221a7057a17f5627fbc55ca SHA256 a15a201fe61da8d05b3d729f49bd65bfe706b998fd586d8da846cbc540011106
 EBUILD vlc-1.1.9999.ebuild 11793 RMD160 51a944123258b0c77a5d26c2ed1db62981594da4 SHA1 a8eb03a6564888d561b743ee614b945c5626e86d SHA256 a9fa709e005d7eaf550ce40b26f9f3e7b1343fd2e3be4d895954d794cb3b0cff
 EBUILD vlc-9999.ebuild 11790 RMD160 a824573ae2dcc442c7be54787988f8b220675703 SHA1 2a1b5761a7586bba4c146948db121a06317ec365 SHA256 a1631a91a2b5eea69a74776dfa196e0ca3bf1c5a2008c8a97cd6a556ce32a556
-MISC ChangeLog 89542 RMD160 81d203e25bb159d1cf2adfe60f737f965042fb85 SHA1 85b5aad957abf11789df58258eded4b5415a0906 SHA256 88a9e035faf98fb9f99240db39466ee3f5e3e9bb7ab8970bb5d90b61ee609b81
+MISC ChangeLog 89649 RMD160 23278a8bcd6652147f313d2920c81a5c521a837f SHA1 145d15b7b67e451b6b8ea064fa76de71b99d08be SHA256 45dc23dbccce62651b3cdfaf75b3aa23faca7702ba669b0697444cc5a35aca57
 MISC metadata.xml 4152 RMD160 371740d72f49649ff3d8e3e9397730962c85d4a3 SHA1 69e10d0465819e595218136e1bdf6fe12f9ab099 SHA256 c5ca4cd5ddfbb0cf93c851eb9f12ac33d561cbeb8fcef9df64eb79c1f9023632
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvhELAACgkQvFcC4BYPU0q5SQCcC9qT92jqHe11j5zqBTYUUTUi
+csEAoIaeyGSokrkq4y6OzSJ7oaMC/7ph
+=MXxT
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.0.4.ebuild b/media-video/vlc/vlc-1.0.4.ebuild
deleted file mode 100644
index 9aea12b9883b..000000000000
--- a/media-video/vlc/vlc-1.0.4.ebuild
+++ /dev/null
@@ -1,385 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.4.ebuild,v 1.11 2010/04/07 16:04:46 patrick 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="79"
-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 ~arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
-	debug dirac directfb dts dvb dvd elibc_glibc 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 shine shout skins speex sse stream svg svga taglib
-	theora truetype twolame udev 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/libdvdnav-0.1.9
-				media-libs/libdvdplay )
-		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		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 )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt	<net-libs/xulrunner-1.9.2 )
-		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 x11-libs/libX11 )
-		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
-			 <net-fs/samba-3.4 ) )
-		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 x11-libs/libXext x11-libs/libX11 )
-		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 )
-		udev? ( >=sys-fs/udev-142 )
-		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 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 has_version 'net-libs/xulrunner:1.9' ; then
-			MOZILLA_PC=libxul
-		else
-			MOZILLA_PC=xulrunner-plugin
-		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 udev) \
-		$(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
-}
diff --git a/media-video/vlc/vlc-1.0.5.ebuild b/media-video/vlc/vlc-1.0.5.ebuild
deleted file mode 100644
index fdd43d66e963..000000000000
--- a/media-video/vlc/vlc-1.0.5.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.0.5.ebuild,v 1.7 2010/04/18 17:48:01 pacho Exp $
-
-EAPI="2"
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=git
-	EGIT_BOOTSTRAP="bootstrap"
-	EGIT_BRANCH=master
-	EGIT_PROJECT=${P}
-	if [ "${PV%.9999}" != "${PV}" ] ; then
-		EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="git://git.videolan.org/vlc.git"
-	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="83"
-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 ~arm ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddax cddb cdio dbus dc1394
-	debug dirac directfb dts dvb dvd elibc_glibc 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 shine shout skins speex sse stream svg svga taglib
-	theora truetype twolame udev 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/libdvdnav-0.1.9
-				media-libs/libdvdplay )
-		elibc_glibc? ( >=sys-libs/glibc-2.8 )
-		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 )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.8 x11-libs/libXpm x11-libs/libXt )
-		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 x11-libs/libX11 )
-		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
-		samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
-			 <net-fs/samba-3.4 ) )
-		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 x11-libs/libXext x11-libs/libX11 )
-		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 )
-		udev? ( >=sys-fs/udev-142 )
-		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 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
-
-	has_version '>=net-libs/xulrunner-1.9.2' || EPATCH_EXCLUDE="550_all_xulrunner192.patch"
-	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 has_version 'net-libs/xulrunner:1.9' ; then
-			MOZILLA_PC=libxul
-		else
-			MOZILLA_PC=xulrunner-plugin
-		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 udev) \
-		$(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
-}