1 |
commit: d0e4b627f95a29ec0fb75aca074a82530aa572b2 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 21 19:51:59 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 21 19:55:30 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e4b627 |
7 |
|
8 |
app-shells/shish: port to EAPI 7 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
app-shells/shish/shish-0.7_pre3-r1.ebuild | 21 ++++++++++----------- |
13 |
1 file changed, 10 insertions(+), 11 deletions(-) |
14 |
|
15 |
diff --git a/app-shells/shish/shish-0.7_pre3-r1.ebuild b/app-shells/shish/shish-0.7_pre3-r1.ebuild |
16 |
index 11fee89ec6d..10c7d469d2d 100644 |
17 |
--- a/app-shells/shish/shish-0.7_pre3-r1.ebuild |
18 |
+++ b/app-shells/shish/shish-0.7_pre3-r1.ebuild |
19 |
@@ -1,7 +1,7 @@ |
20 |
-# Copyright 1999-2012 Gentoo Foundation |
21 |
+# Copyright 1999-2021 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=5 |
25 |
+EAPI=7 |
26 |
|
27 |
inherit toolchain-funcs |
28 |
|
29 |
@@ -11,6 +11,7 @@ MY_P="${PN}-${MY_PV}" |
30 |
DESCRIPTION="The diet shell" |
31 |
HOMEPAGE="http://www.blah.ch/shish/" |
32 |
SRC_URI="http://www.blah.ch/${PN}/pkg/${MY_P}.tar.bz2" |
33 |
+S="${WORKDIR}/${MY_P}" |
34 |
|
35 |
LICENSE="GPL-2" |
36 |
SLOT="0" |
37 |
@@ -20,15 +21,11 @@ IUSE="debug diet" |
38 |
DEPEND="diet? ( dev-libs/dietlibc )" |
39 |
RDEPEND="${DEPEND}" |
40 |
|
41 |
-S="${WORKDIR}/${MY_P}" |
42 |
- |
43 |
DOCS=( AUTHORS BUGS ChangeLog README TODO ) |
44 |
|
45 |
-pkg_setup() { |
46 |
- use diet && export CC="diet $(tc-getCC) -nostdinc" |
47 |
-} |
48 |
- |
49 |
src_prepare() { |
50 |
+ default |
51 |
+ |
52 |
# Respect CFLAGS, bug #439974 |
53 |
sed -i \ |
54 |
-e '/CFLAGS="$CFLAGS/d' \ |
55 |
@@ -37,6 +34,8 @@ src_prepare() { |
56 |
} |
57 |
|
58 |
src_configure() { |
59 |
+ use diet && export CC="diet $(tc-getCC) -nostdinc" |
60 |
+ |
61 |
econf \ |
62 |
$(use_enable debug) \ |
63 |
--disable-quiet # bug 439974 |
64 |
@@ -53,7 +52,7 @@ src_install() { |
65 |
} |
66 |
|
67 |
pkg_postinst() { |
68 |
- einfo "Updating ${ROOT}etc/shells" |
69 |
- ( grep -v "^/bin/shish$" "${ROOT}"etc/shells; echo "/bin/shish" ) > "${T}"/shells |
70 |
- mv -f "${T}"/shells "${ROOT}"etc/shells |
71 |
+ einfo "Updating ${EROOT}/etc/shells" |
72 |
+ ( grep -v "^/bin/shish$" "${EROOT}"/etc/shells; echo "/bin/shish" ) > "${T}"/shells |
73 |
+ mv -f "${T}"/shells "${EROOT}"/etc/shells |
74 |
} |