revbump ebuilds to support multilib-build, changes reviewed by aballier

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

22 files changed, 627 insertions, 145 deletions

diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index a7a2ba98022f..630992b41d3c 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/libva-intel-driver
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.25 2013/12/30 10:06:41 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.26 2014/02/01 15:24:34 axs Exp $
+
+*libva-intel-driver-1.0.20-r1 (01 Feb 2014)
+*libva-intel-driver-1.2.2-r1 (01 Feb 2014)
+
+  01 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +libva-intel-driver-1.0.20-r1.ebuild, +libva-intel-driver-1.2.2-r1.ebuild,
+  libva-intel-driver-1.2.2.ebuild, libva-intel-driver-9999.ebuild:
+  revbump ebuilds to support multilib-build, changes reviewed by aballier
 
 *libva-intel-driver-1.2.2 (30 Dec 2013)
 
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index ef71af6e364a..e7480fe8266c 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -10,17 +10,19 @@ DIST libva-intel-driver-1.2.1.tar.bz2 868981 SHA256 5c6917c961b1de7f0d5ea3a6feac
 DIST libva-intel-driver-1.2.2.tar.bz2 863603 SHA256 19c474782877ec52d5a83e10d4770b65c57cfe9ebd98a7ea43ae5bead04b7044 SHA512 36bec331dc49cf533c61db03805fd2768409b13aa0f2af2427d0411189c9d7ad6e45446a842289cf2166cb019cd5e487bdca631d1b1d66f8f2e23a0b2bb8d2a5 WHIRLPOOL 6efdc24b45bf9e0934b71885e99e3ee2953f89642beb7de42d1d1c8a1f623436cfff5e6b1d46862f3a5a14e7d3edb2b0fd492fdb0a7f702df4d4e5d4bc137317
 EBUILD libva-intel-driver-1.0.17.ebuild 1250 SHA256 d25b493322e39cd9899cb8feb84e427980e2c3d44993c31d6bc5fcd7695aabcf SHA512 7e19809b286c4631e466f3c879c8c807b9b57753e4e12d9a717e33ee76455f160b8f683e0d2893eb418042d6e1ea40a8538bff89b207c63127cb4147bfecd1b4 WHIRLPOOL d37189f84a7f727a1d24c7a610aeefd04ba5ede136c915572854d2b33f6e5843fb1b853b03554dc7494c9a42391e60b618b30fa74a35570de7eae82a9ce3173c
 EBUILD libva-intel-driver-1.0.19.ebuild 1427 SHA256 c175524ca1c8c573286f57856c39709431902c8f7144a4d95e909197bc3fe389 SHA512 9ee17abe86bc2b9fa4c53587035c2b8b3cae29a516d7e1cd0f4524af81f2dbca9ef7907c542fe0cade970b3c8d8594eb88d5f37151bedddddb12b364b6c04a7e WHIRLPOOL 0ea37a3b0701ce7e97d9550b0408f1c936740da0ab7d6bc7b39b69908a8ae9e1c17093af41d3d7e5ef04ec808e1b6ff9724df70c948a1a3af207d4a28f77132d
+EBUILD libva-intel-driver-1.0.20-r1.ebuild 1438 SHA256 bda762d120b9a44dbb52945e656ebffd7e054fe7e1f4de5ead65114473184888 SHA512 78fb06181665de4ecbb8aa304daa6d079d3e76861173ee17d87ff0246d17b2e113cca2b65f81920ee599885854ecc5a1c634e1d7a0a267422b2abb3e6c6a4c0f WHIRLPOOL 5a2dbc27c61109363c745c9aba2ff5fa7e2d61e4bd6af01fed9318eea7def6d4005ffb2dabcd69832374c7c23b4101d839cf48bf5e580c42cfb308f23fbd3622
 EBUILD libva-intel-driver-1.0.20.ebuild 1440 SHA256 195bfa3211f952a4a63862c9795546368ebe0d297c8610831acf567dc5ba9f63 SHA512 067334f72c58671166eab55b005a23bf3c50ba7593137ad022e4300a8e8c5942b818bde2ec644d4d67a220aaf60fc97f9189898a49f8870ee76432db07d1b2df WHIRLPOOL a060b8b4a0ae73b78fa1a953bc7c006a80cad050d26ade8885223afdfc52471dbebc5e5fae1cf204398fe779e5db489c789d12ddec88e34d3f9bbd56b5f04411
 EBUILD libva-intel-driver-1.2.0.ebuild 1439 SHA256 954da0e245f18e2fff00695e2ccbb68e778b25191b41e734db1d70b670e52a2e SHA512 8863c301614404a97258e3162a85be2301252d7b9c8bb2d73bd3f86d42084cf777177c32a3017476bd02da9197b482c739ee79a5b76a8afeb540ffa225d2fe90 WHIRLPOOL 3e0b95d39968177475971f076f359d3e57313e920ed384f990c30e4a61e80e248c6b04666f6823748123282549b5913fafb78d7d030988eab18265252199b951
 EBUILD libva-intel-driver-1.2.1.ebuild 1439 SHA256 b160065080aadb48f1156f3c05536265927a1ebe86adc02403751bbe66dd33e9 SHA512 d2ced2d3adf9e4fe44fb5427d30261ad7df6b1f568a311549efbf1f10049873c6ee2c99e556480e1622cf0df18c649f5f6d309b787b61944e5a2f018bf91fba0 WHIRLPOOL 8d374586b80b6b3d2730f7e7ec83e92ee0271af714f7d87f4696f9895aa0163d61d540aa869e1a71d7ed9bd018e19b16c0dff7e025d29571654894f4cd6af37f
-EBUILD libva-intel-driver-1.2.2.ebuild 1439 SHA256 1ed5f99659028d27ca4ad13ef7040b5090812f43e90c72a4f2797b2a59d7e28d SHA512 a33be57505caf2144f6bccf57cd3be313183b126feb6d47d03492106e4937a2bef00c87f3cbe73eec5113d248c1da003f0c8c7aa383161b765ba0d9af315c036 WHIRLPOOL f4bdbdf0a3903b1dfebebc97364ca052a78139ddab243e03267c105173371bb5333e481e91df56fb9b552ea81dcbcff7de8250d25de2ebbf7c1aaab365073e86
-EBUILD libva-intel-driver-9999.ebuild 1438 SHA256 6b215fcc4daebcbfdf47145755ce215b789d6a4c846782b5be3bd8c4ac8bc652 SHA512 3d2f6744450b2d707b4a260bc13b6a0fdfebdd5dc282ab9124d5015da688d064a72baacbe523c4a7f2aac55d699635971bd8436c6fa44d3141240e102f4e5c4d WHIRLPOOL a20650e0e6c8d6396e51af104c179ff9f7fd57027b21722f08a7cc3745ca1d718b689540b0f0364e96f1522884d0a91cf8b3003314dc8ec4d56daff3e29426c2
-MISC ChangeLog 4130 SHA256 e7805afeb65f5d2560d9a314cc9a5dfa97fb9c0647903e5eecc8d49a98ce7986 SHA512 9d23fefdbb3a4f817fcd47287ea841426394f615bfa52d94008c57c9de633661e5c87465841b6c834ededcbb60a9a49b738aa7c3da7d283801fc6c90864798b4 WHIRLPOOL 6d94bfb9b2fb7c9380ebaa7910a9d0d09341b13444e3f07e5377c1562f71b53cee97cf7dd13651a43dbd943a22c94a5d2fb7795fec365b0eb29a3954eb29e87a
+EBUILD libva-intel-driver-1.2.2-r1.ebuild 1437 SHA256 268b53aa6774f61c761232599a50e28d3184418677959ad423aec65fc69d51f3 SHA512 170426be40b783c3371979cb5ab18456078826189527e926154cb069cb8c1283f0bdde0a5a4bc59cececcd293437e66671ec719c880637f53216db9f23e00820 WHIRLPOOL 070b6d0744016ad1d28d8a7cf30024d20e797d4ade04e61c977871ce7986da9d63832617ef18745d12a092669e65840dfab0d3990509fc8354a92dccf30094dd
+EBUILD libva-intel-driver-1.2.2.ebuild 1434 SHA256 1c8b535825477f0751dced14189d0e13cac0a35dc75f8213c10be61bfc4cb00d SHA512 d271c79a7faed605bde2dbfa5bbce7f124b3d59e42f8d8f08120943ca8ec6e1ba439ca676996ea88b377597c9931c7af10c090bae9579b8361570a3d81c69079 WHIRLPOOL 75c1a4db55c274f480101ebad8765bd048d9d9f8f1a9a6fe0165828f67b064d257f4c6e3c54caf97794e9d85af4b80400840e6024360d40704ae69c6c2a875d2
+EBUILD libva-intel-driver-9999.ebuild 1434 SHA256 87c318262b3c67ae857edae49f9bf271a733f9eef757a102cafceba42c6b6740 SHA512 8f57686ce503441616f798a086d5439b6fc1c35979d2d1ac42aba4886a51ea28cf602db6ebde8b7f28f171b7a2e3330e2e25d405af2b573df67d54a64d7d3b52 WHIRLPOOL d54f9f99403f525b27b41d5df8d71e0c31be5d9db58558da625d0047bdbb668b3c2ff36f79ef3d2f4deb018bf22570acdd01e72906c383e11ad9af8d6d164f34
+MISC ChangeLog 4489 SHA256 b4525ec202ed531bd863c5a18657813505de3df7a4e124a6137bdb15c8f86c9c SHA512 214092da81c36cc352489fcf849db4a20515e959b1a26ddb2c25b37e90a712e8b7ef32573b544c236c66eb0c1b334e29c40ea5d75c56eb74f6966e64dba2db2c WHIRLPOOL 2113c9e3b45d387515e1122cd7d7b6e232bfac81869cee5433f0359f9f0099d2d57637528173349d8c8c95f8acfcbe859b4d806ec8aa2250e1df3f0fb178c3cd
 MISC metadata.xml 439 SHA256 231173effb58a792258a25c612af7b0d0db6c866dc4bf6a9c1d1551a5a4a6d5e SHA512 37ce6cd4f7b53bea6748406bb4fd9c402666e516fa5a772a7b0104f403a5cf44ae9421a06091369a760305b2374307b67cba832a52f2e94b901d1f1b641b974c WHIRLPOOL 38a330bd216d214ef6064065c156badd92f4840ce8c7a4d11a1cd226454217d4f6e6545d7bacd7c31825bf5e676dd7a3597d8825795886ca7bcff799ff175dfd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLBRbIACgkQvFcC4BYPU0qrtACfTFArNHE19sOiyJAWQpo6uH+S
-0loAoIEZHFqZdQe68ywdcye2ikw2Emjr
-=pfqa
+iF4EAREIAAYFAlLtEbEACgkQ2ugaI38ACPCSuAD+L0dv2L7U7kX4QS4Q/3XNcXt5
+KqsDmQwe6wwgh4sNkxAA/iKKllGl4ZApNeEu9qhc6Hu+jhVPLOhfXE7KEb4wawIL
+=Jzx1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild
new file mode 100644
index 000000000000..71aba82d56ae
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.0.20-r1.ebuild,v 1.1 2014/02/01 15:24:34 axs Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	!<x11-libs/libva-1.0.15[video_cards_intel]
+	>=x11-libs/libdrm-2.4.23[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..27469c631b82
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2-r1.ebuild,v 1.1 2014/02/01 15:24:34 axs Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	!<x11-libs/libva-1.0.15[video_cards_intel]
+	>=x11-libs/libdrm-2.4.45[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
+		$(use_enable X x11)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild
index 415b17ed8c91..2146a9a1154e 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild,v 1.1 2013/12/30 10:06:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.2.ebuild,v 1.2 2014/02/01 15:24:34 axs Exp $
 
 EAPI="3"
 
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 72910bdd610d..6bdf8686b524 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.9 2013/06/26 19:06:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.10 2014/02/01 15:24:34 axs Exp $
 
-EAPI="3"
+EAPI=5
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -11,7 +11,8 @@ if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
 fi
 
-inherit autotools ${SCM} multilib
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
@@ -31,28 +32,21 @@ else
 fi
 IUSE="+drm wayland X"
 
-RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
+RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
 	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.45[video_cards_intel]
-	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
+	>=x11-libs/libdrm-2.4.45[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	eautoreconf
-}
+DOCS=( AUTHORS NEWS README )
 
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable drm) \
-		$(use_enable wayland) \
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable wayland)
 		$(use_enable X x11)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README || die
-	find "${D}" -name '*.la' -delete
+	)
+	autotools-utils_src_configure
 }
diff --git a/x11-libs/libva-vdpau-driver/ChangeLog b/x11-libs/libva-vdpau-driver/ChangeLog
index 2b22818bf281..fa8c416cbdc7 100644
--- a/x11-libs/libva-vdpau-driver/ChangeLog
+++ b/x11-libs/libva-vdpau-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libva-vdpau-driver
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/ChangeLog,v 1.4 2013/05/03 22:18:18 jlec Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/ChangeLog,v 1.5 2014/02/01 15:24:44 axs Exp $
+
+*libva-vdpau-driver-0.7.4-r1 (01 Feb 2014)
+
+  01 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +libva-vdpau-driver-0.7.4-r1.ebuild, libva-vdpau-driver-9999.ebuild:
+  revbump ebuilds to support multilib-build, changes reviewed by aballier
 
   03 May 2013; Justin Lecher <jlec@gentoo.org> libva-vdpau-driver-0.7.4.ebuild,
   metadata.xml:
@@ -111,4 +117,3 @@
   +vdpau-video-0.6.9.ebuild, +metadata.xml:
   initial import, bug #317317, ebuild by Frank Richter
   <res@crystalspace3d.org> with small modifications by me
-
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
index f153d63e428d..5d3808db6c9c 100644
--- a/x11-libs/libva-vdpau-driver/Manifest
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libva-vdpau-driver-0.7.4-glext-missing-definition.patch 659 SHA256 031f1a6b43c20fc3ac2f9da841eff02f6950569cb34f0b4be9fc93642d2dd927 SHA512 bb86ef063eb695c77bbe0fd0c273f1c2a479d1803b8381ffaeac5917de8a7d6e11cef33569d75fbbc1d16e9b64913e8f4a60fbb1b80afc5e381033bf34a192de WHIRLPOOL 2a28f72863c6fa0b36f99d398dead39051d895dfdbf3929809d3f5185a121569da96148c2c49a7ccd17cd3ded058f71de0be18fd9ade6844d0989c0d02be6ca5
 DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
 DIST vdpau-video-0.7.3.tar.gz 400121 SHA256 28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266 SHA512 ddaf232dcdd207939e659c88eac4f38a212566e95d6a08afbc22d274585c7a0972c8462c9273b26459628f95ade26081a171f9140cf857386d341e1dda98d63c WHIRLPOOL cddeb9c7de9176b82f11bee96be78fa6be613d1e097f4070e686f6d08a448567a7092f36673aa1c55fd5d3c7493390714c9b1031bf1820a64cb46fb60537685c
 EBUILD libva-vdpau-driver-0.7.3.ebuild 1052 SHA256 cb93ed4cf6bd4e5d96a6bb03e98a5ca39926162c370dae1f330e21e6681b0937 SHA512 34a536dabe2b80a9ba76f01406f352bc43b639bfce1a37ae406d7b973b52dcba861b03ea25fdcb8ca2c37910486618f7b68068c36e3fc53b1c711bec090998cd WHIRLPOOL d761ff628b11391918b40dad39cdad6c89042486b6c247c4c656752702fcf473e34216cab10c9c76c7a5bd4c279344ffa9610185918a863c5f22152a30c3a9af
+EBUILD libva-vdpau-driver-0.7.4-r1.ebuild 1147 SHA256 489b3087f2b8f8fecf2eaa31674ea80ee5f6302824f78a3dbb3dc9aa8b422319 SHA512 c160da132ac119f1cd3426ec5c688db7db667a5be427852bd57c2e76fb0c856cef037538a64f8f7467588b4d89bc103e7babd472009311deb5d55c896089aeec WHIRLPOOL 6ae5aa5bd482f4aecdf95e4246ef57f7919563118dc44eded46315d5b7832fe2115f0f308fb7c7e446bc42f4767cea361b83ff4ef6e10200173d7312dbfeed29
 EBUILD libva-vdpau-driver-0.7.4.ebuild 1115 SHA256 bc032f05336565738817202b79f0c344e067b70926eee462f2859eeff06af6c9 SHA512 3c78b5a695bba075cbeb0974c6f99bd730e04da3e154c569e2cd561551d532db2657d91904b3bcb3ecaf1206bf75d6cf60be9faf60fba298a72802a7e21a394a WHIRLPOOL 8259d12ede7d4374fe916fb32748ee282f0554d7932439980a9af239160871b1e50290e0a6884f765aea786ed47ff921101e184e75988a2594b03e6f7b205850
-EBUILD libva-vdpau-driver-9999.ebuild 1275 SHA256 4a130f0630c481305ded80cd5edef7827873773c7ac002789f0fa61ef4ffd39f SHA512 e448abcac550a628f3c471f4bf85e39dd3fcefe32b03b5b40c3f11252b73b01622aa45414eb3632f5decb6723ad1c757bc4151beb63e6fceadaa888c3d00dcde WHIRLPOOL 236517c94252696fcfc9e8ec824190878d745fddda4c689828e194e0b88ec784cd7ee344f5414bf26244c2ff5a98e716d964923c23f7ee9e6865424f5ed6fa9f
-MISC ChangeLog 3672 SHA256 0f3c7ac90484eff74b06610274173c242c60e93fb4a223aa8629fd4630356241 SHA512 dc3f57229b618b796bc300d76233949a056db2e2ebac649df7d01dc9f0f33a587ca78add158f9a69a7657b1a65088badc5b689d6ae50462de813543faaf5a4a9 WHIRLPOOL 803d1fbedb09533e57af1e7b853d8e257f7c7fc1f09f763a703e7023147d6b2ad07a97e81672c2f3badfdeb6b211ddbf334e6e116cfd54fe65d03e7f8b8a54c6
+EBUILD libva-vdpau-driver-9999.ebuild 1278 SHA256 7e4401a7ca5aed311f5e4e05c354234a3f8e50a22fdef27c78617bdf066028ff SHA512 336b9d4215f6ff8c8c018b7acaabee0c97c5a6c5a5e62e85af61c22c6fa1f4b2366cc45595948f376117f847333982c178339937280d8df68acf23052ff96b9d WHIRLPOOL b2f12f18d021df65eead85903d28eb9acbbe2f52a7b4b126f1cc7cc6fe4199e600e7e61561cc64902b72b7971b2b1a90d513d694870f3c0c1721da6e96ce1571
+MISC ChangeLog 3917 SHA256 e03ab787784ee02b3a4dbb9c08d2c6487c68c4d77359ba88038688a5f927dc8a SHA512 eede6fa4b88677ebdb082026a132f093032fec237b85aabe8196881bcbfb0814e48d7159f3357887269bdcce1549593465e153eae8ba458be0c8ff2056af31b6 WHIRLPOOL 8763301901add51878ff0839478ceb9649294dbe17aba86b76019482cfe8489eeda29f0aa794f8dce5096cdb01fba8e51acfb137515f28540fa91496b2ded4bd
 MISC metadata.xml 260 SHA256 b988a48d8a4e40a98f84e7a463852923b7f2103584e3ca7a46a9212cb621125d SHA512 438a7ea3bc4a9abfa5da583ab08c3a9c195b384fdb6d302996971b0249826cf5edd290640e8d210081178bc48a9df796c9a7d3279599f437eab6e9ccaa32251d WHIRLPOOL e42bf3eb50d3c67373a648d1de56c66c61d6f1ab7762993bdce2adb86254a8bdf219bdad0a849468102d6f3bf6d520bb007e7c28193c52dc331d97eebf42fec6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREKAAYFAlGEN7AACgkQgAnW8HDreRbf2gCffus5V4YP7fv8zUs+L0XYxcsV
-heoAnRKeT3R8K7/NNYQZpBxkKFfrhvev
-=/o6N
+iF4EAREIAAYFAlLtEbsACgkQ2ugaI38ACPBuTwEAgREmdNDbsjPYTxFpsJJOhJZr
+gKe/caFmihzsl9fSqaAA+gJ8oeK9crEG3Mja3eRKfuPTcNw3qLHFq1idHUFrcREG
+=uTJV
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..40901940513d
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r1.ebuild,v 1.1 2014/02/01 15:24:44 axs Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib eutils
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.1.0[X,opengl?,${MULTILIB_USEDEP}]
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	x11-libs/libvdpau[${MULTILIB_USEDEP}]
+	!x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-glext-missing-definition.patch"
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild
index 9fe5110c63fd..07762a0ba4db 100644
--- a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild,v 1.1 2012/11/21 17:53:31 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild,v 1.2 2014/02/01 15:24:44 axs Exp $
 
-EAPI=4
+EAPI=5
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -10,8 +10,8 @@ if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/vdpau-driver"
 fi
-
-inherit autotools ${SCM}
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
 
 DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
@@ -31,27 +31,20 @@ else
 fi
 IUSE="debug opengl"
 
-RDEPEND=">=x11-libs/libva-1.1.0[X,opengl?]
-	opengl? ( virtual/opengl )
-	x11-libs/libvdpau
+RDEPEND=">=x11-libs/libva-1.1.0[X,opengl?,${MULTILIB_USEDEP}]
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	x11-libs/libvdpau[${MULTILIB_USEDEP}]
 	!x11-libs/vdpau-video"
 
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
 
-src_prepare() {
-	eautoreconf
-}
+DOCS=( NEWS README AUTHORS )
 
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		$(use_enable debug) \
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
 		$(use_enable opengl glx)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS README AUTHORS
-	find "${D}" -name '*.la' -delete
+	)
+	autotools-utils_src_configure
 }
diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index 32673111d8fb..446fedc6460d 100644
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/libva
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.54 2013/06/29 03:43:38 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.55 2014/02/01 15:24:22 axs Exp $
+
+*libva-1.2.0-r1 (01 Feb 2014)
+*libva-1.2.1-r1 (01 Feb 2014)
+*libva-1.1.1-r1 (01 Feb 2014)
+
+  01 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/libva-1.2.0-autotools-out-of-source-build.patch,
+  +libva-1.1.1-r1.ebuild, +libva-1.2.0-r1.ebuild, +libva-1.2.1-r1.ebuild,
+  libva-9999.ebuild:
+  revbump ebuilds to support multilib-build, changes reviewed by aballier
 
 *libva-1.2.1 (29 Jun 2013)
 
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 565a5c8cf45e..553087cbd4be 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX libva-1.1.0-wayland1.patch 11570 SHA256 07847d82f6b7f1be27c82f2ecb8c593f4179c90f31bcda9b3716c4c3d7cc5974 SHA512 0bf244fb22b4946c065376209f2ed24fb68c6c43bb133af1e10c8e5b7991374ec5de639a927d33053ae13720545b7e1505a7504267982308ad32e1707d7ff216 WHIRLPOOL 9efe511bfc46243f52351696a8e31138a80102d30133818d762456f60ae166baff02c53e93ad94cb8ad70bb45fdd3b2daa8f20acf3debc1232e8e35da22e6a7b
+AUX libva-1.2.0-autotools-out-of-source-build.patch 309 SHA256 aa512a9707b4608769c15422a0ce21740ac1598f2582bf2326fba72a4dee616a SHA512 883b94dbfa36f2f5aa667415e99fcba0effb3f88b9bf2243ddfbd1d3f70654103f412be8b08f193ae742458ef7b9fe638520a42bb7eb7a589e82c420fbe79246 WHIRLPOOL 1164d7f399fbd8a23910a187983cb59bcdfa52d8530e8a92d47e592bb61c03c595893d522e106f93b5e2a31ed6e11166cd1deeab7048f3001fa924b8f17265fd
 DIST libva-1.0.15.tar.bz2 488805 SHA256 7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37 SHA512 e82d7c7126ff008500c3df47c93d0e5f8205f3cdaf92dc7be8fa6519a761f58961f908931aea9d4bea2ee4373e1ee02c146d4433fa00f50e6b83384f30fadc6e WHIRLPOOL 61c6ede021fc133e721caea73b0f4b95cba64b9ecddaca471a731207aaf44510e1c61553058b1a5cb5e8b5e4f56c49ace35c1bc7a55f5c715e0d939e39d9d189
 DIST libva-1.0.16.tar.bz2 496776 SHA256 a9a39a2b92eeab73c517de7e6b841c2840b040ea685f850866fe58242cc2f161 SHA512 5c7db891d418764db9cce34175c10a84abdb649aa14cdc10df4a294ef86af707937e13a783748b547294f72d9b11aa075d871198165243bb9870f7e7b92a0019 WHIRLPOOL b388beeef6f738110e6b947a9b59e6c246217372644c9c4488aef78d2d87cfdab52a3c4e6a6c016acf46fbb9ae17aff515e247ebee57ec2a0dbee150e6d0f55a
 DIST libva-1.1.0.tar.bz2 728879 SHA256 db6adc24a6f02f234a823dd8ced4a7e38084581f4ae02b6aac10716e523cefa8 SHA512 3ae73e789a26b6d2eee0a38a5e1dc7f06430dbca5ca73785295ca5a1bcc0bdc0ca2423e481e1304203471b55369faf62b2a234daa6370edc7ca8013affb6eaee WHIRLPOOL 27e6d4648aa2eddf2846f57a1300f97820dd013675bd173a019b9a8b1ccf343109a13df822f8581012020451a35cb485974f97be55bf8d2f131a8988e6807c1d
@@ -11,16 +12,19 @@ DIST libva-1.2.1.tar.bz2 915262 SHA256 70080f8b260ca4316f7e100f2ce15ad3e2356a2b9
 EBUILD libva-1.0.15.ebuild 1698 SHA256 4b4233129b3ba73343c32b5dc549b555e714b9e718dfeed42eac8bf90a76332c SHA512 b1c2914a4885f7bcee2345da434e0a6c34f2a6f8da116d213d36e62256ad8ded736dcb587d4b33c0c07981b02ef30a784ae3e50e01023f588b44a2e0997c1242 WHIRLPOOL b39a53d01deb2b804a61feeb477532e420da27dbd8b37279d27383e01e835ca6d34e9f4b4b7857d86ab0d6f2f8c0f18225032a8c6e415ab08715f354f4950e19
 EBUILD libva-1.0.16.ebuild 1709 SHA256 51de1752e2fb62bd1624cb77f63c8a14bb84bda2ab94a24069953c2233b78134 SHA512 1d3e1f8285dbd06c7863c0c40c59a4049c5dfec91452a044aba17408439cfeffee0f690f861674fbe3a7afe704442ba2461cf328536b8c99af990aa68622dded WHIRLPOOL 229e9aa1f5b753906f571bbcfd6d4ca2553e54b2976060fb390f6dd84333ab78fb9d8ceaee5743513e3066bfcc32b1f55cac4e96f541146556b1b7dd79a9364b
 EBUILD libva-1.1.0.ebuild 1932 SHA256 634e7f50cd3a52c0394b84fdc3dcb5c85a5db342b4b79d0deab1be9d2c2345e9 SHA512 521006edabcdb447a863eaeeb08d38595e7e034c5c035f1f88dbba7883c1aed6a1a013e5c6f60c90d6c75a2976375de9d5920d5f10e2e02fb42fabc5da017187 WHIRLPOOL eb2e29397f0e9822b2287fb72b2447abcdf1208d53b596fb615dc2abbbd70136fc19bee8b1b5f01f13e806ed01e2b67e62d72439bf03cd2a7937919d6a5d75e3
+EBUILD libva-1.1.1-r1.ebuild 2224 SHA256 0ef23a35fe0a3746afeaac43e1a2145df33a805293170cdd3041f9de64f93302 SHA512 69fc883da3a3c2371988dc299a61e0a85f7596e16e3a18c98e073e6fb9ba73dca497c7d2b512458974114aeca38bb143977265596d81f70101e24bc7ca753199 WHIRLPOOL 0c4934b5dd2a8f0278530aa9737627a05a153d4293a8e669b22e1ea79bea4ae5c84258151c10983abc15306d1570ab59ac77eab9c75d1a889e6178f2d7e98e8f
 EBUILD libva-1.1.1.ebuild 1911 SHA256 7889f7e04e38a5d6a4a1dda01ae4382996597a2fb179fad33e3c784dfbcc3b4f SHA512 8be3916ee2b1ec0749dbb149475c29e1a9e59fb7917723a053c53b16f0cd19481cada63da2f68d0ab9d6b34ec02a22ad21a84c4221f68b40f77b33663ebd4219 WHIRLPOOL 1f443afc5ec9c783408f62de2d2400dc460a4894ef6b214d3cf684fc6ac166bde00fd2d0f7725034286793477f844068507e4e23ea415dd10d25b85882435505
+EBUILD libva-1.2.0-r1.ebuild 2436 SHA256 98524af96d5e64eb16de5de0e8f5d2979e592a2a28d0373f32e162c041098b56 SHA512 5099dd5556dfd1ca1b1555f9fcc873f2866f39444b34b69b1a89d3746152c588251bb4a25e017390f5b1c68e0c8b66b8a780864e1e3a05492f2ad0e39446f6b1 WHIRLPOOL 782f466518431586ad5b230f8d0482dfbc177d14946d213ae255a74942a3c07ad1e6c42a305e16d0a1dacfa074b7d8ca85c9a7d53ecc2da6a2a8909dae8139c7
 EBUILD libva-1.2.0.ebuild 2005 SHA256 c54bef8418968923d9eed608381344ac22b46dfcbfe3f33650872b61217ab911 SHA512 357ccfe827089c9da51f2c8f5ea287a8e93c45e9e0cc5206f55a10a1e5d989d69e3ed578d346ffad6f9734b5f700a6af66254c2165b3d15a8fdfc3a2284fa194 WHIRLPOOL febdaab5244c087dc0c4e03c25fbd9998ebbee38361c6586db6b4bda6af82f217f0d79cc84131613e5d9b9933dedc07e1ad99384418cb48fce628c679e48d6ce
+EBUILD libva-1.2.1-r1.ebuild 2278 SHA256 11593c540c80043ebba113c5f8ed19dc79f57ec71273e8148656f459cdafa071 SHA512 594728e1f1d92ecb5440ee8474f0dc616831f5498524957463e317030a9ca224293d3e9cd38f849177057da843d1f8990b5b0a5a330d28c9442a05bb33e55ef2 WHIRLPOOL b2e3f8eef190d7220adf013d745b4d366e45545f49409b2e0328b4bd2805690266ad356f8cc2ce7ce953aea3a9a23c31fc2885d6f09f3fbde595aa320a0ffee2
 EBUILD libva-1.2.1.ebuild 1911 SHA256 aae07077c7f80fcd7ec6bfbe5a626fc7972811c52f5e04093dfa66530b1271d9 SHA512 24e00cf6c814af99d742ee8b6f2f5539814f1ccb81f759956cfaf0ecf870a93dce66f86b546aea51e63fc87369a4775d933f128b30654c0464d6cfb0881b891b WHIRLPOOL 54aa7a38f7e347b610c310000985e64a7ffe0b24155c983afcc4a89043f475ccab0697879087ea2210714496b85f8befa05206d828d975522317be8625308386
-EBUILD libva-9999.ebuild 1911 SHA256 11f85a52911b220adcba673229e12a754871b5dd43a82d779cbad3ea9dc11fa4 SHA512 a86144fdc5e052c5fd911d47cb15b270c26b1e0125fbe726bbeedcef52e598e313bf23c5ddee124395f0c3623a87b7f9067e673336f6e156bb1e14915f31316e WHIRLPOOL 199d1b685b9098000a9ab36194018567902d3248e0b19a4409a95b25e574bf61cd58d2d87074f09437c2228cde9c04e1ab67db40b33b4d8fd0c61b534ca2b1a3
-MISC ChangeLog 8141 SHA256 8fb081e8662473c5afc1077cec477325eb62dc7f8bec417dc15180e58b88b8ee SHA512 383256e8dadc021629f05e16682a3b5cd4ca10912993a882ac0928378e6df001b8d7a7065457abde1d2689d967f11c473aac1e8711e64b0755855c4ba41a36a8 WHIRLPOOL 151c9723b5c785a0efbed0d9f0efe4958c047eebbaa66d3d2879e70b664f7f95cc3a0e42b3d336cf3b81668a505787743dc886cd49e18695dd32a79cf9ff85b1
+EBUILD libva-9999.ebuild 2275 SHA256 7f52f58be5f0a20db4e057e2ab415a09c3fbfb7ebb3e5f1cc2595584259f4589 SHA512 d7756b6ecb618595e6b26bbfc5099af741eb42bd37a99ebfde394a7fb236de5a1a0887d11c5fe912fb959e5c9dccdfbd79edea695b7d5b2368e0e3cf949b152c WHIRLPOOL 45a4944c2f447496da7728c1bfb5d55f618dc3251398f95f44f95ce8971c44350daf4033837e3605eeddd1f469de7fefab391e3f23c958e79be500473a505504
+MISC ChangeLog 8512 SHA256 48ca329828896f31f092a4832cb14c0614fbaddc6964f4999ddd726ffd10646e SHA512 0ebd454405dd3a0e0056fad2b11d942abe821375e975f399b788d4ed0cafadc0384b7bb2c7287bec05e239bffec30aa977c7c589f832bffa3ca68ced8fb2fb1c WHIRLPOOL a941d045128dc954e9a1effebd44aaa8060cf13cc61af9da335314e443bfe1acec5d8831ea27cc3896221493ef0868be170cac2be214fe24e20ee864f0587826
 MISC metadata.xml 360 SHA256 89b04f6b5df8b32ce52e950dd6861ab8b27c56ee9187b511b07d557d583d47b9 SHA512 ffbf3e513601bcd30a21371790c4379136de2193246881e8b01d19ffe837fa387ab0277ff8d3e0218157ca1c070a9eb74c0f22cb4be4b9620b41c54746b738d1 WHIRLPOOL 0592d5c21a3c6e73a1b8debab4bc8e2f1f9ca48fdc0e2a0459656de4befd71e763ac3d961936e936443f1a80beedf9b99c8061728b534085587a6136ec1b55fd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHOV+sACgkQvFcC4BYPU0oRxQCbBbVNJAQSh1w0Pz/qqiv65T0h
-q5oAoMtvzy8L5u4K9RV0mh/El12JbbIJ
-=J12t
+iF4EAREIAAYFAlLtEacACgkQ2ugaI38ACPAOawD+Jkk8SENkIkoR5NcNPaQsTONP
+mlFzoqN4lSQR5pWxMRYA+gPZubvxNgBBFGDLabTC1f2caSwZcDdml+ljq9p2y1N7
+=Qpjd
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch b/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
new file mode 100644
index 000000000000..6d36154ea027
--- /dev/null
+++ b/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
@@ -0,0 +1,11 @@
+--- a/va/Makefile.am	2013-06-26 21:45:56.000000000 -0400
++++ b/va/Makefile.am	2014-01-29 14:41:48.878917222 -0500
+@@ -59,7 +59,7 @@
+ 
+ libva_ldflags = \
+ 	$(LDADD) -no-undefined	\
+-	-Wl,-version-script,libva.syms \
++	-Wl,-version-script,$(top_srcdir)/va/libva.syms \
+ 	$(NULL)
+ 
+ lib_LTLIBRARIES			= libva.la
diff --git a/x11-libs/libva/libva-1.1.1-r1.ebuild b/x11-libs/libva/libva-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..d1d095044528
--- /dev/null
+++ b/x11-libs/libva/libva-1.1.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.1.1-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
+	"
+
+REQUIRED_USE="opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.2.0-r1.ebuild b/x11-libs/libva/libva-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..a5472d4108bb
--- /dev/null
+++ b/x11-libs/libva/libva-1.2.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.0-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
+	"
+
+REQUIRED_USE="opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${P}-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-multilib_src_install
+	# collision with media-video/mjpegtools
+	mv "${ED}"/usr/bin/{mpeg2enc,mpeg2enc_libva} || die
+}
diff --git a/x11-libs/libva/libva-1.2.1-r1.ebuild b/x11-libs/libva/libva-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..01e9c931c620
--- /dev/null
+++ b/x11-libs/libva/libva-1.2.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.2.1-r1.ebuild,v 1.1 2014/02/01 15:24:22 axs Exp $
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	)
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
+	opengl? ( virtual/opengl )
+	wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
+	"
+
+REQUIRED_USE="opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 631f6448dfe7..d2eb2cd9d186 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.18 2013/06/29 03:43:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.19 2014/02/01 15:24:22 axs Exp $
 
-EAPI=4
+EAPI=5
 
 SCM=""
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
@@ -11,7 +11,8 @@ if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
 fi
 
-inherit autotools ${SCM} multilib
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
@@ -37,44 +38,46 @@ for x in ${VIDEO_CARDS}; do
 	IUSE+=" video_cards_${x}"
 done
 
-RDEPEND=">=x11-libs/libdrm-2.4
+RDEPEND=">=x11-libs/libdrm-2.4[${MULTILIB_USEDEP}]
 	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 	)
-	egl? ( media-libs/mesa[egl] )
+	egl? ( media-libs/mesa[egl,${MULTILIB_USEDEP}] )
 	opengl? ( virtual/opengl )
-	wayland? ( >=dev-libs/wayland-1 )"
+	wayland? ( >=dev-libs/wayland-1[${MULTILIB_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver )
-	vdpau? ( x11-libs/libva-vdpau-driver )
-	video_cards_fglrx? ( x11-libs/xvba-video )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18 )
+PDEPEND="video_cards_nvidia? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	vdpau? ( x11-libs/libva-vdpau-driver[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? ( x11-libs/xvba-video[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.0.18[${MULTILIB_USEDEP}] )
 	"
 
 REQUIRED_USE="opengl? ( X )"
 
-src_prepare() {
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
 
-src_configure() {
-	econf \
-		--disable-silent-rules \
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" \
-		$(use_enable video_cards_dummy dummy-driver) \
-		$(use_enable opengl glx) \
-		$(use_enable X x11) \
-		$(use_enable wayland) \
-		$(use_enable egl) \
-		$(use_enable drm)
-}
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS || die
-	find "${D}" -name '*.la' -delete
+multilib_src_configure() {
+	local myeconfargs=(
+		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+		$(use_enable video_cards_dummy dummy-driver)
+		$(use_enable opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable egl)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
 }
diff --git a/x11-libs/xvba-video/ChangeLog b/x11-libs/xvba-video/ChangeLog
index b02335cdc8cd..98481dd47ee4 100644
--- a/x11-libs/xvba-video/ChangeLog
+++ b/x11-libs/xvba-video/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/xvba-video
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.15 2013/09/05 19:44:48 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/ChangeLog,v 1.16 2014/02/01 15:24:53 axs Exp $
+
+*xvba-video-0.8.0-r2 (01 Feb 2014)
+
+  01 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/xvba-video-fix-out-of-source-builds.patch, +xvba-video-0.8.0-r2.ebuild,
+  xvba-video-9999.ebuild:
+  revbump ebuilds to support multilib-build, changes reviewed by aballier
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> xvba-video-0.8.0-r1.ebuild,
   xvba-video-9999.ebuild:
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
index fc9698a4b340..06d8a77e3ca4 100644
--- a/x11-libs/xvba-video/Manifest
+++ b/x11-libs/xvba-video/Manifest
@@ -2,27 +2,17 @@
 Hash: SHA256
 
 AUX xvba-video-fix-mesa-gl.h.patch 716 SHA256 dfca7a791d22baefeb9b0b7e6b7f8baad0d1f1785c35d1e43019b4a9c5949204 SHA512 103b424161c17c82bf02a35008603db5b17059e77937b9a7727517da6c3e6c211023cb62fe09cdd5035447209c8c10ed293879e576b1b5c7bcae303d79536adb WHIRLPOOL 590e52fd91658d7272940d0265d20e28b06c0f0e43d7c0b2f5764751855e6a31671b94c330b734505843873c7cc00a7656a07d7be285ad0c2571c649d0a30fa7
+AUX xvba-video-fix-out-of-source-builds.patch 372 SHA256 5acd2f0c1ee1a575bdfe9c0323627e74c15d75af0a88ab4e514f145a419ddc15 SHA512 a4ca2d2228a3d1f212b9c8d71c8bb2d1cddad6269802d7b969b5e6d401bb2aba64f33c4fd0a6a910c1b0d96b57b10b654304ccc10dca997130208b29e6986538 WHIRLPOOL b78ce8b5a091e299c7d4ab64cc7e932a37541b4a176b0927137b9d48ab8e8a37abb43b09e70c3f9d0a74a038515486d1fbe1c476d6829e3a0cfe21ec2331e694
 DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
 EBUILD xvba-video-0.8.0-r1.ebuild 1385 SHA256 8e5a99796fae10d8f4878c813c6d80508e9b6aa5cc3aa89185673cbaf391d5de SHA512 91670251bb690dad339446bc9b2289418562f76bddde687c89101fed1b3bcdf40576ca46d9e9e225841d01999d13aa1406c1296e15b95fc00f705059ae91a043 WHIRLPOOL fd808389cb003aaefb26852ee9fb9fa00cb0ad19cf56f6229886c4cee7ba129ed1eae917ab464d5513c43f021fd86215e18203a0e7f81faed0887cd2dd8cd8f0
-EBUILD xvba-video-9999.ebuild 1268 SHA256 d404caf37711f95240ffc6c1460cb675b9b082ab5a53add2bb4a30b869c90c26 SHA512 65bf0b8e8492fa14d9d5ea1326e031559b0e5df6aa4011476553b5a58c271305fd3121882944c877c7ebe2d734751fc5aa3d197df1769e516c9a432073dfc85b WHIRLPOOL d284679e88f3a74e77303148a51f9cb894608a1aaf6115ea75dfc215ac0467ec561dbbfe7142cf60a5aca5e61a7b4b799999b6239dbeb10ca7fb97cb9341ed49
-MISC ChangeLog 2638 SHA256 1f5b43e62c706549c3eb06bc23b6faf86bac9d2e4da9e56ea30d048b468ffab5 SHA512 7e7d024197a26679e0f8f9896c0a53fef3b559bdd49f2c88bf5ba3ea8eb19eda4225be1e692454c321b1789c4862f93c2fefc3f528021ffaf317c9d2551ae1e2 WHIRLPOOL 20f2981a6122f8106b12a53e2bfae275cf4cabe97c9bad900a509287d3a75c0e47e1c0afb445f86aa51be1f350f99d4716f691452c156fcf1b6039a99d0c560c
+EBUILD xvba-video-0.8.0-r2.ebuild 1475 SHA256 5f41655ff0c35e4ba3a5e28a444922b2134f8fa3376067a5fe070c884b5c12e3 SHA512 31ac8dcc4b5215c957722c6caee3524f1a0c275009a88288e9aaf1376e6aac25b7ace04c7dbfa9f8285dca36c655f406917c516b4d7a0823c688e4c501b93ac6 WHIRLPOOL 4eb990a9c5f90976d474c683b60dda30616859ad5a9ad71cc2f90fa44a10673c129d0a6ba75d07af2237de71673dc380bea8bf901c3ff6a031068b71dc6b8731
+EBUILD xvba-video-9999.ebuild 1355 SHA256 16fe02ec0282c491879804375f4323c4d638ddd135f247d6ad6f607df57ec6d9 SHA512 10e0066cfbe41abe63a983ab79cf96a482e9b5f616e21f56394d8ce34becfb7fad9bac57933b1d8f2db7cb542d8aa00afa0e9b09bdc72bea58ca7ea1bf6b6a48 WHIRLPOOL db8e399de1f737fa417e316c801f65310edfe146857d6d1047ee83c8cfc2b05b0d9c8ecf9bea47c1064eba0989e67a24f79470db9390c5e7e755458adbad5fb2
+MISC ChangeLog 2910 SHA256 cfc6d320e395014750283dd552f5ac1ea5dd5288d835082810cfc9ee92d75873 SHA512 aa427d7883e0b40b1f184d8abdc81b0ddd13ebf154e2d5dc59cdef1782c610f4627b44437452b3296cd29246731cbf992992ae4abcc831a5f486b5c00d871d33 WHIRLPOOL fa379cda6b014de804c99ea28e35d155a690b0a809058108efe7313bc62e22bf082ae45b0ad6e498cc3de1bb2ceb73bc40553a6e7c93e3430c6c481357f3ba01
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKN+EXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkP0P/1LDSJYe+P1MLa4uodzO/ZNE
-DIjSskvnRAFvzcyw/O0+s/QhuA3Oh46lJy8oJgOOIC9O8KfHUA7bu6Og8HoNq1fu
-PWVsv5AhHAizPp+9x/hRaFV+dPlQEEwV+bGV41sru6o+JXSgMkaQB7leLx31Jcr3
-Kh1+hhyz4k3ytfLKG68bOX2gW2m8br2hxdWJrQ7vDTYBODikJisA4/kiIcXx9SUr
-GCrMxqmgCIp1y005KIWzoa7P9SBC+qsf3dl9k58dSFTaR9teTuaGtPoiGIlRgXNa
-rGde3dRQnIJhD8FMeyoCIe/wqyXe/5iEuwNDTWkOBlEBv7+5FK7S1hPt+NWRApgG
-WySqIe9ByFYN0VyoKc864ZaClro6aqPTGPwLN18qvnPxpDLTSliIKM+qUF/DDwYn
-y14a+Tg1oreMATNbIP3JpODyc5tbBBrnpndHu7RNYWsTtZESPrVBxx9kUbvhyVVq
-3njWH0J9oXpR7LZn7VKWqP1IiKBUwODG9K6yVYILA39DnGx85hKNQWKw0Grplo4N
-gN2zF0Q6Gzmz4uUeWs/QsTKC8qZMXdGSdr7+XlSQkEUBX0ia+OSSpzHSbDYPdW+J
-H1WPyIZdNODdHLDJ+I5j5iLbFJXileP1IUujMpiJjBYJuLWcONrQf4TVMkOF9M68
-JAh2wJrrUZidq6uTdfNS
-=ovyM
+iF4EAREIAAYFAlLtEcUACgkQ2ugaI38ACPDyzQD/YY5dW5TzXg0oIJzReQSpnGax
+QNXahxd3xcTyR4AjYvwBAIr5sVFOq//ug2zQcK7FGsIPzW0YZ51/7CcDUpDofx+1
+=T2kK
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch b/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch
new file mode 100644
index 000000000000..23de8559a07a
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch
@@ -0,0 +1,11 @@
+--- src/shaders/Makefile.am	2012-11-23 08:29:10.000000000 -0500
++++ src/shaders/Makefile.am.new	2014-01-30 18:38:27.954753460 -0500
+@@ -25,7 +25,7 @@
+ CLEANFILES += $(shaders_h)
+ 
+ %.h: %.pso pso2h.py
+-	$(PYTHON) pso2h.py -n $*_fp -o $@ $<
++	$(PYTHON) $(top_srcdir)/src/shaders/pso2h.py -n $*_fp -o $@ $<
+ endif
+ 
+ # Only add those targets if the Cg compiler is available
diff --git a/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..9b2b9a593ee5
--- /dev/null
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-0.8.0-r2.ebuild,v 1.1 2014/02/01 15:24:53 axs Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
+[[ ${PV} = 9999 ]] && inherit git-2
+PYTHON_COMPAT=( python{2_6,2_7} )
+AUTOTOOLS_AUTORECONF="yes"
+inherit eutils autotools-multilib python-any-r1
+
+DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/xvba-driver-${PV}.tar.bz2"
+# No source release yet, the src_uri is theoretical at best right now
+#[[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+# newline is needed for broken ekeyword
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND="x11-libs/libva[X(+),opengl?,${MULTILIB_USEDEP}]
+	x11-libs/libvdpau[${MULTILIB_USEDEP}]
+	x11-drivers/ati-drivers"
+DEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
+	"${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+)
+
+S="${WORKDIR}/xvba-driver-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable opengl glx)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
index a79c2eaaa45d..9ea9417d11eb 100644
--- a/x11-libs/xvba-video/xvba-video-9999.ebuild
+++ b/x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.7 2013/09/05 19:44:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xvba-video/xvba-video-9999.ebuild,v 1.8 2014/02/01 15:24:53 axs Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
 [[ ${PV} = 9999 ]] && inherit git-2
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils autotools python-any-r1
+AUTOTOOLS_AUTORECONF="yes"
+inherit eutils autotools-multilib python-any-r1
 
 DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
@@ -21,35 +22,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug opengl"
 
-RDEPEND="
-	x11-libs/libva[X(+),opengl?]
-	x11-libs/libvdpau
-	x11-drivers/ati-drivers
-"
+RDEPEND="x11-libs/libva[X(+),opengl?,${MULTILIB_USEDEP}]
+	x11-libs/libvdpau[${MULTILIB_USEDEP}]
+	x11-drivers/ati-drivers"
 DEPEND="${DEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig"
 
 DOCS=( NEWS README AUTHORS )
+PATCHES=(
+	"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
+	"${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+)
 
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
 		$(use_enable opengl glx)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
+	)
+	autotools-utils_src_configure
 }