[gentoo-commits] repo/gentoo:master commit in: app-shells/esh/

[gentoo-commits] repo/gentoo:master commit in: app-shells/esh/

[Sam James]

commit:     21f73902ec913586b2cdf580499b175cc01a23c0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 19:49:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 19:55:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f73902

app-shells/esh: port to EAPI 7, fix Prefix

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-shells/esh/esh-0.8.5-r2.ebuild | 33 ++++++++++++++++++++++-----------
 app-shells/esh/metadata.xml        |  2 +-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/app-shells/esh/esh-0.8.5-r2.ebuild b/app-shells/esh/esh-0.8.5-r2.ebuild
index 052258caf92..5208355cf0e 100644
--- a/app-shells/esh/esh-0.8.5-r2.ebuild
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild
@@ -1,43 +1,51 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs prefix
 
 DESCRIPTION="A UNIX Shell with a simplified Scheme syntax"
 HOMEPAGE="http://slon.ttk.ru/esh/"
 SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/readline-4.1"
+DEPEND=">=sys-libs/readline-4.1:="
 RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+
+	# For some reason, this tarball has binary files in it for x86.
+	# Make clean so we can rebuild for our arch and optimization.
 	emake clean
 
 	sed -i \
 		-e 's|-g ||' \
 		-e 's|-DMEM_DEBUG ||' \
 		-e 's|^CFLAGS|&+|g' \
-		-e 's|$(CC) |&$(CFLAGS) $(LDFLAGS) |g' \
+		-e 's|$(CC) |&$(CFLAGS) $(CPPFLAGS) $(INC) $(LDFLAGS) $(LIB) $(LIBS)|g' \
 		-e 's:-ltermcap::' \
+		-e "s:/usr/include/readline:${ESYSROOT}/usr/include/readline:" \
+		-e "s:LIB=-readline:$($(tc-getPKG_CONFIG) --libs readline):" \
 		Makefile || die
 }
 
 src_compile() {
-	# For some reason, this tarball has binary files in it for x86.
-	# Make clean so we can rebuild for our arch and optimization.
-
 	use debug && append-flags -DMEM_DEBUG
 
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags readline)"
+
 	emake \
 		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} \$(INC)" \
+		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 }
 
@@ -45,7 +53,10 @@ src_install() {
 	dobin esh
 	doinfo doc/esh.info
 	dodoc CHANGELOG CREDITS GC_README HEADER READLINE-HACKS TODO
-	dohtml doc/*.html
+
+	docinto html
+	dodoc doc/*.html
+
 	docinto examples
 	dodoc examples/*
 }

diff --git a/app-shells/esh/metadata.xml b/app-shells/esh/metadata.xml
index 6f49eba8f49..7a38bb90096 100644
--- a/app-shells/esh/metadata.xml
+++ b/app-shells/esh/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: app-shells/esh/

[Sam James]

commit:     1fc6746fa3e6fea6bad24ea2abf6f8728a713065
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 20:01:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 20:01:51 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fc6746f

app-shells/esh: drop prefix inherit

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-shells/esh/esh-0.8.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-shells/esh/esh-0.8.5-r2.ebuild b/app-shells/esh/esh-0.8.5-r2.ebuild
index 5208355cf0e..164a969d91f 100644
--- a/app-shells/esh/esh-0.8.5-r2.ebuild
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs prefix
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A UNIX Shell with a simplified Scheme syntax"
 HOMEPAGE="http://slon.ttk.ru/esh/"