gentoo resync : 02.02.2022

6 files changed, 134 insertions, 3 deletions

diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 4a063c8d9cc0..0d9d826e3911 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,3 +1,7 @@
+AUX skalibs-2.11.1.0-respect-user-provided-flags.patch 1207 BLAKE2B caaf3b25d9b588aa2edf974fb1c680da80aa7eb0a46764faa65e7faa3dcd0cd0483114094fdbb855f2300be73f32914127a8a1405ec79f5340b7995278bf0389 SHA512 6637398016c16be07429cbb58d150bb7ca75768b162b2ae0a05c77dfbd0f0346b60cfc53b1ef2df7b887caebda9350cba4b1d396b8d3f16357861a7468695bba
+AUX skalibs-2.9.3.0-respect-user-provided-flags.patch 1215 BLAKE2B 48efa77149dfe60b2c77bdbc778bc71e73fd9d90a2e33ca1c2fd922839c1c7c03d8f85b099640d0994654c7b82fc1404b687207fd36a058ae0c0479ef93d62bc SHA512 b2f2c44a9c99ee56d9773673b8edd335934b9342d1560cd260e4ba773b7596e1fd9765454e47270bf8c2d0f6ce21afaae76a3164b8184c88d6ef602c02f7a1fb
+DIST skalibs-2.11.1.0.tar.gz 218300 BLAKE2B 9ab30a43065745a8d2d846167dc9887b0353ec55ec7d4b26f663870fef8dee5eebbf73056346829c1187946f1a64de05eea5067e7b6ea4d5be522f586915ba27 SHA512 7db390b887234437d52f3b9388f7398e92877cde4c93de76532abff64ee1a127524181c53a0fdddd86bd84247d84f704527bd89c5581e27433081862e9970af7
 DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.9.3.0.ebuild 858 BLAKE2B 5024db40b6e36cc0abcf81cc42e8abac9d2aeab566449a8347d19c90443f69139f9071221801c8bd977ae2a487d817c0b9e0beda89fcfd3b62f2593dccb916c4 SHA512 f8443be69d7cef64b10c4ed86110c3f12ef373d793cf70c545a4d8ad943624492102c76b815d669c73977c9aa88a344269792284621db3dc500a30ef143d7caf
-MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
+EBUILD skalibs-2.11.1.0.ebuild 984 BLAKE2B a6de74599b83362820b14241ee24370dbf2c39b69f68afbfd66b0febe9cb286e1ff87b2b0ce30ac3e856c770e3ca27dd278bffafb7ddb230bcf3a2df1dccbb7c SHA512 10222496b25a0404a4485dde0336e90c85f5ab95721a2e2bdec8c826883e61fc74e3fe489f0926e5cec4440b806bddfbe81e58916d499506bdb7e114be8121c3
+EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
+MISC metadata.xml 500 BLAKE2B a0a2130490a01139a57fa7cfe6fb63532250b5d26b3d94bce3cc5da02552f53b84c0f6e714604040026c95ef6031adcec3cfae5f002e2d4f830aab5c594c9d20 SHA512 401f71564f9d41c07bf1271789654f4a1ff6bb957ff03945dc62a501c1dd9f3f3a49c5f1a4177d6f79182283cd9ef62243a7083d0f0c3efd076935d304f0cdc9
diff --git a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
new file mode 100644
index 000000000000..3092d86f3f6e
--- /dev/null
+++ b/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
@@ -0,0 +1,33 @@
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Mon, 24 Jan 2022 11:44:29 +0000
+Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
+ autodetection
+
+Upstream-commit: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
+See-also: http://skarnet.org/lists/skaware/1656.html
+---
+diff --git a/configure b/configure
+index 1aa8fc7..430e57e 100755
+--- a/configure
++++ b/configure
+@@ -99,7 +99,7 @@ stripdir () {
+ tryflag () {
+   echo "Checking whether compiler accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o "$tmpo" "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+@@ -113,7 +113,7 @@ tryflag () {
+ tryldflag () {
+   echo "Checking whether linker accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o "$tmpe" "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+-- 
+2.34.1
+
diff --git a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
new file mode 100644
index 000000000000..a36db4853a15
--- /dev/null
+++ b/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
@@ -0,0 +1,33 @@
+From: Laurent Bercot <ska-skaware@skarnet.org>
+Date: Mon, 24 Jan 2022 11:44:29 +0000
+Subject: [PATCH]  Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during
+ autodetection
+
+Backported-from: d9f541c2b3af (" Apply user-provided CPPFLAGS, CFLAGS and LDFLAGS during autodetection")
+See-also: http://skarnet.org/lists/skaware/1656.html
+---
+diff --git a/configure b/configure
+index 55f34f8..49b3678 100755
+--- a/configure
++++ b/configure
+@@ -99,7 +99,7 @@ stripdir () {
+ tryflag () {
+   echo "Checking whether compiler accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST "$2" -c -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+@@ -113,7 +113,7 @@ tryflag () {
+ tryldflag () {
+   echo "Checking whether linker accepts $2 ..."
+   echo "typedef int x;" > "$tmpc"
+-  if $CC_AUTO -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
++  if $CC_AUTO $CPPFLAGS_POST $CFLAGS_POST $LDFLAGS_POST -nostdlib "$2" -o /dev/null "$tmpc" >/dev/null 2>&1 ; then
+     echo "  ... yes"
+     eval "$1=\"\${$1} \$2\""
+     eval "$1=\${$1# }"
+-- 
+2.34.1
+
diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index db463f3eeb66..56d2647aa7fe 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -5,4 +5,12 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>arkamar@atlas.cz</email>
+		<name>Petr Vaněk</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
new file mode 100644
index 000000000000..69fb41fd5e6c
--- /dev/null
+++ b/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="General-purpose libraries from skarnet.org"
+HOMEPAGE="https://www.skarnet.org/software/skalibs/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc ipv6 static-libs"
+
+HTML_DOCS=( doc/. )
+
+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--datadir=/etc
+		--dynlibdir=/usr/$(get_libdir)
+		--libdir=/usr/$(get_libdir)/${PN}
+		--sysdepdir=/usr/$(get_libdir)/${PN}
+		--enable-clock
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable ipv6)
+	)
+
+	econf "${myconf[@]}"
+}
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
index 116469617d0d..fb9bc2eb668a 100644
--- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 DESCRIPTION="General-purpose libraries from skarnet.org"
 HOMEPAGE="https://www.skarnet.org/software/skalibs/"
 SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
@@ -14,15 +16,21 @@ IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
 
+PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
+
 src_prepare() {
 	default
 
 	# Avoid QA warning for LDFLAGS addition; avoid overriding -fstack-protector
 	sed -i -e 's/.*-Wl,--hash-style=both$/:/' -e '/-fno-stack-protector$/d' \
 		configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
 }
 
 src_configure() {
+	tc-export AR CC RANLIB
+
 	econf \
 		--datadir=/etc \
 		--dynlibdir=/usr/$(get_libdir) \