sci-mathematics/fann: multilib support

Closes: https://github.com/gentoo/gentoo/pull/1942

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/sci-mathematics/fann/fann-2.2.0.ebuild b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
similarity index 63%
rename from sci-mathematics/fann/fann-2.2.0.ebuild
rename to sci-mathematics/fann/fann-2.2.0-r1.ebuild
index 4ba0a43afb76d17a592cf030ff07c906e8269e93..e0d484d11a4658cbfd1f8955ffa4941bb4c396f6 100644 (file)
--- a/sci-mathematics/fann/fann-2.2.0.ebuild
+++ b/sci-mathematics/fann/fann-2.2.0-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-inherit cmake-utils
+inherit cmake-multilib
 
-MYP=FANN-${PV}-Source
+MY_P=FANN-${PV}-Source
 
 DESCRIPTION="Fast Artificial Neural Network Library"
 HOMEPAGE="http://leenissen.dk/fann/"
-SRC_URI="mirror://sourceforge/${PN}/${MYP}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -18,22 +18,21 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"
 
 RDEPEND=""
-DEPEND="${RDEPEND}
-       app-arch/unzip"
+DEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
 src_test() {
-       cd examples
+       cd examples || die
        emake CFLAGS="${CFLAGS} -I../src/include -L${BUILD_DIR}/src"
        LD_LIBRARY_PATH="${BUILD_DIR}/src" emake runtest
        emake clean
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake-multilib_src_install
        if use examples; then
                insinto /usr/share/doc/${PF}
                doins -r examples

diff --git a/sci-mathematics/fann/fann-9999.ebuild b/sci-mathematics/fann/fann-9999.ebuild
index bcc5b6e1bd0d5d25f2ea425b9dd18e8cffc21ec6..4dd87546782a449f8107dd34f649492b1b30aa7e 100644 (file)
--- a/sci-mathematics/fann/fann-9999.ebuild
+++ b/sci-mathematics/fann/fann-9999.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit cmake-utils git-2
+inherit cmake-multilib git-r3
 
 DESCRIPTION="Fast Artificial Neural Network Library"
 HOMEPAGE="http://leenissen.dk/fann/"
-EGIT_REPO_URI="git://github.com/libfann/fann.git"
+EGIT_REPO_URI="https://github.com/libfann/fann"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -21,7 +21,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake-multilib_src_install
        if use examples; then
                insinto /usr/share/doc/${PF}
                doins -r examples

diff --git a/sci-mathematics/fann/files/fann-2.2.0-examples.patch b/sci-mathematics/fann/files/fann-2.2.0-examples.patch
index bfab17022187a418cb257f863cd68d92db942864..189e6936e457dce9c339eb3d5fff623d0bbe0677 100644 (file)
--- a/sci-mathematics/fann/files/fann-2.2.0-examples.patch
+++ b/sci-mathematics/fann/files/fann-2.2.0-examples.patch
@@ -1,5 +1,5 @@
---- examples/Makefile.orig     2012-01-24 05:31:40.000000000 +0000
-+++ examples/Makefile  2012-05-08 19:00:08.000000000 +0100
+--- a/examples/Makefile.orig   2012-01-24 05:31:40.000000000 +0000
++++ b/examples/Makefile        2012-05-08 19:00:08.000000000 +0100
 @@ -1,7 +1,6 @@
  # This makefile is on purpose not made with configure, to show how to use the library
  # The make file requires that the fann library is installed (see ../README)