gentoo auto-resync : 14:09:2023 - 10:46:43

5 files changed, 96 insertions, 5 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b99ef33be921..97de674eb62e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libmacaroons/Manifest b/dev-libs/libmacaroons/Manifest
index a2a72d46887b..d631b0a6f559 100644
--- a/dev-libs/libmacaroons/Manifest
+++ b/dev-libs/libmacaroons/Manifest
@@ -1,5 +1,5 @@
 AUX libmacaroons-0.3.0-json-c.patch 832 BLAKE2B dce0d7ef4be20972a1da7b218d7f66372e25b77d307cd18bc7d70a2893ae0fac8d97e3d71ea83882ce408b642244deb78a92a86035e81047dab07e4e3057e18c SHA512 c258effe1bd9eed548350a066352f358795de16a6dd04be32422874b602226f18114e91a51d803309433bb08d404ece9022dfe68c73de719264aa9665688b6f7
 AUX libmacaroons-0.3.0-no-python.patch 3435 BLAKE2B d1a437bf274db13a04dc73599bebb24c0e8d9d99ea2eec90edd8130a02ccd9efcb2a4c9900b0fa76c9920a6dbb183f8290166ad4de7a921530aec39dd4f2523d SHA512 216c127c1dd7030f42524b2850058f37e73b5ee10a1a19bb82ae032a321684cf77b97e816e1032fa96ec890361dda5256720a314063ffb91fcf7f58931fa75f0
 DIST libmacaroons-0.3.0.tar.gz 47762 BLAKE2B 69371bb69262a88c736121861d9b136fa444b912d2c3a5d603c5897c8af85e9f4af6a6733e35c126ea44c97cfdd1359e1f41ee97452fa7275850769f2134d825 SHA512 79ae2e515bd673949bc1338f06f5f811a0e853ca61ff995bb4cddaf95e5297e77b012c9975b0bb0dba96520b9a24619a4593e3722e64610f1147e131f8c96de0
-EBUILD libmacaroons-0.3.0-r1.ebuild 776 BLAKE2B 71efa358508ca0a3195ac48e4c2ef85144396fedda1aa5553589d437f02378637fde8d79535af9c264044f9957c258686b87536c5baf057c67bad9b57de4401f SHA512 5e2d826ebc923f5298e09ce8503208f84f28434b91ff7f9db5e62b1dabee59a71a6cd48cb151dad567285a542baddb111c99fbb270a7f1426e144bf7d760e797
+EBUILD libmacaroons-0.3.0-r2.ebuild 778 BLAKE2B 96961c31819027b4bc6f4374590b286fd9e485f09425186b516fd32fb621c197fd2aa9159e598ca485ffb38bfc3e04c102491b0d10016b856c772a33ade6fa8a SHA512 6d5252676d9ee13137a053ead865f008ca75a3010c47e5c251a956fd761f68a98a7e456099d2f4dbf84264b907e9972b3254ebd676283df9628b17d60fffab01
 MISC metadata.xml 664 BLAKE2B 94ec73791cac9442622243a129d918336340e74768e7c7342cfed73227236fb3a05ad3051b2d76c0daeac5928d3b7a87ddf3b43bdb856ed069609ab3ae0a9129 SHA512 4ddd1a7e9981d50de6737734d7f0708450c4f36949bc3ec43c5c3b0b7da56b2e3f40d3e15edd489f347ad7599d232549904268e8b4a87ff9f4826d948ca1c295
diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0-r2.ebuild
index 71fbf928561c..ba3c057214a9 100644
--- a/dev-libs/libmacaroons/libmacaroons-0.3.0-r1.ebuild
+++ b/dev-libs/libmacaroons/libmacaroons-0.3.0-r2.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/json-c
-	dev-libs/libsodium
+	dev-libs/json-c:=
+	dev-libs/libsodium:=
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
@@ -23,8 +23,8 @@ BDEPEND=""
 S="${WORKDIR}"/${PN}-releases-${PV}
 
 PATCHES=(
-		"${FILESDIR}"/${P}-json-c.patch
-		"${FILESDIR}"/${P}-no-python.patch
+	"${FILESDIR}"/${P}-json-c.patch
+	"${FILESDIR}"/${P}-no-python.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 0ccf7115ca35..24b8495b7228 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,5 +1,8 @@
 AUX libsodium-1.0.10-cpuflags.patch 1232 BLAKE2B 07d8d993af926db81135b6366fc2219b52c82d3e04abe7208bddcc62b4ec9db5dc9480f7c3c40b6d750a4d5465942b49e4d3840189bf92586a93d99f7510e254 SHA512 0559e5073c3238d887fc34a9f9cd78bde6d628e36c8741ff8bdd0e7db5bca4f510e3b0e2b858c0ecb83433b3cb74ad1c957c61d68ae406843f42139af8b382fd
 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
+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 2539 BLAKE2B c7fc32544272e2a92a0ef21529a1f1b67ecc5a85e1d3d23a2e6942dbbdbcfc652c7706b9ad4f96b97d415e864f895c6b83d70ceed7314782b4c29a75eb287778 SHA512 4feb0a99fc347f9bf3c7f26502e2a56fd11cfcbdfc611de0cc5a21bc912b85351572f904394356052888bccf8429dc30a510f0a7cceed4be99b1b35b5f3e660e
+EBUILD libsodium-1.0.19-r1.ebuild 2320 BLAKE2B e5a672e058a2b8dc9a10bca2ea19ccb8ee64eda2d058084a116e2b31f31c21992fd1ec35450c6cf17d1b2213e32fd8b4578317981bcee45470fa829c12e3cb55 SHA512 138e0eecf45523d99d45d1ca12edc60d3997f45ad884a09c7e1ff5d903da5c2f4a1a77be82a7ad25b45832a77deece454fdadd9952769603e31822db6eff3ec4
 MISC metadata.xml 865 BLAKE2B 04e3718818b19a548afdb2b479d9c24c1b66fb117e91c417ea856cb8bc362634ac717e47dee33de2e626315e8a1c961acd3ef45cde8bbaeadfda5360fcfadc24 SHA512 75aa772e03a2b6579be1a650953766ae4ef06b1a98bc2cc1d79fecbfd0a1b3334b1762605aed7b6f859066d8f63f96ec76e233410a96f45b370519099f635483
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
new file mode 100644
index 000000000000..cb3ef0373a0f
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+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 minimal static-libs +urandom verify-sig"
+
+CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
+IUSE+=" ${CPU_USE[@]}"
+
+BDEPEND=" verify-sig? ( app-crypt/minisign )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.10-cpuflags.patch
+)
+
+src_unpack() {
+	# TODO: Could verify-sig.eclass support minisig? bug #783066
+	MINISIGN_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
+
+	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
+}
+
+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
+}