Version bump (this fixes bug #82918).

Package-Manager: portage-2.1.2_pre3-r9

6 files changed, 173 insertions, 16 deletions

diff --git a/sci-mathematics/fann/ChangeLog b/sci-mathematics/fann/ChangeLog
index 5ffbd81c2996..2f371a59a33b 100644
--- a/sci-mathematics/fann/ChangeLog
+++ b/sci-mathematics/fann/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/fann
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.4 2005/08/24 09:31:15 satya Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/ChangeLog,v 1.5 2006/10/28 14:13:26 markusle Exp $
+
+*fann-2.0.0 (28 Oct 2006)
+
+  28 Oct 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/fann-2.0.0-shared-libs-gentoo.patch, 
+  +files/fann-2.0.0-benchmark.patch, +fann-2.0.0.ebuild:
+  Version bump (this fixes bug #82918).
 
   24 Aug 2005; Christian Andreetta <satya@gentoo.org> fann-1.2.0.ebuild,
   fann-1.2.0-r1.ebuild:
diff --git a/sci-mathematics/fann/Manifest b/sci-mathematics/fann/Manifest
index 1a4f59d902e4..d27badc65bed 100644
--- a/sci-mathematics/fann/Manifest
+++ b/sci-mathematics/fann/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fann-1.2.0-r1.patch 14130 RMD160 b6cf23f60464efb330af374cbce21825f79f051c SHA1 bfbee4b483b22db3487c9751c4bdf0a48aa86aef SHA256 e3c902ae4d1bf6c1f007319406742285f762def454be590c2e8774cfc1263892
 MD5 b5581af0afa35074fc76a910ae6e9b5c files/fann-1.2.0-r1.patch 14130
 RMD160 b6cf23f60464efb330af374cbce21825f79f051c files/fann-1.2.0-r1.patch 14130
@@ -9,7 +6,16 @@ AUX fann-1.2.0-setup.py 1503 RMD160 5577f9ca2845e09454ced87df38eabe8e164bfc0 SHA
 MD5 c3136d6017e2e2debb0c8518543a9900 files/fann-1.2.0-setup.py 1503
 RMD160 5577f9ca2845e09454ced87df38eabe8e164bfc0 files/fann-1.2.0-setup.py 1503
 SHA256 2b77107528c369fbf557b5c502bea17fdea2144d9a8caa906a1c531bc348adba files/fann-1.2.0-setup.py 1503
+AUX fann-2.0.0-benchmark.patch 1986 RMD160 9660044ab4fadc476cda8653ad171ef7b0d5e1e5 SHA1 43645f9e1a198040d7c63d2da7755696087f07bc SHA256 ba4dd808fc66dd7fadb61e82ff12fdb6841c56e70c3d17a6a5e8d316e4d79b66
+MD5 6ba2afa856bba29404f1eb09dfe9a896 files/fann-2.0.0-benchmark.patch 1986
+RMD160 9660044ab4fadc476cda8653ad171ef7b0d5e1e5 files/fann-2.0.0-benchmark.patch 1986
+SHA256 ba4dd808fc66dd7fadb61e82ff12fdb6841c56e70c3d17a6a5e8d316e4d79b66 files/fann-2.0.0-benchmark.patch 1986
+AUX fann-2.0.0-shared-libs-gentoo.patch 1193 RMD160 b7e70b62187fe81363406fad1cabffbd9c98349c SHA1 c2d27d013e11d7bf0098dccf6ad619a32d25a1c8 SHA256 788faf6fde0ee954581b95e2630b265aeb3e88c3bb2fd696bc98e470b87b30f3
+MD5 30cb7a32376dec4f920c4a3d02b2bde9 files/fann-2.0.0-shared-libs-gentoo.patch 1193
+RMD160 b7e70b62187fe81363406fad1cabffbd9c98349c files/fann-2.0.0-shared-libs-gentoo.patch 1193
+SHA256 788faf6fde0ee954581b95e2630b265aeb3e88c3bb2fd696bc98e470b87b30f3 files/fann-2.0.0-shared-libs-gentoo.patch 1193
 DIST fann-1.2.0.tar.bz2 2082660
+DIST fann-2.0.0.tar.bz2 2310853 RMD160 9d7268eaf06ab177eafb72359a1cf73a70e5a886 SHA1 af4d4efe2362e68929bee73cde85bca10c48df43 SHA256 762a1313a9b935300cb66ebf052d469d04823ca721fe6dd2a49c01e13e8ab30a
 EBUILD fann-1.2.0-r1.ebuild 2498 RMD160 f7a7b193054841693540dc12b682e5ef0c03c918 SHA1 7982873ad9cfb21a8383398fd08c7637da996f7e SHA256 4a6610016262dc92ada4b5ca99cb70cc31294ce3cf5fe15f9b7f6ad37eabcb07
 MD5 81fbc5e7550d18d1cea1a48f1a91fa45 fann-1.2.0-r1.ebuild 2498
 RMD160 f7a7b193054841693540dc12b682e5ef0c03c918 fann-1.2.0-r1.ebuild 2498
@@ -18,10 +24,14 @@ EBUILD fann-1.2.0.ebuild 2430 RMD160 a3b09c99f7026c64d34e4c27aef20075b027230d SH
 MD5 8d603efe483abb2cfa0a55fda15598eb fann-1.2.0.ebuild 2430
 RMD160 a3b09c99f7026c64d34e4c27aef20075b027230d fann-1.2.0.ebuild 2430
 SHA256 a692dd9996bfb4c283e894ceac234bb1e9483b27915b822c1035fe4ef670449a fann-1.2.0.ebuild 2430
-MISC ChangeLog 983 RMD160 b26a08c3980bffefda18d49014bbab319d7a0ff3 SHA1 31b264fdee1bf3136be5df1542d2e8e12ca25b82 SHA256 e2593c473d5d9101e9441ef63c76028d3610f4d9989822e2160a4aaff66fab2f
-MD5 cf753889b6608fc285d9bf5bf4e5b0e9 ChangeLog 983
-RMD160 b26a08c3980bffefda18d49014bbab319d7a0ff3 ChangeLog 983
-SHA256 e2593c473d5d9101e9441ef63c76028d3610f4d9989822e2160a4aaff66fab2f ChangeLog 983
+EBUILD fann-2.0.0.ebuild 1799 RMD160 2c1878b830d9fa1e04507013f542355b26890045 SHA1 846e007cfc877d2e5b11da56b9a8b5f6a6e6f80c SHA256 853d83cc1bda84a7e227167d4f5aa8c55aa8e13b37d2fb9c71335adffc239df5
+MD5 f3e4bcb0936cc7a2eff3e3e570334359 fann-2.0.0.ebuild 1799
+RMD160 2c1878b830d9fa1e04507013f542355b26890045 fann-2.0.0.ebuild 1799
+SHA256 853d83cc1bda84a7e227167d4f5aa8c55aa8e13b37d2fb9c71335adffc239df5 fann-2.0.0.ebuild 1799
+MISC ChangeLog 1211 RMD160 11941c903bd2d16001e2994c3bc4fd328d96746d SHA1 94735233c9be2fb05e2ba82cc2ea5f077cbc7478 SHA256 adb501b42780e25ab4fe15f1ba45e11cf9af1364a6e275e2e1484bdfaee5b995
+MD5 f4952c4cb99a2acf240684b986f27d2f ChangeLog 1211
+RMD160 11941c903bd2d16001e2994c3bc4fd328d96746d ChangeLog 1211
+SHA256 adb501b42780e25ab4fe15f1ba45e11cf9af1364a6e275e2e1484bdfaee5b995 ChangeLog 1211
 MISC metadata.xml 712 RMD160 2c5e90c1d9ed9c54921822cf1aa8a08d747b57a6 SHA1 2cf70dfc30d447d3c0fee666101987d9c56f2997 SHA256 93d6305a614cd8f6e46b2ab968d707598885f8209d08515ee9ac28ace9e7d4ba
 MD5 5e5973eae2c5a917fbbc64c84bf2dd29 metadata.xml 712
 RMD160 2c5e90c1d9ed9c54921822cf1aa8a08d747b57a6 metadata.xml 712
@@ -32,10 +42,6 @@ SHA256 1516c0633dad0c32a10412c479f68bd738d3933b918c215a67ec4adf63e89ad1 files/di
 MD5 2f3e1ec485ad30450d503501c4d67912 files/digest-fann-1.2.0-r1 64
 RMD160 79fb63f21d74442d94d627dbf46bd888c71a9bd5 files/digest-fann-1.2.0-r1 64
 SHA256 1516c0633dad0c32a10412c479f68bd738d3933b918c215a67ec4adf63e89ad1 files/digest-fann-1.2.0-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEzX+fwUpWvClEHQoRAqKYAJ4kNXkTiIfs8FoELbzmD7Mx3oWRvgCfeojr
-mK9DO7hbNFA50EmumJqEOdw=
-=d4UT
------END PGP SIGNATURE-----
+MD5 ae0b2cd5d820d6c9e2274d9f9bbb16f5 files/digest-fann-2.0.0 238
+RMD160 98499f36ebfa8a1cadf535821b67ff7572484dca files/digest-fann-2.0.0 238
+SHA256 e5154f88efbb784228fab6762e152eda0440f3e37112b15bad6672bac4691783 files/digest-fann-2.0.0 238
diff --git a/sci-mathematics/fann/fann-2.0.0.ebuild b/sci-mathematics/fann/fann-2.0.0.ebuild
new file mode 100644
index 000000000000..bf849f15232c
--- /dev/null
+++ b/sci-mathematics/fann/fann-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/fann/fann-2.0.0.ebuild,v 1.1 2006/10/28 14:13:26 markusle Exp $
+
+inherit eutils
+
+DESCRIPTION="Fast Artificial Neural Network Library implements multilayer artificial neural networks in C"
+HOMEPAGE="http://leenissen.dk/fann/"
+SRC_URI="mirror://sourceforge/fann/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc python"
+
+DEPEND="python? ( dev-lang/python dev-lang/swig )"
+
+
+src_unpack() {
+	unpack ${A} || die
+	cd "${S}" || die
+	epatch "${FILESDIR}"/${P}-shared-libs-gentoo.patch
+	epatch "${FILESDIR}"/${P}-benchmark.patch
+}
+
+
+src_compile() {
+	econf ${myconf} || die "configure failed"
+	emake || die "failed to build src"
+	if use python; then
+		cd ${S}/python || \
+			die "failed to step into python subdirectory"
+		emake || die "failed to build python wrappers"
+	fi
+}
+
+src_install() {
+	cd "${S}"
+	make install DESTDIR=${D} || die "install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use doc; then
+		dodoc doc/*.txt || \
+			die "failed to install docs"
+		insinto /usr/share/doc/${P}
+		doins doc/fann_en.pdf || \
+			die "failed to install reference manual"
+		insinto /usr/share/${PN}/benchmarks
+		doins -r benchmarks/* || \
+			die "failed to install benchmarks"
+		insinto /usr/share/${PN}/examples
+		doins examples/* || \
+			die "failed to install examples"
+	fi
+
+	if use python; then
+		cd ${S}/python || \
+			die "Faild to step into python subdirectory"
+		make install ROOT=${D} || \
+			die "failed to install python wrappers"
+		if use doc; then
+			local python_doc_dir="/usr/share/${PN}/examples/python"
+			insinto ${python_doc_dir}
+			doins examples/* || \
+				die "failed to install python examples"
+		fi
+	fi
+}
+
diff --git a/sci-mathematics/fann/files/digest-fann-2.0.0 b/sci-mathematics/fann/files/digest-fann-2.0.0
new file mode 100644
index 000000000000..4e5accece56d
--- /dev/null
+++ b/sci-mathematics/fann/files/digest-fann-2.0.0
@@ -0,0 +1,3 @@
+MD5 4224efa533265dcf39237667973d0e20 fann-2.0.0.tar.bz2 2310853
+RMD160 9d7268eaf06ab177eafb72359a1cf73a70e5a886 fann-2.0.0.tar.bz2 2310853
+SHA256 762a1313a9b935300cb66ebf052d469d04823ca721fe6dd2a49c01e13e8ab30a fann-2.0.0.tar.bz2 2310853
diff --git a/sci-mathematics/fann/files/fann-2.0.0-benchmark.patch b/sci-mathematics/fann/files/fann-2.0.0-benchmark.patch
new file mode 100644
index 000000000000..ec37e9940a63
--- /dev/null
+++ b/sci-mathematics/fann/files/fann-2.0.0-benchmark.patch
@@ -0,0 +1,49 @@
+diff -Naur fann-2.0.0/benchmarks/Makefile fann-2.0.0-new/benchmarks/Makefile
+--- fann-2.0.0/benchmarks/Makefile	2005-11-29 16:33:12.000000000 -0500
++++ fann-2.0.0-new/benchmarks/Makefile	2006-10-28 09:08:00.000000000 -0400
+@@ -16,7 +16,7 @@
+ all: $(TARGETS)
+ 
+ quality: quality.cc
+-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -llwneuralnet -ljneural -lfl
++	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -lfl
+ 
+ quality_fixed: quality_fixed.c
+ 	$(GCC) $(CFLAGS) $(LFLAGS) $< -o $@ -lfixedfann
+@@ -25,7 +25,7 @@
+ 	$(GCC) -ggdb -lm -DDEBUG -Wall -ansi -I../src/ -I../src/include/ ../src/fixedfann.c $< -o $@
+ 
+ performance: performance.cc
+-	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -llwneuralnet -ljneural -lfl
++	$(G++) $(CFLAGS) $(LFLAGS) -I$(JNEURALDIR)include/ -L$(JNEURALDIR) -I$(LWNNDIR) -L$(LWNNDIR) $< -o $@ -lfloatfann -lfl
+ 
+ performance_fixed: performance.cc
+ 	$(G++) $(CFLAGS) $(LFLAGS) -DFIXEDFANN $< -o $@ -lfixedfann
+diff -Naur fann-2.0.0/benchmarks/performance.cc fann-2.0.0-new/benchmarks/performance.cc
+--- fann-2.0.0/benchmarks/performance.cc	2005-10-24 16:48:47.000000000 -0400
++++ fann-2.0.0-new/benchmarks/performance.cc	2006-10-28 09:08:28.000000000 -0400
+@@ -19,8 +19,8 @@
+ 
+ //uncomment lines below to benchmark the libraries
+ 
+-#define JNEURAL
+-#define LWNN
++/*#define JNEURAL
++#define LWNN */
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+diff -Naur fann-2.0.0/benchmarks/quality.cc fann-2.0.0-new/benchmarks/quality.cc
+--- fann-2.0.0/benchmarks/quality.cc	2005-11-29 16:33:12.000000000 -0500
++++ fann-2.0.0-new/benchmarks/quality.cc	2006-10-28 09:08:19.000000000 -0400
+@@ -19,8 +19,8 @@
+ 
+ //uncomment lines below to benchmark the libraries
+ 
+-#define JNEURAL
+-#define LWNN
++/*#define JNEURAL
++#define LWNN */
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/sci-mathematics/fann/files/fann-2.0.0-shared-libs-gentoo.patch b/sci-mathematics/fann/files/fann-2.0.0-shared-libs-gentoo.patch
new file mode 100644
index 000000000000..2d9782a563a2
--- /dev/null
+++ b/sci-mathematics/fann/files/fann-2.0.0-shared-libs-gentoo.patch
@@ -0,0 +1,23 @@
+diff -Naur fann-2.0.0/python/pyfann/Makefile fann-2.0.0-new/python/pyfann/Makefile
+--- fann-2.0.0/python/pyfann/Makefile	2005-12-02 20:22:43.000000000 -0500
++++ fann-2.0.0-new/python/pyfann/Makefile	2006-10-28 07:36:34.000000000 -0400
+@@ -10,7 +10,7 @@
+ all: $(TARGETS)
+ 	
+ _%.so: pyfann_wrap.o fann_helper.o
+-	gcc $(LIBS) -shared -dll $^ -o $@
++	gcc $(LIBS) -fPIC -shared -dll $^ -o $@
+ 
+ %.o: %.c 
+ 	gcc -c $< -I/usr/include/$(PYTHON)/ -I$(FANN_DIR)/src/include/
+diff -Naur fann-2.0.0/python/setup.py fann-2.0.0-new/python/setup.py
+--- fann-2.0.0/python/setup.py	2006-01-06 16:45:28.000000000 -0500
++++ fann-2.0.0-new/python/setup.py	2006-10-28 07:36:07.000000000 -0400
+@@ -40,6 +40,6 @@
+     url='http://sourceforge.net/projects/fann/',

+     license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',

+     py_modules=['pyfann.libfann','pyfann.fann'],

+-    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i','pyfann/fann_helper.c'], include_dirs=['../src/include'], extra_objects=['../src/doublefann.o']) ]

++    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i','pyfann/fann_helper.c'], include_dirs=['../src/include'], extra_objects=['../src/.libs/doublefann.o']) ]

+ )

+