[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgpg-error/

["Sam James" <sam@gentoo.org>]

commit:     8bdb31ed5381d8d37c372758bb4c877260f28ab8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 06:11:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 24 06:11:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bdb31ed

dev-libs/libgpg-error: drop need for eautoreconf

Prefix doesn't bootstrap gettext so autopoint run as part of autoreconf fails.

Changes:
* We can replace the need for patch with a stub script which always exits w/ 0.
* Update the sed for Solaris to work on both configure.ac & configure
  (while it does assume /bin/sh is a suitable shell, the old fix did too,
  as the case statement would fallback to it, so this is functionally equivalent).

Bug: https://bugs.gentoo.org/932598
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libgpg-error/libgpg-error-1.49.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
index 0939b629b21f..260aaab7fae6 100644
--- a/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
+++ b/dev-libs/libgpg-error/libgpg-error-1.49.ebuild
@@ -10,7 +10,7 @@ EAPI=8
 # any subsequent ones linked within so you're covered for a while.)
 
 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools multilib-minimal toolchain-funcs verify-sig
+inherit multilib-minimal toolchain-funcs verify-sig
 
 DESCRIPTION="Contains error handling functions used by GnuPG software"
 HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
@@ -40,23 +40,25 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gpgrt-config
 )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48-remove_broken_check.patch"
-)
-
 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
+		sed -i -e 's:INSTALLSHELLPATH=/usr/xpg4/bin/sh:INSTALLSHELLPATH=/bin/sh:g' configure.ac configure || die
 	fi
 
+	# This check breaks multilib
+	cat <<-EOF > src/gpg-error-config-test.sh.in || die
+	#!@INSTALLSHELLPATH@
+	exit 0
+	EOF
+
 	# 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
-	sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
-	eautoreconf
+	#sed -i -e "1s:.*:#\!${BASH}:" autogen.sh || die
+	#eautoreconf
 }
 
 multilib_src_configure() {