gentoo resync : 15.12.2019

5 files changed, 5 insertions, 107 deletions

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 34393ae675b9..77d4844ba35d 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,15 +1,10 @@
-AUX gmmlib-19.1.2_so_patch_version.patch 371 BLAKE2B 2a11045d40729e3d5c931a79638b5cefcac9c4f365ac2dea3b38a749a6928f977bb6201db4f0e2a429997cadb36991b241afe636dcf34f58d8045f13d82e8727 SHA512 9b5cf0b90df9b43e22c203e3812689b192af73cd6580976a82744497ff6f3386d8c0782e83b9736ad698a5955b7af61859016794791b13b4152f7c0bcef09169
-DIST intel-gmmlib-18.3.0.tar.gz 620491 BLAKE2B 555a733b42b8e4c40170db9ecabc25bb04779c3aba38b9141f021df1dbe83d74e385a3437d4a87577d9e5ff4df21ce618393909cd98fce4a59ec19aeff4eb44d SHA512 358598873556822be6748a282cd1447ca3e0bcaeb11c2bb8862414bac2ab8e57deee9581fa14bfe22d33d712e567db936332b7fe715dae9816b31121af934dec
-DIST intel-gmmlib-18.4.1.tar.gz 621793 BLAKE2B 41d6f93ec68cf29b8bc2d01c103c69dd4f732ce1aaf72cc959f993af73df9b355f0c4c7c97af4102cc1996e7732597dac4fe0abaf359806e2accbee1bf852d90 SHA512 8dcb5892cfc98822e8173d0a71dfb4883e1ef838de8c936a9b36fb05d61137b7c7d7edf941d3ebd532a1126d8d8b978b95843afb3514ba8cbf3eec54f05c8b8b
-DIST intel-gmmlib-19.1.2.tar.gz 632661 BLAKE2B 4a9995a9e4c8b5c8e081d757193212180fbae3a88040da24be4225149c4c0924b56d5969e125a0c21a5af7b2b3d249277d7e27cb3ce13135c69bb977a976879d SHA512 fcc0beedfc3716b6204627f7daa5e0a5aec720b2a29ab2f8262b613a11d31bfe14dc8476513515d8470cf7d66f58d109ed4d5cf203e041228f53a64cb4a6c243
 DIST intel-gmmlib-19.2.1.tar.gz 633194 BLAKE2B fe6105bd76d18f3c4e0d42550fa91a1cfa75413b7289d4cfd89c6edbd9c2104f11dbb9c549f3331259d3629eba5f3698f8289da5f551f55f9a76cb704680e9fb SHA512 686b47d9de54f96ff1b4b75e595175a08e5a619d1b3f3e71388d851263dcb12315be7834721c88c698d4dbf6f68845d7850ce7a238f4e639ca0896de724c408d
 DIST intel-gmmlib-19.2.3.tar.gz 633252 BLAKE2B 81fcb541cc1a5fe3bd8ebbb2d98b5d4d7d6af409f1b837327c4cc322da7cc77c80992cc22ef6920cfe3704d6cd030bbf5e36936cb7f205e38f65807297a58dcb SHA512 d82973a18804474708e252cd1f0d5205e72dea0b7b14401ff7bad351f94ad7a53ada7def16f62da0810bfa6a747135fb2c7649e4a1fa6fbc4e8f5a38cf948d6b
 DIST intel-gmmlib-19.2.4.tar.gz 633227 BLAKE2B e7ce9143ced27c8be87b807eeb6fa66dec7f0931dda83d7f1ee597682e593798fda6edf665471723df23bb0ca8b730ff88070211728b83478340d80ad982b089 SHA512 7921b11abc2c0658b614decf5bad92a63155aadd35439eb1885e0314ece1b9a983d44ed28b48ae2259f949cb913272583a0c4f064cfacd698dd5c7013d6bff52
-EBUILD gmmlib-18.3.0.ebuild 807 BLAKE2B 7a58c4ee12ab5d2d970742cf8199f71be6e66a44231b58c3ef618a94c0e07b04e27f0767c02545e5f50d667895c7841cfd97425419d0749c493c15807ed03f59 SHA512 9dbbf041162c336914f0877ad0adc74b91ab695eb9886b46e5efdb4a9635e5f77295d3fec65558993d271e70999ea6144430a3ed9f04a000f62e9ca8c4bc3ca8
-EBUILD gmmlib-18.4.1.ebuild 807 BLAKE2B 2800dcb9e11d3b6958c095a31f53c38e4b1633b36e727d0924c6842b862f307ed198ad0b2b23525f973de5720695fabbebe2f94be1ea4d997e56cfb92faec69c SHA512 9777b3431af111fe2ec7cd211bb29bbc242e5b1b07e2eb9ac2b82722c04f59d48a70f5df2bab5c1d3653d96774cd1336dd7b0d98c9f5b1d9e922f2dec49b046a
-EBUILD gmmlib-19.1.2.ebuild 883 BLAKE2B 5ef30d7f29660cebbb9d6e0d0146714c737108e4ec05c01819858d2ac6daaa3a5e0999daf0a20b648228da1aa54ce7cd8b458cad45ec00d0c8409b4ab7fafabc SHA512 cea321160c7b2b74d4b04e12ddcf86295dd680c3f77d4f4b40090a53f6444e6a81b43478059303f54d5cfad1f971acf4c1166777610141b3a86af9178eb279ed
+DIST intel-gmmlib-19.3.4.tar.gz 706943 BLAKE2B 12eef2d0bed76e94770295461935b4056f40dab97bb24acf8e700d2b83198bb8a2800ab9155aebba5138a3269d4aefe645390524d34e57706de750f8e967d106 SHA512 77c7cf1cd3e7f0c2476badca6ae7a36504afb4af5f2c2282e790744a9b8ef668f24c4db8be171eef02394966021b5647921c0faf710e26689cebbd879b786a9d
 EBUILD gmmlib-19.2.1.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 EBUILD gmmlib-19.2.3.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 EBUILD gmmlib-19.2.4.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
+EBUILD gmmlib-19.3.4.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 EBUILD gmmlib-9999.ebuild 819 BLAKE2B b73f418ae95b025e76499a26e5b7bc04923bd1c6115fb1d7d3788ac24bb07c763fcd0fd2e953084f2cb5a476cee303b233afb2860911b7568f0208518e3a61c0 SHA512 43dfe602d4588bd394f0c4218cdf6b40a8094527393cddc5af7d5180b1bdead3f93e312f1a5f8fd7e780f624a765987ef833195b8e3ea727a2805ca8ae5a059c
 MISC metadata.xml 322 BLAKE2B 802cb8da9b68866ac616c175586bc3651330ecbfb1b08fe3fad52ec8817e1994f347ae49815869d50296504d9607fcf6c41d40543d8896fafd8d36c4421604f6 SHA512 52324c98984d04659d8ee327850152e41b6146f45a35b147a1fba2043be7ca91e220dd57fc3712e5154b416d04f8a1b0f614259cd9fde8c66ad7734853bb50ec
diff --git a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch b/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
deleted file mode 100644
index 1fd45de157f2..000000000000
--- a/media-libs/gmmlib/files/gmmlib-19.1.2_so_patch_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Source/GmmLib/CMakeLists.txt
-+++ b/Source/GmmLib/CMakeLists.txt
-@@ -40,7 +40,7 @@
- endif()
- 
- if(NOT DEFINED GMMLIB_API_PATCH_VERSION)
--    set(GMMLIB_API_PATCH_VERSION PATCH_VERSION)
-+    set(GMMLIB_API_PATCH_VERSION "${PATCH_VERSION}")
- endif()
- 
- message(STATUS "API version: ${GMMLIB_API_MAJOR_VERSION}.${GMMLIB_API_MINOR_VERSION}.${GMMLIB_API_PATCH_VERSION}")
diff --git a/media-libs/gmmlib/gmmlib-18.3.0.ebuild b/media-libs/gmmlib/gmmlib-18.3.0.ebuild
deleted file mode 100644
index f0dd8d2cd690..000000000000
--- a/media-libs/gmmlib/gmmlib-18.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-19.1.2.ebuild b/media-libs/gmmlib/gmmlib-19.1.2.ebuild
deleted file mode 100644
index dd16c51e2ef0..000000000000
--- a/media-libs/gmmlib/gmmlib-19.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Graphics Memory Management Library"
-HOMEPAGE="https://github.com/intel/gmmlib"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
-	S="${WORKDIR}/${PN}-intel-${P}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-19.1.2_so_patch_version.patch
-)
-
-multilib_src_configure() {
-# once upstream makes this optional
-#	local mycmakeargs=(
-#		-DMEDIA_RUN_TEST_SUITE=OFF
-#	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-18.4.1.ebuild b/media-libs/gmmlib/gmmlib-19.3.4.ebuild
index 93070e071d29..aee2550263c0 100644
--- a/media-libs/gmmlib/gmmlib-18.4.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-19.3.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake-multilib
 
 if [[ ${PV} == *9999 ]] ; then
 	: ${EGIT_REPO_URI:="https://github.com/intel/gmmlib"}
@@ -31,7 +31,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_configure() {
+multilib_src_configure() {
 # once upstream makes this optional
 #	local mycmakeargs=(
 #		-DMEDIA_RUN_TEST_SUITE=OFF