gentoo resync : 17.12.2017

3 files changed, 88 insertions, 9 deletions

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index dd358b30ebf0..245b3b8c93ff 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -3,10 +3,12 @@ DIST libva-1.8.0.tar.gz 195261 BLAKE2B d20c1abf419366bdaa32d40d2b5fc8de15c897056
 DIST libva-1.8.1.tar.gz 195281 BLAKE2B 08286fbadb78efc4c55955d4d56c71d27291db8129f837780d150b749593bb1a40ace3716886b02a9ae16063bdce7ef6ea873eb3ebb260c191bc4d7c1f1a7015 SHA512 381267a1835a2c98a5fb093597aa795929afc4c64e2c5fa3aebb6497acf27428dff05ada5ecd698c25c74a350aa5bd9c42baacfcfe7028b2b420d52e10c78bfa
 DIST libva-1.8.2.tar.gz 195281 BLAKE2B ab298599421519cce7ad430cb7d2050e4e5a86fe3f76e1c88a86bbfba382a1052fd742c2984a1b7713bbd53b93b06d56d1fb85a563708920a7bf6d3422b47860 SHA512 1cf6ab6155e53d09d13710e23bf7baf6dfc33fb121d2171792fc258a41a78bbb5741bf6860f72a832f15e027034aa1e19b4feac0a1ba02ce8b19b2081ac730a3
 DIST libva-1.8.3.tar.gz 186915 BLAKE2B 10713e3bd7aaefc033490fc9ef6485ec50774f274f09e9e06fd1479b882b221791375533a6826e5db9a758f2acd74f913a478da61fe32250a3e2d9c0062739fc SHA512 f2f360876d8443a22a3434aa1ac7ec5aa6d4b3cc1f13f475ef74e716f5937acc43e02f9a8b858b5b7b6539da3731f763843d45664cc19c70e81d8b87e93659ea
+DIST libva-2.0.0.tar.gz 191311 BLAKE2B 1515c39f9ff12137b07f753101692c71a5bdd3e9a1e00da427d373307277aff950a31038d132902b4554cb290209b1b29038214de3e9d34c545e6d9854267fb7 SHA512 85c47355d95026e88ad443dbfb2e2dc12c37961dbc001fc051f85e8adada46da9a350cf5d2fe20943ca36fe749f49f88f85f8ee1b9fb93d69b32a75f710609d6
 EBUILD libva-1.7.3.ebuild 2269 BLAKE2B f26dd1b8cc005a35ee3d1b68dcd96015dcccc7191bd77aa50781669a76b226fc2f7c79ff82a348e895994057b39e322181888306d52706e309eb07f23af0c1e8 SHA512 56c8c0c7f479e5fc0a74245001524ee8e9b99920092f2d80ad6392a4c9eee5d37549bcc05b09470a1f323db8107ddff450d6e07a03daba46269f6686f9699b4e
 EBUILD libva-1.8.0.ebuild 2277 BLAKE2B 71878e2da2800329922cd9d332311539ea4147d3074070f0b1c8eeaf062b824dd962d285638e0aec2a8ab908f74ebbed442821f69ef7fc7a1f082ce7bfccfb51 SHA512 1f10b90836c0c5a9bab981c56f32db1a534a563f3dc2e4a9dac95d87d18e56c325ec26fa0a4e1de6d321f2db9e69110d6ce72fa9a5351d6fe51646b988faf9e6
 EBUILD libva-1.8.1.ebuild 2277 BLAKE2B 71878e2da2800329922cd9d332311539ea4147d3074070f0b1c8eeaf062b824dd962d285638e0aec2a8ab908f74ebbed442821f69ef7fc7a1f082ce7bfccfb51 SHA512 1f10b90836c0c5a9bab981c56f32db1a534a563f3dc2e4a9dac95d87d18e56c325ec26fa0a4e1de6d321f2db9e69110d6ce72fa9a5351d6fe51646b988faf9e6
 EBUILD libva-1.8.2.ebuild 2284 BLAKE2B 5f03dd987cf0d5068483a573d1145cbe7dc50d1692becb519db48942fe8f4977c6d72a74b30648530eac5da7592d9eef2d16b24cac65ff5dcf8e93742eded0c4 SHA512 5ade9c6d9d0aa066648bed0de34ccd227a9fca88981b8c7a782c74f0c5bda62ab52d92b0b50b9f9695aeb88a89d97ee642ca31e2484329737ada3daa5e7ad69b
 EBUILD libva-1.8.3.ebuild 2231 BLAKE2B 28f6d39d8e23fd2714acce8982be6462e7035e3fbcbfc91358533a2387a99af25d0247c413ec336cc22fba607dcbbb8ff8e29af5a5ca47f892311ada74fef7eb SHA512 c5d8cadb64d2952cb7e119d87a2c37c3f809b53e8fd5441d54d07e9264d049b50c5115150fd2112da08d0420af53416b6ed90de18db0c8725b68f9160937fee8
-EBUILD libva-9999.ebuild 2231 BLAKE2B 28f6d39d8e23fd2714acce8982be6462e7035e3fbcbfc91358533a2387a99af25d0247c413ec336cc22fba607dcbbb8ff8e29af5a5ca47f892311ada74fef7eb SHA512 c5d8cadb64d2952cb7e119d87a2c37c3f809b53e8fd5441d54d07e9264d049b50c5115150fd2112da08d0420af53416b6ed90de18db0c8725b68f9160937fee8
+EBUILD libva-2.0.0.ebuild 2187 BLAKE2B c1830574389a66b6de0f7537a810c7ddb818281bb56958ffb9395022e45e5d02660d9ce94b4bbac1fa1bc92e67a2b4a5c81d5b8e3b7c630929a2803616f62629 SHA512 4748f3b899f06b17911ee1cc4ec9b318084bb28a86f30c89b722f181fcb5b1a9478ba9d6a85ee70f2f3b919832ea7f8e411f815715e29930d1070b0a74df3bc6
+EBUILD libva-9999.ebuild 2187 BLAKE2B c1830574389a66b6de0f7537a810c7ddb818281bb56958ffb9395022e45e5d02660d9ce94b4bbac1fa1bc92e67a2b4a5c81d5b8e3b7c630929a2803616f62629 SHA512 4748f3b899f06b17911ee1cc4ec9b318084bb28a86f30c89b722f181fcb5b1a9478ba9d6a85ee70f2f3b919832ea7f8e411f815715e29930d1070b0a74df3bc6
 MISC metadata.xml 520 BLAKE2B 1fb6f6e11fdb38e9b1092640e8e15bf666211579f1427798175d8b78d5cf4c3400d9f9be1ea7ab8241e9c8034acf5885f01b472bec126946ef856b2e58f95b98 SHA512 de563ce4e05a8410cf94f2b8776addece7ae152184422592c33bafb5bd946e36afed9e27c32177d6df169492246f22e22f8503c6f62051e701e42618b76dfec0
diff --git a/x11-libs/libva/libva-2.0.0.ebuild b/x11-libs/libva/libva-2.0.0.ebuild
new file mode 100644
index 000000000000..56a848add454
--- /dev/null
+++ b/x11-libs/libva/libva-2.0.0.ebuild
@@ -0,0 +1,79 @@
+# 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/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib versionator
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1)"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm opengl vdpau wayland X utils"
+
+VIDEO_CARDS="nvidia intel i965 nouveau"
+for x in ${VIDEO_CARDS}; do
+	IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	utils? ( media-video/libva-utils )
+	"
+
+REQUIRED_USE="|| ( drm wayland X )
+		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 opengl glx)
+		$(use_enable X x11)
+		$(use_enable wayland)
+		$(use_enable drm)
+	)
+	autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index 0e83286870d5..56a848add454 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -11,7 +11,7 @@ if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
 fi
 
 AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
+inherit autotools-multilib ${SCM} multilib versionator
 
 DESCRIPTION="Video Acceleration (VA) API for Linux"
 HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -22,13 +22,13 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/$(get_version_component_range 1)"
 if [ "${PV%9999}" = "${PV}" ] ; then
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 else
 	KEYWORDS=""
 fi
-IUSE="+drm egl opengl vdpau wayland X utils"
+IUSE="+drm opengl vdpau wayland X utils"
 
 VIDEO_CARDS="nvidia intel i965 nouveau"
 for x in ${VIDEO_CARDS}; do
@@ -41,17 +41,16 @@ RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
 		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
 		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
 	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
 	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+	wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
+	video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] )
 	utils? ( media-video/libva-utils )
 	"
 
@@ -74,7 +73,6 @@ multilib_src_configure() {
 		$(use_enable opengl glx)
 		$(use_enable X x11)
 		$(use_enable wayland)
-		$(use_enable egl)
 		$(use_enable drm)
 	)
 	autotools-utils_src_configure