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