gentoo new year resync : 01.01.2021

4 files changed, 21 insertions, 6 deletions

diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index e5030cefa579..74dce346906b 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -4,7 +4,7 @@ DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca913
 DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
 DIST libgpg-error-1.39.tar.bz2 961676 BLAKE2B 8753a9295ca57ba79142ffbc7fa01a986addcdd6a8860cf80c9e1bf9f6f9dfce874f804205a5cdd956e026eb006f2662110c63e7ed52c7a42ee0c45923ae52be SHA512 b28be183ac3d3920363558c4b5b2c24f9074a302799915cc076674bb349dcfb6f09160bec1d3fb62e04047c3ce432d345f36b0905100a88cc730b53d4eb78e42
 DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
-EBUILD libgpg-error-1.38.ebuild 2098 BLAKE2B e6fe3a7061d14093f0a4d40bb5b52c09f7deda0c0a9c0b99995830f4438f9b16c646208db39cc775851f68407582fc4615e784182bfbd3f68d7d4647cc681eb7 SHA512 1bd54aa4ce63b8fd33d21276bcd64305bcd7c3c152475bdde036cafe43d053dea509a4bd56acc41188b07ba6458fb78dbfcd7c13e4ccb4f7e5e2d6e0ec0f55c8
-EBUILD libgpg-error-1.39.ebuild 1670 BLAKE2B 190511d2ebedc9abf79b1a52cae589963fb147ceb790f71584ca8f8d9ffa0282c83f814947dced30d179a6ffe5a7d974f9fd6179b18ea76e70aa05fee9c4bf9e SHA512 a41a686a938549a108ec2bf59a36e1813d5fddb0e35e25b10eafbe13371496ce94bf8f721f9ba58485a629afcfdf7a7f42640996e5c739d11f4a4dcc04a63c74
-EBUILD libgpg-error-1.41.ebuild 1670 BLAKE2B 190511d2ebedc9abf79b1a52cae589963fb147ceb790f71584ca8f8d9ffa0282c83f814947dced30d179a6ffe5a7d974f9fd6179b18ea76e70aa05fee9c4bf9e SHA512 a41a686a938549a108ec2bf59a36e1813d5fddb0e35e25b10eafbe13371496ce94bf8f721f9ba58485a629afcfdf7a7f42640996e5c739d11f4a4dcc04a63c74
+EBUILD libgpg-error-1.38.ebuild 2078 BLAKE2B c571751e19d709608ef8a75a8bdceb4c4fcee6665858e048c2424a4e93aac88a4a4f49c855fc8b70ff2a9261d2d68e2f38a94ce6b2e602578f592fd0ef18ed78 SHA512 d2aeaac9f57c665533d57298377776928a410e35a3cb2128968a8385d8a7ce92816fc217bb9889c81d001a7deef76d0a21ff5fbec885e04054381f0194030cdb
+EBUILD libgpg-error-1.39.ebuild 1650 BLAKE2B 265d2709fbecb9780d0783f9866afe5d8597c60ee9e515cdb087a324c1e15e152310718b69f3676d103a2c6a497eb7d28b7681b14d7e5864379cb35073ad9710 SHA512 1f4201633bd3e8cd1a839b949904bb9610a675e82faa54021f1a59f1deafa6eedbe6822b2738bd826df2ce9b39aa846ee17065584f43313dcd04c87d7343ed07
+EBUILD libgpg-error-1.41.ebuild 2150 BLAKE2B 84d3b60290162d42128f44a142ef1e563af6951811e4c292b048f31a9c2b7b031c47f5ef86953e4a013773dbe132c8061789e5e498ad54bb304e43742921c8d8 SHA512 932b7175852992a595ee61ba9b1c6a75a59a7561e62b2d997df2ade36905ef3027d4c21401e3ac235d0f3e5b2672f018c0d3fa5bb48f782d5b6b39b283dfc5fd
 MISC metadata.xml 413 BLAKE2B 52ac9e1edfca8673904a9c73c51f1d46bc844db1cd320291f90dc53c89aedb24a4e1a27f01b1fe0b517cd00468300e54aec95632b453c0cb52a54ddfb5bf55d9 SHA512 6334af8e8e833c43414adb35635f42163d9f87e7a0659b03e5a51c8250ec8a1f1b72c13617050ab75e9eac0ed0377919424aec0c3bc13cc5efac32cf863f8948
diff --git a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
index 4baca344efba..a27a868a101a 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.38.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
index dcb9068911b4..7cdaab3047ae 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.39.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
index dcb9068911b4..be7802c9db40 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.41.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp nls"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@@ -32,11 +32,26 @@ PATCHES=(
 
 src_prepare() {
 	default
+
+	if use prefix ; then
+		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
+		sed -i -e 's/solaris\*/disabled/' configure.ac || die
+	fi
+
 	# only necessary for as long as we run eautoreconf, configure.ac
 	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
 	# not a pure /bin/sh script, so it fails on some hosts
 	hprefixify -w 1 autogen.sh
 	eautoreconf
+
+	if use prefix ; then
+		# upstream seems not interested in trying to understand (#584330)
+		# https://lists.gnupg.org/pipermail/gnupg-devel/2017-March/032671.html
+		# again reported as https://dev.gnupg.org/T4474
+		einfo "Forcing -no-undefined libtool flag ..."
+		sed -i -e 's/\$(no_undefined)/-no-undefined/' src/Makefile.in
+		eend $? || die
+	fi
 }
 
 multilib_src_configure() {