1 |
commit: 3fda85d3fef1fad04e37c214446cc1b759659ee2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 7 23:21:09 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 7 23:23:29 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fda85d3 |
7 |
|
8 |
sys-libs/db: Another batch of EAPI-7 revbumps |
9 |
|
10 |
Fixed whitespace issue from previous EAPI-7 revbump |
11 |
|
12 |
Closes: https://bugs.gentoo.org/655302 |
13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
sys-libs/db/db-3.2.9_p2-r1.ebuild | 2 +- |
17 |
.../{db-4.8.30-r2.ebuild => db-4.8.30-r3.ebuild} | 83 ++++++------ |
18 |
.../{db-5.1.29-r1.ebuild => db-5.1.29-r2.ebuild} | 142 +++++++++++---------- |
19 |
.../{db-5.3.28-r3.ebuild => db-5.3.28-r4.ebuild} | 133 ++++++++++--------- |
20 |
.../{db-6.0.35-r1.ebuild => db-6.0.35-r2.ebuild} | 124 +++++++++--------- |
21 |
sys-libs/db/files/db-4.8-libtool.patch | 4 +- |
22 |
6 files changed, 260 insertions(+), 228 deletions(-) |
23 |
|
24 |
diff --git a/sys-libs/db/db-3.2.9_p2-r1.ebuild b/sys-libs/db/db-3.2.9_p2-r1.ebuild |
25 |
index a575baafe1c..5385f48b606 100644 |
26 |
--- a/sys-libs/db/db-3.2.9_p2-r1.ebuild |
27 |
+++ b/sys-libs/db/db-3.2.9_p2-r1.ebuild |
28 |
@@ -131,7 +131,7 @@ src_compile() { |
29 |
pushd "${S}"/build-static &>/dev/null || die |
30 |
emake strip="${EPREFIX}"/bin/true |
31 |
popd &>/dev/null || die |
32 |
- |
33 |
+ |
34 |
einfo "Building ${P} (shared)..." |
35 |
pushd build-shared &>/dev/null || die |
36 |
emake strip="${EPREFIX}"/bin/true |
37 |
|
38 |
diff --git a/sys-libs/db/db-4.8.30-r2.ebuild b/sys-libs/db/db-4.8.30-r3.ebuild |
39 |
similarity index 80% |
40 |
rename from sys-libs/db/db-4.8.30-r2.ebuild |
41 |
rename to sys-libs/db/db-4.8.30-r3.ebuild |
42 |
index 23c18500065..8479c2a10fb 100644 |
43 |
--- a/sys-libs/db/db-4.8.30-r2.ebuild |
44 |
+++ b/sys-libs/db/db-4.8.30-r3.ebuild |
45 |
@@ -1,20 +1,20 @@ |
46 |
# Copyright 1999-2019 Gentoo Authors |
47 |
# Distributed under the terms of the GNU General Public License v2 |
48 |
|
49 |
-EAPI=5 |
50 |
+EAPI=7 |
51 |
|
52 |
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs |
53 |
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs |
54 |
|
55 |
#Number of official patches |
56 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
57 |
-PATCHNO=${PV/*.*.*_p} |
58 |
+PATCHNO="${PV/*.*.*_p}" |
59 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
60 |
- MY_PV=${PV} |
61 |
- MY_P=${P} |
62 |
+ MY_PV="${PV}" |
63 |
+ MY_P="${P}" |
64 |
PATCHNO=0 |
65 |
else |
66 |
- MY_PV=${PV/_p${PATCHNO}} |
67 |
- MY_P=${PN}-${MY_PV} |
68 |
+ MY_PV="${PV/_p${PATCHNO}}" |
69 |
+ MY_P="${PN}-${MY_PV}" |
70 |
fi |
71 |
|
72 |
S="${WORKDIR}/${MY_P}/build_unix" |
73 |
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
74 |
done |
75 |
|
76 |
LICENSE="Sleepycat" |
77 |
-SLOT="4.8" |
78 |
+SLOT="$(ver_cut 1-2)" |
79 |
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" |
80 |
IUSE="doc java cxx tcl test" |
81 |
|
82 |
@@ -40,51 +40,68 @@ DEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
83 |
RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
84 |
java? ( >=virtual/jre-1.5 )" |
85 |
|
86 |
+PATCHES=( |
87 |
+ "${FILESDIR}"/${PN}-4.8-libtool.patch |
88 |
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
89 |
+ "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch |
90 |
+ |
91 |
+ # use the includes from the prefix |
92 |
+ "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
93 |
+ "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
94 |
+) |
95 |
+ |
96 |
src_prepare() { |
97 |
cd "${WORKDIR}"/"${MY_P}" || die |
98 |
for (( i=1 ; i<=${PATCHNO} ; i++ )) |
99 |
do |
100 |
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
101 |
+ eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" |
102 |
done |
103 |
- epatch "${FILESDIR}"/${PN}-4.8-libtool.patch |
104 |
- epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
105 |
- epatch "${FILESDIR}"/${PN}-4.8.30-rename-atomic-compare-exchange.patch |
106 |
|
107 |
- # use the includes from the prefix |
108 |
- epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
109 |
- epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
110 |
+ default |
111 |
|
112 |
sed -e "/^DB_RELEASE_DATE=/s/%B %e, %Y/%Y-%m-%d/" -i dist/RELEASE \ |
113 |
|| die |
114 |
|
115 |
# Include the SLOT for Java JAR files |
116 |
# This supersedes the unused jarlocation patches. |
117 |
- sed -r -i \ |
118 |
+ sed -r \ |
119 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
120 |
- "${S}"/../dist/Makefile.in || die |
121 |
+ -i dist/Makefile.in || die |
122 |
|
123 |
- cd "${S}"/../dist || die |
124 |
- rm -f aclocal/libtool.m4 |
125 |
- sed -i \ |
126 |
+ cd dist || die |
127 |
+ rm aclocal/libtool.m4 || die |
128 |
+ sed \ |
129 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
130 |
- configure.ac || die |
131 |
- sed -i \ |
132 |
+ -i configure.ac || die |
133 |
+ sed \ |
134 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
135 |
- aclocal/programs.m4 || die |
136 |
+ -i aclocal/programs.m4 || die |
137 |
+ |
138 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
139 |
+ |
140 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
141 |
. ./RELEASE |
142 |
- sed -i \ |
143 |
+ sed \ |
144 |
-e "s/__EDIT_DB_VERSION_MAJOR__/$DB_VERSION_MAJOR/g" \ |
145 |
-e "s/__EDIT_DB_VERSION_MINOR__/$DB_VERSION_MINOR/g" \ |
146 |
-e "s/__EDIT_DB_VERSION_PATCH__/$DB_VERSION_PATCH/g" \ |
147 |
-e "s/__EDIT_DB_VERSION_STRING__/$DB_VERSION_STRING/g" \ |
148 |
-e "s/__EDIT_DB_VERSION_UNIQUE_NAME__/$DB_VERSION_UNIQUE_NAME/g" \ |
149 |
- -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" configure || die |
150 |
+ -e "s/__EDIT_DB_VERSION__/$DB_VERSION/g" \ |
151 |
+ -i configure || die |
152 |
} |
153 |
|
154 |
multilib_src_configure() { |
155 |
- local myconf=() |
156 |
+ local myconf=( |
157 |
+ --enable-compat185 |
158 |
+ --enable-o_direct |
159 |
+ --without-uniquename |
160 |
+ $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) |
161 |
+ $(use_enable cxx) |
162 |
+ $(use_enable cxx stl) |
163 |
+ $(multilib_native_use_enable java) |
164 |
+ $(use_enable test) |
165 |
+ ) |
166 |
|
167 |
tc-ld-disable-gold #470634 |
168 |
|
169 |
@@ -121,16 +138,8 @@ multilib_src_configure() { |
170 |
|
171 |
ECONF_SOURCE="${S}"/../dist \ |
172 |
STRIP="true" \ |
173 |
- econf \ |
174 |
- --enable-compat185 \ |
175 |
- --enable-o_direct \ |
176 |
- --without-uniquename \ |
177 |
- $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \ |
178 |
- $(use_enable cxx) \ |
179 |
- $(use_enable cxx stl) \ |
180 |
- $(multilib_native_use_enable java) \ |
181 |
- "${myconf[@]}" \ |
182 |
- $(use_enable test) |
183 |
+ econf "${myconf[@]}" |
184 |
+ |
185 |
# The embedded assembly on ARM does not work on newer hardware |
186 |
# so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. |
187 |
# Specifically, it uses the SWPB op, which was deprecated: |
188 |
@@ -143,7 +152,7 @@ multilib_src_configure() { |
189 |
multilib_src_test() { |
190 |
multilib_is_native_abi || return |
191 |
|
192 |
- S=${BUILD_DIR} db_src_test |
193 |
+ S="${BUILD_DIR}" db_src_test |
194 |
} |
195 |
|
196 |
multilib_src_install() { |
197 |
|
198 |
diff --git a/sys-libs/db/db-5.1.29-r1.ebuild b/sys-libs/db/db-5.1.29-r2.ebuild |
199 |
similarity index 69% |
200 |
rename from sys-libs/db/db-5.1.29-r1.ebuild |
201 |
rename to sys-libs/db/db-5.1.29-r2.ebuild |
202 |
index 82fda831643..54548984ba6 100644 |
203 |
--- a/sys-libs/db/db-5.1.29-r1.ebuild |
204 |
+++ b/sys-libs/db/db-5.1.29-r2.ebuild |
205 |
@@ -1,19 +1,19 @@ |
206 |
# Copyright 1999-2019 Gentoo Authors |
207 |
# Distributed under the terms of the GNU General Public License v2 |
208 |
|
209 |
-EAPI=5 |
210 |
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib toolchain-funcs |
211 |
+EAPI=7 |
212 |
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib toolchain-funcs |
213 |
|
214 |
#Number of official patches |
215 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
216 |
-PATCHNO=${PV/*.*.*_p} |
217 |
+PATCHNO="${PV/*.*.*_p}" |
218 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
219 |
- MY_PV=${PV} |
220 |
- MY_P=${P} |
221 |
+ MY_PV="${PV}" |
222 |
+ MY_P="${P}" |
223 |
PATCHNO=0 |
224 |
else |
225 |
- MY_PV=${PV/_p${PATCHNO}} |
226 |
- MY_P=${PN}-${MY_PV} |
227 |
+ MY_PV="${PV/_p${PATCHNO}}" |
228 |
+ MY_P="${PN}-${MY_PV}" |
229 |
fi |
230 |
|
231 |
S_BASE="${WORKDIR}/${MY_P}" |
232 |
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
233 |
done |
234 |
|
235 |
LICENSE="Sleepycat" |
236 |
-SLOT="5.1" |
237 |
+SLOT="$(ver_cut 1-2)" |
238 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
239 |
IUSE="doc java cxx tcl test" |
240 |
|
241 |
@@ -40,70 +40,91 @@ DEPEND="tcl? ( >=dev-lang/tcl-8.4:0 ) |
242 |
RDEPEND="tcl? ( dev-lang/tcl:0 ) |
243 |
java? ( >=virtual/jre-1.5 )" |
244 |
|
245 |
-src_prepare() { |
246 |
- cd "${WORKDIR}"/"${MY_P}" |
247 |
- for (( i=1 ; i<=${PATCHNO} ; i++ )) |
248 |
- do |
249 |
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
250 |
- done |
251 |
- epatch "${FILESDIR}"/${PN}-4.8-libtool.patch |
252 |
- epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
253 |
+PATCHES=( |
254 |
+ "${FILESDIR}"/${PN}-4.8-libtool.patch |
255 |
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
256 |
|
257 |
# use the includes from the prefix |
258 |
- epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
259 |
- epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
260 |
+ "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
261 |
+ "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
262 |
|
263 |
# upstream autoconf fails to build DBM when it's supposed to |
264 |
# merged upstream in 5.0.26 |
265 |
- #epatch "${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch |
266 |
+ #"${FILESDIR}"/${PN}-5.0.21-enable-dbm-autoconf.patch |
267 |
|
268 |
# Needed when compiling with clang |
269 |
- epatch "${FILESDIR}"/${P}-rename-atomic-compare-exchange.patch |
270 |
+ "${FILESDIR}"/${P}-rename-atomic-compare-exchange.patch |
271 |
+) |
272 |
+ |
273 |
+src_prepare() { |
274 |
+ cd "${S_BASE}" || die |
275 |
+ for (( i=1 ; i<=${PATCHNO} ; i++ )) |
276 |
+ do |
277 |
+ eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" |
278 |
+ done |
279 |
+ |
280 |
+ default |
281 |
|
282 |
# Upstream release script grabs the dates when the script was run, so lets |
283 |
# end-run them to keep the date the same. |
284 |
export REAL_DB_RELEASE_DATE="$(awk \ |
285 |
'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ |
286 |
"${S_BASE}"/dist/configure)" |
287 |
- sed -r -i \ |
288 |
+ sed -r \ |
289 |
-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ |
290 |
- "${S_BASE}"/dist/RELEASE |
291 |
+ -i dist/RELEASE || die |
292 |
|
293 |
# Include the SLOT for Java JAR files |
294 |
# This supersedes the unused jarlocation patches. |
295 |
- sed -r -i \ |
296 |
+ sed -r \ |
297 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
298 |
- "${S_BASE}"/dist/Makefile.in |
299 |
+ -i dist/Makefile.in || die |
300 |
|
301 |
- cd "${S_BASE}"/dist |
302 |
- rm -f aclocal/libtool.m4 |
303 |
- sed -i \ |
304 |
+ cd dist || die |
305 |
+ rm aclocal/libtool.m4 || die |
306 |
+ sed \ |
307 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
308 |
- configure.ac |
309 |
- sed -i \ |
310 |
+ -i configure.ac || die |
311 |
+ sed \ |
312 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
313 |
- aclocal/programs.m4 |
314 |
+ -i aclocal/programs.m4 || die |
315 |
+ |
316 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
317 |
+ |
318 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
319 |
. ./RELEASE |
320 |
+ local v ev |
321 |
for v in \ |
322 |
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ |
323 |
DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ |
324 |
DB_VERSION \ |
325 |
DB_RELEASE_DATE ; do |
326 |
- local ev="__EDIT_${v}__" |
327 |
- sed -i -e "s/${ev}/${!v}/g" configure |
328 |
+ ev="__EDIT_${v}__" |
329 |
+ sed -e "s/${ev}/${!v}/g" -i configure || die |
330 |
done |
331 |
|
332 |
# This is a false positive skip in the tests as the test-reviewer code |
333 |
# looks for 'Skipping\s' |
334 |
- sed -i \ |
335 |
+ sed \ |
336 |
-e '/db_repsite/s,Skipping:,Skipping,g' \ |
337 |
- "${S_BASE}"/test/tcl/reputils.tcl || die |
338 |
+ -i "${S_BASE}"/test/tcl/reputils.tcl || die |
339 |
} |
340 |
|
341 |
src_configure() { |
342 |
- local myconf='' |
343 |
+ local myconf=( |
344 |
+ --enable-compat185 |
345 |
+ --enable-dbm |
346 |
+ --enable-o_direct |
347 |
+ --without-uniquename |
348 |
+ --enable-sql |
349 |
+ --enable-sql_codegen |
350 |
+ --disable-sql_compat |
351 |
+ $(use amd64 && echo --with-mutex=x86/gcc-assembly) |
352 |
+ $(use_enable cxx) |
353 |
+ $(use_enable cxx stl) |
354 |
+ $(use_enable java) |
355 |
+ $(use_enable test) |
356 |
+ ) |
357 |
|
358 |
tc-ld-disable-gold #470634 |
359 |
|
360 |
@@ -113,12 +134,11 @@ src_configure() { |
361 |
is-flagq -O[s123] || append-flags -O2 |
362 |
fi |
363 |
|
364 |
- # use `set` here since the java opts will contain whitespace |
365 |
- set -- |
366 |
if use java ; then |
367 |
- set -- "$@" \ |
368 |
- --with-java-prefix="${JAVA_HOME}" \ |
369 |
+ myconf+=( |
370 |
+ --with-java-prefix="${JAVA_HOME}" |
371 |
--with-javac-flags="$(java-pkg_javac-args)" |
372 |
+ ) |
373 |
fi |
374 |
|
375 |
# Add linker versions to the symbols. Easier to do, and safer than header file |
376 |
@@ -129,32 +149,22 @@ src_configure() { |
377 |
|
378 |
# Bug #270851: test needs TCL support |
379 |
if use tcl || use test ; then |
380 |
- myconf="${myconf} --enable-tcl" |
381 |
- myconf="${myconf} --with-tcl=${EPREFIX}/usr/$(get_libdir)" |
382 |
+ myconf+=( |
383 |
+ --enable-tcl |
384 |
+ --with-tcl="${EPREFIX}/usr/$(get_libdir)" |
385 |
+ ) |
386 |
else |
387 |
- myconf="${myconf} --disable-tcl" |
388 |
+ myconf+=( --disable-tcl ) |
389 |
fi |
390 |
|
391 |
# sql_compat will cause a collision with sqlite3 |
392 |
# --enable-sql_compat |
393 |
- cd "${S}" |
394 |
+ cd "${S}" || die |
395 |
+ |
396 |
ECONF_SOURCE="${S_BASE}"/dist \ |
397 |
STRIP="true" \ |
398 |
- econf \ |
399 |
- --enable-compat185 \ |
400 |
- --enable-dbm \ |
401 |
- --enable-o_direct \ |
402 |
- --without-uniquename \ |
403 |
- --enable-sql \ |
404 |
- --enable-sql_codegen \ |
405 |
- --disable-sql_compat \ |
406 |
- $(use amd64 && echo --with-mutex=x86/gcc-assembly) \ |
407 |
- $(use_enable cxx) \ |
408 |
- $(use_enable cxx stl) \ |
409 |
- $(use_enable java) \ |
410 |
- ${myconf} \ |
411 |
- $(use_enable test) \ |
412 |
- "$@" |
413 |
+ econf "${myconf[@]}" |
414 |
+ |
415 |
# The embedded assembly on ARM does not work on newer hardware |
416 |
# so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. |
417 |
# Specifically, it uses the SWPB op, which was deprecated: |
418 |
@@ -164,12 +174,8 @@ src_configure() { |
419 |
# >=db-6.1 uses LDREX instead. |
420 |
} |
421 |
|
422 |
-src_compile() { |
423 |
- emake || die "make failed" |
424 |
-} |
425 |
- |
426 |
src_install() { |
427 |
- emake install DESTDIR="${D}" || die |
428 |
+ emake DESTDIR="${D}" install |
429 |
|
430 |
db_src_install_usrbinslot |
431 |
|
432 |
@@ -181,8 +187,10 @@ src_install() { |
433 |
|
434 |
dodir /usr/sbin |
435 |
# This file is not always built, and no longer exists as of db-4.8 |
436 |
- [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \ |
437 |
- mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc |
438 |
+ if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then |
439 |
+ mv "${ED}"/usr/bin/berkeley_db_svc \ |
440 |
+ "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die |
441 |
+ fi |
442 |
|
443 |
if use java; then |
444 |
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so |
445 |
@@ -207,9 +215,9 @@ src_test() { |
446 |
#sed -ri \ |
447 |
# -e '/set subs/s,multi_repmgr,,g' \ |
448 |
# "${S_BASE}/test/testparams.tcl" |
449 |
- sed -ri \ |
450 |
+ sed -r \ |
451 |
-e '/multi_repmgr/d' \ |
452 |
- "${S_BASE}/test/tcl/test.tcl" |
453 |
+ -i "${S_BASE}/test/tcl/test.tcl" || die |
454 |
|
455 |
db_src_test |
456 |
} |
457 |
|
458 |
diff --git a/sys-libs/db/db-5.3.28-r3.ebuild b/sys-libs/db/db-5.3.28-r4.ebuild |
459 |
similarity index 75% |
460 |
rename from sys-libs/db/db-5.3.28-r3.ebuild |
461 |
rename to sys-libs/db/db-5.3.28-r4.ebuild |
462 |
index 3c5e2102717..db5f8b8a8c0 100644 |
463 |
--- a/sys-libs/db/db-5.3.28-r3.ebuild |
464 |
+++ b/sys-libs/db/db-5.3.28-r4.ebuild |
465 |
@@ -1,19 +1,19 @@ |
466 |
# Copyright 1999-2019 Gentoo Authors |
467 |
# Distributed under the terms of the GNU General Public License v2 |
468 |
|
469 |
-EAPI=5 |
470 |
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal toolchain-funcs |
471 |
+EAPI=7 |
472 |
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs |
473 |
|
474 |
#Number of official patches |
475 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
476 |
-PATCHNO=${PV/*.*.*_p} |
477 |
+PATCHNO="${PV/*.*.*_p}" |
478 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
479 |
- MY_PV=${PV} |
480 |
- MY_P=${P} |
481 |
+ MY_PV="${PV}" |
482 |
+ MY_P="${P}" |
483 |
PATCHNO=0 |
484 |
else |
485 |
- MY_PV=${PV/_p${PATCHNO}} |
486 |
- MY_P=${PN}-${MY_PV} |
487 |
+ MY_PV="${PV/_p${PATCHNO}}" |
488 |
+ MY_P="${PN}-${MY_PV}" |
489 |
fi |
490 |
|
491 |
S_BASE="${WORKDIR}/${MY_P}" |
492 |
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
493 |
done |
494 |
|
495 |
LICENSE="Sleepycat" |
496 |
-SLOT="5.3" |
497 |
+SLOT="$(ver_cut 1-2)" |
498 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
499 |
IUSE="doc java cxx tcl test" |
500 |
|
501 |
@@ -41,84 +41,108 @@ RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
502 |
java? ( >=virtual/jre-1.5 )" |
503 |
|
504 |
MULTILIB_WRAPPED_HEADERS=( |
505 |
- /usr/include/db5.3/db.h |
506 |
+ /usr/include/db${SLOT}/db.h |
507 |
) |
508 |
|
509 |
-src_prepare() { |
510 |
- cd "${WORKDIR}"/"${MY_P}" |
511 |
- for (( i=1 ; i<=${PATCHNO} ; i++ )) |
512 |
- do |
513 |
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
514 |
- done |
515 |
- |
516 |
+PATCHES=( |
517 |
# bug #510506 |
518 |
- epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
519 |
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
520 |
|
521 |
# use the includes from the prefix |
522 |
- epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
523 |
- epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
524 |
+ "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
525 |
+ "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
526 |
|
527 |
# sqlite configure call has an extra leading .. |
528 |
# upstreamed:5.2.36, missing in 5.3.x |
529 |
- epatch "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch |
530 |
+ "${FILESDIR}"/${PN}-5.2.28-sqlite-configure-path.patch |
531 |
|
532 |
# The upstream testsuite copies .lib and the binaries for each parallel test |
533 |
# core, ~300MB each. This patch uses links instead, saves a lot of space. |
534 |
- epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
535 |
+ "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
536 |
|
537 |
# Needed when compiling with clang |
538 |
- epatch "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch |
539 |
+ "${FILESDIR}"/${PN}-5.1.29-rename-atomic-compare-exchange.patch |
540 |
+) |
541 |
+ |
542 |
+src_prepare() { |
543 |
+ cd "${S_BASE}" || die |
544 |
+ for (( i=1 ; i<=${PATCHNO} ; i++ )) |
545 |
+ do |
546 |
+ eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" |
547 |
+ done |
548 |
+ |
549 |
+ default |
550 |
|
551 |
# Upstream release script grabs the dates when the script was run, so lets |
552 |
# end-run them to keep the date the same. |
553 |
export REAL_DB_RELEASE_DATE="$(awk \ |
554 |
'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ |
555 |
"${S_BASE}"/dist/configure)" |
556 |
- sed -r -i \ |
557 |
+ sed -r \ |
558 |
-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ |
559 |
- "${S_BASE}"/dist/RELEASE || die |
560 |
+ -i dist/RELEASE || die |
561 |
|
562 |
# Include the SLOT for Java JAR files |
563 |
# This supersedes the unused jarlocation patches. |
564 |
- sed -r -i \ |
565 |
+ sed -r \ |
566 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
567 |
- "${S_BASE}"/dist/Makefile.in || die |
568 |
+ dist/Makefile.in || die |
569 |
|
570 |
- cd "${S_BASE}"/dist || die |
571 |
- rm -f aclocal/libtool.m4 |
572 |
- sed -i \ |
573 |
+ cd dist || die |
574 |
+ rm aclocal/libtool.m4 || die |
575 |
+ sed \ |
576 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
577 |
- configure.ac || die |
578 |
- sed -i \ |
579 |
+ -i configure.ac || die |
580 |
+ sed \ |
581 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
582 |
- aclocal/programs.m4 || die |
583 |
+ -i aclocal/programs.m4 || die |
584 |
+ |
585 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
586 |
+ |
587 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
588 |
. ./RELEASE |
589 |
+ local v ev |
590 |
for v in \ |
591 |
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ |
592 |
DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ |
593 |
DB_VERSION \ |
594 |
DB_RELEASE_DATE ; do |
595 |
- local ev="__EDIT_${v}__" |
596 |
- sed -i -e "s/${ev}/${!v}/g" configure || die |
597 |
+ ev="__EDIT_${v}__" |
598 |
+ sed -e "s/${ev}/${!v}/g" -i configure || die |
599 |
done |
600 |
|
601 |
# This is a false positive skip in the tests as the test-reviewer code |
602 |
# looks for 'Skipping\s' |
603 |
- sed -i \ |
604 |
+ sed \ |
605 |
-e '/db_repsite/s,Skipping:,Skipping,g' \ |
606 |
- "${S_BASE}"/test/tcl/reputils.tcl || die |
607 |
+ -i "${S_BASE}"/test/tcl/reputils.tcl || die |
608 |
} |
609 |
|
610 |
multilib_src_configure() { |
611 |
- local myconf=() |
612 |
+ local myconf=( |
613 |
+ # sql_compat will cause a collision with sqlite3 |
614 |
+ #--enable-sql_compat |
615 |
+ # Don't --enable-sql* because we don't want to use bundled sqlite. |
616 |
+ # See Gentoo bug #605688 |
617 |
+ --enable-compat185 |
618 |
+ --enable-dbm |
619 |
+ --enable-o_direct |
620 |
+ --without-uniquename |
621 |
+ --disable-sql |
622 |
+ --disable-sql_codegen |
623 |
+ --disable-sql_compat |
624 |
+ $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) |
625 |
+ $(use_enable cxx) |
626 |
+ $(use_enable cxx stl) |
627 |
+ $(multilib_native_use_enable java) |
628 |
+ $(use_enable test) |
629 |
+ ) |
630 |
|
631 |
tc-ld-disable-gold #470634 |
632 |
|
633 |
# compilation with -O0 fails on amd64, see bug #171231 |
634 |
if [[ ${ABI} == amd64 ]]; then |
635 |
- local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} |
636 |
+ local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" |
637 |
replace-flags -O0 -O2 |
638 |
is-flagq -O[s123] || append-flags -O2 |
639 |
fi |
640 |
@@ -129,7 +153,6 @@ multilib_src_configure() { |
641 |
append-ldflags -Wl,--default-symver |
642 |
fi |
643 |
|
644 |
- # use `set` here since the java opts will contain whitespace |
645 |
if multilib_is_native_abi && use java ; then |
646 |
myconf+=( |
647 |
--with-java-prefix="${JAVA_HOME}" |
648 |
@@ -147,26 +170,10 @@ multilib_src_configure() { |
649 |
myconf+=(--disable-tcl ) |
650 |
fi |
651 |
|
652 |
- # sql_compat will cause a collision with sqlite3 |
653 |
- # --enable-sql_compat |
654 |
- # Don't --enable-sql* because we don't want to use bundled sqlite. |
655 |
- # See Gentoo bug #605688 |
656 |
ECONF_SOURCE="${S_BASE}"/dist \ |
657 |
STRIP="true" \ |
658 |
- econf \ |
659 |
- --enable-compat185 \ |
660 |
- --enable-dbm \ |
661 |
- --enable-o_direct \ |
662 |
- --without-uniquename \ |
663 |
- --disable-sql \ |
664 |
- --disable-sql_codegen \ |
665 |
- --disable-sql_compat \ |
666 |
- $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \ |
667 |
- $(use_enable cxx) \ |
668 |
- $(use_enable cxx stl) \ |
669 |
- $(multilib_native_use_enable java) \ |
670 |
- "${myconf[@]}" \ |
671 |
- $(use_enable test) |
672 |
+ econf "${myconf[@]}" |
673 |
+ |
674 |
# The embedded assembly on ARM does not work on newer hardware |
675 |
# so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. |
676 |
# Specifically, it uses the SWPB op, which was deprecated: |
677 |
@@ -177,7 +184,7 @@ multilib_src_configure() { |
678 |
} |
679 |
|
680 |
multilib_src_install() { |
681 |
- emake install DESTDIR="${D}" |
682 |
+ emake DESTDIR="${D}" install |
683 |
|
684 |
db_src_install_headerslot |
685 |
|
686 |
@@ -219,9 +226,9 @@ src_test() { |
687 |
#sed -ri \ |
688 |
# -e '/set subs/s,multi_repmgr,,g' \ |
689 |
# "${S_BASE}/test/testparams.tcl" |
690 |
- sed -ri \ |
691 |
+ sed -r \ |
692 |
-e '/multi_repmgr/d' \ |
693 |
- "${S_BASE}/test/tcl/test.tcl" || die |
694 |
+ -i "${S_BASE}/test/tcl/test.tcl" || die |
695 |
|
696 |
# This is the only failure in 5.2.28 so far, and looks like a false positive. |
697 |
# Repmgr018 (btree): Test of repmgr stats. |
698 |
@@ -231,10 +238,10 @@ src_test() { |
699 |
# Rep_test: btree 20 key/data pairs starting at 0 |
700 |
# Rep_test.a: put/get loop |
701 |
# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 |
702 |
- sed -ri \ |
703 |
+ sed -r \ |
704 |
-e '/set parms.*repmgr018/d' \ |
705 |
-e 's/repmgr018//g' \ |
706 |
- "${S_BASE}/test/tcl/test.tcl" || die |
707 |
+ -i "${S_BASE}/test/tcl/test.tcl" || die |
708 |
|
709 |
multilib-minimal_src_test |
710 |
} |
711 |
@@ -242,5 +249,5 @@ src_test() { |
712 |
multilib_src_test() { |
713 |
multilib_is_native_abi || return |
714 |
|
715 |
- S=${BUILD_DIR} db_src_test |
716 |
+ S="${BUILD_DIR}" db_src_test |
717 |
} |
718 |
|
719 |
diff --git a/sys-libs/db/db-6.0.35-r1.ebuild b/sys-libs/db/db-6.0.35-r2.ebuild |
720 |
similarity index 78% |
721 |
rename from sys-libs/db/db-6.0.35-r1.ebuild |
722 |
rename to sys-libs/db/db-6.0.35-r2.ebuild |
723 |
index 70e9cbe1da3..3db37562bd9 100644 |
724 |
--- a/sys-libs/db/db-6.0.35-r1.ebuild |
725 |
+++ b/sys-libs/db/db-6.0.35-r2.ebuild |
726 |
@@ -1,19 +1,19 @@ |
727 |
# Copyright 1999-2019 Gentoo Authors |
728 |
# Distributed under the terms of the GNU General Public License v2 |
729 |
|
730 |
-EAPI=5 |
731 |
-inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs |
732 |
+EAPI=7 |
733 |
+inherit autotools db flag-o-matic java-pkg-opt-2 multilib multilib-minimal toolchain-funcs |
734 |
|
735 |
#Number of official patches |
736 |
#PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"` |
737 |
-PATCHNO=${PV/*.*.*_p} |
738 |
+PATCHNO="${PV/*.*.*_p}" |
739 |
if [[ ${PATCHNO} == "${PV}" ]] ; then |
740 |
- MY_PV=${PV} |
741 |
- MY_P=${P} |
742 |
+ MY_PV="${PV}" |
743 |
+ MY_P="${P}" |
744 |
PATCHNO=0 |
745 |
else |
746 |
- MY_PV=${PV/_p${PATCHNO}} |
747 |
- MY_P=${PN}-${MY_PV} |
748 |
+ MY_PV="${PV/_p${PATCHNO}}" |
749 |
+ MY_P="${PN}-${MY_PV}" |
750 |
fi |
751 |
|
752 |
S_BASE="${WORKDIR}/${MY_P}" |
753 |
@@ -26,7 +26,7 @@ for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do |
754 |
done |
755 |
|
756 |
LICENSE="AGPL-3" |
757 |
-SLOT="$(get_version_component_range 1-2)" |
758 |
+SLOT="$(ver_cut 1-2)" |
759 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
760 |
IUSE="doc java cxx tcl test" |
761 |
|
762 |
@@ -41,76 +41,96 @@ RDEPEND="tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[${MULTILIB_USEDEP}] ) |
763 |
java? ( >=virtual/jre-1.5 )" |
764 |
|
765 |
MULTILIB_WRAPPED_HEADERS=( |
766 |
- /usr/include/db$(get_version_component_range 1-2)/db.h |
767 |
+ /usr/include/db${SLOT}/db.h |
768 |
) |
769 |
|
770 |
-src_prepare() { |
771 |
- cd "${WORKDIR}"/"${MY_P}" |
772 |
- for (( i=1 ; i<=${PATCHNO} ; i++ )) |
773 |
- do |
774 |
- epatch "${DISTDIR}"/patch."${MY_PV}"."${i}" |
775 |
- done |
776 |
- |
777 |
+PATCHES=( |
778 |
# bug #510506 |
779 |
- epatch "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
780 |
+ "${FILESDIR}"/${PN}-4.8.24-java-manifest-location.patch |
781 |
|
782 |
# use the includes from the prefix |
783 |
- epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
784 |
- epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
785 |
+ "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch |
786 |
+ "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch |
787 |
|
788 |
# sqlite configure call has an extra leading .. |
789 |
# upstreamed:5.2.36, missing in 5.3.x/6.x |
790 |
# still needs to be patched in 6.0.20 |
791 |
- epatch "${FILESDIR}"/${PN}-6.0.35-sqlite-configure-path.patch |
792 |
+ "${FILESDIR}"/${PN}-6.0.35-sqlite-configure-path.patch |
793 |
|
794 |
# The upstream testsuite copies .lib and the binaries for each parallel test |
795 |
# core, ~300MB each. This patch uses links instead, saves a lot of space. |
796 |
- epatch "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
797 |
+ "${FILESDIR}"/${PN}-6.0.20-test-link.patch |
798 |
+) |
799 |
+ |
800 |
+src_prepare() { |
801 |
+ cd "${S_BASE}" || die |
802 |
+ for (( i=1 ; i<=${PATCHNO} ; i++ )) |
803 |
+ do |
804 |
+ eapply -p0 "${DISTDIR}"/patch."${MY_PV}"."${i}" |
805 |
+ done |
806 |
+ |
807 |
+ default |
808 |
|
809 |
# Upstream release script grabs the dates when the script was run, so lets |
810 |
# end-run them to keep the date the same. |
811 |
export REAL_DB_RELEASE_DATE="$(awk \ |
812 |
'/^DB_VERSION_STRING=/{ gsub(".*\\(|\\).*","",$0); print $0; }' \ |
813 |
"${S_BASE}"/dist/configure)" |
814 |
- sed -r -i \ |
815 |
+ sed -r \ |
816 |
-e "/^DB_RELEASE_DATE=/s~=.*~='${REAL_DB_RELEASE_DATE}'~g" \ |
817 |
- "${S_BASE}"/dist/RELEASE || die |
818 |
+ -i dist/RELEASE || die |
819 |
|
820 |
# Include the SLOT for Java JAR files |
821 |
# This supersedes the unused jarlocation patches. |
822 |
- sed -r -i \ |
823 |
+ sed -r \ |
824 |
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \ |
825 |
- "${S_BASE}"/dist/Makefile.in || die |
826 |
+ -i dist/Makefile.in || die |
827 |
|
828 |
- cd "${S_BASE}"/dist || die |
829 |
- rm -f aclocal/libtool.m4 |
830 |
- sed -i \ |
831 |
+ cd dist || die |
832 |
+ rm aclocal/libtool.m4 || die |
833 |
+ sed \ |
834 |
-e '/AC_PROG_LIBTOOL$/aLT_OUTPUT' \ |
835 |
- configure.ac || die |
836 |
- sed -i \ |
837 |
+ -i configure.ac || die |
838 |
+ sed \ |
839 |
-e '/^AC_PATH_TOOL/s/ sh, none/ bash, none/' \ |
840 |
- aclocal/programs.m4 || die |
841 |
+ -i aclocal/programs.m4 || die |
842 |
+ |
843 |
AT_M4DIR="aclocal aclocal_java" eautoreconf |
844 |
+ |
845 |
# Upstream sucks - they do autoconf and THEN replace the version variables. |
846 |
. ./RELEASE |
847 |
+ local v ev |
848 |
for v in \ |
849 |
DB_VERSION_{FAMILY,LETTER,RELEASE,MAJOR,MINOR} \ |
850 |
DB_VERSION_{PATCH,FULL,UNIQUE_NAME,STRING,FULL_STRING} \ |
851 |
DB_VERSION \ |
852 |
DB_RELEASE_DATE ; do |
853 |
- local ev="__EDIT_${v}__" |
854 |
- sed -i -e "s/${ev}/${!v}/g" configure || die |
855 |
+ ev="__EDIT_${v}__" |
856 |
+ sed -e "s/${ev}/${!v}/g" -i configure || die |
857 |
done |
858 |
|
859 |
# This is a false positive skip in the tests as the test-reviewer code |
860 |
# looks for 'Skipping\s' |
861 |
- sed -i \ |
862 |
+ sed \ |
863 |
-e '/db_repsite/s,Skipping:,Skipping,g' \ |
864 |
- "${S_BASE}"/test/tcl/reputils.tcl || die |
865 |
+ -i "${S_BASE}"/test/tcl/reputils.tcl || die |
866 |
} |
867 |
|
868 |
multilib_src_configure() { |
869 |
- local myconf=() |
870 |
+ local myconf=( |
871 |
+ --enable-compat185 |
872 |
+ --enable-dbm |
873 |
+ --enable-o_direct |
874 |
+ --without-uniquename |
875 |
+ --disable-sql |
876 |
+ --disable-sql_codegen |
877 |
+ --disable-sql_compat |
878 |
+ $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) |
879 |
+ $(use_enable cxx) |
880 |
+ $(use_enable cxx stl) |
881 |
+ $(multilib_native_use_enable java) |
882 |
+ $(use_enable test) |
883 |
+ ) |
884 |
|
885 |
tc-ld-disable-gold #470634 |
886 |
|
887 |
@@ -151,20 +171,8 @@ multilib_src_configure() { |
888 |
# See Gentoo bug #605688 |
889 |
ECONF_SOURCE="${S_BASE}"/dist \ |
890 |
STRIP="true" \ |
891 |
- econf \ |
892 |
- --enable-compat185 \ |
893 |
- --enable-dbm \ |
894 |
- --enable-o_direct \ |
895 |
- --without-uniquename \ |
896 |
- --disable-sql \ |
897 |
- --disable-sql_codegen \ |
898 |
- --disable-sql_compat \ |
899 |
- $([[ ${ABI} == amd64 ]] && echo --with-mutex=x86/gcc-assembly) \ |
900 |
- $(use_enable cxx) \ |
901 |
- $(use_enable cxx stl) \ |
902 |
- $(multilib_native_use_enable java) \ |
903 |
- "${myconf[@]}" \ |
904 |
- $(use_enable test) |
905 |
+ econf "${myconf[@]}" |
906 |
+ |
907 |
# The embedded assembly on ARM does not work on newer hardware |
908 |
# so you CANNOT use --with-mutex=ARM/gcc-assembly anymore. |
909 |
# Specifically, it uses the SWPB op, which was deprecated: |
910 |
@@ -175,7 +183,7 @@ multilib_src_configure() { |
911 |
} |
912 |
|
913 |
multilib_src_install() { |
914 |
- emake install DESTDIR="${D}" |
915 |
+ emake DESTDIR="${D}" install |
916 |
|
917 |
db_src_install_headerslot |
918 |
|
919 |
@@ -214,12 +222,12 @@ src_test() { |
920 |
# db_repsite is used directly in the setup_site_prog, |
921 |
# setup_site_prog is called from open_site_prog |
922 |
# which is called only from tests in the multi_repmgr group. |
923 |
- #sed -ri \ |
924 |
+ #sed -r \ |
925 |
# -e '/set subs/s,multi_repmgr,,g' \ |
926 |
- # "${S_BASE}/test/testparams.tcl" |
927 |
- sed -ri \ |
928 |
+ # -i "${S_BASE}/test/testparams.tcl" |
929 |
+ sed -r \ |
930 |
-e '/multi_repmgr/d' \ |
931 |
- "${S_BASE}/test/tcl/test.tcl" || die |
932 |
+ -i "${S_BASE}/test/tcl/test.tcl" || die |
933 |
|
934 |
# This is the only failure in 5.2.28 so far, and looks like a false positive. |
935 |
# Repmgr018 (btree): Test of repmgr stats. |
936 |
@@ -229,10 +237,10 @@ src_test() { |
937 |
# Rep_test: btree 20 key/data pairs starting at 0 |
938 |
# Rep_test.a: put/get loop |
939 |
# FAIL:07:05:59 (00:00:00) perm_no_failed_stat: expected 0, got 1 |
940 |
- sed -ri \ |
941 |
+ sed -r \ |
942 |
-e '/set parms.*repmgr018/d' \ |
943 |
-e 's/repmgr018//g' \ |
944 |
- "${S_BASE}/test/tcl/test.tcl" || die |
945 |
+ -i "${S_BASE}/test/tcl/test.tcl" || die |
946 |
|
947 |
multilib-minimal_src_test |
948 |
} |
949 |
@@ -240,5 +248,5 @@ src_test() { |
950 |
multilib_src_test() { |
951 |
multilib_is_native_abi || return |
952 |
|
953 |
- S=${BUILD_DIR} db_src_test |
954 |
+ S="${BUILD_DIR}" db_src_test |
955 |
} |
956 |
|
957 |
diff --git a/sys-libs/db/files/db-4.8-libtool.patch b/sys-libs/db/files/db-4.8-libtool.patch |
958 |
index f5d985b2f20..0c3dbffb03c 100644 |
959 |
--- a/sys-libs/db/files/db-4.8-libtool.patch |
960 |
+++ b/sys-libs/db/files/db-4.8-libtool.patch |
961 |
@@ -1,5 +1,5 @@ |
962 |
---- dist/configure |
963 |
-+++ dist/configure |
964 |
+--- a/dist/configure |
965 |
++++ b/dist/configure |
966 |
@@ -6691,7 +6691,7 @@ |
967 |
$as_echo_n "(cached) " >&6 |
968 |
else |