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

11 files changed, 127 insertions, 5 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1d28d39a0e25..2baa40871ded 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 0790a228ffb4..51150fa3a3c0 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -1,4 +1,4 @@
 DIST keystone-0.9.2.tar.gz 4433222 BLAKE2B 5654ae6a66ccf6832fbdbb8c1083a2318e413bb833a0fadc4e1374f0de601e3dad9f354b1dec92d9a944621923458e432510299c1b55579ac9bb6b6e90a818de SHA512 5d4dd30410410bc7848e75a2e31e8ecef6241ad25e21963aa7a07bbea21d95b75e235c80573129014102684c9647710ace3c0776a8401844d7e4b45cab7bd04b
-EBUILD keystone-0.9.2-r1.ebuild 2005 BLAKE2B 644a7d76b2672e68b31591790fe89112f5559a3382b11ea82a9e236b387ad45ef8ba9b6267b035a57dee1521f0be2dfad5a12bbeb1fac124e765facf599fca08 SHA512 f794e8192b71d589bc9f6bdc8910e7e637d4f6d020234ce59e84ba7a3baf372c79bf2261f884335d91e057baf62764b7cbe90d85273d8029f8c2a0ba1c74c25f
-EBUILD keystone-9999.ebuild 2005 BLAKE2B 644a7d76b2672e68b31591790fe89112f5559a3382b11ea82a9e236b387ad45ef8ba9b6267b035a57dee1521f0be2dfad5a12bbeb1fac124e765facf599fca08 SHA512 f794e8192b71d589bc9f6bdc8910e7e637d4f6d020234ce59e84ba7a3baf372c79bf2261f884335d91e057baf62764b7cbe90d85273d8029f8c2a0ba1c74c25f
+EBUILD keystone-0.9.2-r1.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
+EBUILD keystone-9999.ebuild 2030 BLAKE2B bb014d629ca37df08d6d8915410be37381156a2653b0b2dcf493b6076cddd0476a0278aaf109abd5ea1ab04fe5ef753d7c05398eedb32bf8b5c4497b8a47099a SHA512 32eea0582795692a727e4c748c03147219e1a2555d1aea8a5ceb332ab18c516c8eb554e2f39435ca6d2932594d354e34e1b7b08aa0425b4eecfc25a117ddb815
 MISC metadata.xml 500 BLAKE2B 4b4e43ac4694c90c31773bede3c829801ab8ac33709a750bf574b3b4808fdb2ab10c655f16a6b19afbd9981eda154cf2fe40f62c0ade3457bad30fe013b37e38 SHA512 8380f6fbc99e23fbdcc5e820207b63082c903d5b41ff91a899acb1d6a6262eba63a17e4f930b8b56a6be1cb301b0605cc1a4413d62764208416017d520206785
diff --git a/dev-libs/keystone/keystone-0.9.2-r1.ebuild b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
index f54ae624af81..68f71673a12f 100644
--- a/dev-libs/keystone/keystone-0.9.2-r1.ebuild
+++ b/dev-libs/keystone/keystone-0.9.2-r1.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 RESTRICT=test # only regression tests
 
diff --git a/dev-libs/keystone/keystone-9999.ebuild b/dev-libs/keystone/keystone-9999.ebuild
index f54ae624af81..68f71673a12f 100644
--- a/dev-libs/keystone/keystone-9999.ebuild
+++ b/dev-libs/keystone/keystone-9999.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 "
 DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
 
 RESTRICT=test # only regression tests
 
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
+}
diff --git a/dev-libs/libxlsxwriter/Manifest b/dev-libs/libxlsxwriter/Manifest
index ed606011aa30..3f6e715c0d7a 100644
--- a/dev-libs/libxlsxwriter/Manifest
+++ b/dev-libs/libxlsxwriter/Manifest
@@ -1,3 +1,4 @@
+AUX libxlsxwriter-1.1.4-fix-pkgconfig-version.patch 675 BLAKE2B 19771b0b921a613191695ab0dfc65dabf3941678df01e7241cc37b5dcb9544c59f917d9d0090781e525708b4e1fa314cd49b6887c9915e809f4111b3fe0d2831 SHA512 dd43e9b8738298dbf568f9fe7cc518ff44ecd352a01554af776506be6c815e51c954195f4bcd046dfeb35ced4d590824f4dc26881f03a70639486f8fee768797
 DIST libxlsxwriter-1.1.4.tar.gz 20442200 BLAKE2B 38308dd8e954820b6debf15bc884effd583c0e0fa1667ed4451085ff8cf1bf4101807110873a501617785763886c107c19ab30c16390b5fb608f52b2736465be SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5
-EBUILD libxlsxwriter-1.1.4.ebuild 1043 BLAKE2B ab85b1f43163662c721c2092190cfa6aebaf7cb8cbe46f46325410acf13b5aaaf18615204e36a09f6c9add6bcb2077c0b8a60b02bd0fa629eb3beb53961a4b83 SHA512 f6ce8cabce1adc0e6a98efa679e229aaa67d7aa47ee40777d290c1742f797e5b2185cb5c89bc145c0890d512c2105fec6405b107e27cdcd0dd63eef69ee0fb9a
+EBUILD libxlsxwriter-1.1.4-r1.ebuild 1104 BLAKE2B 8d8af2a9e607ed73d0252872c63d488bdfa4fae17d14264f50551fbc5911a751d634d028d384d6b6a0af714eb0c0a3112d1b30032a5462f85f14cc6bed523b38 SHA512 bea6d68ae84c21b7c829f8476a0093265a160c18bcf959ed296dccd8db85997b42066f37b10f2130290cdd84b9ac574391ab86e1e7729f586fc8d9e6f525b4bb
 MISC metadata.xml 579 BLAKE2B 0c3294a1f69d9cc7e3e95a37f2708ce4672cc931f28cdded82aadc9cdffb323ac4bd7518c61fee57ad30022617acb572625f3b6b0972fd903a1ae3afcf98aee1 SHA512 83d288575e27337692c3cd94bad56d8e2882240343b739eeed72742bd82e9177c45a81ef94ebab9e035b99431ecc2cf21723e408a90fa6b5f551e8a7f1f17a0d
diff --git a/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch
new file mode 100644
index 000000000000..a66ea82e944e
--- /dev/null
+++ b/dev-libs/libxlsxwriter/files/libxlsxwriter-1.1.4-fix-pkgconfig-version.patch
@@ -0,0 +1,18 @@
+Patch greedy dot star to fix mismatched pkg-config file version.
+Fixed upstream with: https://github.com/jmcnamara/libxlsxwriter/commit/12afb351db634ed9452eb2f38d68883a9538b8ef
+https://bugs.gentoo.org/859745
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -202,9 +202,9 @@
+ # Configure pkg-config
+ file(READ "include/xlsxwriter.h" ver)
+ 
+-string(REGEX MATCH "LXW_VERSION .*\"\(.*\)\".*" _ ${ver})
++string(REGEX MATCH "LXW_VERSION \"([^\"]+)\"" _ ${ver})
+ set(VERSION ${CMAKE_MATCH_1})
+-string(REGEX MATCH "LXW_SOVERSION .*\"\(.*\)\".*" _ ${ver})
++string(REGEX MATCH "LXW_SOVERSION \"([^\"]+)\"" _ ${ver})
+ set(SOVERSION ${CMAKE_MATCH_1})
+ set(PREFIX ${CMAKE_INSTALL_PREFIX})
+ 
diff --git a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
index c31861ee337b..3006dcf4e7cd 100644
--- a/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4.ebuild
+++ b/dev-libs/libxlsxwriter/libxlsxwriter-1.1.4-r1.ebuild
@@ -21,6 +21,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-pkgconfig-version.patch
+)
+
 src_configure() {
 	DOUBLEFUNCTION=OFF
 	for x in $(plocale_get_locales); do
diff --git a/dev-libs/tlsh/Manifest b/dev-libs/tlsh/Manifest
index cbadc9711431..b89a06e253bf 100644
--- a/dev-libs/tlsh/Manifest
+++ b/dev-libs/tlsh/Manifest
@@ -1,5 +1,5 @@
 AUX tlsh-4.8.2-gnuinstalldirs.patch 1244 BLAKE2B 1369902e03db4837e02c01d63262545725b241a02f02462fd4fb41e7204dee9bae668bf16daf0990b083ced13d4234348ba3df220eab6d69fd77a1e3979b71f3 SHA512 68cf688a8587a301299efb5779ab47473a508e0f0cf6dc90e3ada21bda3cae25142da7d83b67098adef0f03cfbbea40952acffffcaf75c18842efeacb5bcfda8
 AUX tlsh-4.8.2-respect-flags.patch 820 BLAKE2B 9159f50d554168497ad9f416e4e002fd757a88543529fe6e2a180f6250399956bb6d967b06bc458e71b9dcf7f01cbb5d98d762ee65d9fd61392fd59b81dd25c4 SHA512 4b90021f2a01992d68d52f11b20a2ce9c4900216c8a6cd7c6fb95cfad20b44fbe37ab118ceee2811e65da7380e12960b5ddbf883198573491c2cf40f25b0fed1
 DIST tlsh-4.8.2.tar.gz 3345458 BLAKE2B 27d5eece16bb36225b9ae8b3d3a9d055a0f214fffae08a58c39211c3d918dd842497315a62237b291ee1055dfadad78826bbd24f7b9d88f510e9a31f74654039 SHA512 5355c7734f5356a3a7a31ccc078254835871fc0369f1889a34131a0f810735201c68f674eb18e975b6a03a32e5c284899ca9ffdc1f583e42192188c172d2aad0
-EBUILD tlsh-4.8.2.ebuild 699 BLAKE2B ed1a34f96de5342b1bb84a0f57cff06eabce5809090758c5d5573da32baca8381a534d1b85a9d9a67eeff4fbfffc01b5fbe55e3d5146e5b472263bcc2101002f SHA512 be6926b86788b163dd8362cd35ee30edd2b66eb92f50f4b6ede1b38cd6ea688e9f2b6da404bab85c31c7801545e2a8fcd3d129c8490ed570a7e7ea8afca3c3e2
+EBUILD tlsh-4.8.2.ebuild 706 BLAKE2B 416abbac42e1cf953b51dbdb3645e24e2b13c4ed4a093c009fdb63c572265d23733ee9842511d125fb556f03ac95312a46af6424a000c6e8c8dc8e7500667ec9 SHA512 fff9be4b937b8fad1dd8737b3811b8d1fdeee625490b5ebeb5704c7aed6e0300551c97a4d20fc3f18dfff68da57c1b56046cde64ac5cb4ba4bf498dda5e43f98
 MISC metadata.xml 471 BLAKE2B 2e17c59829f15d1439933fef59fd14a8525723aae1de1c640c8a83a9df612776ff33d24904a30ffcf27eddcd9c778af09d6d65c3b4e66542288810f416ca0ec4 SHA512 e8a8759d526e1d0b9607f84df503440a650f5835c864c0c5c89c5f978b58839620e2ed7e0bc39af51e38e1da1fe86fac1a398394069f4b3820219db40254a284
diff --git a/dev-libs/tlsh/tlsh-4.8.2.ebuild b/dev-libs/tlsh/tlsh-4.8.2.ebuild
index 4959d64e815f..6b964ea89a55 100644
--- a/dev-libs/tlsh/tlsh-4.8.2.ebuild
+++ b/dev-libs/tlsh/tlsh-4.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/trendmicro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gnuinstalldirs.patch