media-video/vlc: multilib-utize (mostly)

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

Also, in what really should have been a separate patch,
enhance the make test support to pick up the main part
of the vlc testsuite which for some stupid reason doesn't
use recursive make (or else has an OOT bug?)

The completion yardstick I've used here is "keep hacking until it
works on my box".  I have not gone the rest of the way, here,
and tested the full matrix of USE flags.  So, there may still
be bugs and there almost certainly are some dependencies
in this e-build that have no ebuilds to fulfull them yet,
not even in the gmt overlay.

That's kinda OK by me actually -- the ebuild says what it's
dependencies are, not where to go get them, after all,
and this one has a lot.

Still the matrix of dependencies is actually not /too/ far from
completely tested.  I have enabled most of the useflags and I seem
to get a working vlc at the end of it.

Also, a couple of deps don't build multilib but only on the best
abi.  I'm not fond of that for tldr reasons but after all the
depthwise recursion I've gotten sucked into lately I'm not
willing to pull in kdelibs yet. yikes, no thank you, not
ready for that just yet (but getting closer...)!

-gmt

2 files changed, 138 insertions, 106 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1f51574..d320920 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,8 +7,9 @@ AUX vlc-2.1.0-libva-1.2.1-compat.patch 272 SHA256 fe9a4fdfe5447c869ec881f9e30236
 AUX vlc-2.1.0-newer-rdp.patch 2133 SHA256 597549a7cae76998cb40871c6e5e3a11d2aeaa6443e5e9f69528f1d668bfc53d SHA512 e13541f116a11e27ffc25a25ff3e94c7122dcfdbe4eed8ad97abe3b672df135648523716eb2d0cd191caf0b59af010b4aab48202b3fbf5f1f7d6ab2144093122 WHIRLPOOL 8c0278e069ea73593a57d013b045380fe99ff7cfb79ffbca08d9cd761ee5b3ebccbcaaaab939861016af38dee35b9c327bb573ee8bef36934c64bf3ab8207d86
 AUX vlc-2.1.0-transcode-don-t-check-drift-if-we-have-VLC_TS_INVALI.patch 1953 SHA256 bd1694702a2faef7175b746dd0bf710aaa155d07cfc8023ca3d503347844cb53 SHA512 9b0d8ab9ba8578d99dc098fbbdd2d04a73e2ba60b4a00308fb9b66cd1ffddf14d85a7f158766ff73b07aabc22abdf0257d2f3811f4a9377a5eb0ab19e7c6a3e2 WHIRLPOOL 637894d3fa9503280da9825168c3e894274b6dbcb67d1bbe0cee025d025b5ca3a2216d25e04cc3142f7579153a0ecac5d5969f2181af5491a5fc12319b1b16f2
 AUX vlc-2.1.1-freetype-2.5.1-support.patch 764 SHA256 424fd612665c1c3d8f9247053379de1f93f56f81cb788d15470076c583d949e4 SHA512 aa11369b9cc5a91a0edaf7e23ada1651cdab01fa3acd54d454358c0789db2b2539fc4200c798b6ac58448341f6a2cfa32c987d2a44ac1af815fa4c2a7b091597 WHIRLPOOL 9c11f2b6ba5b903443991654b80ac2f6b1fe898c08b5b3c8004c3cc11fa5a9f4b20fb76e5eaaf137fcdb2a84e871a357aa72d3955668e5301de63ed4d1ff3d79
+AUX vlc-2.1.2-qt-mkdir-kludge.patch 1493 SHA256 0ff636da209e7c2fe811ebc613a9fd6ad63f7c4ae0c064054e5755691b9108a3 SHA512 d24b19261c44cfc8ded74d098da37b599cc0286ad5b8d780cfdc9c124ada884dc39d25687e57f46c9f034763fc53e131564e8364dc0bb307d69f5450b9833646 WHIRLPOOL 31df283e5a01e94f9f5e4ed95d5f5469df345970715f830620b752c9ba2ce8642994e4f9da8d869f6710d805700514dad41b097b55b56a29d687cb4e643b0274
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
-EBUILD vlc-2.1.2-r1.ebuild 13994 SHA256 e2bd88fd2551e392166678d5691b07cfa351b47bd7dbf3186f4e7cf5daa24592 SHA512 cb9d0ab4476162d09ba1c9df09ddb3260a69289ff433de390c372f69aa25fe42cbbc0a9c7dc68518b694d27d6adefeae0e46539420fec03ad024aed35a325474 WHIRLPOOL e460644cb6469cee24fbfdd2c36821107197f67fb0eddf094e5163ed8012b1bd2fa07d6756c7316aedcfe4fab5365c9e08fd1c12618bb3f902af3089aef5a1f7
+EBUILD vlc-2.1.2-r1.ebuild 17094 SHA256 7b198c81dd522951ac45c6ff185923e64fa28e5bc44a96b59c066c660d2b8539 SHA512 14dd0f51d1dab086ead3c9957297b7a8c34b15509cb0328887ae119dfe25d747d068770db5e7243c5b8f020eb4d0e93365b29311a97599cf32e21c0216515a82 WHIRLPOOL 837cefebef2e89d2ea0e34ce75f1a9484fd4188605169c29ff80f2fc6d18d9859da1d9daf3967e1c141ee4ddecaf4138826bbf15c8871910bdb266633d88e34d
 MISC ChangeLog 22298 SHA256 9e00bed3496715272c730d772ab2ec4f1a2e8f215152dbfb7d9a2cc71ec47a1a SHA512 2cd1e2621c72749367b21edb9612eeda0cd899154a2ef24e312e60c011efff8e4598b61578abf05d15296c2dbb7869dc5e4e1301e501e12d0be5de6eca6694b8 WHIRLPOOL 9c34fb4282e2b0df9bdbd28422018b0207609d8c29217eb48157f99416d2cd43b25aed7a82a139dd79dfee37b0896f14f9c250f8576f65a22c50eb5a99e63b53
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6844 SHA256 a3811bd21c177f53d9355c64713de4745b21508bb67feba129b39316be67e985 SHA512 b464088eba743833a8b2c4b89bb6c5bd961dc0304acd2f0fe3c0f4c4a6b73187e24fb47655ebd0670d5fa6bd1dc1204477a755549ff73a321b84e99734e94b23 WHIRLPOOL 003aab808c9d364ae3c6e1d15f7fc40d46236087ae1177455957b1e265f7c60a98888d8121364b41e8ed7004299d9245337e0afab31dfbd0491c0a60ee05ccef
diff --git a/media-video/vlc/vlc-2.1.2-r1.ebuild b/media-video/vlc/vlc-2.1.2-r1.ebuild
index 0e74055..8dd8c90 100644
--- a/media-video/vlc/vlc-2.1.2-r1.ebuild
+++ b/media-video/vlc/vlc-2.1.2-r1.ebuild
@@ -15,7 +15,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then
 	fi
 fi
 
-inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM}
+inherit eutils eutils-multilib multilib autotools toolchain-funcs flag-o-matic virtualx multilib-minimal ${SCM}
 
 MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
@@ -35,7 +35,7 @@ LICENSE="LGPL-2.1 GPL-2"
 SLOT="0/5-7" # vlc - vlccore
 
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~ppc -sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64"
 else
 	KEYWORDS=""
 fi
@@ -56,106 +56,114 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 
 RDEPEND="
 		!<media-video/ffmpeg-1.2:0
-		dev-libs/libgpg-error:0
-		net-dns/libidn:0
-		>=sys-devel/gettext-0.18.3:0
-		>=sys-libs/zlib-1.2.5.1-r2:0[minizip]
-		a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
-		aalib? ( media-libs/aalib:0 )
-		alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
-		avahi? ( >=net-dns/avahi-0.6:0[dbus] )
-		avcodec? ( virtual/ffmpeg:0 )
-		avformat? ( virtual/ffmpeg:0 )
-		bidi? ( >=dev-libs/fribidi-0.10.4:0 )
-		bluray? ( >=media-libs/libbluray-0.2.1:0 )
-		cddb? ( >=media-libs/libcddb-1.2.0:0 )
-		chromaprint? ( >=media-libs/chromaprint-0.6:0 )
-		dbus? ( >=sys-apps/dbus-1.0.2:0 )
-		dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1.0:2 )
-		dirac? ( >=media-video/dirac-0.10.0:0 )
-		directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
-		dts? ( media-libs/libdca:0 )
-		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0 )
-		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0 )
-		egl? ( virtual/opengl:0 )
+		dev-libs/libgpg-error:0[${MULTILIB_USEDEP}]
+		net-dns/libidn:0[${MULTILIB_USEDEP}]
+		>=sys-devel/gettext-0.18.3:0[${MULTILIB_USEDEP}]
+		>=sys-libs/zlib-1.2.5.1-r2:0[minizip,${MULTILIB_USEDEP}]
+		a52? ( >=media-libs/a52dec-0.7.4-r3:0[${MULTILIB_USEDEP}] )
+		aalib? ( media-libs/aalib:0[${MULTILIB_USEDEP}] )
+		alsa? ( >=media-libs/alsa-lib-1.0.24:0[${MULTILIB_USEDEP}] )
+		avahi? ( >=net-dns/avahi-0.6:0[dbus,${MULTILIB_USEDEP}] )
+		avcodec? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
+		avformat? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
+		bidi? ( >=dev-libs/fribidi-0.10.4:0[${MULTILIB_USEDEP}] )
+		bluray? ( >=media-libs/libbluray-0.2.1:0[${MULTILIB_USEDEP}] )
+		cddb? ( >=media-libs/libcddb-1.2.0:0[${MULTILIB_USEDEP}] )
+		chromaprint? ( >=media-libs/chromaprint-0.6:0[${MULTILIB_USEDEP}] )
+		dbus? ( >=sys-apps/dbus-1.0.2:0[${MULTILIB_USEDEP}] )
+		dc1394? ( >=sys-libs/libraw1394-2.0.1:0[${MULTILIB_USEDEP}] >=media-libs/libdc1394-2.1.0:2[${MULTILIB_USEDEP}] )
+		dirac? ( >=media-video/dirac-0.10.0:0[${MULTILIB_USEDEP}] )
+		directfb? ( dev-libs/DirectFB:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
+		dts? ( media-libs/libdca:0[${MULTILIB_USEDEP}] )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.2.1:0[${MULTILIB_USEDEP}] )
+		dvd? ( media-libs/libdvdread:0 >=media-libs/libdvdnav-0.1.9:0[${MULTILIB_USEDEP}] )
+		egl? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
 		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: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 )
-		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
-		ios-vout? ( virtual/opengl:0 )
-		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
-		kate? ( >=media-libs/libkate-0.3.0: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 )
+		faad? ( >=media-libs/faad2-2.6.1:0[${MULTILIB_USEDEP}] )
+		fdk? ( media-libs/fdk-aac:0[${MULTILIB_USEDEP}] )
+		flac? ( media-libs/libogg:0 >=media-libs/flac-1.1.2:0[${MULTILIB_USEDEP}] )
+		fluidsynth? ( >=media-sound/fluidsynth-1.1.2:0[${MULTILIB_USEDEP}] )
+		fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+		gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0[${MULTILIB_USEDEP}] )
+		gme? ( media-libs/game-music-emu:0[${MULTILIB_USEDEP}] )
+		gnome? ( gnome-base/gnome-vfs:2[${MULTILIB_USEDEP}] dev-libs/glib:2[${MULTILIB_USEDEP}] )
+		gnutls? ( >=net-libs/gnutls-3.0.20:0[${MULTILIB_USEDEP}] )
+		ieee1394? ( >=sys-libs/libraw1394-2.0.1:0[${MULTILIB_USEDEP}] >=sys-libs/libavc1394-0.5.3:0[${MULTILIB_USEDEP}] )
+		ios-vout? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0[${MULTILIB_USEDEP}] )
+		kate? ( >=media-libs/libkate-0.3.0:0[${MULTILIB_USEDEP}] )
+		libass? ( >=media-libs/libass-0.9.8:0[${MULTILIB_USEDEP}] media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+		libcaca? ( >=media-libs/libcaca-0.99_beta14:0[${MULTILIB_USEDEP}] )
+		libnotify? ( x11-libs/libnotify:0[${MULTILIB_USEDEP}]
+			x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+			x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+			dev-libs/glib:2[${MULTILIB_USEDEP}] )
+		libsamplerate? ( media-libs/libsamplerate:0[${MULTILIB_USEDEP}] )
+		libtar? ( >=dev-libs/libtar-1.2.11-r3:0[${MULTILIB_USEDEP}] )
+		libtiger? ( >=media-libs/libtiger-0.3.1:0[${MULTILIB_USEDEP}] )
+		linsys? ( >=media-libs/zvbi-0.2.28:0[${MULTILIB_USEDEP}] )
+		lirc? ( app-misc/lirc:0[${MULTILIB_USEDEP}] )
+		live? ( >=media-plugins/live-2011.12.23:0[${MULTILIB_USEDEP}] )
 		lua? ( >=dev-lang/lua-5.1:0 )
-		macosx-vout? ( virtual/opengl:0 )
-		matroska? (	>=dev-libs/libebml-1.0.0:0= >=media-libs/libmatroska-1.0.0:0= )
-		modplug? ( >=media-libs/libmodplug-0.8.8.1:0 )
-		mp3? ( media-libs/libmad:0 )
-		mpeg? ( >=media-libs/libmpeg2-0.3.2:0 )
-		mtp? ( >=media-libs/libmtp-1.0.0:0 )
-		musepack? ( >=media-sound/musepack-tools-444:0 )
-		ncurses? ( sys-libs/ncurses:5[unicode] )
-		ogg? ( media-libs/libogg:0 )
-		opencv? ( >media-libs/opencv-2.0: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= sys-libs/zlib:0 )
-		postproc? ( || ( media-libs/libpostproc:0 >=media-video/ffmpeg-1.2:0= ) )
-		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
-		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
+		macosx-vout? ( virtual/opengl:0[${MULTILIB_USEDEP}] )
+		matroska? (	>=dev-libs/libebml-1.0.0:0=[${MULTILIB_USEDEP}] >=media-libs/libmatroska-1.0.0:0=[${MULTILIB_USEDEP}] )
+		modplug? ( >=media-libs/libmodplug-0.8.8.1:0[${MULTILIB_USEDEP}] )
+		mp3? ( media-libs/libmad:0[${MULTILIB_USEDEP}] )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2:0[${MULTILIB_USEDEP}] )
+		mtp? ( >=media-libs/libmtp-1.0.0:0[${MULTILIB_USEDEP}] )
+		musepack? ( >=media-sound/musepack-tools-444:0[${MULTILIB_USEDEP}] )
+		ncurses? ( sys-libs/ncurses:5[unicode,${MULTILIB_USEDEP}] )
+		ogg? ( media-libs/libogg:0[${MULTILIB_USEDEP}] )
+		opencv? ( >media-libs/opencv-2.0:0[${MULTILIB_USEDEP}] )
+		opengl? ( virtual/opengl:0[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.3.99.901:0[${MULTILIB_USEDEP}] )
+		opus? ( >=media-libs/opus-1.0.3:0[${MULTILIB_USEDEP}] )
+		png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
+		postproc? ( || ( media-libs/libpostproc:0[${MULTILIB_USEDEP}] >=media-video/ffmpeg-1.2:0=[${MULTILIB_USEDEP}] ) )
+		projectm? ( media-libs/libprojectm:0[${MULTILIB_USEDEP}] media-fonts/dejavu:0 )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0[${MULTILIB_USEDEP}] )
+		qt4? ( >=dev-qt/qtgui-4.6.0:4[${MULTILIB_USEDEP}] >=dev-qt/qtcore-4.6.0:4[${MULTILIB_USEDEP}] )
+		qt5? ( >=dev-qt/qtgui-5.1.0:5[${MULTILIB_USEDEP}]
+			>=dev-qt/qtcore-5.1.0:5[${MULTILIB_USEDEP}] dev-qt/qtwidgets:5[${MULTILIB_USEDEP}] )
 		rdp? ( net-misc/freerdp:0= )
-		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
-		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 sys-libs/zlib:0 ) )
-		sftp? ( net-libs/libssh2:0 )
-		shout? ( media-libs/libshout:0 )
-		sid? ( media-libs/libsidplay:2 )
-		skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-		speex? ( media-libs/speex:0 )
-		svg? ( >=gnome-base/librsvg-2.9.0:2 )
-		swscale? ( virtual/ffmpeg:0 )
-		taglib? ( >=media-libs/taglib-1.6.1:0 sys-libs/zlib:0 )
-		theora? ( >=media-libs/libtheora-1.0_beta3:0 )
-		tremor? ( media-libs/tremor:0 )
-		truetype? ( media-libs/freetype:2 virtual/ttf-fonts:0
+		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient,${MULTILIB_USEDEP}] >=net-fs/samba-4.0.0:0[client,${MULTILIB_USEDEP}] ) )
+		schroedinger? ( >=media-libs/schroedinger-1.0.10:0[${MULTILIB_USEDEP}] )
+		sdl? ( >=media-libs/libsdl-1.2.10:0[${MULTILIB_USEDEP}]
+			sdl-image? ( >=media-libs/sdl-image-1.2.10:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] ) )
+		sftp? ( net-libs/libssh2:0[${MULTILIB_USEDEP}] )
+		shout? ( media-libs/libshout:0[${MULTILIB_USEDEP}] )
+		sid? ( media-libs/libsidplay:2[${MULTILIB_USEDEP}] )
+		skins? ( x11-libs/libXext:0[${MULTILIB_USEDEP}]
+			x11-libs/libXpm:0[${MULTILIB_USEDEP}]
+			x11-libs/libXinerama:0[${MULTILIB_USEDEP}] )
+		speex? ( media-libs/speex:0[${MULTILIB_USEDEP}] )
+		svg? ( >=gnome-base/librsvg-2.9.0:2[${MULTILIB_USEDEP}] )
+		swscale? ( virtual/ffmpeg:0[${MULTILIB_USEDEP}] )
+		taglib? ( >=media-libs/taglib-1.6.1:0[${MULTILIB_USEDEP}] sys-libs/zlib:0[${MULTILIB_USEDEP}] )
+		theora? ( >=media-libs/libtheora-1.0_beta3:0[${MULTILIB_USEDEP}] )
+		tremor? ( media-libs/tremor:0[${MULTILIB_USEDEP}] )
+		truetype? ( media-libs/freetype:2[${MULTILIB_USEDEP}] virtual/ttf-fonts:0
 			!fontconfig? ( media-fonts/dejavu:0 ) )
-		twolame? ( media-sound/twolame:0 )
-		udev? ( >=virtual/udev-142:0 )
-		upnp? ( net-libs/libupnp:0 )
-		v4l? ( media-libs/libv4l:0 )
-		vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] )
-		vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
-		vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-9.11 )
-		vorbis? ( media-libs/libvorbis:0 )
-		X? ( x11-libs/libX11:0 )
-		x264? ( >=media-libs/x264-0.0.20090923:0= )
-		xcb? ( >=x11-libs/libxcb-1.6:0 >=x11-libs/xcb-util-0.3.4:0 >=x11-libs/xcb-util-keysyms-0.3.4:0 )
-		xml? ( dev-libs/libxml2:2 )
-		zvbi? ( >=media-libs/zvbi-0.2.25:0 )
+		twolame? ( media-sound/twolame:0[${MULTILIB_USEDEP}] )
+		udev? ( >=virtual/udev-142:0[${MULTILIB_USEDEP}] )
+		upnp? ( net-libs/libupnp:0[${MULTILIB_USEDEP}] )
+		v4l? ( media-libs/libv4l:0[${MULTILIB_USEDEP}] )
+		vaapi? ( x11-libs/libva:0[${MULTILIB_USEDEP}] virtual/ffmpeg[vaapi,${MULTILIB_USEDEP}] )
+		vcdx? ( >=dev-libs/libcdio-0.78.2:0[${MULTILIB_USEDEP}] >=media-video/vcdimager-0.7.22:0[${MULTILIB_USEDEP}] )
+		vdpau? ( >=x11-libs/libvdpau-0.6:0[${MULTILIB_USEDEP}] !<media-video/libav-9.11 )
+		vorbis? ( media-libs/libvorbis:0[${MULTILIB_USEDEP}] )
+		X? ( x11-libs/libX11:0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20090923:0=[${MULTILIB_USEDEP}] )
+		xcb? ( >=x11-libs/libxcb-1.6:0[${MULTILIB_USEDEP}]
+			>=x11-libs/xcb-util-0.3.4:0[${MULTILIB_USEDEP}]
+			>=x11-libs/xcb-util-keysyms-0.3.4:0[${MULTILIB_USEDEP}] )
+		xml? ( dev-libs/libxml2:2[${MULTILIB_USEDEP}] )
+		zvbi? ( >=media-libs/zvbi-0.2.25:0[${MULTILIB_USEDEP}] )
 "
 
 DEPEND="${RDEPEND}
 	kde? ( >=kde-base/kdelibs-4:4 )
-	xcb? ( x11-proto/xproto:0 )
-	app-arch/xz-utils:0
+	xcb? ( x11-proto/xproto:0[${MULTILIB_USEDEP}] )
+	app-arch/xz-utils:0[${MULTILIB_USEDEP}]
 	virtual/pkgconfig:0
 "
 
@@ -184,12 +192,22 @@ REQUIRED_USE="
 
 S="${WORKDIR}/${MY_P}"
 
+MULTILIB_PARALLEL_PHASES="src_configure src_compile src_test"
+
 pkg_setup() {
 	if [[ "$(tc-getCC)" == *"gcc"* ]] ; then
 		if [[ $(gcc-major-version) < 4 || ( $(gcc-major-version) == 4 && $(gcc-minor-version) < 5 ) ]] ; then
 			die "You need to have at least >=sys-devel/gcc-4.5 to build and/or have a working vlc, see bug #426754."
 		fi
 	fi
+	if use '!prefix' && use test; then
+		if ! has userpriv ${FEATURES}; then
+			ewarn
+			ewarn "The VLC testsuite cannot run as root and will therefore"
+			ewarn "be skipped.  Set FEATURES=userpriv if you want to test"
+			ewarn
+		fi
+	fi
 }
 
 src_unpack() {
@@ -256,7 +274,7 @@ src_prepare() {
 	find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die
 }
 
-src_configure() {
+multilib_src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
@@ -277,7 +295,7 @@ src_configure() {
 		qt_flag="--enable-qt"
 	fi
 
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		${myconf} \
 		--enable-vlc \
 		--docdir=/usr/share/doc/${PF} \
@@ -327,7 +345,7 @@ src_configure() {
 		$(use_enable ios-vout) \
 		$(use_enable jack) \
 		$(use_enable kate) \
-		$(use_with kde kde-solid) \
+		$(use_with_best_abi kde kde-solid) \
 		$(use_enable libass) \
 		$(use_enable libcaca caca) \
 		$(use_enable libnotify notify) \
@@ -337,7 +355,7 @@ src_configure() {
 		$(use_enable linsys) \
 		$(use_enable lirc) \
 		$(use_enable live live555) \
-		$(use_enable lua) \
+		$(use_enable_best_abi lua) \
 		$(use_enable macosx-audio) \
 		$(use_enable macosx-dialog-provider) \
 		$(use_enable macosx-eyetv) \
@@ -364,7 +382,7 @@ src_configure() {
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		${qt_flag} \
-		$(use_enable rdp libfreerdp) \
+		$(use_enable_best_abi rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
 		$(use_enable samba smbclient) \
@@ -414,20 +432,29 @@ src_configure() {
 		# ^ We don't have these disables libraries in the Portage tree yet.
 }
 
-src_test() {
-	Xemake check-TESTS
+multilib_src_test() {
+	if use test; then
+		if (( $(id -u) )) ; then
+			Xemake check-TESTS PACKAGE_STRING="${P} (${ABI})"
+			cd test
+			Xmake check-TESTS
+		else
+			einfo
+			einfo "Skipping VLC test-suite because we are root"
+			einfo
+		fi
+	fi
 }
 
 DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
 
-src_install() {
-	default
-
+multilib_src_install_all() {
+	dodoc ${DOCS}
 	# Punt useless libtool's .la files
 	find "${D}" -name '*.la' -delete
 }
 
-pkg_postinst() {
+abi_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/"
@@ -437,3 +464,7 @@ pkg_postinst() {
 		ewarn "If you do not do it, vlc will take a long time to load."
 	fi
 }
+
+pkg_postinst() {
+	multilib_foreach_abi abi_pkg_postinst
+}