gentoo auto-resync : 29:05:2023 - 21:18:33

26 files changed, 46 insertions, 180 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 047695cd0d5a..6f3e78ae3f79 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index c1a11afa0b39..9e9aef5b3fe2 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,4 +1,3 @@
-AUX apr-1.5.0-mint.patch 872 BLAKE2B dda2941cbed87117a8a6c488bd8045894686aef0ba219ff489f67dd03b58fb07a05f9e67c54cdff330c65e579c41c992446a465104661bbacbb2525a5b9518eb SHA512 ba71f17ef9f61a8379139f05ca17eb583ad34cbc3ebf5c4f59d011662db6b5c963da5c466c093c3eb98372299d8f202d927a05b52cc7515270ac52fe44ec6daf
 AUX apr-1.6.3-skip-known-failing-tests.patch 512 BLAKE2B 29607bce9a35853d824f8872557f361f3d5ffa0f2c7cd35e06cbf4d449e54f1b12978c0220b8ce4ae5d590ee9e04b5cd77af22876e3880deef115efbeb5a1dcc SHA512 ac097d28d5ae0b2437522da0578ff8bd049190d8df576e4e5298426f827b2bf69891e4f33bd1ffaf1a3c53143927e71f10d8362567121faa03cdf908d4fbc6c2
 AUX apr-1.7.2-autoconf-2.72.patch 570 BLAKE2B 6cfe6c2b00c3d0ac1f5776d546366355be3139a06c0b6229ee2830f1c8c019b16701f9404fda0071c085161461476271a7930c95ec0b6501c4a2df23a371b3fa SHA512 b44805e747c441407b01ae26e06eb1e16f4e5334f097e9eab3c41a4ed39978f483065eadc9a4514a11bf246080ea120f9b594c712d282c2be638a5eb01dc2fbb
 AUX apr-1.7.2-fix-pkgconfig-libs.patch 963 BLAKE2B fb36bb31050286064e17c2a9c9f3d48ce9c0e42f8ee6cfcfa45ec79ad57670acf953f273d83419d3b053a38d9786600a240b8b082615e0e1fe7f15dcd2793e6c SHA512 0d8bb84b71f6f9f590afc15a48010383ef6b5b84b2b64fcbb9489adefa32137a1af7c0b7b216dd18f9c04b92492772f2d9f9564b9fbfbffc019bed8e43818cfe
@@ -9,8 +8,8 @@ AUX config.layout.patch 745 BLAKE2B 9877db3d76339b70f2bd354d118eff0df4d63bc81e4a
 DIST apr-1.7.2.tar.bz2 890218 BLAKE2B a17ee4311a33acee0bdeb9e5225a198f9dec1b2e0267a742080c77d5342e5052392a5a2100a0ba85f5a192b8679838a7002d4c9a12aa5bdd7921eff025b75d15 SHA512 0a3a27ccc97bbe4865c1bc0b803012e3da6d5b1f17d4fb0da6f5f58eec01f6d2ae1f25e52896ea5f9c5ac04c5fddcfd1ac606b301c322cf40d5c4d4ce0a1b76e
 DIST apr-1.7.3.tar.bz2 901048 BLAKE2B effd809ff2d43c5340874456c6440c94c3c1dc728964d6b65050e0e11692961ccbedba63fd02009c79fa05bb8effde7cc46d2b22c560745d49d54f0a793e4b6d SHA512 d8f62868d8e3ec92cede1f0d93b5d48e49441f575c98e165ff84343746a6abd265290ab16a57f741896ae7a6b3e534a334325a99a61c96c2485e085f7761c124
 DIST apr-1.7.4.tar.bz2 894526 BLAKE2B a93b9d3f2c46fe0a34ce1d544e7a43ba40720e2fae8b8a7d0957413ac695057902378dbf96f067ced7486da86c8e513b7fbd48fa79839efeeb40a3295fe2d3df SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
-EBUILD apr-1.7.2-r1.ebuild 4572 BLAKE2B f56d372b5d9b2fe160c14e407ad0d190cbd3a9da9de45c6a4d2868faa4452fb461b84fc0eb40a52b74139359b5d4f7b8cb86c153d6db673645d3e9c1cccb890c SHA512 618ea824f577291b6a1956cd9d830d6cd331c02a2908b4150d22a679ceab6c9f4d33271ddd3b084d1a4833c72895ad060aff41666fd64a40adc3e93a3c647aa5
-EBUILD apr-1.7.2.ebuild 4518 BLAKE2B f39d80075a71914f0a599dd91af2caa561cc8b09cb05c47098f20a4748af73f909ece3a4e771d01ee76c663fd06ed2cf3c3e1635e4e8ebfac61afa2b06d6a0f4 SHA512 2dbe0dd1773714ef76aa03b2051dae0db7d1645884a57549931d2495914be901a77e7f9632f790ebb4e7fdb7cb68bce322a8ac2b938939e6eed8611251123785
-EBUILD apr-1.7.3.ebuild 4572 BLAKE2B f56d372b5d9b2fe160c14e407ad0d190cbd3a9da9de45c6a4d2868faa4452fb461b84fc0eb40a52b74139359b5d4f7b8cb86c153d6db673645d3e9c1cccb890c SHA512 618ea824f577291b6a1956cd9d830d6cd331c02a2908b4150d22a679ceab6c9f4d33271ddd3b084d1a4833c72895ad060aff41666fd64a40adc3e93a3c647aa5
-EBUILD apr-1.7.4.ebuild 4647 BLAKE2B 137d94649aafc8572a7f03ebb9b2ec94023a5d6019c28453da3105aef5c4f61bd775c4705e981c4f1114802a5b1e1631790b27325491d4e751af3b98c4f4f31d SHA512 2e59ee8376ea27a1813a00ad0aa59d54389dfa5ab3fd4bb3232200109a2e873530e8f929b61ceeeb71ee65dfa3cac50e2d8bdbdb411ecc4402911fe20e14e98e
+EBUILD apr-1.7.2-r1.ebuild 3747 BLAKE2B 930ea9f82e48a1d53f9658f00f5a144549814d5e95febb08f232f0f12a716a305f76cdb6670017fb8973ed33e5b30ac532f97268b119a9001192cee94d18e5c1 SHA512 831a343f765fc6cdd33c5e773838a9c125c2a94b9e88923843a5fbd6e683d32aa6aedd93dedefab379c710a36bca4565eb18b15014293ae330cc50cae35d4382
+EBUILD apr-1.7.2.ebuild 3693 BLAKE2B 214f0a25eb988f0198c343ecf422fd4d6b510009049a21469ed55726c1c83271811a37e665faa35e4e6a74d352a861343e3f9f96b8961dee5ac8ed7a47a127fb SHA512 dce3f7ad05ddcbbb637254c47f776200aff8dc6cd3178dad9613c490a1cee7bfac42622f8c22fa9b9b82c901e1dd2281f0acb03649dc4357f3b7b45c3b486036
+EBUILD apr-1.7.3.ebuild 3741 BLAKE2B 88f85efbcafea7bf473daf725f61bcd259207aa9802c0d3b784583146b97e1eac1ecffadcab9a920126557c190d1342237cfe2759ace0b71d1a6225522a12db8 SHA512 45ff76a68141d32613a8927bdb10d448f443d4e2665e3ca6136498ed770d33edfcd57d59c6ead78eb62d2d954dc979838ca989ca0c42de75d3ce23e7f19c9199
+EBUILD apr-1.7.4.ebuild 3822 BLAKE2B 26a8fa98b5195b33a92d2befb5591d487f0409e35a4839ae19e3cd57f62b6684e86cd1a853caaaa7f2bae824ec14b78de26ad2f75545d7b5d9f97ac6d74b6916 SHA512 d045dca75492bc88d1764243eafd47a13fb796b0bccda494a5e619d7504e01d27a8ebae90f8c08dc9ba6f08c51230dbd8710e3f999dfa304a072291be2cfc607
 MISC metadata.xml 487 BLAKE2B 826e5b4b8b87d0077f1b2063ae1c808447987ddea524eeb4cdd17d60bea8b3919a2a714cdb0706cf758dfcf86109b702399c04dd054872d8465e1f6b3469c795 SHA512 9e8fbae61974080394151944ca7e2fec92a6c99b2c2fe75dc2486dced890933ac4694c8ac2984504bbfe42706bed6895b7d5fe9f9a9ced96c5c0ead8016f4366
diff --git a/dev-libs/apr/apr-1.7.2-r1.ebuild b/dev-libs/apr/apr-1.7.2-r1.ebuild
index 7986ed4088df..e1c446e9551f 100644
--- a/dev-libs/apr/apr-1.7.2-r1.ebuild
+++ b/dev-libs/apr/apr-1.7.2-r1.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -96,38 +95,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.2.ebuild b/dev-libs/apr/apr-1.7.2.ebuild
index 13fff2505e42..2bac56d69761 100644
--- a/dev-libs/apr/apr-1.7.2.ebuild
+++ b/dev-libs/apr/apr-1.7.2.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -95,38 +94,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.3.ebuild b/dev-libs/apr/apr-1.7.3.ebuild
index 7986ed4088df..3dc1fa16ac8a 100644
--- a/dev-libs/apr/apr-1.7.3.ebuild
+++ b/dev-libs/apr/apr-1.7.3.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -96,38 +95,15 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
-	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/apr-1.7.4.ebuild b/dev-libs/apr/apr-1.7.4.ebuild
index 727cb2ad663c..e2253cffa218 100644
--- a/dev-libs/apr/apr-1.7.4.ebuild
+++ b/dev-libs/apr/apr-1.7.4.ebuild
@@ -32,7 +32,6 @@ BDEPEND="
 DOCS=( CHANGES NOTICE README )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.0-mint.patch
 	"${FILESDIR}"/${PN}-1.6.3-skip-known-failing-tests.patch
 	"${FILESDIR}"/${PN}-1.7.2-libtool.patch
 	"${FILESDIR}"/${PN}-1.7.2-sysroot.patch # bug #385775
@@ -98,38 +97,16 @@ src_configure() {
 
 	if use urandom; then
 		myconf+=( --with-devrandom=/dev/urandom )
-	elif (( ${CHOST#*-hpux11.} <= 11 )); then
-		: # no /dev/*random on hpux11.11 and before, apr detects this.
 	else
 		myconf+=( --with-devrandom=/dev/random )
 	fi
 
-	# shl_load does not search runpath, but hpux11 supports dlopen
-	if [[ ${CHOST} == *-hpux11* ]]; then
-		myconf+=( --enable-dso=dlfcn )
-	elif [[ ${CHOST} == *-solaris2.10 ]]; then
-		local atomic_contents=$(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h)
-
-		case "${atomic_contents}" in
-			*atomic_cas_ptr*)
-				;;
-			*)
-				local patch_id=$([[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885)
-
-				elog "You do not have Solaris Patch ID ${patch_id} (Problem 4954703) installed on your host ($(hostname)),"
-				elog "using generic atomic operations instead."
-
-				myconf+=( --disable-nonportable-atomics )
-				;;
-		esac
-	else
-		if use ppc || use sparc || use mips; then
-			# Avoid libapr containing undefined references (underlinked)
-			# undefined reference to `__sync_val_compare_and_swap_8'
-			# (May be possible to fix via libatomic linkage in future?)
-			# bug #740464
-			myconf+=( --disable-nonportable-atomics )
-		fi
+	if use ppc || use sparc || use mips; then
+		# Avoid libapr containing undefined references (underlinked)
+		# undefined reference to `__sync_val_compare_and_swap_8'
+		# (May be possible to fix via libatomic linkage in future?)
+		# bug #740464
+		myconf+=( --disable-nonportable-atomics )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/dev-libs/apr/files/apr-1.5.0-mint.patch b/dev-libs/apr/files/apr-1.5.0-mint.patch
deleted file mode 100644
index cfe039e962c6..000000000000
--- a/dev-libs/apr/files/apr-1.5.0-mint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apr-1.5.0/build/apr_hints.m4
-+++ apr-1.5.0/build/apr_hints.m4
-@@ -45,6 +45,8 @@
-   case "$host" in
-     *mint)
- 	APR_ADDTO(CPPFLAGS, [-DMINT -D_GNU_SOURCE])
-+	apr_cv_pthreads_cflags="none"
-+	apr_cv_pthreads_lib="-lpthread"
- 	;;
-     *MPE/iX*)
- 	APR_ADDTO(CPPFLAGS, [-DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE])
---- apr-1.5.0/build/apr_threads.m4
-+++ apr-1.5.0/build/apr_threads.m4
-@@ -198,7 +198,7 @@
- AC_DEFUN([APR_CHECK_SIGWAIT_ONE_ARG], [
-   AC_CACHE_CHECK(whether sigwait takes one argument,ac_cv_sigwait_one_arg,[
-   AC_TRY_COMPILE([
--#if defined(__NETBSD__) || defined(DARWIN)
-+#if defined(__NETBSD__) || defined(DARWIN) || defined(MINT)
-     /* When using the unproven-pthreads package, we need to pull in this
-      * header to get a prototype for sigwait().  Else things will fail later
-      * on.  XXX Should probably be fixed in the unproven-pthreads package.
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 5dd1b867c551..177d20f30388 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,3 @@
 DIST imath-3.1.7.tar.gz 583049 BLAKE2B 54619339f349a944e1d72fcea4438d7bd2ef6c9655ba0e16ac608934a8df30c97a2f3cf5c75adaeb8a6fe6bf19ec3240c11439550b452571d0a8cbf75d6bd83e SHA512 e298454cb845cadde28f7881fdaa4739c3942f941278a07ec912459ac376c2ee7858cb3b2d2047b9afb4d4dacae7a8a52ffef4c104f8499b4e0a1f0ed46cc0f0
-EBUILD imath-3.1.7.ebuild 1864 BLAKE2B 86e8f663482dccc725b51e8d66d39371228c32f29468bedaf21b11bb033b87a85c0964473e3f1d6353340296910b3cd284cf41e45b4b84072d13f044757fc254 SHA512 99630bb795dea8f3d589ca28a22d97660f2c3008314c1ab69cd401dd749cc571bc8a4703b8f5ff19d804908aa626ebe03da7ae698f4476a1f373efc9a00d9b86
+EBUILD imath-3.1.7.ebuild 1851 BLAKE2B 25b2d3be469be0463756c1753985771e4e698742de04df6e968b5afbf1c4eec6ded223521729c743c9cd051d177f2eae09dd34bc8c2a3a9923ea13df70a82d2e SHA512 9fe18533623317fdd52cd75e4ec9794247aacf443a050037bd4fe9f218f9ce8130f06dd0ae21309865cd1459e069134889b8d6903c9eff257212b14a5e1c1da1
 MISC metadata.xml 820 BLAKE2B f035962970166d4c636e8b98b9301e31fbc27aecb7059289a7581958619b85c7f60551d56175637d373363a41c7349c8c78ec31348590826313bdca94aec6727 SHA512 9dbff2f917f1705a611680c46f73a0ad372f27f6b5c236f691f16b6c41a51cb3d8712c4bceddb5469742f4952385e2a2b07377c4c216736810562ae89c5c52f4
diff --git a/dev-libs/imath/imath-3.1.7.ebuild b/dev-libs/imath/imath-3.1.7.ebuild
index bc0feb859d73..2e490284d2c3 100644
--- a/dev-libs/imath/imath-3.1.7.ebuild
+++ b/dev-libs/imath/imath-3.1.7.ebuild
@@ -12,7 +12,7 @@ MY_PN="${PN^}"
 DESCRIPTION="Imath basic math package"
 HOMEPAGE="https://imath.readthedocs.io"
 SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords): ~x64-macos ~x86-solaris
+# re-keywording needed for (according to ilmbase keywords): ~x64-macos
 KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index 0ac55e8d4dfa..13227d4bdef5 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1516 BLAKE2B 57cdb544f27027752d2fbcb823e26fc7001727078748c0a82f3ae4525f95fc00f41456f75e43d0dfb0c105eba4006530de9d442452f351e9d59274b6154b6401 SHA512 54104cda38821f2b4f6e1a40e503f3ba9233220ba5ffc2fe0fa078ed5f402d51545e164faddfeb2168c4675cdc1ddab82991ef119ded6d91fc1b29e51230d365
+EBUILD libgcrypt-compat-1.5.6.ebuild 1409 BLAKE2B 322f237ffb46b6bfcb06e071f3f13cdbfaa304c1c7f53a3366ff549f64ae29cd2744e7e86c5aee2549c9642cb33b6be17cfef104d10f606811bba0fa74e240c2 SHA512 b5b73aa406178aab1f7a9487eb085b740b079e10129eb9060733babf9807337e83b55fbfb606e3f1e5e8eb28e430dec53b2b8ec4ca25ea3077dae936b5d0151e
 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index 1878e5f9bee0..2ee712b6b33c 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,9 +44,7 @@ multilib_src_configure() {
 		--without-capabilities
 
 		# http://trac.videolan.org/vlc/ticket/620
-		# causes bus-errors on sparc64-solaris
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index ac107fad6589..7b386f1a4a5a 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -12,8 +12,8 @@ DIST libgcrypt-1.10.2.tar.bz2 3795164 BLAKE2B c86b29648664aae3fb694b20ad258828d2
 DIST libgcrypt-1.10.2.tar.bz2.sig 119 BLAKE2B 3753134a1ed1fd2bfd2c64f175c3745db02791359646b3f0229c80ce4ccedbb147ee889a6b8c4fe4bf7e9067d804ee18a8411cd347026cd1656ad1d4d5686bec SHA512 9350444a0bcfa49217815a831f2286ccea470311673257bd809eb5dedbe97d2a5543b0bc7fb752312df69adeb7ac5f064e433f2545a8bf3e494027986cd8020c
 DIST libgcrypt-1.9.4.tar.bz2 3239704 BLAKE2B b8244bc12a68955797b0c2b474ac5c95df1014231f7180a2ffa113e3aacedc98eed60ee1e4b30b032a5fcd6a04855ae07142c223906d5db9c28328a71e014f33 SHA512 d0e117ac73c94d70e9521ee1e6328691498cc8328f8c4e21338096908f5c04c7b838966eb63d59494565f4e19f506c07dab4f4d922150d75610d9f7b57abbf60
 DIST libgcrypt-1.9.4.tar.bz2.sig 119 BLAKE2B 4012c22259a9fd56f9da6c87d60077cea0dbfef85d4d4ad1ff6a2375ddefafc4cd03ee9083d18e080c14c95887b495062af886732a9593bcf1b8f187d21073fe SHA512 4aee16449b4b50dac62bd80217e769f32f43fb7cd994402b7d9cffbb1934b2771041c8c0c41a63ced9c8d9408025f9c5608ffc7f00e5e9a9b92a07cb5118a98a
-EBUILD libgcrypt-1.10.1-r2.ebuild 6192 BLAKE2B 8f1b13a36b976b1562b161a52be0adee6a73515f7d5f961fc8967dcc9d2d34200b584f682cd27d37edc6157280d884f2822cedce7b0d80a76219538a7973544f SHA512 256884d3075305128d38e75118df659012173f21cb94257cff23e94de8def5b1cc25d0745799bc6769aa095db2c9ce467fa13b76ba3687eda34896933e6797f8
-EBUILD libgcrypt-1.10.1-r3.ebuild 6310 BLAKE2B ee077195c6d901cd061eac5811b4415df24cad91fe6842a882ae3a7197503f0200c5a9d96d02e12554fc15e539aa37eb42a355b785dbf93a2d81d5877151f688 SHA512 5d431f6ff74cb01364e8f608e7986325dbd4b5b50a7eee76a54ad85e87d3ffe1de17b61a75ee53528984aee575275482c67865acabc5525683119ccedd04df44
-EBUILD libgcrypt-1.10.2.ebuild 6216 BLAKE2B 81632a0f3040506bdccf65e75ef8a3d450156ba85af85edd3c5b4da6b0d99e319845865b9111d91daf1b1524e42d6b19b5f96c80eb31a739a08101148206c611 SHA512 e7b28a683b92119a3a0f278bcd6239f3d46d5f5f595b2a482dfa189a375a74f53920bf7a9942eaf40c3a4c3a8a0183619cc095bc722f2b1f2c4bab828b33db88
-EBUILD libgcrypt-1.9.4-r2.ebuild 5250 BLAKE2B 34576e770c32e51d81c62a083e10d3a966b1445065447a5fa761059bb0bcc689585205da2cf14232d83875e64d8127a467a2e238cfde229431954455f6a5c8fe SHA512 355b7f5951bfe0e578c40ab05d2bc101daa78021955979ede75b0f46c8275ae97444c3e2016f41e67f125f0d1358878eeea5e84791de6de27dda3c78d78c499c
+EBUILD libgcrypt-1.10.1-r2.ebuild 6085 BLAKE2B 2f8c35e36513b3570e700e1e4aff146db19c6ab676cb5f096d9cb4e74cfc1b0c251d7205cd4bee2846d84779d0f3870354c37e0446837908bd9384493369152a SHA512 bd0dcfe3e800586fe6c8005638eb5d12ce4067be9b0c510a487ef6a979a979eaf8ca7ea12be5617b40f1c1574bb7593cbcccd1caef0e301bc4b8fc6e671ff8b3
+EBUILD libgcrypt-1.10.1-r3.ebuild 6203 BLAKE2B 0e20ba31a1597783958fab3ce276923037cbb6f4c8df0a131125ee0732916019bd3ee417017381902cc939acd0fcff52f7fe4baed995abd339d659bfc57195c2 SHA512 8a8a1da203f1e883fdc3f6c32818e5f5ffa9297338ba9e92a827d31fb54d0bb3d8f8be9c66da1b2e2538ce5bf81b6f30ba183bec9159024c718f3cc92b2d3773
+EBUILD libgcrypt-1.10.2.ebuild 6109 BLAKE2B 5c742c3a437b69105e58d17dee72c2476cabccb50c93cc5ba7542f1da7af368a5acf50e1b8883fd0f7b95958471497c759925adce40f0a5be0bb6c3bf1141edd SHA512 abfadb41f96fb96050fc8b4f0e07ce6aa77d6f2e61480af4393fbdd34d057ff71fa9a8310582e307c813d57eacf4c1cca0a7f179086b83298513dfe1523d7349
+EBUILD libgcrypt-1.9.4-r2.ebuild 5143 BLAKE2B 435c2483850c24b4c3a7b1c6dc40c49bdef566fe71601fca7f2dffa34e78460ddb3a78a45314c7e5cc6dd08d954fca29ba0e16da41dc6c4350a44979617830b6 SHA512 4739413d105cf749f9d25329a5b514c9c2bb2e29468390808e39a7ca99c2efa07ee669d6b2a3d7ba9c669203699d57cc4e029319764ee250368181a19f62df55
 MISC metadata.xml 510 BLAKE2B 1c3a524d74fb388a17465acdeb777872600347779635e33b8f235b59a464690cfd2ecd690b8fc0080600f1180e98255fe367dbb0dab70d04bf546ad7839de72a SHA512 2d1f11194b5ee566ed7a787fa7e40ee2e14511e9f94467ea84b4b3a8395a908c0f95044bda0714dc7426f47d81b0ff977d15654bd06316cfd4a00424242ae900
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
index b752d7b56eea..7892cef502ef 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r2.ebuild
@@ -135,8 +135,6 @@ multilib_src_configure() {
 
 		# http://trac.videolan.org/vlc/ticket/620
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
index cea35705769e..f8f07b438b81 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild
@@ -138,8 +138,6 @@ multilib_src_configure() {
 
 		# http://trac.videolan.org/vlc/ticket/620
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
index 4d7ad06552cb..c9e12df8e4bb 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild
@@ -136,8 +136,6 @@ multilib_src_configure() {
 
 		# http://trac.videolan.org/vlc/ticket/620
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
index af2c8526ecb5..fcff947f59c6 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.9.4-r2.ebuild
@@ -108,8 +108,6 @@ multilib_src_configure() {
 
 		# http://trac.videolan.org/vlc/ticket/620
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
-		# causes bus-errors on sparc64-solaris
-		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
 
 		$(use asm || echo "--disable-asm")
 
diff --git a/dev-libs/libmcrypt/Manifest b/dev-libs/libmcrypt/Manifest
index b2635b8b502f..7ff627317406 100644
--- a/dev-libs/libmcrypt/Manifest
+++ b/dev-libs/libmcrypt/Manifest
@@ -4,6 +4,6 @@ AUX libmcrypt-2.5.8-prototypes.patch 1435 BLAKE2B 6b4e85df1432e7766d5e678595b08b
 AUX libmcrypt-2.5.8-rotate-mask.patch 1060 BLAKE2B 1bce08c2fee92ddb2038b6de67d8ccc1c2d630506f4298926edf44147dcf9596d636204fb1d009f4affb00a1e84c503b162a41b5b02d5596996a8a1768ea2d96 SHA512 975d75e7b41ba18012a09ebf0bddec794ab8597d2515995ec55498437f237d8de917a2766e31da32e92ddbd40de6fe9ca78814eb55ff68da746037e064aaede8
 AUX libmcrypt-2.5.8-uninitialized.patch 624 BLAKE2B d6c55091d0c159b5b04fb7cb68a239e45020de177271da7ac6b15c20f6d791399f5fb9c48970e66e6f43168408ce83c347fc8c1387308fee9d273726f268ed91 SHA512 d5bf3520f101a5edae1e165358c075be763ec1a76d721301b562476fe6495f4cfb0b991c71c24fe182885bf86903ef796b934fd9f5b2f026ad8a433579d70791
 DIST libmcrypt-2.5.8.tar.gz 1335178 BLAKE2B caa970107382c1485267e68feebebe3ed1e2981d879b2bfaaa37f296528b77bf5e57e73e380f5ab02a1212fae1be5caeb376142920353fabdd8600746634780e SHA512 471a4e0dcbede836c975697a4edd5c3a53d555dde122a045d702e619d7e9768c7abc1ab541c79829f644b70241ac2e0cd274cf22499e47862983401566ca1fd1
-EBUILD libmcrypt-2.5.8-r4.ebuild 964 BLAKE2B c14e7ce7b7bbaf0080631687a18913f8243ad05d35f7bdf597226b14591af686d2d77a30c9bb6ecc91c136abeeec3551d4993b23acfdaaf62ddff112a3c42ad0 SHA512 c280a59caa86627e693be089fa9e66593efc98d2456ea55717a36c9490f583367c81c64e4a4e8bea4cf22574cf05668b673b78bac9477f00980340186c8f513c
-EBUILD libmcrypt-2.5.8-r6.ebuild 1253 BLAKE2B 4549e647240bd9de81a6a3e64ce70128e51594a61e4615f8cc0d11efe0d0891da384cf0fd44a5abe82c7910bed04271c77231bb7b09946e75409ade840c7d596 SHA512 bc07c2d3bac6395ce57ac7effccb2661776cee013e33bbbc8a583259238ab63e2b07b86f0cb5d264efbfbc210fc0f80dd57dce9513c5a64c54a89ac3cc4d03a1
+EBUILD libmcrypt-2.5.8-r4.ebuild 918 BLAKE2B 1a6e3419f27e0bfe0bfc8f3cbfabd53b802d0069efc90293012b6fb331a611d0e877284273f2e26dd8e10358a369f10042f6c6080a6466c5b90fe525f55b4b93 SHA512 fc16b72db54973d4b74b58b3cf9cfd3719131a0e4baf749b94dd9cc2e090e1d011e6793b28469716e18c5a2d8d257cada2dac8f971a0e38cdc878969f3cf3c5b
+EBUILD libmcrypt-2.5.8-r6.ebuild 1207 BLAKE2B 5396daf57c3f6b226346c0eb183e3d5a4e4873a1156b11af94f99d43e66b0ae27f42c22409e8bdd3682a66d82812832b75ab869eee013138b6f0c61c756e86fe SHA512 d8210a585f575a6093092d1a2699435603bc2b2146859578f435633d017527e55bd574f51c2fa814fb420fa9937251667b31c3863d42715040fb8b0c96306aff
 MISC metadata.xml 249 BLAKE2B d6e11cf35a40f525ea7e1f78e0eb43ebde085e8f3a9ee2bd869a5acb43040d3490b84f7b916e5580163b217ca8e36910016199223a0d7f958d8d32e77fd6c92f SHA512 3976fd063b92b20de47f9a45410cf467b778d186a58eb13cd1dd6f46bbbd4fa1d0b8665e0a37f07e0f6b7a44343594d95bfa616c384be151982f0342ecdda7f3
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
index 83fb5dd272cd..e7a928f6bc34 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,5 +29,5 @@ src_prepare() {
 	mv configure.in configure.ac
 	mv libltdl/configure.in libltdl/configure.ac
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
-	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+	eautoreconf # update stale autotools
 }
diff --git a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
index 599538aee266..040220a1d88a 100644
--- a/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
+++ b/dev-libs/libmcrypt/libmcrypt-2.5.8-r6.ebuild
@@ -33,7 +33,7 @@ src_prepare() {
 	mv configure.in configure.ac
 	mv libltdl/configure.in libltdl/configure.ac
 	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac libltdl/configure.ac || die
-	eautoreconf # need new libtool for interix (elibtoolize would suffice for freebsd)
+	eautoreconf # update stale autotools
 }
 
 src_install() {
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index e620c198e8e3..5d500723f83b 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,5 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
 DIST mpc-1.3.1.tar.gz 773573 BLAKE2B 76434e6f8830af3571836d51576bfebbc9701e9bbb5c4686f134081cd96cd90ae02f7ff42bf9e3957c7a7ba92b6b2d9cdabe18f0269271147521cd7f6a2d551c SHA512 4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97
 EBUILD mpc-1.2.1.ebuild 895 BLAKE2B 25be0fbb65d92b455e69b684eff2f4673cc6ac05e914b75452203e81bee353cc5ad5d744c3b2b8c87b420b4ab5412ec50a2705c14dd1adedd4723215a4a9840b SHA512 1265aa1f9dba25e9a27dd64d1213178824ebfbd0d74907da13c99b2e383a4edf1ed081fd01ec58d94721e90e15230fa9fd834a6e2084de7571fc295be52fef88
-EBUILD mpc-1.3.1.ebuild 1406 BLAKE2B 4b968d88ce0d29911063f012becfa8558c5466fb82c32f57a6d2dbe75593bc29cddf1e43fa6c6e907bda260b92e98ca8e89707e5a2534324dad6a4e24536fb01 SHA512 1c1083f39d9b55edcc940bb632dbd354b8c74521d1093d39fa0a4fd9bdb8913ec102436e2ae3058a041894d7939afa194a63fe8031ffab21f80249176cecedc5
+EBUILD mpc-1.3.1.ebuild 1349 BLAKE2B 3a83bbe4f9d56f1a3581cd32b429aa392b0c3309c9731c61ad47c040f69016e4e7d88582b51126942445baa8b5eb0b9ce4efdc9401ac3fd6c2bb1570cf72584d SHA512 c2cf21acf956cadd76b78f442e56558f52e8bf40c536291d46370d2b2c05233a99c200d2887d5f6986d3b89f5d5a53cc90fe27e7ad839ba12c2a0e9d9594460f
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.3.1.ebuild b/dev-libs/mpc/mpc-1.3.1.ebuild
index d1899da8d3dd..9fac63aa632d 100644
--- a/dev-libs/mpc/mpc-1.3.1.ebuild
+++ b/dev-libs/mpc/mpc-1.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *_rc* ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 8136eb7d06c1..10b5b3c56d4b 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -25,7 +25,7 @@ DIST openssl-3.1.0.tar.gz 15525381 BLAKE2B 9212a7fb13f6dee7746721ee406af56ae1b48
 DIST openssl-3.1.0.tar.gz.asc 488 BLAKE2B f4a844e3db2c2bdf42b6f811d16cc2077cacf713d20474d94e2d0180a6f97eadf4f03522e9fed478d263d680d88091dc2bc48e7ebb15d049bc57ee7ed64c7fbb SHA512 8d542e6471b745822d6cd889c5b168841b4366ee9a96edc2ab5b44fa1bd1b75308422aed312f1bd6e6a3c3e306eceaa95ce9bb4d0aa3e8ff86cb0fd92a7e61ea
 EBUILD openssl-1.0.2u-r1.ebuild 9993 BLAKE2B 2128588b25f90830c4b9120a0e5aa079b127c28aaa590a65900d735999ce777bd8a5f04de75ba476cf5062f3d862021654a2e41a800a0f06359aaa9947269d5b SHA512 e37897b8262f7365aa6484252cbd6b56567552ec90fb299518479cb91f9b88490324c426716cc2ae4facb8d479753d8dacce56a6676adb3afd66558ce693543a
 EBUILD openssl-1.1.1t-r1.ebuild 7919 BLAKE2B 2cdf1786b0ec0f7efcb74e8636e2ca37a0e26cebe5db07914791ce9e612dca1ea5cb6f4a53f2c26936b0aff1141c264d328211af412e28be1a8e896de4af6e21 SHA512 364e2eab610cf6f57591956c5d52618fc103e24a55e5d0d1e73c691fffe4a4dae5189045cc892a703efccb0e981124d41e0822347f41934cf7674cf56e12145f
-EBUILD openssl-1.1.1t-r3.ebuild 8430 BLAKE2B 670a2726a6c9c5e827754ec4fbbafea4c6f4da49b99dd5787ad20f1060461bee0e80c15504ccb4be894ef206f90fe268e26935ba42ce2c21f5076c96a733b42d SHA512 eaabf62a76e9c332255ef8fa44be970b799c01f3d3e2e923f23a98effef838bb21511eb9bb49c5ab65dd1d7b11a6e08954f82cc3a0ead7adac3b7d9c376610fc
+EBUILD openssl-1.1.1t-r3.ebuild 8240 BLAKE2B 39fca6bb87a1e9ec112518fa01a2ce871daa44ff6536708ef03906dde1eadd8f53d480c69f3a6bcacbf541affeb9af3cc6719e94479c93d50c8fb2dcb565c40f SHA512 f793d361cb98ea89706ec4bd0442e30671f623efb815a846557f7ba514d25bede9ed8f7a7b62c5400ea2a8674de3659bbe276dd1138748116d9d651dd755308b
 EBUILD openssl-3.0.8-r4.ebuild 8359 BLAKE2B bf0308b0c9a37d8cba6437cad2de049cb48482e856fc810a8cd195324561c883f31bdd3978c85e79cd08ff8dadc101946ecd020365fe4bdaa27e7131d2b91857 SHA512 92caeadf8e63479ca5a6789ac3bfdfd34359855e958644d341f4ec32ee027cd3000c938bf81d706a3ec00386e138ec2c88d1e8a98c6df3e47c2b4f0656c5ba15
 EBUILD openssl-3.1.0-r3.ebuild 8393 BLAKE2B 5a0b57a5272298a9d81c2f01a39e7a8cb429d4795bdc8b348c6112677085c15c14f3c7b52d55f0282b464dc60cff401d510dfad0178527eefe3fa8419ea54d46 SHA512 09d8a0db1d941bf1d20d0cf89509b1d827155089bbd4ca4d8bcf03a597c6959ecbe7a3c554bb33503588b323b28a199be908e231966241c565278a190df10f39
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
index d2ce01e6de8b..36d0d673d156 100644
--- a/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1t-r3.ebuild
@@ -111,12 +111,6 @@ src_prepare() {
 			-e 's/-Wl,-M,/-Wl,--version-script=/' \
 			-e 's/-Wl,-h,/-Wl,--soname=/' \
 			Configurations/10-main.conf || die
-
-		# fix building on Solaris 10
-		# https://github.com/openssl/openssl/issues/6333
-		sed -i \
-			-e 's/-lsocket -lnsl -ldl/-lsocket -lnsl -ldl -lrt/' \
-			Configurations/10-main.conf || die
 	fi
 
 	# The config script does stupid stuff to prompt the user.  Kill it.
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index e8b129fc2be1..3d6f0aa240ba 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,5 +1,5 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
-EBUILD xerces-c-3.2.4.ebuild 2810 BLAKE2B ecfee6948c03007ba9e0257e54e781265a3e02a9d12b22bb85e1b57af8fa0a9d54ca3459a599b96253e9120ad791a300e45fe9e24b9f0be2218d0589a6372992 SHA512 937c2f8df46d8e7089af70dba8bd3f9b745d3f75aa5a0b4b39d617a0063be0f7f1ae39da4678b53bfb05a29641aa03ce49a838d153ea99cd10196df76fc4ea22
-EBUILD xerces-c-9999.ebuild 2817 BLAKE2B d55076252e84b3b273e4997f740ca0845043cd44c6a5c1cc47cf991f3c8fb115d65892a1d3ccfd8e30fc04f267b85894a7b2df16072ddab360a0d92da7c4df3c SHA512 1d163062122cab95d114561d68e40e3385a14c0a13fc17fa1675b39c501bfcd754aafc23bd7991f0e7e6503ec2f6b6e28692cae37b3df23c8db884e397bf7776
+EBUILD xerces-c-3.2.4.ebuild 2767 BLAKE2B 30de0974c3e594e7c7e4da25a679d8f11a681a52d5d46fdfcb970c64cd18fce4406d1e7fe6e0f54ca6b975fe6fc4a1c6dd63b0fbe7181da1f7cb951f0ae2aa1c SHA512 831efcdfd284e40b46a42aa1fcab470183fcac1db9bcbf70836289939f04d5fd2e49380bd1e380f104a059a9a26b5223a0569ab48fdd6285dd85ba6eda09dcea
+EBUILD xerces-c-9999.ebuild 2774 BLAKE2B 24ba776119a45cde34513f7c50960670a2b3d68fd347bc55e18a77aeb281b7b60f1f6c901636783d32bf7b5a2e2343c5acd060acccf087e647de1b00768c3cf6 SHA512 a527bafc30dc2448f6e084590165bcc54a0f8ee9d8002e4958db2cf0c84ef481a46c4c91d5aa33956c1b2713f560b38aa15ae3883e469ee08a97219f9cc84ed2
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
index dd3b781f5317..f1046bbeb48f 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.4.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 	else
 		transcoder="gnuiconv"
 	fi
-	# for interix maybe: transcoder="windows"
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index d839bf7df2ca..0fdc2749c78a 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 	else
 		transcoder="gnuiconv"
 	fi
-	# for interix maybe: transcoder="windows"
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"