Version bump and removed old ebuilds.

(Portage version: 2.1.4_rc10)

6 files changed, 25 insertions, 84 deletions

diff --git a/sci-libs/itpp/ChangeLog b/sci-libs/itpp/ChangeLog
index 33b192e3673a..9d73229a62f0 100644
--- a/sci-libs/itpp/ChangeLog
+++ b/sci-libs/itpp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2007/10/26 13:50:26 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/ChangeLog,v 1.57 2007/12/18 03:11:07 markusle Exp $
+
+*itpp-4.0.1 (18 Dec 2007)
+
+  18 Dec 2007; Markus Dittrich <markusle@gentoo.org> -itpp-3.99.3.1.ebuild,
+  -itpp-4.0.0_rc2.ebuild, +itpp-4.0.1.ebuild:
+  Version bump and removed old ebuilds.
 
   17 Oct 2007; Markus Dittrich <markusle@gentoo.org> itpp-4.0.0.ebuild:
   Streamlined the blas/lapack configuration.
diff --git a/sci-libs/itpp/files/digest-itpp-3.99.3.1 b/sci-libs/itpp/files/digest-itpp-3.99.3.1
deleted file mode 100644
index 48f2afa42c3c..000000000000
--- a/sci-libs/itpp/files/digest-itpp-3.99.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2ec2e8a8c56d4f3a8dbaece82739fa0 itpp-3.99.3.1.tar.bz2 896218
-RMD160 182f45b8c31ce9f679135c2198c2438818fceb6f itpp-3.99.3.1.tar.bz2 896218
-SHA256 683427bbeee602be444e30c17578ec4effb5ab082a38c156592c64b2c6c409a6 itpp-3.99.3.1.tar.bz2 896218
diff --git a/sci-libs/itpp/files/digest-itpp-4.0.0_rc2 b/sci-libs/itpp/files/digest-itpp-4.0.0_rc2
deleted file mode 100644
index b71820534385..000000000000
--- a/sci-libs/itpp/files/digest-itpp-4.0.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63f0edb3af1119bd07f9af86af2311ed itpp-4.0.0-rc2.tar.bz2 918396
-RMD160 dcabd8758d5968498ee88004bef8cf61ed6e1736 itpp-4.0.0-rc2.tar.bz2 918396
-SHA256 b2b9bfcc91cd2fa3c10c84eebf0074d4ee147a7c50124de25c030d8c694465e1 itpp-4.0.0-rc2.tar.bz2 918396
diff --git a/sci-libs/itpp/files/digest-itpp-4.0.1 b/sci-libs/itpp/files/digest-itpp-4.0.1
new file mode 100644
index 000000000000..67b88563a4fb
--- /dev/null
+++ b/sci-libs/itpp/files/digest-itpp-4.0.1
@@ -0,0 +1,3 @@
+MD5 a6fe9b957de8dad7b87ae5aebe490e2a itpp-4.0.1.tar.bz2 937452
+RMD160 638e95ae1e644f3d1ed392917e634282e70389a2 itpp-4.0.1.tar.bz2 937452
+SHA256 e0b50ade1bcb18c2bf9bdf2881bfc775d508d59324196f0fe8b6db4816293217 itpp-4.0.1.tar.bz2 937452
diff --git a/sci-libs/itpp/itpp-3.99.3.1.ebuild b/sci-libs/itpp/itpp-3.99.3.1.ebuild
deleted file mode 100644
index 72470891feed..000000000000
--- a/sci-libs/itpp/itpp-3.99.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-3.99.3.1.ebuild,v 1.2 2007/10/08 13:16:42 markusle Exp $
-
-inherit fortran flag-o-matic
-
-DESCRIPTION="IT++ is a C++ library of mathematical, signal processing, speech processing, and communications classes and functions"
-LICENSE="GPL-2"
-HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="blas debug doc fftw lapack minimal"
-
-DEPEND="!minimal? ( fftw? ( || ( >=sci-libs/fftw-3.0.0
-								>=sci-libs/acml-2.5.3 ) ) )
-		blas? ( virtual/blas
-				lapack? ( virtual/lapack ) )
-		doc? ( app-doc/doxygen
-				virtual/tetex )"
-
-pkg_setup() {
-	# lapack can only be used in conjunction with blas
-	if use lapack && ! use blas; then
-		die "USE=lapack requires USE=blas to be set"
-	fi
-}
-
-src_compile() {
-	# turn off performance critical debug code in development
-	# versions
-	append-flags -DNDEBUG
-
-	local myconf
-	if use blas; then
-		myconf="--with-blas=-lblas"
-	else
-		myconf="--without-blas"
-	fi
-
-	if use minimal; then
-		myconf="${myconf} --disable-comm --disable-fixed --disable-optim --disable-protocol --disable-signal --disable-srccode"
-	fi
-
-	econf $(use_enable doc html-doc) \
-		$(use_enable debug) \
-		$(use_with lapack) \
-		$(use_with fftw fft) \
-		"${myconf}" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog ChangeLog-2006 ChangeLog-2005 INSTALL \
-		NEWS NEWS-3.10 README TODO || die "failed to install docs"
-}
diff --git a/sci-libs/itpp/itpp-4.0.0_rc2.ebuild b/sci-libs/itpp/itpp-4.0.1.ebuild
index 817466b847e7..573fceea3c9e 100644
--- a/sci-libs/itpp/itpp-4.0.0_rc2.ebuild
+++ b/sci-libs/itpp/itpp-4.0.1.ebuild
@@ -1,15 +1,13 @@
 # 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.0_rc2.ebuild,v 1.4 2007/10/12 16:29:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/itpp/itpp-4.0.1.ebuild,v 1.1 2007/12/18 03:11:07 markusle Exp $
 
 inherit fortran flag-o-matic
 
-MY_PV="${PV/_/-}"
-
 DESCRIPTION="IT++ is a C++ library of mathematical, signal processing, speech processing, and communications classes and functions"
 LICENSE="GPL-2"
 HOMEPAGE="http://itpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
@@ -21,8 +19,6 @@ DEPEND="!minimal? ( fftw? ( || ( >=sci-libs/fftw-3.0.0 ) ) )
 		doc? ( app-doc/doxygen
 				virtual/tetex )"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 pkg_setup() {
 	# lapack can only be used in conjunction with blas
 	if use lapack && ! use blas; then
@@ -35,22 +31,21 @@ src_compile() {
 	# versions
 	append-flags -DNDEBUG
 
-	local myconf
+	local blas_conf="--without-blas"
+	local lapack_conf="--without-lapack"
 	if use blas; then
-		myconf="--with-blas=-lblas"
-	else
-		myconf="--without-blas"
-	fi
-
-	if use lapack; then
-		myconf="${myconf} --with-lapack=-llapack"
-	else
-		myconf="${myconf} --without-lapack"
+		if use lapack; then
+			blas_conf="--with-blas=$(pkg-config lapack --libs)"
+			lapack_conf="--with-lapack"
+		else
+			blas_conf="--with-blas=$(pkg-config blas --libs)"
+		fi
 	fi
 
+	local fftw_conf;
 	if use fftw;
 	then
-		myconf="${myconf} --with-fft=-lfftw3"
+		fftw_conf="--with-fft=-lfftw3"
 	fi
 
 	if use minimal; then
@@ -59,7 +54,9 @@ src_compile() {
 
 	econf $(use_enable doc html-doc) \
 		$(use_enable debug) \
-		${myconf} \
+		"${blas_conf}" \
+		"${lapack_conf}" \
+		"${fftw_conf}" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }