gentoo resync : 29.12.2022

6 files changed, 6 insertions, 122 deletions

diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index 3d634e98a052..cee6653c798a 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -1,9 +1,5 @@
-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.11.2.0.tar.gz 219085 BLAKE2B a8aeca79890465784cae5e958d73359544416b11ac3ca4fb412ba00e59db28ee041c745653efb9f1553944974579238b0d9e8e5b3696de9a07d4e2e11333d631 SHA512 174e92be03cfb8ee41d9dc78bfd183a435d01481ad9835b74b38e000012cf6fbadd30f97c27203dbc942102641349626f92000510636dc73f413a5aebd7f7942
-DIST skalibs-2.9.3.0.tar.gz 231372 BLAKE2B f0d0b530eab4d0c98346a94af078604d741a6da4ac9625b6b903011b791c16789a8488b562623376bfc1119fca5a2ab1c2dc35b563cb1d8ff36edad2d7793922 SHA512 41e867fcaf16da437840b796a41b2d34ea53aafedde8b4fc86d712934ec533e9f7f2a8b7902542570ea6b5bcba772569fc4f47bccef770b5dee4f9d113b3df11
-EBUILD skalibs-2.11.1.0.ebuild 982 BLAKE2B 5da34d1c1400f249c0e364eeaddea15a307e9a695fcd5ee5dcd63f3b842f755f6ae0f8b6b79cdeeeacb7d8483d3a79adbe498e013ee63b80aa4e85d1ab9fe74b SHA512 03c6c97b9fbf23260dc96f83b32c99a2ecc24ea19a00ae2171a0add5d575a6607178fd150b195fe0fc5ef40c05f6957bf0b98ef9d553454dd720a290d2dbf6ec
-EBUILD skalibs-2.11.2.0.ebuild 925 BLAKE2B f60df8e2420b8cffd2782d1ae966a463e12cf3b06638edac0413f508612fc7e63dc16c087250e2f131ef45589c00e9101b2dbc2e689e6ef7f7bab2c7404fa0ee SHA512 005fecc565e4a69f1e9323c9445569235d9991d74299558930cb2462e67f09a2b0ac24751e6a72cd5ff812957e374470ad6153adb6bf26a29618b881ec0b1c46
-EBUILD skalibs-2.9.3.0.ebuild 1033 BLAKE2B a020fd7b3c911e796d3059d4ae1263b9cb5285f2908af24d8f5b0b767ec87f037da81e3c0a3a0b397756fde1943eff9fc59cf25e74e7236610ad79de2bfea18e SHA512 b4de37ef321d442c12ec8a6e2ceae183b6ec7c577f3f2d849bc0ee89df36732d4abc4b50bfeeeaebe6288084987644c7f38ed18a393502c664e63e8f983a9b83
+DIST skalibs-2.12.0.1.tar.gz 222717 BLAKE2B f094677bbe2efe4c4dcd4359bdfaafa07dc2d436691517a868870e88a360fed8fe81008ebb5ad6f2737d12764a8313b20c31fb52e0c424174744451eca991d9a SHA512 383961588eeb4934ef68e25764d3e258d7d9f19fdd14156490e8d9e2e111050c92b34b1786d007c269d09f82cd234bdcbecb13ef603c101e9439ce4b77a6e635
+EBUILD skalibs-2.11.2.0.ebuild 923 BLAKE2B 425d25ea8f525abbec4b6019c3ce2a234f7170a193d613f98752225876942a17bd2ee33a766286bd009ad99c8a5ef1e37d78c1463e1a2306f13b7224272edb42 SHA512 c57af30c867da127abc76165b0814704c5aa686e247f1d77a3a25c853834c2e249cf995a91c935fc8a6731c869edc80197e8a80b6267eff349814454576a8d31
+EBUILD skalibs-2.12.0.1.ebuild 878 BLAKE2B 9c85e378857d096e21211f71356ed3d8c5743e450bf12fac8a233806fa9905133bcc88df7b3f26cdc327985601a64b62000bec667e240be5c5faccf81a653a6a SHA512 82e0e95c0550f7a4080e4a3282e230f02b2cf9bf91c37eaa18b24d48bdfeecf86e73751cbbb7b46f7a4ec8e7e7ac1f329adbbb3a726bed6adde2baa5284c283e
 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
deleted file mode 100644
index 3092d86f3f6e..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.11.1.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index a36db4853a15..000000000000
--- a/dev-libs/skalibs/files/skalibs-2.9.3.0-respect-user-provided-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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/skalibs-2.11.2.0.ebuild b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
index 0eb6a5c6b8ab..f878f25eee05 100644
--- a/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.11.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc ipv6 static-libs"
 
 HTML_DOCS=( doc/. )
diff --git a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
index c2ffd2478c25..748bda1854a2 100644
--- a/dev-libs/skalibs/skalibs-2.11.1.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.12.0.1.ebuild
@@ -11,13 +11,11 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc ipv6"
 
 HTML_DOCS=( doc/. )
 
-PATCHES=( "${FILESDIR}/${P}-respect-user-provided-flags.patch" )
-
 src_prepare() {
 	default
 
@@ -37,7 +35,6 @@ src_configure() {
 		--sysdepdir=/usr/$(get_libdir)/${PN}
 		--enable-clock
 		--enable-shared
-		$(use_enable static-libs static)
 		$(use_enable ipv6)
 	)
 
diff --git a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild b/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
deleted file mode 100644
index fb9bc2eb668a..000000000000
--- a/dev-libs/skalibs/skalibs-2.9.3.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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"
-
-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; 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) \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--sysdepdir=/usr/$(get_libdir)/${PN} \
-		--enable-clock \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable ipv6)
-}