gentoo auto-resync : 25:03:2023 - 06:49:35

8 files changed, 58 insertions, 39 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 80fbe2dce433..5ee34dc33354 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 23284499389c..d0bad57d573f 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,8 +1,9 @@
+AUX elfutils-0.189-configure-bashisms.patch 2086 BLAKE2B 4ecebe40ee2c628bdbd26fce6bfd487517ee8f9590cd2d565f4be34cf9afe67b59fd9cb225039ae911f9cf939783cef0cb623d7264fff07255abe89aed9c509f SHA512 0db8aaafd625cb57b9a7a16c841685b44beaff4b18d9ea15e5adf2e0a7bf14340be7c17ebda9278f1f88ec14e5457b720c4fc4e7e7b81e861fc83059b93b8e3f
 DIST elfutils-0.187-patches.tar.xz 2804 BLAKE2B 77cbd0666d8da3d5229baaba6605c84e7990200f39bfb72b2008eb2527e4567abd90c93c291cc0c8f3c10bbf97758ccf5877cbdae823780cf8dc97ff4ff2f932 SHA512 d056fdd6ae0e71471087af472a72384d6e73ff2d7fe1b708b5ec9f091a913c8327197660132b7a6619a0db86534715507ef67ee91691a00a591c1d24c55a99f4
 DIST elfutils-0.188.tar.bz2 9112977 BLAKE2B 6b0474f1436eaf6af73b735b9b2ddd5448ab9c03fbaa0be745a31c89ae8f15b0e21a651409c38643ca125794ce82c19d7b46db4a079f3e72cb919d643560e7a4 SHA512 585551b2d937d19d1becfc2f28935db1dd1a3d25571a62f322b70ac8da98c1a741a55d070327705df6c3e2ee026652e0b9a3c733b050a0b0ec5f2fc75d5b74b5
 DIST elfutils-0.188.tar.bz2.sig 310 BLAKE2B c8d9135cffde3b1dd337b692d5351855cf799915d3ebd553327febaac192bd2f108b3f45a6376d458e179390a1ceaf4809762cdc40ea1e05fed0214ac33ed56e SHA512 4cc8a7417d244e319a1650d71b1831660cfe41afc7c73e9c83d1f076f4013fe15247e8b4f5e12a5396d83c4f1c7663ca4be5ea42bff3dc23263f85331fd9d566
 DIST elfutils-0.189.tar.bz2 9143169 BLAKE2B 30596271e14cf3408326abc38a9775b849b8cb0ee119a5455df9434a7d3b9a57afb15e0236a179a26c7bd400d303749964c9d6350c419f747784fd99d12517e0 SHA512 93a877e34db93e5498581d0ab2d702b08c0d87e4cafd9cec9d6636dfa85a168095c305c11583a5b0fb79374dd93bc8d0e9ce6016e6c172764bcea12861605b71
 DIST elfutils-0.189.tar.bz2.sig 310 BLAKE2B d4155de64b15a9ab5c497cd603e73bf918eb1117de36cf28f8ddb50ccb4874fb24cffdf44bcbbc028b2ef3f64562960bf11a431274d861f9db96e3d865b37ec2 SHA512 2016c5f0ccd16f7feb0c825164bb18b2f1afad17dcd39d9f159429360fe4afd645665f612397d48bde191a1e59bb8352e2d065d61d7f649b929c3a7e7bfe8dd0
 EBUILD elfutils-0.188.ebuild 3415 BLAKE2B 2415e7ed6cc16e3cbf43d96ef928f10af8fba89ab1e0e3afd6eba16aaf5b8bf10c14731c51f3e47ad8b10ac2f3a00508fe6d27eb5160d222fad0cd571ba07407 SHA512 766e831f104aa12ca6efd328998369f61979f3bfc0b35f0b65c1e155c58fa4b13f3ae32c668dd046a0ba231f80958d82e63d245db375bc6025f46d72c0181ce8
-EBUILD elfutils-0.189.ebuild 3423 BLAKE2B 5e0891911025fdec075eaae9a05faf0aa016e02f8673fcac678bdbc53fff91f89a36cc7538abd31e27f305a3c13eca658e2ebd7bcf37fa21991e5bf6a77238ed SHA512 f8ccd6e67141fc9afff25e9af36b36ec6949937e42e9fde0c86e5c3382c9c62763ab6a9e642a469cc74b6a47946bcb37115b5fbce34638ba3b5c5c8cc7c3b1ab
+EBUILD elfutils-0.189-r1.ebuild 3561 BLAKE2B 8421da2f274300e600381696775718f8d44eff2235e3f1b2431993fd3a7e1766e286ad4a6b5b09a79baf981191a6a870e633a9ded973c0ef60611380509ed734 SHA512 0bd54a638171ef6528f8ef03bd2d300d7ce9f6eea850ec0d42fa8b478c7db35a65503005d2c3b91e005a88411d88cccd400fac1b4e8dcf65407234ca6e2ac841
 MISC metadata.xml 655 BLAKE2B 246409a9ea3b4ada7ab225dc524b7fe7241a5a65e29b7ccacfb59b6810d19ab7b06aff7bc5024946745da063ea9df4dc7646ee146526a3104504e16ee515b118 SHA512 7a7b42842d8ebb53d45ca3d4feb588f22b106e1023254fb96b39f39b3d8dcd6c5f2b7263e1e696f760daa3472deef43f44578a650b8417facfa17e246782247b
diff --git a/dev-libs/elfutils/elfutils-0.189.ebuild b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
index 0df16d8efdf8..285cb3c8c192 100644
--- a/dev-libs/elfutils/elfutils-0.189.ebuild
+++ b/dev-libs/elfutils/elfutils-0.189-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
-inherit flag-o-matic multilib-minimal verify-sig
+inherit autotools flag-o-matic multilib-minimal verify-sig
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://sourceware.org/elfutils/"
@@ -44,6 +44,7 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-0.187-patches/
+	"${FILESDIR}"/${P}-configure-bashisms.patch
 )
 
 src_unpack() {
@@ -62,6 +63,9 @@ src_prepare() {
 		eapply "${WORKDIR}"/${PN}-0.187-patches/musl/
 	fi
 
+	# Only here for ${P}-configure-bashisms.patch, delete on next bump!
+	eautoreconf
+
 	if ! use static-libs; then
 		sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die
 	fi
diff --git a/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch
new file mode 100644
index 000000000000..04c01b0ecf88
--- /dev/null
+++ b/dev-libs/elfutils/files/elfutils-0.189-configure-bashisms.patch
@@ -0,0 +1,49 @@
+https://sourceware.org/git/?p=elfutils.git;a=commit;h=a9834d7df68afde4ee44ee8fef888cf7e799171a
+
+From a9834d7df68afde4ee44ee8fef888cf7e799171a Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sun, 5 Mar 2023 13:09:34 +0100
+Subject: [PATCH] configure.ac contains Bashisms
+
+Autoconf scripts are supposed to be written in POSIX-compatible shell
+language. elfutils commits 0ffe2874e75d48cb88936e119e5284ff2bf664d9
+and 3fa98a6f29b0f370e32549ead7eb897c839af980 introduced Bashisms to
+configure.ac that cause errors when /bin/sh is not Bash.
+
+Example error when /bin/sh is Dash:
+
+./configure: 8748: test: xyes: unexpected operator
+
+The cause of the error is the use of a non-existent == operator in
+expressions passed to the 'test' built-in command. POSIX shell
+specifies only an = operator for testing string equality.
+
+  * configure.ac: Replace == by = in use_msan and enable_demangler
+  comparisons.
+
+https://sourceware.org/bugzilla/show_bug.cgi?id=30196
+
+Reported-by: Matt Whitlock <sourceware@mattwhitlock.name>
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,7 +169,7 @@ if test "$use_msan" = yes; then
+   CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins -D_FORTIFY_SOURCE=0"
+   LDFLAGS="-shared"
+   AC_LINK_IFELSE([AC_LANG_SOURCE([int main (int argc, char **argv) { return 0; }])], use_msan=yes, use_msan=no)
+-  AS_IF([test "x$use_msan" == xyes],
++  AS_IF([test "x$use_msan" = xyes],
+         ac_cv_zdefs=no NO_UNDEFINED=,
+         AC_MSG_WARN([clang memory sanitizer not available])
+         CFLAGS="$old_CFLAGS" CXXFLAGS="$old_CXXFLAGS")
+@@ -493,7 +493,7 @@ AC_ARG_ENABLE([demangler],
+ AS_HELP_STRING([--disable-demangler],
+ 	       [Disable libstdc++ demangle support]),
+ 	       [], [enable_demangler=yes])
+-AS_IF([test "x$enable_demangler" == xyes],
++AS_IF([test "x$enable_demangler" = xyes],
+ AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl
+ AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
+ AM_CONDITIONAL(DEMANGLE, test "x$ac_cv_lib_stdcpp___cxa_demangle" = "xyes")
+-- 
+2.31.1
diff --git a/dev-libs/skalibs/Manifest b/dev-libs/skalibs/Manifest
index d1956cd8b368..e6fb3f743a0f 100644
--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@@ -3,5 +3,5 @@ DIST skalibs-2.13.0.0.tar.gz 227804 BLAKE2B ece7fd2152002300209e209277dd5950de07
 DIST skalibs-2.13.1.0.tar.gz 229637 BLAKE2B 38e9a6608b55178861ae0a8c86547c558a4b0d5c64cb9f841da0b5ae99cfcf951560d74806b4a1fd8086f2cf90bfc82b82be862cee6bb4b2c05ecb47a95071b4 SHA512 922a26f0113e22491d57aa2a577375245d70fea1478024c7130814426d978f4c18b59acbbe6a0b846a4776f0af34b966585318feb7e9b4fbcbfded459e061c9d
 EBUILD skalibs-2.12.0.1.ebuild 875 BLAKE2B c48ad519cbeb9490a176dd945dbe887b0f769db7faa197875bdfd166c4259449b569256b6fb7a657128baa98bcc0b96a418d05771fe490d942f62c13596f02dd SHA512 b2dd22acbcea15e81cb1d3c9f97191844e37692fc2cf050e185f752f6e206605edbaddf10da552292d7d8cf74b0e969b5e086d9f0fda86d937b642042eb99a2d
 EBUILD skalibs-2.13.0.0.ebuild 884 BLAKE2B dd113a40a743a501ae855ad516ac2bde15d28064ad0c5658896b0b4a4130258c9d88853d26e7c818f0c9403da43e22565e9f8e152a912a58ef6fd92393f92feb SHA512 57fbe0ab3cce6f5f1216424280edd063772d370ae095980a1ff3c8970ccf8ff664c28dec99eb594553521e95c13ef609473b2299849fe41f25cbd2034a896254
-EBUILD skalibs-2.13.1.0.ebuild 886 BLAKE2B fd19a28bd1914538af9cb033f32cac6f9c79cbc0058e53c16cb0ddf66eceb606b71f3f54d851a641c0283c90204220473d447ede5bb2f17c123b42b2ace506af SHA512 5f5cc7684836cfe9ae9f093e8826f2361aa40d950ccfc6e482b5562523deaf88e8bd2523e267ce92cabcaccc3fa948d8ce6d47a14ecbbc87320a2c38c1c4946b
+EBUILD skalibs-2.13.1.0.ebuild 885 BLAKE2B 5a8b6b07bc0c7380fc2bde71b55042ea1cca81bdaaa225ee9c5ebbeab27c8eeb6506f372f4abd59b7f4b3d8306a85594806de59a2b3506decde4831c88f34f88 SHA512 eb5d88c18968d20dbd1909a33a5f0302500f8f0277d80ce564f31a203acb3e48422a4f51df1c8aa6cebd80484ee7037da196ad9ec1e9e829197c73fb1ca593ff
 MISC metadata.xml 500 BLAKE2B c0d150ea1c31963b1fb45d6732790228212350f6007cb670440add82faeb2adb38f8f469227fad8532201db1248077fa188bda966437b738b10b4de069535f89 SHA512 44e355dca59a67de8da8b4d930b98ef7f31c6a99e7ad3d472d5cc445c2e689c1f27370b88ec136be438d8a14674608f55700d639089227e74231d70fef147f52
diff --git a/dev-libs/skalibs/skalibs-2.13.1.0.ebuild b/dev-libs/skalibs/skalibs-2.13.1.0.ebuild
index 746086486c1a..627673ede156 100644
--- a/dev-libs/skalibs/skalibs-2.13.1.0.ebuild
+++ b/dev-libs/skalibs/skalibs-2.13.1.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 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
 
 HTML_DOCS=( doc/. )
 
diff --git a/dev-libs/trio/Manifest b/dev-libs/trio/Manifest
index 3af34790f199..f32a56eb5b1d 100644
--- a/dev-libs/trio/Manifest
+++ b/dev-libs/trio/Manifest
@@ -1,5 +1,3 @@
 DIST trio-1.17.1.tar.gz 466909 BLAKE2B 1403c2534623b536de519cd428ac75480ecc0fcb9fbba693e329a923471947f068cae1e1fd453d10863255369e830ef5d8a75475d95f0f903e66936a9fa48e2b SHA512 574e360d88be838d13d7df5259c68809187a578d8d04981812ff768d3ab80215baf5595952994ec9fabbe3a6ce71512a7cd16d6a29b4f91dcd1b6f2ebcd3ed98
-DIST trio-1.17.tar.gz 452237 BLAKE2B 77ff673cc103b07b1424720d28c49d2e33a1402a98d8d21124fabb0cafd3498a99976d808cbbc5a90e1b3a063c6af68c3daf94768d533e4a762b730a253fa012 SHA512 19f4732b32c6a3754677d5766399fa70083c6a78c0d04b1dfa10a578b21405ba3e3d3af6543e4811f5fd305ec2727781a1b0f2888e59c574ca735f8406da7954
 EBUILD trio-1.17.1.ebuild 543 BLAKE2B 9dd9866ce09542ab61a8eba8056aceae8febc740aecb3fb3d73593bb0280589bd01b5b925aa0605a134aadbd4ebf0cdf0ab997adf4eb9a48d3514189f7a423bf SHA512 ed6edce0be2f0aaa347590a7a6088b1c6787f0576e7877cef9810b1a9212b7a7b2390c0c43bf3d5830270f5d8b810e045f7537df2d1a2290e4f9b6db9ebecc72
-EBUILD trio-1.17.ebuild 656 BLAKE2B 79dbc4cd7ee9bec4253781dcb4156251a60bc5d2223cda002f51850069a1e9b164790e9ad7ee6e47805f2589644ff01d79615f9803183d7fbbe60a49b9943599 SHA512 84e9aef3d5ce582852a6fcef7771761e230aec472c056a456c9aec12ea1b5d1b5857a4a99dcdf94b5ae51f750194481ba728c6a0dfddcf3b34ddf572ecec5805
 MISC metadata.xml 329 BLAKE2B 5863c898baa0c23c810edcdc6ae637b0a391579d1fee8db773c899bb936e36c76fb847e2d6de1410d9b6b286154459fb7d515f0a7f270c16a762274f4c19457f SHA512 5ee6ecb624bca2b159b5a6ebd0605d5ccef265c21f37e5f440317032a4144851b0b2eeaabf5fa89f710b9b18b85ad6812827cf9d32f4cfefc4d44e6592c98de2
diff --git a/dev-libs/trio/trio-1.17.ebuild b/dev-libs/trio/trio-1.17.ebuild
deleted file mode 100644
index b5edc06dd0f5..000000000000
--- a/dev-libs/trio/trio-1.17.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="doxygen"
-DOCS_DIR="doc"
-
-inherit autotools docs
-
-DESCRIPTION="Portable string functions, focus on the *printf() and *scanf() clones"
-HOMEPAGE="https://daniel.haxx.se/projects/trio/"
-SRC_URI="https://github.com/orbea/trio/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="trio"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-src_prepare() {
-	default
-	# Required to fix -Werror=strict-prototypes configure errors
-	eautoreconf
-}
-
-src_compile() {
-	default
-	docs_compile
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}