gentoo resync : 04.01.2022

10 files changed, 14 insertions, 14 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ab5ddc09c719..28ce98e4743f 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 34ab8936eea7..5ee6e39b4a66 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -1,6 +1,6 @@
 DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
 EBUILD metagen-0.7.2-r1.ebuild 708 BLAKE2B 096b3982cd7b27b127b44528b628ed5fd29717ec6f927ef2a84a61107a0177c9caf53c291729618487db0d60aaa9e1af43fe8083ba5dbe8cad360e2b42ced17b SHA512 e62a3ccaaaa439ec322774f7cb0b2c6912a0d1b0c8312fbe34447482f6012298976f9c180c7f8692317a46d074b7b009c46cef61588991796011758c9647c9a1
-EBUILD metagen-0.7.2-r2.ebuild 831 BLAKE2B 179ff715e22997f3e2bf3fd9869af567c1d3be0afc1eea2a3a8d98f4d86c7a440056651e9b334ba836e4f463e36b7b4dfc9e7087700b9c55f77659b8932e1b0f SHA512 8a3510c223346ada9fe5dc962d3c5dd1c408396a3b1ea26339ea8f0039db903bd456b9b9148d80853af3f1e0478c804a3e7f856fedad5c2fa7781a136cb7038a
+EBUILD metagen-0.7.2-r2.ebuild 834 BLAKE2B 92e3d9180b49fcd49ec41f7a3bc92810dfaf31b96a6c3b828ba841f4476bfeb5be56e2d31cbb3457452346cbd654b2fa81875fe22170e06d3df36cd84a077175 SHA512 848ce0bcc332cd1eec100747eea6feb63d94019e71af55295077f9da3da1045bb19352c6227ccdbca0f5ea033419d03ae91bbfbeb277bf43c08758ea7de67151
 EBUILD metagen-0.7.2.ebuild 737 BLAKE2B b8abed80940833688f245cef82963833ddea9994479d11896016bf601677c36b03531a4bba48ac5a7ffd7cd0ca15cb30e1db7890496e8f8e78507b4205e501db SHA512 3e4eef66d79eab73b0c1e4b7c0dd0b6fafe7fed3d529a399729bb9378ce68bb8d75f8eddca165fb7f814470bcceedf828e5dd239948895cea9a2b04d73e847b9
-EBUILD metagen-9999.ebuild 930 BLAKE2B 2ed329c8bfdfff8c72d7ee00b448b70c900bf90f325a7ab0d72f8c85458860c36313eb0597dd01962f446d89d12ac52045318ed879ad7841299f7286c3b01a91 SHA512 4d842ecb22d61cd199138d0692dc3713af538f026354efeb6f6cedab3ebde0be7f6cdd9a500594043af2f4ba282f27b05924b4e1fb86e507b7001cb7971c1a2a
+EBUILD metagen-9999.ebuild 932 BLAKE2B e1ccb42a0aa761701f2370038bf13272bcb0144583317f1f6aff51969dac37f83fe55effb9917904fd9855d14a9a483f02136e8d1242e3d3949fc5750178c147 SHA512 86ad17b1e90ad1e602eaee0687471b360c839dfa87981e012aa3c84eedf720af69a3eafc8ebc8041bbfd8a5c210876f40f770af37b0702890daac6492c3bc555
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-portage/metagen/metagen-0.7.2-r2.ebuild b/app-portage/metagen/metagen-0.7.2-r2.ebuild
index c0b8ff11a9d2..7ade9f82fd3c 100644
--- a/app-portage/metagen/metagen-0.7.2-r2.ebuild
+++ b/app-portage/metagen/metagen-0.7.2-r2.ebuild
@@ -24,8 +24,8 @@ python_install_all() {
 	doman docs/metagen.1
 
 	# Bug 814545
-	mv "${D}"/usr/share/doc/${P}/* "${D}"/usr/share/doc/${PF}/ || die
-	rmdir "${D}"/usr/share/doc/${P}/ || die
+	mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die
+	rmdir "${ED}"/usr/share/doc/${P}/ || die
 }
 
 python_test() {
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index d0a3f9c8dbba..65f6e64cdfda 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -29,8 +29,8 @@ src_install() {
 	distutils-r1_src_install
 
 	# Address expected path warning for /usr/share/doc/metagen-<not-9999>
-	mv "${D}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die
-	rmdir "${D}"/usr/share/doc/metagen-*.*.*/ || die
+	mv "${ED}"/usr/share/doc/metagen-{*.*.*/*,${PV}/} || die
+	rmdir "${ED}"/usr/share/doc/metagen-*.*.*/ || die
 }
 
 python_test() {
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 1e117965ba65..4f6bc2f5f2b4 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,10 +1,10 @@
 DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
 DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
 DIST portage-utils-0.92.tar.xz 1819676 BLAKE2B 01798e3984745140bca1bcc1eda5c2aea7c517bee2656acfe1bd810fc8088ddcb474f2c64fee6832c5e1699e2ec8ad5a9c6d5afba8a2e2b6f1861d49fbf7fcb7 SHA512 7d36263c9c242c8e82786fa12e171a3f396f65520acb8caa91516862615bd71241699ab6c2232122f7009875aa0a10b06b614a842d45afc86e599b39711e12b3
-DIST portage-utils-0.93.1.tar.xz 1795788 BLAKE2B b2ec546ad391d9d1862321907120e24d8d451166d759ea1f1f0d12aa6e34627c9bca9fcd331c02310937e739171428f3491f596d5e01aac2d699fa924f3ca6a2 SHA512 7245e8e75e99f6fec19363b974963bd7ff385c9f6c4834779501030fe9d134a36b32dd1b41d015fed3c81f76fd41a663e9a2fd8246e97d26e3b2ebbce6b5baad
+DIST portage-utils-0.93.3.tar.xz 1796828 BLAKE2B cfad7ab27ff2d92f631f4e31012e8903c5fa6113485f727338812059379cdd4a9552d80dc3aef6bb91264c361c0554fe9054a12347e274c4c5c3db66fd36008b SHA512 c1245aa78d236263cd266fc8565312c2ac30cb992037a7b0f26da04ecf2dfeebc85bff653784e186cf2c7d7468e4772fb0bd93bcdb3a37d46e493d000933e5a1
 EBUILD portage-utils-0.90.1.ebuild 1344 BLAKE2B aa2a6db5a845dae33a6a5e711b3cc2f49d39458bb89bb3498b1b29a87909456f6e361f2108aff2b0dc36bd73189b5d6b0826e352ee47d80c0388bd47b5e08a92 SHA512 54523cfaa4e7362efe036e37f75cb8a40c356569952293ac2e9ee1a8ac289ea1e5f32b0c41c65ad505b5d3e0b686dd1bd4b6ac463ed78b33f89e2850119e170f
 EBUILD portage-utils-0.90.ebuild 1524 BLAKE2B 75878900c8ba8a8a6c8382a0be0a48bf5bb75ef28b12583e437a577cbf3138f6e562675344bb79b3516c7510baed5bf5d69339d0e6924570e21fc45c2f248c0e SHA512 9bd404d97610fedb1e036e5548be12932570fe7916ab486e02835baa1bfa8d8fa59a7c31689b17728d72ee9d8d1a4733823dc611a6c9b2eecc1d58f78b1165ac
 EBUILD portage-utils-0.92.ebuild 1520 BLAKE2B 7dd754e763e53568562d2022bcb09df5c0be58b38675593569bd6c446fb3fd96b2c03919216b42a8e14391578f1d99f368bde20fd093cca0cc4a5d92c358814e SHA512 aa9224219077cbe9e2dbe64594c8f794beead0621e3bc2d1c17d75b2cf1c66fcd625f8b47c74bb73644d7d78c2cf8087f88b2f1964ba4c0d053e2876e81bb66c
-EBUILD portage-utils-0.93.1.ebuild 1526 BLAKE2B 15441470809e412e45b4ff193a93a473049c68cc641585a33e117cb6994269f8b57a6838b4b93dccde6dda2fea6c11dddd2aaf8be6e7db1e873385a28515ede2 SHA512 376f34ca2ef7f551bf8576fcf237cde6f484a7d7a2fabb615b1932fc2947715632e7f7e3eff7968a73dc294d7186fae626a6d5f4abbf2294d9faa075af670e55
+EBUILD portage-utils-0.93.3.ebuild 1526 BLAKE2B 15441470809e412e45b4ff193a93a473049c68cc641585a33e117cb6994269f8b57a6838b4b93dccde6dda2fea6c11dddd2aaf8be6e7db1e873385a28515ede2 SHA512 376f34ca2ef7f551bf8576fcf237cde6f484a7d7a2fabb615b1932fc2947715632e7f7e3eff7968a73dc294d7186fae626a6d5f4abbf2294d9faa075af670e55
 EBUILD portage-utils-9999.ebuild 1528 BLAKE2B 6ffd2e8918b698d5bd889466372feb394b8aed16a16a388f4e2a17d33a94cac296359255efc8a2b339422a6b10ba957e68021895ce90c36c30997e2fb1d97416 SHA512 8aa781c65ec4e0cb67f9b34c1fc184f50b6c81d3c4b3518d51adbe6710d3f6f76ba53e8c6362a70750e2c72aec84b4be87794a8d8135e037bbef4ddcc5ad81e3
 MISC metadata.xml 574 BLAKE2B 1448e8343748e8bbc61128f3a621010ae1f7095872c271962ac24e62abcea8cca7c52034008c0d5691a56ca7f2e242ab4cec7d38fceecc2c39f858d1ceb30ab1 SHA512 dcf9949c990845794a534b34e44e820b16b3700bc993e13707bfac6d26269d2aba00fd3f873b9157ead222d2fa5cdd63d263c098bfc79c1b1f66097fa24f552e
diff --git a/app-portage/portage-utils/portage-utils-0.93.1.ebuild b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
index f11ea5afcccd..f11ea5afcccd 100644
--- a/app-portage/portage-utils/portage-utils-0.93.1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.93.3.ebuild
diff --git a/app-portage/recover-broken-vdb/Manifest b/app-portage/recover-broken-vdb/Manifest
index d292ebb8dbcb..557b9a6e38cf 100644
--- a/app-portage/recover-broken-vdb/Manifest
+++ b/app-portage/recover-broken-vdb/Manifest
@@ -1,6 +1,6 @@
-DIST recover-broken-vdb-0.0.7.tar.gz 13336 BLAKE2B 0c7d2dc73ca6e525edf190caee56f76e918559a4c0da322bb93b5807554d214fd01b53b0cc5c983fa9009b98a5d71f5aac542b26fe6656b9f81989e159f20d8c SHA512 447effe9664781095e8fd9760ff7f63f8b10466299c002e20da3d226843fa9c24a50b2c8f9eebaaa07cecd75a17272757c0e2175dd81e8daf2a59fa7233bc4a3
 DIST recover-broken-vdb-0.0.9.tar.gz 15410 BLAKE2B c8fffa07e817ef2ff825add92aac732036676dd08b2cbdcca60a7c1fa2fc740f0473be2147635701971fb9a0a871c65115a1fa9ea05486cffe747207e432d8fd SHA512 0fd9f5e0d046344ac6c86e446b7c52c11238b1d90cf330558da357b71b5fa577b157adfc6903e94f065de6afb0296df2ae191078836311792ec319f614e39d37
-EBUILD recover-broken-vdb-0.0.7.ebuild 964 BLAKE2B 96b8034955645ba574f79d5c8bf63c791d97d60d34ebdd3e6b5e9ac3d445d4a763fcb558738f8ea2139e6b876eba769d276dd7ee5b6d7ff821743617c2500d5d SHA512 099352bee1d1fe36d3897ed7724dec5524e1626821376e227329e8416558f51683ea953a5a6c2cf4f809675dfcd2de42cd22ce93217448d2cf4aa6f25b4c84f2
+DIST recover-broken-vdb-1.0.0.tar.gz 15723 BLAKE2B a2c39f64f1db3c0cb1e285deb37654575f35fbdd419b5eaabef52293299e70d98cf7804654f596655fb68beff88699cb9f87628ea29ffd1a29cf2893589f9508 SHA512 4a6428b65c33be4128936423c6770f6af9574fe6caef90837a7d9a1d62d4a595c798b29021f81df4dcd39db4e086abb18f256345f2a8f1e0e7c6687863dea092
 EBUILD recover-broken-vdb-0.0.9.ebuild 964 BLAKE2B 96b8034955645ba574f79d5c8bf63c791d97d60d34ebdd3e6b5e9ac3d445d4a763fcb558738f8ea2139e6b876eba769d276dd7ee5b6d7ff821743617c2500d5d SHA512 099352bee1d1fe36d3897ed7724dec5524e1626821376e227329e8416558f51683ea953a5a6c2cf4f809675dfcd2de42cd22ce93217448d2cf4aa6f25b4c84f2
+EBUILD recover-broken-vdb-1.0.0.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
 EBUILD recover-broken-vdb-9999.ebuild 972 BLAKE2B 306c767a94c17e3a943fedd7c72eab00578b68ae671d59c6597c9f26eac9a1b92c77cc50d776cdbffb6b8ad2acf4f26b08e0c10d5f6f40c0cc5d0acca8f71951 SHA512 6bc0864b42ef78c3eeabc7bf04e5715d5c3c1cfdf737eef2301746b741909e1eb716b2926f1417c8a299829410e6d953bbc8ad9cf1d8897da96c3bf8cd5c3ece
 MISC metadata.xml 542 BLAKE2B c65008fabc6fcf791a935f514a218eebff103d0ce07290b84c545d1551ad8f7834b2245299081bb97c659280670bd2b4b252dbe328a0df946ae29c9110f34fc3 SHA512 dda7cb383905a922852267329a6a848f3e1c19c0fa0a97952dff0995192d00bf227722415194514edc778bd68a1634efdee1ab89cc8b0ce2e9433b8420d478a4
diff --git a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.7.ebuild b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
index ce233e99dd61..6bf736875162 100644
--- a/app-portage/recover-broken-vdb/recover-broken-vdb-0.0.7.ebuild
+++ b/app-portage/recover-broken-vdb/recover-broken-vdb-1.0.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/thesamesam/recover-broken-vdb.git"
 else
 	SRC_URI="https://github.com/thesamesam/recover-broken-vdb/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index dfa42f584055..5fbf172e2e62 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,3 @@
 DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
-EBUILD unsymlink-lib-20.ebuild 720 BLAKE2B bfdbe74e0d8ea88448996ae8031dd395b390196753c4fb3efab1b0d27317269ee8b3bdf17ae60e7ede77f9f33e806e11735075fc58dcfd8556b5549380157988 SHA512 c3765512ffc76965dc61db0053d7ad1c76c06c56fab1a3881d8a3877b2e9f369166355175541632c45e676976280b0dd21176f0cb41fadb9c966171925c79407
+EBUILD unsymlink-lib-20.ebuild 721 BLAKE2B eab912763fbe9a46d1b8dc043f4019b50f8980d9759e4e5ee9a85a5976e1f0819349356eddea4b5842cee54398f17cb13f4fc95e687cf084a59401af65c827b9 SHA512 11554b955d9472a9d8115c408aa63c15f1455aceab8a6fe43ddc8e30a70912d4338b38580f813f6c3d6739511ef18191c1f393aa86978408c58767da18633349
 MISC metadata.xml 402 BLAKE2B edaf7e0b834e6f57dd8db2d667a47539d0d1a0ba402880fa79855036fc5f25684657e1b8870aca2705010aae30b189f60eba1a14e18d2ed3956c4277ea013159 SHA512 5bbe61d0e16c6c7dfc928dcdc4ce7fc7006577c0e41d18ea3e1b91c0943050ec232c9c184152c9f248e09cfa15ee3d86796ed22ea903f7286cfd02271d8d7ef1
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
index 3cca8af5cca1..070dd5986d41 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-single-r1
 
 DESCRIPTION="Convert your system to SYMLINK_LIB=no"