8 files changed, 88 insertions, 8 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index abe853d4d041..257ebc1eefa6 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 75ab0ff79032..2d93cadaf669 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -6,7 +6,7 @@ DIST ell-0.60.tar.xz 565856 BLAKE2B a77ab4a26af154734f5258ad4a16ae97645f4cafc5b9
 DIST ell-0.61.tar.xz 565920 BLAKE2B 994a5b8b7eaffcf2274e1d020f54ce3f829a50de352a79744de156b59cb9f5b8db39adc53ab6f5728abd501a13815e58eac1c3359024bb22cd28e248a4b8f289 SHA512 0e57125a924ab4772c3c7ccf97040e416810bccd05ce8f0cb4525a4483f32eabc0f431fac3fff7afdc8bb0e145611b944e1f7fa8d10e6337fc7f97f190d9b0f8
 EBUILD ell-0.56.ebuild 1205 BLAKE2B c84eb4db4f7b0ba802f14f6929b412ab635f89a6116630fd28b7b6b8c7b22153e788e7eaea9bdec76c8a3f0e6bcad1b8d4e69bd11a5c1e1c66dc6dfc6c01bf40 SHA512 8267cd412c87a5dfa5955d6faf7df69049d397c45e001d54c16f4bd04eb7fa5bbec6a970222d6b56fbacb3a1c52d96fd4db3c24f863ceca81e8165fd481a72fa
 EBUILD ell-0.57.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
-EBUILD ell-0.58.ebuild 1208 BLAKE2B 12a901449dda3e1344257a24882a335750c97f72f557c0d133f92beb0ccd6618ec8bee51a900b9dc25a82fb177851865e3cb555be538715db23780a11dfdb553 SHA512 aecde2627c85828ec06374cc88ab6ced91a00f09385ce894d65de3e3abe3ea00d82356bf9041ea531560ed7f6f0af991f6c5127433e5a112e30d2db453a60595
+EBUILD ell-0.58.ebuild 1207 BLAKE2B 0f2527571f80df7f2681eb7a90328381810ea4c243837446b718217046d4652c4f61106cdeffb448836545d8033d4766090da29cdf34f4f926b8d12e75e14531 SHA512 ee3743d8695c2e087c604ff86e0cc9aea0a912020631132dbb3a859dfcedb87677ae03494c735f261535d98f902825d285a1ce94e1508722fa33f834f6c0a0a2
 EBUILD ell-0.59.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
 EBUILD ell-0.60.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
 EBUILD ell-0.61.ebuild 1211 BLAKE2B af4d68aeab21ca440793e13fde095665abf991c388dfbb3c1c9bbcec4f62816a9b00c334cdf61deeb570355d464bd6d4d64fabb76918b4dd8bbaa2f067cda9c3 SHA512 e298d3c78a250ff8b057b158e11662d3bd1d3a9945befe0fbb71068597e2b7a98226345c00708949cce1b06a5bb52fcf45466d89d12fa8812c47cfb43a301f39
diff --git a/dev-libs/ell/ell-0.58.ebuild b/dev-libs/ell/ell-0.58.ebuild
index 2fc732856b0d..2fd26260aa95 100644
--- a/dev-libs/ell/ell-0.58.ebuild
+++ b/dev-libs/ell/ell-0.58.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
@@ -12,7 +12,7 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 3f5dc2331279..2a5e5d25b3f8 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -1,5 +1,5 @@
 DIST libatomic_ops-7.8.0.tar.gz 526300 BLAKE2B 3b2545c8eac8d1fcc75f5431a3f1ce1f3976c6a3e0af94779b90c9f36f0b833c66e74e596072901fbb49465d6d2b24ecf4d232c91bdc3dddc51df042ee69f49e SHA512 b0d2b3c6f8672d599e05087688e7793a3c648c1728f48b27bffecc95b70afd5921ed36ec016985b2e22b82de7b7013bf5ebbb8b434a736d3fd680310b7af903d
 DIST libatomic_ops-7.8.2.tar.gz 524637 BLAKE2B 1faaedc52106b9d240085beb364a257de28ba5dba4141d2b6a7660a93c59ed7b4e1371ea4a8212b32a11805a15992c7b5ba4e748b2d194e8cc06fe20d91d5e14 SHA512 0559087c99b941990f189ea4ed5b3b371faf086bc1d517da6b878ba609c200eef24358768fd4361900101cdb474e28cea8408eb0b0222d23ef3154ce77f6acc0
 EBUILD libatomic_ops-7.8.0.ebuild 720 BLAKE2B ab0f7db6f90d5dfc5bc476da6693c7dd62b00581008368d72ce1ce2408d4c1588463d2513931b3f0fcce5a98acb70abdb782a7129780de752036a5971f865745 SHA512 9ef9838507e5b16849f8519eec27701bd076e81549380d536e6b49e9ec83ebfd7a1c2445335338fe1d6d02ffa7ef8634f5f97344b089aa77f8a55426b926d5d9
-EBUILD libatomic_ops-7.8.2.ebuild 722 BLAKE2B 8825bb716d00fd0f870a98b9fea3bb03e21eada261f2a2e12373e0509a0b64720f9249212f229ed76faf0f8ed2fdc3a913194449853c7948066e589c15b94ae1 SHA512 524a20c04da00192b4963dfe1517aceffcd1aeb73b22a1adde707635e5edb8f6219709707427d872e70020d874c63a793b48d9b16b469c77f71a7386f41d1d7f
+EBUILD libatomic_ops-7.8.2.ebuild 805 BLAKE2B 10834e7bbf7b3eb930e78e9e31a11b9cdcbcd2bf479098ce5ff57d9732b8cecedcaeacd76559534d7b5ee104edce0d2be9530d7974cf811b19e3da20cf92d746 SHA512 0f16b6d636c1c78b2eb984261aa173327827701e71166ff11c27c77f8bd2f277321237d50b7d3b317f4251b5b1029f92adad9a187d8e49f1a0ce69b4034ab9e9
 MISC metadata.xml 476 BLAKE2B ebb64fe1d7008e89803b62789927ba37fcbafddb2758c0dbd26590335466cc3e35515e1a00cb3331db03041ca28354641b9fc3f37d29a4cc8bfb53507bb3d81c SHA512 28c2f2d8c5abcf72abd825be52584ca2c9e08674caddd28333e90ebfd3bae4f8d52100f2b887efdb0ccf6eff6314dcbf99282589db0c6dca7dd9a91dd5a0d066
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.8.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.8.2.ebuild
index c392bf74486f..4c114e27bccd 100644
--- a/dev-libs/libatomic_ops/libatomic_ops-7.8.2.ebuild
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal
+inherit libtool multilib-minimal
 
 DESCRIPTION="Implementation for atomic memory update operations"
 HOMEPAGE="https://github.com/ivmai/libatomic_ops"
@@ -14,6 +14,12 @@ LICENSE="MIT boehm-gc GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 
+src_prepare() {
+	default
+	# ensure LTO patches are applied
+	elibtoolize
+}
+
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf --enable-shared
 }
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 62878c4cc79b..68aeb20d2c20 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -4,5 +4,6 @@ DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e78973
 DIST libsodium-1.0.19.tar.gz 1945523 BLAKE2B de43520150b55760142d186404cc3e49471c6e911a7a590c7ae08bc61e928c063c459555f49cd88155238fb0008ef3924b6d7c14ba9cff2f90f1e96201e1259c SHA512 8e9b6d796f6330e00921ce37f1b43545966094250938626ae227deef5fd1279f2fc18b5cd55e23484732a27df4d919cf0d2f07b9c2f1aa0c0ef689e668b0d439
 DIST libsodium-1.0.19.tar.gz.minisig 318 BLAKE2B e86e653107478d9e9281894632baafda57358229f2d56fcaf55591098e38d6be72ed2f599a7f2c16d5b9978d2cbfe8e07db4e772b053a832a61fd325fc1efae4 SHA512 8b5993bd7e541a5913ea1659c1009c4edefd9b5907e0a7c9090fa604c23d77006ad9d9a897d66243162742d63ce9bc1f2c81091d50a584f1495dd3bd87d4451e
 EBUILD libsodium-1.0.18_p20220618.ebuild 1998 BLAKE2B c0971b1d0f9e13ee2365093c311cd6a7186de26a557461b66111a8e9f75691e8ce4318a285074cd873d3e122b15be2f646bd341b261220f94e0fe170ddc21b0b SHA512 1c0e04a0540c2bb0fc9e6f141c370c28a5c20e086f32cf5548cb6d73937ab2bcc4305d973d248b476a4c932b8450f4462e25185c1f82cefa6aff091abd538221
-EBUILD libsodium-1.0.19-r1.ebuild 2000 BLAKE2B 518ec9b3250ea88a48242c449b70716cf4ba5713ffe66d58a334011597f22842cb0a361c3abdf04e490d8e245b08664c3d60c5f84b054232b8a24f67ffb083db SHA512 4596db3c5b76181c4fd90f7d923bf2099bd1652a3f1e7154f81ab9c78ebee19481ea24a5f1f58f6ffb2958c348275681ccb22519e9b90d06eee3006f74702cc9
+EBUILD libsodium-1.0.19-r1.ebuild 1998 BLAKE2B 50b3fc86c63c7721fd3a3d3bda38648fed17127558c34b6e08e3e025fb47550748aaffe614d8393833c6cc4d433079b854411ae0000029fb79fdeb2876744071 SHA512 165a6d4bfba97d9049af1f9a06160a7d92aec6bc7d23205d2ab1c860a17b3310d305cf8bc16919935503a4ee67ba3cffe347c374b0c1f842909a3b50826100a2
+EBUILD libsodium-1.0.19-r2.ebuild 1974 BLAKE2B 3814694f707d21f0fbc970b3fd2ac11e69ef4297571adcb7405210ca96a7ec73e37de64a12a761c17d8b17cb1adc6b18bfe0beb6e3c12c9fb7ca1cdf7938ce45 SHA512 2564b9ed2ab21e30b82439bea675960371e269a5148644bf8bc6da9735aca9376f34dcfcaf48ba6aee871d38d96df76e94e685a795f26b6e4c8f0ef301128813
 MISC metadata.xml 806 BLAKE2B 069f36bae588b263d664f00b50c9a0f4c2348b1a1f0ff2e5c5902217ccf14a81e648997fae2f789220d5b9fa5aef440a7c0526918a7d7f402870dd80067e3744 SHA512 1902268ec9dbb312b9740f9bc9b2df5e66f50dc066ba281b438fbf6d2b5317c589c587305c400c929c068af95c30918fde7a6324ab53b76503ef183aab034886
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
index 3a6f2d652245..575daa8a5059 100644
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.19-r1.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
@@ -31,7 +31,7 @@ S="${WORKDIR}"/${PN}-stable
 
 LICENSE="ISC"
 SLOT="0/26"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
new file mode 100644
index 000000000000..c3e685aae87f
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.19-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libsodium.minisig
+VERIFY_SIG_METHOD=minisig
+inherit autotools multilib-minimal verify-sig
+
+DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://libsodium.org"
+
+if [[ ${PV} == *_p* ]] ; then
+	MY_P=${PN}-$(ver_cut 1-3)-stable-$(ver_cut 5-)
+
+	# We use _pN to represent 'stable releases'
+	# These are backports from upstream to the last release branch
+	# See https://download.libsodium.org/libsodium/releases/README.html
+	SRC_URI="
+		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz
+		verify-sig? ( https://dev.gentoo.org/~sam/distfiles/dev-libs/libsodium/${MY_P}.tar.gz.minisig -> ${P}.tar.gz.minisig )
+	"
+else
+	SRC_URI="
+		https://download.libsodium.org/${PN}/releases/${P}.tar.gz
+		verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.minisig )
+	"
+fi
+
+S="${WORKDIR}"/${PN}-stable
+
+LICENSE="ISC"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+IUSE="+asm static-libs +urandom"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+IUSE+=" ${CPU_USE[@]}"
+
+BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable asm)
+		$(use_enable cpu_flags_x86_aes aesni)
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1)
+		$(use_enable static-libs static)
+		$(use_enable !urandom blocking-random)
+	)
+
+	# --disable-pie is needed on x86, see bug #512734
+	# TODO: Check if still needed?
+	if [[ ${ABI} == x86 ]] ; then
+		myeconfargs+=( --disable-pie )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}