gentoo resync : 03.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
commit: fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree: f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-libs
parent: 162945d2a91899b637bbb9e163b406350de12906 (diff)
51 files changed, 482 insertions, 529 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b2102dc63c3d..2ac202afdde8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 747857dc8152..bf435d7f25b8 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,4 +1,4 @@
 AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a890dc639d966403511373a182cf908229a15e6c3302c3635a8ac134399a71823d2dc65320f4304078c674da7978911 SHA512 7293fbccc394f09887398940996d44f59170fc556662f095bdcead752be84b7583411af8303e462703272b00523a8e14407d14c4f0e1589ba395b592b7c29f01
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
-EBUILD efl-1.25.1-r11.ebuild 8236 BLAKE2B 7172fe0d930d200b04a470bc89f2100e5a49c868434de50860059bf1f82eb3b17babaa9358d85cf19a06194cd02b911998395c74390a3bcee8a3eac8f9a60a86 SHA512 ddd7a503bb160e65c70e1ec03e931adde1ef8af719482c519e6053df78cb86359431412584f620290535770821e06a016f471c1a20c234f63aa936dd1cc460d5
+EBUILD efl-1.25.1-r12.ebuild 8242 BLAKE2B 6f3fbdc292db7478fe4556c0e2e1bc59906c7d04737c87dc60f161b5f812ae13aec7ff0aa8214bda6e1b640e130492cca4caa3db2282fbefa56776838fd391d1 SHA512 5e8e1c850a1e9902692cdfcff20d831e23defd0cf503d67898bb337c4018c7aa7e6594a903abfa2a697747c13fd63797d0b64b7fee48a0954ff9ea4255d8db06
 MISC metadata.xml 1889 BLAKE2B 00d61cd4f80a59696ca2a0b2547d5ac39f93312e35271b6f94ce7aed168d3aa042a05378b1bb2d3874dcab9c166ed5ae53a1c955fadc6b588dc40deec07ccdab SHA512 b852affad80c80834e80da06d33e3c3e42aba404cb5b628bee06f23977d3956225bf38e9897e24d31325cc10efebcd448d4c50ad9d4e8a154e23400a545e2e9f
diff --git a/dev-libs/efl/efl-1.25.1-r11.ebuild b/dev-libs/efl/efl-1.25.1-r12.ebuild
index 13014cbf930f..a3c8c4762965 100644
--- a/dev-libs/efl/efl-1.25.1-r11.ebuild
+++ b/dev-libs/efl/efl-1.25.1-r12.ebuild
@@ -74,7 +74,7 @@ RDEPEND="${LUA_DEPS}
 	drm? (
 		dev-libs/libinput
 		dev-libs/wayland
-		media-libs/mesa[gbm]
+		media-libs/mesa[gbm(+)]
 		x11-libs/libdrm
 		x11-libs/libxkbcommon
 	)
@@ -85,7 +85,7 @@ RDEPEND="${LUA_DEPS}
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gles2-only? (
-		media-libs/mesa[egl,gles2]
+		media-libs/mesa[egl(+),gles2]
 		virtual/opengl
 	)
 	glib? ( dev-libs/glib:2 )
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index fbb5d9d2c7b0..fc75474babec 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -1,6 +1,6 @@
-DIST ell-0.41.tar.xz 525240 BLAKE2B 80614190c1237fdbb867300418d474d50e163fba7ca15f4c74c3019b4d407da8319b67be5a88886894dd8869620bae1338e91d28993077690e93260ed1dc3cf6 SHA512 bfbc18195126196776a0d00b4ae8bd8358a6cd1d2f8221132fdae1f323172f148a3faad84a951774ca38a3a72e8d96512b9cac84d9ef3a6cddf4b1490b34453e
 DIST ell-0.44.tar.xz 530720 BLAKE2B 682217828a6a8c6b429bd3760f39fe2d4139b2836daa30d9cd6fe2149c30db63acbeb9be0b4e2f8ed6debf3a6b153950b12995fa5093078f93b4c45b7425bfd8 SHA512 589bf5d8b2954ea7ab38d9673b7ef59729a51c50c20c03b35673bf777b369819222390f471fcd58651f7d51e42375197792119327d4e7e7b101d1bf22c9b7078
-EBUILD ell-0.41.ebuild 1251 BLAKE2B fdf1de6253dd70eca9a06cf5709a5ace67be4bcac98af27fc731f70938f86af8d421701327750c3c1508302c3736bf28f46f95f60cb1d3422260ea3bb9c237cd SHA512 16244e84cfa811cd8d2e1b81ec4544a2d9618aba9c29b1853ea1512ad065bbdec6daefc176330454e56c4cf9e00156d2f83d1df7a68cd1ed5f940655cf32bfc0
+DIST ell-0.45.tar.xz 531140 BLAKE2B 62a54c18dbb7858ec0e56aae081fd8edf14c1aa82a9acf6edb2a2c16e35525c492467bec3fc0714200d2592c98c9d394314f8f6eef9f0ca0cdfc8548ed9abd09 SHA512 38b9e68ed1fae14dc77c1cfd867d497f272530ee40f040ee03862cef46dd4930f09fb40de9ed23db1baad487ba39795665c9833b8988114e4bd357bc0d0fd66d
 EBUILD ell-0.44.ebuild 1169 BLAKE2B ed818bc1b592a9d5768ee4875205a63bedc7c32cad81e5be707e5b345aa78de37e1c337a33fdbae36a934bb2c01e288f5ab27a8af6a3fcfd795912414dd4437c SHA512 b4aab5df0c8036b434c05e46f00277f5b9a111567b3fd1b7ecff52cbb0c6e3678fa8cd9afcba57c43bc316b7416a28582484791d66b1ffb9357e366e3821241b
+EBUILD ell-0.45.ebuild 1175 BLAKE2B 38153be8a98441d30ba0299302e0913631abee145ad6c2c212ef6d4c9ef7ba97f4408aa79119f2ee6e2ada5731d8811288fcd9d98385f1660efa89d58dc2c149 SHA512 9572ec6ecf0e0bb036934ca776675d1d14694df5a0efda4bc2045e45c2478b2c8c9c1488b9daa123754f3eed2c14a883dc3d1d64bfbf4085961e3720fac7e46c
 EBUILD ell-9999.ebuild 1168 BLAKE2B 229eaef8e41979c42c2a5b5a233cda5701be588f5dc093eb8b288ef3ad05c9216b065cb8e29bf4adc4d8f702331032f9904f443f139ac72936fe776434f32b59 SHA512 e9719214985628d7e6f752df9a69f4576efb2c0e418f9bf44968c0c23ed81ede0483fe9f5f79bf9ef32a18fbaded57fc3c38c582f02bd2e5cd0dacfda5532028
-MISC metadata.xml 337 BLAKE2B 48c0725411f6975e1e1d6783c7c8cb76e0918265c4ac90a762a440e34505db05096bdacc9dba9cf928ae39dc40e94a59305ef5cfa5f6e80c5711909cee1ce1c3 SHA512 b7ed002ca708259ce0a7a1106b944fa5f463fe600ba390059e9b6b7c79f70dc88c76666d7245c0334a29efc1170f6797d710e14811f187856406c1f9d6812e9f
+MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.41.ebuild b/dev-libs/ell/ell-0.45.ebuild
index 8d87287e5656..e2a5fd2979c4 100644
--- a/dev-libs/ell/ell-0.41.ebuild
+++ b/dev-libs/ell/ell-0.45.ebuild
@@ -12,21 +12,16 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-IUSE="glib pie test"
+IUSE="pie test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( sys-apps/dbus )
-"
+RDEPEND=""
+DEPEND="test? ( sys-apps/dbus )"
 
 CONFIG_CHECK="
 	~TIMERFD
@@ -46,7 +41,6 @@ src_prepare() {
 multilib_src_configure() {
 	append-cflags "-fsigned-char" #662694
 	local myeconfargs=(
-		$(use_enable glib)
 		$(use_enable pie)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/dev-libs/ell/metadata.xml b/dev-libs/ell/metadata.xml
index 2e0e9cea2686..85c8ec42b7ca 100644
--- a/dev-libs/ell/metadata.xml
+++ b/dev-libs/ell/metadata.xml
@@ -5,7 +5,4 @@
     <email>bkohler@gentoo.org</email>
     <name>Ben Kohler</name>
   </maintainer>
-  <use>
-    <flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
-  </use>
 </pkgmetadata>
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest
index 243dde6349c7..175c3069a2a4 100644
--- a/dev-libs/hiredis/Manifest
+++ b/dev-libs/hiredis/Manifest
@@ -3,8 +3,8 @@ AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6
 AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390
 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
 DIST hiredis-1.0.0.tar.gz 97507 BLAKE2B 247852d53be96e36dbdd7d4d8cfbda4406aa66281f26c28c3f80ab4593679122fd59430b2d5f04d20126b4459fc75af0a1fd67f1ee1db691d8db575debad2b61 SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
-DIST hiredis-1.0.1.tar.gz 97937 BLAKE2B 476bb3607aabe2147eead61c98de325f4dbd2d7c7439513ea0cd98980fc151a64798647757e46feb61e8914e47b42963bf128c938c94c42c448369065532166f SHA512 87909f78171cf4deeb3d030484b55fbd1a7f7f27f33636f90e169a900ddc5c5ec447d2df34739ada3cf35a50d647cb4fcbe2754f4521d18f770f1cf8ed962909
+DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b
 EBUILD hiredis-0.14.1.ebuild 1897 BLAKE2B f247584df6ce3646f5fe5a9e014910d0a1392679b596ab54bc0879914ec63e45a9d0e0e8d27c29ffc41143bd7f033cacf24ca3103fb56cec816fd0e2455bbe87 SHA512 4a2f9e9f98f842a30051744892647fa3b2c9e91b0a8c117215609ad4ffd66a599c2b6603b3b4fab5815b21488176d103d9fa29026b9f1cf437ffb30c1db67167
 EBUILD hiredis-1.0.0-r1.ebuild 1957 BLAKE2B e0e88f04089350f05de98d3915dc9c361607478685dde2fe414e961c0fef22c16ba7035988aaa08dc7a95ed4b376b42602763c42f94af3bce928c9103e1767ff SHA512 0a65d34ba42f6f1fff3b8166f17957dc39a6f12e198a312a5a482dd4bb3863aba25b33217ab004c793a35533d10afcfb69cd2c936c165778a7c484c19ae63677
-EBUILD hiredis-1.0.1-r1.ebuild 1959 BLAKE2B f281f5597ec73a7df2fed2a63ec968f31115ac1b21fbccc38e70e3f2991c872fc6f642c8a49e12340de660aecdc7eec0db5a8902916c1cda18b79ad04c19ccf9 SHA512 bcab38dc1522fc2c5d064f47706721df75cb4e19d3d7d97b5b51102188a8e3f031c06d04498dd30d8c13ce9ebb839791d3c608c1c10f57941970d7dec96f3ec7
+EBUILD hiredis-1.0.2-r1.ebuild 2095 BLAKE2B a2669e3109128e5b22417b6021f8e4c164d3c5c3c962ebac040dd598d3f9cd53f79b3a5ef3c7ba342641392fcbdce2ab4a52f885cf87190004de3f055327d367 SHA512 8de2e2cbb228429ba3b6d79939873dd407834f7294220466b4fa1a8f0a116dda59d635e2d842061f89631046c367d3e80dc5dca4b2d90900086af1afa257859d
 MISC metadata.xml 404 BLAKE2B 3872a9946b2a134a1c55c2b0aa6a77d83df6b3e48a6bfd017e716ec0eb8400bc95476088d8b79de5e23d6638397b5a0d41bff556c076e607a6f1d0dcd668c7e5 SHA512 ea90d8e7a04ab8929bbefce3c78adb610c7e22d2c9ed44483e16dd4530f04baf160d372999a5de9ea52850336b4d9ca13fd70fb719c2db18f938360262761a29
diff --git a/dev-libs/hiredis/hiredis-1.0.1-r1.ebuild b/dev-libs/hiredis/hiredis-1.0.2-r1.ebuild
index b1397aa2a4d0..7a7c75517a0a 100644
--- a/dev-libs/hiredis/hiredis-1.0.1-r1.ebuild
+++ b/dev-libs/hiredis/hiredis-1.0.2-r1.ebuild
@@ -10,7 +10,9 @@ HOMEPAGE="https://github.com/redis/hiredis"
 SRC_URI="https://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/1.0.1"
+# 1.0.1 erroneously bumped SONAME but we're stuck with it now. Force another
+# rebuild so everybody is on the right one though (1.0.0).
+SLOT="0/1.0.2"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 IUSE="examples ssl static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 1ed14c5bea60..893f7edcf3f4 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -4,9 +4,11 @@ DIST intel-compute-runtime-21.39.21127.tar.gz 4666632 BLAKE2B 0e63e1bdf152e9995d
 DIST intel-compute-runtime-21.40.21182.tar.gz 4678271 BLAKE2B c8f5c324af0e8ef787b287ee1e3fcacc217c3d935ce859123a217c088323f97a80293749689959be22502e7f569ad0fb917868c526dcea7905e80585e7376f53 SHA512 fdf74ae700a444ba9732938d9cdda3ba6f6baac209ca1611488b405a4ecced7cdd434a9e349af8a095b5adcd583b84294cb831ddc785520cd697a7af1ffa0437
 DIST intel-compute-runtime-21.41.21220.tar.gz 4753783 BLAKE2B a340c2b5c1199498a68aa66c1d88367b99bc2404f35da10135030aa68462a909808fb2358dbc3d75357e00ccf30bb259a325a3d4523d862c0da358eae7528f65 SHA512 df397688423dbe0ec2e61c9a9c8b6ee1ee4451a95ef01aefcc2a0ed956e6b8273a4e9975c9aca592b51b4ce85324f5bdcd6a835f8eab40a0e715eb10000f1ceb
 DIST intel-compute-runtime-21.42.21270.tar.gz 4761371 BLAKE2B 5dd2886e4b2a84a2247d2bb70667805531f099881431d9e8052c870d4081378cbbb43ea3f595c890f9d1930b9d054c0813da3f8b1c5509ad2090c78a4d683ed5 SHA512 f913bb116e84c0bd477578e75e10b67ef9c42bb447c2afdeefd9bb8ae291e53b019937d6e474e749a9bf98741366c8e76e5a8dcd23f8a9fac48e306e8dc9a648
+DIST intel-compute-runtime-21.43.21438.tar.gz 4840204 BLAKE2B 6de3075132b9a48e97e30e66c6e09dd24f51cabddf55622f2c7490d38bd1ad25e4853206a0a8a3c4c34ac3eb774e44974c47089182652ae2d234044b72d1d048 SHA512 e8f98d9c8c0a01794d57276706ec4212a3fb082c8ac04dc76ceb0e30fecbd8d35405baaa45685fd4b241e8b04a15db16aef75bf1929c81ff879af46e5be00d1e
 EBUILD intel-compute-runtime-21.38.21026.ebuild 1385 BLAKE2B 16dec0480a8a58efdb7ae90798252cc9bee903f49d348ef31565ed2f7e6b23b6fbdbe81d466eda732f799ed92a1394b7b058043105d6cdde100799bae77b299b SHA512 0d8816d6697afe47b3dfdc24b483bb3e4e1ac6408387510ba1e3a18186066de69bfd907db1499b69358afffc23405c20fb2a34b96ec65e0286a5b258ebe85e44
 EBUILD intel-compute-runtime-21.39.21127.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
 EBUILD intel-compute-runtime-21.40.21182.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
 EBUILD intel-compute-runtime-21.41.21220.ebuild 1386 BLAKE2B e7fa088d3c0869f7a5b251095bc33531a242c555c25ced19182b91786372cdbb0d308a3b6b12c63cd49fd8680d8810a0936582e12bb70a8511d7eeac0b8e56d6 SHA512 e082c0fbfc6d6ca10f2c6ced5f43a2b4071437e79974cf1c075ab4d1319f0786d2d97fa545671b8060cee87a661f755d0833c53ec560c3a2cb424c2aec072986
 EBUILD intel-compute-runtime-21.42.21270.ebuild 1386 BLAKE2B 429135e921bfbe7bbf733cf686dcecc0565df85f4aeb7a11b206265500b4f1cf87ea8a28d2a0a261e4da2b1f045e3054dcdc6eb8de945d88e4f3ecf44997918d SHA512 345daf68bb741d8ed2cb38dba6bb84f979405c934ad44e0ad4fa510e1fd0cca40ede045fc651a98db2ac0bf2dabc2f5ce92a6f801ab93be25d482ef16a4876d9
+EBUILD intel-compute-runtime-21.43.21438.ebuild 1386 BLAKE2B 429135e921bfbe7bbf733cf686dcecc0565df85f4aeb7a11b206265500b4f1cf87ea8a28d2a0a261e4da2b1f045e3054dcdc6eb8de945d88e4f3ecf44997918d SHA512 345daf68bb741d8ed2cb38dba6bb84f979405c934ad44e0ad4fa510e1fd0cca40ede045fc651a98db2ac0bf2dabc2f5ce92a6f801ab93be25d482ef16a4876d9
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild
new file mode 100644
index 000000000000..aa334bc43b1f
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-21.43.21438.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND="
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.8744
+	>=dev-util/intel-graphics-system-controller-0.2.4
+	>=media-libs/gmmlib-21.2.1
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.5.4 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+# for Khronos OpenGL headers
+DEPEND="
+	${RDEPEND}
+	media-libs/mesa
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+PATCHES=( "${FILESDIR}/${PN}-21.31.20514-no_Werror.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/libarcus/Manifest b/dev-libs/libarcus/Manifest
index 2baa4a0bc7f8..16700fbcfefa 100644
--- a/dev-libs/libarcus/Manifest
+++ b/dev-libs/libarcus/Manifest
@@ -1,4 +1,4 @@
 AUX libarcus-4.8.0-deprecated-protobuf-calls.patch 1395 BLAKE2B 6488f7da07b78df1f18826a62f47cc2a7835ad66f7c5f999a4926caff9bffa8125b39f44cbb4e5849b3283c95898120c2cdc0947c9008869af91db08f0036e55 SHA512 f98cdd0d15d03752cd04466211cdaf2fb0ebb4f9a5aa887c4f9a1df5c32ced18559952f89c4549ea93376d95ec0b1bc51289ce87256804d2fc453686d48b55e5
 DIST libarcus-4.9.1.tar.gz 31967 BLAKE2B 2ee827c3f1f592ac1efa7557a2cbfa9cf9fd2d43a7be7fd803f94f7b51c9a03be1078d3df319e1bbe2bc37b6ec3a1c6f16996c4e3b6251dd06f6031dd32ad2a9 SHA512 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd
-EBUILD libarcus-4.9.1.ebuild 1357 BLAKE2B 9c7cf901543a6e13c8e1cf6861a028c81cc98048dd725b5981c1dc0a1c023d5482fde9d4188d971057454e175b60b8619158bcf387900e6eba7e0a7f113e1a79 SHA512 b165f573c87c6daa209b225686d0a12081a0f69b2feac846ea3d00017529f8164f00855b7476ad031ad425954f6636f4e542966046e02ed35c503d604e67a977
+EBUILD libarcus-4.9.1.ebuild 1359 BLAKE2B 103675b40d9849aaa5c9b1a077a3ca0efd2f2c539f6e7caf53115411996f8a36c4a58ef5b512076cc9c95b9c57e2ab60aca458f4f804b67c9e9de93e5ff48856 SHA512 19789acb5e8e7bd6b7db4354432372a4feffb588f48845e2ddfcef64d642570bf3396b6292ca454fb6bbb90754a29b26190fd76e0cc231fc56365c91c9101756
 MISC metadata.xml 1286 BLAKE2B 149e6008ee050d64c46009c12f18dd2e18234e4f19c1093fd0c557cc3d9369b547b07f7397975ab74b58d96ce39210f6a213b2f750ac2f844da579ff9f4ba8e3 SHA512 d6efb7fab1d6072cf8ad1ce5d2a33956eb9a8ac78992a434201d89de444b29382223e91f3c25475128a07fc81cfd4382bd396f9f16044f33b5ec4cdac8612b0c
diff --git a/dev-libs/libarcus/libarcus-4.9.1.ebuild b/dev-libs/libarcus/libarcus-4.9.1.ebuild
index 8a82c33b9bb0..ce9da7cb6141 100644
--- a/dev-libs/libarcus/libarcus-4.9.1.ebuild
+++ b/dev-libs/libarcus/libarcus-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 6932df310425..dca14f5cd553 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -4,5 +4,5 @@ DIST libcec-4.0.7.tar.gz 355249 BLAKE2B 5f742364804d0d10cfcd71635645d33c3dfde200
 DIST libcec-6.0.2.tar.gz 355807 BLAKE2B 007530d839493355f283992a4390550d6ddd432977d7489c17087f7e5bb6f503c35e967ed6a620d55e2e7c25ce10814f360d146a28b860cdcdd108fae152f896 SHA512 c16ac268e67b01d4e35fad644e5927e1d9fc7bcaeff698ac5f0eadd31ec63a0bef2a2b2bc37860d1571e1e0cdc55911c2de468c661c7c7ae1d492f80188035cb
 EBUILD libcec-4.0.4-r1.ebuild 2018 BLAKE2B 36e7fd1cac2551febd35fa3d0533bf9e06d8d5c8981283c6948acb78c1fb2ca405a80113afd3b31fecc315f271442a4c589d02ad300c0461a4615a0e456205df SHA512 619a8dec29e7aaf7daee20f79ccf8d330a4cf199054568f4be98e9d23f09d20a0aca4c389d0b41036acc1d53f0bfe749d70148cf22efd9aa6502d27f57a6ed0b
 EBUILD libcec-4.0.7.ebuild 3271 BLAKE2B cec8de0c00a3976c3eff2e8631846f5a175ea00129b32eefc37dbe9d3000c594aa653e4cd6f5f673bc2eb0db6de1bb18a3ee16f258871c826afa43cd1ff9869a SHA512 79ffd559dd8a0ae22622571ceeb73616574fa0fcf1b0db876ec0bf92fb9d22ad5460e5119abde10bb977e51027609fca6989f372173e7e3aa72960b503218a58
-EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B eae8545464fa0f273c00b69a1e44e5a8fec9def4d29595da76524f50ef62c37d6fc078bc73cf69b506d5414cb4d5753fd3c702d4a94444d5f78d745b4a9f32a5 SHA512 0f28d398a4e87f7d412f399600522a963e31e0ab9bec01b525a82e336c859231c3b737516321d3955ae49728b6db3f5780fa3d41af34734d38f6960166329716
+EBUILD libcec-6.0.2.ebuild 3268 BLAKE2B c6e86830fa1c49906627f5f532fb62a477da03f6608eea81cd65c038c8d9270abb4d354c4743292b99589ef25e35f15b3745d16f32bf5de2a8bf9db54d4c2bf3 SHA512 9b32a427bff242ae2012f3d993a1c4baa822e95b354d39f72301b695cd6fefbe5ff612dad8c8c6dded814903dee6439cb793dfeac47462ea02192db0603c575c
 MISC metadata.xml 828 BLAKE2B 55df5b9af327507fdb9f415c8616affc437d82ac5a7e57b53f21f7917285b10f70e58b3fdbebf6899aa8c10dbe73186f84643842b04953da74f94b6c4112b3d6 SHA512 25e981d2c88ce87c9c41f6816dfadeb00bf3e0d5dfebc8b135ceba09552c40c29501bede0e3a73a63dcacb0741167f6180a674d82cf2b66dfb649a4aa968387a
diff --git a/dev-libs/libcec/libcec-6.0.2.ebuild b/dev-libs/libcec/libcec-6.0.2.ebuild
index c118e5234689..80507a293bfb 100644
--- a/dev-libs/libcec/libcec-6.0.2.ebuild
+++ b/dev-libs/libcec/libcec-6.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 MY_PV=${PV/_p/-}
 MY_P=${PN}-${MY_PV}
 
diff --git a/dev-libs/libcharon/Manifest b/dev-libs/libcharon/Manifest
index b0d9704dc206..c0f4e0ae65e5 100644
--- a/dev-libs/libcharon/Manifest
+++ b/dev-libs/libcharon/Manifest
@@ -1,3 +1,3 @@
 DIST libcharon-4.9.1.tar.gz 151243 BLAKE2B 8557efe4667a83297a4bcfc8307e2322a379e52d50ad1648d873a923e182b3be1651a13c7402ac041fd134036a75a42e825adf2cc27271af218db44af7e48473 SHA512 41d611f8d3bf0f762a38a00c159104df04b73cd5c4f7e9ebcfe3ac9cdd0c8e31e505c4fd4ef8f8a6f1c02bf882bb3e14ea4e92c8b15169a91cbd1815e36310fa
-EBUILD libcharon-4.9.1-r1.ebuild 1746 BLAKE2B 46a4e224043798f5f327d6b0d6b3033145a210cc5f3b80e4387d7e39cee3e8a9bcf8ff707c0fe76c6b1b20a00318eb4153002d7a89417572a8a117f4d5163447 SHA512 fe4d49ecb8b11c9e814755711628eaa3d52d5be73c24bf0c88b909d4c11d868831b360309c7072a4a6b4e746fd8526338a0287da640fa277cc6d2fc5e8fc7ab1
+EBUILD libcharon-4.9.1-r1.ebuild 1747 BLAKE2B 8a8989c27be14e430a912d220e83e12e7584010a82838ff7453c9f58b7a6e3bb045885a6f222ef49a17fbd77dbbfe7d8343bbeba387008a6f50299d2dc6b4021 SHA512 422fe986046dbb84f3cef7e1e7872a484a8a71dcd49e0dd5d096aa89a60f8c2bba1a2d2ecc5648c88668b3cdfc4a94e0448b9f24c539840244d10a409cac419d
 MISC metadata.xml 1140 BLAKE2B 356713d6a644186b8fda5d9fd9587a74a605aaa638217c62dd9f0657859322c66015d25a5b5335dbe02fcf2492ca7dec0d5e7decd5a2d4602b8b8ec8338f7821 SHA512 8aa76c3b4dc2246e0cc6c508149ff9913ef3310a3477d7596b9101f183d0e858cc3c11ebfd138cf1eb65e79c2800ad63cfaca63201aa1a63e36e5ef63bd664aa
diff --git a/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
index 8bb7404534a2..6ba209c25452 100644
--- a/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
+++ b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 767889914dac..1c7746d57cb3 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -3,5 +3,5 @@ DIST libgit2-1.2.0.tar.gz 5589147 BLAKE2B b612e3a30b4675431879792132adee22cce579
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
 EBUILD libgit2-1.1.1.ebuild 1679 BLAKE2B 9dd07e9bbe4d89983be44c8496fdda580f0934bce1d25088062a4f0b9fdd32dfa7fa845bb7d5bb601aa150d76aa22484845ae1ad0d97a81a23fd788eec737528 SHA512 8ed3e5abd8e9c97bc73c7b487d9669d973a5d3992090eb3a5ca72868a9309193ab03515a9dd1c8804f6c5457ce29a966091489666f40a8a917916a7492913e87
 EBUILD libgit2-1.2.0.ebuild 1686 BLAKE2B d397aafdeeb75006880dabf9653b88921794cee0f79ecf2498fbeb303dd5816d74afe21c03076eaaa6e575d0e96f57d0e697d7e0e859ad97f4bc02860fe9c6f3 SHA512 55e66ddcf474bca68cc61ed829a22b830f083ff584239d23c62d48ec0ad45dca75294c7bff0d27bb425cc6152ea71dd03e05082da846e8fcf086dc38a136fd90
-EBUILD libgit2-1.3.0.ebuild 1697 BLAKE2B 4e336b16d73964d6ecd3547b7da0938ba472be7e693d96267682ee81680823ac3e2847572d0079a46a50e42ec8f7d550749d285495ea953bde115b2e6e5ea068 SHA512 7518a47ed5a06c22282aaf4ee9b722062db1f0dcc42badce7beb6b2eff7c631a1e550b4beeaf84203b0124bf19a720121217934a125786d35435560f3fee5d3b
+EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a0b4ffdc20274788d174de2735afa3d5a2cde3ec248e07e9c843a62547c240514edd9897f4dab1cd4a8c4455c8 SHA512 c3c00367cdd0f9d4699fc017f760eb193c324ed280149b8264d8f2680824308948437e771ab0ea901185e558a9fa535c13e906ffa0aca732fe2480874492554f
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/libgit2-1.3.0.ebuild b/dev-libs/libgit2/libgit2-1.3.0.ebuild
index 18a2c3f5725b..573a05a4d9b0 100644
--- a/dev-libs/libgit2/libgit2-1.3.0.ebuild
+++ b/dev-libs/libgit2/libgit2-1.3.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index a8a32aa66f53..603530285251 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,7 +1,6 @@
 AUX libmowgli-2.1.3-cacheline-Ensure-sysconf-var-is-defined-before-use.patch 831 BLAKE2B 552140cae8b31f796826487319286fc5d59972e2036bb33a8a2c6febcf0fc8fc8bea502a0d5aa3d00e0028534c1891e19ba92ee0c4071ba3fd8b8fd9bea5158d SHA512 8f572b47fa62918be88dc11028a916897aeda46691b5b4975f87227aad2141fe472fdcff3431d61c42cdeb8322aab1e065d8ac155f2f367f4c28a6ae97799271
 AUX libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch 531 BLAKE2B 13627cf2420f8a9f1c90010e9b40fd4234a6c6603857f463de7d469a1e2e148bdf1ac5dc620ddfc622b2fe6da64f52f9756b2e980e529a78d519bcdd9ef36cf6 SHA512 b4e35ea2cb241a48ce698f7fe094a9a55b0c901f3a9f613a308898714496c4b3b531380d81ab34651b6f24dd877341eeb1c694120d420096854daad03240bd01
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
-EBUILD libmowgli-2.1.3-r2.ebuild 1036 BLAKE2B 87b25ec5f80417e482fa14e7c3c26881eef72cdfeccfe01dcc182ee5bc2aff727ab6a8314cbb7194a88fe3ea84463d3ffd6f4575f7131623180e13bb060a644d SHA512 d4e660c81986de1b8a53b93a17276012db7e1db85ccf53438dfb0c6414c4036abf246392038158bef1b1df8b45a66f264a5b005de4af186a37d9723117f4bf0a
-EBUILD libmowgli-2.1.3-r3.ebuild 1001 BLAKE2B 05c1a53c903b8df766cfeb3cc1b20192e101e9690570f7e296b904577cbb9793eb40365b8acade3fd35b234b8f68f5d3e18257e5a93525bb81fc5815c43633a0 SHA512 e5f0a1be44c8128ba6a618bd48272f02504f97193ad8574fea301b6ab91ec20a23b70d8f969b6c1b0f940807c6d519811a0fa98175a10acd7f02fb06744761ce
+EBUILD libmowgli-2.1.3-r3.ebuild 995 BLAKE2B 609d1ed9e3944f844b995c4b73d47507e40ec1093a2d6c36d851f19e7556532ba57e44d9e5e01ffad1ecb5e0c04d665d77610e58a4035991e75d55039180e793 SHA512 4c490656991842bc7defbc70e2f09e35645cd167833114acb6ecb7b9df71295aca2e466b878f6bd0ed14e085da796e54388d966201fadf8346d1a1ff7b1a16ee
 EBUILD libmowgli-9999.ebuild 544 BLAKE2B 28587dc8b9503a3826127bd7eb71e6d31d98d3a3f0be5e5113f7bcd4cafff467f1251ed096edd15baefc50f31419366bd97386b2db9ce77bd710b183e9582cff SHA512 29fe335d9aa56893845413a55838e85a9d699571dad0d4d9ecd3eb06cf6a3f7cbcb0cfa67cddd361ed6574805d33d011ea92e322a661cfac597366b02beebf16
 MISC metadata.xml 395 BLAKE2B 865c24d88eb3b9457b11c25af8c2a73d44770f861df79ed9f0fedfa007dbb65c4ee0b7c1610506255322d283a7968bfb32c1ff27c35df98708e90a45d2e7484e SHA512 4db1299e9cd08caecf0288571f38f39cafd16d4e56aa69d5c272c73bba197448deea36e09a688100b879ad5fd5e25000e28559724013699d811968cf9bb3bbbc
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
deleted file mode 100644
index e7b02c8ea2b2..000000000000
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="https://github.com/atheme/libmowgli-2"
-SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl"
-
-RDEPEND="ssl? (
-		dev-libs/openssl:0=
-	)
-	!~dev-libs/libmowgli-2.1.0" # Bug 629644
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
-PATCHES=(
-	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
-	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
-)
-
-S="${WORKDIR}/${PN}-2-${PV}"
-
-src_prepare() {
-	default
-
-	# $(MAKE) invocation will handle passing down flags.
-	sed -i -e 's/${MFLAGS}//' buildsys.mk.in || die
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ssl openssl)
-}
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
index a26bc6b5a111..3f74c221f3fe 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="ssl? (
diff --git a/dev-libs/libsass/Manifest b/dev-libs/libsass/Manifest
index 3923fa60a10e..8b0129239dde 100644
--- a/dev-libs/libsass/Manifest
+++ b/dev-libs/libsass/Manifest
@@ -1,4 +1,4 @@
 DIST libsass-3.6.5.tar.gz 342426 BLAKE2B 8c6bb37da3f832dd462408a7ef4f80384e468295fc420b3d915899e65fb89a9d0b4c1cf0653b7288fedbf6a66daa2943c2911ad2c310f77a06deb84bec1d3abf SHA512 98cc7e12fdf74cd9e92d8d4a62b821956d3ad186fcee9a8d77b677a621342aa161b73d9adad4c1849678a3bac890443120cc8febe1b7429aab374321d635b8f7
-EBUILD libsass-3.6.5.ebuild 1132 BLAKE2B 230a36406333941434e7bf172570a80e8afaa101c5196c6420d2977a6f1a494f2f96d594943cdcc83873d8b396c8ec35e339b80585088fffd4403a083baf7322 SHA512 5b1c0d8af82085d3d729029d2d6fb07d1bd00c03380b4cfbe2d32c33297406d4bc44fc48b2a5a4804519ea8ec7c4fb4632b4e4513959ab71ca2391de82baf65e
+EBUILD libsass-3.6.5.ebuild 1138 BLAKE2B 98b741a1ad419fcd47c1617390807feb1a2c7cd101077dc4076c0c67b352a521fdbe9315b3065cb6c553f2f292e2a8dae4e576ff4473aae8429e31c641954359 SHA512 fc19a86e75832483538160db58adb193d85281cd2f0178c9de013a057fbe68107e230e59e27ab727aaf91c0aa36521af6947f2e97a8e315e9b34bdd173b38d6b
 EBUILD libsass-9999.ebuild 1129 BLAKE2B 74ce5b5d25d821a1d6dead5db25a4d5f834dd30b2f9da2e2ee8526a3842b2934b6ec5b8c5b5abdbbf4d97b846eee6aa513588f597011025ea77357667c91f2d8 SHA512 620076a106661dfcd9d332c628732eb9bafbd1db59b7619a0edc312cf7aa9f91417b6def62c12934e1f7201c8527ec52df4549b5c9c873682653df40f8483250
 MISC metadata.xml 647 BLAKE2B 2043328e18efbefdfaded61e1fd2269d8b83910a2440cfba2c692fd343889087bd861ad70b2f8f96651b9e0af28cae3bb0668177478203b2ebabab3f8764c8ec SHA512 98de3665f1c27ae03a73212a3ee947597dde27846a2f44db6ef19d362566887d999d42daf505e8a938352005e5d7a3b77f0d661e4f2170f2ec225c43442a47ff
diff --git a/dev-libs/libsass/libsass-3.6.5.ebuild b/dev-libs/libsass/libsass-3.6.5.ebuild
index 16a7fb2752de..d1807595adcc 100644
--- a/dev-libs/libsass/libsass-3.6.5.ebuild
+++ b/dev-libs/libsass/libsass-3.6.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sass/libsass/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
 fi
 
 DESCRIPTION="A C/C++ implementation of a Sass CSS compiler"
diff --git a/dev-libs/libsavitar/Manifest b/dev-libs/libsavitar/Manifest
index 49d84ffeca64..cf03f7fc161f 100644
--- a/dev-libs/libsavitar/Manifest
+++ b/dev-libs/libsavitar/Manifest
@@ -1,4 +1,4 @@
 AUX libsavitar-4.7.0-use-system-pugixml.patch 162 BLAKE2B fa5f648f8288cf954cd2e1b0583d3e7ab7d55d288101576580119de6de1b3ffbe1e9037d6ee04731e34c27a3a0432f10f006ce387bee838d8acda64ebaa4ca73 SHA512 c32caa0c0a9d422cfc367b617d6ac6dd14e4c7104533377d46043734ed461a233ed436c0ae197ba78e9b02e6b3b1942b56debc11f68c17571181db18b5950f72
 DIST libsavitar-4.9.1.tar.gz 100496 BLAKE2B 7700f110522298905c1e4cf42529e83c06c337ac826007db2fca8abf462abcb8dd9245d2d81773ba3e6663d9afa093685bf955a1cc7e27d48fc904913e56d62f SHA512 2b291a17603922a4a06292282392015cf381a813b5f9a374e8cb35da6c0701ead72cbf76f17e763793225885a4209b49e73114f462b40d6999f95db6de887a44
-EBUILD libsavitar-4.9.1.ebuild 1750 BLAKE2B 10d57551bd2703e242b1c8b3a3baac10de4975d9983f3d7f4acd83e29f89134d280385699a3bc95faf8ec289c2d7d068f8938af6f2ea863ae301482f98202086 SHA512 6df6f66f81c11a6d8c5b70a175dfb2070ed1d29aa64ecac11077fbbe37a86e8a706162f431b0473324d87e86d07306736c74aacd978345b28956d559330fbe76
+EBUILD libsavitar-4.9.1.ebuild 1751 BLAKE2B 40e8748df6934c20fc4843a8194461e49242fe6b344fa40a1b31dfd64ab84263612bc669039fdc926e48c7f6150916b803a5c9f783531b71f9d794d0209f6e18 SHA512 11fe811ee9165ed118957ed7576b7af8b2c7a070e0587327f110d00657d6a88680fc357059e7078a57494fefdcc066f43c5ccd243a9899bb53aa4471f65bb36d
 MISC metadata.xml 975 BLAKE2B 0d0faa17d5fad674babdfcbb4da1366f0a25eb8e28dfd091c006da263b5915b1909d2843cf9eb2cd8ae6205c56bd9b7fd3ac0d39f7594217c69f9b3cb727bc66 SHA512 91548b2cd344eb43f8b9e2e7596d86b9eec8c856c60dd5b41710d53da1e224d7c2c83283fe04031f7e0ede2be92bed1ebb46b3e897289d7b5a5de5fe93a6f1b8
diff --git a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
index c2659976510a..263cdd5d1947 100644
--- a/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
+++ b/dev-libs/libsavitar/libsavitar-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index e84360f5981d..6405de5ba1ad 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -7,5 +7,5 @@ DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a0
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
 EBUILD libsodium-1.0.18.ebuild 1564 BLAKE2B e38d0a2158c560d894579950aeb7f1deca649cc4edc8c1a7ba492e43b0cbab2a9d210f5610c657d75ffcfc1e7dcfd474b3350a9e5371f335bf6a2c59330509d3 SHA512 8aecc81582b1e2776b53483ce37db0a5a98f46aa29de8c1421e861db69513fc0df89fd82ca0fb647b9463871e923044915177ed1d24832e03613ff58e5e63a12
 EBUILD libsodium-1.0.18_p20210421.ebuild 2620 BLAKE2B cfb32d50a4e9eb20e91971833a7541afbbc9e5dcde8f9b9da4a02053e89c5494ffec5560dd4a66571d44b4b697cb14cf883548652c8bf88efa5d1bfdf3912296 SHA512 107a9f9a0c8a5e43f4bde75c4bf7666466b459c90b8813dcb11cffd27bf9c6aafe9a8d27466f52b4dc36202f0148728c2a235624956abaaa2caa6c7cf2350485
-EBUILD libsodium-1.0.18_p20210617.ebuild 2633 BLAKE2B a857e0f91faa71460cecc84b6378fad9f8e856fa3dfd691265b3568fb4495b5a03e810107684c435e0904ca10d2883ccd8f4b8e60fc06898947624da33de6a47 SHA512 a2d9f69ef47dd905df833b73040cc6ceb32086f51e4a0396828c9f619610b0892e3587399e0564a34735dd2b044eaa66abacb1bebc96f59d3343ff9cb168e241
+EBUILD libsodium-1.0.18_p20210617.ebuild 2632 BLAKE2B 357211199f2aef80b02889d173a0eaa32dff954b2979a09e4277cbef443a643171430311529ba30a6448e6cadb2f486aa123014a4f906df36df5b968f4574a49 SHA512 b01874b5115f95542cc637bf6fd6b0556af532e42510e816e8f7f78eb766253def0a955338476f64fbaf38e8502168bce3eaf4dcbd5b2cee002d2d836ecc79fc
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
index 7b3e0b7ddbe6..4e6e0079f8c7 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d7e37aba1157..d326e3c04eb1 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -3,5 +3,5 @@ AUX libxslt-1.1.34-libxml2-2.9.12.patch 4178 BLAKE2B 00dc945c2a4d50bb4a428c1ae5f
 DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
 DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea
 EBUILD libxslt-1.1.34-r1.ebuild 1896 BLAKE2B afaf24eff826feaaf6f2ce237c6576a9046665ffe7aca21de53ff39be1df5ad646997cc02e09ca97209f5be4b2649afa992fea78b4471d3f9408e702638e80d4 SHA512 c28937d9ca1b393d9ef56cc09025fb51390466c5c4eafedac6131917054b6846d981ea7d9ea0d0d66b5fce3edb8f633afebce2c98203adef4544dafafbe4ce3d
-EBUILD libxslt-1.1.34-r2.ebuild 1993 BLAKE2B 4688bd781750deed5dd5751df48d7309dc979abb8176a1130946694102af37722a0e1d7b61bc8a3f28f04046b131047650715c4f52185e07c38e1cbd43f23c52 SHA512 0c4cd4da6ad25a09be20a02a5f4dfba32e3b3d2b9ab9c654129961945d743c8acd3d35bb457267f966eb89c81585388718af1245638088f7398959bb7c5fa962
+EBUILD libxslt-1.1.34-r2.ebuild 1991 BLAKE2B 7ce8f08dbf52c964b574d0f867dbc18e587c1f74a2f3722ab6e03eab5db4bd9c7e54300812d6b6d2e86775c2ae021cfde33a6f338d19e5f311cd6e394a88c9f5 SHA512 31bd596950a0881bcae83c4e5a4d27b1425005bcca49ea17ab2b7dc8a0df6d7ad67b5d6fcda31931544060dc5dabfd608980248303a72d1a0ad647522573fd1b
 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b
diff --git a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
index 8d2b03569657..50d9a3936339 100644
--- a/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.34-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( ftp://xmlsoft.org/${PN}/${P}.tar.gz.asc )"
 
 LICENSE="MIT"
 SLOT="0"
-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"
+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"
 IUSE="crypt debug examples static-libs elibc_Darwin"
 
 BDEPEND=">=virtual/pkgconfig-1
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index afa13b3cb10e..49804bece294 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -10,7 +10,8 @@ DIST mpfr-4.1.0-patch09.patch 4591 BLAKE2B 09980bd9f1fb7e39a35e972e9c8a8fd3918bd
 DIST mpfr-4.1.0-patch10.patch 26493 BLAKE2B 8cc0c498264d05c03a72dad58e553c9ea63e29fe43f45cec0cdf29df2e3eac1db33e17c58de5dacfe08c4192300bff5ee3dd816ecab661890a277bdee2cfc19a SHA512 7ee6d2074f640ed17626284fc3f1e77b18e756365ee836ba4b046ba49adb7a701c845401f202ae2d396319285e9f65ec7ef0d51bc3a51460b91b7b2078efcb04
 DIST mpfr-4.1.0-patch11.patch 4584 BLAKE2B 4ba240e7e8acc360eb2f05186493fd9044c8fe285f1be209270e1bd5bcb6485d4ee2feca6af1cf56e2ffd5b592b483ae76ae9acac246286ea0ab4130fe0d9bf6 SHA512 90d6f3e781eab0f8e5f07ed00c1c824af49c6cd60d4c3324c71e6c29150a8f22e2b0b78e7ee32ce505c87ee33ec1ad46e36e3825c6beb524093fc532acdcd913
 DIST mpfr-4.1.0-patch12.patch 6768 BLAKE2B 15ce68eb9941ac5d6544ee18a062cb12026e07273a5424b3941596a1024f54cf5481363e145cac9375e518ec2033db82d4fe9152884c74a9037a81fd2c405b5e SHA512 4e91cffa0df911d68931ace13e86e420ec9f7d8e8a0279e12d995bbf8061b6bec90cb03ef8642a854f652907b13e533b7afb95f2279cf2dfa4010ec5d745ac3c
+DIST mpfr-4.1.0-patch13.patch 3344 BLAKE2B 1239cf16dfe32a71bb6fc7b156978cd451bcbe4e1b04842fdb3549352a43607d44d58120e38bf448ffd33e36bab7f7cfd4ab65b2eb3aac2fe9bbd86d8f425f5a SHA512 ddd5f54d12584b6e10fd4eba12b8568c5286dba10bd3b5cdd429415b78bc827bd0ed3957bd06ca4c2c63a2f5e877fd9d86eebade8929d61aafe84ace8454d016
 DIST mpfr-4.1.0.tar.xz 1525476 BLAKE2B 41d1be0c4b557760f12a4525ad3a84b6e2cd6f0927c935fcfba577ac0490e582d1ae4b581dce58e21e705cf9d7c88373054d7fb7a94bb32c69b339f99a25dc68 SHA512 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273
 EBUILD mpfr-4.1.0-r1.ebuild 1032 BLAKE2B cc2f05e76164efac0956867232086096e20afcd9137953f883835e8f762524328fcafbc306a6d44c45f34086bbf8f11bf5e50cf56dfb4d5aa3bcf1793c98dca1 SHA512 9112a81d34c9e3808eed001f3d567a1534b3e3e1eab9a5ab4f9d4da8c40d8c78cf4ca0717fe089dc57e6728883d6ddd0427bdafb58ca8a764862affcb09ed80d
-EBUILD mpfr-4.1.0_p13.ebuild 2131 BLAKE2B e2fc2d2c6bff9e8589ab1139ecbe1d73502c2bb5eef620928de7aff780c6073f692c92460cd6e5a83e25df4f9e914bddf08961fca0b1a2c5a5c1811bd94e6421 SHA512 c24b19ac3a7ee82634cfe8abdf4499b6d56d3c1ee805f28f41ae48ebd3f0d87e3a0f9ef0ae8006d3a2a58ee9417810786e8a085a9b1f2a32e4259f41ec93d7a9
+EBUILD mpfr-4.1.0_p13-r1.ebuild 2130 BLAKE2B 81272aee030b8f287aef264601a588e9ee2f731c9cd8ab8e78f7ecf67abe6ae790b37a72f2d25e7677b9fdaf454538e4043673e3738fae3a70b70ca66a261b34 SHA512 607f98bd467f0fd61a7940deefa53124dc210897c63194b1ba000e9bbda64a71838f9ad12304e6401702e34aea6b443da0b7d380ad41ec9592fb845120a7e9f6
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpfr/mpfr-4.1.0_p13.ebuild b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
index 228e9e9a8584..8c516b676e79 100644
--- a/dev-libs/mpfr/mpfr-4.1.0_p13.ebuild
+++ b/dev-libs/mpfr/mpfr-4.1.0_p13-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 	# - patch file names are like: patch01, patch02, ..., patch10, patch12, ..
 	# => name the ebuild _pN where N is the number of patches on the 'bugs' page.
 	my_patch_index=1
-	while [[ ${my_patch_index} -lt ${MY_PATCH} ]] ; do
+	while [[ ${my_patch_index} -le ${MY_PATCH} ]] ; do
 		SRC_URI+=" "
 		SRC_URI+=$(printf "https://www.mpfr.org/${MY_P}/patch%02d -> ${MY_P}-patch%02d.patch " ${my_patch_index} ${my_patch_index})
 		my_patch_index=$((my_patch_index+1))
@@ -33,7 +33,7 @@ LICENSE="LGPL-2.1"
 # This is a critical package; if SONAME changes, bump subslot but also add
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
-#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"
+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"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 285733c17068..2c7286a4c359 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -7,6 +7,7 @@ DIST nss-3.69.1.tar.gz 82426679 BLAKE2B 71948a9fee08536c41da9916e6d2eb82bf52bf68
 DIST nss-3.69.tar.gz 82427268 BLAKE2B 1467c7f17b1d3d46fb4fcb1d19112585c24ec3d10125d7e954a87c3a6d0e20a300d2084a9480c88dad20274c500e1efb70143bb92b4a8110c2080abf3fe68dfe SHA512 9dd824b3e96aa5a032d5005cdf60a55efac23f69f3857cd1f4337f3ebad92fc2354bb05ed85f04a368e55306a46ebd17a91f7f432f1c191a96e99aecfa62cfdf
 DIST nss-3.70.tar.gz 83917362 BLAKE2B 51de2e2cf5feb11045388b0badec24509d50f8bc8abd4116cbab77ff434f86a44ad4c98e533a1dd7093a9d1be9b7deb45f0426e3a173f9b2b92995cf63f2ea51 SHA512 9766282b36560d2f73ac5e90dbc3962802d6b1e8650ff9c0afbd6d2e1ff4cf8f2bc251f972344dc8a6ac5209b917aae03cc9883cb081011a7dea7bd258a95d82
 DIST nss-3.71.tar.gz 83927933 BLAKE2B a8d683b9f9bff5390e0378ab0d55156f7cc69a52b0667658738e67e920548965e7a276dc4104547b2e6a1a6d18325c3f85b955b9c12d7f071d10930b5264207e SHA512 a4a724dc4e8677965b6245ea2309790d31ec7719658e2b349eb67c9008082132c76277340d15e4fdd8d2fe1f560ae6803fb038d023c3dfd2e3772fa3b77720e2
+DIST nss-3.72.tar.gz 83928300 BLAKE2B d92889e27e99095a18090eff0c08b8653ef1f53f4954f5bd018df2f2903647bc71f217159bb4b11f0d6b4fb289fda20bffa2d1d207d1836dcfc33dbd4bedf511 SHA512 1d818d2ef85735837275059fecf68d57e48152f0348ea54887c29171cf029b6944e94d99a8cd96e580a81edb678b79c55515ac0516e27daf6b290c34baed9ebb
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.63.1-r1.ebuild 9506 BLAKE2B 28105fb764f1f57e8d06fc8e58ac7cc03534c9a83f939dd49b63a3ae84a79d82a815858680f4bccd03abca8703b39329cb5ddea21bd06648bed9460a68b4af50 SHA512 ddcb298b779ca3430b18eba1da4ad1778b39b7c946f22b92c2857ed0e612e93138a57f486c37980ebbcc53b906beff68d6ebec58e2fbb821930053b78a76e9b1
 EBUILD nss-3.68.ebuild 9521 BLAKE2B de04a237b2980036eaf2012346b4f0b8e9fa83ff0cec78319f9b69fb34861d8047d53045ae7c1b64a2784476292cf4eb34fae99e7b5fbdc9b7920615922345ea SHA512 d9cdb53234d74e823bafc1ff9c1e80538866efe0618f7660ef7f297fda32f1d9a8580e91ff5f28d659dbe995e143538464eaa46c2429b2d6bee6d102505d6c79
@@ -14,4 +15,5 @@ EBUILD nss-3.69.1.ebuild 9547 BLAKE2B 97d1aa4b223070c9f18590cc2c97aae0891d9c3272
 EBUILD nss-3.69.ebuild 9521 BLAKE2B 5ad382679f739a612e30c5670df39fcb92306e79307f348c47968355536a65252c3424a90977d18245d4f50d8cab233946389fa6e83f9e3188ceed3ec650d4be SHA512 afccf0a6a2c3851375cb459619e0a5773e4e4ba27697596b057ebe1a0a79adbdf229bd1ef1967bc6e23a82d9a063571c9c3c68d410f50b79af7473044eb108a3
 EBUILD nss-3.70.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 EBUILD nss-3.71.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
+EBUILD nss-3.72.ebuild 9545 BLAKE2B 11e6bb946ec4d094b604f2c22a7e6f78ac0331faf409938b6ffccf0ea902b70eb195ad85359613e591c6555af8e17550bb756c20ac84f886ba17e3f5eda446c8 SHA512 85a9aaf8c321c4ef04cf8724c8b3865f0038779612e8990f92878359282225a33f184487f342d01c2aaf7b2fc2c14d44d4b8b2d0f9e45c1b6779fc089383f30b
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.72.ebuild b/dev-libs/nss/nss-3.72.ebuild
new file mode 100644
index 000000000000..97adb106159f
--- /dev/null
+++ b/dev-libs/nss/nss-3.72.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.32"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -j1 -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+
+	# Prelink breaks the CHK files. We don't have any reliable way to run
+	# shlibsign after prelink.
+	dodir /etc/prelink.conf.d
+	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
+		> "${ED}"/etc/prelink.conf.d/nss.conf
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index 22f7f9ce51e5..6ee47d76cdc5 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,5 +1,5 @@
 DIST ntl-11.4.3.tar.gz 2274421 BLAKE2B d2c2fe695b17f47b24ad714d51dd723cbba453cc0fd67b8f46392103ef2f40ba54246411c793f0f60d1d50aae27cb8e75f6e8526fa9592e04c2cd0bdecef760c SHA512 26515ed73c8e74d0ff8bc161101f1b815f2c23e4bd633cc426f6da2741c6d8f43ad4f8df2cb7ad915475933599e0ee01cc360e75569f6f5d49cb5e5eae37b3f5
 DIST ntl-11.4.4.tar.gz 2378708 BLAKE2B 9a4c85bbe2fd2d3360988e0c350864fc0a05714e39ce3972228d93aba17f0dc079c90fbe40ab9d72116d1e31f55328bbd5cc71cd080e42ea33bc92361b4462aa SHA512 ed89d82008ca8785cb3d69de9577f42abe464dabf167ea2aaf801951843fc427d41171cbaac2f0cf68f35110d029cc28a65bd5aad69d30e7312f5ebcb0b58911
 EBUILD ntl-11.4.3.ebuild 1618 BLAKE2B 9752c09cb92a1389910f53a49c1cc882f35f0627e622745a133b1697948d87197ecfdd322347feeebee1d280db45ec7e3d842b13ed368da1f559f860a500d5d5 SHA512 d32d3fc780fed344c5a9c01548de12d1326c9a7842dab8831dccdf39447db7a94ccd88df59484d79210fc1b647f8abfc0106238a4a5c6aa336b0ca8e558e1fe5
-EBUILD ntl-11.4.4.ebuild 1707 BLAKE2B 6ba902c94e587f24bd4746e9a5226908755ad3d640ebe8860d56075af1c78555ae749a4d46e6e85b708e12215189ff817b9a48d3968bdae5e88c3e10a45380aa SHA512 920dbc160fde73be5ca460a4eeb2339e82346548bc289aaa41974b5b9a9167e4c59e8bccf17ae9eb01f835b780643b38a5f1ecfdd91b3f27a39b4de4f5c380a3
+EBUILD ntl-11.4.4.ebuild 1706 BLAKE2B d9f5e1b6455b53e06a3fa16a606af327d6d9e2ad5ec94520e5804a5efec609659043df8ad6c08ccdd4ba00f7a50760d216cd6166244629e6035259a56050c673 SHA512 8f645ae0b0abd0f6062430f17a066d72af733043fdb5b911ed89070bf737c272b457472a0c5f224bc30cb07345997d1506fb71fba447ce95d04b2c70f851ff9c
 MISC metadata.xml 553 BLAKE2B cdfae3ba1eecfe54b279aec52c8a122226eb0247dfad805feb9f0854705e99247f15e42dedd6d08164a8d9c9cc9db871a481f6bcebad3062ac32ad05c3c32b7b SHA512 ca5e891461461757b75aea48a2cf631cc871daf33159c1f2c2a9a9e6acad43db97733de1c24754709e9b4eb1173a50af3ce63690443ce5ddd6794de9580b0d19
diff --git a/dev-libs/ntl/ntl-11.4.4.ebuild b/dev-libs/ntl/ntl-11.4.4.ebuild
index 18f21afb1eb0..9b4ebf81f549 100644
--- a/dev-libs/ntl/ntl-11.4.4.ebuild
+++ b/dev-libs/ntl/ntl-11.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.shoup.net/ntl/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/43"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="bindist doc static-libs threads cpu_flags_x86_avx2"
 
 BDEPEND="dev-lang/perl"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index ee48f4b28069..55aebe08d226 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -7,12 +7,10 @@ DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e
 DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8
 DIST openssl-1.1.1k.tar.gz 9823400 BLAKE2B e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121
 DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0
-DIST openssl-3.0.0-beta2.tar.gz 14912360 BLAKE2B f1180eee6561f04e778f40d3d6f9fac5645777de09d965662f00c2506da30d3c3cfa0e98a25fc668e2e1fd39b8d700d7f0fd901f80964be048cb3aaa6432a5f5 SHA512 3eb9b472429bc26a7fc5c5837e2ea496706e3c6273ba33f36bbe3dc13bf7dcf7cba08d19ce005ee9b1cecfc63de68ef86cd8d911df28c82873ee44ba5d7e253a
 DIST openssl-3.0.0.tar.gz 14978663 BLAKE2B 64721ee958fc47d57a479dffff91be5692d80d10a6727d804f8a9da66fcaea799b67fda8987f9ecdfb2777ec42033c5e8a6a135e30784d6422eb3c65e676abe6 SHA512 1fdf769ef69631eb802671a9e0bb3a01883d58282f651986212983c2d7c9d3499dabe99a6dee0411e997e6fcfa6f682b121b7698596de0d6c78850c2200241b1
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1k-r1.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
 EBUILD openssl-1.1.1l-r1.ebuild 8486 BLAKE2B 215dac2c120ca81bba45f5f1dc7f5cceae32ff0f473af778d0c7de7a836c8b7901a2ac03d8f506111dc42d0b88c55c173092a36d0956570ba719435727ed5f34 SHA512 ba7cb74d5c40aff08a7ffa31462c65aa7b1ab861cab4e6e599c7d7f94af39cd447f82081ccf938e551c96f3cd079504ea824640beb0993e523733e0102e3c44d
 EBUILD openssl-1.1.1l.ebuild 10306 BLAKE2B 1c8274fb11aafa6aa78f09df1f7a88ced754d08e5b332fe8bec55152da240617fad12a5489549d967da472ee1cfed10ce93689e0e011a54826c55334c3a3daa2 SHA512 96fb34ba04ffcf7e801365ce95d3ab6062b162524c43bab47543f1826a9c94b849b004a58d3ceb3cac3bbe973410d11455488d1e3c3850bb2acabe68c66b6f68
-EBUILD openssl-3.0.0.ebuild 8177 BLAKE2B 5fa0ec66fc01af291d6e56ad22d11c5320e4d4853b0477f84861295b64da3e24330a1bc8ad79591a8c119c7f7569bae36aed10a58fd6119db479673debbeb288 SHA512 53dcb4b6aa002860082705877ed28a0bac87a40d14e52f9e4fb66579d5d436729eef65d19d5252b56d1a4dcda5f9a7a6225e44b889bf1ca99ec4ddbe99b20553
-EBUILD openssl-3.0.0_beta2.ebuild 8202 BLAKE2B 77d7b31ac7eb5949e4a7561f975a792a21378eabf1877c77b796004d543d2e02a50d0b9ea6770cf775c8a43d7ef3333b0a4a25761553cc7fa276d652348f38d7 SHA512 c4c7d6619a2fda1ec98c51a644d80b1fec321d06384ef3be4cde58831f79769c91107fdecd0532ef59d73a720009e0f2213104100703d0dc826e6a98cb76731d
-MISC metadata.xml 1439 BLAKE2B 0853fbc0e27ae1c6134e378406d5825f97ea16e7fcb08dc5a0c2cb35f36f50afae9b68b022beed3c0068b7aebe90fb9b199b53ac7a9bc55246f05f0d40005919 SHA512 d7bd5600accdbf069932d873f559195b99af590bc8e326abf9a05e2ec10c0e3bdef193cb8331640b6a6928a705f35dbd4e94a407a1c91c654318b9be89bf7c0d
+EBUILD openssl-3.0.0.ebuild 8218 BLAKE2B 329ce898bf43a14c1a55e2d5b6cc38cd4420d547e63c475c4005243aea3889df06c9ad2d1d6614f7000d38854add6ad61a54a6815fa6ea595a47992b401a25a3 SHA512 79fbc20bc445355b8f9809f41b0f4e6abed1c2cb7582b9a86a2da02f5978d53bb6f8fa21a86c0a4029d3a38e43bd65554b31c46c64d88f2a78a7e6e69a6dbcea
+MISC metadata.xml 1486 BLAKE2B ddf79f8ea66471d1aa2809dce9b3b87973c38a1367566ec77222dfd22062963535241314bd4fd56387f2d133825e43627f363edee9329c14565717511b5cb870 SHA512 92f53ca3d3867ab8cfc4093ac92a9d9885eee8c10ac43f80c4dfb87911fc253557118064ecf1b1fae48c50e1273ef3821c9db84f00760dd0af8d5104a49595f0
diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index a338ff2ba12a..e0b7df73655d 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -8,6 +8,7 @@
 <use>
  <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
  <flag name="bindist">Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name="fips">Enable FIPS provider</flag>
  <flag name="ktls">Enable support for Kernel implementation of TLS (kTLS)</flag>
  <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
  <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag>
diff --git a/dev-libs/openssl/openssl-3.0.0.ebuild b/dev-libs/openssl/openssl-3.0.0.ebuild
index c7bab83b760f..dad6d1b877b3 100644
--- a/dev-libs/openssl/openssl-3.0.0.ebuild
+++ b/dev-libs/openssl/openssl-3.0.0.ebuild
@@ -22,7 +22,7 @@ fi
 LICENSE="Apache-2.0"
 SLOT="0/3" # .so version of libssl/libcrypto
 
-IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
+IUSE="+asm cpu_flags_x86_sse2 elibc_musl fips ktls rfc3779 sctp static-libs test tls-compression vanilla"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -171,6 +171,7 @@ multilib_src_configure() {
 		enable-idea
 		enable-mdc2
 		enable-rc5
+		$(use fips && echo "enable-fips")
 		$(use_ssl asm)
 		$(use_ssl ktls)
 		$(use_ssl rfc3779)
diff --git a/dev-libs/openssl/openssl-3.0.0_beta2.ebuild b/dev-libs/openssl/openssl-3.0.0_beta2.ebuild
deleted file mode 100644
index 5005c8fa6602..000000000000
--- a/dev-libs/openssl/openssl-3.0.0_beta2.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic linux-info toolchain-funcs multilib-minimal
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
-HOMEPAGE="https://www.openssl.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/openssl/openssl.git"
-
-	inherit git-r3
-else
-	SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0/3" # .so version of libssl/libcrypto
-
-IUSE="+asm cpu_flags_x86_sse2 elibc_musl ktls rfc3779 sctp static-libs test tls-compression vanilla"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-misc/c_rehash-1.7-r1
-	tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
-"
-
-BDEPEND="
-	>=dev-lang/perl-5
-	dev-perl/Text-Template
-	sctp? ( >=net-misc/lksctp-tools-1.0.12 )
-	test? (
-		sys-apps/diffutils
-		sys-devel/bc
-		sys-process/procps
-	)"
-
-DEPEND="${COMMON_DEPEND}"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PDEPEND="app-misc/ca-certificates"
-
-S="${WORKDIR}/${MY_P}"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/openssl/configuration.h
-)
-
-pkg_setup() {
-	if use ktls ; then
-		if kernel_is -lt 4 18 ; then
-			ewarn "Kernel implementation of TLS (USE=ktls) requires kernel >=4.18!"
-		else
-			CONFIG_CHECK="~TLS ~TLS_DEVICE"
-			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
-			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
-
-			linux-info_pkg_setup
-		fi
-	fi
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# must check in pkg_setup; sysctl don't work with userpriv!
-	if use test && use sctp ; then
-		# test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel"
-		# if sctp.auth_enable is not enabled.
-		local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null)
-		if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]] ; then
-			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# allow openssl to be cross-compiled
-	cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
-	chmod a+rx gentoo.config || die
-
-	# keep this in sync with app-misc/c_rehash
-	SSL_CNF_DIR="/etc/ssl"
-
-	# Make sure we only ever touch Makefile.org and avoid patching a file
-	# that gets blown away anyways by the Configure script in src_configure
-	rm -f Makefile
-
-	if ! use vanilla ; then
-		if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then
-			[[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}"
-		fi
-	fi
-
-	eapply_user
-
-	if use test && use sctp && has network-sandbox ${FEATURES} ; then
-		einfo "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox ..."
-		rm test/recipes/80-test_ssl_new.t || die
-	fi
-
-	# make sure the man pages are suffixed #302165
-	# don't bother building man pages if they're disabled
-	# Make DOCDIR Gentoo compliant
-	sed -i \
-		-e '/^MANSUFFIX/s:=.*:=ssl:' \
-		-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-		-e $(has noman FEATURES \
-			&& echo '/^install:/s:install_docs::' \
-			|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
-		-e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \
-		Configurations/unix-Makefile.tmpl \
-		|| die
-
-	# quiet out unknown driver argument warnings since openssl
-	# doesn't have well-split CFLAGS and we're making it even worse
-	# and 'make depend' uses -Werror for added fun (#417795 again)
-	[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
-
-	append-flags -fno-strict-aliasing
-	append-flags $(test-flags-CC -Wa,--noexecstack)
-
-	# Prefixify Configure shebang (#141906)
-	sed \
-		-e "1s,/usr/bin/env,${EPREFIX}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
-	# The config script does stupid stuff to prompt the user.  Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config --test-sanity || die "I AM NOT SANE"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset APPS #197996
-	unset SCRIPTS #312551
-	unset CROSS_COMPILE #311473
-
-	tc-export AR CC CXX RANLIB RC
-
-	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
-
-	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
-	local sslout=$(./gentoo.config)
-	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
-
-	local myeconfargs=(
-		${sslout}
-		$(use cpu_flags_x86_sse2 || echo "no-sse2")
-		enable-camellia
-		enable-ec
-		enable-ec2m
-		enable-sm2
-		enable-srp
-		$(use elibc_musl && echo "no-async")
-		enable-idea
-		enable-mdc2
-		enable-rc5
-		$(use_ssl asm)
-		$(use_ssl ktls)
-		$(use_ssl rfc3779)
-		$(use_ssl sctp)
-		$(use_ssl tls-compression zlib)
-		--prefix="${EPREFIX}"/usr
-		--openssldir="${EPREFIX}"${SSL_CNF_DIR}
-		--libdir=$(get_libdir)
-		shared
-		threads
-	)
-
-	CFLAGS= LDFLAGS= echoit \
-		./${config} \
-		"${myeconfargs[@]}" \
-		|| die
-
-	# Clean out hardcoded flags that openssl uses
-	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
-		-e 's:^CFLAGS=::' \
-		-e 's:\(^\| \)-fomit-frame-pointer::g' \
-		-e 's:\(^\| \)-O[^ ]*::g' \
-		-e 's:\(^\| \)-march=[^ ]*::g' \
-		-e 's:\(^\| \)-mcpu=[^ ]*::g' \
-		-e 's:\(^\| \)-m[^ ]*::g' \
-		-e 's:^ *::' \
-		-e 's: *$::' \
-		-e 's: \+: :g' \
-		-e 's:\\:\\\\:g'
-	)
-
-	# Now insert clean default flags with user flags
-	sed -i \
-		-e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \
-		-e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \
-		Makefile \
-		|| die
-}
-
-multilib_src_compile() {
-	# depend is needed to use $confopts; it also doesn't matter
-	# that it's -j1 as the code itself serializes subdirs
-	emake -j1 depend
-	emake all
-}
-
-multilib_src_test() {
-	emake -j1 test
-}
-
-multilib_src_install() {
-	# We need to create $ED/usr on our own to avoid a race condition #665130
-	if [[ ! -d "${ED}/usr" ]] ; then
-		# We can only create this directory once
-		mkdir "${ED}"/usr || die
-	fi
-
-	emake DESTDIR="${D}" install
-
-	# This is crappy in that the static archives are still built even
-	# when USE=static-libs.  But this is due to a failing in the openssl
-	# build system: the static archives are built as PIC all the time.
-	# Only way around this would be to manually configure+compile openssl
-	# twice; once with shared lib support enabled and once without.
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	# openssl installs perl version of c_rehash by default, but
-	# we provide a shell version via app-misc/c_rehash
-	rm "${ED}"/usr/bin/c_rehash || die
-
-	dodoc {AUTHORS,CHANGES,NEWS,README,README-PROVIDERS}.md doc/*.txt doc/${PN}-c-indent.el
-
-	# create the certs directory
-	keepdir ${SSL_CNF_DIR}/certs
-
-	# Namespace openssl programs to prevent conflicts with other man pages
-	cd "${ED}"/usr/share/man || die
-	local m d s
-	for m in $(find . -type f | xargs grep -L '#include') ; do
-		d=${m%/*} ; d=${d#./} ; m=${m##*/}
-
-		[[ ${m} == openssl.1* ]] && continue
-
-		[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
-
-		mv ${d}/{,ssl-}${m} || die
-
-		# fix up references to renamed man pages
-		sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} || die
-		ln -s ssl-${m} ${d}/openssl-${m} || die
-
-		# locate any symlinks that point to this man page ...
-		# we assume that any broken links are due to the above renaming
-		for s in $(find -L ${d} -type l) ; do
-			s=${s##*/}
-			rm -f ${d}/${s}
-			# We don't want to "|| die" here
-			ln -s ssl-${m} ${d}/ssl-${s}
-			ln -s ssl-${s} ${d}/openssl-${s}
-		done
-	done
-	[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
-
-	dodir /etc/sandbox.d #254521
-	echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
-
-	diropts -m0700
-	keepdir ${SSL_CNF_DIR}/private
-}
-
-pkg_postinst() {
-	ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
-	c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null
-	eend $?
-}
diff --git a/dev-libs/rapidxml/Manifest b/dev-libs/rapidxml/Manifest
deleted file mode 100644
index fbd664900809..000000000000
--- a/dev-libs/rapidxml/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX rapidxml-1.13-clang.patch 1650 BLAKE2B 6e807a3266dbaa5a575a7036ec65b2ce6cfdb3347f4baa0c776f7ba2791fb363fb861994363a9131111e61a40f0aef818ad2e484b0b9f8d676a1cebc79be7d85 SHA512 b55735e503fbf51fa24c381effb1346dde3a2d31f0a4320634fab816832d75b23f51839f280d837247bc228d59504170bda1c1350898f9b4f79c011084f0d0e3
-AUX rapidxml-1.13-iterators.patch 1627 BLAKE2B aa5404188f12d0c193ececb43bcf0491ae03579535485f8d677b9621255b876165261007c775223851816a8552f0268349f11f54dc50fae3efbb2c0bd365a4a8 SHA512 37c5555ccc1a39f503d84e9209180937a63e431d8e5009d54e99335b2f0808b0e6c2bd6e551dca72ab535e4ac805660082de3f244b0605efd9884a9adb2bf57a
-DIST rapidxml-1.13.zip 44163 BLAKE2B 9db90dfca1943c47e95541a323e1210368447c054cf072d6768031488070e375fe2aa78a4e41f61f252d4c487e94cf1e24e4d3756e3f8774b0c2c52ef86959e7 SHA512 6c10583e6631ccdb0217d0a5381172cb4c1046226de6ef1acf398d85e81d145228e14c3016aefcd7b70a1db8631505b048d8b4f5d4b0dbf1811d2482eefdd265
-EBUILD rapidxml-1.13-r1.ebuild 506 BLAKE2B b1cfe9b7a953971e2b2170c9021bd9a838830460cf2f069fac2b03cce3fa9f842f1fc32f657473cadb4d808c6f1a2b4cb4ae87820b81354637723ec9fc6078c3 SHA512 8e18151c110bd6478a291332912d82d9eb0744e31268fb0e4a9ff287d233b98c3c31af498f7a43b954af0d1a1968cd337a732bc1a0b7a7771bc2fc8bc6e08793
-MISC metadata.xml 332 BLAKE2B 45570d69614a01abede44db42baf4dcc194a633083cb618d274541b410e22924f053f00ad98703d115e5cc61759326f76e6237ab2410b68c9c762a5d51ed5688 SHA512 470189c6a6b2d4bc84584c19f42be06c08a864f7715278c3961f4a9181a440a26f388b304abf13fa74cd753298a700901dff1600fc89a40943e197e4e4f20b78
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch b/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
deleted file mode 100644
index 7609984f5a28..000000000000
--- a/dev-libs/rapidxml/files/rapidxml-1.13-clang.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/rapidxml_print.hpp
-+++ b/rapidxml_print.hpp
-@@ -102,6 +102,20 @@
-         ///////////////////////////////////////////////////////////////////////////
-         // Internal printing operations
-     
-+        // =====================================
-+        // fix for clang for this bug in gcc and others: https://sourceforge.net/p/rapidxml/bugs/16/
-+
-+        template<class OutIt, class Ch> inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+        template<class OutIt, class Ch> inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-+
-+        // =====================================
-+
-         // Print node
-         template<class OutIt, class Ch>
-         inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
diff --git a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch b/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
deleted file mode 100644
index 068545241388..000000000000
--- a/dev-libs/rapidxml/files/rapidxml-1.13-iterators.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sources.debian.org/data/main/r/rapidxml/1.13-3/debian/patches/fix-iterators.patch
-https://bugs.gentoo.org/791328
---- a/rapidxml_iterators.hpp
-+++ b/rapidxml_iterators.hpp
-@@ -18,9 +18,9 @@
-     
-     public:
- 
--        typedef typename xml_node<Ch> value_type;
--        typedef typename xml_node<Ch> &reference;
--        typedef typename xml_node<Ch> *pointer;
-+        typedef typename rapidxml::xml_node<Ch> value_type;
-+        typedef typename rapidxml::xml_node<Ch> &reference;
-+        typedef typename rapidxml::xml_node<Ch> *pointer;
-         typedef std::ptrdiff_t difference_type;
-         typedef std::bidirectional_iterator_tag iterator_category;
-         
-@@ -56,7 +56,7 @@
-         node_iterator operator++(int)
-         {
-             node_iterator tmp = *this;
--            ++this;
-+            ++(*this);
-             return tmp;
-         }
- 
-@@ -70,7 +70,7 @@
-         node_iterator operator--(int)
-         {
-             node_iterator tmp = *this;
--            ++this;
-+            ++(*this);
-             return tmp;
-         }
- 
-@@ -97,9 +97,9 @@
-     
-     public:
- 
--        typedef typename xml_attribute<Ch> value_type;
--        typedef typename xml_attribute<Ch> &reference;
--        typedef typename xml_attribute<Ch> *pointer;
-+        typedef typename rapidxml::xml_attribute<Ch> value_type;
-+        typedef typename rapidxml::xml_attribute<Ch> &reference;
-+        typedef typename rapidxml::xml_attribute<Ch> *pointer;
-         typedef std::ptrdiff_t difference_type;
-         typedef std::bidirectional_iterator_tag iterator_category;
-         
diff --git a/dev-libs/rapidxml/metadata.xml b/dev-libs/rapidxml/metadata.xml
deleted file mode 100644
index cb1847380d2b..000000000000
--- a/dev-libs/rapidxml/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">rapidxml</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild b/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
deleted file mode 100644
index d072ba673bc9..000000000000
--- a/dev-libs/rapidxml/rapidxml-1.13-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Fast XML parser"
-HOMEPAGE="http://rapidxml.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rapidxml/rapidxml-${PV}.zip"
-
-LICENSE="Boost-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-iterators.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_install() {
-	insinto /usr/include/rapidxml
-	doins *.hpp
-	docinto html
-	dodoc manual.html
-}
diff --git a/dev-libs/snowball-stemmer/Manifest b/dev-libs/snowball-stemmer/Manifest
index 248f94d9a5a0..e4789fa106a0 100644
--- a/dev-libs/snowball-stemmer/Manifest
+++ b/dev-libs/snowball-stemmer/Manifest
@@ -1,4 +1,3 @@
-AUX libstemmer_c-shared-library.patch 850 BLAKE2B 864f1f7f34a35b04a57899f0ac3dd743121c4f6270ad1f5cd127789d79e2f70fedab1cbff72d492b7e0f7a048609650e2315b8cebef013fb711f812deeddf32e SHA512 36f96bf9661a71d7aa77619202d7c4d48cc494da6287ecf5a24ffa9963aefadf9f825ec52058534aca908e6c2641af71bfc1bf14ab880d9ba480add7a8cac12b
 AUX snowball-stemmer-2.1.0-shared-library.patch 2140 BLAKE2B 43a66ad25bf5bdbc2d908ca91d12da496faf831fce96cc8945d0b56f5b34c3522185f71cc0e73648fd97ad5b2f161750b4376201994c3545fb458f81f313cdee SHA512 bb80701187e29f43fe23075b9598716bd0f2a97903d4905ca0570766235e79b31b68a0aa4c2335ccabec3bcba3b68e75db18fc9bf0f6c928e90f23bc7a12dabc
 DIST snowball-data-887fb7a3e006f32b4979e0d55f2543abe78a42f1.tar.gz 33063750 BLAKE2B bffc7e9f8fadbaecf9a7d1a2b8ee7a9db0b1dc1d5a6304a9c8d60b6c24a0947307b8780a99d2349b19e5fbcdfe819cc400ffb0b8b1df9748bb401ae1dec7b9aa SHA512 b68567d3e59aaa870251f682988b52a89d82767e954adea6b7f6247a6d432c29c8373c95a5e49df07110d4cb396aafa64ee6c71af2c0680d383ffe22491e50dd
 DIST snowball-stemmer-2.1.0.tar.gz 220324 BLAKE2B 3d92a2f5b4bd633932d681f2555cf1cc1a2c1a1c71fd0272f09bee17628d034a20649450dd90242c155ab7b262e685913d5ad4034bce6e7a41d76f0dfc724137 SHA512 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
diff --git a/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch b/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch
deleted file mode 100644
index ca27fc517705..000000000000
--- a/dev-libs/snowball-stemmer/files/libstemmer_c-shared-library.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- /home/graaff/Desktop/Makefile	2009-11-06 01:57:50.000000000 +0100
-+++ Makefile	2013-07-18 10:57:32.482149252 +0200
-@@ -1,9 +1,13 @@
- include mkinc.mak
--CFLAGS=-Iinclude
--all: libstemmer.o stemwords
--libstemmer.o: $(snowball_sources:.c=.o)
--	$(AR) -cru $@ $^
--stemwords: examples/stemwords.o libstemmer.o
--	$(CC) -o $@ $^
-+CFLAGS+=-Iinclude -fPIC
-+all: libstemmer.so libstemmer.a stemwords
-+libstemmer.so: $(snowball_sources:.c=.o)
-+	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$@.0d -o $@.0d.0.0 $^
-+	ln -s $@.0d.0.0 $@.0d
-+	ln -s $@.0d.0.0 $@
-+libstemmer.a: $(snowball_sources:.c=.o)
-+	$(AR) -crs $@ $^
-+stemwords: examples/stemwords.o libstemmer.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- clean:
--	rm -f stemwords *.o src_c/*.o runtime/*.o libstemmer/*.o
-+	rm -f stemwords libstemmer.so* libstemmer.a *.o src_c/*.o runtime/*.o libstemmer/*.o
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index d7185e959f18..f87f173598e0 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,4 +1,4 @@
 AUX 3.26.6-plparser-Fix-uninitialized-variable-error.patch 1002 BLAKE2B 20af6936f47b2b1932417caec381df50bf503eff6e5235b1edeb4645dfc248358fdfc528016bcebaeb47f14f0cb99bd6a69519ae0a1a6e82b2629316522922e9 SHA512 65d015cb956c5f0b82bb2436309bbc35535d3decf7d8de4730fa3d41abf4378131756d09b536d3a16b9581c7e76fa18e795976753e90e91edea76428281f9386
 DIST totem-pl-parser-3.26.6.tar.xz 1503888 BLAKE2B b0768f54c77ff902ad20aeaa9162c616e0cc64ccfc2839d2db2e4c9076f82a611baedf127b0b74f84ec8698a5adc25c43fb9245dcb26a221da7024372a61896b SHA512 1a7aa69e147b55c3c9761328604821a7e40bac4e7b82492e5ce1b2405e3b6d5154e3b06687f2446ec923b34bf6ea96eef179ef8410c005a061d448fc6b3e754e
-EBUILD totem-pl-parser-3.26.6.ebuild 2003 BLAKE2B 5dceff30a28672f016a4abf29cecaf0729ab765fd6f31a445d657776ea0a4f811040ec4feae45ca7ab154f7afdc714b3c984ee8bc2f1f915abfa4a7df647cbb0 SHA512 6645ef3f7cbb74e1ed26cdd491e5fb7dae32f3b20970874045006909228b7c881c43fe67ee2a63c41ac5c3f1a23573bbdc70222bde9399b71ac336db3b7d60a0
+EBUILD totem-pl-parser-3.26.6.ebuild 2002 BLAKE2B 96d51f54df408bc5ac211c29e09376e713ce4acf5ac5e6acc7077ab36bd8220d055d36355f33fea0d4e57bd7919ffe9d5419a20a9ea629d240cd32a24e2f81de SHA512 ad72cddb19e8a81c2c11ca2d19b560028a58810ec6ae9e07cb1feafb9c8c96339853aae88b2e5714352d779bfc2cc1cdc3d62748c16afb3922c3647c3d008770
 MISC metadata.xml 527 BLAKE2B 834d48a23c0275cbe5bb15f44e294d4551350b70eff823c3d3d309fc7dbb2466ca9d518449c7337a4fee38cb43f3c1a567309982f697624dd2220a016ee1b0c3 SHA512 e113c24beba7401e0d8cdfdd5434d9d7f962f55a40acc8b558944539e111d78f254b5986afe691717ec61ae8efbb3d896861805f4a272757f2a60e2998075a43
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
index 295230ed2f92..26a90958a523 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
@@ -11,7 +11,7 @@ LICENSE="LGPL-2+"
 SLOT="0/18"
 IUSE="archive crypt gtk-doc +introspection test +uchardet"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index d84672ec56a8..1be9f31bec92 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,6 +1,6 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
-EBUILD weston-9.0.0-r1.ebuild 3780 BLAKE2B c71c3ccd3f76999517f6e15270fa2a88024753079e058719bd10467d8c3ebbab25efc435c79f9e2097912790edcdd3542ea1597dd0892ca4a1dc96ef2aa11526 SHA512 77a724d1a39a81a1be11d417f7ea0dd398389b57d27975e305e48d3cfe4018b35c209978b104e91a59bccc91254aecf723a478f5a09566e0df47e26cba237001
-EBUILD weston-9999.ebuild 3783 BLAKE2B 6480b821a580b6da0cf52ce48b69c27fba7fea0e37180865316b44a9fca09bd6388bf08a6e32aa3e92e9ce574773d35412d858893edfbb7b0828cac731418176 SHA512 5e4aa8e6a02ef06256b90304b7f18a1a85a50d63bbaface2f086e1e2c59d5e7bfa29bf8c43e3609c99fe270a645a74be9db0791b7c099fb9d9a3c7c3b623c0d9
+EBUILD weston-9.0.0-r2.ebuild 3783 BLAKE2B 88402d127c2d2c9f3376a98d67ca8aeaeefe9a255e4dba9f6f30387e4e6ce3fb23659a66307df221ec2f42d114a5962a59af5cc3ef0b704d3be33564cf60050f SHA512 8bda48f3c3cd1fae667a353e85c3f7be929d605b173b915bcf57a362ef167ee7abf054533a34b8b7f19489ba1415005ed8bc8f2407c252dc57aa014d2ed853e7
+EBUILD weston-9999.ebuild 3786 BLAKE2B 796acd0ff65bf5c3271ac8c09242024ffd33e7f2898cff0e80a39dfe0dd2a33763af9d5226910f6b48a128b8ce14457fd55471e432cafa7f8ef7b21d85c95abc SHA512 017dd76bec83bca30102daccd06b97d1edad078ad9b08c66266d8c1f37f774a384c7907528cc9774ee1c82ef2c27ccb1a401452afb3e1b904448c38460741cc7
 MISC metadata.xml 1578 BLAKE2B 302ecc49dda1f6327a73d7dfcae61accf15323cf19e2d4dd322ae54612fa738331614efd044ec148a6bdb3d85895d789c962fad224a5fa88f45f2228421ef089 SHA512 104a8c428651e8c7e4ccdf8332be0af8bf00f3cd36afff301bf5fbd2f446fcc64e9b9ccf3acd636f4e4357a4d4d1ecac0cc747bdfb7089508900abdca5d96bea
diff --git a/dev-libs/weston/weston-9.0.0-r1.ebuild b/dev-libs/weston/weston-9.0.0-r2.ebuild
index c10df76c2d83..a00fa099e6a2 100644
--- a/dev-libs/weston/weston-9.0.0-r1.ebuild
+++ b/dev-libs/weston/weston-9.0.0-r2.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
 	)
 	colord? ( >=x11-misc/colord-0.1.27 )
 	drm? (
-		>=media-libs/mesa-17.1[gbm]
+		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index bf7a8c00415e..75c191a28c7b 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -56,7 +56,7 @@ RDEPEND="
 	)
 	colord? ( >=x11-misc/colord-0.1.27 )
 	drm? (
-		>=media-libs/mesa-17.1[gbm]
+		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
author	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
commit	fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree	f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-libs
parent	162945d2a91899b637bbb9e163b406350de12906 (diff)