gentoo resync : 20.12.2017

3 files changed, 59 insertions, 2 deletions

diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 7c46db4b5835..c847559147b1 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -9,6 +9,7 @@ EBUILD libva-intel-driver-1.8.0.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b8
 EBUILD libva-intel-driver-1.8.1.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-1.8.2.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-1.8.3.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
+EBUILD libva-intel-driver-2.0.0-r1.ebuild 1430 BLAKE2B aabb842fd5b41fd85e00a777c40844756a03e32241a35a7241b5132292e2081c04be9a6f711824ad9bce9b045b6dfc1caa68186510a3fb1af0a750ff43b2fc48 SHA512 096c9b223cb3e0fcc7ef60be7a5120f12e4c8d1ff9cd0bf07724d8789aca82e2adfcc7d450b85026847d72d68d7ea60b0501b3cb87cfa4eaf785c34c22379f6b
 EBUILD libva-intel-driver-2.0.0.ebuild 1428 BLAKE2B fb65395624b2a600a9c0ddcf6e6eb1b888272b3b75ce264460193b94c1dea74b76f1a21c202bba8ce7eb5ae13917b17a21c1f543c84f6fdefa6cfffd9791bf70 SHA512 8f455f60bd0d3f04252b3ea2e80fe6d3817e8cbe70711facb55a6d17173f2454c0ffc3375d9cc7890a35d58951d74e91e9d46acb3355c2ce15af721ae470745a
-EBUILD libva-intel-driver-9999.ebuild 1428 BLAKE2B fb65395624b2a600a9c0ddcf6e6eb1b888272b3b75ce264460193b94c1dea74b76f1a21c202bba8ce7eb5ae13917b17a21c1f543c84f6fdefa6cfffd9791bf70 SHA512 8f455f60bd0d3f04252b3ea2e80fe6d3817e8cbe70711facb55a6d17173f2454c0ffc3375d9cc7890a35d58951d74e91e9d46acb3355c2ce15af721ae470745a
+EBUILD libva-intel-driver-9999.ebuild 1430 BLAKE2B aabb842fd5b41fd85e00a777c40844756a03e32241a35a7241b5132292e2081c04be9a6f711824ad9bce9b045b6dfc1caa68186510a3fb1af0a750ff43b2fc48 SHA512 096c9b223cb3e0fcc7ef60be7a5120f12e4c8d1ff9cd0bf07724d8789aca82e2adfcc7d450b85026847d72d68d7ea60b0501b3cb87cfa4eaf785c34c22379f6b
 MISC metadata.xml 421 BLAKE2B 4a4d9faf1984657da212ed918f4dae8cd39e13ed78bb9f65d1eb7a3ca25312b65fbeefd4b06ae584b74468817e232516b49634e28fccbd5d310be5ef74fb74fd SHA512 a4a6264acc0467edc025240668f4ebcf7455e3ffc698dddfa69ae90da0946579ec55c96b346a4eec91e9b8985a12705594687c665df524375a9a8b0e0dbe35ae
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0-r1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..bcc260be80d3
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.0.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/01org/intel-vaapi-driver.git"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/01org/intel-vaapi-driver"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+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-2.0.0:=[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
+
+src_prepare() {
+	sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+	autotools-multilib_src_prepare
+}
+
+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-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 91c3815cfab6..bcc260be80d3 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -31,7 +31,7 @@ else
 fi
 IUSE="+drm wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm?,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
 	wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"