remove old

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64
author: Alexis Ballier <aballier@gentoo.org> 2011-02-14 11:55:11 +0000
committer: Alexis Ballier <aballier@gentoo.org> 2011-02-14 11:55:11 +0000
commit: ff15e8f25b1070f838014a1e75231ad22e8b41be (patch)
tree: ab65d0daf7b7412bf1fc12379ab5a9d326a8522f /media-video
parent: remove old (diff)
download: historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.tar.gz
historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.tar.bz2
historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.zip
6 files changed, 16 insertions, 1499 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 9f2485c75034..2e07d3845620 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.660 2011/02/12 17:55:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.661 2011/02/14 11:55:11 aballier Exp $
+
+  14 Feb 2011; Alexis Ballier <aballier@gentoo.org> -vlc-1.1.4.ebuild,
+  -vlc-1.1.4.1.ebuild, -vlc-1.1.5.ebuild, -vlc-1.1.6.ebuild:
+  remove old
 
   12 Feb 2011; Raúl Porcel <armin76@gentoo.org> vlc-1.1.6.ebuild,
   vlc-1.1.7.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a756d727cc79..75c2e8f8a192 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,18 +1,19 @@
-DIST vlc-1.1.4.1.tar.bz2 23669651 RMD160 539f8e87c81b090524b1ada56301ffde302cd016 SHA1 91a88c02a7ed04de150ce998ce0534ccfabe57bc SHA256 61c9ea30a17ea40c6ccbfd507026e5c83ad9e0691f221d3667c8e49696d7c2aa
-DIST vlc-1.1.4.tar.bz2 23923550 RMD160 9ea0fa94f46bc9624e1314423f4bc6d3d20c8c4f SHA1 2c4f85fbccbd11946cb4b2cf94464e5db38db78a SHA256 0951493d27af3f950ed57ff123d9cb17ed1d17c8ae51741d3a90f4973af397d7
-DIST vlc-1.1.5.tar.bz2 24111723 RMD160 b3ac38109e11e86df6049c7d7af4d484e582c586 SHA1 19f4b3d82afd9cfd2131447d0cc65032e7cb9e5f SHA256 f8e3af9c317fb2e695ba2b9b7f5ac904e6eda3b078f632b98746ffc277e5ca26
-DIST vlc-1.1.6.tar.bz2 24631857 RMD160 537b264745ee8b9f803a6b62ea5d49b66e11d8b5 SHA1 4cb4014d116493cc7d1b09622d0458121c14ce73 SHA256 e797f9fe60cbfc9df7c2cb019c27554213e32230a7beb4a3c6abc5287f069cac
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vlc-1.1.7.tar.bz2 24635812 RMD160 1662f458c5e1cec41e27fa1320af817551577def SHA1 6bd559fe2bba51c5ed1ae71d18dc8ac611e72a04 SHA256 28059ef17d0866c3d9d5808fb6bf56783f72486b1b80f7ea8f6106612db0c1d5
 DIST vlc-patches-88.tar.bz2 3341 RMD160 b29676117f2a4033e66f4c956b5de1cc1be872b0 SHA1 93bbfd854270596fa6e5084e68c93a66dc73c616 SHA256 64544578d02a9c2cfa5aa9ba3181106d9e631c5cd2989874d632caed38acd3d1
 DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180 SHA1 0535f90fc6efd71aad2f6522bb7cee1325549ae6 SHA256 9e994200a9da9ec5e5eb3db7f5abfde822f2b36e99ada4be3db0cbf621be950b
-DIST vlc-patches-90.tar.bz2 3836 RMD160 b77017afe5e707bea472dd318aed265aefc4364b SHA1 a29aa594a7638cd873519ef406d8148e347b5812 SHA256 a36bebfdd17c6d2a2301ae7e55b00fe85b5a9c9b938b9bf60d4ed0a1573c590d
 DIST vlc-patches-91.tar.bz2 3955 RMD160 37024ac3d68f0c36f711bb680c573976e4e729e8 SHA1 987ac5f47926d76073e84643023df346f9a0027a SHA256 9863e9fd62bf07641e3e99cbd11194cd462ad99ca1719034badfff74419ec451
-EBUILD vlc-1.1.4.1.ebuild 11981 RMD160 e2c6701494dac52d8a784b234722d6367630242e SHA1 bc8df5385a9d19269a611c06287a2a8ef10f8d34 SHA256 2f104f95fc1405b549fee1da8e57cd5d1762e3040d940584b2869ac0ca50253b
-EBUILD vlc-1.1.4.ebuild 11973 RMD160 0c2b9fcddbcbfa56f9f8f9ae6a32d29a276eef43 SHA1 2dbf8285b9c6c1d44c23f2d8c5ac91c27e640654 SHA256 159648e61b2582d293c23f06d5110a0419203ffae3175243d5796ef2335647a5
-EBUILD vlc-1.1.5.ebuild 12080 RMD160 08f59cd6ba634267a3134681c5049ebed5250cf8 SHA1 c4809e386833fcc86c0608bb613b3c0652d2cd02 SHA256 761d2089ed74f9095479e5c902642a967863a06889b09e8337bea40e7c4e99d2
-EBUILD vlc-1.1.6.ebuild 12263 RMD160 b61252b1808ca0a86626358a49d540c23fdb710a SHA1 31defee1c5c1bb3d28f3149c4f196210114eea96 SHA256 6238c60d32c57bf6c68592973bedd40a227e0c1c0a463c2d01e4a33cca8f0a3b
 EBUILD vlc-1.1.7.ebuild 12269 RMD160 36dc682bb0549b58f7803aa17a055ef0b971ca53 SHA1 1e561a2088c4c4ed3935d24b2a63f02e495a84fb SHA256 261f17b1624e51706b95cf97e5c342b1012147d9027bb1e485aecef29bdcd7e8
 EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
 EBUILD vlc-9999.ebuild 11085 RMD160 fb4b580ae26070acfd1b4190a9f3d53dfbce7416 SHA1 4f622fe5c1cc800ed100da70d112a0c3cc6838dd SHA256 3859a72c576904a90d347c6964972aef5a37e8d63c78071086fcf1ebccab872a
-MISC ChangeLog 100187 RMD160 2a17838b42ed30cd4504c2e4f298887d27db1559 SHA1 1cf746624a10288b107dcba922e2b711ae9c419b SHA256 a1277b7f6da38804043629df097e755d52180c5aa27bc24422532768e77e267a
+MISC ChangeLog 100334 RMD160 21fd919a3759b541755c513172a888497352be9c SHA1 5403ae1987e6cde43e81b4d3e588337e5aa2dbc2 SHA256 e3cbae4a50d3c81a661de76b1a822aa023c2dfdda3d7828401537c0f35efdd71
 MISC metadata.xml 4211 RMD160 2a8b9684d21db73920b1967ea27af9828250c228 SHA1 5c4e0725c9e48f64c7b26237327c34ffe00cc976 SHA256 baa70c6763379c4f483ff330bb5f141882b6ea448c07be55c445bed332c5342e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1ZGCQACgkQvFcC4BYPU0rwKACgvTWvT/tAmkUc3a8EntF95sPA
+0YgAn1dr00QvuJq9R96yb7EfFsbYNvjL
+=339p
+-----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.4.1.ebuild b/media-video/vlc/vlc-1.1.4.1.ebuild
deleted file mode 100644
index 21bc42f8c928..000000000000
--- a/media-video/vlc/vlc-1.1.4.1.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.4.1.ebuild,v 1.2 2010/10/15 19:35:26 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 ~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 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-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
-		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.4.ebuild b/media-video/vlc/vlc-1.1.4.ebuild
deleted file mode 100644
index 4f1a1b14834b..000000000000
--- a/media-video/vlc/vlc-1.1.4.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.4.ebuild,v 1.11 2010/10/25 18:38:39 halcy0n 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 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 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-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
-		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.5.ebuild b/media-video/vlc/vlc-1.1.5.ebuild
deleted file mode 100644
index 3b9e466f1c51..000000000000
--- a/media-video/vlc/vlc-1.1.5.ebuild
+++ /dev/null
@@ -1,373 +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.5.ebuild,v 1.6 2011/01/13 21:52:30 ranger 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="~amd64 ~arm ~ppc ~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 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-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? ( >=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 )
-		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 )
-		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[xcb] >=x11-libs/libX11-1.3.99.901 ) )
-		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
-	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	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 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) \
-		$(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.6.ebuild b/media-video/vlc/vlc-1.1.6.ebuild
deleted file mode 100644
index ca5e55f42cd3..000000000000
--- a/media-video/vlc/vlc-1.1.6.ebuild
+++ /dev/null
@@ -1,375 +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.6.ebuild,v 1.7 2011/02/12 17:55:02 armin76 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="90"
-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="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 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-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? ( >=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 )
-		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 )
-		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[xcb] >=x11-libs/libX11-1.3.99.901 ) )
-		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.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
-	alsa? ( >=media-sound/alsa-headers-1.0.23 )
-	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
-	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio 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 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 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) \
-		$(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) \
-		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && 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
-}
author	Alexis Ballier <aballier@gentoo.org>	2011-02-14 11:55:11 +0000
committer	Alexis Ballier <aballier@gentoo.org>	2011-02-14 11:55:11 +0000
commit	ff15e8f25b1070f838014a1e75231ad22e8b41be (patch)
tree	ab65d0daf7b7412bf1fc12379ab5a9d326a8522f /media-video
parent	remove old (diff)
download	historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.tar.gz historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.tar.bz2 historical-ff15e8f25b1070f838014a1e75231ad22e8b41be.zip