remove old

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

4 files changed, 11 insertions, 780 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index c45c90b9949d..87aec576e507 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.763 2011/12/21 16:45:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.764 2011/12/26 16:24:36 aballier Exp $
+
+  26 Dec 2011; Alexis Ballier <aballier@gentoo.org> -vlc-1.1.12-r1.ebuild,
+  -vlc-1.1.12-r2.ebuild:
+  remove old
 
   21 Dec 2011; Agostino Sarubbo <ago@gentoo.org> vlc-1.1.13.ebuild:
   Stable for X86, wrt security bug #395543
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1fdc88ebf3e2..bc3c69816da6 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,32 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST vlc-1.1.12.tar.bz2 26220996 RMD160 117530abc8bd3f38d9233b7a7c91a3aaa17af87c SHA1 b39de66711a33746ce12f16a50e41d3def7b1452 SHA256 6dc50d27d25a0fab55b66f9ae3aa4001082d2d86b96b0491a8dab35423be1a68
 DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
 DIST vlc-1.2.0-pre1.tar.xz 16899100 RMD160 82f49619606bba26214b7c7206d0e592ec94f9bd SHA1 72b38f2c97cad4f143b16a2891f083bfab5b5174 SHA256 263bd69c5b0cf3b363d10896f373d6dc8b78feb208d51bcbc0d7260ef507ebc0
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
-DIST vlc-patches-102.tar.bz2 4286 RMD160 c8d693d88e231fe8ff5257be296f967ce592d91b SHA1 83471b1df166dfb6c1faaa6d4120c09ab7d9b9fd SHA256 649d10cb9ddb604468b05dfaa9bc0ce22af906f04e744ec671fc76472ac622be
-DIST vlc-patches-103.tar.bz2 4610 RMD160 db486b668e5c98e4c46f7cb8eac60b9fb7696446 SHA1 bb329088a1b73de4eff59399bd66b2d145ab59f3 SHA256 5019bb3cc49621b3186079d05a63a191c3e8c69b6b9221ea015932d8e02b443e
 DIST vlc-patches-104.tar.bz2 3839 RMD160 bde7bd345b8082a82382f8c874d7ec2a9151382e SHA1 85729ea0889de759d8476c9571c2680fd31b588c SHA256 cb019bdea9ea95b7bbe2d2ef1194d276e93e1cf0e4e62403e80698c785f1a1ec
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
-EBUILD vlc-1.1.12-r1.ebuild 12526 RMD160 5fe9127e4e05cf2f41842c3a1168d081f8aca5ce SHA1 16a4cd0cfcdd2678433543066ea0fe6f76a3d08b SHA256 d51e5954374008de27e24c76c81c5b780f9ede9545eb8b9dab014e53f7867d84
-EBUILD vlc-1.1.12-r2.ebuild 12464 RMD160 5a0ce515a048022bd25770112c770622ab46f057 SHA1 34bb426ef1f317999c6a5e1b1182c22933b3a5d4 SHA256 ce8072040c30fd4cb943a6311ef46381a7f58b01ff06580628f7d29732dcbc1d
 EBUILD vlc-1.1.12.ebuild 12443 RMD160 0f7d8e6fa9e24cf498e881a8365182702ab3356a SHA1 c2efc5e3ed66ceeea7c7fcc81a8666c1bd3da892 SHA256 8a3f7629154a5f8bba332a7d92156380abe1d2ba8a59865303fbf3ab34e317d4
 EBUILD vlc-1.1.13.ebuild 12193 RMD160 67133ebf8edfe8d2f710cd30fa8931286d2a0564 SHA1 73786a5c0f4af26c13c0039203cef1944280abb4 SHA256 9c43d16d772ae7eea0286e0e95dc698fdccfabc423b7333e27aa86f9a10eb583
 EBUILD vlc-1.1.9999.ebuild 12203 RMD160 c01bd4a095afb95e134d0381c0a607d95c02a5c6 SHA1 260af6ab266b05e9cd9ee4f7650dea7b997b056d SHA256 613280dc3e31ede0759666fa39169e3bae7c9bc8d58941bfa59599e368e85212
 EBUILD vlc-1.2.0_pre1.ebuild 10912 RMD160 0fb3eefdff4f1d858549369ecbce7aed35a5efe2 SHA1 54fd68119c40a1be0faf9076809ca79e193944c7 SHA256 6fc3a47415476e1b76d775b7c9db0bfc3b725f99b6a11283d3b22835ad51a74a
 EBUILD vlc-1.2.9999.ebuild 10919 RMD160 9119fbf3a03f90b46e1714388f5c01ef7d9f1c7d SHA1 97cd3995117b06e6a2a443d103561765b0747e10 SHA256 0ba93df71ad36b63e2ffb0c0aebe266100ae8ca584f0e27a2fa833d8da3b464b
 EBUILD vlc-9999.ebuild 10917 RMD160 f23f6fb0bf672361b674ddc2bcb2f9111f8cb173 SHA1 6dba975e44b69f95c6ad4ddf6d63258f7f5a3b00 SHA256 a75d591df2a956c482e159f3025e0f7a3c43725a2b89f0dc25fd06834855638e
-MISC ChangeLog 113442 RMD160 3effe502f544a6eb953402c99b5171118dfdebcd SHA1 4003c3e784997525884ac57d4723fd1283f6d394 SHA256 ca34795f1ac9e5ea3af7f06ad74ed94a3a912587fd6579abb6291c47bb8e18d2
+MISC ChangeLog 113561 RMD160 19b0e9c383e9f8aaeb651a369eb7f53de65d1922 SHA1 90a13200d5671ea5fdd02480c86a00fc8fcbf611 SHA256 c733427387ad527b0c04711e37f208749b5dc3e4ba45315cb2db037db0aff804
 MISC metadata.xml 6589 RMD160 ab5b329732294a0a30a03ad4cdf08b1085dcf44a SHA1 8e4fc30a95e1a0a7f48875d6786ca85009d334f5 SHA256 b6d64afe5ef288be46fccf5a476efdbbfbe066b104e00fd952a12b545748447d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO8g0ZAAoJEOTDgjZ80txdAlUIAIOlUnXSCeXOsuN9y+gpwDa5
-nA5e+wY4IinlXXe2okMwzz60305dTQTsJv2Mire9QlLpNH9kUjXjtt/ATJhzko76
-pqAT6tLggiJyQSvzBief5bXZxgFj4i0BhONok5ZSVeo83Gsv0BJQN76HUOCvuywK
-mnD0GfUx0jyNiPdeXTpFhztUawSE8HwUo9aDAJV6E18orhCWWfTZQwTz1B+LDV2Y
-xjOdQYnpeaqkmW+2FxjWZVRU29ORkAiyvYunad7lZF+SIkwv7cxrdcPRWQ4eRB0l
-ZkJQX00u+ezAo7esGWK8qIn4Qvc/zR2o55o9znykb8tBr46YI+J1hgnplufJpCU=
-=bbMI
+iEYEARECAAYFAk74n8oACgkQvFcC4BYPU0qmGQCcCaKUVnJXuxiiQ+K+TcUOwmhE
+uu0AmQHdzjzsUqOLgWHubMEv3TvoCubK
+=RRrP
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.12-r1.ebuild b/media-video/vlc/vlc-1.1.12-r1.ebuild
deleted file mode 100644
index e2353fad8544..000000000000
--- a/media-video/vlc/vlc-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12-r1.ebuild,v 1.1 2011/12/09 19:58:47 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="102"
-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 ~ppc ~ppc64 ~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 gme 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 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
-		|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
-		>=media-libs/libdvbpsi-0.1.6
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib x11-libs/libX11 )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23 )
-		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? ( virtual/ffmpeg )
-		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 )
-		gme? ( media-libs/game-music-emu )
-		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 x11-libs/gtk+:2 )
-		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-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
-		png? ( media-libs/libpng sys-libs/zlib )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
-			( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
-		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.10 )
-		sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11
-			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 virtual/ttf-fonts
-			!fontconfig? ( media-fonts/dejavu ) )
-		twolame? ( media-sound/twolame )
-		udev? ( >=sys-fs/udev-142 )
-		upnp? ( net-libs/libupnp )
-		v4l? (
-			libv4l2? ( media-libs/libv4l )
-			libv4l? ( media-libs/libv4l )
-			)
-		vaapi? ( x11-libs/libva virtual/ffmpeg )
-		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 x11-libs/libX11 )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	!!<=media-video/vlc-1.0.99999
-	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	dvb? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( >=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
-	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
-	vlc_use_force sdl X
-	vlc_use_force aalib X
-	vlc_use_force xosd X
-
-	# 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 v4l
-	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 gme) \
-		$(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) \
-		--disable-v4l \
-		$(use_enable v4l 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) \
-		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
-		$(use sdl && echo '--with-x') \
-		$(use xosd && echo '--with-x') \
-		$(use aalib && echo '--with-x')
-}
-
-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.12-r2.ebuild b/media-video/vlc/vlc-1.1.12-r2.ebuild
deleted file mode 100644
index 7cc860ad67c0..000000000000
--- a/media-video/vlc/vlc-1.1.12-r2.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12-r2.ebuild,v 1.1 2011/12/17 13:24:57 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="103"
-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 ~ppc ~ppc64 ~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 gme 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 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
-
-RDEPEND="
-		|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 )
-		>=media-libs/libdvbpsi-0.1.6
-		a52? ( >=media-libs/a52dec-0.7.4-r3 )
-		aalib? ( media-libs/aalib x11-libs/libX11 )
-		aac? ( >=media-libs/faad2-2.6.1 )
-		alsa? ( >=media-libs/alsa-lib-1.0.23 )
-		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? ( virtual/ffmpeg )
-		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 )
-		gme? ( media-libs/game-music-emu )
-		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 x11-libs/gtk+:2 )
-		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-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) )
-		png? ( media-libs/libpng sys-libs/zlib )
-		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
-		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.10 )
-		sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11
-			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 virtual/ttf-fonts
-			!fontconfig? ( media-fonts/dejavu ) )
-		twolame? ( media-sound/twolame )
-		udev? ( >=sys-fs/udev-142 )
-		upnp? ( net-libs/libupnp )
-		v4l? (
-			libv4l2? ( media-libs/libv4l )
-			libv4l? ( media-libs/libv4l )
-			)
-		vaapi? ( x11-libs/libva virtual/ffmpeg )
-		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 x11-libs/libX11 )
-		zvbi? ( >=media-libs/zvbi-0.2.25 )
-		"
-
-DEPEND="${RDEPEND}
-	!!<=media-video/vlc-1.0.99999
-	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	dvb? ( sys-kernel/linux-headers )
-	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( >=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
-	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
-	vlc_use_force sdl X
-	vlc_use_force aalib X
-	vlc_use_force xosd X
-
-	# 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 v4l
-	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 gme) \
-		$(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) \
-		--disable-v4l \
-		$(use_enable v4l 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) \
-		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') \
-		$(use sdl && echo '--with-x') \
-		$(use xosd && echo '--with-x') \
-		$(use aalib && echo '--with-x')
-}
-
-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
-}