sys-libs/ncurses: don't call LD & pkg-config directly

Bug: https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html
Closes: https://bugs.gentoo.org/866398
Thanks-to: Allen Webb <allenwebb@google.com>
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 22 insertions, 10 deletions

diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
index 1a8b50aab67f..f7f4f7c7d153 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423-r1.ebuild
@@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then
 	#	"At times (generally to mark a relatively stable point), I create a rollup
 	#	patch, which consists of all changes from the release through the current date."
 	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
 	# This array should contain a list of all the snapshots since the last
 	# release if there's no megapatch available yet.
 	PATCH_DATES=(
@@ -120,6 +124,12 @@ src_configure() {
 	# bug #214642
 	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
 
+	# Should be fixed upstream soon:
+	# https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html
+	# bug #866398
+	sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die
+	sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die
+
 	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
 	# Order matters here -- we want unicode/thread versions to come last so that the
 	# binaries in /usr/bin support both wide and narrow.
@@ -258,11 +268,7 @@ do_configure() {
 		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
 	fi
 
-	# Force bash until upstream rebuilds the configure script with a newer
-	# version of autotools. bug #545532
-	#CONFIG_SHELL=${EPREFIX}/bin/bash \
-	ECONF_SOURCE="${S}" \
-	econf "${conf[@]}" "$@"
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
 }
 
 src_compile() {
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
index 4b4374096d7a..223791bd1371 100644
--- a/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
+++ b/sys-libs/ncurses/ncurses-6.3_p20220423.ebuild
@@ -22,6 +22,10 @@ if [[ ${PV} == *_p* ]] ; then
 	#	"At times (generally to mark a relatively stable point), I create a rollup
 	#	patch, which consists of all changes from the release through the current date."
 	#
+	# Also, from https://lists.gnu.org/archive/html/bug-ncurses/2019-08/msg00039.html,
+	# the patches are considered to be acceptable to use after some testing. They
+	# are both for development but also bug fixes.
+	#
 	# This array should contain a list of all the snapshots since the last
 	# release if there's no megapatch available yet.
 	PATCH_DATES=(
@@ -120,6 +124,12 @@ src_configure() {
 	# bug #214642
 	BUILD_CPPFLAGS+=" -D_GNU_SOURCE"
 
+	# Should be fixed upstream soon:
+	# https://lists.gnu.org/archive/html/bug-ncurses/2022-08/msg00024.html
+	# bug #866398
+	sed -i -e 's/ld --verbose/${LD} --verbose/' configure || die
+	sed -i -e 's/pkg-config --version/${PKG_CONFIG} --version/' misc/gen-pkgconfig.in || die
+
 	# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
 	# Order matters here -- we want unicode/thread versions to come last so that the
 	# binaries in /usr/bin support both wide and narrow.
@@ -258,11 +268,7 @@ do_configure() {
 		[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
 	fi
 
-	# Force bash until upstream rebuilds the configure script with a newer
-	# version of autotools. bug #545532
-	#CONFIG_SHELL=${EPREFIX}/bin/bash \
-	ECONF_SOURCE="${S}" \
-	econf "${conf[@]}" "$@"
+	ECONF_SOURCE="${S}" econf "${conf[@]}" "$@"
 }
 
 src_compile() {