gentoo resync : 20.03.2022

7 files changed, 13 insertions, 112 deletions

diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest
index ce77b9586cd3..6962cb3eeb81 100644
--- a/media-libs/gmmlib/Manifest
+++ b/media-libs/gmmlib/Manifest
@@ -1,15 +1,9 @@
 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.3.3.tar.gz 747305 BLAKE2B ef055bfdb6efccec5e2e7618677a97b38e314f44486c0d99e704281f2cb78acdf64a1737a8ae2c33b9dde6f60a284b83d9b5ca1949c5a5c7a34894cdbfbb9347 SHA512 9680b2c38f71467a7c4f2c1a6136d1de9c906355ca675ebbafc697daea15fe615aa45f3af3140330f1610946f9c55471038eeb815b1d677b64efb4896515d8fb
-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
-DIST intel-gmmlib-22.0.1.tar.gz 756727 BLAKE2B 767802e5d25b79647af84c10cf2377e07530b61682e564f5d317e308e31090a9427322c4faba78eb072b4c3933968cb575dc24029c174388c6b9a04b3fdc8325 SHA512 a9ad41611ba8fb6b0bf1ab8769ba9d12dd4450728d268d2c099e959c5638593c1cea1eea5fc00a8d9f311881b267e6059b422045deaabf42b35bcd98e1dfc12e
 DIST intel-gmmlib-22.0.2.tar.gz 757146 BLAKE2B 1a1045fea6cb5f3b56732febccaa50b45a8d7019b7977a8edd99e3ebadd53449a70de23e28d1518a41b0e875bd9d879fde424bc7cd9760253084d518e2b29f0d SHA512 87c43a6f730ac13301f2ce0ec75dcd160bfa7a44d32480544f534519937744e618143831e207d3461a6a9dc7409adefd32c318bd8776939599d367a4c4bd9b4a
-EBUILD gmmlib-21.3.3.ebuild 762 BLAKE2B 502ca6165fd0f155c30a0bab51e802ea8f748382694644d738b257d5ad8b77aaea101d805e9098cac6b5deba03c92f5cf03f7dcdb0ecc4c51f9803a2ba5a9e12 SHA512 5d2b77fb6f87f72805495665fe4b8c802429d4890c2d857a0d9e7f6b3676a8ba230f1c4a15ca44645ba5d0e6f92eb17e2e33457ac3dfa6492f7df4134ab6df9c
-EBUILD gmmlib-21.3.5.ebuild 764 BLAKE2B 024e984f0b1e86b4663e763004c5489033f098b21c3cc283b6aef0cec6e0b7bc21d5c419fc9505b0cd4350b36062b6a777c59c77b9dcb52e1e344963466edaa2 SHA512 fceeaf8ab5e739d484e6ce625ec3dd438fb31f6b9727b1b563de4128034bab1cf996e859410a054c1ca3f5201dca0bfd82a76c21534551e891cfd95b9ab36992
-EBUILD gmmlib-22.0.0.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
-EBUILD gmmlib-22.0.1.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
-EBUILD gmmlib-22.0.2.ebuild 766 BLAKE2B 094df50fe26a75d43e2d63cf6a755a241a8bf0962049ce52b00d10447f045fb69456dfafca1930e31c05c7901fabb273034e3d734c78e945b3bfd8412d9454c7 SHA512 8e6071e0beb788289297f5290f4bdb1f98e20b10d930fba84778cb7299ca34e5d041f5a3fbf77455aa4155ae24fb76dcd25e0de95ceee85903e67c3325d4a699
-EBUILD gmmlib-9999.ebuild 845 BLAKE2B ffc7d65df6b699426cf51813f7dc425c4ac94ab09fc43974a811047820e7b228d5ca59653db89483b153d03fe2409853a4b4e2a7cc23f61ef2cb66736a745b03 SHA512 7353902c4f3b38c7305452077284a888e48bb1e7974be92b622c4000ae310bcd7509a2a70c122a729c2675b95a17aabc9befc557cdbf6e205fee61704229c828
+DIST intel-gmmlib-22.0.3.tar.gz 757738 BLAKE2B 37247195cfbfa787f8f0d9c4541bb03034a492a2edc4f8747740abecd5519f7803048d3be1f7f26965d78121deb2865e703764e8f1aeb8b9d944ab0967453da7 SHA512 ee4d51153e498540ba1528d7f1f792ff7c6b3684a38094af41ca323b0467e30b231ac346411aa12efd53cbc5f4dfb83869472a03181669e79074f3fcdf2c1e9d
+EBUILD gmmlib-22.0.2.ebuild 765 BLAKE2B bf289e742c872cf9c69906a70a4fcf7678bcfd2cc80fc40a89e2e2958913c8505bc74d1a99111f30bf9bef31f15c1e8e5065c2648368327cc5ae8de261c64d10 SHA512 bcc09dace580e72b76eb253af9def8715ebf2c9490704b0234e0269e63f05edfce38d4ad060ccaba3808abdab2db33fcaf2a59c134b8f713d2691bb710259488
+EBUILD gmmlib-22.0.3-r1.ebuild 962 BLAKE2B b985222af586f9481786480fa90fcb9d53ca94526ee12a52050a557d04d92d7dccbf12738c857ea121e918f53a07b7cd438d26aa4bf83e03fa247b1d7c5c8d7f SHA512 dfbad61d40e0d7ef12b1802e360ea884cd0c6721873cc56f2ea4a201ccdcbcfaf9e3103472966ab04b0361ca8fff81b17c12fc455d63837afc9143e079028048
+EBUILD gmmlib-9999.ebuild 1041 BLAKE2B ec38f9b28cd6be9bc9698c2e30e05dce3a67b80069d56a280d86676646537de50c0fa679a92b5bc852941b50cd2cf54187aa9c3a157fc1eb409aa036cc0202cb SHA512 5a9e3bfecc94e7e68d8d1917800323fd39dbed6ee11ec3823b443af4de3c19b980ef9c16ddb76d783165f2c05f4d9df09a428dbc8d5d8db3d62a24943f7bb524
 MISC metadata.xml 602 BLAKE2B 3dd974d0293b434877d26265e65ff26cf3b024556b22614012e31169cf7230703f092310cbd4b7bdcf82da4f439e0590f49279e3adbd845de08e7320996032b1 SHA512 48b892b2ad978c1736f8487ea6c3020ba9b94fe0f77306c6c3c48c8d320d04fa513a28bfcb60b991870503fe6dcf7fbf7848e840fd6470c382b4a808bab5b159
diff --git a/media-libs/gmmlib/gmmlib-21.3.3.ebuild b/media-libs/gmmlib/gmmlib-21.3.3.ebuild
deleted file mode 100644
index 66e98449ad8a..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-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-21.3.5.ebuild b/media-libs/gmmlib/gmmlib-21.3.5.ebuild
deleted file mode 100644
index c6bc8d5f5c6a..000000000000
--- a/media-libs/gmmlib/gmmlib-21.3.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 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/0"
-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-22.0.0.ebuild b/media-libs/gmmlib/gmmlib-22.0.0.ebuild
deleted file mode 100644
index 2e977a3d2a9e..000000000000
--- a/media-libs/gmmlib/gmmlib-22.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 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-22.0.2.ebuild b/media-libs/gmmlib/gmmlib-22.0.2.ebuild
index 1e2a71912bdd..2e977a3d2a9e 100644
--- a/media-libs/gmmlib/gmmlib-22.0.2.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.0.2.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/12"
 IUSE="+custom-cflags test"
diff --git a/media-libs/gmmlib/gmmlib-22.0.1.ebuild b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
index 1e2a71912bdd..c99bb7dfa852 100644
--- a/media-libs/gmmlib/gmmlib-22.0.1.ebuild
+++ b/media-libs/gmmlib/gmmlib-22.0.3-r1.ebuild
@@ -12,7 +12,10 @@ S="${WORKDIR}/${PN}-intel-${P}"
 
 KEYWORDS="~amd64"
 LICENSE="MIT"
-SLOT="0/12"
+# gmmlib version 22.0.3 made breaking ABI changes without changing the
+# soname, so the "_1" subslot suffix was added. There is no need to keep
+# this suffix after the next soname version bump.
+SLOT="0/12_1"
 IUSE="+custom-cflags test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild
index ff83cbf204ae..813c2d6ebd0e 100644
--- a/media-libs/gmmlib/gmmlib-9999.ebuild
+++ b/media-libs/gmmlib/gmmlib-9999.ebuild
@@ -18,7 +18,10 @@ HOMEPAGE="https://github.com/intel/gmmlib"
 SRC_URI=""
 
 LICENSE="MIT"
-SLOT="0/12"
+# gmmlib version 22.0.3 made breaking ABI changes without changing the
+# soname, so the "_1" subslot suffix was added. There is no need to keep
+# this suffix after the next soname version bump.
+SLOT="0/12_1"
 IUSE="test +custom-cflags"
 RESTRICT="!test? ( test )"