Added a patch from upstream and cleaned up the ebuild.

(Portage version: 2.1.4_rc10)

3 files changed, 71 insertions, 6 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index ed880ab0d43a..1301eb902c25 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/itpp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.58 2007/12/18 11:29:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.59 2007/12/21 14:50:30 markusle Exp $
+
+  21 Dec 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/itpp-4.0.1-zdotu-debian.patch, itpp-4.0.1.ebuild:
+  Added a patch from upstream and cleaned up the ebuild. Thanks much
+  to Adam Piątyszek <ediap@ET.PUT.Poznan.PL> for his help.
 
   18 Dec 2007; Markus Dittrich <markusle@gentoo.org> itpp-4.0.1.ebuild:
   Added missing myconf to econf and fixed installation path of html docs
diff --git a/sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch b/sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch
new file mode 100644
index 000000000000..50dc6936ee14
--- /dev/null
+++ b/sci-libs/itpp/files/itpp-4.0.1-zdotu-debian.patch
@@ -0,0 +1,54 @@
+diff --git a/itpp/base/blas.h b/itpp/base/blas.h
+index 91e415b..e23ca68 100644
+--- a/itpp/base/blas.h
++++ b/itpp/base/blas.h
+@@ -88,21 +88,21 @@ extern "C" {
+ 	       const double *x, const int *incx,
+ 	       const double *y, const int *incy);
+ 
+-#if defined(HAVE_ZDOTU_RETURN)
+-  std::complex<double> zdotu_(const int *n,
+-                              const std::complex<double> *x, const int *incx,
+-                              const std::complex<double> *y, const int *incy);
+-#elif defined(HAVE_ZDOTU_VOID)
++#if defined(HAVE_ZDOTU_VOID)
+   void zdotu_(std::complex<double> *dot,
+               const int *n,
+               const std::complex<double> *x, const int *incx,
+               const std::complex<double> *y, const int *incy);
++#elif defined(HAVE_ZDOTU_RETURN)
++  std::complex<double> zdotu_(const int *n,
++                              const std::complex<double> *x, const int *incx,
++                              const std::complex<double> *y, const int *incy);
+ #else
+   void zdotusub_(std::complex<double> *dot,
+                  const int *n,
+                  const std::complex<double> *x, const int *incx,
+                  const std::complex<double> *y, const int *incy);
+-#endif
++#endif // HAVE_ZDOTU_VOID
+ 
+   // ----------------------------------------------------------------------
+   // BLAS 2 functions
+diff --git a/itpp/base/vec.h b/itpp/base/vec.h
+index 6da1126..8708766 100644
+--- a/itpp/base/vec.h
++++ b/itpp/base/vec.h
+@@ -925,13 +925,13 @@ namespace itpp {
+     it_assert_debug(v1.datasize == v2.datasize, "cvec::dot: wrong sizes");
+     int incr = 1;
+     std::complex<double> output;
+-#if defined(HAVE_ZDOTU_RETURN)
+-    output = blas::zdotu_(&v1.datasize, v1.data, &incr, v2.data, &incr);
+-#elif defined(HAVE_ZDOTU_VOID)
++#if defined(HAVE_ZDOTU_VOID)
+     blas::zdotu_(&output, &v1.datasize, v1.data, &incr, v2.data, &incr);
++#elif defined(HAVE_ZDOTU_RETURN)
++    output = blas::zdotu_(&v1.datasize, v1.data, &incr, v2.data, &incr);
+ #else
+     blas::zdotusub_(&output, &v1.datasize, v1.data, &incr, v2.data, &incr);
+-#endif // HAVE_ZDOTU_RETURN
++#endif // HAVE_ZDOTU_VOID
+     return output;
+   }
+ #endif // HAVE_BLAS
diff --git a/sci-libs/itpp/itpp-4.0.1.ebuild b/sci-libs/itpp/itpp-4.0.1.ebuild
index 536f995d2180..a54a961e3b9e 100644
--- a/sci-libs/itpp/itpp-4.0.1.ebuild
+++ b/sci-libs/itpp/itpp-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.0.1.ebuild,v 1.2 2007/12/18 11:29:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.0.1.ebuild,v 1.3 2007/12/21 14:50:30 markusle Exp $
 
 inherit fortran flag-o-matic
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="blas debug doc fftw lapack minimal"
 
-DEPEND="!minimal? ( fftw? ( || ( >=sci-libs/fftw-3.0.0 ) ) )
+DEPEND="!minimal? ( fftw? ( >=sci-libs/fftw-3.0.0 ) )
 		blas? ( virtual/blas
 				lapack? ( virtual/lapack ) )
 		doc? ( app-doc/doxygen
@@ -26,9 +26,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-zdotu-debian.patch
+}
+
+
 src_compile() {
-	# turn off performance critical debug code in development
-	# versions
+	# turn off performance critical debug code 
 	append-flags -DNDEBUG
 
 	local blas_conf="--without-blas"
@@ -42,7 +48,7 @@ src_compile() {
 		fi
 	fi
 
-	local fftw_conf;
+	local fftw_conf="--without-fft";
 	if use fftw;
 	then
 		fftw_conf="--with-fft=-lfftw3"