gentoo auto-resync : 31:08:2022 - 04:49:49

2 files changed, 97 insertions, 0 deletions

diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 6c7b024bf48a..454ff24e038f 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -3,6 +3,9 @@ DIST libsodium-1.0.18.tar.gz 1919817 BLAKE2B a42d898fe77f232dcbb75728e776b88f006
 DIST libsodium-1.0.18.tar.gz.sig 566 BLAKE2B bb892901e2228c93018d79a5c8e70e0ea458513b0fdf99e8f6c015132b618fd0fefbe6a18ed514c20fbe1e56719dd6dd3762bc4bb6348a439146fdaa951090c0 SHA512 ba69d372263e63126d6ce24f67fe85d83f74e558db81391ddcd7eacb6787dcdd5209a149eebca897e9806f295e78f5a8ababa0ab884b85d9a8dd1a54507a8b0c
 DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a04719d708c217bc6f0b344f08d566bde85c4f758862c0ad61924346eac508542c2d9c6313cb1e3e421743e424f396dd1972e8195 SHA512 d7cd64101fed11ce33c4865dec253f1058acab376c3a6097422508087f4449b2f7fd1b38835915843106f620bf86694d846695e0c8a35f921e4f190dea3164bc
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
+DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e03c31768a2183bae80a535234b23ac5bc9a2c3632d6c891ce72cbc1d6dc633a15b539111e322c2d210f993f99d6e5bd32f8a8b63 SHA512 14d1c6109de2ac02ba6cb5541746275f6deb25302b60cb3f65a7922b34d2c3bd5f17a4d730acf77a53d5837be00228c68fa06c6a2e9095ea97f6d8c4b782ab6b
+DIST libsodium-1.0.18_p20220618.tar.gz.minisig 318 BLAKE2B a2cba3c62ca5a84e7897373cdfe4033c636c652c848bf9beff15765d359f1dd2a8834dc3a4d4443d0b9418a59a94309cf9c5c917ae9c8965778411e21f98e4e6 SHA512 ca1ac892b41c5cb6dd1ba9d4bbde8e75987e66023d29cfc81839bbb3b99efa215f7db1ef903c375dd9d2d5a76f6064b3c7eab833081d21983693b7db87175160
 EBUILD libsodium-1.0.18.ebuild 1563 BLAKE2B 436396cc79b476ac4ae42efcb9f5d41edde6544a57062b7ae11bc0a3796194a92ba0e463ae51219641cb3e599b38c300c1837c3215a79fbcb856fff8100e7e93 SHA512 0f0474831c5f0a315562e992942dc7c62e5527fbcdd760a60c1c8419e1a083cdde0faf6082fb9a519411de7c372e75eb5233830d61d99a5986be3c20ddb594cb
 EBUILD libsodium-1.0.18_p20210617.ebuild 2525 BLAKE2B 5a7ec4a44f5bb82dbbac1ad5b0c1ac2525922a41997a510d72f56434854dfe7b0246f64a5504181d78c1079d58d619f691644f249fb8ac4b9566b56f53051c3e SHA512 59e898b12d7b0eff6499fa21e830112a80713db65abeec3f985af6d9bce969ec4c12e8d7a214d7f95201fc88f4f180c6a556582a69896c056179d57e9c9f45de
+EBUILD libsodium-1.0.18_p20220618.ebuild 2523 BLAKE2B f9068d8d43d91576a54f8ed11cb5c13223ad4a7734fbd72cb268a2018c7d715be37beefaf316ded951bd784fe15482703a3794f1e64c049c23cdbe4310b24df4 SHA512 8c80cce37bd205dd6bb55cb489e9c9d544db3ef242c170636bcdada5a19d61c56edef0f840c5e9508595941f9764185e7e1afb9722a80c6339df9cd6ebfc52f3
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
new file mode 100644
index 000000000000..cc921b7865b0
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="A 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-)
+	MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
+
+	# 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"
+
+	# TODO: Could verify-sig.eclass support minisig? bug #783066
+	SRC_URI+=" 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
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jedisct1.asc
+	inherit verify-sig
+
+	SRC_URI="https://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://download.libsodium.org/${PN}/releases/${P}.tar.gz.sig )"
+fi
+
+LICENSE="ISC"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+asm minimal static-libs +urandom"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+IUSE+=" ${CPU_USE[@]}"
+
+if [[ ${PV} == *_p* ]] ; then
+	IUSE+=" verify-sig"
+	BDEPEND+=" verify-sig? ( app-crypt/minisign )"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *_p* ]] ; then
+		if use verify-sig ; then
+			ebegin "Verifying signature using app-crypt/minisign"
+			minisign -V \
+				-P ${MINISIGN_KEY} \
+				-x "${DISTDIR}"/${P}.tar.gz.minisig \
+				-m "${DISTDIR}"/${P}.tar.gz
+			eend $? || die "Failed to verify distfile using minisign!"
+		fi
+
+		default
+	else
+		verify-sig_src_unpack
+	fi
+}
+
+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 minimal)
+		$(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
+}