| 1 |
commit: 21f73902ec913586b2cdf580499b175cc01a23c0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 21 19:49:26 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 21 19:55:29 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21f73902 |
| 7 |
|
| 8 |
app-shells/esh: port to EAPI 7, fix Prefix |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
app-shells/esh/esh-0.8.5-r2.ebuild | 33 ++++++++++++++++++++++----------- |
| 13 |
app-shells/esh/metadata.xml | 2 +- |
| 14 |
2 files changed, 23 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-shells/esh/esh-0.8.5-r2.ebuild b/app-shells/esh/esh-0.8.5-r2.ebuild |
| 17 |
index 052258caf92..5208355cf0e 100644 |
| 18 |
--- a/app-shells/esh/esh-0.8.5-r2.ebuild |
| 19 |
+++ b/app-shells/esh/esh-0.8.5-r2.ebuild |
| 20 |
@@ -1,43 +1,51 @@ |
| 21 |
-# Copyright 1999-2015 Gentoo Foundation |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=5 |
| 26 |
-inherit flag-o-matic toolchain-funcs |
| 27 |
+EAPI=7 |
| 28 |
+ |
| 29 |
+inherit flag-o-matic toolchain-funcs prefix |
| 30 |
|
| 31 |
DESCRIPTION="A UNIX Shell with a simplified Scheme syntax" |
| 32 |
HOMEPAGE="http://slon.ttk.ru/esh/" |
| 33 |
SRC_URI="http://slon.ttk.ru/esh/${P}.tar.gz" |
| 34 |
+S="${WORKDIR}"/${PN} |
| 35 |
|
| 36 |
LICENSE="GPL-2" |
| 37 |
SLOT="0" |
| 38 |
KEYWORDS="amd64 ppc x86" |
| 39 |
IUSE="debug" |
| 40 |
|
| 41 |
-DEPEND=">=sys-libs/readline-4.1" |
| 42 |
+DEPEND=">=sys-libs/readline-4.1:=" |
| 43 |
RDEPEND="${DEPEND}" |
| 44 |
- |
| 45 |
-S="${WORKDIR}/${PN}" |
| 46 |
+BDEPEND="virtual/pkgconfig" |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
+ default |
| 50 |
+ |
| 51 |
+ # For some reason, this tarball has binary files in it for x86. |
| 52 |
+ # Make clean so we can rebuild for our arch and optimization. |
| 53 |
emake clean |
| 54 |
|
| 55 |
sed -i \ |
| 56 |
-e 's|-g ||' \ |
| 57 |
-e 's|-DMEM_DEBUG ||' \ |
| 58 |
-e 's|^CFLAGS|&+|g' \ |
| 59 |
- -e 's|$(CC) |&$(CFLAGS) $(LDFLAGS) |g' \ |
| 60 |
+ -e 's|$(CC) |&$(CFLAGS) $(CPPFLAGS) $(INC) $(LDFLAGS) $(LIB) $(LIBS)|g' \ |
| 61 |
-e 's:-ltermcap::' \ |
| 62 |
+ -e "s:/usr/include/readline:${ESYSROOT}/usr/include/readline:" \ |
| 63 |
+ -e "s:LIB=-readline:$($(tc-getPKG_CONFIG) --libs readline):" \ |
| 64 |
Makefile || die |
| 65 |
} |
| 66 |
|
| 67 |
src_compile() { |
| 68 |
- # For some reason, this tarball has binary files in it for x86. |
| 69 |
- # Make clean so we can rebuild for our arch and optimization. |
| 70 |
- |
| 71 |
use debug && append-flags -DMEM_DEBUG |
| 72 |
|
| 73 |
+ append-cppflags "$($(tc-getPKG_CONFIG) --cflags readline)" |
| 74 |
+ |
| 75 |
emake \ |
| 76 |
CC="$(tc-getCC)" \ |
| 77 |
+ CFLAGS="${CFLAGS} \$(INC)" \ |
| 78 |
+ CPPFLAGS="${CPPFLAGS}" \ |
| 79 |
LDFLAGS="${LDFLAGS}" |
| 80 |
} |
| 81 |
|
| 82 |
@@ -45,7 +53,10 @@ src_install() { |
| 83 |
dobin esh |
| 84 |
doinfo doc/esh.info |
| 85 |
dodoc CHANGELOG CREDITS GC_README HEADER READLINE-HACKS TODO |
| 86 |
- dohtml doc/*.html |
| 87 |
+ |
| 88 |
+ docinto html |
| 89 |
+ dodoc doc/*.html |
| 90 |
+ |
| 91 |
docinto examples |
| 92 |
dodoc examples/* |
| 93 |
} |
| 94 |
|
| 95 |
diff --git a/app-shells/esh/metadata.xml b/app-shells/esh/metadata.xml |
| 96 |
index 6f49eba8f49..7a38bb90096 100644 |
| 97 |
--- a/app-shells/esh/metadata.xml |
| 98 |
+++ b/app-shells/esh/metadata.xml |
| 99 |
@@ -1,5 +1,5 @@ |
| 100 |
<?xml version="1.0" encoding="UTF-8"?> |
| 101 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 102 |
<pkgmetadata> |
| 103 |
-<!-- maintainer-needed --> |
| 104 |
+ <!-- maintainer-needed --> |
| 105 |
</pkgmetadata> |
Archives