x11-libs/libva: 2.0.0 version bump

Closes: https://bugs.gentoo.org/639404
Package-Manager: Portage-2.3.17, Repoman-2.3.6

3 files changed, 86 insertions, 8 deletions

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 5781f124dc4d..b3987aa47a9d 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -3,3 +3,4 @@ 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
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