commit:     f9c5367182a692635590f1765aa3a0cd65e4fe02
Author:     Brett A C Sheffield <bacs <AT> librecast <DOT> net>
AuthorDate: Wed Mar 11 15:26:13 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 16:35:05 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9c53671

dev-libs/libsodium: drop 1.0.20, 1.0.20_p20250606, 1.0.21

Bug: https://bugs.gentoo.org/968296
Signed-off-by: Brett A C Sheffield <bacs <AT> librecast.net>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/296
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libsodium/Manifest                        |  6 --
 dev-libs/libsodium/libsodium-1.0.20.ebuild         | 76 ----------------------
 .../libsodium/libsodium-1.0.20_p20250606.ebuild    | 76 ----------------------
 dev-libs/libsodium/libsodium-1.0.21.ebuild         | 76 ----------------------
 4 files changed, 234 deletions(-)

diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index cd3dcba60bf4..a1b6ec018b4b 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,8 +1,2 @@
-DIST libsodium-1.0.20.tar.gz 1925167 BLAKE2B 
2f1d8b2dc8a65f95433132b12bdccb7e0e4750326b05c4f42ddd3a74bf568faa2515384bfe94bba2ef420aff35c515d3d44945ea5a68f72e6a73b3a9b5bb234c
 SHA512 
7ea165f3c1b1609790e30a16348b9dfdc5731302da00c07c65e125c8ab115c75419a5631876973600f8a4b560ca2c8267001770b68f2eb3eebc9ba095d312702
-DIST libsodium-1.0.20.tar.gz.minisig 318 BLAKE2B 
b5939a9ca9b25332c39484b3ef02ced54aa75b2dc732d384d4f42daa0b6bd276f0c3359a8cbe8c97d8ab76b8c49e9f66959dcf350e3cf00fae10a279826109ae
 SHA512 
fc5a4282093d58eb42559f88ccf75ea3788449afda9d882d313714e448e78ef11c22ff1e52091af026f6bf3ba01917d606040b1dca240dd1a32278c901b4affb
-DIST libsodium-1.0.20_p20250606.tar.gz 1987810 BLAKE2B 
d423f516312fa1108b7e49b9c69d49abc3ebb2db5e6d81698e08ded33a2f11079738d261be7e8bd5ff87080cb6e225ee7c32d9ebf2bf8cc840c4e04454621987
 SHA512 
afe584c735e439202f6168032800b30afed9b15cf24305043a8fcb9356ba812f3f13e08e8d99ba2da4711da2390d2d7d6c2598285ac3dc1056d48588ba743c76
-DIST libsodium-1.0.20_p20250606.tar.gz.minisig 318 BLAKE2B 
131ed9064a414e2f7dd7a2509c367eceed2784e47a903262e4c037d27ca5809e343943e26a5e87eb9a00be122393acc920861797ac303ab7bf005a74a1bf02a0
 SHA512 
cafcdcc2de7e34a57f9bd8ae526ed22b3310467e89a51d68035feb298bfff30e6d2ea9100973de18eb3abc11b70d0b05238a726afacbe621287cfac509503dcb
-DIST libsodium-1.0.21.tar.gz 2046164 BLAKE2B 
df68159bbf0b5198ab185e93857b4f07af1d4aa7ffd178b7cb78ff5b020b6ee93ab5c3e71f59812b79906ff4df19e42845435c2bc22bbe8b0a0804076b0ddd05
 SHA512 
ee8cc2f3f5707b172bf75d8c04afbd5f0c83c6f94dbab3f988f07aab716d96f1662556a59e09b3d83c3bd5c22f59327ad95937bf499d523c86146f4df830f777
-DIST libsodium-1.0.21.tar.gz.minisig 318 BLAKE2B 
3ce78469d01575e7ffbcd52c078a50e894b7dbdc631a8d44adf70df6d8f81adaabed8cea7c3d8ebdcfc768932713de02a4026c64068f212efd524e3f07f2503e
 SHA512 
5d6df371692c0d13f7ea82b4d15df7b24c445eb66dcf9fb528e9b055270e7ad5d27d60193cde9cf0182789694972b9d620844d55547df3d45f3da3dfd17aa46b
 DIST libsodium-1.0.21_p20260122.tar.gz 2049837 BLAKE2B 
e55ffacb5355935980faac65cd21c1677f5904e20b9b752959bbbf08738b2ef677ffc341a67f866625167688b2a3488a24e11adc78f565b79684e8b1b0628e88
 SHA512 
8e65aae18a26fc7e7dc7fee7c078b5964a094de0d4fb01d571366ffa4c57d1fab6391b8e5a6fd8a22450c6ad57060f7ad7760f5caa215ded49579af71fa8fc9b
 DIST libsodium-1.0.21_p20260122.tar.gz.minisig 318 BLAKE2B 
0cb95f535f0da4345652aac7e7a36a23923c1fb925de25ed087cbe1a7f0b62be611201a947c0c360515d0e2a5f93e76aff6feff5df78dfd0e5ae659bb71feab5
 SHA512 
73c0d6ab4816eb10c731517d95405e817a12aa716173fee874d10fb9e843cad4aa921ddeef4b3d69c26a3ec0e1a9f0695416a2a5c542638c31292a49231ff14e

diff --git a/dev-libs/libsodium/libsodium-1.0.20.ebuild 
b/dev-libs/libsodium/libsodium-1.0.20.ebuild
deleted file mode 100644
index dfcb5914b7a2..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.20.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2025 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 )
-       "
-       S="${WORKDIR}"/${PN}-stable
-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
-
-LICENSE="ISC"
-SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       _rdrand64_step # depends on target, bug #924154
-)
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.0.19-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
-}

diff --git a/dev-libs/libsodium/libsodium-1.0.20_p20250606.ebuild 
b/dev-libs/libsodium/libsodium-1.0.20_p20250606.ebuild
deleted file mode 100644
index dfcb5914b7a2..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.20_p20250606.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2025 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 )
-       "
-       S="${WORKDIR}"/${PN}-stable
-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
-
-LICENSE="ISC"
-SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       _rdrand64_step # depends on target, bug #924154
-)
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.0.19-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
-}

diff --git a/dev-libs/libsodium/libsodium-1.0.21.ebuild 
b/dev-libs/libsodium/libsodium-1.0.21.ebuild
deleted file mode 100644
index b89d904af657..000000000000
--- a/dev-libs/libsodium/libsodium-1.0.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2026 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 )
-       "
-       S="${WORKDIR}"/${PN}-stable
-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
-
-LICENSE="ISC"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 )"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-       _rdrand64_step # depends on target, bug #924154
-)
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-1.0.19-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
-}

Reply via email to