commit: 8bca653c406eab635c04db4e0fbae3b16de81c07
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 20:41:42 2021 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 20:47:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bca653c
dev-scheme/chez: fix for ncurses detection; ncurses slot
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-scheme/chez/{chez-9.5.6.ebuild => chez-9.5.6-r1.ebuild} | 10 +++++++---
dev-scheme/chez/files/tinfo.patch | 12 ------------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/dev-scheme/chez/chez-9.5.6.ebuild
b/dev-scheme/chez/chez-9.5.6-r1.ebuild
similarity index 86%
rename from dev-scheme/chez/chez-9.5.6.ebuild
rename to dev-scheme/chez/chez-9.5.6-r1.ebuild
index 3755edbfecd6..6ec1f6d5145f 100644
--- a/dev-scheme/chez/chez-9.5.6.ebuild
+++ b/dev-scheme/chez/chez-9.5.6-r1.ebuild
@@ -19,17 +19,21 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X examples ncurses threads"
+BDEPEND="virtual/pkgconfig"
RDEPEND="
X? ( x11-libs/libX11 )
- ncurses? ( sys-libs/ncurses )
+ ncurses? ( sys-libs/ncurses:= )
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/tinfo.patch" )
-
src_prepare() {
tc-export AR CC CXX LD RANLIB
+ if use ncurses ; then
+ local nclibs="\"$($(tc-getPKG_CONFIG) --libs ncurses)\""
+ sed -i "s|ncursesLib=-lncurses|ncursesLib=${nclibs}|g"
configure || die
+ fi
+
default
}
diff --git a/dev-scheme/chez/files/tinfo.patch
b/dev-scheme/chez/files/tinfo.patch
deleted file mode 100644
index a7dc613bd234..000000000000
--- a/dev-scheme/chez/files/tinfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-index b8ff70a..349bc3f 100755
---- a/configure
-+++ b/configure
-@@ -483,7 +483,7 @@ if [ "$disablex11" = "yes" ]; then
- fi
-
- cursesLib=-lcurses
--ncursesLib=-lncurses
-+ncursesLib="-lncurses -ltinfo"
-
- if [ "$disablecurses" = "yes" ]; then
- echo '#define DISABLE_CURSES' >> $w/c/config.h
