Cleaned and fixed for as-needed

(Portage version: 2.2_rc40/cvs/Linux x86_64)

5 files changed, 26 insertions, 160 deletions

diff --git a/sci-mathematics/fann/ChangeLog b/sci-mathematics/fann/ChangeLog
index 6c6942e807f8..6894c31f12f3 100644
--- a/sci-mathematics/fann/ChangeLog
+++ b/sci-mathematics/fann/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/fann
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.12 2008/05/23 18:17:38 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.13 2009/09/09 20:35:37 bicatali Exp $
+
+  09 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -fann-1.2.0.ebuild,
+  -fann-1.2.0-r1.ebuild, fann-2.1.0_beta.ebuild,
+  +files/fann-2.1.0_beta-asneeded.patch:
+  Cleaned and fixed for as-needed
 
 *fann-2.1.0_beta (23 May 2008)
 
diff --git a/sci-mathematics/fann/fann-1.2.0-r1.ebuild b/sci-mathematics/fann/fann-1.2.0-r1.ebuild
deleted file mode 100644
index 8796bd3efa7c..000000000000
--- a/sci-mathematics/fann/fann-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-1.2.0-r1.ebuild,v 1.5 2008/05/12 13:10:17 markusle Exp $
-
-inherit eutils
-
-MY_PKG_NAME=${PN}-${PV/-.*/}
-DESCRIPTION="Fast Artificial Neural Network Library implements multilayer artificial neural networks in C"
-HOMEPAGE="http://fann.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fann/${MY_PKG_NAME}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc python"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-apps/sed
-	doc? ( app-text/docbook-sgml-utils )
-	python? ( dev-lang/swig )"
-
-S=${WORKDIR}/${MY_PKG_NAME}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}.patch
-}
-
-src_compile() {
-	local myconf
-	myconf="--prefix=/usr"
-
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-
-	if use python; then
-		cd "${S}"/python
-		#mkdir fann
-		#for f in `ls *py |grep -v setup.py`; do
-		#	mv $f fann || die
-		#done
-		python setup_unix.py build
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/benchmarks
-		cp -pPR "${S}"/benchmarks/* "${D}"/usr/share/doc/${PF}/benchmarks
-		insinto /usr/share/doc/${PF}/examples/c
-		doins "${S}"/examples/*
-		insinto /usr/share/doc/${PF}/html
-		cp -pPR doc/html/* "${D}"/usr/share/doc/${PF}/html
-		insinto /usr/share/doc/${PF}/pdf
-		doins doc/*pdf
-	fi
-
-	if use python; then
-		cd "${S}"/python
-		python setup_unix.py install --root="${D}" || die "python setup failed!"
-		if use doc; then
-			local python_doc_dir="/usr/share/doc/${PF}/examples/python"
-			insinto ${python_doc_dir}
-			doins examples/*py
-			dosym ../../benchmarks/datasets ${python_doc_dir}/
-		fi
-	fi
-}
diff --git a/sci-mathematics/fann/fann-1.2.0.ebuild b/sci-mathematics/fann/fann-1.2.0.ebuild
deleted file mode 100644
index c98158d2427f..000000000000
--- a/sci-mathematics/fann/fann-1.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-1.2.0.ebuild,v 1.6 2008/05/12 13:10:17 markusle Exp $
-
-inherit eutils
-
-DESCRIPTION="Fast Artificial Neural Network Library implements multilayer artificial neural networks in C"
-HOMEPAGE="http://fann.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fann/${PF}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc python"
-
-RDEPEND="python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf
-	sys-apps/sed
-	doc? ( app-text/docbook-sgml-utils )
-	python? ( dev-lang/swig )"
-
-S=${WORKDIR}/${PF}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}"/${PF}-setup.py "${S}"/python/setup.py
-}
-
-src_compile() {
-	local myconf
-	myconf="--prefix=/usr"
-
-	cd "${S}"
-	econf ${myconf} || die "econf failed!"
-	emake || die "emake failed!"
-	if use python; then
-		cd "${S}"/python || die
-		mkdir fann
-		for f in `ls *py |grep -v setup.py`; do
-			mv $f fann || die
-		done
-		cd "${S}"
-	fi
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed!"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/benchmarks
-		cp -pPR "${S}"/benchmarks/* "${D}"/usr/share/doc/${PF}/benchmarks
-		insinto /usr/share/doc/${PF}/examples/c
-		doins "${S}"/examples/*
-		insinto /usr/share/doc/${PF}/html
-		cp -pPR doc/html/* "${D}"/usr/share/doc/${PF}/html
-		insinto /usr/share/doc/${PF}/pdf
-		doins doc/*pdf
-	fi
-	if use python; then
-		cd "${S}"/python || die
-		python setup.py install --root="${D}" || die "python setup failed!"
-		if use doc; then
-			local python_doc_dir="/usr/share/doc/${PF}/examples/python"
-			insinto ${python_doc_dir}
-			doins examples/*py
-			dosym ../../benchmarks/datasets ${python_doc_dir}/
-		fi
-	fi
-}
diff --git a/sci-mathematics/fann/fann-2.1.0_beta.ebuild b/sci-mathematics/fann/fann-2.1.0_beta.ebuild
index 4897f0210ea7..f6b69b449787 100644
--- a/sci-mathematics/fann/fann-2.1.0_beta.ebuild
+++ b/sci-mathematics/fann/fann-2.1.0_beta.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-2.1.0_beta.ebuild,v 1.2 2008/05/23 19:06:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-2.1.0_beta.ebuild,v 1.3 2009/09/09 20:35:37 bicatali Exp $
 
-inherit eutils python
+EAPI=2
+inherit eutils python autotools
 
 MY_P=${P/_/}
 DESCRIPTION="Fast Artificial Neural Network Library"
 HOMEPAGE="http://leenissen.dk/fann/"
-SRC_URI="mirror://sourceforge/fann/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -20,16 +21,16 @@ DEPEND="${RDEPEND}
 	app-arch/unzip"
 
 S="${WORKDIR}/${P/_beta/}"
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-python.patch
 	epatch "${FILESDIR}"/${P}-benchmark.patch
 	epatch "${FILESDIR}"/${P}-examples.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	eautoreconf
 }
 
 src_compile() {
-	econf || die "econf failed"
 	emake || die "emake failed"
 	if use python; then
 		cd "${S}"/python
@@ -52,10 +53,10 @@ src_test() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use doc; then
-		dodoc doc/*.txt || die "failed to install docs"
+		dodoc doc/*.txt
 		insinto /usr/share/doc/${PF}
 		doins doc/fann_en.pdf || die "failed to install reference manual"
 		doins -r examples || die "failed to install examples"
diff --git a/sci-mathematics/fann/files/fann-2.1.0_beta-asneeded.patch b/sci-mathematics/fann/files/fann-2.1.0_beta-asneeded.patch
new file mode 100644
index 000000000000..f68da2d4eccb
--- /dev/null
+++ b/sci-mathematics/fann/files/fann-2.1.0_beta-asneeded.patch
@@ -0,0 +1,8 @@
+--- configure.in.orig	2009-09-09 21:18:25.000000000 +0100
++++ configure.in	2009-09-09 21:18:43.000000000 +0100
+@@ -7,4 +7,5 @@
+ AC_C_CONST
+ AC_HEADER_TIME
+ AC_CHECK_FUNCS(gettimeofday)
++AC_CHECK_LIB(m, sin)
+ AC_OUTPUT(Makefile src/Makefile src/include/Makefile fann.pc fann.spec)