gentoo resync : 08.01.2018

3 files changed, 2 insertions, 472 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a3cbda7f05a0..4ec10dc21661 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -17,8 +17,7 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b9
 DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b99995df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 EBUILD vlc-2.2.6.ebuild 15554 BLAKE2B bb51292251d39edda6e981b3805480396307dc0052cf4124fd74acda3bc48103646b147761aca15093f00afae21264eb27a46b1bab27d208755b47591981d0fc SHA512 56a3383357cf055d4bc1a459b0c395a22afa95d9d3eb2be1ed48d1b485378b9d5d230851b8c65accd9713a712685044f62a5652b1fa79749f678aca190fcc6cb
-EBUILD vlc-2.2.8-r1.ebuild 14487 BLAKE2B cdab104988c76d8a8b90b85b73c7ec3b89a55697e4c83705ae7aeafd8ba3a479f5cd86ee835929950a64326a0407b49ee9b7d5b5fab174cdb0865c810a172630 SHA512 9a7cb383d18e5841e284f38792b7090a98f69e3879ccd227f4adb28748ea401bec16c641769cf70086e2b677b2428511e25c8d7c411ab3f9e161cc591e7bac49
-EBUILD vlc-2.2.8.ebuild 14421 BLAKE2B a19e6d304b5758cee4c66d804d3836b171b81d88a4c8c5c2d0864743ae2f539be971ce833f9d8bff056bcfe696e8408fa1d687b1aca7d4b0aa51f0304e80b48d SHA512 4d9232bdaeedded4d2523547c27583c83291909fbda47051991adfd2b5216217873e040059075fd383469d6eeffd0769ca884eead73f44e0b49a5da32fe8804e
+EBUILD vlc-2.2.8-r1.ebuild 14486 BLAKE2B 18e0bd2a2a3e56bcc944f64e3bf67558bc7b1d49c7aeab1e9b5f5e586f06578517ddec0c6c219a67ff4e21109a3794bdb5811a62dae4358a8023088e2b5017c6 SHA512 ce132d458f3f3a83344be86b26e106e18a9134c5186ad6b7d9bce5886eef186df853cd9161b9a1a954acd86008ce995c3eda22d6a5842cab7f0a7ffbfd87419b
 EBUILD vlc-2.2.9999.ebuild 14502 BLAKE2B 0e052bfee82b41f15f2b61da02a1674dda8445520f45c0f0ee2a05d5da1f81dbe9666c5c6efd3eb9a6ef11f798dd736cfc6381ec0d45d5c51bada3905aaf106e SHA512 e2a5009595678aa48bd84328529d4bb8dd4a3e70fd4a5a608ba8b6cede9f2fcbbe209107273b18d627fc1b5fdbb81bd10f3672294c93b8fdf46f9112929c3060
 EBUILD vlc-3.0.9999.ebuild 13488 BLAKE2B 95f5eabafdabc5e45eb0df7e6075d42674b17ca06fa03025d56e6ddc6a192277b3a020e323358024628ec0f70b08e86d506409f2e31e776eeaa19cc6ed24c6eb SHA512 96f80b716829f4b7e3c3b0bf757f31d3797d18b76735c42f332e8019577d3a06c97890d97a2781accc033b56a83212a25a194610c6019ce885251f02be180136
 EBUILD vlc-9999.ebuild 13481 BLAKE2B ab969226645372b0360dc12482c3d19514b7abfe3c27d1460b97a9a4c3b9e2a0c888b984e196c2d314ab27f6c841a1371094870a3b200f0aeb67c14e7ad0ea12 SHA512 5c3b6f746401b6e423af49238025ee509ba40bf567495b3a966fe42e97da07badfcb463e4f89cfeb431d60747d59b9ae493bf94c167864f2e0a567a400f55834
diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index 1591be57fa73..997cd366883d 100644
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -19,7 +19,7 @@ else
 	else
 		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
 fi
 inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
 
diff --git a/media-video/vlc/vlc-2.2.8.ebuild b/media-video/vlc/vlc-2.2.8.ebuild
deleted file mode 100644
index 6896d4729401..000000000000
--- a/media-video/vlc/vlc-2.2.8.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = *9999 ]] ; then
-	if [[ ${PV%.9999} != ${PV} ]] ; then
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.9999}.git"
-	else
-		EGIT_REPO_URI="https://git.videolan.org/git/vlc.git"
-	fi
-	SCM="git-r3"
-else
-	if [[ ${MY_P} = ${P} ]] ; then
-		SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"
-	else
-		SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc x86 ~x86-fbsd"
-fi
-inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM}
-
-DESCRIPTION="Media player and framework with support for most multimedia files and streaming"
-HOMEPAGE="https://www.videolan.org/vlc/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0/5-8" # vlc - vlccore
-
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec +avformat bidi bluray cdda
-	cddb chromaprint dbus dc1394 debug directfb directx dts dvb +dvbpsi dvd dxva2
-	elibc_glibc +encode faad fdk fluidsynth +ffmpeg flac fontconfig +gcrypt gme
-	gnome gnutls growl gstreamer httpd ieee1394 jack jpeg kate libass libav
-	libcaca libnotify +libsamplerate libtiger linsys libtar lirc live lua
-	macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
-	matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg
-	omxil opencv opengl optimisememory opus png postproc projectm pulseaudio
-	+qt5 rtsp run-as-root samba schroedinger sdl sdl-image sftp shout
-	sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype
-	twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X
-	x264 x265 +xcb xml xv zeroconf zvbi
-"
-REQUIRED_USE="
-	aalib? ( X )
-	bidi? ( truetype )
-	cddb? ( cdda )
-	dvb? ( dvbpsi )
-	dxva2? ( avcodec )
-	ffmpeg? ( avcodec avformat swscale )
-	fontconfig? ( truetype )
-	gnutls? ( gcrypt )
-	httpd? ( lua )
-	libcaca? ( X )
-	libtar? ( skins )
-	libtiger? ( kate )
-	qt5? ( X )
-	sdl? ( X )
-	skins? ( qt5 truetype X xml )
-	vaapi? ( avcodec X )
-	vdpau? ( X )
-	vlm? ( encode )
-	xv? ( xcb )
-"
-RDEPEND="
-	dev-libs/libgpg-error:0
-	net-dns/libidn:0
-	sys-libs/zlib:0[minizip]
-	virtual/libintl:0
-	a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-	aalib? ( media-libs/aalib:0 )
-	alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-	avcodec? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	avformat? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	bidi? ( dev-libs/fribidi:0 )
-	bluray? ( >=media-libs/libbluray-0.3:0= )
-	cddb? ( >=media-libs/libcddb-1.2:0 )
-	chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-	dbus? ( >=sys-apps/dbus-1.6:0 )
-	dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
-	directfb? ( dev-libs/DirectFB:0 )
-	dts? ( >=media-libs/libdca-0.0.5:0 )
-	dvbpsi? ( >=media-libs/libdvbpsi-1.0.0:0= )
-	dvd? ( >=media-libs/libdvdread-4.9:0 >=media-libs/libdvdnav-4.9:0 )
-	elibc_glibc? ( >=sys-libs/glibc-2.8:2.2 )
-	faad? ( >=media-libs/faad2-2.6.1:0 )
-	fdk? ( media-libs/fdk-aac:0 )
-	flac? ( >=media-libs/libogg-1:0 >=media-libs/flac-1.1.2:0 )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0 )
-	fontconfig? ( media-libs/fontconfig:1.0 )
-	gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
-	gme? ( media-libs/game-music-emu:0 )
-	gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
-	gnutls? ( >=net-libs/gnutls-3.0.20:0 )
-	gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 )
-	ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-	jack? ( virtual/jack )
-	jpeg? ( virtual/jpeg:0 )
-	kate? ( >=media-libs/libkate-0.3:0 )
-	libass? ( >=media-libs/libass-0.9.8:0= media-libs/fontconfig:1.0 )
-	libcaca? ( >=media-libs/libcaca-0.99_beta14:0 )
-	libnotify? ( x11-libs/libnotify:0 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 )
-	libsamplerate? ( media-libs/libsamplerate:0 )
-	libtar? ( >=dev-libs/libtar-1.2.11-r3:0 )
-	libtiger? ( >=media-libs/libtiger-0.3.1:0 )
-	linsys? ( >=media-libs/zvbi-0.2.28:0 )
-	lirc? ( app-misc/lirc:0 )
-	live? ( >=media-plugins/live-2011.12.23:0 )
-	lua? ( >=dev-lang/lua-5.1:0 )
-	matroska? (	>=dev-libs/libebml-1:0= >=media-libs/libmatroska-1:0= )
-	modplug? ( >=media-libs/libmodplug-0.8.4:0 !~media-libs/libmodplug-0.8.8 )
-	mp3? ( media-libs/libmad:0 )
-	mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-	mtp? ( >=media-libs/libmtp-1:0 )
-	musepack? ( >=media-sound/musepack-tools-444:0 )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	ogg? ( >=media-libs/libogg-1:0 )
-	opencv? ( >media-libs/opencv-2:0= )
-	opengl? ( virtual/opengl:0 >=x11-libs/libX11-1.3.99.901:0 )
-	opus? ( >=media-libs/opus-1.0.3:0 )
-	png? ( media-libs/libpng:0= )
-	postproc? (
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-		libav? ( media-libs/libpostproc:0= )
-	)
-	projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-	pulseaudio? ( >=media-sound/pulseaudio-1:0 )
-	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 )
-	samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
-	sdl? ( >=media-libs/libsdl-1.2.10:0
-		sdl-image? ( >=media-libs/sdl-image-1.2.10:0 ) )
-	sftp? ( net-libs/libssh2:0 )
-	shout? ( >=media-libs/libshout-2.1:0 )
-	sid? ( media-libs/libsidplay:2 )
-	skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-	speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
-	svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
-	swscale? (
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( media-video/libav:0= )
-	)
-	taglib? ( >=media-libs/taglib-1.9:0 )
-	theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-	tremor? ( media-libs/tremor:0 )
-	truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
-		!fontconfig? ( media-fonts/dejavu:0 ) )
-	twolame? ( media-sound/twolame:0 )
-	udev? ( >=virtual/udev-142:0 )
-	upnp? ( net-libs/libupnp:= )
-	v4l? ( media-libs/libv4l:0 )
-	vaapi? (
-		x11-libs/libva:0=[X,drm]
-		!libav? ( media-video/ffmpeg:0=[vaapi] )
-		libav? ( media-video/libav:0=[vaapi] )
-	)
-	vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-	vdpau? (
-		x11-libs/libvdpau:0
-		!libav? ( media-video/ffmpeg:0= )
-		libav? ( >=media-video/libav-10:0= )
-	)
-	vnc? ( >=net-libs/libvncserver-0.9.9:0 )
-	vorbis? ( media-libs/libvorbis:0 )
-	vpx? ( media-libs/libvpx:0= )
-	X? ( x11-libs/libX11:0 )
-	x264? ( media-libs/x264:0= )
-	x265? ( media-libs/x265:0= )
-	xcb? ( x11-libs/libxcb:0 x11-libs/xcb-util:0 x11-libs/xcb-util-keysyms:0 )
-	xml? ( dev-libs/libxml2:2 )
-	zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
-	zvbi? ( media-libs/zvbi:0 )
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils:0
-	>=sys-devel/gettext-0.18.3:*
-	virtual/pkgconfig:*
-	amd64? ( dev-lang/yasm:* )
-	x86?   ( dev-lang/yasm:* )
-	xcb? ( x11-proto/xproto:0 )
-"
-
-PATCHES=(
-	# Fix build system mistake.
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
-
-	# Bug #541678
-	"${FILESDIR}"/qt4-select.patch
-
-	# Allow QT5.5 since Gentoo has a patched QTwidgets
-	"${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
-
-	# Bug #575072
-	"${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
-	"${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
-
-	# Bug #589396
-	"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
-
-	# Bug #594126, #629294
-	"${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
-	"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
-
-	# Bug #593460
-	"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch
-
-	"${FILESDIR}"/${P}-libupnp-compat.patch
-)
-
-DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch
-
-	# Bootstrap when we are on a git checkout.
-	if [[ ${PV} = *9999 ]] ; then
-		./bootstrap
-	fi
-
-	# Make it build with libtool 1.5
-	rm -f m4/lt* m4/libtool.m4 || die
-
-	# We are not in a real git checkout due to the absence of a .git directory.
-	touch src/revision.txt || die
-
-	# Don't use --started-from-file when not using dbus.
-	if ! use dbus ; then
-		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
-	fi
-
-	eautoreconf
-
-	# Disable automatic running of tests.
-	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
-
-	# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt
-	# version may be used. Setting QT_SELECT environment variable will enforce correct binaries.
-	if use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	# Compatibility fix for Samba 4.
-	use samba && append-cppflags "-I/usr/include/samba-4.0"
-
-	if use x86; then
-		# We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996
-		append-cflags $(test-flags-CC -fno-stack-check)
-		# Bug 569774
-		replace-flags -Os -O2
-	fi
-
-	# FIXME: Needs libresid-builder from libsidplay:2 which is in another directory...
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
-
-	xdg_environment_reset # bug 608256
-
-	if use truetype || use projectm ; then
-		local dejavu="/usr/share/fonts/dejavu/"
-		myconf="--with-default-font=${dejavu}/DejaVuSans.ttf \
-				--with-default-font-family=Sans \
-				--with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf
-				--with-default-monospace-font-family=Monospace"
-	fi
-
-	if use qt5 ; then
-		myconf+=" --enable-qt=5"
-	else
-		myconf+=" --disable-qt"
-	fi
-
-	econf \
-		${myconf} \
-		--enable-vlc \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--disable-optimizations \
-		--disable-update-check \
-		--disable-freerdp \
-		--enable-fast-install \
-		--enable-screen \
-		$(use_enable a52) \
-		$(use_enable aalib aa) \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable atmo) \
-		$(use_enable audioqueue) \
-		$(use_enable avcodec) \
-		$(use_enable avformat) \
-		$(use_enable bidi fribidi) \
-		$(use_enable bluray) \
-		$(use_enable cdda vcd) \
-		$(use_enable cddb libcddb) \
-		$(use_enable chromaprint) \
-		$(use_enable dbus) \
-		$(use_enable directfb) \
-		$(use_enable directx) \
-		$(use_enable dc1394) \
-		$(use_enable debug) \
-		$(use_enable dts dca) \
-		$(use_enable dvbpsi) \
-		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
-		$(use_enable dxva2) \
-		$(use_enable encode sout) \
-		$(use_enable faad) \
-		$(use_enable fdk fdkaac) \
-		$(use_enable flac) \
-		$(use_enable fluidsynth) \
-		$(use_enable fontconfig) \
-		$(use_enable gcrypt libgcrypt) \
-		$(use_enable gme) \
-		$(use_enable gnome gnomevfs) \
-		$(use_enable gnutls) \
-		$(use_enable growl) \
-		$(use_enable gstreamer gst-decode) \
-		$(use_enable httpd) \
-		$(use_enable ieee1394 dv1394) \
-		$(use_enable jack) \
-		$(use_enable jpeg) \
-		$(use_enable kate) \
-		$(use_enable libass) \
-		$(use_enable libcaca caca) \
-		$(use_enable libnotify notify) \
-		$(use_enable libsamplerate samplerate) \
-		$(use_enable libtar) \
-		$(use_enable libtiger tiger) \
-		$(use_enable linsys) \
-		$(use_enable lirc) \
-		$(use_enable live live555) \
-		$(use_enable lua) \
-		$(use_enable macosx-dialog-provider) \
-		$(use_enable macosx-eyetv) \
-		$(use_enable macosx-qtkit) \
-		$(use_enable macosx-quartztext) \
-		$(use_enable matroska mkv) \
-		$(use_enable cpu_flags_x86_mmx 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 neon) \
-		$(use_enable ogg) $(use_enable ogg mux_ogg) \
-		$(use_enable omxil) \
-		$(use_enable omxil omxil-vout) \
-		$(use_enable opencv) \
-		$(use_enable opengl glspectrum) \
-		$(use_enable opus) \
-		$(use_enable optimisememory optimize-memory) \
-		$(use_enable png) \
-		$(use_enable postproc) \
-		$(use_enable projectm) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable rtsp realrtsp) \
-		$(use_enable run-as-root) \
-		$(use_enable samba smbclient) \
-		$(use_enable schroedinger) \
-		$(use_enable sdl) \
-		$(use_enable sdl-image) \
-		$(use_enable sid) \
-		$(use_enable sftp) \
-		$(use_enable shout) \
-		$(use_enable skins skins2) \
-		$(use_enable speex) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable svg) \
-		$(use_enable svg svgdec) \
-		$(use_enable swscale) \
-		$(use_enable taglib) \
-		$(use_enable theora) \
-		$(use_enable tremor) \
-		$(use_enable truetype freetype) \
-		$(use_enable twolame) \
-		$(use_enable udev) \
-		$(use_enable upnp) \
-		$(use_enable v4l v4l2) \
-		$(use_enable vaapi libva) \
-		$(use_enable vcdx) \
-		$(use_enable vdpau) \
-		$(use_enable vlm) \
-		$(use_enable vnc) \
-		$(use_enable vorbis) \
-		$(use_enable vpx) \
-		$(use_enable wma-fixed) \
-		$(use_with X x) \
-		$(use_enable x264) \
-		$(use_enable x265) \
-		$(use_enable xcb) \
-		$(use_enable xml libxml2) \
-		$(use_enable xv xvideo) \
-		$(use_enable zeroconf bonjour) \
-		$(use_enable zvbi) $(use_enable !zvbi telx) \
-		--disable-asdcp \
-		--disable-coverage \
-		--disable-cprof \
-		--disable-crystalhd \
-		--disable-decklink \
-		--disable-gles1 \
-		--disable-gles2 \
-		--disable-goom \
-		--disable-kai \
-		--disable-kva \
-		--disable-maintainer-mode \
-		--disable-merge-ffmpeg \
-		--disable-mfx \
-		--disable-mmal-codec \
-		--disable-mmal-vout \
-		--disable-opensles \
-		--disable-oss \
-		--disable-quicktime \
-		--disable-rpi-omxil \
-		--disable-shine \
-		--disable-sndio \
-		--disable-vda \
-		--disable-vsxu \
-		--disable-wasapi
-
-		# ^ We don't have these disabled libraries in the Portage tree yet.
-
-	# _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo.
-	# Other values of _FORTIFY_SOURCE may break the build (bug 523144), so definition should not be removed from config.h.
-	# To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the very start of config.h file
-	sed -i '1i#undef _FORTIFY_SOURCE' "${S}"/config.h || die
-}
-
-src_test() {
-	virtx emake check-TESTS
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-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
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}