gentoo auto-resync : 15:01:2023 - 05:54:04

7 files changed, 21 insertions, 37 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index ea46f95c35d3..7a9be7fb40a4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 461797a57b43..1b953bfd563b 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,3 +1,3 @@
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5
-EBUILD libnfc-1.8.0-r1.ebuild 1050 BLAKE2B b89dbe3c9f21a5637836a755b648c0d6e5853b65b380acb99cc81c120e6c08f1e9305dabab00bd14d773ed46da7851edf97086fb204d09f947cede68f2fa344e SHA512 6a4e1fb8df883712b67eec0fee8ee97d93e1eb15aa56a5c981870074eea7dc496a6aec964d16d9829473951f0cd019f8dcd7f56b185b1d1d2d9e3852ff4c15a2
-MISC metadata.xml 389 BLAKE2B 699fb3cd9d37fe58a3f4d4c80bdad576dfae94d3f45318107c08741ee2cf5dd0c66266987e4c80321bfa69e1b7c5ed8e987ffc93e058d0b709c56dbef5477c72 SHA512 abf7bbbf9ce7e0364690079bb7ace4b3db320ee0468f76e80182244432ef8781249b1d7df66c361644fbfe8e0e843fda4014704792b64677769e8b4e48a33d52
+EBUILD libnfc-1.8.0-r1.ebuild 1050 BLAKE2B 91d286807dc7b8ec9e113b8a3b18781b0ed40f586df035e12c00412cf207fa11e6cd4e763f7fc3832ec39048e6f116855c1f3b75c7614afda5917cc16c0a642c SHA512 3ca6305e04756423533f7516bee67ca6bebde33f62f21af0d9db62fb5f596773fe2f13ba03229483bcbb60166956991e6b726486d6e5f0af2720a6d50241517a
+MISC metadata.xml 581 BLAKE2B aaba85942e401b92a0add293b98f4bd7bfef2c06b416a967b0203eff380e6da7ddb259e936afedc6248acd458c27bacd2a3b5ca179e6ec8f1a93a20f780e345e SHA512 17f4cf0fb026d1b7e48354bd44f6a7c3f4a82c6eba98e62477e58c10ef640da8089ada97d54aa633445301bb24fab8d66be849d2563f5d90fab816c1efa1eb70
diff --git a/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
index fba699e4b06a..e07eb4d29c0b 100644
--- a/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
+++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-libs/libnfc/metadata.xml b/dev-libs/libnfc/metadata.xml
index 32b502630c84..1fbb553b1fb7 100644
--- a/dev-libs/libnfc/metadata.xml
+++ b/dev-libs/libnfc/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>mario.haustein@hrz.tu-chemnitz.de</email>
+		<name>Mario Haustein</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="pcsc-lite">Enable NFC drivers that require pcsc-lite</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">libnfc</remote-id>
 		<remote-id type="github">nfc-tools/libnfc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index e4e8e74b2d09..ccf0c50fec63 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -16,8 +16,8 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s-r1.ebuild 10348 BLAKE2B 3b20a52d947cb0cc9d3641d88e470c3692056c4b2a4700355be8846f5a81ed7a0b100a000523ece223e9842d039e723d31b0c7e0bf55088b1fa88afbe2b69ebc SHA512 dafa343d898badb602dfeda6f7b3125746f9597536d42254304664a58d7047c022ac6a34d20f286de0b99206c76dfc2b86912d2bc75ba89ecc892d61ac8eecdc
+EBUILD openssl-1.1.1s-r1.ebuild 10232 BLAKE2B 582d5af9bb2c50fa29f7204506b4cdc04eaf43bf2ce6363dd034e7edf82896e05178e0f4b612cd87e48e0e2ac8f0286a6fe050e66c7523677cd3c20e29af06a4 SHA512 0c41da84973c240a371183b8ddcbad8f46e59861320e91352bf425a7cde4bf83dbc5f9ebe4165ca8015862fe262408ca70ff9f4733605802a75c6e9f481ff5ef
 EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3
 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47
-EBUILD openssl-3.0.7-r2.ebuild 10126 BLAKE2B 5a78943c4b19690a960ae05b552f3175fc980099867544441918d232a0cabe7bdce7a8374ac97cf461bfcad325518d6598e9d5fbf3098e0d336e9ec33f1e1708 SHA512 e8dd7a0fab196361353e181b49ab37d42743cc55a29cfd6b0d79226fa2648400a91798e69bc6e1526f0b1c88d14e500805d952026aa356cabe6d77d9b59b57d3
+EBUILD openssl-3.0.7-r2.ebuild 9657 BLAKE2B 989d5e08c98c472f8dac360dd2beebda291496a0d48baf911dd00e6cf2d53e4c1032650ebc0d1222bc921e23760876ff41f0c1a350762eb871ea4c2b47000dad SHA512 76cbd45e2018da4a61e901bf35f56e348b7118c5d52883e45a5992c86258373b35ea37a7862001abe333d1e10f675b0d349a52b7ef66e6b316fe706c2decf7d7
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild
index e2f32f1b8861..910d8fcfbda4 100644
--- a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s-r1.ebuild
@@ -132,11 +132,6 @@ src_prepare() {
 
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${BROOT}&," \
-		-i Configure || die
-
 	# Remove test target when FEATURES=test isn't set
 	if ! use test ; then
 		sed \
@@ -160,12 +155,12 @@ src_prepare() {
 
 	local sslout=$(./gentoo.config)
 	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
+	local config="perl Configure"
+	[[ -z ${sslout} ]] && config="sh config -v"
 
 	# The config script does stupid stuff to prompt the user.  Kill it.
 	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	edo ./${config} ${sslout} --test-sanity || die "I AM NOT SANE"
+	edo ${config} ${sslout} --test-sanity
 
 	multilib_copy_sources
 }
@@ -198,8 +193,8 @@ multilib_src_configure() {
 
 	local sslout=$(./gentoo.config)
 	einfo "Use configuration ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
+	local config="perl Configure"
+	[[ -z ${sslout} ]] && config="sh config -v"
 
 	# "disable-deprecated" option breaks too many consumers.
 	# Don't set it without thorough revdeps testing.
@@ -237,7 +232,7 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+	CFLAGS= LDFLAGS= edo ${config} "${myeconfargs[@]}"
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
index b32f5c40c02c..e83dd0df830b 100644
--- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
@@ -148,24 +148,9 @@ src_prepare() {
 
 	append-flags $(test-flags-CC -Wa,--noexecstack)
 
-	# Prefixify Configure shebang (bug #141906)
-	sed \
-		-e "1s,/usr/bin/env,${BROOT}&," \
-		-i Configure || die
-
-	# Remove test target when FEATURES=test isn't set
-	if ! use test ; then
-		sed \
-			-e '/^$config{dirs}/s@ "test",@@' \
-			-i Configure || die
-	fi
-
 	local sslout=$(./gentoo.config)
 	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-
-	# The config script does stupid stuff to prompt the user. Kill it.
-	sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-	./config ${sslout} --test-sanity || die "I AM NOT SANE"
+	edo perl Configure ${sslout} --test-sanity
 
 	multilib_copy_sources
 }
@@ -198,8 +183,6 @@ multilib_src_configure() {
 
 	local sslout=$(./gentoo.config)
 	einfo "Using configuration: ${sslout:-(openssl knows best)}"
-	local config="Configure"
-	[[ -z ${sslout} ]] && config="config"
 
 	# https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-and-disable-features
 	local myeconfargs=(
@@ -232,7 +215,7 @@ multilib_src_configure() {
 		threads
 	)
 
-	CFLAGS= LDFLAGS= edo ./${config} "${myeconfargs[@]}"
+	CFLAGS= LDFLAGS= edo perl Configure "${myeconfargs[@]}"
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \