gentoo resync : 22.12.2021

8 files changed, 42 insertions, 157 deletions

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index 572ce00b8d1e..b821f680ad0b 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,15 +1,11 @@
 AUX gmmlib-20.2.2_conditional_testing.patch 1151 BLAKE2B edeb2ff121efeb39e674bc6e4fc37e3603f98875e7d618f4a0bbad49d6d46745c2fdcc2405b3383443af767ab231cddeb1914ccbf0710190fe6c47a94033e638 SHA512 8f6a676104108161e5ca727d231789559bbf1c24b289b25b9809b5b70882e355af976051d31bd4a238df24b13fbe4a3324ce40c3ee3c592e650b34dde8d8a62b
 AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f85c23028e632c44f1cfe41a5fa47c7e94416ac1e5c58a4018a5da024d65e662c301e8d935994f6b53b52414a5f8081208c SHA512 feafa316267e903a25e7889fcbcfb31bd77402715d84d82464ae25f2cf013866c812b1c37bc1d64a8c5e1a0dd3f00e9333658532ad6d7abebf4f67bd6fc46d64
 AUX gmmlib-20.4.1_custom_cflags.patch 2995 BLAKE2B 2e344bd4576c83490dc09e49c6d739e1a06df138fe7f3ff5fd5b4c788f9115f9284a8967b02832ab71ed0f19a4d202e81b865e65ea0c7aa2225a818c366ed465 SHA512 7d4d82aa320ca1aa8f281162e39cc5f9f2e50cb70d2a8df572dd544a8a1b60ed52c903131ee41dd8454f2d1836a8d0a2bf82257f8648d419e0b550c6fe5795bf
-DIST intel-gmmlib-21.2.1.tar.gz 746883 BLAKE2B 9ffd3319bca42558e139f81ab60e5db5328d155b591c08b763c2b02f2728c04c6f96b79547ff3a1e6b8b8cb940cdd01b33ee04f946ac6fa9eefda5439cc49414 SHA512 457d2815204c8e12292fbe6e642a7409df4b3de597972e3c956d5dfae23b5032fc07cf60c0a10bd58aa6dc62a89225a5b704c98689112d23b81f91c1129bcb97
-DIST intel-gmmlib-21.2.2.tar.gz 746635 BLAKE2B abc73cfa209b8212bfe185e1f27a84cefb7ece9134f287e85e67c09bfd4f48e097e410a95d966d2f85c79bc95f753b6ae462a67db031dcd1fc6f46bec9452e22 SHA512 eaca3595c28afb8873b172fff3e178489b7ff736e6e9d80e75939ffd94af6c9c5f7f7429a74e98c9af478ab218cd25242d7c69037afb7193a983f8f02616e81f
-DIST intel-gmmlib-21.3.1.tar.gz 746732 BLAKE2B 537d446839136d6d048d15eb79e18214d797c68dd4288670448e4104e8d6d0701cb93366f77093f264f5392c0c37470b4fbdd0b0da43c9e319c2b334c3315bdf SHA512 54ae92bedadfe8cf7e39786f96bd29b5ace8bbafe8f32620034de8775c5e31fbbd99dd61b10e5fdf12c9f967196c11840e6a202cfb549e5f950f1743cb9b098b
-DIST intel-gmmlib-21.3.2.tar.gz 746990 BLAKE2B b9cc1937d551ff48e317b6a6b70a07f96e6ed1a4a1d27a4cf5be61e97a7ece71cf75a7f2d773f9a42e2c4ad8badf97c06a5cc0dd4a4fa38159a43839f1ac11ac SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be
 DIST intel-gmmlib-21.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
-EBUILD gmmlib-21.2.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
-EBUILD gmmlib-21.2.2.ebuild 1008 BLAKE2B 752f6cdadb79665d1b8befc29bd1c85a0d2feea544ad91f776fab333afc6075a6487c9626522065c26950762487a65d366565e705ee52b324578c5c3a7f62de2 SHA512 4e8138326980584dba5e56b5182551cce96d1672ac4023bd0e369cd3b401af3ca44db04110d84f5253aea235ef80e16a34f76eb5af0298ad28216374be1b1b99
-EBUILD gmmlib-21.3.1.ebuild 1007 BLAKE2B aa984297a3567665d09052dcb4e32c51fba64bb748e5a71960529911c108dbf2a6a1529137b77a57ec4a8e2a714e7f97716b572f99cd270ef3d6a75dd035a232 SHA512 41c09dc0499292bafe5e2c3ef49bcf6d3c40ae6ffb20cfe540d8c505463c0f4e8ce128afb753d4e18fc415c34b558c92c255c3e0a987bbd3f46229f3c4d232d5
-EBUILD gmmlib-21.3.2.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4
-EBUILD gmmlib-21.3.3.ebuild 763 BLAKE2B 29a714a5243bc8110253bea5950b177ea27eac9b8d044b8928b568fbb5f3aa8c06939457103ad7ac69b984199d907d316ddf34bd2baec8b5b7ed4c031f475d2a SHA512 56a203152fe945bca2fd90914e6941890fff8452c575fdf8306a497130e29afe4fc7018c334aae9ccf09ec4f07ceca9e590d3f51ef3d8e035ef6e61bd5c6f8a4
-EBUILD gmmlib-9999.ebuild 842 BLAKE2B b4791d7666070fc1f47b47888e6571c9844a85ec40a3c32e5b846fd7305af8943c97c6160f2995fe47a771067ab4be8d55b34d0393e3d0c13e44024f2897c609 SHA512 25f35b6bbf0033d0455585bfae6909b2bc204d4e43170c482e31b38b4b5f4302a9b6f0dd5a2f7fa2996693fe7cfa51b01165554784de03c71d4c271149608ed1
+DIST intel-gmmlib-21.3.5.tar.gz 747289 BLAKE2B 288cc0e051389818fcd1025e5f9e650dea6e52df08020aec1c1127afa5e422410c825a45eb78fa8343b583c246501371143a1c8176232b81acf314af3b2513af SHA512 59922ced38983333a29c075cef5d28f02331c0e5a28ac556229e474e9a904a19d952d40daedfcca2365ab35212e0c14bf6db0087283ec5d0b932651c450178c4
+DIST intel-gmmlib-22.0.0.tar.gz 755785 BLAKE2B 30d0e5fa87bbec35532b1934741bdbc1616e1af654d8e90f77b176c757207acf806e9f366d0bcd27b752df19373e0513eca462b39fd1eb6b434c4549b243963e SHA512 7d9a1c216ca5e3d15f53e780698303bb0ab580043a37d83b7b014cc4645e371ec66f49fb0c404fe1856350cc33fb9bf5e7006cb7fd065236086496d7270874aa
+EBUILD gmmlib-21.3.3.ebuild 762 BLAKE2B 502ca6165fd0f155c30a0bab51e802ea8f748382694644d738b257d5ad8b77aaea101d805e9098cac6b5deba03c92f5cf03f7dcdb0ecc4c51f9803a2ba5a9e12 SHA512 5d2b77fb6f87f72805495665fe4b8c802429d4890c2d857a0d9e7f6b3676a8ba230f1c4a15ca44645ba5d0e6f92eb17e2e33457ac3dfa6492f7df4134ab6df9c
+EBUILD gmmlib-21.3.5.ebuild 765 BLAKE2B 8f2b0ca1f8991d1dff36eda35542ff8fdeab84d8003c474c5a86885bb19d7d2ebdc9008f3f754a946431f9e68a0128fb280d5847d76401f79bc125bf4c564273 SHA512 494904a861f7a3a8b5775fd261250664f430f9d52272feb64335eafa07daf7205da4d310f64d58119bcbc439b6efc61fb7f12840b17e68cea3788e9f0a62ba55
+EBUILD gmmlib-22.0.0.ebuild 766 BLAKE2B 2fe4baed5e106494905ce5e7963004c2a5507df6274542f7714a252ec034c8f486609aeb879fbe33e64493dfe8ca9360c26e7521396b2937b702f64d15731402 SHA512 648c29b2d47691806d603d63da3cf2f79f67764fa2b01815b77815179d0a4c4ea1c1c46895c7c85ed582d4b8c4eac1d09374545f2b9c88707e1a64166285c9ed
+EBUILD gmmlib-9999.ebuild 845 BLAKE2B ffc7d65df6b699426cf51813f7dc425c4ac94ab09fc43974a811047820e7b228d5ca59653db89483b153d03fe2409853a4b4e2a7cc23f61ef2cb66736a745b03 SHA512 7353902c4f3b38c7305452077284a888e48bb1e7974be92b622c4000ae310bcd7509a2a70c122a729c2675b95a17aabc9befc557cdbf6e205fee61704229c828
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-21.2.1.ebuild b/media-libs/gmmlib/gmmlib-21.2.1.ebuild
deleted file mode 100644
index daef825f99e2..000000000000
--- a/media-libs/gmmlib/gmmlib-21.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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=""
-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="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.2.2.ebuild b/media-libs/gmmlib/gmmlib-21.2.2.ebuild
deleted file mode 100644
index 4e796e2186d3..000000000000
--- a/media-libs/gmmlib/gmmlib-21.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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=""
-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="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.3.1.ebuild b/media-libs/gmmlib/gmmlib-21.3.1.ebuild
deleted file mode 100644
index daef825f99e2..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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=""
-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="test +custom-cflags"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
-	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TYPE=Release
-		-DBUILD_TESTING=$(usex test)
-		-DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
index 75f21bc6ea03..66e98449ad8a 100644
--- a/media-libs/gmmlib/gmmlib-21.3.3.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
 S="${WORKDIR}/${PN}-intel-${P}"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="MIT"
 SLOT="0"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-21.3.2.ebuild b/media-libs/gmmlib/gmmlib-21.3.5.ebuild
index 75f21bc6ea03..2bbab9907b5b 100644
--- a/media-libs/gmmlib/gmmlib-21.3.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-21.3.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-intel-${P}"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/0"
 IUSE="+custom-cflags test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gmmlib/gmmlib-22.0.0.ebuild b/media-libs/gmmlib/gmmlib-22.0.0.ebuild
new file mode 100644
index 000000000000..49b1edad54de
--- /dev/null
+++ b/media-libs/gmmlib/gmmlib-22.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Intel Graphics Memory Management Library"
+HOMEPAGE="https://github.com/intel/gmmlib"
+SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz"
+S="${WORKDIR}/${PN}-intel-${P}"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/12"
+IUSE="+custom-cflags test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch
+	"${FILESDIR}"/${PN}-20.4.1_custom_cflags.patch
+	"${FILESDIR}"/${PN}-20.3.2_cmake_project.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+		-DBUILD_TYPE="Release"
+		-DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index 1f972c3b1914..ff83cbf204ae 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI=""
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/12"
 IUSE="test +custom-cflags"
 RESTRICT="!test? ( test )"