gentoo auto-resync : 20:07:2024 - 12:29:37

24 files changed, 384 insertions, 144 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 031b48d93ae7..af276d92567a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/boron/Manifest b/dev-libs/boron/Manifest
new file mode 100644
index 000000000000..627ce57383d5
--- /dev/null
+++ b/dev-libs/boron/Manifest
@@ -0,0 +1,4 @@
+AUX boron-2.0.8_makefile.patch 2025 BLAKE2B 66a68046ead260f077fd247f24350d2d9cbe1bf7e25bab2f0e6715ae9284b2c09b757f4ae2d09885757da5a1c4acf9714c1a7a88a646690c18ad019be800c7d4 SHA512 63a46734af6933390acff1fadbaff30f8c8cc6182a44325c16338e2cb5979dc3bf39a3cb1f39aff997e3e294441a3ca8939df9f9f76d9db27332be5e68141cb5
+DIST boron-2.0.8.tar.gz 351968 BLAKE2B c89b61ca2cf55960edd5cfbb8b6bfe9501cfca775a250d325d5f2874423aafca5d9157600a1859c17909c6948f47830613e42b2b916335636876c60ffe7782d2 SHA512 b583dfafc10a640c2cf919b38e5bcdfcbe146e874d4c41fbd4fc6d510ea38938b3e91de502f42e5b2923c9dd201358ffe15c0df47655ac8a8ed2294979338db0
+EBUILD boron-2.0.8.ebuild 713 BLAKE2B 986d696b8550f71249c72d966e1abcad2d2636bb27e0d0d07c64f8bc1f568158b64741f2b2b2cb9fc2d81983377c162de4b3843646bf718908916b3e511d955e SHA512 875ece34e822bfca7523832966b7f8ef4b65094129d9e8ee747b91338b699a9aed1c7b40dc91d4fe2dd54621638a7d875c73d75febf3a90b2c67f68fbedbbe3b
+MISC metadata.xml 468 BLAKE2B dd9b80449a388bda68d4276ac3df14ebd37b5f5bcf57611bacaf655262f424d8eb2322452038b6a625cbbbb40353bcfdfd6fc95fc337b937b691394dd5635f29 SHA512 9743069f2f2907a520a4612891e4b2e8b83e0413b85e69580e79766663d5c770e12409052ca6e74b62ec0dfd0e5b140a7a17d6059357534c7f7a3135e6dec48d
diff --git a/dev-libs/boron/boron-2.0.8.ebuild b/dev-libs/boron/boron-2.0.8.ebuild
new file mode 100644
index 000000000000..428f9ef87c32
--- /dev/null
+++ b/dev-libs/boron/boron-2.0.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="A scripting language similar to REBOL"
+HOMEPAGE="https://urlan.sourceforge.net/boron/"
+SRC_URI="https://downloads.sourceforge.net/urlan/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 readline"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2:= )
+	!bzip2? ( sys-libs/zlib:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.8_makefile.patch"
+)
+
+src_configure() {
+	tc-export CC
+	# Non-standard configure
+	edo ./configure \
+		$(usex bzip2 "--bzip2" "")
+}
+
+src_install() {
+	emake DESTDIR="${D}/usr" install install-dev
+	dodoc README.md
+}
diff --git a/dev-libs/boron/files/boron-2.0.8_makefile.patch b/dev-libs/boron/files/boron-2.0.8_makefile.patch
new file mode 100644
index 000000000000..915f491e3e58
--- /dev/null
+++ b/dev-libs/boron/files/boron-2.0.8_makefile.patch
@@ -0,0 +1,69 @@
+From 8f796a61697e9efe1d6e5498b807e74fc274af24 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 28 Apr 2023 12:01:28 +0300
+Subject: [PATCH] Fixes to buildsystem
+
+* Properly respect CFLAGS
+* Respect LDFLAGS
+* Don't compress man-pages
+* Don't strip binaries
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@
+
+ OS := $(shell uname)
+
+-CFLAGS = -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport
++CFLAGS += -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport
+ CFLAGS += -O3 -DNDEBUG
+ #CFLAGS += -g -DDEBUG
+
+@@ -84,17 +84,17 @@
+
+
+ $(ODIR)/%.o: urlan/%.c
+-	cc -c $(CFLAGS) $(CONFIG) $< -o $@
++	$(CC) -c $(CFLAGS) $(CONFIG) $< -o $@
+ $(ODIR)/%.o: support/%.c
+-	cc -c $(CFLAGS) $(CONFIG) $< -o $@
++	$(CC) -c $(CFLAGS) $(CONFIG) $< -o $@
+ $(ODIR)/%.o: eval/%.c
+-	cc -c $(CFLAGS) $(CONFIG) $< -o $@
++	$(CC) -c $(CFLAGS) $(CONFIG) $< -o $@
+
+ boron: $(EXE_OBJS) $(BORON_LIB)
+-	cc $^ -o $@ $(EXE_LIBS)
++	$(CC) $^ -o $@ $(EXE_LIBS)
+
+ $(ODIR)/os.o: unix/os.c
+-	cc -c $(CFLAGS) $(CONFIG) $< -o $@
++	$(CC) -c $(CFLAGS) $(LDFLAGS) $(CONFIG) $< -o $@
+
+ $(EXE_OBJS): | $(ODIR)
+ $(LIB_OBJS): | $(ODIR)
+@@ -108,7 +108,7 @@
+ else ifeq ($(OS), Darwin)
+ 	libtool -dynamiclib -o $@ $^ -install_name @rpath/$(BORON_LIB) $(LIBS)
+ else
+-	cc -o $@ -shared -Wl,-soname,libboron.so.2 $^ $(LIBS)
++	$(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,libboron.so.2 $^ $(LIBS)
+ 	ln -sf $(BORON_LIB) libboron.so.2
+ 	ln -sf $(BORON_LIB) libboron.so
+ endif
+@@ -130,13 +130,12 @@
+ 	install_name_tool -change libboron.dylib $(LIB_DIR)/libboron.dylib boron
+ 	install -m 644 libboron.dylib $(LIB_DIR)
+ else
+-	install -m 755 -s $(BORON_LIB) $(LIB_DIR)
++	install -m 755 $(BORON_LIB) $(LIB_DIR)
+ 	ln -s $(BORON_LIB) $(LIB_DIR)/libboron.so.2
+ endif
+ endif
+-	install -s -m 755 boron $(BIN_DIR)
+-	gzip -c -n doc/boron.troff > doc/boron.1.gz
+-	install -m 644 doc/boron.1.gz $(MAN_DIR)
++	install -m 755 boron $(BIN_DIR)
++	install -m 644 doc/boron.troff $(MAN_DIR)/boron.1
+
+ uninstall:
+ 	rm -f $(BIN_DIR)/boron $(MAN_DIR)/boron.1
diff --git a/dev-libs/boron/metadata.xml b/dev-libs/boron/metadata.xml
new file mode 100644
index 000000000000..0a665448e565
--- /dev/null
+++ b/dev-libs/boron/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">urlan</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/jansson/Manifest b/dev-libs/jansson/Manifest
index 854c0327f10a..99fec3ee2107 100644
--- a/dev-libs/jansson/Manifest
+++ b/dev-libs/jansson/Manifest
@@ -2,5 +2,5 @@ AUX jansson-2.14-default-symver-test.patch 1604 BLAKE2B 5a18c4723997e7ed668ae345
 AUX jansson-2.14-test-symbols.patch 1100 BLAKE2B 605e64b3f8487e25d56d879b6ef260db5449bd331baf6a05b9612532e1582d6a99af888701f12e5660f494892725fba79d5f22840c1a9faf89d186a785450158 SHA512 5de00dd9c9c4558bbfceed9e100d2821707d66befe446e992c724b4f14b0a560eb432caf65377d13e7f9a71711a14a9ae2cf5c716fa250fa1e86603665dc219c
 DIST jansson-2.14.tar.bz2 434481 BLAKE2B b7b7e98360fd73f7925b88e3729a7a18307b4f05fed4b37659d24ddc03208469471d508dcd245534f73af3b5e93f595e49e3cb2c99733955b03d471bd5a32f15 SHA512 1a659c0f41b0672757c13ebd16bd10ad7d6484366aefda078aa816266ce4f5638bc121f1ce8c4234b0b9f201ea73c227b9084125857452cbcba058a111e4a6fd
 EBUILD jansson-2.14-r1.ebuild 854 BLAKE2B 741f304ec5e60d9dcdbf797c7b89f0932393b5afff00625c1a81f66e493b0f33b763be9338d385353df16b63756c3722ab5b90d92299673295e63d05179f0898 SHA512 3a897d4517a2be465f1023135c669d72e90ab23a1a90e912df0d2bd63c2ff0cfb90e9b8448254fc80318d075651e2f4b08ef5d635a17bd94f91607fa603d9f2c
-EBUILD jansson-2.14-r2.ebuild 929 BLAKE2B 14146d798a42120fb486b25462b2005109b2ae1e5f64ec924935e9a578dbc29657b587d519b3840bea01c464530afcd3dfa677777d2c3df093d2b1232e6e2320 SHA512 89a341bbd20437be2302a44ad303efab92d87db72a1a3b44242762e7f022101f101371986f551d1c6a99f7b692cad7f5ac44b8a6d41b983bbb7a21c746fa62a0
+EBUILD jansson-2.14-r2.ebuild 928 BLAKE2B 32b8c4ac274672cf31748cb06cd2cf8c5213a1efb67312373d344de98d58aa9ba085427405cfe9cc6e225013e5d25a60fb3ea8553c3bd52ad53fca88dcb6b63c SHA512 5c2d7d6c8e03d712d046bdf8786bef115c0ab6723b771817619aa6083ba65633dbe2f9d93240a54e788c8d475e95f6b7a51d2b72d601c4af2bfd31066b34f7f2
 MISC metadata.xml 475 BLAKE2B 9cc60096cb39c1f472a534fd3a1e32da41f251b7f9601e10bd64164f3aa46fef7b492f8c2902b09ea56ac185de146e9c32014d5c741542cce2b5b289864d983a SHA512 7412836cd76c643dd976b26732d827d7efd607d87cecf79ef7d27815e7a14bba4210ee33c01c4f6da5193068c8662fd857935bb1e304edd81a86ae2bf3094ca1
diff --git a/dev-libs/jansson/jansson-2.14-r2.ebuild b/dev-libs/jansson/jansson-2.14-r2.ebuild
index 11b1fb50be40..1e6a82d02789 100644
--- a/dev-libs/jansson/jansson-2.14-r2.ebuild
+++ b/dev-libs/jansson/jansson-2.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/akheron/jansson/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="MIT"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc static-libs"
 
 BDEPEND="
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 5320c8b3172a..40463fceef06 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -13,8 +13,8 @@ DIST libgcrypt-1.10.3.tar.bz2 3783827 BLAKE2B 1a228e02820e886016eb55dee75936c442
 DIST libgcrypt-1.10.3.tar.bz2.sig 238 BLAKE2B 216baebca91b2e940f60d70a4260b6b6b8221ef88cfb42b020bc7b3743a465ef2cf105316648ed1e689cbbf7d79da421aa9f08b5af21c5b862734cf01f377214 SHA512 73795781a458c334ec6daade1b86ae8b788dd5da0b7198b46b8e54a103c5ec4c65a5dd7e6a9d173d136889f24e7f5721992f59117334f39bd1c8a94e3b55a048
 DIST libgcrypt-1.11.0.tar.bz2 4180345 BLAKE2B fe3f42480c0b9a0c50c24f4c54197404b4e1056d8baa9c0c07c671c9c05b90777580b4cbcde931b50ecb4dd93f5ddad89cea99aa36a35f86f796a003e3816f7d SHA512 8e093e69e3c45d30838625ca008e995556f0d5b272de1c003d44ef94633bcc0d0ef5d95e8725eb531bfafb4490ac273488633e0c801200d4666194f86c3e270e
 DIST libgcrypt-1.11.0.tar.bz2.sig 119 BLAKE2B e64d59dae5556e2826f6d297988a3300c36d05aeecfe19544c5092b5f7b777b9b3f37c5ddcfcba5a916ae237cf981efdd9e3bdec482f7c36b12ac5c70f9d4c52 SHA512 8c5ceb50d70ccdedcc1ff4b31a65a07198567b85f582e3e67699cc3e5d012bebf7b1d4903652d11905a9cd845976ad7d3642474804777d0bdc46c6847d92fe38
-EBUILD libgcrypt-1.10.2.ebuild 6452 BLAKE2B a801a7bceb776cf03f6b7497db5576a7ea7443c7bcd14539cff3f836246c3b9f1027da45d97849046fcb764778e66b9fab2806ae508b4878e6206e893e5b1e33 SHA512 f249ed2735c70f8edaf31f18fb069c5ca68c8dce0910f27fceb67cd732fe72b7521a522c4efb7a6627aab47d2b4ac0c5502f616798464b7d740cd06e4bf73110
-EBUILD libgcrypt-1.10.3-r1.ebuild 6207 BLAKE2B dfbddcbe6e1cd37609f63c1729cf78e564c09a8312ced218b92f006c26593f0e313a34315675bf1ca73f7cbc0787a245b8198db5778029e7cdce3a0d1beac03b SHA512 37dc10103998f3b6c87dadc5fc0436b6b51cd3ce15e71bc14016b701fe1a701ffc4f75c4abd0274323d6711720f669effa10e719e97ba9a8718ecbb9ff4a79b1
+EBUILD libgcrypt-1.10.2.ebuild 6347 BLAKE2B 329bc44dffa887b0d80906e99472d4b0856c19926a7090daf344a69930a07b96ae724eef0265548ae20ebca16142978244292d145961e33daa8035cad52a3735 SHA512 c1344a39278e7cfc1b2b610b91566a83497e890d380bd00891d5eca42b7df4cc3610795edc57e988cb0800b1e6f17e2fb971bef82d522538266c486f50263464
+EBUILD libgcrypt-1.10.3-r1.ebuild 6102 BLAKE2B 06daa0a36f06d29acf1f158c21d92a7beeee462d93498918e9fdff8ec2b65054141ecf2f6e1714488df4554d94fb632e490442f4ffa6a48857c5755cb30b37a6 SHA512 fa7be7d6bbd927d2c014333505e9d82d8152e8e5f36bd37d9b5389c9e18feab6d5907f9b2771059627d92a2be5f8a3449132469a1f26f1d5154b94bfaddb214d
 EBUILD libgcrypt-1.10.3-r2.ebuild 6337 BLAKE2B e7d2e6d113670e6b32adfea88289864283e651ec444daf3b1d9cf5f0a17a061bd6dbaf9c917e920572081a1fd0fb6119ee1b445ee2992742e44d5946fac58afc SHA512 95f0bb0ff0770f127c0e6e85bd177db3541005a7d1424166d78e0ce5f5123516cfa99b4a8c6b6afcb73d78cdcf00ab730cbbe0047d82ef7877b92fa51242cf6c
-EBUILD libgcrypt-1.11.0.ebuild 6394 BLAKE2B c7af416929815511f8f8a21ee22ef755d7993ec2ce697403a07d00934807f16092a642cc2645f537145a7477ca735049b4b4a85738ac9f278bd7a006ae82643d SHA512 bac3eb401fa2f14fa567d578eab15ce76d6bd6205722b3a0c7a12a4893106b91c2f90e4240758592896f93ed386448a1b4bf9bcb1a15e2fd9babf483d7749509
+EBUILD libgcrypt-1.11.0.ebuild 6289 BLAKE2B 757788f0fadc324807a7e96c0f6741ed5374c9d6197612fbe940a64a46557057e8d4458cb64790c0ce0328e5a44d0116b10480e28b69f78332c7a4351daa1a3b SHA512 860121042e645e782ccc82df434b1be40d8b0b6cafb0b6d6edbc96cf2f279a8b2c912e0f98fbeb7dc964d0fdc8855eec067e13f5f87e591bcdd2905d084afb85
 MISC metadata.xml 451 BLAKE2B 3be914b8449db0938d868c7cf2df7fbcf29d7f2e9b91320dfb97f0c1bf6c22326f3a1c3f3b695eaacbe4d74bb3a0b733a7afc1f88e04a37d06a9d9ed25358efb SHA512 add260d64091e3aa1de6fb802f4cfd076c1520622ebe93ddf7a0312f8d46232bd330d9bd380e2bdef6aec15563b6d27f2733b5ebe624ad9d0965ed9c6456939d
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index 9747d039fe02..6d72a68b8514 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -142,9 +142,6 @@ multilib_src_configure() {
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
-		# http://trac.videolan.org/vlc/ticket/620
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-
 		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
index e2225f423866..ae0b0501998f 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.3-r1.ebuild
@@ -140,9 +140,6 @@ multilib_src_configure() {
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
-		# http://trac.videolan.org/vlc/ticket/620
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-
 		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
index f3520b916d93..3afe6a467f90 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild
@@ -146,9 +146,6 @@ multilib_src_configure() {
 		# after libgcrypt drops them (bug #468616)
 		--without-capabilities
 
-		# http://trac.videolan.org/vlc/ticket/620
-		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-
 		$(use asm || echo "--disable-asm")
 
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index 0fb58bb8ae5c..dc7233f6bde3 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -1,10 +1,12 @@
 AUX libnl-3.8.0-printf-non-bash.patch 974 BLAKE2B 6f7b4d3d25cc7ffaf6566aeeaa943d4e8ce3ff14af28f2d1ee98c3dc89e87bee24d1d8a211084b4dde0668ff37830f4039ccde93708edda75434dfc0831632a2 SHA512 9eaeddb3ed12be03ba824ad2924879c67f1f3e12f1a938e866404780e6390297bed0b926981820b93459849380ddaac7bb6824e07e096be97ee8cebf18927027
 AUX libnl-3.8.0-python-decorator-syntax.patch 798 BLAKE2B 364c3eff7873ae791c5ff24f3ffa699c149817e1fc871ff257877723c67c8f187270d57a6204df40cb8b534dca3a41903f5d911c21e9ae1e82d1dbf8796cfc58 SHA512 332e2c53e766bb84fdcd7bf2c2d944c3cb78722d733441f3d8f8403a949b9fdbe202bfa6874154733735f193279ab3c7fed960eeff462c0468b355412abbb5d6
+DIST libnl-3.10.0.tar.gz 1116186 BLAKE2B 13383c4ef49be3bcf89122b24d1d5dc9834353aa7128f04f50993203add14aa7f97a4500164982ddcb82f481f7324a26efc2375036d5a23bfa62b15c4fe07473 SHA512 c95e79fba69308c63a08d0c576503b4398710ea9cd1d0097851500a7fbc5fbe87fb32ac281cf42bbfe57eab07b110055e6bc9b95d82244bba3df8a31fe562962
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
 DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02
 DIST libnl-3.9.0.tar.gz 1074117 BLAKE2B 56a39aad9aa15992ff02fe35732abbc5ed5d107b814587e02b914631489877899989d49c7aeee1ecb461ad5f525c7cd7c045c9770864d83b0a58490293441193 SHA512 b6f3633d1920e61645c97f4c4c4419444e7fd66aa3b67b0a73bc29df24cf27065542a62a9c2581f90d0c153247922ce5c649b7da51c0fead6afceaf4d0361dce
-EBUILD libnl-3.7.0.ebuild 2639 BLAKE2B 9f93d4b6028347d62b49758d015b1dafd1627f87ae84259fd8d5a68f20ed1355db80d0defc0f3fb4a1d55180c20927fb024d9e1bbb30a78e528543e1004d4fac SHA512 c3eda33ee4c7a322c36f658c3cda16b97ff560aee28362db5c288d2f60d6562e739aa523f4db164984bf8c29777e49e124989715a09f189f8f978d188928fa95
-EBUILD libnl-3.8.0.ebuild 2916 BLAKE2B e2e1cbe44ae1721d642a96c0897b38615d70ceba99d3bff88a4308d35cec4dc22d27c849adf217f1533e04eef98e1fa3ad0fe761a501a4e510cffa9ae393b948 SHA512 4db0d51cdd30aa8c93ad85da3aa27586648e09135b51d64c4116104f810f231cddb158d891ef79b677016f51c69a9d7ddf2097177c5c4c63fedf6f250f70742d
-EBUILD libnl-3.9.0.ebuild 3059 BLAKE2B 68e65db48ca51854296e2ea0d513d5a17aefaa46b409eb278a53800ba8d5d8a65e55b49bd24e03fa32157ce38c3518374929f21074053a296e5cda8c448709a0 SHA512 efa460ca9fa5cedf57b83f631d61ae7c0dd1362ff5338ff996f59b93eaa19a58be2566ba4f696df6c2e0cebc25d9348e45176016f9e4053221d4918f6f180d28
-EBUILD libnl-9999.ebuild 3065 BLAKE2B 53a079926065dfc8e60dfada54f5d6548d4cce7d202734eb655c09447503a65f1357cf60c134ff293b5069fc05d479368eb3a8227c4a2ab900c496556cfe510e SHA512 3c5867d3b9faafe99ba465ed146a3a0a5b2fa817ad4e0f915696d3ddc4c2b47f162e241393fbe6f01c227ab84bdcf7f2b8e0d84df28af5fc756151c61b124cb5
+EBUILD libnl-3.10.0.ebuild 3142 BLAKE2B 934ddc2b38047e2241ee0251b86b0f0e8ba8ce1dc7f0338b4f38aa3ef84f909b6d64896a4bbe1cf2be2c8d9e9be73f84f7a9c1168b25defb39765c50d85028ae SHA512 27315af8cb38af43ed2fa0e6e38a14f797629a88b83bca5d8ff00c081841efdb16aae94b2c4bd0d285909dcec2ca46228f88e13f7f4a96e2700e1a9faca8e9c1
+EBUILD libnl-3.7.0.ebuild 2716 BLAKE2B 53df8e8de5b0766d76ec3bac46f7bbb7036183826078facd5b18232b2cf56d6f6a2b4e48a7a30793f7d6679e6772d0654a842192b9f612735de50aa2f3a04aa5 SHA512 f7d6d003d92e623df28822ea643b75679c3711671286f0ffb6cf7334f5de10f86a57c4255f34485e8dce8d107cbf05fec0a90bdc3a496f7f2b9a1ec811e50df9
+EBUILD libnl-3.8.0.ebuild 2993 BLAKE2B dcb5ae0ef26d73d5121acef18b5d4e0a88691466654ae30b7a9944774bc42cb8063623e15586cfe570c79970571ccf531dbd7884f8d9ab1ab946ba4a932a2795 SHA512 1dfc82f6494f4050f64abb18dd51289170cff7ad905f8e001c546540c1bb4e746fb93ae38c3c9cb8fe5ac7a7e18ddaa1f75424e2dde7897d5dc58a624fa557d1
+EBUILD libnl-3.9.0.ebuild 3136 BLAKE2B 55faa83c9d1bb6c3cd39a897008b8054f159d665a93eb3781d88bc5850af7f52bffa8a940727f4c38858003b544149f8ac9b3a2f652ff9f4a3c361da00473f77 SHA512 0000bbe52690dcf41dc39d1760a76269cc58690ef77feb718057b078b69f4304a213dcf536596ecb3bc6d85685b8590cdefb68721887ea92685a6f62786e1520
+EBUILD libnl-9999.ebuild 3142 BLAKE2B 934ddc2b38047e2241ee0251b86b0f0e8ba8ce1dc7f0338b4f38aa3ef84f909b6d64896a4bbe1cf2be2c8d9e9be73f84f7a9c1168b25defb39765c50d85028ae SHA512 27315af8cb38af43ed2fa0e6e38a14f797629a88b83bca5d8ff00c081841efdb16aae94b2c4bd0d285909dcec2ca46228f88e13f7f4a96e2700e1a9faca8e9c1
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
diff --git a/dev-libs/libnl/libnl-3.10.0.ebuild b/dev-libs/libnl/libnl-3.10.0.ebuild
new file mode 100644
index 000000000000..1c7d4454ac9e
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.10.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Make sure to test USE=utils on bumps and update MULTILIB_WRAPPED_HEADERS if needed
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+inherit autotools distutils-r1 multilib-minimal
+
+LIBNL_P=${P/_/-}
+LIBNL_DIR=${PV/_/}
+LIBNL_DIR=${LIBNL_DIR//./_}
+
+DESCRIPTION="Libraries providing APIs to netlink protocol based Linux kernel interfaces"
+HOMEPAGE="https://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/thom311/libnl"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/thom311/${PN}/releases/download/${PN}${LIBNL_DIR}/${P/_rc/-rc}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	S="${WORKDIR}/${LIBNL_P}"
+fi
+
+LICENSE="LGPL-2.1 utils? ( GPL-2 )"
+SLOT="3"
+IUSE="+debug python test utils"
+# Tests fail w/ sandboxes
+# https://github.com/thom311/libnl/issues/361
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	python? (
+		${DISTUTILS_DEPS}
+		dev-lang/swig
+	)
+	test? ( dev-libs/check )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# We do not install CLI stuff for non-native
+	/usr/include/libnl3/netlink/cli/addr.h
+	/usr/include/libnl3/netlink/cli/class.h
+	/usr/include/libnl3/netlink/cli/cls.h
+	/usr/include/libnl3/netlink/cli/ct.h
+	/usr/include/libnl3/netlink/cli/exp.h
+	/usr/include/libnl3/netlink/cli/link.h
+	/usr/include/libnl3/netlink/cli/mdb.h
+	/usr/include/libnl3/netlink/cli/nh.h
+	/usr/include/libnl3/netlink/cli/neigh.h
+	/usr/include/libnl3/netlink/cli/qdisc.h
+	/usr/include/libnl3/netlink/cli/route.h
+	/usr/include/libnl3/netlink/cli/rule.h
+	/usr/include/libnl3/netlink/cli/tc.h
+	/usr/include/libnl3/netlink/cli/utils.h
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_configure() {
+	# bug #884277
+	export YACC=yacc.bison
+
+	ECONF_SOURCE="${S}" econf \
+		$(multilib_native_use_enable utils cli) \
+		$(use_enable debug)
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	CK_VERBOSITY=verbose emake check VERBOSE=1
+
+	if multilib_is_native_abi && use python ; then
+		pushd python > /dev/null || die
+		# TODO: run python/tests/test-create-bridge.py
+		distutils-r1_src_test
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		# Unset DOCS= since distutils-r1.eclass interferes
+		local DOCS=()
+
+		pushd python > /dev/null || die
+
+		distutils-r1_src_install
+
+		popd > /dev/null || die
+	fi
+}
+
+multilib_src_install_all() {
+	DOCS=( ChangeLog )
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libnl/libnl-3.7.0.ebuild b/dev-libs/libnl/libnl-3.7.0.ebuild
index dc16175b64ac..c4bd28210037 100644
--- a/dev-libs/libnl/libnl-3.7.0.ebuild
+++ b/dev-libs/libnl/libnl-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,9 @@ fi
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 IUSE="+debug python test utils"
-RESTRICT="!test? ( test )"
+# Tests fail w/ sandboxes
+# https://github.com/thom311/libnl/issues/361
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libnl/libnl-3.8.0.ebuild b/dev-libs/libnl/libnl-3.8.0.ebuild
index c72e4b01c347..5a815cb27fa7 100644
--- a/dev-libs/libnl/libnl-3.8.0.ebuild
+++ b/dev-libs/libnl/libnl-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,7 +30,9 @@ fi
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 IUSE="+debug python test utils"
-RESTRICT="!test? ( test )"
+# Tests fail w/ sandboxes
+# https://github.com/thom311/libnl/issues/361
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libnl/libnl-3.9.0.ebuild b/dev-libs/libnl/libnl-3.9.0.ebuild
index cd91ab04a015..157fe4e901fc 100644
--- a/dev-libs/libnl/libnl-3.9.0.ebuild
+++ b/dev-libs/libnl/libnl-3.9.0.ebuild
@@ -30,7 +30,9 @@ fi
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 IUSE="+debug python test utils"
-RESTRICT="!test? ( test )"
+# Tests fail w/ sandboxes
+# https://github.com/thom311/libnl/issues/361
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/libnl/libnl-9999.ebuild b/dev-libs/libnl/libnl-9999.ebuild
index 65afdf1df751..1c7d4454ac9e 100644
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-9999.ebuild
@@ -30,7 +30,9 @@ fi
 LICENSE="LGPL-2.1 utils? ( GPL-2 )"
 SLOT="3"
 IUSE="+debug python test utils"
-RESTRICT="!test? ( test )"
+# Tests fail w/ sandboxes
+# https://github.com/thom311/libnl/issues/361
+RESTRICT="!test? ( test ) test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 74a4c821cabb..f776346fe402 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -10,6 +10,7 @@ AUX openssl-3.2.1-CVE-2024-2511.patch 5166 BLAKE2B 22ebed2ada20ee5c65d489677d270
 AUX openssl-3.2.1-p11-segfault.patch 2275 BLAKE2B d47816615ece0d015be0a307db950cee1217a522570040a48b9a9a7f7a23927f73ba5633718937c07c90c9a49564e9acc00de239d156cf8632b473afcdba8705 SHA512 9ab62a72036f8fbae34e844e6b17ab3482259de24918279230c2e5daa373de8ee59bd17942c2f4b2dcf06b1bf31796dc539324055e1cded099f6d8630bc13fff
 AUX openssl-3.2.1-riscv.patch 3713 BLAKE2B 427a35e30768116b7d65f442c4b2b5ddf6cc7387dc69ec7311345336a59bb86984b45e5572bab67fecf159580b2321aec35db9c6306b74c2d76db51479d910b8 SHA512 e80a244e9674cbd250244aab16501ea5ab6a03efb44ea744ac109063dda003cc638d0eb6da4630f1c1d7eeabbbc14530b21e3c74608ac961141133b09f4795af
 AUX openssl-3.2.1-s390x.patch 1169 BLAKE2B ae115074de657f450813b329f3f52d19993734b753411be72b2793df8163402c54bb690d7e41ee7598ae500176eb4f57e108021dcfcbcfef81d9135f5ce41e3e SHA512 6c66c9387a13f772e24dbd794b79dc8fdd8fd81186e3d33c917bd45a6c4841a29e5e28643597e1e105b154c30d7b5814fe154895312241b7f793dc352913095c
+AUX openssl-3.3.1-riscv.patch 4413 BLAKE2B bf58837c05023bb34edaf6387a5d1f32b6216791643958e972d634d387031461780c34b9209b399f479d908a40ca3b593ea18b1fa80414802bfcdb80db21e1e7 SHA512 b46f2576be603007f767cb7350e3ec74e0ef0832bcc18e50f7b67010e673a6cdcd7099e99d85d53c6693af6b64260e5a92a9aa3f02be1d626421ab7ff73c6f6b
 DIST openssl-1.0.2-patches-1.5.tar.xz 12404 BLAKE2B 6c1b8c28f339f539b2ab8643379502a24cf62bffde00041dce54d5dd9e8d2620b181362ee5464b0ab32ba4948e209697bfabadbea2944a409a1009100d298f24 SHA512 5725e2d9d1ee8cc074bcef3bed61c71bdab2ff1c114362110c3fb8da11ad5bc8f2ff28e90a293f5f3a5cf96ecda54dffdb7ab3fb3f8b23ef6472250dc3037659
 DIST openssl-1.0.2t-bindist-1.0.tar.xz 13872 BLAKE2B b2aade96a6e0ca6209a39e205b1c838de945903fcf959c62cc29ddcd1a0cb360fc5db234df86860a6a4c096f5ecc237611e4c2946b986a5500c24ba93c208ef4 SHA512 a48a7efb9b973b865bcc5009d450b428ed6b4b95e4cefe70c51056e47392c8a7bec58215168d8b07712419dc74646c2bd2fd23bcfbba2031376e292249a6b1b6
 DIST openssl-1.0.2u.tar.gz 5355412 BLAKE2B b2ff2a10e5851af5aca4093422a9a072c794e87b997263826c1c35910c040f695fac63decac5856cb49399ed03d410f97701d9fd4e1ebfbcacd8f3a74ce8bf57 SHA512 c455bb309e20e2c2d47fdc5619c734d107d5c8c38c1409903ce979acc120b0d5fa0312917c0aa0d630e402d092a703d4249643f36078e8528a3cafc9dac6ab32
@@ -40,5 +41,5 @@ EBUILD openssl-3.1.6.ebuild 8534 BLAKE2B b0d0b4c64ad7b025272ac54150ef9ea18e6ab97
 EBUILD openssl-3.2.1-r2.ebuild 9377 BLAKE2B d8a1bd16284002ec39c926bbe9da25c371e2b54f668146d68f72e8f210e1e0073c1bbeb243f9e24ae970023c207906141e7232e925be718ca244e71dc2f604e9 SHA512 9c6f800d565a7c615ce77e04501b0d9f78c4047465242b9bd6f2c64dc0e0b68a6ff0f3effbf70aba0fe0339455d40095609b4a0df33b07e5afbc7543fe9aef58
 EBUILD openssl-3.2.2.ebuild 9179 BLAKE2B c58b822d2c7a0c0f9b2eb985171472818d6719f2f4f7a87ce33f3cbc5d10decd98588357f7dfe64ec49f1b5e220cb26d334a6cd9e88bc35b3f9584f53c961974 SHA512 8dc73f143cad88806c3a3ae23e20ce88f45e24f8a862aabbb28f38f2be9342df188575ea6cf3530f854c7fdf39bc336a3da3c7983166e6825d838abb58c8e2c2
 EBUILD openssl-3.3.0.ebuild 9232 BLAKE2B 26a1b881b02d355802ff020f2d8797b74d7db61426f0254a30937112ba52988317cf9b58155c1d8fb7a662679d78cca80f484ce72fd66684590f85b2da07af67 SHA512 ecb11de2fa82c33911ab3c9500f942524b4831e7318d7cebacc14218f3b08cc379808ec64086475d2151fe7d5981fc775cd47a71ca0aba8a09c03df52e413413
-EBUILD openssl-3.3.1.ebuild 9094 BLAKE2B a2ee84f53932fddbd018c3a6c57cbae5124951d9c47f320809ec916a47396a945c9f4b324b0f9a21554bbff990d557169c948db39138d82423f64e48debc7e2b SHA512 3632abdf334f04a9045cc5929525720fabed83ae85d8b1825877aae4484dc75b5d9ef3fc297413cb864be310197a0916bbcb5d19ff1e6a6eb6eeaef67d0c3d21
+EBUILD openssl-3.3.1.ebuild 9185 BLAKE2B 7fb4e9e92c8cee1ffb972340511f91dd0d59e9bd08e30b4e467cad81e28998618d7b0c1970e510f2b9c56a5d36cef0f6513137033c128909bc01d595b3e53523 SHA512 7d3820c8a7d1b041edd9e913a7741d2664cddb475b7c87b5789532c060cdaac276ca35ed2523808d600c127c4553a134abf8e09acc7c6c82695e1260872baead
 MISC metadata.xml 1674 BLAKE2B 2195a6538e1b4ec953c707460988f153e40abe7495fd761403c9a54b44ecb7cb5c69ac37ac7d4d18bc0086cf9b4accaaac19926fe5b2ac4b2c547ce1c9e08a6d SHA512 d4eda999c1027f9d8102c59275665f5b01d234c4a7636755a6d3c64b9aad2a657d14256b1527d9b7067cb653458b058db7f5bb20873e48927291092d9ccdd1c6
diff --git a/dev-libs/openssl/files/openssl-3.3.1-riscv.patch b/dev-libs/openssl/files/openssl-3.3.1-riscv.patch
new file mode 100644
index 000000000000..90cad6d92a00
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-3.3.1-riscv.patch
@@ -0,0 +1,96 @@
+# https://bugs.gentoo.org/936311
+# Taken from https://github.com/openssl/openssl/pull/24486
+
+From b1dd4a8005cf172053d986c0dd85fd104f005307 Mon Sep 17 00:00:00 2001
+From: Hongren Zheng <i@zenithal.me>
+Date: Fri, 24 May 2024 14:12:47 +0800
+Subject: [PATCH] riscv: Fix cpuid_obj asm checks for sm4/sm3
+
+Similar to #22881 / #23752
+---
+ crypto/sm3/sm3_local.h                                | 2 +-
+ include/crypto/sm4_platform.h                         | 2 +-
+ providers/implementations/ciphers/cipher_sm4_ccm_hw.c | 2 +-
+ providers/implementations/ciphers/cipher_sm4_gcm_hw.c | 2 +-
+ providers/implementations/ciphers/cipher_sm4_hw.c     | 2 +-
+ providers/implementations/ciphers/cipher_sm4_xts_hw.c | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h
+index d2845f9678967..a467cc98eb13e 100644
+--- a/crypto/sm3/sm3_local.h
++++ b/crypto/sm3/sm3_local.h
+@@ -39,7 +39,7 @@
+ #  define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
+ void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
+ # endif
+-# if defined(__riscv) && __riscv_xlen == 64
++# if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ #  include "crypto/riscv_arch.h"
+ #  define HWSM3_CAPABLE 1
+ void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
+diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
+index 928dc17ff0838..4d70d291450a1 100644
+--- a/include/crypto/sm4_platform.h
++++ b/include/crypto/sm4_platform.h
+@@ -38,7 +38,7 @@ static inline int vpsm4_ex_capable(void)
+ #   define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt
+ #   define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt
+ #   define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks
+-#  elif defined(__riscv) && __riscv_xlen == 64
++#  elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ /* RV64 support */
+ #   include "riscv_arch.h"
+ /* Zvksed extension (vector crypto SM4). */
+diff --git a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+index 34f0e751e007d..293bb69d64272 100644
+--- a/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
++++ b/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
+@@ -59,7 +59,7 @@ static const PROV_CCM_HW ccm_sm4 = {
+     ossl_ccm_generic_gettag
+ };
+ 
+-#if defined(__riscv) && __riscv_xlen == 64
++#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ # include "cipher_sm4_ccm_hw_rv64i.inc"
+ #else
+ const PROV_CCM_HW *ossl_prov_sm4_hw_ccm(size_t keybits)
+diff --git a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+index 06ca450782ff2..e3b4e9f588807 100644
+--- a/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
++++ b/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
+@@ -89,7 +89,7 @@ static const PROV_GCM_HW sm4_gcm = {
+     ossl_gcm_one_shot
+ };
+ 
+-#if defined(__riscv) && __riscv_xlen == 64
++#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ # include "cipher_sm4_gcm_hw_rv64i.inc"
+ #else
+ const PROV_GCM_HW *ossl_prov_sm4_hw_gcm(size_t keybits)
+diff --git a/providers/implementations/ciphers/cipher_sm4_hw.c b/providers/implementations/ciphers/cipher_sm4_hw.c
+index c4f2f97cccd8d..70dc66ffae233 100644
+--- a/providers/implementations/ciphers/cipher_sm4_hw.c
++++ b/providers/implementations/ciphers/cipher_sm4_hw.c
+@@ -134,7 +134,7 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_##mode(size_t keybits)           \
+     return &sm4_##mode;                                                        \
+ }
+ 
+-#if defined(__riscv) && __riscv_xlen == 64
++#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ # include "cipher_sm4_hw_rv64i.inc"
+ #else
+ /* The generic case */
+diff --git a/providers/implementations/ciphers/cipher_sm4_xts_hw.c b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
+index 6cf58e851f5d4..423598317d217 100644
+--- a/providers/implementations/ciphers/cipher_sm4_xts_hw.c
++++ b/providers/implementations/ciphers/cipher_sm4_xts_hw.c
+@@ -89,7 +89,7 @@ static const PROV_CIPHER_HW sm4_generic_xts = {
+     cipher_hw_sm4_xts_copyctx
+ };
+ 
+-#if defined(__riscv) && __riscv_xlen == 64
++#if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+ # include "cipher_sm4_xts_hw_rv64i.inc"
+ #else
+ const PROV_CIPHER_HW *ossl_prov_cipher_hw_sm4_xts(size_t keybits)
diff --git a/dev-libs/openssl/openssl-3.3.1.ebuild b/dev-libs/openssl/openssl-3.3.1.ebuild
index 57742961b14a..d348842d29b0 100644
--- a/dev-libs/openssl/openssl-3.3.1.ebuild
+++ b/dev-libs/openssl/openssl-3.3.1.ebuild
@@ -23,7 +23,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~amd64"
+		KEYWORDS="~amd64 ~mips ~sparc ~x86"
 	fi
 fi
 
@@ -57,6 +57,8 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
+	# bug 936311, drop on next version bump
+	"${FILESDIR}"/${P}-riscv.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index bf5a6f7fd9a4..a2ee43cbeaf4 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,11 +1,7 @@
-AUX rccl-5.0.2-change_install_location.patch 936 BLAKE2B bd9feabfdeb0e6098e25baca8dd20a512b8761ab6d5b7ee4e723c268dec9b7200d125d4cb36fe540aedca396da51c094123f778d695f644788804e2f890d0697 SHA512 0fb0fadef6137d1a60dff8ae7e44df5a0769ea7142e182b86d2e4acee5a76397424b67ee73f25697494ad5d6e6ef60b71e889208775e6abf6f05f1c0d1b4b2b0
-AUX rccl-5.1.3-remove-chrpath.patch 1852 BLAKE2B 255a295ffe34301c3926fbff412bef9ef7e6625a69a7e3dba2e3c7cc281640f3e4bc30dbaa25c916edf71f6b23e801e9f56a6c06cdb9221f470881a9d1291793 SHA512 05fc9c20c76195f45daba5c4a3612a6d2572ba1ae0028a0710c8c92e55f7c70b03ab7722363942d05d8e3c89a40edaa0364c0aff64f9d712e0739954650a6bae
 AUX rccl-5.7.1-remove-chrpath.patch 592 BLAKE2B 8510698259154be9138c136c87c3650276140ac500a235049cdd1f8ea9dcc969ac6cd16b13ce628c448f1d5aa8c49818c455e761e96c24a0abc3aa0d3d431320 SHA512 7df69e5293edb3021f57caf9fa6ec12fd3c6a2841f62de4d6358092ec8f5c11f18d2f6434704e64c225327b3a55a4e64710cb07a82ebee103e4faa3865baa72d
 AUX rccl-6.0.2-fix-version-check.patch 552 BLAKE2B fb1230b262a959c783e6f796e83621c3b32f69cc81ab94c07a9596a8fa37bf2d496aebfe4bec97adf2873d3dc946e690d64f51b4d578528470436b9949cfa432 SHA512 efd6343ffd9b5dee9152787f993621e7bbd5a6d46d4b33d1c0c47ded4fd1a5da9dc753c956c646f48bde5dd6b61876a633d89810ba33861734ec2b2c0040d0ec
-DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
 DIST rccl-5.7.1.tar.gz 1425561 BLAKE2B 852c111ad806d5c99f48b3c65c8cf37315c68b969f9544bfa14c1faf1d5557edcc57cdc21705ced6ded4a0288d42b1076e65fb67b3f89b4fa78cfba9d317b23e SHA512 5913b8ff67fa787714713b7d5b571374898be740d56c77db9f04fe7a3e6ca74023fa930a3494d8a6f984ac9e68ee318343835e110049d08700fe773376618af4
 DIST rccl-6.1.1.tar.gz 1679144 BLAKE2B 371d64691dc74f875c49e14df8f3f2d8b9c607376e6c5a889bd2bdb50607e88715d6d75ffed4ba3184a5b9b241cb37b8501e927a5f495632212909e410102490 SHA512 6c6376dd822182bcf28f573c0f3b5c7e52f94f4b670ee7c88519232f51b443d52cd37cbe6c41b5b6e9cb0b93c1124246a989f6e6a2ae74935134135585118002
-EBUILD rccl-5.1.3.ebuild 1091 BLAKE2B 0506cc6607a280c97d934ba9037289f8c06678efe6bd4f5c0501d855b1e765181c1273e4918cfed72a19e235ad5b182eb901eb97401419d57319282ef4134e07 SHA512 c3be588fe12ef890fd74ee6bd6a09ba1f0b461a7daef14efa9ebabdcea7f1b9a3bb1389e3eed8856c231b0bf05674939f952ebcd0f522fcbe6284d4aa2e8f583
 EBUILD rccl-5.7.1.ebuild 1836 BLAKE2B 3286a92c9d08f9e0baac3ad3fbf0a9782109788b999bab8ac4864fa0ab47a6fcd53a73eee2d34a7cb5400998e60f246ec64df6f4a3f8bb07c38405e7f0b4417b SHA512 dd4dfeecdd908eeddba9d0450eba831ccc4778accbcab6023d4d47bac218d2e5d92a967744796b7c8854a579c5df16d8253795dd294183b2054dcf725a0372ae
 EBUILD rccl-6.1.1.ebuild 1605 BLAKE2B c819ea45053d9a2a46396b2c280e24620947addb1a3074c63c364c3b3669cdfd7d7995a7cf401eda8b3d296fa4529cf0a1b367ff58d24eae2746424f4cd4e209 SHA512 9238cf17ea6c21de22babd70d9639fdc20b4446cb3d5f6faf8dd6795cd5b0ef37db92b7e300df9977c788355ba8a9a603bf12db7fb8a476065559fa5074fb800
 MISC metadata.xml 695 BLAKE2B 7d52b2606665aebfade0d15c339f04fe9ac743d1ef402437adefa6a1ab710ae8e0367172cfa3bae8876609d40d26356cc9a93f555fd28f887cff957e38192416 SHA512 6b1d2a88fb7f88bc2bd1fd7126ba33a7d63b6e323cf43072a6c56fad3a5b8cde4262bc7ed7c9485a650544d562377b146d52088e2ecdd8c0e65d0b91addea57c
diff --git a/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch b/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
deleted file mode 100644
index 11e3fea312de..000000000000
--- a/dev-libs/rccl/files/rccl-5.0.2-change_install_location.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: rccl-rocm-5.0.2/CMakeLists.txt
-===================================================================
---- rccl-rocm-5.0.2.orig/CMakeLists.txt
-+++ rccl-rocm-5.0.2/CMakeLists.txt
-@@ -268,16 +268,12 @@ target_link_libraries(rccl INTERFACE hip
- rocm_set_soversion(rccl "1.0")
- 
- rocm_install_targets(TARGETS
--                     rccl
--                     PREFIX
-                      rccl)
- rocm_install(FILES ${PROJECT_BINARY_DIR}/rccl.h
--        DESTINATION rccl/${CMAKE_INSTALL_INCLUDEDIR})
-+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- rocm_export_targets(NAMESPACE
-                     roc::
--                    PREFIX
--                    rccl
-                     TARGETS
-                     rccl
-                     DEPENDS
-@@ -329,8 +325,6 @@ rocm_create_package(
-   "RCCL Maintainer <rccl-maintainer@amd.com>"
-   LDCONFIG)
- 
--rocm_install_symlink_subdir(rccl)
--
- if(BUILD_TESTS)
-   add_subdirectory(test)
- endif()
diff --git a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
deleted file mode 100644
index 26bad572c7d8..000000000000
--- a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Manually chrpath not needed in CMakeLists since CMAKE_SKIP_RPATH=On
-So chrpath dependency is not needed
-===================================================================
---- rccl-rocm-5.1.3.orig/test/CMakeLists.txt
-+++ rccl-rocm-5.1.3/test/CMakeLists.txt
-@@ -5,11 +5,6 @@ if(BUILD_TESTS)
- 
-   message("Going to build unit tests (Installed in /test/UnitTests)")
- 
--  find_program(CHRPATH chrpath)
--  if(NOT CHRPATH)
--      message(FATAL_ERROR "chrpath is required for UnitTests. Please install (e.g. sudo apt-get install chrpath)")
--  endif()
--
-   include_directories(${GTEST_INCLUDE_DIRS})
- 
-   if(BUILD_ALLREDUCE_ONLY)
-@@ -88,14 +83,6 @@ if(BUILD_TESTS)
-   # HIPCC adds /opt/rocm/lib as RPATH, even though the install process is supposed to
-   # remove RPATH.  It also occurs before any user-specified rpath, which effectively overrides the user rpath.
-   #  As a work-around, set the correct RPATH for the unit test executable as a post-install step
--  if (CMAKE_INSTALL_PREFIX MATCHES "${ROCM_PATH}")
--    # install_prefix/CMAKE_INSTALL_PREFIX was not explicitly specified, so look in build/release
--    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTests)
--    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTestsMultiProcess)
--  else()
--    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTests)
--    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTestsMultiProcess)
--  endif()
- else()
-   message("Not building unit tests")
- endif()
diff --git a/dev-libs/rccl/rccl-5.1.3.ebuild b/dev-libs/rccl/rccl-5.1.3.ebuild
deleted file mode 100644
index 92092f7946cf..000000000000
--- a/dev-libs/rccl/rccl-5.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ROCM_VERSION=${PV}
-
-inherit cmake edo rocm
-
-DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
-HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
-SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-
-RDEPEND="dev-util/hip
-dev-util/rocm-smi:${SLOT}"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/cmake-3.22
-	>=dev-build/rocm-cmake-5.0.2-r1
-	test? ( dev-cpp/gtest )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/rccl-rocm-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0.2-change_install_location.patch"
-	"${FILESDIR}/${PN}-5.1.3-remove-chrpath.patch"
-)
-
-src_configure() {
-	addpredict /dev/kfd
-	addpredict /dev/dri/
-
-	local mycmakeargs=(
-		-DSKIP_RPATH=On
-		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-Wno-dev
-	)
-
-	CXX=hipcc cmake_src_configure
-}
-
-src_test() {
-	check_amdgpu
-	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/UnitTests
-}