remove old

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

4 files changed, 9 insertions, 749 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index ea8ca0d75412..103c9ec58d36 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.618 2010/08/28 14:52:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.619 2010/08/28 14:54:29 aballier Exp $
+
+  28 Aug 2010; Alexis Ballier <aballier@gentoo.org> -vlc-1.1.2.ebuild,
+  -vlc-1.1.3.ebuild:
+  remove old
 
 *vlc-1.1.4 (28 Aug 2010)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 76d06da59400..741212703146 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,25 +2,21 @@
 Hash: SHA1
 
 DIST vlc-1.0.6.tar.bz2 22149704 RMD160 2185eb418748f2aadfce5e61b7a9de66a62ef2d1 SHA1 834346a84a71d915440b7741e04b6e02de451786 SHA256 f521933e7a1021746d8ecde6caa2f9d1b43187ab2e13df6abc07540e415e1842
-DIST vlc-1.1.2.tar.bz2 23445745 RMD160 55ba0dc3670194fda265c1db009242f8e7fa90c3 SHA1 b19b2d509785ae5e92a8db045e4641c9632dea74 SHA256 db95e8667534e44f26c053e9f3f470d37c06d5ece10d2645cf2f7c25880a33f7
-DIST vlc-1.1.3.tar.bz2 23887407 RMD160 5c11f485b03d429124c8c6f7fd61d975e016a368 SHA1 7dc8a8ea2284800d762f4a00b675474684a04e30 SHA256 128c31f8c5cebbc947c2cf337cfb1877350f7e282826c76dc69e1218765e83e5
 DIST vlc-1.1.4.tar.bz2 23923550 RMD160 9ea0fa94f46bc9624e1314423f4bc6d3d20c8c4f SHA1 2c4f85fbccbd11946cb4b2cf94464e5db38db78a SHA256 0951493d27af3f950ed57ff123d9cb17ed1d17c8ae51741d3a90f4973af397d7
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-83.tar.bz2 9277 RMD160 b585a84187f42c3e5cb557e6d752ffde26585506 SHA1 91bcd66f3b393202153595e8c44926cc051d7451 SHA256 c3c2b7841bde69762feed36758d95ccd5cc0ee390310cfad91bbfa3bca72b1e3
 DIST vlc-patches-86.tar.bz2 3359 RMD160 29db216fa1424db0ad5cb0a129b01d01ab08141b SHA1 54189fbcbd5936a4cc85fe544031573397d1c875 SHA256 5ecb52004876a90600a1886976c5ed2b3582a2e7f0dd7ad9bc33792015c7d11c
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 EBUILD vlc-1.0.6.ebuild 12224 RMD160 5a6b842122fb912a688c23e23dd8aaff77d1532c SHA1 2dd9d563450ae53fd833fc4d6de9ddda288d41ec SHA256 a451ef21f95174ee1bbd78526c233d7c414efe64e66dca5b487089921d6f3055
-EBUILD vlc-1.1.2.ebuild 11919 RMD160 013b3706ed4c89ec6e0aa0dcaf5e8c01733dbc8b SHA1 5e2db546ece1931f86756787c9d48466d2e1af94 SHA256 159acc10367f53651c2347154e08750d93d203e11aa4cb6c5fe36abaab69fb97
-EBUILD vlc-1.1.3.ebuild 11919 RMD160 8a9d666ab7cbecd5e982e44d964e0ac1a4338433 SHA1 7ca77fad83c4999be7c61920bcde9e56e4595517 SHA256 7c9fd209de688738a5f1e75327bbfe424b9394afa8195945b8fd75fa298faa47
 EBUILD vlc-1.1.4.ebuild 11919 RMD160 154dc3b6628d0a7ce4447b25ea6e8fe9941d851c SHA1 fd834a04adda47457ced4012c66918447898ded0 SHA256 40c2e9b6c07e6c59102e28c447b3a29535c2dc24db711eec7c8618d30beaea19
 EBUILD vlc-1.1.9999.ebuild 11935 RMD160 11ddb0a3231f75a652a99482d2bb764be89f3c7a SHA1 b9ad0ab820a5373e5be89e74d377476d8ba35b75 SHA256 efcef38b79484481246df072e8784c37066f47fa2bd35f761f8c9fa9277811d8
 EBUILD vlc-9999.ebuild 11599 RMD160 a6d5418ffe313e084384d00f6e920c03660c20cd SHA1 77f2d0120aa2668bbe446868a52f6c9a74c6ddb9 SHA256 bed8d867771259d90d0ed05db5bf07541020e226fdeaf9a4a9c1c3a2610d6921
-MISC ChangeLog 95244 RMD160 0bb8756301c3c23d6d772e40ae91dcbcb7e7adde SHA1 1b79d74f622b08c6d1bb7d5da92b899db0cd26e7 SHA256 d1d56e147bfc81bed3d89c494ec53f842bd3c6cb4df87f29ea193ca315b19571
+MISC ChangeLog 95350 RMD160 f94e9f902f16c9bf0195c3d0fab2406fd1dc79e4 SHA1 eab235a5aca4941e6021f3ba4e534dcdde2dc025 SHA256 6143d463d062e33e64bc5db41ee3a0475d62fc8802966e15aae62c36c6adc557
 MISC metadata.xml 4410 RMD160 a45aa6995938c863a9f9c351471392fd91d88119 SHA1 36bb27e88806dea7926b3965fb14afcdbfe5653c SHA256 7e240147c0cffdb48ac2736144e6064396c765d1627ff22c1d4fac6f2b6473a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx5IswACgkQvFcC4BYPU0pH6wCgyOhR1KXdRUn2BeZsLVXAZDDg
-2tAAoI5PpUIwb7u2K5WQU5QIIJ5MwTJG
-=kUSy
+iEYEARECAAYFAkx5IyoACgkQvFcC4BYPU0oJAwCdGtlVEZQyg3SeH9yOPpw+EL19
+2i8An3TPO3rc7eXMeS5OKbkLgpYvZyYi
+=N48j
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.2.ebuild b/media-video/vlc/vlc-1.1.2.ebuild
deleted file mode 100644
index 4f85a94efb27..000000000000
--- a/media-video/vlc/vlc-1.1.2.ebuild
+++ /dev/null
@@ -1,370 +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.1.2.ebuild,v 1.1 2010/08/02 05:04:43 aballier Exp $
-
-EAPI="3"
-
-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="88"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
-	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
-	+gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
-	libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
-	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
-	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
-	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
-	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
-		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[dbus] )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB sys-libs/zlib )
-		dts? ( media-libs/libdca )
-		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
-		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 >=dev-libs/libgcrypt-1.2.0 )
-		id3tag? ( media-libs/libid3tag sys-libs/zlib )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-		libnotify? ( x11-libs/libnotify )
-		libproxy? ( net-libs/libproxy )
-		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-0.8.8.1 )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		musepack? ( >=media-sound/musepack-tools-444 )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl x11-libs/libX11[xcb] )
-		png? ( media-libs/libpng sys-libs/zlib )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
-			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
-		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 sys-libs/zlib	) )
-		shout? ( media-libs/libshout )
-		skins? (
-				x11-libs/qt-gui:4 x11-libs/qt-core:4
-				x11-libs/libXext x11-libs/libX11
-				media-libs/freetype media-fonts/dejavu
-			   )
-		speex? ( media-libs/speex )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		svga? ( media-libs/svgalib )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		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 ) )
-		v4l? ( libv4l? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
-		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
-		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
-		X? ( x11-libs/libX11 )
-		x264? ( >=media-libs/x264-0.0.20090923 )
-		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	!!<=media-video/vlc-1.0.99999
-	dvb? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
-	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 $1 depends strictly on $2
-# if use $1 then enable $2
-vlc_use_enable_force() {
-	use $1 && echo "--enable-$2"
-}
-
-pkg_setup() {
-	# Useflags we need to forcefuly enable
-	vlc_use_force remoteosd gcrypt
-	vlc_use_force gnutls gcrypt
-	vlc_use_force skins truetype
-	vlc_use_force skins qt4
-	vlc_use_force vlm stream
-	vlc_use_force vaapi ffmpeg
-	vlc_use_force nsplugin xcb
-
-	# Useflags that will be automagically discarded if deps are not met
-	vlc_use_needs bidi truetype
-	vlc_use_needs cddb cdda
-	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
-	vlc_use_needs libv4l v4l
-	vlc_use_needs libtiger kate
-	vlc_use_needs xv xcb
-
-	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"
-	eautoreconf
-}
-
-src_configure() {
-
-	# It would fail if -fforce-addr is used due to too few registers...
-	use x86 && filter-flags -fforce-addr
-
-	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 cddb libcddb) \
-		$(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 httpd) \
-		$(use_enable id3tag) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(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 libv4l) \
-		$(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=libxul \
-		$(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 projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable remoteosd) \
-		$(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 sqlite) \
-		$(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 vcdx) \
-		$(use_enable vaapi libva) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable win32codecs loader) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-optimizations \
-		--enable-fast-install \
-		$(vlc_use_enable_force vlm sout) \
-		$(vlc_use_enable_force skins qt4) \
-		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force remoteosd libgcrypt) \
-		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec) \
-		$(vlc_use_enable_force nsplugin xcb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS HACKING THANKS NEWS README \
-		doc/fortunes.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"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}
diff --git a/media-video/vlc/vlc-1.1.3.ebuild b/media-video/vlc/vlc-1.1.3.ebuild
deleted file mode 100644
index b2abb80e3e5d..000000000000
--- a/media-video/vlc/vlc-1.1.3.ebuild
+++ /dev/null
@@ -1,370 +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.1.3.ebuild,v 1.1 2010/08/19 09:50:37 aballier Exp $
-
-EAPI="3"
-
-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="88"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~sparc ~x86 ~x86-fbsd"
-else
-	KEYWORDS=""
-fi
-IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
-	debug dirac directfb dts dvb dvd elibc_glibc fbcon fluidsynth +ffmpeg flac fontconfig
-	+gcrypt ggi gnome gnutls httpd id3tag ieee1394 jack kate kde libass libcaca
-	libnotify libproxy libtiger libv4l libv4l2 lirc live lua matroska mmx
-	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
-	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
-	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
-	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
-		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[dbus] )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		cdda? (	cddb? ( >=media-libs/libcddb-1.2.0 ) )
-		dbus? ( >=sys-apps/dbus-1.0.2 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 )
-		dirac? ( >=media-video/dirac-0.10.0 )
-		directfb? ( dev-libs/DirectFB sys-libs/zlib )
-		dts? ( media-libs/libdca )
-		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
-		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 >=dev-libs/libgcrypt-1.2.0 )
-		id3tag? ( media-libs/libid3tag sys-libs/zlib )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
-		kate? ( >=media-libs/libkate-0.1.1 )
-		libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig )
-		libcaca? ( >=media-libs/libcaca-0.99_beta14 )
-		libnotify? ( x11-libs/libnotify )
-		libproxy? ( net-libs/libproxy )
-		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-0.8.8.1 )
-		mp3? ( media-libs/libmad )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
-		mtp? ( >=media-libs/libmtp-1.0.0 )
-		musepack? ( >=media-sound/musepack-tools-444 )
-		ncurses? ( sys-libs/ncurses )
-		nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util )
-		ogg? ( media-libs/libogg )
-		opengl? ( virtual/opengl x11-libs/libX11[xcb] )
-		png? ( media-libs/libpng sys-libs/zlib )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
-			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
-		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 sys-libs/zlib	) )
-		shout? ( media-libs/libshout )
-		skins? (
-				x11-libs/qt-gui:4 x11-libs/qt-core:4
-				x11-libs/libXext x11-libs/libX11
-				media-libs/freetype media-fonts/dejavu
-			   )
-		speex? ( media-libs/speex )
-		sqlite? ( >=dev-db/sqlite-3.6.0:3 )
-		svg? ( >=gnome-base/librsvg-2.9.0 )
-		svga? ( media-libs/svgalib )
-		taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib )
-		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 ) )
-		v4l? ( libv4l? ( media-libs/libv4l ) )
-		vaapi? ( x11-libs/libva >=media-video/ffmpeg-0.5_p22846 )
-		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
-		vorbis? ( media-libs/libvorbis )
-		win32codecs? ( media-libs/win32codecs )
-		X? ( x11-libs/libX11 )
-		x264? ( >=media-libs/x264-0.0.20090923 )
-		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
-		xml? ( dev-libs/libxml2 )
-		xosd? ( x11-libs/xosd )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	!!<=media-video/vlc-1.0.99999
-	dvb? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
-	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 $1 depends strictly on $2
-# if use $1 then enable $2
-vlc_use_enable_force() {
-	use $1 && echo "--enable-$2"
-}
-
-pkg_setup() {
-	# Useflags we need to forcefuly enable
-	vlc_use_force remoteosd gcrypt
-	vlc_use_force gnutls gcrypt
-	vlc_use_force skins truetype
-	vlc_use_force skins qt4
-	vlc_use_force vlm stream
-	vlc_use_force vaapi ffmpeg
-	vlc_use_force nsplugin xcb
-
-	# Useflags that will be automagically discarded if deps are not met
-	vlc_use_needs bidi truetype
-	vlc_use_needs cddb cdda
-	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
-	vlc_use_needs libv4l v4l
-	vlc_use_needs libtiger kate
-	vlc_use_needs xv xcb
-
-	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"
-	eautoreconf
-}
-
-src_configure() {
-
-	# It would fail if -fforce-addr is used due to too few registers...
-	use x86 && filter-flags -fforce-addr
-
-	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 cddb libcddb) \
-		$(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 httpd) \
-		$(use_enable id3tag) \
-		$(use_enable ieee1394 dv) \
-		$(use_enable jack) \
-		$(use_enable kate) \
-		$(use_with kde kde-solid) \
-		$(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 libv4l) \
-		$(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=libxul \
-		$(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 projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr) \
-		$(use_enable qt4) \
-		$(use_enable remoteosd) \
-		$(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 sqlite) \
-		$(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 vcdx) \
-		$(use_enable vaapi libva) \
-		$(use_enable vlm) \
-		$(use_enable vorbis) \
-		$(use_enable win32codecs loader) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xosd) \
-		$(use_enable xv xvideo) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-snapshot \
-		--disable-growl \
-		--disable-optimizations \
-		--enable-fast-install \
-		$(vlc_use_enable_force vlm sout) \
-		$(vlc_use_enable_force skins qt4) \
-		$(vlc_use_enable_force skins freetype) \
-		$(vlc_use_enable_force remoteosd libgcrypt) \
-		$(vlc_use_enable_force gnutls libgcrypt) \
-		$(vlc_use_enable_force vaapi avcodec) \
-		$(vlc_use_enable_force nsplugin xcb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS HACKING THANKS NEWS README \
-		doc/fortunes.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"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
-		einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
-		"/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
-	else
-		ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
-		ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
-		ewarn "If you do not do it, vlc will take a long time to load."
-	fi
-}