1 |
commit: 4f798560ee14becf35b08aabbe758ba60aa52b73 |
2 |
Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name> |
3 |
AuthorDate: Fri Jul 22 15:02:57 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 25 18:46:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f798560 |
7 |
|
8 |
sci-mathematics/fann: multilib support |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/1942 |
11 |
|
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
.../{fann-2.2.0.ebuild => fann-2.2.0-r1.ebuild} | 21 ++++++++++----------- |
15 |
sci-mathematics/fann/fann-9999.ebuild | 8 ++++---- |
16 |
.../fann/files/fann-2.2.0-examples.patch | 4 ++-- |
17 |
3 files changed, 16 insertions(+), 17 deletions(-) |
18 |
|
19 |
diff --git a/sci-mathematics/fann/fann-2.2.0.ebuild b/sci-mathematics/fann/fann-2.2.0-r1.ebuild |
20 |
similarity index 63% |
21 |
rename from sci-mathematics/fann/fann-2.2.0.ebuild |
22 |
rename to sci-mathematics/fann/fann-2.2.0-r1.ebuild |
23 |
index 4ba0a43a..e0d484d 100644 |
24 |
--- a/sci-mathematics/fann/fann-2.2.0.ebuild |
25 |
+++ b/sci-mathematics/fann/fann-2.2.0-r1.ebuild |
26 |
@@ -1,16 +1,16 @@ |
27 |
-# Copyright 1999-2012 Gentoo Foundation |
28 |
+# Copyright 1999-2016 Gentoo Foundation |
29 |
# Distributed under the terms of the GNU General Public License v2 |
30 |
# $Id$ |
31 |
|
32 |
-EAPI=4 |
33 |
+EAPI=6 |
34 |
|
35 |
-inherit cmake-utils |
36 |
+inherit cmake-multilib |
37 |
|
38 |
-MYP=FANN-${PV}-Source |
39 |
+MY_P=FANN-${PV}-Source |
40 |
|
41 |
DESCRIPTION="Fast Artificial Neural Network Library" |
42 |
HOMEPAGE="http://leenissen.dk/fann/" |
43 |
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.zip" |
44 |
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" |
45 |
|
46 |
LICENSE="LGPL-2.1" |
47 |
SLOT="0" |
48 |
@@ -18,22 +18,21 @@ KEYWORDS="~amd64 ~ppc ~x86" |
49 |
IUSE="examples" |
50 |
|
51 |
RDEPEND="" |
52 |
-DEPEND="${RDEPEND} |
53 |
- app-arch/unzip" |
54 |
+DEPEND="app-arch/unzip" |
55 |
|
56 |
-S="${WORKDIR}/${MYP}" |
57 |
+S="${WORKDIR}/${MY_P}" |
58 |
|
59 |
-PATCHES=( "${FILESDIR}"/${P}-examples.patch ) |
60 |
+PATCHES=( "${FILESDIR}/${P}-examples.patch" ) |
61 |
|
62 |
src_test() { |
63 |
- cd examples |
64 |
+ cd examples || die |
65 |
emake CFLAGS="${CFLAGS} -I../src/include -L${BUILD_DIR}/src" |
66 |
LD_LIBRARY_PATH="${BUILD_DIR}/src" emake runtest |
67 |
emake clean |
68 |
} |
69 |
|
70 |
src_install() { |
71 |
- cmake-utils_src_install |
72 |
+ cmake-multilib_src_install |
73 |
if use examples; then |
74 |
insinto /usr/share/doc/${PF} |
75 |
doins -r examples |
76 |
|
77 |
diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild |
78 |
index bcc5b6e..4dd8754 100644 |
79 |
--- a/sci-mathematics/fann/fann-9999.ebuild |
80 |
+++ b/sci-mathematics/fann/fann-9999.ebuild |
81 |
@@ -2,13 +2,13 @@ |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
# $Id$ |
84 |
|
85 |
-EAPI=5 |
86 |
+EAPI=6 |
87 |
|
88 |
-inherit cmake-utils git-2 |
89 |
+inherit cmake-multilib git-r3 |
90 |
|
91 |
DESCRIPTION="Fast Artificial Neural Network Library" |
92 |
HOMEPAGE="http://leenissen.dk/fann/" |
93 |
-EGIT_REPO_URI="git://github.com/libfann/fann.git" |
94 |
+EGIT_REPO_URI="https://github.com/libfann/fann" |
95 |
|
96 |
LICENSE="LGPL-2.1" |
97 |
SLOT="0" |
98 |
@@ -21,7 +21,7 @@ src_test() { |
99 |
} |
100 |
|
101 |
src_install() { |
102 |
- cmake-utils_src_install |
103 |
+ cmake-multilib_src_install |
104 |
if use examples; then |
105 |
insinto /usr/share/doc/${PF} |
106 |
doins -r examples |
107 |
|
108 |
diff --git a/sci-mathematics/fann/files/fann-2.2.0-examples.patch b/sci-mathematics/fann/files/fann-2.2.0-examples.patch |
109 |
index bfab170..189e693 100644 |
110 |
--- a/sci-mathematics/fann/files/fann-2.2.0-examples.patch |
111 |
+++ b/sci-mathematics/fann/files/fann-2.2.0-examples.patch |
112 |
@@ -1,5 +1,5 @@ |
113 |
---- examples/Makefile.orig 2012-01-24 05:31:40.000000000 +0000 |
114 |
-+++ examples/Makefile 2012-05-08 19:00:08.000000000 +0100 |
115 |
+--- a/examples/Makefile.orig 2012-01-24 05:31:40.000000000 +0000 |
116 |
++++ b/examples/Makefile 2012-05-08 19:00:08.000000000 +0100 |
117 |
@@ -1,7 +1,6 @@ |
118 |
# This makefile is on purpose not made with configure, to show how to use the library |
119 |
# The make file requires that the fann library is installed (see ../README) |