1 |
commit: c89a2d379bddbaf84c39152431dd1876133ae8f8 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 18:37:18 2018 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 3 18:37:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c89a2d37 |
7 |
|
8 |
sys-libs/suacomp: Port to EAPI 6 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
sys-libs/suacomp/suacomp-0.6.14.ebuild | 33 ++++++++++++++++++--------------- |
13 |
1 file changed, 18 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/sys-libs/suacomp/suacomp-0.6.14.ebuild b/sys-libs/suacomp/suacomp-0.6.14.ebuild |
16 |
index be3cecaf4bf..be3e9886e4e 100644 |
17 |
--- a/sys-libs/suacomp/suacomp-0.6.14.ebuild |
18 |
+++ b/sys-libs/suacomp/suacomp-0.6.14.ebuild |
19 |
@@ -1,9 +1,9 @@ |
20 |
-# Copyright 1999-2017 Gentoo Foundation |
21 |
+# Copyright 1999-2018 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
-EAPI=3 |
25 |
+EAPI=6 |
26 |
|
27 |
-inherit toolchain-funcs flag-o-matic eutils |
28 |
+inherit flag-o-matic toolchain-funcs |
29 |
|
30 |
DESCRIPTION="library wrapping the interix lib-c to make it less buggy" |
31 |
HOMEPAGE="http://suacomp.sf.net" |
32 |
@@ -21,9 +21,11 @@ get_opts() { |
33 |
local shlibc= |
34 |
local stlibc= |
35 |
|
36 |
+ local dir |
37 |
for dir in /usr/lib /usr/lib/x86; do |
38 |
[[ -f ${dir}/libc.a ]] && stlibc=${dir}/libc.a |
39 |
|
40 |
+ local name |
41 |
for name in libc.so.5.2 libc.so.3.5; do |
42 |
[[ -f ${dir}/${name} ]] && { shlibc=${dir}/${name}; break; } |
43 |
done |
44 |
@@ -34,23 +36,19 @@ get_opts() { |
45 |
echo "SHARED_LIBC=${shlibc} STATIC_LIBC=${stlibc}" |
46 |
} |
47 |
|
48 |
-pkg_setup() { |
49 |
+src_prepare() { |
50 |
+ [[ ${CHOST} == *-interix6* ]] && eapply "${FILESDIR}"/${P}-strtoll.patch |
51 |
+ eapply_user |
52 |
+} |
53 |
+ |
54 |
+src_configure() { |
55 |
if use debug; then |
56 |
append-flags -D_DEBUG -D_DEBUG_TRACE |
57 |
fi |
58 |
} |
59 |
|
60 |
-src_prepare() { |
61 |
- [[ ${CHOST} == *-interix6* ]] && epatch "${FILESDIR}"/${P}-strtoll.patch |
62 |
-} |
63 |
- |
64 |
src_compile() { |
65 |
- emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" || die "emake failed" |
66 |
-} |
67 |
- |
68 |
-src_install() { |
69 |
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ |
70 |
- CFLAGS="${CFLAGS}" || die "emake install failed" |
71 |
+ emake all CC=$(tc-getCC) $(get_opts) CFLAGS="${CFLAGS}" |
72 |
} |
73 |
|
74 |
src_test() { |
75 |
@@ -59,5 +57,10 @@ src_test() { |
76 |
use debug && v="TEST_VERBOSE=1" |
77 |
use debug && export SUACOMP_DEBUG_OUT=stderr |
78 |
|
79 |
- emake check $(get_opts) ${v} || die "emake check failed" |
80 |
+ emake check $(get_opts) ${v} |
81 |
+} |
82 |
+ |
83 |
+src_install() { |
84 |
+ emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" $(get_opts) \ |
85 |
+ CFLAGS="${CFLAGS}" |
86 |
} |