gentoo resync : 17.08.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-08-17 11:36:49 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-08-17 11:36:49 +0100
commit: e2db47eaae00ec33f8971db44b68645c5d3b9590 (patch)
tree: 3ec0cf16ddb5854017e134fabebe14bf8cb94a34 /dev-util
parent: 616579b5d773c50af31ee56f00105d96ce641ca2 (diff)
69 files changed, 529 insertions, 79 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c3430a2ecaad..c8c83c88cba1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index a1e7c97d1e6d..700b4577ff96 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,5 +1,5 @@
 DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
 DIST bats-1.4.1.tar.gz 98964 BLAKE2B e7cb70d2d0f448e4336ccf1fe51e93730a7179a782247e28ee906eb576fc02305aeeb2a580b5d34220daf8dfd2ee1d3269fb86a386fdf00483bd3b234df3b75e SHA512 3b00af13ac97d38349f09db79179e170e2b37c5364815e0e1fb957e6593a564d291bb50c54776088dd5784ef8cd597f0c332ec3a574bcef65e3083a5f2fc1f0e
 EBUILD bats-1.3.0.ebuild 814 BLAKE2B eb9e4b8b39ccf123feb41ff3afc027537d9fcfc157b74c252cd37829ebb99a741c82dd710e6787636fcc96140894f810da5243de41122fea3fa890ca8b3c86a4 SHA512 9b8d60b1748431da443626a04672a547e2b6a217344e4c06653835a13d4ad035d5b8a430c72077bb37998468710acaf4d3f74f4a6d6e8dc2a3bb5c6daa25594d
-EBUILD bats-1.4.1.ebuild 817 BLAKE2B dc2fbac0428857444bf8928715ce2c076df9bb7eb92a3b286a78425a87ec5b11fc5f9bfafc7efd1329973f60421744ad3e0e55dfe2ca776451ba449cae5a5e34 SHA512 dc1c5d1d9e36f7c6181f87a4d609be36a00606d235d9cca844476d57d04ac67983cdc46487c6e6db81ee142d2591f7984b3fe8dfd1534b5524a80c8b604a4d0e
+EBUILD bats-1.4.1.ebuild 933 BLAKE2B 4618a1a1b3c19189415a6b331a23cc33b7406fd361b108a5739b663a84c771c20160d0b06932fa589e3f2ff1c46ceddc13d30694b035bd9acae14b1ddd458f7c SHA512 6c915b4bdc4d3d5b859e981dace960d10f748ae8aa4b605fce79caf103d2d2cd6b2b2941f2269dbd16292dd42681f4e68afaefa049f8fbf7b4ea2d3e522be6cf
 MISC metadata.xml 959 BLAKE2B cc406ff1f1902059d614efb8ff9742348c4518403c38dd4f4bfdc78f56dd5b620a79e12cae4fe7f2e4084caba34a68026583be38ab2eeb676907deb180088256 SHA512 e3b0bb9b821c9f93ef85d9e5707402b8401e1ca9b4d68b26e63884a9bdfba56d7c65068fdbc2817726ab470b16a27541dcfbc5b0e91857f67e2784de57231b66
diff --git a/dev-util/bats/bats-1.4.1.ebuild b/dev-util/bats/bats-1.4.1.ebuild
index fba39b434202..d79c423b4e2a 100644
--- a/dev-util/bats/bats-1.4.1.ebuild
+++ b/dev-util/bats/bats-1.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit optfeature
+inherit multiprocessing optfeature
 
 MY_PN="bats-core"
 DESCRIPTION="Bats-core: Bash Automated Testing System"
@@ -20,7 +20,11 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_test() {
-	bin/bats --tap test || die "Tests failed"
+	local my_jobs=$(makeopts_jobs)
+	if ! command -v parallel; then
+		my_jobs=1
+	fi
+	bin/bats --tap --jobs "${my_jobs}" test || die "Tests failed"
 }
 
 src_install() {
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index d095a531068e..8d6e259bd3fa 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -9,6 +9,6 @@ AUX boost-build-1.77.0-darwin-gentoo-toolchain.patch 646 BLAKE2B 96420764d7504ff
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
 DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429
 DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f
-EBUILD boost-build-1.76.0-r2.ebuild 2160 BLAKE2B 863623d5adae1f31b70db03ef0259f123037ee1a40117ef9e615e9f2e0da848946a6efa4fff878a8a93dfd8fe987d3b5a64142d0263921712d841fd383869227 SHA512 0793cfbad9c7b9fd8e4e163bceaf3501b09c72f0b41ebbd3b91e5065a47a1d5cf32c623551ecdfeb8101de23bf262455b8c8c48886a3fe16228b872d85f2dcbd
-EBUILD boost-build-1.77.0.ebuild 2121 BLAKE2B 3a413313d8a7897b53f6a3133acbd1533ab697d32dfe63a4038258d4554cefb28d3674d0b1a870bac40fbca9ac78788b2c106b322400e7dbb214535d790b6322 SHA512 d7f7353aceded5dcd7cffa312eb8e4420798e77b8c9fabc6381972757cbb05b24eea88c4bbb58e69b01fa72bd417b8dadc47dd382495a572b58bd1b78cae1b54
+EBUILD boost-build-1.76.0-r2.ebuild 2155 BLAKE2B f3705ae6770e374d00d4405335662c072dd475dc0a230cb2fc376bb84374554cf11dfc07df059833630ea0131a2f3bce9f4d0aa0059fff33b0996d12d1d1d33b SHA512 b68b1bbaf0713cb0901037d731ba7001d0cab9bfec248bf0f6724211b2b50ba7a759d9f5e0bc66070f37b60c9207dd452bd63f69007ac18d5370316dc3443651
+EBUILD boost-build-1.77.0.ebuild 2116 BLAKE2B 5cad580ff99e6c9a88dcc05665e3fdf5de5cd63e2adc32f0f015d8e8248f2a32285435e586543deaa115c707073d224b0c23dbd2001139bb63aad95273ebd0f1 SHA512 56169c216bdcfbb0e3585e72d9d5ae82a7332db0688a372698f82209fdf51d4d0e260c58102109f42d2a8d271a580cb11069ce3ab5fd8f65f149ec9943ab0546
 MISC metadata.xml 319 BLAKE2B 1033a43af352d26e4a99158b781300b38a97b0e52bf6a140d12b862c52feada5110f6fc8a62a22ad3635a10b98418d6a6810b9fde767cd68f2ac109493517d10 SHA512 adf5a4ccdb69f576918b3ccf54e7b900b1270428a579cfd752706b91d2bf3cf2718de3a37e7b35633560f1d6fc3eb7a84fb8537dac3f67230147ef041cf27b0d
diff --git a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
index 58b4ec906882..1e0b91062eb0 100644
--- a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
+++ b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic toolchain-funcs
 MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
+HOMEPAGE="https://www.boost.org/build/"
 SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
diff --git a/dev-util/boost-build/boost-build-1.77.0.ebuild b/dev-util/boost-build/boost-build-1.77.0.ebuild
index 234c67c0f3fd..d4117bc4ee27 100644
--- a/dev-util/boost-build/boost-build-1.77.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.77.0.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic toolchain-funcs
 MY_PV="$(ver_rs 1- _)"
 
 DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
+HOMEPAGE="https://www.boost.org/build/"
 SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2"
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index ea89225faa51..62316999e615 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -2,8 +2,8 @@ DIST cucumber-core-10.0.0.tar.gz 47173 BLAKE2B 3ce81c4ae9de1dafe444fcae4b2609b78
 DIST cucumber-core-10.0.1.tar.gz 47196 BLAKE2B d048c36e3d28871e603b2092062af1e9a754ce642c365c5f71696f450c2f8fbccd27e3d809980c96929f75a2afb11c216a3b1ce40a0b7f81dfff7495d46f531e SHA512 c7ff950f7fd81824822de0ec485c1890808126c36be4c25ed15048c35491e8891851cf7438ef806bb1456b68281853ac3a0b1f7a598414f794793db83530406b
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 DIST cucumber-core-9.0.1.tar.gz 47009 BLAKE2B 2c78956643dfb08319732af24c08d5df811574891b582ba7ab51281c9a5299a3063c6c607af5cd9659aa0e160c0f3cab1d54b9cbd57d3dbf2768e97bb8f79e8e SHA512 0ac61797cda1d62d2b452d3d843be855f84b12fc9c435e8b5261700a981d94c9c88e36e309d8c2dc637ff195032768d363ffd9e7424c842d5b0ba98c3c678752
-EBUILD cucumber-core-10.0.0.ebuild 937 BLAKE2B 03ed124e774bbccac900eeb53342b7485613d325ff3719e8d1bbd9d6e935ce7444cb8548626fc959509aaed2304942552f5aec2c9b21ff40f12dec388cf13d57 SHA512 576f76e49e010f70a546d1a3e866f762c469e983d4517d228619498ac02d92b543a8c5e6e8b2c4adfe727786ec048df9b75fed86d43a2295285e97bbdf0e5406
-EBUILD cucumber-core-10.0.1.ebuild 963 BLAKE2B a575af4325fdea86617331b26bc3c22d1f37e0afe89f145e04808f04bb0419cfe87e863333cac09f5a343535e662134727141262bc381e4bc78984050d32f4c4 SHA512 15c73645e2681e19a15efcccbaaa09f156e4ddbf3c6c78352a1e4a853fbcc0784ca0ef75fb11c3d70a5b709acc4a20ed5e41e5d927a5c69d04df400e7c5703d3
-EBUILD cucumber-core-3.2.1.ebuild 1063 BLAKE2B 115e5a34df2654655c4c4d4eaafa34bbec22b277a35f484370f73e9987bc3be3809ecd61cd352a76a28b09a9afb929cfc034f82617aaf58bde424a7be07be9fb SHA512 4d0273470f96259204c7f909ddf29704c46adb498524304e4bd19f69505a5c0a78be29ebc32269fbcefce56f69c3ad27ef83df02b00aed40b8095e4b927b6d4b
-EBUILD cucumber-core-9.0.1.ebuild 1133 BLAKE2B e69b419451512f3c0212ac25657531511c5adbdb7868af45741712839ad17e2b37d687459836687895e9a2e593c8db37ba79eb968fbf749e1c95f8145e5790d5 SHA512 342e947e4f480aa3cb0829868914562941d2d085dd76fffedfe06b7d720b99e337fc3957c39bd787eab875446ea6be14b19d64f624a05620d2dccc2311df91a3
+EBUILD cucumber-core-10.0.0.ebuild 910 BLAKE2B 28832d630b2905fad9f86991b168d4f1908dcda685b8ec16c994eb318394aa7c91430ce5ce1e642327c608a193a51f142e26e59dcabaa85453b1c5501a6c5a10 SHA512 bdfcc8db9b12195dd030623d088501ce8cc6d878e6fd31d844ae8335d785901767cb87f6ae785dfa02ba373c7cb764240f8552d0a0044ccf373a5dced436c52b
+EBUILD cucumber-core-10.0.1.ebuild 936 BLAKE2B a5c0960ebc8c4dc7ba5145219723f9ab582c65a68389a6e2873264756bd046972339e5cc79af21df6555b849eaee9b84bb234385a93b46267d79c209fdfbedc7 SHA512 afd48389461d1733a621180f865fa60c1bb51ec876bbc9de23edfb2fa9d1347f9f9535587ac19a8defeaf19bac65993497fe85da0f9bce9824687aed19e50f8f
+EBUILD cucumber-core-3.2.1.ebuild 1036 BLAKE2B 5974f4b5f2e4b10fc89b934e92917e95f500c07334d2d25ff06000f7cb626ff5412446765dee220def380ba8c17beede6778feff8471d80a70af0ded394a5110 SHA512 0063cd60aff9789447e75df8af18e6c1f736505aa124489617811f57a1dbd96387ade525d3273da06987e5596e5ca917e75dc5ed5e28d3a3953da02ac077475f
+EBUILD cucumber-core-9.0.1.ebuild 1106 BLAKE2B 4d96152c96654bb09378888d4737b4b8c9fff618bc4f67a4af0fcd5f0ce124f5bf782cd577693fa3e8b79e0c1876b80dbd63376c8900543a9700ad270023b3c1 SHA512 e020b4060c6c685039fd6be41399cb99450b39b92527cfa978d112045dc764b4653840a75516ba2dd4cc895bfd79ec41df3ee4044824cd07e7daf67216763dc5
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild
index 866432367d74..2a2acdb21bbb 100644
--- a/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-10.0.0.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
index 36392e73a309..d9e7377454f9 100644
--- a/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-10.0.1.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 4cd3f8a785ea..112f5bef7876 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
 inherit ruby-fakegem eapi7-ver
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
index daa24240caf3..61b69c5ce0f3 100644
--- a/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-9.0.1.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber-cucumber-expressions/Manifest b/dev-util/cucumber-cucumber-expressions/Manifest
index 96ae7dcdc923..a0818abd5840 100644
--- a/dev-util/cucumber-cucumber-expressions/Manifest
+++ b/dev-util/cucumber-cucumber-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-cucumber-expressions-10.3.0.gem 23552 BLAKE2B 6aab081690081e991a1c1dfdaac93e114165dc1b2a39a1825e6424304765c96836cec9dcb8635e9f97ef0c07a6b58cfe7fc587c651dc73bab0670f4230828640 SHA512 d560c62f625f6b284a94974cef5227a3623fead9c8c4f45ea9fed2300b37c405ba69161d6c6f5e159b2a36be5eeb05b122789cafcafec0dc84efbb366bd0166f
 DIST cucumber-cucumber-expressions-12.1.1.gem 32768 BLAKE2B 3b885771889349b84ab4a83537d720eef63c44297217a5b06ec78a9759d5617437ee7e1dc98d7dc692a3afbcfbbf1c315b76f2685577e861214b8ca943e6eb00 SHA512 6d931a589e4959d6e2647a3ae2a16fdc57e6de04d3e875277da55a60278548cb789d00216c2cb1374c56bcdc58d2e39228dc03f047d1a3a12774c8c03429c149
-EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 475 BLAKE2B 200a330f113a55b51d98ad04636633b38a369ad76fdd2b20d11fc609b904f40a3bb6ffc107877ec670843aebc9e5f065574916a6d5374754e480a9cff84097df SHA512 fbcc950bcb316eecfffbcdd4addc9a64a7c3c280bab6eb56bae67e5a6ba0973ccef92beeba9653c7310de441488776ef70fbd87852e4dba88c5ca663ec3f6ae1
-EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 482 BLAKE2B fc33a2bc078bd342333bfdb9108b55fcfab9e8736bb320cf7c8b5bbd35307230c772a45611cbf151aaa43d77ebc49355e730cb5eb8ce44dbb90f289b1d166648 SHA512 12c3fc2fb7377bc0bfbae2acf1206827fa653ffb6362a16facbee0a3dd5ce43166fdd49412c4a8ac3d59b065cee9e10ec9772f189dc376551db729f0392a621b
+EBUILD cucumber-cucumber-expressions-10.3.0.ebuild 435 BLAKE2B a3fb096924926c58f912bd465834ecf529e8808f1d33d8dc39028f76c3d634a01bce87c3c89bac7cf1252359f41c01e41c01fa10a38e90fd260ebd1157b35391 SHA512 ebb5527b73b4d7d90f0e1746d116f409480bb1cd2035e749086df000705b1c97f91d7d83c87fc04f3326357e22370bf99c063d0bf7271c91d24abd262c392e09
+EBUILD cucumber-cucumber-expressions-12.1.1.ebuild 442 BLAKE2B edf1cdeff711ed691bd45db3853b786b66a9ba4eafbf05285b0b65a810e2a6f5684452378e9dce71162decc56986210b58dee25b51f5ab84ce168afc47eb8ac5 SHA512 1a1e2b91e32c6cca007ffcac42513add43209d1106254d5e28001d2dd4020a4d36b6db775860badf9381e6e8f735860bf4c2fc88ed3512d2715fbf571668f553
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
index 10db2f04fa4f..25b24f1a86fc 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-10.3.0.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
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
index fb5ffe411c48..a877dd490f7c 100644
--- a/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
+++ b/dev-util/cucumber-cucumber-expressions/cucumber-cucumber-expressions-12.1.1.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index afcdaeb738c1..4b1616a37798 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
-EBUILD cucumber-expressions-6.0.1.ebuild 497 BLAKE2B e766100d932cb89e33b9cc92c683c8039bda695de3d438fa15f3ef4c87c1885a7974d7d9700551821f2a9b905ea6d5c61ea333902639319614a312904f866f70 SHA512 d81f667ac1c9fadc73c93aaf3e7de9db2aaec3760c2c407c29a4b6061ab551c78aa19b2c22dd8029cfa8121c718188d5ba2e5caed99ceba1d8058dac4d020aaa
+EBUILD cucumber-expressions-6.0.1.ebuild 457 BLAKE2B cd304a9f2061bab870bf07c9f4becfbb30da6b9d99bcf4e5718276c2481b5e489c799e901bfd6f27419cddfcd9c33b85e2b9c51c07786b4cd207d64b828a43a9 SHA512 ea7f1de3c983d02d6baf74053d9bb5c49c319096ebaf453f542dfbcd11718067b44c4c68f8a93ba86159b2b7f33547a5a8aa9259fc9c38f28a0bb26c7eb79290
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 109e8741fd07..3982a7b68085 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
diff --git a/dev-util/cucumber-gherkin/Manifest b/dev-util/cucumber-gherkin/Manifest
index 34e707f4ea2f..3d8c908b90cd 100644
--- a/dev-util/cucumber-gherkin/Manifest
+++ b/dev-util/cucumber-gherkin/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-gherkin-18.1.1.tar.gz 12436812 BLAKE2B 5434d3133f35156d131283dff7cbdebb6523911ffca481ec61b6cb7fc41288e8deaa9afadfb4f34afc57729e92212c513fa203b279a54e5f09a389fe9bdef1dd SHA512 c6f329ea2f46e224b802a1a4062b8d66314c2ee124fd261cfeed390775acf184e1098879c17cae4838ef361ffcd0cf43b1eb77978da7376a87afc09576d25085
 DIST cucumber-gherkin-20.0.0.tar.gz 9238574 BLAKE2B 40dd7f31e234740528301ed20be59c6b550e256fdfc21b50883c7d6acf9aca75f61c6f87c86f6ab72ef8e6f9672814dd23ce2ba093bb0fe9a447027c2469ab6f SHA512 25a3180482166a1e6e7d63946b2ed8618558b62c5506c366c5a18b59064259473ea34b3169b666a366a271ddab08bc235a16bdedd34e184157cbd6f12068b1cb
 DIST cucumber-gherkin-20.0.1.tar.gz 9410066 BLAKE2B 2c34b1eec9d74b96bbf21ea20b479d9a1ab42669bce08eeac9c9f0c97b86c64e9119423eb8ed3c42897c8730d1dae9c0a75e32e407a63b6c1955e773d35fa16f SHA512 0a53a7110fde39ed921c3a883b2aa00f8599e7dda87cdf1766d606a696ba6f9e350d176edb9cf849567a9f4733d5e0653944d738fe9a9451ecf0763b8687706b
-EBUILD cucumber-gherkin-18.1.1.ebuild 951 BLAKE2B c1aafeb0612a41f93fd1465cd1c8f7f1ea77ef72c1848bcd739ddab3f88854961ca0554a5062cb4ad9678fd974e45a9be7502e8102e6250c8638f1db9ada6202 SHA512 52d650ee344b3afac54b1cc6a364708f706a56645dfb63a0c4c24734b78f3603b688fe5f43f9a998c3967c1b7d6e7320d2d6588ba8b677406979fb78f6dfdffa
-EBUILD cucumber-gherkin-20.0.0.ebuild 741 BLAKE2B d8afd727a9ae4f2b5ecf8fed65fa63cdb963b615e3c2093a1b1c6b44766d2add104984599ce79ade9c99e42a165f6afd7ea4c7d9acc3c4d242acff05d4ee7a04 SHA512 6cc882826dd95d6e83fd9a78fcb4094d9689494f6c0471ee610fa43a40159f15f75383be959d621a212e8f44c0421c596299e291adb52071a0b3976a83461ed5
-EBUILD cucumber-gherkin-20.0.1.ebuild 767 BLAKE2B 0b00bb545806296d93919f57c8e1e29ed6aa6df3337724b544de78e6ebff6a07d648e194bcad7657b008902ab8b90acff41cee440cac50ba4c15f3dd324b7740 SHA512 b160473cf344ed070d1a79985f57f2ffe1f6517cfbd0d1cad3431661296b20032cd4077a216b174e7504944903a8e17e119845d3525fd60851126a84624ba379
+EBUILD cucumber-gherkin-18.1.1.ebuild 936 BLAKE2B 0fce62bf64809a0545da8460dd5a7be80d79249885823272df072e5c980acc5678b13305c5da8b654ca5e2172c8caae1bd3a63855e96568aa99f2f4ab3d1fe42 SHA512 d582198a8394678e29418e9c957573c745d45a640ce041f34949e0be4610356351ef8db11a8ce2cb6d0f446970e1b4cd7ecf5edb142767e7745958d6fe6b2161
+EBUILD cucumber-gherkin-20.0.0.ebuild 726 BLAKE2B b5473261c531bcc08b8516dc36fd44d3389745924bc6a510c075a8efe4e7589abe8ce0d64610785dd468f4ef7e12e4b985298cc58982e26f73b310dcc4772959 SHA512 05187e0c9421f6b4e6a39137642b174ddba92196cfe4f4a46ce8bb06811bc4daad11b57b176a4b9a23ccef0e0da8840c7a6aa02721ab4f776777e44c83415d6b
+EBUILD cucumber-gherkin-20.0.1.ebuild 752 BLAKE2B 97d59d4f98c55ff939692b6ab67e34de85f1c3dccf39daac69a922e77524d5d58f9ecf339356e4a60919d0468c06e0dbece663b865be8fc7ba1d8160126852ff SHA512 da97d7cd58d83bb8af86bda2ba0679c33bf031709fffeb177499b14ea3bbcc35f60b6d939b39ac8be3a04171da7cf586bfdef9d4c7da5000d68980ef56c3683f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
index bfa83e6d087e..d7a9f611c679 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-18.1.1.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
index 87a56e48a94d..d27ef5a8f778 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.0.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
diff --git a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
index 5e864900cb5e..8ceb52961796 100644
--- a/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
+++ b/dev-util/cucumber-gherkin/cucumber-gherkin-20.0.1.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-gherkin.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Fast Gherkin lexer and parser"
-HOMEPAGE="https://github.com/cucumber/gherkin"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/common/archive/gherkin/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="common-gherkin-v${PV}/gherkin/ruby"
 LICENSE="MIT"
diff --git a/dev-util/cucumber-messages/Manifest b/dev-util/cucumber-messages/Manifest
index 51037ad7092f..c2ffa9810e2b 100644
--- a/dev-util/cucumber-messages/Manifest
+++ b/dev-util/cucumber-messages/Manifest
@@ -3,9 +3,9 @@ DIST cucumber-messages-14.0.1.gem 11264 BLAKE2B aff0eac711df831708126bedccec15f9
 DIST cucumber-messages-15.0.0.gem 11264 BLAKE2B 41586a540fd4b092a25b3516419e912900f229f43ba3f8699733bdb67a2783d4e83c50df3b0605abb511894c6a466aa7cae7ee82bae8f48a2cab878349a54a63 SHA512 906a09517dfa6b44519b24ad9dbe5092d1ee24f0fa0e08291206f9b81e1611d988074b063f493ddc2034e05429b7c218380fe0412184c07ba8b2f7af2e3c9ead
 DIST cucumber-messages-17.0.0.gem 21504 BLAKE2B 3dbe6a8f2e486c790c05bb77105fc5ff9ec0acd5074df5a5fe4048a8ace5ce58267992fabfb58e1ed3881d510e18605d0a3fde69d5335f2f3fe47bba429d367f SHA512 fefd84e07ef8cc9e301ac299e969643b8977cf9ad8f9990401df8c71e4c35e7435a815a5922166f52c49052345451c06df6bafce3c139f28287172594bdc9e85
 DIST cucumber-messages-17.0.1.gem 21504 BLAKE2B 7bcddbc42fe9abb1deee0b4bd02bfc2187236ab0d90357ab5904a4d486dddf91fe60ccbe894c64b6093d98499e79dd7506a7d36d78132c0336044819ab85af95 SHA512 71ec1cd2490ac27e2bbd3b7f498062b4c97c693ede9fa826a2fe859e1ce766a1a5b263fd520d77b0a6a0f3955e528f1729011e60b598aea6a930cd3bf71d4825
-EBUILD cucumber-messages-13.2.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
-EBUILD cucumber-messages-14.0.1.ebuild 535 BLAKE2B 57f655316794694d9dacfa77c5fe4f5297c78c9206cd618b859805cd8f7963161880014b66d663a80c093f2a9f3f393056e5b3f82d46aede1ce1d4896e662832 SHA512 018db7289a6caf01688ca1677b92ed96b9ad97922af6f9e18c06d9c3f10e5ae7058c5e41f4b955af13114e67a7627dab513e10acc86e43aa6d1bee830f2182ca
-EBUILD cucumber-messages-15.0.0.ebuild 547 BLAKE2B b14433d359038538968dfd0388b6bb9726a460ae29bded7fa0ebdd5bdbb8f5f05a39494505e222fe1355249775b2e15d733815eab3bf68caed00e991302341f9 SHA512 b1443c1575f19c59fd411b06ea0be2dcf0af58717a85e6731329ca30d9b18ea014c734bfd6de541261b04292000346c23e182d3f5fb2df9416b48d0943db5e5d
-EBUILD cucumber-messages-17.0.0.ebuild 477 BLAKE2B 7bbab777d90e354ee290e6b9c2be7dd28b7c8dc0f1cb8d279e998973458d437eb3bf5ad29e63991691077daa26de1a7ec83dfdb3b3779fd099a9746572c43f28 SHA512 04e4e6e64114b9fb03f4f303086ac273817c2e44594fa8d79e91cb8d65441219441e543a9ef0dfdd6eda5fcaff3db378ecffc5ccb7db7c3cfa3f8610f048ac9e
-EBUILD cucumber-messages-17.0.1.ebuild 503 BLAKE2B fb09445c6a8a54142e8b0a7f5c8c448e2c7adbadea494a7cd076fc10743660af671aafeb878eb6d35ec7e85a7c1b8e549559136adbc99aa72a55749f6a07e0d7 SHA512 2dff02c94f90e24f804ef41019dc3f55e95efbc461d0308acec09c394e2036942487828325924ba1cd27852d3b8e9f35ce1780c89cb950474a7d05e7b51e6976
+EBUILD cucumber-messages-13.2.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
+EBUILD cucumber-messages-14.0.1.ebuild 498 BLAKE2B 5f1b07a54fd92218910d0dc08591979bd9b868b482ae678c2c6e34691ee9516b6c7afafcef9bae31ecd654905bb28e581adff9bd270eda52ab4e92e4fa09f050 SHA512 c4ef586d85ae9d0f38dd751bfbd2093cb61119dcb4d4030bc24404f3320d5d09666ce0e2358083cb0ad70440c237007f5730fac1038a1e01a2db675f5599aaa7
+EBUILD cucumber-messages-15.0.0.ebuild 510 BLAKE2B 984178b531645027cff462ad8812aa3dba34297b5cbdffcd23d541c544860db4b765a230ecb589afb6bd69ed575c6950f8b4adf93206c8e6b4ef067f0dbe2865 SHA512 46497d2707319760fb1dbb6332df234831a100352192ddb78316d8d0667d79baff0095c7e119a2a782cc3a9302c2b9bd96e1310223a410072f3a452163b9f96e
+EBUILD cucumber-messages-17.0.0.ebuild 440 BLAKE2B b1df26553661d947995e30bf7e93bcc84699906a3674a403d3fbe8c2a9e1f8600fc8691526d6fffe9d036e6639e1dd16f0edfc81a9465120e8c56bd370aaca82 SHA512 6f58f6c51ecf570a425758b32369ae31b76a5a14a2c3f56901215732968bb279d253ee08422293444cd2f2fe11848288bc90943bd440f19cc4a2fa04d65e89a8
+EBUILD cucumber-messages-17.0.1.ebuild 466 BLAKE2B f6e551b6c322efb3c03e71114750a5da5a5cf05c33e962e97e6f45f2e16ce5e1eb88fdbbf7ae5ff92c10fd1aa862fc5dc7e8a48c1b848c5db931afd67a43e2ef SHA512 7fcb5a829401bdf1c30a9aea230004f4c0d3baae768fba50c3690f7b425cc23b64128bc63cde22080194e21ef210845063eca3fb019d3c1eb93c641bbdfbbef7
 MISC metadata.xml 313 BLAKE2B 8043a2240cf0e24b0307a6f068bd8bcccc65471d59ac643f3c654227695ec7a2392a6c1ed9ce4c0ca7cdd926a26be275b248626509c79aeaad48930e00f00c62 SHA512 949342e57dd6165f4402bd068865400a7affcc6e7f73adac6f8e121caf1ef9564bc95b61fa9bd7f80d9ca8597e5b5e0f3200a210d496577d4ec2fa881fbc23bb
diff --git a/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild
index 1b40a7597842..593adcf6f130 100644
--- a/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-13.2.1.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 inherit ruby-fakegem
 
 DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild
index 1b40a7597842..593adcf6f130 100644
--- a/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-14.0.1.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 inherit ruby-fakegem
 
 DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
index a187e183a7bd..8d0ba59011ad 100644
--- a/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-15.0.0.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 inherit ruby-fakegem
 
 DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild
index ed9ef8e16930..c9bd3ee6b80f 100644
--- a/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.0.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 inherit ruby-fakegem
 
 DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
index 77fc213683c8..b410fc23b087 100644
--- a/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
+++ b/dev-util/cucumber-messages/cucumber-messages-17.0.1.ebuild
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 inherit ruby-fakegem
 
 DESCRIPTION="Protocol Buffer messages for Cucumber's inter-process communication"
-HOMEPAGE="https://github.com/cucumber/cucumber-messages-ruby#readme"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 99a2f4eb8120..9c5d3cb4783c 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -2,8 +2,8 @@ DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a
 DIST cucumber-rails-2.2.0.gem 136704 BLAKE2B 660037bb5938ad01aa0b1188e5e48522f9932662d6578f1c0a107cdacbd5cf8527e48b6ddb2c91d975577a71db0259a7250d762004ef0a49ebc063f45103aab0 SHA512 ca8a0ce9c9cdb1306b6a5f8e3d9ba68a2beb3d0a35a58fd6c51ba3ce76e2104045b2768054d27bb4bfcd437534aeb6d39fa2be87396f3a4084c0044201e96252
 DIST cucumber-rails-2.3.0.tar.gz 39492 BLAKE2B 73c45db7b3b445804b29814fa7add1ee5d66ea75bf3bd7b19456cef38340adc37f6129911a49d7e9996bf20299e31511e51758e18d9f8ffdb53fa9ea320aad42 SHA512 fee78784bd21084271c611073bce8b399783a2ce1900bf12a27cd8b70edbedc525b501d5d71856ad42f19174664d95d97bd4adf75b1791af60bc237a9f16e00d
 DIST cucumber-rails-2.4.0.tar.gz 41130 BLAKE2B abe10f72aad684691f863a7aeb952a7e45c945d22e1998dbd860ff47808c253607d6502fdb9dbcb1d573a0e3d615859ab56b9e34eabc5de33ff3c47483f8314d SHA512 b57134227e807da4f64d5d8d1435e597f28adab27f2f4d7148b8e997cedf721916dfa73de5a226953827053db2dbc3f3300a88f71d72327514585ae9fada9e0c
-EBUILD cucumber-rails-1.8.0.ebuild 1184 BLAKE2B 4e2c858cfbb65f591442aefb56f6c50916c58adec4a40394a578f4cbc09dc5a2770a7d2da02d2897bf052957395b51157c77319370e882e2c55c406bcb871c05 SHA512 72d72915af22e3ed24e9a9e1965cad8f5a37c1748302787b7ba665f6dcf1834e19fbabdfc7257fa338b2db777ed8b1d0d1355d2377c33b2ac07a4d9666bc0ca9
-EBUILD cucumber-rails-2.2.0.ebuild 1196 BLAKE2B 204bff27ac75def4b5e88ccfb332b824d8cceec2672f4a2b298c9afc4c32c5c176fd03534fbd6136c9f6d9356a2692ad4a6b1dbf43444334735e3f5e28a714f2 SHA512 70a349b9c1e0b6417fc9e7625ae09f670220bef05f7a8a5c820637ff2cae11b0a5918bee4baa29b1a2e701d6f37d4b2844fabb497a2003abda5857dfafcbdbc9
-EBUILD cucumber-rails-2.3.0.ebuild 1306 BLAKE2B e38089ec8e150c8af7418c5fe67310f6be53f84c9a19859683cd14fe8a12147277792a10159b1f56f86a22970a47fdd779e381318a757292c6bd6851832a24d2 SHA512 786cf0c4ee54ed2d560b7f7d1356b1976e2e093dede1f7aeaf7830f2526429faec7ec5ec284a821e9de980c0aada270883d973add3ddd75729e51a8030844936
-EBUILD cucumber-rails-2.4.0.ebuild 1324 BLAKE2B 9758ef2b398869d3258fd2a6b8f1c9f3558277a6a3802a63c3ad94246d27d8bd5c29630fcd8268e1faf22c200ebfc31330e75abc295084a048f2decb9713ebe1 SHA512 d71a95087d9822fa979c8b34088b783ba9cfbb96e66ace17ab13ae5e6d104762cb8e49e0614e5367e324fb6600c183cff354b499c23999bca32d030b7ce35926
+EBUILD cucumber-rails-1.8.0.ebuild 1162 BLAKE2B e331bb87a4aae973e0f25ce575ac117512d52287509bb63c0e2e9a8ecf89d019ae78c2545ceb9a0ba0926ed81ae06ac200442ba04dda4990436f6bf984e552a2 SHA512 b4b3d19e60f972ade1730d87982121eb7fd3ef0514a7242f1a6909faa87ef7f24528c06ba798b4b73e9c1f875f2af0d0791d38b3f457d54f8321d78a248afaa6
+EBUILD cucumber-rails-2.2.0.ebuild 1174 BLAKE2B 2f2d04492f77ee142583095bddb987dd72213f34429908e0a240308b4178db57df3b5116b85ee68844c755cd09f820a3cd2fecc45cd9027d4d24c4b3bc49c166 SHA512 c3d5a3e0407ee0122d0e44667f9fb9dc14fb47cdcd25615b86a0c8685715cb1e3dc0d0c2428637bdfbb82fa70ba54ea85773dee789ba337dad9c9f14940a4798
+EBUILD cucumber-rails-2.3.0.ebuild 1284 BLAKE2B 221dad655a92b65bcf3d6dfcdd31454ee1b0e0b8b2a41161bcda2cc4df520ff1dd5810493453020b4b93a23cf885123c329fdf622f803a8a27c5782ab67f7b58 SHA512 7a89333dde47f099520adaf4397032b954b7d6215d65fcf44851e724ca910794cd44cf7296dabbdb7d3fb75190d5e287e2dcba1ac87e206176611502d3723ea1
+EBUILD cucumber-rails-2.4.0.ebuild 1302 BLAKE2B 76f406cdf9b9dfa5986e2241b46bfa434b2a29fde25431c3b158b994a92de7cfddffe45daa024d7b2ad768f4966f50ac3dc0578bdad2ff571e43ddcebfb2d69c SHA512 924ed76623a44c61cca3d9fb29298f9a050dc47b6474b5821db3eb8a0f12b9dc073103dbab5b9bfa8b7997e8617e3d9761036e5159906743fce96a380ed7fe67
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
index 3198b85de304..b7d36dd11150 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
index 7e0c9521aa9e..26409e65e60c 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.2.0.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64"
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
index a0c8d4909ba3..d770fc2499c3 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.3.0.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
diff --git a/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
index 0dec57043e00..7257c1648459 100644
--- a/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-2.4.0.ebuild
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_BINWRAP=""
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios for Rails"
-HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Ruby"
 
diff --git a/dev-util/cucumber-tag-expressions/Manifest b/dev-util/cucumber-tag-expressions/Manifest
index 7c11a55c6dc8..7f05972d31e7 100644
--- a/dev-util/cucumber-tag-expressions/Manifest
+++ b/dev-util/cucumber-tag-expressions/Manifest
@@ -1,5 +1,5 @@
 DIST cucumber-tag-expressions-2.0.4.gem 8192 BLAKE2B 1ca07c8b1c018aa0011e6b31fd2b1a6085f5de9aa5a9abd4cfcc2bf0feb9fd3018a1fd07b7a3026e62b32aa629718ca1acb7c4b2e9d19a118ed500e2d60d0c87 SHA512 d52d07f4415c69db54e3d37e5627e8587386aa777e1816b8c8d6dd284388a5ebfe48f7ab3c8f8ff3f4c3e6b3dfa6a1136460f501504b1dc71554f2878e81756e
 DIST cucumber-tag-expressions-3.0.1.gem 7680 BLAKE2B 83d89259c5451886e9d699a3a7bfe4b0d09ae6164fe2b3d271e62cc8185876cdd1173cf1223b8eb07f898ae43bd599efddc7e589eb353342548b376ed7aa670c SHA512 699cac80ec0fa41d55f5600e84772d471e9268cc46382813ccdf1aae99f2d50c9e89b7b60baf79c9dc9d5d17189056212726aeb7dec3a4e18c2e982191078fb5
-EBUILD cucumber-tag-expressions-2.0.4.ebuild 452 BLAKE2B c21f86fd0f1e0c35351b990fd600390d4426d0b990ba7c622d152a8b6e3c55db280e6f9e8029b17c4e227c353c7b71240ccca3c4fcb6cb0ba68fd693017c1774 SHA512 5c46a1ff034dba684cb496008345dcc1e70bafc8a9e83f08951a69437f21aadc6474206c67c4a39658fabd250f3cd9dc540f4a5c9a5ac8d866a6cb4eac957814
-EBUILD cucumber-tag-expressions-3.0.1.ebuild 452 BLAKE2B 37b0334a750805c982739443ee355734d5f87344f12295b0d0ae89e00c64e922ff2ae540f19b51d38e34a246581be2ad2c728b7d40d4a160ad1cce74f0c7e219 SHA512 856318ab2947dbc36821f5510043ee89ea3f764f9fbf34e53a0cfc0371e5485b0753850ffeb851a341ca48fbf84819060bb905fbdba2dbe0ceeee0947e352b26
+EBUILD cucumber-tag-expressions-2.0.4.ebuild 431 BLAKE2B 3173cb5f7660f88f4d2a26f941657216f33e9efe352acf845e9947dfe715a877aff8ff116d03e8460ba46be60e4b1f45c81833e56b3c6a7e1ad194431d8fa3fa SHA512 cc8c92daf0004a23e854a8272140f53f6dbf3be7dac9aab2114915161bbcc13d200de1c71d85860e61090d97b444a4d0dfdc9f5a637219486882bc1a7ffc08ef
+EBUILD cucumber-tag-expressions-3.0.1.ebuild 431 BLAKE2B 352ecb5dba6965e52a9b4b07958b16095c75dc4a6402424722d177ff26ecb576fbe8cb89a484c3221ae7f0273d1da8cd69832e374e7003f1924703ac8982ef54 SHA512 3a52a049567f3373f679b54b3c076cbc281cbf71e026cfa35666d7f61d374882ac225aca9515bd95103fa0d04e6a2b962ba3b09347806d8ca0963d9432a9ee77
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild
index a1658dee860a..76c765a1a5f6 100644
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.ebuild
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-2.0.4.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
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
index 75d8e58d1023..b947e508dd07 100644
--- a/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
+++ b/dev-util/cucumber-tag-expressions/cucumber-tag-expressions-3.0.1.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index dcf9fe525560..0fcd78985c84 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 465 BLAKE2B 63fb3050a058642775c570b5fa647358728787633580092dcc0a8f676e9f8ad84ce23700598fd6a9716e429c7cbf6cebfe84d1c45794077b870d5f2aae63b187 SHA512 72b0720f9b94aae249d20b9901d4f99a7cd97f2f008e77d539548580cd523af2cc9c1fdde32ab130d6c2135d90a581f58cbb3a7b4d64b0f009a32c621dc4961f
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 444 BLAKE2B e48497332320230c09aea81609d4f82a2e312c4069b00b728314f45826323d37942b37ae50d48c88ca2f47b6973a8b6204dcc76409320a35d0faa98773e938d0 SHA512 8efc5a060873af1dfa1707fc22394d17e151acebedfaa98d2eaecf0bcff3c8d18d8b8eef2bc6dd2b36343a7d59623961afe6396da391492ae8f4e575f3b108e3
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index 62ce751f726a..50f2df52ed61 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 5920cdcd82b4..a23589d05b20 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -2,8 +2,8 @@ DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087b
 DIST cucumber-wire-5.0.1.gem 12288 BLAKE2B cbbf593d43cbbc003ea247d41db2cebaed14d232ae2bc52eebe34c8316c58b679be7c6802c7ffae7dd3e8c14d367803e3baba7b2f79326434821693e71fbd9f5 SHA512 deda0bb93b51b9d27074242bd0c371b7465c06e302d2aa608201898a1eb3b1736c9955baa9360f047a29793871fedc9feb25bf3430020e5b1f5630a2c982da73
 DIST cucumber-wire-6.0.1.gem 12288 BLAKE2B f7d371e186a27ee1a6ce489c8663c456c29b1e8dcf3788032c799575ad42b4658110b50bff6e4a446bca7227bcd12eafb117782675ff2ff7e1d0ce67eccc6c48 SHA512 b056dd78b0e715771ec591578fa3d4a29297a1ba1abf3a0d009cc90e36b44ae20578a20198f463a0c8760b70722a0655612f286c34224849db675ae2110c0bd7
 DIST cucumber-wire-6.1.0.gem 12800 BLAKE2B e03e120b1beeab52b2650df8f0e55eb01edb58162d2a31b41e7634b9d8d4b5277a499faf80ba9a179a73a1e92bd660fbe5d71202f39a7ed29e171cb58da268ee SHA512 a7931b90c3eabfca0c762ee8f30e9a9b2e44a649ff8eed11e52ccd187045768678eaf7570e58f4f1fba07ceb1e1c66bdcb8cf02f8fd04a264c89ff874815fabe
-EBUILD cucumber-wire-0.0.1-r1.ebuild 520 BLAKE2B 2a05625d160dca569f254cc0f0b78f26aff853f86bb5df8ced10f81ae09b41d5b906d0956dfc160b6564d3f805266cebc0e16185ab844ee4e8f8f545ba225e41 SHA512 49d1079ec8ae4ea16a47d509424ed299b0d1467c6ab4bc22811093f8982c7cb1d7877e951e61320e70c29ed76d8c3b3135d4ee2f655ca8ed12cb2b9c05136990
-EBUILD cucumber-wire-5.0.1.ebuild 564 BLAKE2B a23e9e882a3bd669f00ee00eb311b58d26daaca5a3bc275a1f9104671db900ba8cbfcfe93ccd8e2ce6eb7cd821e4a364bfa8e1586f270e0a1d79e241338b421f SHA512 2d0e867ce7ba1cc03f38662c08cd352ec3067f69f1db819038c2e2709fd1b6303c32309d9714f889e307e78569078950f5358f1306fcc02c7e2c627f4725c0cd
-EBUILD cucumber-wire-6.0.1.ebuild 621 BLAKE2B 7922a8be4708e2c3284b11016adfdbd2f9de73c498c5992eb4dd3bf5d6d82f6b3470ffa3d1363193ab9ce91775ecb35d470442366a53d54c183580a49f51e13c SHA512 c82714c682bf2f6a64978c196a7d887e08f6eb7c943ef8ee5dc25444af3d6a3e4969b354a33be369efdc8494ec01d29a314c1d4941c46153fa66a82d36aaab81
-EBUILD cucumber-wire-6.1.0.ebuild 621 BLAKE2B 7922a8be4708e2c3284b11016adfdbd2f9de73c498c5992eb4dd3bf5d6d82f6b3470ffa3d1363193ab9ce91775ecb35d470442366a53d54c183580a49f51e13c SHA512 c82714c682bf2f6a64978c196a7d887e08f6eb7c943ef8ee5dc25444af3d6a3e4969b354a33be369efdc8494ec01d29a314c1d4941c46153fa66a82d36aaab81
+EBUILD cucumber-wire-0.0.1-r1.ebuild 493 BLAKE2B 3b26c3323530d510aec5a5071a20fd5e379f63c998f5a3fb608832c2fda89910e07b77f5f7e690954b3600d314e1a238073d123aabcc2248e91b4d64dee431e0 SHA512 2867c63cf53b26a4b6644bbaf6437f351efe4c9b6309353e502cf615fdac732bf9d39d8e216cd12fe664c38a65ea34b466922ca639d389a2f110610f3ed38d0f
+EBUILD cucumber-wire-5.0.1.ebuild 537 BLAKE2B 9c7a6a8df4ac51f1e319c0d2fd376d98f7e13ddebf9e957b1f54c4662fce5b142b9c77c89ff4a64aa4686c22a56d905d9177373b52fc67a7a689ead16863a85b SHA512 9544e7fe0bcfa75d62a8a9f6510eca2e3b712c2c4628d2d8d8d14f6a39a7b34b152467ab28a90a82a4267d9c9f7b05f451a802fb24f275ee76d73abd2c87021e
+EBUILD cucumber-wire-6.0.1.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
+EBUILD cucumber-wire-6.1.0.ebuild 594 BLAKE2B 7caaad08bf11594af90ffa5472662414a7196accddda25f53fd2914264752f11209190d4e603dd2d46e405ad7c3593600abf24c760589d3f41419354e9da5643 SHA512 60ace6d7cd19d6835df4e629a5a308259084d04855f847e85e83110c601b8d70f65b7befe2045ed040c478db71dabb568909b3f63a039b4927c5a3eaab63c12b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index 1566152f684f..41837bf5e35b 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
diff --git a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
index 056a80ddaf05..3f593689b7aa 100644
--- a/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-5.0.1.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
index 48c5484c5f9e..ec6f09281efd 100644
--- a/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-6.0.1.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
diff --git a/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild b/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild
index 48c5484c5f9e..ec6f09281efd 100644
--- a/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-6.1.0.ebuild
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 LICENSE="Ruby"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 0e3d641c7c65..171c2979501a 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-3.2.0.tar.gz 271886 BLAKE2B 0945336e2a4d14c21d22b3af18fb140663fa0c5acd7d29540cb6755fcc50b020640ffc573f4d4ed17af2758df3df410f93cf5067b736cb8005d9a6ae7fa4d397 SHA512 927ca314c56f83e270284921131ec62aa05053d29a77b230799bd1949751f64c964c0f87525c776d7fe260506ddb632b5cc8939df841d131f6a0af8a82110441
 DIST cucumber-6.1.0.tar.gz 250437 BLAKE2B 64b2adfe5b9b78e70bdf6eea5bad4fe96b5598b686e27aee8635c84070c2e20bd8051217db9c79c9f0de62b6a8eed85c327f2adb9965d39f58f74359b935c013 SHA512 45b455f1c1728463a3e0dd9061d30e6438710e137e923d56cee90be4aac4b9f940a79aac60eca8cee3c4800831e7f57c1893276449e18a9f58c3f3664d810b08
 DIST cucumber-7.0.0.tar.gz 406986 BLAKE2B 6d06d40e7b7029f3f5fea782b5060cf8985cd65334c722744132f40048d1d261963dd4baaa80a8fd44b18d66b63b08960350abedfbfd4d95e0a033a22192d010 SHA512 ca083c2de895f11d7cfd955c216e1e2c52ea9e5ed0034aacbec44e5daf1809e6a67a4621a64a5f236c6a0be9d8057beb917fd00a5f03191fe3d9d2c8814fa22b
-EBUILD cucumber-3.2.0.ebuild 2864 BLAKE2B ba02dcb6f95ec1f5bea0ead4f3751e5ef8239886639225bc8d7bf473a157f623edfab6562f8c59691d5fc2f301fd68178824968f66f514d57d1334c194e8268a SHA512 d95106aeb1be4f9e5e790f317571ad74a96a0a7ac6d3317ffb30485a99e0cbcdc28639e8cfdaf4586f09f2be7609d4d6855014bd6344234594c749bdf61966ce
-EBUILD cucumber-6.1.0.ebuild 2554 BLAKE2B 5705b28444f15db814ae30cfc317d1350b65c3f639cf383df0f5fc22183ba0442b44cab55359ce0acc6a458400f6970627f697c1552108e3ae0d2eeb9d0f2d78 SHA512 d588448b97c1d0e3ba789fdf3c872071cbaf2ab227f80a4b0593bc194073161e15aabc9f352b8977a4b4f9d4ea8e99bf3a5d773e8a2795edf98f7c414c74eeb7
-EBUILD cucumber-7.0.0.ebuild 2571 BLAKE2B cb613b911be80e0a891d975cd381dbc602d366754a1c90405bc930740596ccc9df9ae434f4ab3ee19daac4c9778b6de73679547f9e518ef6180ef6d293a0f934 SHA512 89c6efdbea342091ca45ceff03d444eda678b53f9f125f38ba1bf822eeb542b29f37eb4970caf691fbfda00942b0fe557ac40f52a83a4d31bf7b4316ce12f159
+EBUILD cucumber-3.2.0.ebuild 2837 BLAKE2B 8d76d4476b2e1c8d7bdd16c4c89f8d45eb04af571d7438a057ffb28f3b818388cc346b30b53606e8e96ce75b65fb59e9333433c343817e9a57c805128267cd24 SHA512 f0a0a344b0190d7751f9de8aebb8c5d2c93dec6ba41f6df288c67b1629649c2a0f510394b65e9d53074c8f9ce27dafaa6a469b97b03b69309fbcf17f0ac2b689
+EBUILD cucumber-6.1.0.ebuild 2527 BLAKE2B 5001b462e33a2b308e8e9fb4e9e00893027ed3421980539dbad0e15cd10cd27913f8024731e6df37f1a50760bbca6e508ea87d864be2857ff90b15afb8b9a07a SHA512 3d541dbf42e8fd458ae6bd9b15aa5bc94aa2f3fdb9d05ac344a81c3cb4b4475d1450966682154fd9532ab7bdea573feb665a96be3bc6758932084d3a4de76828
+EBUILD cucumber-7.0.0.ebuild 2544 BLAKE2B cc361b5e344ce7b6416e4bac97a231270e708a99211693ffa24c7260f2615e9d49370c96dc969f6d55300dd3f95115767b4a6b18e926e708f1825a2d487ca972 SHA512 c62b6773a40fcbc6acc956a2211de3f1cba13c5817fc6633281cc6359dd2461a2af65daa429f96ccad65447d81513ddcf21a3a4b44ff3f663d4074fa902e8d50
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.2.0.ebuild b/dev-util/cucumber/cucumber-3.2.0.ebuild
index 0fd14e28e954..b5af4c5497d0 100644
--- a/dev-util/cucumber/cucumber-3.2.0.ebuild
+++ b/dev-util/cucumber/cucumber-3.2.0.ebuild
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber/cucumber-6.1.0.ebuild b/dev-util/cucumber/cucumber-6.1.0.ebuild
index edf47fbd9c5e..0d8c4801a6b3 100644
--- a/dev-util/cucumber/cucumber-6.1.0.ebuild
+++ b/dev-util/cucumber/cucumber-6.1.0.ebuild
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cucumber/cucumber-7.0.0.ebuild b/dev-util/cucumber/cucumber-7.0.0.ebuild
index 05dc5805c701..dc1b2aa7fd87 100644
--- a/dev-util/cucumber/cucumber-7.0.0.ebuild
+++ b/dev-util/cucumber/cucumber-7.0.0.ebuild
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+HOMEPAGE="https://cucumber.io/"
 SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 5dea86320bbb..8536aa72e672 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,3 +1,3 @@
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p3.ebuild 1371 BLAKE2B eec283e8a3888bd3e0f82db911686212e24ed007a4effe5e82c7f49e410ee1e807c409511a75a413ed1cb5fa0971561b2c8c1b0e4c51d1d5eb30e351aa594167 SHA512 f35bed29e3536e6e4567b76b7f25ded57c05d16f690abe091a46937165450caa54a79fdc4999f1fca163b2c20d1464852ce3582fcd4f6d5beff71d93f4179500
+EBUILD cunit-2.1_p3.ebuild 1377 BLAKE2B e6459f0a7763cc590c6edd3bcf2c0b05b673eac830656e67dd552c2be42cfade6e4941cbcde093ad87798998dc0bb514cfefdb16c1e3f4efb6554bf1f979f2b8 SHA512 619ce89173a5172a0f9218288afd429f48519767e2000d594c18fa9c93266d9719b03d776c92b50a32d8e08be335f5c8f970ee436d67771a692f5d68935401bc
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index a01a1d24d366..b863c77021aa 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/cunit/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/gi-docgen/Manifest b/dev-util/gi-docgen/Manifest
index 5887e50ca9d6..c775df2fed1b 100644
--- a/dev-util/gi-docgen/Manifest
+++ b/dev-util/gi-docgen/Manifest
@@ -1,3 +1,5 @@
 DIST gi-docgen-2021.6.tar.gz 1253449 BLAKE2B 8eb115c8554d122c0caf11a9d56ed423e4764ff3665cebe0f5d5c7eecc2df2c39885e213254bc2f7ca252ea8aa2fc57795497e43d348ce892515bb7c9a2fbb34 SHA512 cf319d30e82aa3dc84af106aeb2aafb9623225445773e7017080d2530fe03975160a233a0d60429eb2b420c17e329712b7f2321615ec4d63a5723b162606eccb
+DIST gi-docgen-2021.7.tar.gz 1258424 BLAKE2B 455dee52ab19e5aeb52169caad65119ddf0c149651cb663b026f9177d9ed0914c662c26969f3a2cfea2bff9caafe0432be06d7cfad233497e70b44517f0f0417 SHA512 8a12007d0caa71cdfd7766420935049131d22a35358fc55ab7953323f251149f92744274486856f930bd3108d54fe12bda4114aee541c41e5aac75c788570fd9
 EBUILD gi-docgen-2021.6.ebuild 904 BLAKE2B dfc1f4647ba5ca2ab7114bee289fdd0e23031d6d59bd15896f2c6fe40507f64595fac194b2c43c507607de1d309d8933442177475b9d6649387aa53e698e9001 SHA512 2da11140070f01623fd7416d507e903d9adb4ad8e0572990c806149585f002acab61be402286117752cbe07e0a84b16844e1254c7ee73ee91c895008d5d561b0
+EBUILD gi-docgen-2021.7.ebuild 912 BLAKE2B a0b053a1e773cf952fddbb1638bc16c4ed0866a4fda25bf3c7053fd986e4468daf83c01f89c07b6374909795951b0b858ea124c48510e41c4f577cc395ea3ce1 SHA512 69ae4aee2be1fda8480d93e09ce10e6a14aaea43feaeafa196bd37120c3f076103db9bb1e7d5721d9cbaf63a0cd1a3f0d24d44a3f8bc63c026ffa99fcac44780
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gi-docgen/gi-docgen-2021.7.ebuild b/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
new file mode 100644
index 000000000000..8640d0d7eadb
--- /dev/null
+++ b/dev-util/gi-docgen/gi-docgen-2021.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="A documentation generator for GObject-based libraries"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gi-docgen https://pypi.org/project/gi-docgen/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 GPL-3+ ) CC0-1.0 OFL-1.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/markdown-3[${PYTHON_USEDEP}]
+		>=dev-python/markupsafe-1[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2[${PYTHON_USEDEP}]
+		>=dev-python/jinja-2[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		>=dev-python/typogrify-2[${PYTHON_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 9813f1e7d7b7..e9c583b06f38 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-devel-docs-40.0.tar.xz 10756744 BLAKE2B 565a6340191f7f3f1d8e396bd0109d9d82792829dbdfc1d155115acfe6453b239e095e3c6f763a0b94119d173e1063ecc48296760cd9a39a3f29356de4faf6cf SHA512 c7068cfe712c94b01d0387bd66f64a295096223f0ee1c49cb06d0d4d2c1651da7df1f152164e289cafae5fa53963a9b4e2afd616d1995475a8b2c437fd8c2903
 DIST gnome-devel-docs-40.3.tar.xz 10790760 BLAKE2B 2d7804115ac03fc4c3f46127c2d80bffc8281616d158ea12006d5ba8123f3e52111049f5dc0e235ae2c7709bbdea592100b82630ed5153a44f44ede31da4283f SHA512 c80abbd6e8e06219e9bb4563ea7b42fc8edd03d51be1fa075d217f285e0eff8344bc411f26f7a68c338cf1ebcc1bc05ffc24c6b3dd7d6ad2bf98fa83e3b7ef20
 EBUILD gnome-devel-docs-40.0.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
-EBUILD gnome-devel-docs-40.3.ebuild 640 BLAKE2B b2c1be0335dc6568b9e886682dc20aa74e07fd02cd30b325e0d83b539982a3d8226217007db2e2bc7daddf25fa1cd8889ac4efadbda67bb6725cb57dd32361c8 SHA512 27e85eaffbf603d795859f6e602551b463340858a1145b2394317747cb535c95aba1531ba4ab2137473ce03aa26541305d6ac176a6253100ebcaab63c7d515e5
+EBUILD gnome-devel-docs-40.3.ebuild 638 BLAKE2B 9e6642afa1276c9a03efad81d85d8ce8bd9d1c24dc88678783eba4f04bd5572abce1e7192bcfcca5e53bd755dba6a298d0b1f9357de73671b56b3a4f9b66a687 SHA512 ba8723fbb6ee8bef61fd7eca8ba17f83d69a520265de2b1fbdb0023964b9e01e7a9704b316bf9e9ccae981f1152fe852148436050223142b215d620c77e4ba9a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
index 2ff8d4654ff2..ea104314ef56 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-40.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://developer.gnome.org/"
 
 LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 BDEPEND="
 	app-text/docbook-xml-dtd:4.1.2
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 6cffacfe4b8b..505e51658a57 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,3 +1,3 @@
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
-EBUILD gperf-3.1.ebuild 585 BLAKE2B 91a5fbd1c66297dc04dfa7edf73a979103af1feea3587cab80e080929d01b7af6342aa0c75e37e4c0768750beadd9999feccd51b116bde0ec9cbbd6584ad909d SHA512 6f82fe99e83172eb809c70e140354b14c11edc3194c4473da6744e4f3a4f1f8b7923ffca1219a16552c39a175880170dc6e11ff744be7e3b874d76aa921ad6e7
+EBUILD gperf-3.1.ebuild 591 BLAKE2B 88029dbacefdc59d66eb7c56e6d038c5b5fa0da86ef61ebe3d29d9fc505c2e16507a105bfe31656b698f9fad61edc4ed52ae823ec364fa4599f724786f564877 SHA512 36107389151bb1e80236b8824c3cc273c143242d50413a70803569269ac6cb3ec24f2b03956615679f05d86aa0a137faf1f1c34c9b5d0c89df66f8f2bcb47b8d
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 621895047b88..1a22bfa1dc8c 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 src_prepare() {
 	sed -i \
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index f6f1a54f453e..3f73f5701cef 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,9 +1,13 @@
 AUX intel-graphics-compiler-1.0.4111-opencl-clang_version.patch 1567 BLAKE2B cef900deb559e251e7fce91b8b8558e5eff846d5bab0153edb6d01ee29bdd0fd4c8dfcf3f3d732a23c357eebb119a4b833205f6e8526ef612069cec165395bf6 SHA512 984a3f26bd16d2d2db0608338f498ebefbbadb6b75552d3c3eaa0fea3456bf52e5ed0c57bedbd144e1d72bf6dea132fb21fe0d8cbca008ddd6b5456352143942
+AUX intel-graphics-compiler-1.0.8173-fix-missing-limits.patch 744 BLAKE2B 61e7fc376d7e5aa197794f8cc7f9cd4fc469ca4a7f0e9463c4d066ad119869da7ce6501d542e3c660326bd6131769534339fbedc18e954c49eb471243c48059c SHA512 c1ca22cb158c2c83e9bc355cc9c9aa4d710877c2431c0d769013e91fe15f6c4245e529de08b889548dcdecec34ce3708a2b976fb9ccd7b4b69e11c066878582d
+AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 DIST intel-graphics-compiler-1.0.4944.tar.gz 6632351 BLAKE2B a3d72730b8c10fd3810fdb8206d9d92da325a094627b678bb9f8d0941e29c1697994a2d98a1b49780fae62dc421e623dea4c3a7e3061347de5f5b644cfb5e105 SHA512 34fafd5387f3b86bef17511015ff1e8daef75ebdff5d1d14ff2000b58968bb502a9ec1aee988858a2992414f6cdb222e7de19c2d877f7fc8cd84a79417e9a85e
 DIST intel-graphics-compiler-1.0.5353.tar.gz 6642256 BLAKE2B 34b80b30f33dbd57bcea15852c80cdf8bdbf4630a7904946c7ce84481789e7db42f5216ba14140d445e9b0adbfcfe224468e462ea27768f0e8d31525ce56cde1 SHA512 e9f20e2261c5cb79d365d5d8257e8f4830b2364962c48413cc80154469db34c1c844ae5d576cbce2e3c5e5cbe22c7c3710ebd0a7fe7208e5412e81ce20077c80
+DIST intel-graphics-compiler-1.0.8173.tar.gz 7471884 BLAKE2B 2248a8d5f23d4578c5bd04a799af65767916b3705e16a8145149794a2cf16e5a0e16c21669336151a241cc52e7672b05eb892ac4925f2c2d0b22673af4ebf67f SHA512 bebccee0699dea48e98ddcdb320cacacda0cdcd36b68e51d932791756b0a8e2171a78cc1921ca2a092b9fe7dbd7a783d4898ada08c58bf856dd29bfc08334fa0
 EBUILD intel-graphics-compiler-1.0.4111.ebuild 1948 BLAKE2B b94c41a2657cb985065ef195ae06d62d53db8a02d30f48fdd37014b8209382d459cec5da6bfc4f1a2ded793a60adf736ea4d43f6511aecde9614c2b6aac42c49 SHA512 0abfecf61f289b258909da53e3edae8eea31577a3b57108043b7e8d6902d53153d55d8f635bc3146e71e986e9f12bfebf280ead5f58196e3f36abaeeda7411a0
 EBUILD intel-graphics-compiler-1.0.4944.ebuild 2492 BLAKE2B 2a41f64fb5ab688815cbfb29c4454eabd645cfa4ae0e852ff6fe41511726dd380843a561ebe4b594971093c51f5ceab8b132d9ac766d980bd6b4a254979f996c SHA512 feaaad5029246bff1faff06c3ba9d7c4afb15be0c31656ebfcb1a9dee7127271599144d5fb118625b034f8bb86970aed83f2acc0822eff01f2791ea74c671785
 EBUILD intel-graphics-compiler-1.0.5353.ebuild 2559 BLAKE2B 16d24827231f286999542377531e90d89599ca7c70674be8200c47bc6270412cf6aa548b5a1a0a23968375f3a25060011edd2655a1522b16abf07765ae79763c SHA512 f3d195649693fd25cff7f34762f0b18ab1e5f0c2072b5ebd0bab9b1a69a1f9dcc5bd0ed482010bf7a1b50515dda122343a6dabda464c6ce61ea08511099d1041
-MISC metadata.xml 261 BLAKE2B fb9fbab5069434d85556da8c100fe4fd6f92aea5909300e58766c1df329317b0c7ac692479aac7e579a994a0c215aa2a87743fdab1e85dec9a120f6a6fa79fa2 SHA512 45a7c84c8dd3ef024aee1d481df406cf4cf47e57ad1205e23874e897b49fd84dfe2adfe0c1738c94e9f6a45c4eef611117b24f63b5191b777dffc63ebb330768
+EBUILD intel-graphics-compiler-1.0.8173.ebuild 2578 BLAKE2B 65fd7700ebc866e3b8057a8508a052c53b5c2d3902af391378bcbed257cb2ed7ef1120ad8d0f6d708354457983cb9260aa0f4fcb7fed57fbd65fc36c103a03b3 SHA512 e0879fd7e50d11aba0dd3cffc29d9a37676a54fb6272b2b9c74800f3d80768d72c6948902bf211a9eadeabd9fa557b830c23978a30045e7ce9c9fdf2337d9c84
+MISC metadata.xml 482 BLAKE2B 64e21a016d408cd17239a204f6b004c09de3784c5a68815143e7f1019fdd52950e64402fc4480956a14e5c4a644b33ac47d99a7929fd3fd9afe667b946ae1e8b SHA512 3f004dfd8bad391c2fe144cdc003b8094b99fa189b0233c855071e6913a828983b6123600dd25c7c24d49132cb045ff258ca792fcc1a234b5fc7269e9871a161
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
new file mode 100644
index 000000000000..406262d2d914
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-fix-missing-limits.patch
@@ -0,0 +1,23 @@
+Fix compilation with >=gcc-11, taken from upstream:
+https://github.com/intel/intel-graphics-compiler/pull/190
+
+From 8e1a461d3e6b85a6cf018caf6abf4a3ba9a1758d Mon Sep 17 00:00:00 2001
+From: Bruno Pagani <bruno.n.pagani@gmail.com>
+Date: Wed, 4 Aug 2021 20:54:21 +0200
+Subject: [PATCH] Fix missing include
+
+---
+ visa/iga/IGALibrary/IR/RegDeps.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/visa/iga/IGALibrary/IR/RegDeps.cpp b/visa/iga/IGALibrary/IR/RegDeps.cpp
+index 83c226a316..585896631e 100644
+--- a/visa/iga/IGALibrary/IR/RegDeps.cpp
++++ b/visa/iga/IGALibrary/IR/RegDeps.cpp
+@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
+ #include "../asserts.hpp"
+ #include "../bits.hpp"
+ 
++#include <limits>
+ #include <sstream>
+ #include <cstring>
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch
new file mode 100644
index 000000000000..54a3364e7c66
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.8173-opencl-clang_version.patch
@@ -0,0 +1,31 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -19,24 +19,10 @@
+ 
+ if(UNIX)
+   if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+-    # Get common clang library soname
+-    get_target_property(CCLANG_LIB_PATH opencl-clang-lib "IMPORTED_LOCATION")
+-    execute_process(
+-      COMMAND readelf -d ${CCLANG_LIB_PATH}
+-      RESULT_VARIABLE CCLANG_READELF_RESULT
+-      OUTPUT_VARIABLE CCLANG_READELF_CALL)
+-    if(CCLANG_READELF_RESULT AND NOT CCLANG_READELF_RESULT EQUAL 0)
+-      message(FATAL_ERROR "[IGC\\BiFModule] : Error occurred while executing readelf:  ${CCLANG_READELF_RESULT}")
+-    endif()
+-    string(REGEX MATCH "\\[${COMMON_CLANG_LIB_FULL_NAME}\\.([0-9](\\.[0-9]*)*[a-zA-Z0-9]*)\\]" CCLANG_SONAME_VERSION "${CCLANG_READELF_CALL}")
+-    set(CCLANG_SONAME_VERSION "${CMAKE_MATCH_1}")
+-
+-    # Check if common clang library is newer than 5.0.0 version on which we have SPIR-V support
+-    if("${CCLANG_SONAME_VERSION}" VERSION_GREATER "5.0.0")
+-      set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+-    else()
+-      message(FATAL_ERROR "[IGC\\BiFModule] : Version ${CCLANG_SONAME_VERSION} of library ${COMMON_CLANG_LIB_FULL_NAME} is below version 5.0.0 (where it's starts support of SPIR-V), please upgrade this library at least to version 5.0.0")
+-    endif()
++    # Workaround for https://bugs.gentoo.org/739138 : instead of checking
++    # the version of opencl-clang, have ebuilds set CCLANG_SONAME_VERSION
++    # for us.
++    set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${CCLANG_SONAME_VERSION}")
+   endif()
+   if (NOT CCLANG_FROM_SYSTEM)
+     install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
new file mode 100644
index 000000000000..dd493717301b
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.8173.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python{3_9,3_10} )
+LLVM_MAX_SLOT=10
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-igc-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+BDEPEND="${PYTHON_DEPS}
+	>=sys-devel/lld-${LLVM_MAX_SLOT}"
+# Yes, the last dependency does effectively force the use of llvm-10
+# - there are currently no SLOT=9 ebuilds of opencl-clang with mem2reg
+# support. Of course with there being no SLOT=9 ebuilds of vc-intrinsics
+# (which we'll need soon as well) at all either we are limited to llvm-10 anyway.
+DEPEND="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=
+	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=
+	>=dev-libs/opencl-clang-12.0.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8173-fix-missing-limits.patch"
+)
+
+find_best_llvm_slot() {
+	local candidate_slot
+
+	# Select the same slot as the best opencl-clang
+	local ocl_clang_ver="$(best_version -d dev-libs/opencl-clang:=)"
+	einfo "Selecting ${ocl_clang_ver}"
+	candidate_slot=$(ver_cut 5 ${ocl_clang_ver})
+
+	# Sanity check - opencl-clang brings the right LLVM slot as its
+	# dependency so if this is missing, something is very wrong.
+	has_version -d sys-devel/llvm:${candidate_slot} || die "LLVM slot matching ${ocl_clang_ver} not found (${candidate_slot})"
+
+	echo ${candidate_slot}
+}
+
+src_configure() {
+	local llvm_slot=$(find_best_llvm_slot)
+	einfo "Selecting LLVM slot ${llvm_slot}: $(best_version -d sys-devel/llvm:${llvm_slot})"
+	local llvm_prefix=$(get_llvm_prefix ${llvm_slot})
+	local llvm_ver=$(best_version -d sys-devel/llvm:${llvm_slot})
+	llvm_ver=${llvm_ver##*-}
+
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+	# IGC uses this definition causes problems for some users (see Bug #718824).
+	use debug || append-cppflags -DNDEBUG
+
+	# VectorCompiler needs work, at the moment upstream only supports building vc-intrinsics in place.
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION=${llvm_slot}
+		-DCMAKE_LIBRARY_PATH="${llvm_prefix}"/$(get_libdir)
+		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
+		-DIGC_PREFERRED_LLVM_VERSION=${llvm_ver}
+		-DIGC_BUILD__VC_ENABLED=no
+	)
+	cmake_src_configure
+}
diff --git a/dev-util/intel-graphics-compiler/metadata.xml b/dev-util/intel-graphics-compiler/metadata.xml
index 36d27b8681c7..c1144ffebb0c 100644
--- a/dev-util/intel-graphics-compiler/metadata.xml
+++ b/dev-util/intel-graphics-compiler/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">intel/intel-graphics-compiler</remote-id>
 	</upstream>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index c1f1e3f4920e..521a32ca76c5 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,8 @@
 DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
 DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
+DIST meson-0.58.2.tar.gz 1899464 BLAKE2B 48c4c0cec2cb1c55e51cd56e08461ad7d95211d83bb60085f32493cb8d53cfeb00234fa1ab62ba8fbf3baf726231c7e9b098a0630281fda63402a860337528e0 SHA512 31496da729ede0813d5b6cfcc891e8376108252ee8a8148d23e8a4c2a4109b9b0dbc7e9e59acd954fb7de38ceb35f05c3a916eb6d4e106656d9ea8e7536ac4b1
 EBUILD meson-0.57.2.ebuild 2303 BLAKE2B f05ddd144872cd4a01891b089af2adec6e53bd6bf69707557dba5f7770385062d0111b0706e328aa5b21fb2acde9efb136221fbd651828ec16e902f5b7c878d1 SHA512 5bfdeeb4ed0542917ae6bc1780e06ff7733c1e03b9c1fb8816d6ffa26fc18b843008a3a32aa5ca1e596d219a0a7fdcf2984e9fabeb34f7ea793798239ab46653
 EBUILD meson-0.58.1.ebuild 2678 BLAKE2B f4969a73c757f7b64d673bab442d07aac6de77fc015c340fea9f7ec4383d0049d051e1eeae09ef9ddffc029245483c336b17a837d5af3df89e7566c0e58f193d SHA512 d14b5bcdb990c0124e5e625b8b8501782c6247e38265b9ab2570ab92cac8546c0f14dd636e951ade6574b3c2872c6fed6e2f249dbfac408bb25ff57cc5df49ab
+EBUILD meson-0.58.2.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 EBUILD meson-9999.ebuild 2686 BLAKE2B 01ac1e0754290c41a97cf65b5505a2a811efcec356322e1c315cb124f77c2afaf182b8cb0fb98a5c89244ff0e1933062afd83f0acebc760cf43b8b1f89071a0f SHA512 d2883e8cc040e67e215150bae5a52f3e7b1db566f0becdf2f411e1c10941c0b3586ab93426f5ef0cf273737ca76ffd0b288853bdf841e87106c23e08acb5752b
 MISC metadata.xml 423 BLAKE2B d5ccfb020cc6bd4c163a6807d27528e6035ef59d0e0a7122c0a194da25126408ed5d5a1d97effb6e7e4721eaa20d15efb2bccb48db4215c3c5609cdcb58938ef SHA512 88f01def35adfd916e55aea1abf8234108338f1b692c1702e64b1fdeb6354f50965651e741b347cf792cd9ae90897ee4451060115d757af6b6235469f8d9aef0
diff --git a/dev-util/meson/meson-0.58.2.ebuild b/dev-util/meson/meson-0.58.2.ebuild
new file mode 100644
index 000000000000..e2a175666ca3
--- /dev/null
+++ b/dev-util/meson/meson-0.58.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		# 'test cases/unit/73 summary' expects 80 columns
+		export COLUMNS=80
+
+		# If JAVA_HOME is not set, meson looks for javac in PATH.
+		# If javac is in /usr/bin, meson assumes /usr/include is a valid
+		# JDK include path. Setting JAVA_HOME works around this broken
+		# autodection. If no JDK is installed, we should end up with an empty
+		# value in JAVA_HOME, and the tests should get skipped.
+		export JAVA_HOME=$(java-config -O 2>/dev/null)
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index e3f63fe7e9f1..73f24fa08380 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -4,12 +4,14 @@ DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078ea
 DIST pkgcheck-0.10.2.tar.gz 454643 BLAKE2B 4585a72ce9675a23a3bcd7228ac811bdf45bacf2a25d91b9665f833de6dffbac5c4e11405b112bd5dd6e643fc51c3f57cf7dda989c2521c11e279324a02740c7 SHA512 0151d6fb81f800d46b65bb02bd5474ae36e8e4dc35376f1abfaa1c8be61e3429e527947b42f76c9f6da5ede648617d58f6b9ac44a93ff58175b748dfd9a43cbe
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
 DIST pkgcheck-0.10.4.tar.gz 455252 BLAKE2B 3fb8183120b8a45569a007e4c9e521e5b070554523c5c2fbf44c383996896924800d42f79f9809e0fcc3b04363b2c50a8894b547376a8c030f4d0451c7f943bf SHA512 f5f01340ff4ac882da8e56cbb44440425dcb42c5ed6a9ab102c435a61cfca6861a421ee294039f055fec5b93cae338ea4ba23237f1ba509e6e24bdba351427eb
+DIST pkgcheck-0.10.5.tar.gz 458314 BLAKE2B 143a397f5374b3f84d957953d0915b6ae7107b81f85af4e37e75289ed0edc5bdf16bdc00213860fdf0bdf53be953b80d514839c6568c3a70d2cdd61401e8dc73 SHA512 3902560099c7e5570be2b86b6e7d56427b6ef9cc893dafe5327b6773b92ca44cc787725a0d2e81d4b779ae71dc2acaeceaaff4d5de50fc99aab4c0dc0ab03bfa
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
 EBUILD pkgcheck-0.10.0.ebuild 1507 BLAKE2B 70f6f537fa953ec59c3ed9b0ea017bec0fb7c569e6006b066e35a2b2b868a4e75da078c5bd60faba16a9c80f8e011a565366e611b9202628f073a27fc4e47aee SHA512 07dbe05c8d6a60d411bbd2d07e890b914c85703e024822ad7b6720818d15e6843ea05f95bfeda54b3f4c1f8db96948d25e719bf5d415082ad9c038a0403c50af
 EBUILD pkgcheck-0.10.1.ebuild 1507 BLAKE2B e9faf1f21afbd8a9846f54cb795083ecdc48853e47e171b9cbb9e7a9e668a3b09caaf1870a31830d33488c4841e04c3fedfd8c2b1219cb391f74c981dcd999ae SHA512 0b1b30f6e5fea0bc8175206903e90ef60e65d0456fdfb14448342abc811e4e9d0333000e8cd6fd79974e22803673f64349cc8404c1ed8dbff4e3f54b58ddf3b2
 EBUILD pkgcheck-0.10.2.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
 EBUILD pkgcheck-0.10.3.ebuild 1508 BLAKE2B f7e417191f84d5fd4fda320278831cc847dd356816556b3bdb7b55138d667d64696d20135537616f21de9c331c4e063c612000198663b3d1337904ae90c6113d SHA512 a2d1fdc2fa45f2f1be07066d798145eb185f8616c96170d5436ce58b6f67840374f73e0bc9424121b914aa8a18d5830639580550ca3a1cd991355a9bc3513fb8
 EBUILD pkgcheck-0.10.4.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
+EBUILD pkgcheck-0.10.5.ebuild 1516 BLAKE2B 044cf7af3749601b64a8766f28d4c972b396e99576d44c856cd7b3b96e5b3c51ae8eb0e340eeff61508c73b99a7d9f2fcb1f1fa18f56af3558e5694f3b9cb925 SHA512 4dabfdd73300eac1b2a6ffe74fef17c82615e84eb19c5c59202360523a9e6170cf37b6a8190937b857499865427821ee5c5eceb5055f74cd7124aba85021096f
 EBUILD pkgcheck-0.9.7-r2.ebuild 1544 BLAKE2B 7bea3bcebc9b0397682d6ea9c39798a59857ea9276095548927e6fc6f09c606e60504b7a6ebba401fd00c55238489211889744b6480e559b897d7824fa33bbd7 SHA512 1de34366c44024ea677d6ae3e41a2a71819490d22a7f0813307f790ae3f3b019daa07d259ebc2ffe39121588dfc3a9183f46cbc7858d1c17e631ff2f6668bc50
 EBUILD pkgcheck-0.9.7-r3.ebuild 1604 BLAKE2B 0e6042b6fe93f617544b08d728eb1bbc4217e6e1b675c4069990c02f99937c9ba5668a68f3b5b595c688eddad5a47a96140f58daf9ca94a803eec7b933dd874b SHA512 6a3dd00c5158e8d004a002e820dc4553294c6faa2759ed672dc91f8664725bf6e7eaca8c1f7417a6d232566fe6031dac8df045307beba52137d003d8a1b76b28
 EBUILD pkgcheck-9999.ebuild 1515 BLAKE2B 6e00b9da5d1ebedf1d4d9e540b5cf88df6a6a17c3c313fc451eba46cedfb469528e971d821fb80cf5bd0975e0e73a0146c4a7df39c6b90b9dbc13af2e81e62a2 SHA512 64688636b07fa3c35788a10a130e8b9897cecd82b185b9e5c14f3ea2c540f13fcfc7a945d994b08fbd4c873829ee6fce425e242c82dbff18a5236c0adeec4646
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
new file mode 100644
index 000000000000..fecb6baf36a3
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
index 63942b874bee..b031a2eabde8 100644
--- a/dev-util/premake/Manifest
+++ b/dev-util/premake/Manifest
@@ -1,10 +1,13 @@
 AUX archless.patch 1516 BLAKE2B 6a4b335cc41f466a45170b016da0e26c7d5b955c8d0fdb118bb90370663711ea42e66308e455dbc671eee2a29c4999f2628c416e30491825d8ccac151b3bec65 SHA512 e74f895b24a7bb3da118aa694c35b2473994881ffa6e54ec5a0be450ab55374c0bb418b93fa84b5e30f46a04987c1cb75305463a1a181e458c750d38cafecd04
+AUX premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch 2814 BLAKE2B 3fd9affab496c3cfe3b49db672a3dd705c7592502d3d12ad203bf7034ce79d9de69266ba9358016656792b929a99eece12fbec41f223f0e21fb40b73ed9cec40 SHA512 0ab6979eada5a917f6cde6189ead0112c273e496662445d4b00a27a362361e57664cca1480c163cd157f87769c12f07a6bcbd5f737b38475885780bc2ae5ca53
 DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001
 DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61bfa34c1e30c64aa59a6fed9c4c35aaca996fd0e8b728e839c24e74eae9f23ac3c99406361a061f0fa5dc04ce3ce9aa SHA512 47a2c26d3c45578cb2cbae96ec1b647298824d08584e2610aacd038e21069297a1f5b3366340cf781d29827555ff4d955651f70cdc2d36b99808fddf52e7a242
 DIST premake-5.0.0_alpha12.tar.gz 3548788 BLAKE2B 30f7b0e139ac8b7639c78b06ae139137d4f62b4a7690b180d6c292f57205e7ab352042241735f472d20163c24277b835e9b14e307d66602d5c1bc1a7c65da036 SHA512 6f458fada8af9d93e99f9511b0cf1a2cad87eacf155c8330cab9f830c89aac0ba137ea466b8b2ecfd4a104132c7cd79eefbd06b9780066d27760bc695a4b94a2
+DIST premake-5.0.0_alpha16.tar.gz 6462956 BLAKE2B 27c27eeef77986f6e8244ecd1a08e19d753dafcd0292d593ac758e04c2cb2307e05aaf325d2afc6ad8936ab2bbd97af6269841b9b7489b50dd4ce56e39120f05 SHA512 7ddb5ffe48484157336c7309fb611d34ff670fb20f92da309af3a4ae6f664a4b8abd2c0575036abbed1e346b155a03bf6fbac0587b47d5c97d9a22f08dd2deea
 DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4
 EBUILD premake-3.7.ebuild 447 BLAKE2B 9a52bc3e693e3500fe706db1e400ef552961952d06106e43c38fb4ef62c172600469fe266b26a9bd3ef7504164cdebb9db2abbb9f9c96d893b85bb0a9d7fbd93 SHA512 8e77f419f850b861e66e77ac0140fc0de4ead84b23d0abd82ab568d6e9dc06c6537eed6ea2b5db8b3a0b88f44f3b915009ae173f6165c53b56bbc5a0b384d1c8
 EBUILD premake-4.3-r1.ebuild 539 BLAKE2B 831f585242a1722e38e1fbe8a6757bae8f7aa7d82bf9dc26667de0a1b4f02d410a2154a8779b6eb0ee40542003e433fa613e3cfec1a11231ff0472855c60249e SHA512 6a238c75005f7bc0c9e598543274ba4ddf4acf32806ee5fa9fe7e7188e7cce4f1de0bb6a242e6994d1a20d2d1786c95578e91867f46e7f9cfa2a7dd2ea56f104
 EBUILD premake-4.4_beta5.ebuild 610 BLAKE2B 576418d3d18c1fc2f3a020368711ae33f19cd65c7e0c9300a084fa165cb57e028ef224c9abc2044801f8c247acf80d79b418dedf69a82f867355446629d93875 SHA512 43709cba1c064040a61423808e75dc5d490807a89cffdae21068fa12855a2f1386be90a4d5c975eab370242b1aba41cfce58e1a92d8e8bb94ecf9d7cb6807d75
 EBUILD premake-5.0.0_alpha12.ebuild 611 BLAKE2B a7d0c3cb4eea07b3831665b6cf33faa5a93b7488759f44aab91babbacf9da6d027877c9a92d6388ad1e20192cda8a94f33830f88942a82e70aec0fcc8095c796 SHA512 5515fee0f01f446f180feadb3a3c045b135f50ae3cf10c7b4cefa252a9703e8ccdb50a0f0e635152be188a79fbfc0c5c8758fe95bca119d946cf8b818a5494be
+EBUILD premake-5.0.0_alpha16.ebuild 692 BLAKE2B e10d83075697bd2e159475ed2d687b6432468359ca82e386b3055d24753644c3764607bd56732d253c90ccdbd332228e47b211b58200e23020304f40aa3e4ff4 SHA512 a48980d187866b229321069f2469033d845b5eedfa6edb8fc11c00144ac9736f5e2720b977690d33c3d909ddd2e4ff41c9d671565d80469c161774a9c061e7be
 MISC metadata.xml 770 BLAKE2B 7de7d14b1e548a5de3be5a0ac41bd5cc5294597e73137378d5dce203ebc79b7ef284262a94925122162300e2f0bf0481d5a2ef76c24dbb9776f083f1e8b78572 SHA512 95b1babfff92abf52682ec58382d6a4fd416297038868f7c3b079eb662e24eaffdfcf25e8ba407adf957c0cefa512122dcd037abc288259d5622bf86ae6621ff
diff --git a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
new file mode 100644
index 000000000000..766d2aea71b4
--- /dev/null
+++ b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/773505
+
+From 89d8c74f0c9ba77aaa12799a9d2dc397eac4ece6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 15 Aug 2021 21:47:20 +0100
+Subject: [PATCH] Respect MAKEOPTS jobs
+
+---
+ Bootstrap.mak | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Bootstrap.mak b/Bootstrap.mak
+index 06e0f20..2d59068 100644
+--- a/Bootstrap.mak
++++ b/Bootstrap.mak
+@@ -101,7 +101,7 @@ osx: osx-clean
+ 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $(SRC)
+ 	./build/bootstrap/premake_bootstrap embed
+ 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
+-	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
++	$(MAKE) -C build/bootstrap config=$(CONFIG)
+ 
+ linux-clean: nix-clean
+ 
+@@ -110,7 +110,7 @@ linux: linux-clean
+ 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm -ldl -lrt
+ 	./build/bootstrap/premake_bootstrap embed
+ 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
+-	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
++	$(MAKE) -C build/bootstrap config=$(CONFIG)
+ 
+ bsd-clean: nix-clean
+ 
+@@ -119,7 +119,7 @@ bsd: bsd-clean
+ 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
+ 	./build/bootstrap/premake_bootstrap embed
+ 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
+-	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
++	$(MAKE) -C build/bootstrap config=$(CONFIG)
+ 
+ solaris-clean: nix-clean
+ 
+@@ -128,7 +128,7 @@ solaris: solaris-clean
+ 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
+ 	./build/bootstrap/premake_bootstrap embed
+ 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
+-	$(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
++	$(MAKE) -C build/bootstrap config=$(CONFIG)
+ 
+ haiku-clean: nix-clean
+ 
+@@ -137,7 +137,7 @@ haiku: haiku-clean
+ 	$(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_BSD_SOURCE -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lbsd
+ 	./build/bootstrap/premake_bootstrap embed
+ 	./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
+-	$(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
++	$(MAKE) -C build/bootstrap config=$(CONFIG)
+ 
+ windows-base: windows-clean
+ 	if not exist build\bootstrap (mkdir build\bootstrap)
+-- 
+2.32.0
+
diff --git a/dev-util/premake/premake-5.0.0_alpha16.ebuild b/dev-util/premake/premake-5.0.0_alpha16.ebuild
new file mode 100644
index 000000000000..af3a8cbff0f0
--- /dev/null
+++ b/dev-util/premake/premake-5.0.0_alpha16.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A makefile generation tool"
+HOMEPAGE="https://premake.github.io"
+SRC_URI="https://github.com/premake/premake-core/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-core-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="5"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
+)
+
+src_compile() {
+	# bug #773505
+	tc-export AR CC
+
+	emake -f Bootstrap.mak linux
+}
+
+src_test() {
+	bin/release/premake${SLOT} test || die
+}
+
+src_install() {
+	dobin bin/release/premake${SLOT}
+
+	einstalldocs
+}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index f3a1ad5ed8d9..924c10e07945 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -9,4 +9,4 @@ EBUILD spirv-llvm-translator-10.0.0_p20200909.ebuild 1555 BLAKE2B 12befee30e2c70
 EBUILD spirv-llvm-translator-11.0.0.ebuild 1555 BLAKE2B e2140c932905dfe3f53507cdfca04572fcf9c68a7c16e3f09de02426e9b1af71ff1056e5a9aca39d248653a4561ed686eecd76f7f9d2e5b3082ef7c9f3d6ea57 SHA512 0650a432c75a86437bb94ce30ba569bf5c39117e3eff5efca26e3bef9bc1047f20c3209f4b0347bd734e49c32fbec5531fa27e0b141f6e752b593a130169cb6b
 EBUILD spirv-llvm-translator-11.1.0_pre20210212.ebuild 1555 BLAKE2B 03064f9e4cc3acd127f98ff1485e73db3cbab63781e24a447b829990418e7dae05ced9b3af77ca7f73613e3b5d04fa91e14a94a06809abeed596d5b4f476bd1d SHA512 cf57d2357b1b1b5ac35326648b9dddf179f9a8a0cab92f8271fc809179e4cf4d01af7b17f53841fcd29c5b498ae00d725dde558fef6ca89cbeb6d59810036a13
 EBUILD spirv-llvm-translator-12.0.0.ebuild 1201 BLAKE2B 5a00881cf52746076ea38fd9de26e708964d20fdb3b4b730d33a8de722fdfdd18ca5ce10745291bad84c92fc731e38e032e24dfed3fd2e838fbdbcff71e1aa26 SHA512 a66d4f4852df959297d92b12398c84c2c902aba50697396cb41d0d14277f95d681fe9627cf1e2274df6e98e02ddd3f149922c20acbd179ec81fedb190d572622
-MISC metadata.xml 363 BLAKE2B 8dcf09b8fc5a238a4c4c841973d13f9046440c08ea0eb5240616836e5891ad49fea580c72d83f52eba6f11781a177245a62fe2746cf0e2404c3ce843136a9588 SHA512 721f1801ac362a45601b9928280210c68cd971dedfb2a2851c97f6899ad9fad68929760e7b5692c9fbf97a66a35619ec8e9d3fda2adb051c76c0d6c77d72d0b3
+MISC metadata.xml 584 BLAKE2B 519ef0f12434a9ba6ef999feba379b401b4da09f76a4aa8ac08a0226d44327b524003c8de3a63e1b1efded4a0b40f663fe791704ae73769765bd760eec11a599 SHA512 54a950bfea7262bbabd6d5bba3dd0447aecd7d7614979bf93ebb592afb72bc78d947abd66e5e0c73f079636a2d1d83a45184a1b001fd0a2f4b517515fa1de125
diff --git a/dev-util/spirv-llvm-translator/metadata.xml b/dev-util/spirv-llvm-translator/metadata.xml
index 13135f7c6360..2816efba7774 100644
--- a/dev-util/spirv-llvm-translator/metadata.xml
+++ b/dev-util/spirv-llvm-translator/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>gentoo@taujhe.de</email>
+		<name>Jan Henke</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="tools">
 			Install the command-line translator llvm-spirv
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 78ab8293839a..bce9f8649565 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -12,6 +12,6 @@ EBUILD stripe-mock-0.105.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da
 EBUILD stripe-mock-0.106.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 EBUILD stripe-mock-0.107.0.ebuild 582 BLAKE2B 3e5f302fe8efdfa19c81b51aa1f733c8695650a2ab7982ac737f67bf0005c4d94ecbe47c59c41ee81377d9e02671119e19e084ff37be10a555ea031d1951f6f8 SHA512 25771845d4987ba1fd2e4f49ec69825c59a36d0ad967ef258b149de7f53edc7ef7cd3198095b2684e7364e0f46d8a62beb653e6b088f14184ee5a6efed72d53c
 EBUILD stripe-mock-0.109.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
-EBUILD stripe-mock-0.110.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
+EBUILD stripe-mock-0.110.0.ebuild 583 BLAKE2B c59cdf187cc4ae59b76404a32fac3d835c797e12f7622f5c40788eb3b877750e3abe7d71feef513c889aa36a1162f8d222cd528098cbccd84eeaca44425ddca0 SHA512 484f105ae4fdfbcde6e8687b6ae9b69621ea08afd4f5efa23c03d4f6cf5fa9ca68c8e8cafa5c4ebafff983be0a2ea7d1016f7ac66c8cc3ccbe60cfd28352e353
 EBUILD stripe-mock-0.111.0.ebuild 584 BLAKE2B 455d8b5f05654245c33ccefbd33002c6da3f15fe0a27b9129461e8470b00c1620e5b498624841059856e5c356c6dcf253ff24e95daa0349f6e2b0b4943815be5 SHA512 21a2f75e84a60c4dea866be981f19fbae71bfe78bb0bc9b80136a3573c443b71450badd2cd2b4e14f0d841da40e57bf748b231f2b61b0eb897f1fede45eb59ac
 MISC metadata.xml 642 BLAKE2B f8a0cc39447fa2a3bb6b5f488214dc6603b0b34d8e07ce087a215b333054041d84734bedca17eee874858a4fe0a7c7e0a3048a67f183d6a3ca1546c0a284fe9a SHA512 b4a32de284bf118140ca530c9705aec3ac413eb20657f6111f94865fa6456ed95cb6150f9e8a3f8fb232db1e9afe3ac4267d06c210e2fa7aa53c1e657ab531f0
diff --git a/dev-util/stripe-mock/stripe-mock-0.110.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.110.0.ebuild
index 05a7220e34b0..0d362eb78a2b 100644
--- a/dev-util/stripe-mock/stripe-mock-0.110.0.ebuild
+++ b/dev-util/stripe-mock/stripe-mock-0.110.0.ebuild
@@ -10,7 +10,7 @@ inherit golang-build golang-vcs-snapshot
 DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
 HOMEPAGE="https://github.com/stripe/stripe-mock"
 SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 LICENSE="MIT ISC BSD-2"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2021-08-17 11:36:49 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-08-17 11:36:49 +0100
commit	e2db47eaae00ec33f8971db44b68645c5d3b9590 (patch)
tree	3ec0cf16ddb5854017e134fabebe14bf8cb94a34 /dev-util
parent	616579b5d773c50af31ee56f00105d96ce641ca2 (diff)