gentoo resync : 17.02.2021

16 files changed, 385 insertions, 375 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 1de0b63fe212..ed161f6841d2 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 0d7de83f6ff8..74aeb676f8fb 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -1,6 +1,6 @@
 AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc4f8b6114c95ef229654093dabed26ebf1c66aabda2d5039749cce8580a4974c70afdd49e127b791a561a04202338c9b6512870804bce4db SHA512 a49618d773acb377c8015243ac6657e17b65e1f0f54228c391617118ae61199662a6d6398d5c5cd02ceb4cc74dc2b4cedf6488536fbe418768480285c5500773
 DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d
 DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97
-EBUILD colord-gtk-0.1.26.ebuild 1657 BLAKE2B 60f3e47850b590f53ebb2bd6abf4a85625d9ba83178b88abfdaf522415968af32d19e7a540b2aa60ef6657d88bedb56a4d880362422bf352bfa46ed695747378 SHA512 22e5159dfd7c1cf21897ff4a27147cc30db2e77f3bb9287579931b6a8eecbc7c1d51f150a8075e2b052d4f79a09e78b4dcf941922f3d378a7f7067aebe2edd6d
+EBUILD colord-gtk-0.1.26.ebuild 1653 BLAKE2B c846669f9fbf6e1a563437112243ab6fe96cbb8524439f3dd788b825bfd0b15e15600399a43661b23291afbefb30d53035c65a953c66febd939ffd2561306212 SHA512 bf9c41a78a92e03e9e7f5570e9a3ca0a981b499a87a6d62bd31e6b8f8a4bc7066697fcbad4cd13712c9675fef547b776574e8f4182e495ae7afaaeda08dd7694
 EBUILD colord-gtk-0.2.0.ebuild 1308 BLAKE2B 1eba533efbe58238f331951f51a6dce7a198047066fafd7796c56725b9106e5eac7c5f29ee437fdc2f5ae0982f6f430b5b397900a49278751468c1ed5c53c3b6 SHA512 e9b90314c0ec41b19bee04648a165ebe65c5b4523d3e3d1c680640763d38f87060165ebcb73c8b3d10940895089c5016b095ebe7803d0b527d43dac98ee511f6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
index a388681d24d6..03df30c3a140 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0/1" # subslot = libcolord-gtk soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 # We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
 IUSE="doc +introspection vala"
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
index f2b1263b188b..7ce356bdb04b 100644
--- a/x11-libs/gl2ps/Manifest
+++ b/x11-libs/gl2ps/Manifest
@@ -1,9 +1,5 @@
 AUX gl2ps-1.3.8-cmake.patch 2410 BLAKE2B 044a2b9cfd4b108e5e766f062123fec8ea9fe0ca51518419a76f70915501d5ba2e20301a80e92803dccdf90d33a086365e75b0b040bc5cd42ad0a7c9517e1b64 SHA512 9ae64f280ff72e88cccd8daedec283ffef3403a02dbfa5872ec8991a1b6f0c6e0afaa1ff5009ada99cf9a3bb051dccf61614a77947728140b516081de8a624bd
 AUX gl2ps-1.4.2-cmake.patch 1959 BLAKE2B 28725bdca4ec50c4cdb19100d30d3af4fe5705709b0aad92c79ca9d732da862170d922e037da29a43e174bf16b773d9ec73c2034a5f67803dd9e3c97dbc2f4d5 SHA512 a76a7649e8b2b62de6669f1bf1d3f4797708ae659ba8cdf9b3da21319dbc56035876d1b233c5b8934ee93a6b3d1b6562376734c6ef1da8764910a30b8849fe17
-DIST gl2ps-1.3.9.tgz 294907 BLAKE2B b8473f9f3fc6cefa2374f6fdd94fb98d73ea79b9c0087ccc573f6b66eafe11098fc4312d8ff121abe2a8d6c9a3474f69dcb321ef978f8777b6dc077e5504621f SHA512 e6770c27d4832a300b4e16a9f98deb8557e7875460e7aa7e655fdb796f5dfffd5eccdc8b15f5a3ae151713fc46f97dacad48ee7550c41373b6fc8cfd21a437cb
-DIST gl2ps-1.4.0.tgz 300339 BLAKE2B bda8742dea6c1b4eb3e3a3492e6f38229feb6480131ce69e3512e9c558f7817a34bc76985311c3879cfcec5f715f36f0b8300300dd26025cdb7e72478802aa7d SHA512 420b21a5b4397c9a9a2323a8686b8635c2683354c94762d2d0172c661fc36c4298042498dd8ef2323adf32f45aa4e0a3dba146058ccde597e5a46c2027cbf7ce
 DIST gl2ps-1.4.2.tgz 301134 BLAKE2B 43c93f93d09dd7a6af0711819647f5f82c0853a80822dbc600b7502f2c86612f5cb2edc31729c67abbab44cc8fec7aa1fa7e13f0d115b0d79c7a7d45fa1a3079 SHA512 46652e1b3825ace61dbd77c4b0bf451e7671c248eb18bbd3369e2fac00056ea4cd5d2578561984313c239e3b02f78b9d9a76d963c935af65a13bc2abfc538620
-EBUILD gl2ps-1.3.9.ebuild 1234 BLAKE2B c97198ef55c6aacfde9767ea187fe4531c56d2d1219a4a94afe9fbcc7667a0a0dc70dd0c65fbf35c2e7168808db1c7bc34e82787a5ca3ac1b4914fe1a48fa9bf SHA512 c66e6e72040c273a6419df2de8184bdd558bce1a389edd788b4003a20085c822781f7d77fbcb363fe18c65bb84210f7dd11b59efc7c2ac35dabaf80857befbed
-EBUILD gl2ps-1.4.0.ebuild 1226 BLAKE2B 67b345f62c76f0d07d72e4aeb1ad105537d9f999a7d840944db4461f5f1eff31802caffac85ae2852120d00eaf653c9ed536842690e50537d61547258e28a6f4 SHA512 cd55c07246a5befaa970d07b993ed09d705460bc82650e465092bf80c7d4f4bf74e05775df0b9b6bf8be71c52b5c9695d342c8bab95f6845688dcbd201df9b1d
 EBUILD gl2ps-1.4.2.ebuild 1175 BLAKE2B 1d93619d65949298724339055bd760349d077b0cc0e5aadc80a7041c652406c9a83352260795b06ab0ddb7f941067dae3c09a81ad73e4cc6de556243e3b0233b SHA512 5c290a4ed8ab7ebff21a729196c64e013fa8f7df6dc93f7ca98937c7f1aafa6f4560edb5746855bd6ce399e88101fba16ab76a1d4b5e6822880143d5c7bbfa51
 MISC metadata.xml 722 BLAKE2B 357dece0405ffb4a0714a534246c0f119a6b19d08b0d9867695d178af5e68bdf40b55824d35817c44ae85094f1900368ddf167752bc97c184cde687fca631a84 SHA512 0cd6f7dc51149def7310418cf775980f8287b9e40bde438e03dde020623f19b49648662f12e06233be7686eda4a5b75f79e92730dfdfd1a3ae6da80d6413efc9
diff --git a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild b/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
deleted file mode 100644
index 8343480aa877..000000000000
--- a/x11-libs/gl2ps/gl2ps-1.3.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc png zlib"
-
-RDEPEND="
-	media-libs/freeglut
-	x11-libs/libXmu
-	png? ( media-libs/libpng:0= )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-tex/tth
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DUSE_ENABLE_DOC="$(usex doc)"
-		-DUSE_ENABLE_PNG="$(usex png)"
-		-DUSE_ENABLE_ZLIB="$(usex zlib)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild b/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
deleted file mode 100644
index 0bbe8e1f8a04..000000000000
--- a/x11-libs/gl2ps/gl2ps-1.4.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="OpenGL to PostScript printing library"
-HOMEPAGE="http://www.geuz.org/gl2ps/"
-SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc png zlib"
-
-RDEPEND="
-	media-libs/freeglut
-	x11-libs/libXmu
-	png? ( media-libs/libpng:0= )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-tex/tth
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexrecommended )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.8-cmake.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed '/^install.*TODO\.txt/d' -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DENABLE_DOC="$(usex doc)"
-		-DENABLE_PNG="$(usex png)"
-		-DENABLE_ZLIB="$(usex zlib)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		install_name_tool \
-			-id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
-			"${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
-	fi
-}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index a870e32102ee..b62d50597bda 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,7 @@
 AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
 AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
+AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
 AUX gtk+-3.24.8-update-icon-cache.patch 5523 BLAKE2B 648018f807cb1f3d057e986a1422e3fbeb0cf1c050f19569f4a93a9d7e71577370b79f01133e0be048282259af8218f03511c39c8e73b3b912c2c86e91ab935b SHA512 70fa68b08dd140eea1dfa80f2b67d4c6d3d5bd1b5374eda57bd827f9727e89bbd0e2d775676da2dc5d852d3c2f55cbb07d9d791a99a6d90f5f63864a0479fe13
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
@@ -9,9 +10,12 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169
 DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
 DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520
+DIST gtk+-3.24.25-patchset.tar.xz 8884 BLAKE2B 34531ebe0c2ca96d276071bed6b512ccffae4eb8f50263985af3c9c3e74f252690d5fdf354a6bca4cd2e54f7aa2636b2ab676fca13554901b221f1284de7b13e SHA512 11ca6bc40199a11875a31624e29d2d36800ae67ae596d145a146b0fff835f02b7864f46aef3689a7108f53e5db18b4855e34ff1dad1a201937320a51a97716cb
+DIST gtk+-3.24.25.tar.xz 21417428 BLAKE2B 3a5ac2a453a6067bba43c2b712925dea150d1e5d5783d05ff5c1e01db5d04cee3bced6d327f66dcdcfbdd992ecadfe03e1ac1c545280bef4a4bb4d3d4afaff2e SHA512 e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b
 EBUILD gtk+-2.24.32-r1.ebuild 9834 BLAKE2B 75f9eb737608fc5ffe7748c68b6592bb96f1cad3d5f326f5567a906222dbe2db96beeacbb32e89499d5f3122b84d4b81cdbcd2fb5f253fc7f6721725e1978c8f SHA512 0a04b09bc637fda2d76c5be5b1807f6cba88af36bab11279d55dfdb8639272df743a9e717ae5916f500e7bff6f24bb017a75c95e0fbbfb905f5f9b50fb7a715a
 EBUILD gtk+-3.24.20.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
 EBUILD gtk+-3.24.22.ebuild 7256 BLAKE2B 4ef2d43f69c935f272c9f6644138ffc8be51e0f2538a6203082926261c2a8204aa9b84289922026c925dba40e7765cdc7459663f18f7c3dc2e63da1a0fe4e284 SHA512 ec9d464d131e09ef295f2cd9f947eccbf67785878b2552c02cd313d1ca5d3953e9bf4a26a5a075401ad5e9c4d9fe61e9d79b5e43778ab24d9843d7830ba853c7
 EBUILD gtk+-3.24.24-r1.ebuild 7301 BLAKE2B 104a0450e1a5743f69c664a44ba8860c281ee5312f01979794bc1f3e2e087a91d98a609dd69d605907767360a1f21decc6b52e57e757e98545214ee696b0d755 SHA512 0d1931b9432b9a3a16ba374bfdb88c9e4dd5bf5725088c66372aa4490900889d5e9ba7b2478fae466e69e88f40b3ed534c69bceb27241161a88d8d3c68d28c29
 EBUILD gtk+-3.24.24.ebuild 7420 BLAKE2B 9aee21b006d166d6f9e47f12ad966cc05648254ce869bbe2b4b141290349415ef7bf98167d077dab6f7b5eaea20bfd8bef0af8a7dc1ee9d24a55d52195644ef7 SHA512 be0c566c3c41655e280ae7cf09a92fa8ba7d5e17ea3b58ce71cddbe8fffd88fc55dc79c37e75395762dda436a7794fd065b31039a41fbed2b8ea85f8c2105b1b
+EBUILD gtk+-3.24.25.ebuild 7475 BLAKE2B d8f366cc92d969e2f57bd1a3b72b26965c804884ddaa0d4f38599f9f54ccb96b2f4fcd96bde04e6436db64cde99fd94471941b79e0f80634a5702c4af6d86e20 SHA512 f6b27d5fcfbb1c50f7ecc16028b74da6a75bb9610ab61f8ecb96b59dddf188cf442711bb0c9563f9e2ea4885aa8d1988578857c93108033fdb74ae3438c2ac9c
 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb
diff --git a/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
new file mode 100644
index 000000000000..a648ba40f4c8
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
@@ -0,0 +1,121 @@
+From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 1 Nov 2016 15:24:22 +0100
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+Check for gtk-update-icon-cache to install demos, otherwise it is not
+used when building.
+---
+ configure.ac                     |  2 ++
+ demos/gtk-demo/Makefile.am       |  2 +-
+ demos/widget-factory/Makefile.am |  2 +-
+ docs/reference/gtk/Makefile.am   |  1 -
+ gtk/Makefile.am                  | 27 ---------------------------
+ 5 files changed, 4 insertions(+), 30 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36dda2ebaf..df9d9b0e9b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
++
+ ########################################
+ # Windowing system checks
+ ########################################
+diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
+index 4a2f827469..369ba5d3cc 100644
+--- a/demos/gtk-demo/Makefile.am
++++ b/demos/gtk-demo/Makefile.am
+@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
+ dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
+index c33a6d0a95..291f389f53 100644
+--- a/demos/widget-factory/Makefile.am
++++ b/demos/widget-factory/Makefile.am
+@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
+ dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index dc9b80c6c5..bcaa4032c9 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
+ 
+ man_MANS = 				\
+ 	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+ 	gtk-encode-symbolic-svg.1	\
+ 	gtk-launch.1			\
+ 	gtk3-demo.1			\
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 9608ab3355..74792a4b40 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1658,7 +1658,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ 	gtk-query-immodules-3.0	\
+-	gtk-update-icon-cache \
+ 	gtk-encode-symbolic-svg \
+ 	gtk-builder-tool \
+ 	gtk-query-settings \
+@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+ 	$(GMODULE_LIBS)				\
+ 	$(GTK_DEP_LIBS)
+ 
+-gtk_update_icon_cache_SOURCES = updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+-
+ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
+ gtk_encode_symbolic_svg_LDADD =			\
+ 	$(GDK_PIXBUF_LIBS)			\
+@@ -1698,29 +1694,6 @@ gtk_launch_LDADD =				\
+ 	$(top_builddir)/gdk/libgdk-3.la		\
+ 	$(GTK_DEP_LIBS)
+ 
+-if OS_WIN32
+-
+-# Workaround for UAC silliness: programs with "update" in their name
+-# are believed to be installers and require elevated privileges to be
+-# used... Embed a manifest file into executable to tell Windows that
+-# gtk-update-icon-cache.exe doesn't require any special privileges.
+-
+-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
+-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
+-	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
+-
+-$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+-	$(WINDRES) --input $< --output $@ --output-format=coff
+-
+-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
+-
+-endif
+-
+ .PHONY: files
+ 
+ files:
+-- 
+2.30.0
+
diff --git a/x11-libs/gtk+/gtk+-3.24.25.ebuild b/x11-libs/gtk+/gtk+-3.24.25.ebuild
new file mode 100644
index 000000000000..e878b6859cfe
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.25.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 multilib multilib-minimal virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+	)
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.17
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}]
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	# origin/gtk-3-24 imcontext regression fixes up to commit 5f13ee0afe0
+	"${WORKDIR}"/patches
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable aqua quartz-backend)
+		$(use_enable broadway broadway-backend)
+		$(use_enable cloudprint)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(multilib_native_use_enable gtk-doc)
+		$(multilib_native_use_enable introspection)
+		$(use_enable sysprof profiler)
+		$(use_enable wayland wayland-backend)
+		$(use_enable X x11-backend)
+		$(use_enable X xcomposite)
+		$(use_enable X xdamage)
+		$(use_enable X xfixes)
+		$(use_enable X xkb)
+		$(use_enable X xrandr)
+		$(use_enable xinerama)
+		# cloudprovider is not packaged in Gentoo yet
+		--disable-cloudproviders
+		--disable-papi
+		--enable-man
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		# need libdir here to avoid a double slash in a path that libtool doesn't
+		# grok so well during install (// between $EPREFIX and usr ...)
+		# TODO: Is this still the case?
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+	)
+
+	if use wayland; then
+		myconf+=(
+			# Include wayland immodule into gtk itself, to avoid problems like
+			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+			# user overridden GTK_IM_MODULE envvar
+			--with-included-immodules=wayland
+		)
+	fi;
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
+		else
+			touch "${ED}${cache}" || die
+		fi
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 01a1784ff602..a368c18e35de 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,19 +1,11 @@
 AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070
 AUX libva-intel-media-driver-20.4.5_custom_cflags.patch 4078 BLAKE2B 59c525f39ce9ab5546c384641fe8aba017a5cdfe0a4f48dd5acd5d48dc7c6469731c81bb8781ae3be77baaf673e3bee1787fa6623e1ded8b2c3578ff41ba1292 SHA512 0b53bc5a809b305eae939b4ee3a173d59eb433ecb66f67f8c168f4c098689f972fab807e9ee227ca9eac2f80855ad048d45ed262063f031d85ff79813500c643
 AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319
-DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d
-DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536
 DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25
 DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b
 DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea
-EBUILD libva-intel-media-driver-18.3.0.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555
-EBUILD libva-intel-media-driver-18.4.1.ebuild 892 BLAKE2B efb6cbcf1340852a3ca27f5e763be43175e9d6c870877beb4a794f1da03d1e47c8d08668274b9e8dc26f4ef3674581e4bb6518547515c984bff7a6767d011ce1 SHA512 ace25c724f3434ddc08884d7bed8f944e78364d8f72c54b33f1f6f5919596a7a81581b369a0f0b9024858cc274a43df3095a76643a9433fc4a3d54ee1abb1d23
-EBUILD libva-intel-media-driver-20.1.1-r1.ebuild 942 BLAKE2B 212f8314c1abff4908c5bfcc25b05998ce54b77eaf9e7aab153cb669e5e8cada42bd3e1d6149d08c1ae09509c3b8f7e4d09eb51b9549678a3f8b809ef2da2093 SHA512 5675870b98ca4e17077f6589d25cec531ac4e7dd6df6854850b6c3c8ec61f604beccfe32a0c190a58750afb43c6024be66a56bb8379a901fac2230994b4d7613
 EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c
-EBUILD libva-intel-media-driver-20.1.1.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6
-EBUILD libva-intel-media-driver-20.2.0-r1.ebuild 985 BLAKE2B 9c7d9f19c231c5e3137243915fd2ff55f61bd79fd43ce23d21b1bf12572054d2c99b00e5ad249197501c0f270bcbc51dd589f18b0a6308c88adb028fee08a359 SHA512 72b54d7049baf366ba89782f6c098ec24e3435b81b5e4b592b8ce313b2aa8f4ac7bd4e8f1750ffcd17817c1ffff467385bf0e22118b3804af61e710d02471157
 EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
-EBUILD libva-intel-media-driver-20.2.0.ebuild 869 BLAKE2B f060ace5837fa81761fd7a416d2c82647656691e7a356d4d5b1f5f74c06e417cbf8386429762d1a4b9ee63debaaa99efc5a55e6e333f372fe763848040f9e9bd SHA512 65233a25a88643d2d1b6d6d2381ba333a8c28716b178646471b191d691179ddfc45322a25564d189b266f3ee1c5c72ab5014bf374c9f1e6dd6f34b73e7ff8d53
 EBUILD libva-intel-media-driver-20.4.5.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
 EBUILD libva-intel-media-driver-9999.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952
 MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild
deleted file mode 100644
index 14fd59d27674..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.3.0.ebuild
+++ /dev/null
@@ -1,43 +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/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.3.0
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_RUN_TEST_SUITE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild
deleted file mode 100644
index e08e05733d2d..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-18.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 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/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-if [[ ${PV} == *9999 ]] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.4.0
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_RUN_TEST_SUITE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild
deleted file mode 100644
index 6d7e704b973e..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.7.1[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-		-DUSE_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
deleted file mode 100644
index 3c1a6331fa39..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/gmmlib-${PV}
-	>=x11-libs/libva-2.7.1
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild
deleted file mode 100644
index 2fc523061564..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE="X"
-
-PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch )
-
-DEPEND=">=media-libs/gmmlib-20.2.2
-	>=x11-libs/libva-2.8.0[X?]
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-		-DBUILD_TYPE=release
-		-DPLATFORM=linux
-		-DUSE_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild
deleted file mode 100644
index 6d16c9dd9598..000000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
-	if [[ ${PV%9999} != "" ]] ; then
-		: ${EGIT_BRANCH:="release/${PV%.9999}"}
-	fi
-	inherit git-r3
-else
-	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz"
-	S="${WORKDIR}/media-driver-intel-media-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
-HOMEPAGE="https://github.com/intel/media-driver"
-
-LICENSE="MIT BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/gmmlib-20.2.2
-	>=x11-libs/libva-2.8.0
-	>=x11-libs/libpciaccess-0.13.1-r1:=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
-		-DMEDIA_RUN_TEST_SUITE=OFF
-	)
-
-	cmake-utils_src_configure
-}