gentoo resync : 03.03.2019

3 files changed, 74 insertions, 21 deletions

diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 09b09a495390..73971150124a 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -1,3 +1,4 @@
+DIST intel-vaapi-driver-2.3.0.tar.bz2 2901075 BLAKE2B 606635c2b4ad05119a3fe1269354e2a27b944c56117360b5c4171b679506f3aa10d48057f1c99957efa1cff3b625a315138ac93e616aa14d30d20d540a3bb6a8 SHA512 60f37c09269e6ae07e55ecfc2c046ae7b6321abe71647625310ea7c75627ea875b94ed8e14813a36ec068bbd605c6d447dfa2c3bd692eb7953a58a871064fd5b
 DIST libva-intel-driver-1.7.3.tar.gz 1648659 BLAKE2B 5d5bf82d02c6e887f4afd332fa395e3044ac9b9bbf8e1682aeaf80d6c61c1db537b27ed22b25e932ec71d9011af07d9008f64df2e7c77a2c6f9dd0e10860d41f SHA512 57ae4fbf1bd5799e8a311fcd67eda1a8a6d5b5267df502b83f63f8bd0cdd510a4f78b4d09088833bfa2e98447d841c3d4e7229f4e75a9d9f4b8096fb14027878
 DIST libva-intel-driver-1.8.3.tar.gz 2591242 BLAKE2B 954ad024ea93073f23045530506c6988cd55bc4bce565856071b30cfc0c10b673a225d4cfdd50cd360a3f828bf236386ba2937e59c260f72717dbdf72a29152c SHA512 0457147aa998014df82ef6180c873fd087b03573adac7ba84c79516a16bd73eb43ff5f07cf3f40c7f590f4e04981ae3010877a468fb20fe4606843932aaa0990
 DIST libva-intel-driver-2.1.0.tar.gz 3954965 BLAKE2B 6ff759860477896df6ee433d7b1ff8f3fda498e98210bfcbec33dc663a65bc07b8304ae219885225985fc65a785d7510aacb785a17d9fd66fb1c16a0ca7ffd57 SHA512 2df0d617a4a64ee37641fd9134f8455f59160d003c252b0e82f7be47adaad7d531f9f2f3ab16d75457b2852e8893887d5be6da5f8128e64ffe8311853baf6453
@@ -6,5 +7,6 @@ EBUILD libva-intel-driver-1.7.3.ebuild 1412 BLAKE2B 9e985438dd80942d725ef893e818
 EBUILD libva-intel-driver-1.8.3.ebuild 1429 BLAKE2B bc33591d741b7e6fe6a339d2f8b89b94a75a86f0c13643b3103a0edaafce267ca6b72bb3fbb38b4d0e979296e7cc45edaa5adce7addfe6dbace9137509ad8144 SHA512 3ef6e33a043bb7184d5240880a41647e89250e8451e2476b7ba1d39b36dec65d66dcd8511cb769f90243a13126d94420c183ba8144dbe23e28eb8942c53c94c5
 EBUILD libva-intel-driver-2.1.0.ebuild 1426 BLAKE2B 1c956f7292f762816ae86ceab6a94acde5a7965772008dff36a0f4ddf1632670570d28c361cd23381dbcdfe22a3d5e0838bcde7582d9229bf0cf521196846bdc SHA512 9ac2e4bf42a57d0a914d64114f475513352850ba5e36f0cf9f1ee8b0a9a98ec17d0cd423862e4bbaeb96087343940aa7f8c4d1c0c2c9a4cd0f33e72dd4f961f8
 EBUILD libva-intel-driver-2.2.0.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
-EBUILD libva-intel-driver-9999.ebuild 1400 BLAKE2B d22802d407a9164b5f1921f9c0cf238bfe51ed37111b21cd4f62449c25c8fbda6296a691e797227ba70a12f169f10cd7e88cb864fc5f92aac7d91aebe678ac7c SHA512 8400d77fd9b3fe407e0b642a9f0f87da047aa827e44be5ddfe4051856698181082a0d073cb7f8c0450e2a17510e76aad16535ebd3ceb7c1fccb56b7f856f1a6a
+EBUILD libva-intel-driver-2.3.0.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
+EBUILD libva-intel-driver-9999.ebuild 1310 BLAKE2B 0941bb1ef76ddfcd7346c12e31ffd1f98cf76f4b15260a9584bb2398c3ffda64b675f401535b2d987a0df74799ba576caee2641b6b2c9f87e23750c8b4c97ee3 SHA512 9f6aea6aae9b45d0ec612b072089ba1f794487447a27b332505cf6390558c33fc8fba3363e9090a8fd61f339ccad5ffb12c54670663ffea30767a78875d591a7
 MISC metadata.xml 421 BLAKE2B f0188d8af65943438672ecd3ca5fdee0050ede13770668e54ebb99cdecbd816a4888f23939ddd1c0f467a000bb9357114db6d1934159cc808d9c981e849ec4b2 SHA512 ce09ecee2e99fa3a1dbb0ba9d320d39b6ed037cb0e6402bc2ea7762acd9dff09313d087e128e377e9d58558cfbc9374dd96acad2ea427a623a68bf1d972b9dd7
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
new file mode 100644
index 000000000000..1d8bbf4cd84b
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.3.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
+fi
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	>=x11-libs/libdrm-2.4.52[video_cards_intel,${MULTILIB_USEDEP}]
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${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 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 92d13cf8a5b3..1d8bbf4cd84b 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,42 +1,40 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-r3
+MY_PN="intel-vaapi-driver"
+if [[ ${PV} = *9999* ]] ; then # Live ebuild
+	inherit git-r3
 	EGIT_BRANCH=master
 	EGIT_REPO_URI="https://github.com/intel/intel-vaapi-driver"
 fi
-
 AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM}
+inherit autotools-multilib
 
 DESCRIPTION="HW video decode support for Intel integrated graphics"
 HOMEPAGE="https://github.com/intel/intel-vaapi-driver"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/intel/intel-vaapi-driver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/intel-vaapi-driver-${PV}"
+if [[ ${PV} != *9999* ]] ; then
+	SRC_URI="https://github.com/intel/${MY_PN}/releases/download/${PV}/${MY_PN}-${PV}.tar.bz2"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
 IUSE="wayland X"
 
-RDEPEND=">=x11-libs/libva-2.0.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+RDEPEND="
 	>=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}] )"
-
+	>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
+	wayland? (
+		>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS NEWS README )
 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"