gentoo auto-resync : 16:09:2023 - 17:00:58

9 files changed, 75 insertions, 59 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b3467b42b70b..d215df43f7dc 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 040d9c820b6f..0ed51e7a4cdc 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,4 +1,5 @@
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
+AUX libcdio-2.1.0-realpath-test-fix.patch 1838 BLAKE2B 9e500479587a76925adc0bc6fed620e8a4880b45ca691ed0eb3aec4909ff48f14804a3d44405204d27d89628f050bb6f0f0d6342e483222e565d3613e97c550a SHA512 2395fb3cf9b56beeca6e91399be185d01ad460217ba144b5959d3941cdfca450795b0fab6466c471cb2714a4c004c3acf0097da1696cb33074d4aa0567feb504
 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f
-EBUILD libcdio-2.1.0-r1.ebuild 1769 BLAKE2B 03066ffe81bd07b320119da094beabbb018dbb09e096e43c6f742a75b5120f2df99130cfb2cbfd82593f063a158f6f867202c29ae933e352d4b1ce9c209c6187 SHA512 0de998c904d01ce81e3600f855d10f6c894cc9b99448ec1d81944fc13156c875a07ac691d1e1a8ef4a6ad9155d509b4a76a6867d8c11757525def11229ad5012
+EBUILD libcdio-2.1.0-r1.ebuild 1813 BLAKE2B cdbe473d6e21b15f678ce60ea214dc225d9da5488f36595947f7241ffbe1e43dee1070770584d427c647b7d0781e4bd13aa8653c794518121ac56807dcdd8f87 SHA512 59be8a5fd57a59e18257dab01f82c552492998aca985551a08efd94a423851a8d419b6f17a860787f444ac8153fbb2dd2eef34bc9a6f0bcaa6c854dc0b1e4aec
 MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8
diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch
new file mode 100644
index 000000000000..10325682aec2
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/834342
+https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0
+
+From 56335fff0f21d294cd0e478d49542a43e9495ed0 Mon Sep 17 00:00:00 2001
+From: "R. Bernstein" <rocky@gnu.org>
+Date: Wed, 24 Aug 2022 14:34:33 -0400
+Subject: Correct realpath test failure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See https://savannah.gnu.org/bugs/?62948
+Patch courtesy of Martin Liška <marxin>
+--- a/test/driver/realpath.c
++++ b/test/driver/realpath.c
+@@ -1,5 +1,7 @@
+ /* -*- C -*-
+-  Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
++
++  Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
++  <rocky@gnu.org>
+ 
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
+         rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
+                       "symlink", psz_symlink_file);
+         if (0 == rc) {
+-            cdio_realpath(psz_symlink_file, psz_file_check);
+-            if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
++            char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
++            if (0 != retvalue) {
++	      if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+                 fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
+                         psz_file_check, symlink_file);
+ 		rc = 5;
+ 		goto err_exit;
++	      }
++	      check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+             }
+-            check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
+         }
+-
+     }
+ 
+     check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);
+-- 
+cgit v1.1
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 43365dc41f6e..122dfa96d536 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -38,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
+	"${FILESDIR}/${P}-realpath-test-fix.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/libpsl-native/Manifest b/dev-libs/libpsl-native/Manifest
index 41ff95b5a8ff..0e862c51accc 100644
--- a/dev-libs/libpsl-native/Manifest
+++ b/dev-libs/libpsl-native/Manifest
@@ -1,5 +1,5 @@
 AUX libpsl-native-7.3.2-cmake.patch 1134 BLAKE2B d2cd40fef4abfd23c946c211e99317cbb35f00b55e81afd08620a06cbea8ad24a41b97054bae8bd17760d4d0ce552e3dd4709b7e622e695c579898a5520fb18c SHA512 a7a487f4dd5c85b2719a699777bfc03a7db0c8a35ba9554434a93eb79efd9db91036d7c9d41032159353c4fb1f0947e1a579f9fa83d34fdee5469bfc2dafb8d0
 AUX libpsl-native-7.3.2-test-cmake.patch 485 BLAKE2B 4da10739abc354866c1343bc7c0d398cf97c21c2010b3dbeb75da9c0807379582f21689bd99f031d886270abe36897fdc6ffad2fbc3105c6b23beeddebbaea16 SHA512 921ddc3303f3c5ba8e320d893d708f337f7a704b8c716d1ba075514eca6cad737b0c97c62308d51e073ab323aec7f0ab098e20665ff65ad35f994ac4ad89aef6
 DIST libpsl-native-7.3.2.tar.gz 288949 BLAKE2B 9547d0144ec1bd48d4f9272ae7c7237fbc052a852908a535047f2f9a41a7a0f7c36868fe697c77ec37d4705a119ac3f4f6961f7ff8ad7c80f8ec176839e34dd3 SHA512 5ff7c730c000e1d8ccbf48e01a1233889df3ddda3c280cbf37298a1731354dde30f0637b62567a8679dec4ea27a2184d9559026c3a86c793c6c8c12ec629c90d
-EBUILD libpsl-native-7.3.2.ebuild 829 BLAKE2B 99e9964b3ad31b96fe799802907b92c3ea685af72965edf18b606aaf06a462d2f6685b6f350c1962ad7b19673d95497f05857870afa08a3e6db4abb7747ead88 SHA512 bbfa4be3acb427d501ff03bef5a28e51ee1c069414fd0dcc30da72dfffbb9f5ff2d78a4008ba320b937aa27bc5997afb6ad39cec93423dc3946784dc372d7398
+EBUILD libpsl-native-7.3.2.ebuild 841 BLAKE2B 3d464842b56073cc4a7e7c5bbe10dd1bd58621e28fb21a5fa5d4462ae153d69835c10f51fa016bf078ab1bcf64fbbdf712e914c4034eb0f5080a9a8bc54adc96 SHA512 8aa749c3311b3577894048cb03721244c157c6b4aeeea98cc47d5118e90031198b7899a80985aaa5dc4430ad5f7484f424ff62d14899c696e3f36dd3c95aa4aa
 MISC metadata.xml 439 BLAKE2B 72a823c1e144b3a594c8571200dd935dd46010f59f0380bd9b30131124bd71fd102c7f286c7d26670647e77ff111b9d5c043d5e0637be10950a7527b8302f6e7 SHA512 960e66a6fb960bae6053b1dbd05168c6aed69aff14e6b840d77809b82a80ad1ec3edb5ab329c3a6c5a19a413e97d9f651e3e963aa8385d210d5ec1da9b842c2b
diff --git a/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild b/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild
index 86ff150176a7..db376c436a36 100644
--- a/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild
+++ b/dev-libs/libpsl-native/libpsl-native-7.3.2.ebuild
@@ -20,7 +20,7 @@ else
 		-> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}/src/${PN}"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 24b8495b7228..77dcb0e99cc9 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -3,6 +3,6 @@ DIST libsodium-1.0.18_p20220618.tar.gz 1869858 BLAKE2B 60d46f722c4e5c9896226e3e0
 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
+EBUILD libsodium-1.0.18_p20220618.ebuild 2004 BLAKE2B 7533fdc4c5132d51221b66f6adccef49855efaa314f75cbe02cc47050417ffe4be413201ee649fcfaa31a8ef97e14fd04cbb56b630f83fde9e6eb17fa84aff1f SHA512 a3ddaa0ac739f719f54419c29cbaf073d8e09bb22d0e362bb8dbf708ea178600c5a03ab775d17f1df984af995ce2ee14e448cba266a91def07224d4d20383098
+EBUILD libsodium-1.0.19-r1.ebuild 2012 BLAKE2B 33028480c488a8f78ded4db515ee41542df137eab7932d404b5a98088ea86967d3b8a78f05323963eaa89e57055db153bc766960430a934175bd8293bc45956d SHA512 49d218476026cb9b907b7b4185649ad761b5f63e9b659a73deac8d3f64ef56f570a2cb48fd698bd7c094c80208bdb3aae02102fca267dca3088edb31353ad47f
 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
index e98b55fa65ca..d54147eedb31 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild
@@ -3,32 +3,32 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key
+VERIFY_SIG_METHOD=minisig
+inherit autotools multilib-minimal verify-sig
 
-DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+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-)
-	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
+	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
-	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 )"
+	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/23"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
@@ -37,32 +37,12 @@ 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
+BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
 
 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
 
diff --git a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
index cb3ef0373a0f..af4e604b01e7 100644
--- a/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.19-r1.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libsodium.key
+VERIFY_SIG_METHOD=minisig
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="Portable fork of NaCl, a higher-level cryptographic library"
 HOMEPAGE="https://libsodium.org"
@@ -30,33 +32,17 @@ 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"
+IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
 IUSE+=" ${CPU_USE[@]}"
 
-BDEPEND=" verify-sig? ( app-crypt/minisign )"
+BDEPEND=" verify-sig? ( sec-keys/minisig-keys-libsodium )"
 
 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