1 |
commit: 828da35a1d13377a7160a22a880bf257df73c6a3 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Mon Sep 11 17:38:12 2017 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 11 18:39:17 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=828da35a |
7 |
|
8 |
app-i18n/zinnia: Port to EAPI="6". Minor cleanup. |
9 |
|
10 |
app-i18n/zinnia/zinnia-0.06-r3.ebuild | 67 ++++++++++++++++++++++------------- |
11 |
1 file changed, 42 insertions(+), 25 deletions(-) |
12 |
|
13 |
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
14 |
index a012fde380d..ce1ffaefc08 100644 |
15 |
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
16 |
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild |
17 |
@@ -1,41 +1,50 @@ |
18 |
# Copyright 1999-2017 Gentoo Foundation |
19 |
# Distributed under the terms of the GNU General Public License v2 |
20 |
|
21 |
-EAPI=5 |
22 |
-PERL_EXPORT_PHASE_FUNCTIONS=no |
23 |
-inherit perl-module eutils flag-o-matic toolchain-funcs autotools-utils |
24 |
+EAPI="6" |
25 |
|
26 |
-DESCRIPTION="Online hand recognition system with machine learning" |
27 |
-HOMEPAGE="http://zinnia.sourceforge.net/" |
28 |
+inherit autotools flag-o-matic perl-module toolchain-funcs |
29 |
+ |
30 |
+DESCRIPTION="Zinnia - Online hand recognition system with machine learning" |
31 |
+HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/" |
32 |
SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz" |
33 |
|
34 |
LICENSE="BSD" |
35 |
SLOT="0" |
36 |
KEYWORDS="amd64 x86" |
37 |
-# Package warrants IUSE doc |
38 |
IUSE="perl static-libs" |
39 |
-DOCS=( AUTHORS ChangeLog NEWS README ) |
40 |
+ |
41 |
PATCHES=( |
42 |
"${FILESDIR}/${P}-flags.patch" |
43 |
"${FILESDIR}/${P}-perl_build.patch" |
44 |
"${FILESDIR}/${P}-c++-2011.patch" |
45 |
) |
46 |
-AUTOTOOLS_AUTORECONF=yes |
47 |
+ |
48 |
+DOCS=(AUTHORS) |
49 |
|
50 |
src_prepare() { |
51 |
- autotools-utils_src_prepare |
52 |
- if use perl ; then |
53 |
- pushd "${S}/perl" >/dev/null |
54 |
+ default |
55 |
+ mv configure.in configure.ac || die |
56 |
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die |
57 |
+ eautoreconf |
58 |
+ |
59 |
+ if use perl; then |
60 |
+ pushd perl > /dev/null |
61 |
PATCHES=() |
62 |
perl-module_src_prepare |
63 |
- popd >/dev/null |
64 |
+ popd > /dev/null |
65 |
fi |
66 |
} |
67 |
|
68 |
+src_configure() { |
69 |
+ econf $(use_enable static-libs static) |
70 |
+} |
71 |
+ |
72 |
src_compile() { |
73 |
- autotools-utils_src_compile |
74 |
- if use perl ; then |
75 |
- pushd "${S}"/perl >/dev/null |
76 |
+ default |
77 |
+ |
78 |
+ if use perl; then |
79 |
+ pushd perl > /dev/null |
80 |
|
81 |
# We need to run this here as otherwise it won't pick up the |
82 |
# just-built -lzinnia and cause the extension to have |
83 |
@@ -46,23 +55,31 @@ src_compile() { |
84 |
append-ldflags "-L${S}/.libs" |
85 |
|
86 |
emake \ |
87 |
+ CC="$(tc-getCXX)" \ |
88 |
+ LD="$(tc-getCXX)" \ |
89 |
+ OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \ |
90 |
LDDLFLAGS="-shared" \ |
91 |
- OTHERLDFLAGS="${LDFLAGS}" \ |
92 |
- CC="$(tc-getCXX)" LD="$(tc-getCXX)" \ |
93 |
- OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" |
94 |
- popd >/dev/null |
95 |
+ OTHERLDFLAGS="${LDFLAGS}" |
96 |
+ popd > /dev/null |
97 |
fi |
98 |
} |
99 |
|
100 |
+src_test() { |
101 |
+ default |
102 |
+} |
103 |
+ |
104 |
src_install() { |
105 |
- autotools-utils_src_install |
106 |
+ default |
107 |
+ find "${D}" -name "*.la" -delete || die |
108 |
|
109 |
- if use perl ; then |
110 |
- pushd "${S}/perl" >/dev/null |
111 |
+ if use perl; then |
112 |
+ pushd perl > /dev/null |
113 |
perl-module_src_install |
114 |
- popd >/dev/null |
115 |
+ popd > /dev/null |
116 |
fi |
117 |
|
118 |
- # Curiously ChangeLog & NEWS are left uncompressed |
119 |
- dohtml doc/*.html doc/*.css |
120 |
+ ( |
121 |
+ docinto html |
122 |
+ dodoc doc/*.css doc/*.html |
123 |
+ ) |
124 |
} |