1 |
commit: d89a7f844b180bc6ca79ac0948b2ec3b85c9c1b6 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 1 10:44:12 2014 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 1 10:44:12 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d89a7f84 |
7 |
|
8 |
app-shells/mpibash: Bump to EAPI=5 |
9 |
|
10 |
Package-Manager: portage-2.2.14 |
11 |
|
12 |
--- |
13 |
app-shells/mpibash/ChangeLog | 4 ++++ |
14 |
app-shells/mpibash/metadata.xml | 20 ++++++++-------- |
15 |
app-shells/mpibash/mpibash-4.3_p24.ebuild | 38 +++++++++++++++---------------- |
16 |
3 files changed, 33 insertions(+), 29 deletions(-) |
17 |
|
18 |
diff --git a/app-shells/mpibash/ChangeLog b/app-shells/mpibash/ChangeLog |
19 |
index 58fda67..d8edb92 100644 |
20 |
--- a/app-shells/mpibash/ChangeLog |
21 |
+++ b/app-shells/mpibash/ChangeLog |
22 |
@@ -2,6 +2,10 @@ |
23 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+ 01 Nov 2014; Justin Lecher <jlec@g.o> mpibash-4.3_p24.ebuild, |
27 |
+ metadata.xml: |
28 |
+ Bump to EAPI=5 |
29 |
+ |
30 |
*mpibash-4.3_p24 (29 Aug 2014) |
31 |
|
32 |
29 Aug 2014; Christoph Junghans <ottxor@g.o> |
33 |
|
34 |
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml |
35 |
index 8598dc9..372a889 100644 |
36 |
--- a/app-shells/mpibash/metadata.xml |
37 |
+++ b/app-shells/mpibash/metadata.xml |
38 |
@@ -1,16 +1,16 @@ |
39 |
<?xml version="1.0" encoding="UTF-8"?> |
40 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
41 |
<pkgmetadata> |
42 |
-<herd>base-system</herd> |
43 |
-<use> |
44 |
- <flag name='bashlogger'>Log ALL commands typed into bash; should ONLY be |
45 |
+ <herd>base-system</herd> |
46 |
+ <use> |
47 |
+ <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be |
48 |
used in restricted environments such as honeypots</flag> |
49 |
- <flag name='mem-scramble'>Build with custom malloc/free overwriting allocated/freed memory</flag> |
50 |
- <flag name='net'>Enable /dev/tcp/host/port redirection</flag> |
51 |
- <flag name='plugins'>Add support for loading builtins at runtime via |
52 |
+ <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag> |
53 |
+ <flag name="net">Enable /dev/tcp/host/port redirection</flag> |
54 |
+ <flag name="plugins">Add support for loading builtins at runtime via |
55 |
'enable'</flag> |
56 |
-</use> |
57 |
-<upstream> |
58 |
- <remote-id type="cpe">cpe:/a:gnu:bash</remote-id> |
59 |
-</upstream> |
60 |
+ </use> |
61 |
+ <upstream> |
62 |
+ <remote-id type="cpe">cpe:/a:gnu:bash</remote-id> |
63 |
+ </upstream> |
64 |
</pkgmetadata> |
65 |
|
66 |
diff --git a/app-shells/mpibash/mpibash-4.3_p24.ebuild b/app-shells/mpibash/mpibash-4.3_p24.ebuild |
67 |
index cf8e545..f6e8cc4 100644 |
68 |
--- a/app-shells/mpibash/mpibash-4.3_p24.ebuild |
69 |
+++ b/app-shells/mpibash/mpibash-4.3_p24.ebuild |
70 |
@@ -2,7 +2,7 @@ |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-4.3_p24.ebuild,v 1.1 2014/08/24 17:53:01 polynomial-c Exp $ |
73 |
|
74 |
-EAPI="4" |
75 |
+EAPI=5 |
76 |
|
77 |
inherit autotools eutils flag-o-matic toolchain-funcs multilib |
78 |
|
79 |
@@ -38,17 +38,17 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" |
80 |
|
81 |
LICENSE="GPL-3" |
82 |
SLOT="0" |
83 |
+KEYWORDS="" |
84 |
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
85 |
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla" |
86 |
|
87 |
-DEPEND=">=sys-libs/ncurses-5.2-r2 |
88 |
+DEPEND=" |
89 |
+ sys-libs/ncurses |
90 |
readline? ( >=sys-libs/readline-${READLINE_VER} ) |
91 |
nls? ( virtual/libintl )" |
92 |
RDEPEND="${DEPEND} |
93 |
virtual/mpi |
94 |
- sys-cluster/libcircle |
95 |
- !<sys-apps/portage-2.1.6.7_p1 |
96 |
- !<sys-apps/paludis-0.26.0_alpha5" |
97 |
+ sys-cluster/libcircle" |
98 |
# we only need yacc when the .y files get patched (bash42-005) |
99 |
DEPEND+=" virtual/yacc" |
100 |
|
101 |
@@ -76,7 +76,7 @@ src_prepare() { |
102 |
|
103 |
# Clean out local libs so we know we use system ones w/releases. |
104 |
if [[ ${PV} != *_rc* ]] ; then |
105 |
- rm -rf lib/{readline,termcap}/* |
106 |
+ rm -rf lib/{readline,termcap}/* || die |
107 |
touch lib/{readline,termcap}/Makefile.in # for config.status |
108 |
sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die |
109 |
fi |
110 |
@@ -85,10 +85,11 @@ src_prepare() { |
111 |
sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die |
112 |
touch -r . doc/* |
113 |
|
114 |
- epatch "${FILESDIR}"/${PN#mpi}-4.3-compat-lvl.patch |
115 |
- epatch "${FILESDIR}"/${PN#mpi}-4.3-parse-time-keyword.patch |
116 |
- epatch "${FILESDIR}"/${PN#mpi}-4.3-append-process-segfault.patch |
117 |
- epatch "${FILESDIR}"/${PN}-4.3.patch |
118 |
+ epatch \ |
119 |
+ "${FILESDIR}"/${PN#mpi}-4.3-compat-lvl.patch \ |
120 |
+ "${FILESDIR}"/${PN#mpi}-4.3-parse-time-keyword.patch \ |
121 |
+ "${FILESDIR}"/${PN#mpi}-4.3-append-process-segfault.patch \ |
122 |
+ "${FILESDIR}"/${PN}-4.3.patch |
123 |
|
124 |
epatch_user |
125 |
|
126 |
@@ -140,7 +141,8 @@ src_configure() { |
127 |
else |
128 |
# Disable the plugins logic by hand since bash doesn't |
129 |
# provide a way of doing it. |
130 |
- export ac_cv_func_dl{close,open,sym}=no \ |
131 |
+ export \ |
132 |
+ ac_cv_func_dl{close,open,sym}=no \ |
133 |
ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no |
134 |
sed -i \ |
135 |
-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \ |
136 |
@@ -164,11 +166,9 @@ src_configure() { |
137 |
} |
138 |
|
139 |
src_compile() { |
140 |
- emake |
141 |
+ default |
142 |
|
143 |
- if use plugins ; then |
144 |
- emake -C examples/loadables all others |
145 |
- fi |
146 |
+ use plugins && emake -C examples/loadables all others |
147 |
} |
148 |
|
149 |
src_install() { |
150 |
@@ -176,7 +176,7 @@ src_install() { |
151 |
|
152 |
default |
153 |
|
154 |
- find "${ED}" -name "bashbug*" -delete |
155 |
+ find "${ED}" -name "bashbug*" -delete || die |
156 |
mv "${ED}"/usr/share/man/man1/{,mpi}bash.1 || die |
157 |
mv "${ED}"/usr/share/info/{,mpi}bash.info || die |
158 |
return 0 |
159 |
@@ -245,8 +245,8 @@ pkg_preinst() { |
160 |
# missing even temporarily causes a fatal error with paludis. |
161 |
local target=$(readlink "${EROOT}"/bin/sh) |
162 |
local tmp=$(emktemp "${EROOT}"/bin) |
163 |
- ln -sf "${target}" "${tmp}" |
164 |
- mv -f "${tmp}" "${EROOT}"/bin/sh |
165 |
+ ln -sf "${target}" "${tmp}" || die |
166 |
+ mv -f "${tmp}" "${EROOT}"/bin/sh || die |
167 |
fi |
168 |
} |
169 |
|
170 |
@@ -254,6 +254,6 @@ pkg_postinst() { |
171 |
return 0 |
172 |
# If /bin/sh does not exist, provide it |
173 |
if [[ ! -e ${EROOT}/bin/sh ]] ; then |
174 |
- ln -sf bash "${EROOT}"/bin/sh |
175 |
+ ln -sf bash "${EROOT}"/bin/sh || die |
176 |
fi |
177 |
} |