[gentoo-commits] repo/gentoo:master commit in: app-text/reed/

[gentoo-commits] repo/gentoo:master commit in: app-text/reed/

[Sam James]

commit:     959ea46b6cb40ff778fe95eb8a7c5d03301723ce
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 04:23:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 04:31:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959ea46b

app-text/reed: attempt at fixing build (finding ncurses)

pkgconfig wasn't listed as an explicit dependency, so perhaps
that was the issue.

Closes: https://bugs.gentoo.org/677526
Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/reed/reed-5.4.ebuild | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild
index 10999a62f90..6e417c03798 100644
--- a/app-text/reed/reed-5.4.ebuild
+++ b/app-text/reed/reed-5.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
 # Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
@@ -13,19 +14,25 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS BUGS NEWS README )
 
 src_prepare() {
-	sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
+	default
+
+	sed -e 's;-O2;$(CFLAGS) $(LDFLAGS);' \
 		-e 's: wrap::' \
 		-e 's:-s reed:reed:' \
-		-e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
+		-e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
 		-i Makefile.in || die
-	rm wrap.1 #Collision with talkfilters, bug #247396
-	tc-export CC PKG_CONFIG
+
+	# Collision with talkfilters, bug #247396
+	rm wrap.1 || die
+
+	tc-export CC
 }
 
 src_configure() {