Added a patch from upstream and cleaned up the ebuild.

Package-Manager: portage-2.1.4_rc10

4 files changed, 83 insertions, 14 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/Manifest b/sci-libs/itpp/Manifest
index 944ef6742472..8fb3b959c179 100644
--- a/sci-libs/itpp/Manifest
+++ b/sci-libs/itpp/Manifest
@@ -1,3 +1,7 @@
+AUX itpp-4.0.1-zdotu-debian.patch 2160 RMD160 7eab6b2dcd41edaf0355ae7f066427b1c6edb751 SHA1 36efcc7b1d22c6042083ad813fd017ba64e809f3 SHA256 7fb38cf84a4601d205a2cfb5577fb8ff4696e7b77edd3f57f81e12b0da2a6fc8
+MD5 47b0b90a9d03b56547d1f610ffa8df6c files/itpp-4.0.1-zdotu-debian.patch 2160
+RMD160 7eab6b2dcd41edaf0355ae7f066427b1c6edb751 files/itpp-4.0.1-zdotu-debian.patch 2160
+SHA256 7fb38cf84a4601d205a2cfb5577fb8ff4696e7b77edd3f57f81e12b0da2a6fc8 files/itpp-4.0.1-zdotu-debian.patch 2160
 DIST itpp-3.10.12.tar.bz2 815433 RMD160 889e4d864d7d9d00f3c3df253a49d7e30d327cb0 SHA1 e069a8cfd4ed2c1bf128ca295d37f5f9788752c6 SHA256 da9cf513364f155a440d4154085256b5bad43549e0589e3b6c88b54644ebd87a
 DIST itpp-4.0.0.tar.bz2 917273 RMD160 b464d48ac03719ab003877b6b92f5ff714c63f4d SHA1 6e010e77044597b602118ea4892f3c98e96b0b27 SHA256 56808c82c33f5d5dedb37ad5b6bf28814682b038514993e3cd1218dd853186af
 DIST itpp-4.0.1.tar.bz2 937452 RMD160 638e95ae1e644f3d1ed392917e634282e70389a2 SHA1 a64a62fc869625d004d4c0c6b5db0a0fc71bc4ca SHA256 e0b50ade1bcb18c2bf9bdf2881bfc775d508d59324196f0fe8b6db4816293217
@@ -9,14 +13,14 @@ EBUILD itpp-4.0.0.ebuild 1890 RMD160 947674ec0e922e4903c15e44596386a85878f64f SH
 MD5 f57a9b3d252bfd94a477e0efc8c55e34 itpp-4.0.0.ebuild 1890
 RMD160 947674ec0e922e4903c15e44596386a85878f64f itpp-4.0.0.ebuild 1890
 SHA256 6c680525aac8e62a4cd00a7f93fab6b20ed0721de6d113a7632f8d34525b838c itpp-4.0.0.ebuild 1890
-EBUILD itpp-4.0.1.ebuild 1949 RMD160 6dbbad65b251e34d38681d56bc74ddc46fce833d SHA1 4d6046271d8ceb38c1c5121b62d723234f5e8300 SHA256 4baad74e455dd921b0a0bc570a5441dfae43a7a18737a858da62e0b1c87f7025
-MD5 ede999eca081d2fc3c4a0102a235839e itpp-4.0.1.ebuild 1949
-RMD160 6dbbad65b251e34d38681d56bc74ddc46fce833d itpp-4.0.1.ebuild 1949
-SHA256 4baad74e455dd921b0a0bc570a5441dfae43a7a18737a858da62e0b1c87f7025 itpp-4.0.1.ebuild 1949
-MISC ChangeLog 9407 RMD160 3680b2b330355cb2d477f4598d0d4d80a846cdec SHA1 6035a65162289aea9b7fd9e8d66093615f974d7b SHA256 2c49de5927e01087fcdfbcd1cd83b4a4a53a438e010a70c77ebaa532e979d092
-MD5 7a042a52a7317e6c0bff0398f7abe608 ChangeLog 9407
-RMD160 3680b2b330355cb2d477f4598d0d4d80a846cdec ChangeLog 9407
-SHA256 2c49de5927e01087fcdfbcd1cd83b4a4a53a438e010a70c77ebaa532e979d092 ChangeLog 9407
+EBUILD itpp-4.0.1.ebuild 2021 RMD160 ea608a125248719c01b0379fc8c9b9f9fe43ffbc SHA1 08f40b579a0f58f3995af81ce5ee44399149f352 SHA256 54625e1d8f79c4089aec4d9275ec7d2e07e6ff6ec87d33b901abeb82938c3f99
+MD5 bb72d936ce6466f9782595a4e7912442 itpp-4.0.1.ebuild 2021
+RMD160 ea608a125248719c01b0379fc8c9b9f9fe43ffbc itpp-4.0.1.ebuild 2021
+SHA256 54625e1d8f79c4089aec4d9275ec7d2e07e6ff6ec87d33b901abeb82938c3f99 itpp-4.0.1.ebuild 2021
+MISC ChangeLog 9649 RMD160 6974aaf2491af2d1e3843e024b2e452ef47421d4 SHA1 6ee9a0c6e2f6601f4ea258bc860c6aa46177854f SHA256 964754e4049c23be2ce657f871d9a61d7e96ed6b12c2493506883dbcfec47850
+MD5 74c0bbe736bedaad242b3d3b0a272451 ChangeLog 9649
+RMD160 6974aaf2491af2d1e3843e024b2e452ef47421d4 ChangeLog 9649
+SHA256 964754e4049c23be2ce657f871d9a61d7e96ed6b12c2493506883dbcfec47850 ChangeLog 9649
 MISC metadata.xml 254 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 SHA1 83928b80dc644941d59b64e04e0964b1c1fa3005 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
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"