Cleaned and fixed for as-needed

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 39 insertions, 165 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/Manifest b/sci-mathematics/fann/Manifest
index fb9588b0deb5..fcb18db84f8b 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,16 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fann-1.2.0-r1.patch 14130 RMD160 b6cf23f60464efb330af374cbce21825f79f051c SHA1 bfbee4b483b22db3487c9751c4bdf0a48aa86aef SHA256 e3c902ae4d1bf6c1f007319406742285f762def454be590c2e8774cfc1263892
 AUX fann-1.2.0-setup.py 1503 RMD160 5577f9ca2845e09454ced87df38eabe8e164bfc0 SHA1 e70764a15c23b8b958b309b029586ba9ea129a87 SHA256 2b77107528c369fbf557b5c502bea17fdea2144d9a8caa906a1c531bc348adba
 AUX fann-2.0.0-benchmark.patch 1986 RMD160 9660044ab4fadc476cda8653ad171ef7b0d5e1e5 SHA1 43645f9e1a198040d7c63d2da7755696087f07bc SHA256 ba4dd808fc66dd7fadb61e82ff12fdb6841c56e70c3d17a6a5e8d316e4d79b66
 AUX fann-2.0.0-shared-libs-gentoo.patch 1193 RMD160 b7e70b62187fe81363406fad1cabffbd9c98349c SHA1 c2d27d013e11d7bf0098dccf6ad619a32d25a1c8 SHA256 788faf6fde0ee954581b95e2630b265aeb3e88c3bb2fd696bc98e470b87b30f3
+AUX fann-2.1.0_beta-asneeded.patch 280 RMD160 495614dcab634ada103a1be9755f5e54d32ef2b8 SHA1 a9dc32d477a30a2682fdf301922da3dc73778dc6 SHA256 a9ff761ccaf54136795f4491945c486a23560db15f8839991ce8c2a8cee73187
 AUX fann-2.1.0_beta-benchmark.patch 2862 RMD160 338c32d701cb483bb2c9d9676accb83d4f1b1d19 SHA1 87d2deb97b938052b19391693c7ccada416a5e47 SHA256 f12c6649d9eff5aa4c0e565f9c404c1be8101e7ded91da862df82fe499e1c5f4
 AUX fann-2.1.0_beta-examples.patch 923 RMD160 7379369370db10635234f7245f4636969e495259 SHA1 7ae0e2e060a5cc0da212c5310293a3e1e6e81d5d SHA256 a52427363d169d1ff20b4167db41c098bc41e6c2d5f7dfac1bf6389fc0342c58
 AUX fann-2.1.0_beta-python.patch 750 RMD160 1609d02da5096c2fc3404f2747f55261faba58bd SHA1 9cf261f3733be27a49e8bcebf0879347fb7b1d6a SHA256 94490da5c5b6216c97e987965b92347e3d5125ea32a9aaa62cd8b584036f9a01
-DIST fann-1.2.0.tar.bz2 2082660 RMD160 672dd909d05f3a42517f938f6145c81ab421adeb SHA1 b3ffe2bef832256b89af80a4843f760ed2d63fca SHA256 3ddd93bfc0dfbe1a223edcf86e79b4a325e966ffbafa000bd0c86d25fdf717b1
 DIST fann-2.0.0.tar.bz2 2310853 RMD160 9d7268eaf06ab177eafb72359a1cf73a70e5a886 SHA1 af4d4efe2362e68929bee73cde85bca10c48df43 SHA256 762a1313a9b935300cb66ebf052d469d04823ca721fe6dd2a49c01e13e8ab30a
 DIST fann-2.1.0beta.zip 4033198 RMD160 f0d5366547a1f3998246b9ffec9c9a65ec70fa9e SHA1 ee86afbb9787cd41a42e07db2a9bc10699b555f6 SHA256 c24171b5b9c87946bd2f50045cc8dbd0121629fe426615501db14e6043e4a141
-EBUILD fann-1.2.0-r1.ebuild 1862 RMD160 aa89ffe947dccaebb49fb7e88d5749cc65ea49b8 SHA1 c14db4e8af9db7137946488bee1a979142901e63 SHA256 03804e12df7316004db80e3d46e248e48c47cd01229bc05194db670c1e048193
-EBUILD fann-1.2.0.ebuild 1841 RMD160 e23101e9811ed1e66de163df0cfb74fc2cdd9b90 SHA1 0067e4bfa322929874ea13d45cc6aa2928acaddd SHA256 8efcf206644124e6bc13711386d545316ff054a9bd7393256c5f8561834635e4
 EBUILD fann-2.0.0.ebuild 1838 RMD160 2dd97d2396b1937461060a7b832ca7cfb536b6a5 SHA1 30252e4366a99e7b57950a98681e0d222b8d7b01 SHA256 7cdf98b489d3ffda3e2c19c0b98cf64191640c2b281b8f72bb2b11e0c4000577
-EBUILD fann-2.1.0_beta.ebuild 1966 RMD160 0fe74d5bc6cdc506ab5c7236c9e2bd648357b16f SHA1 740d58f0b69ef7b22404a48381f69b73a7f3d67e SHA256 375c34733341849af4a1fea7d13518a5270a10eaeb18e7770625f69022bef7a5
-MISC ChangeLog 2287 RMD160 5d631cae9e8d52f67ccb87e14f1489d9fbe7b686 SHA1 099cd16f3ca56ef24b19d1f8be384de3e65b5a45 SHA256 b30b734c23e71e7290d939e55a1ed30ad44a7ab05965937493bf9144350fd411
+EBUILD fann-2.1.0_beta.ebuild 1933 RMD160 00bc37ba17f253d66be3d6fb221d9e97fc5aa169 SHA1 de069e67dfefbb45d7af692d88934278d8fadce5 SHA256 763567e53240c4588ddd0bfb377c26e146084352dd7b30b350d1775ebff84aa7
+MISC ChangeLog 2487 RMD160 b982ba39f13a71baf6efac028dcb648e4288f362 SHA1 105729640e31b29eb2e86b6cd376dc757a333ba4 SHA256 bb6b93fb160e2b72c4eba532c2ff09ae64f2af53582c669aacd7bbf74244cce2
 MISC metadata.xml 658 RMD160 25e209eb45899500179b5f893cc72ca41ab2370a SHA1 0c05318426869d997f382e37c9a9a5371123b052 SHA256 003060bd03fae3d61eeffbe23a4b181b905761a9e21bb1482fdec962e099641b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqoEaMACgkQ1ycZbhPLE2CXVwCfSAYKvyAGF9gIAF5rBLpnQ5Wn
+4EoAn1x2k9JcMZFhdTlTZ4AL40x0N1VM
+=M5HA
+-----END PGP SIGNATURE-----
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)