Removed icc flag, added a revision bump removing fortran stuff (not needed without the benchmarks), and examples building. Propagate user flags and cleanup. See bug #217317

Package-Manager: portage-2.1.5_rc6

5 files changed, 92 insertions, 14 deletions

diff --git a/dev-libs/blitz/ChangeLog b/dev-libs/blitz/ChangeLog
index 5bbb3b066051..ac9f46d00dea 100644
--- a/dev-libs/blitz/ChangeLog
+++ b/dev-libs/blitz/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/blitz
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.29 2008/04/01 15:48:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.30 2008/04/26 10:27:37 bicatali Exp $
+
+*blitz-0.9-r2 (26 Apr 2008)
+
+  26 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> blitz-0.9.ebuild,
+  blitz-0.9-r1.ebuild, +blitz-0.9-r2.ebuild:
+  Removed icc flag, added a revision bump removing fortran stuff (not needed
+  without the benchmarks), and examples building. Propagate user flags and
+  cleanup. See bug #217317.
 
   01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
   +files/blitz-0.9-gcc-4.3-missing-includes.patch, blitz-0.9.ebuild,
diff --git a/dev-libs/blitz/Manifest b/dev-libs/blitz/Manifest
index 3bb6c571e1de..d81a0d5380d4 100644
--- a/dev-libs/blitz/Manifest
+++ b/dev-libs/blitz/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blitz-0.9-gcc-4.3-missing-includes.patch 404 RMD160 13cf1763393344485de9d2a28c908095f2ada50f SHA1 374d14e968f478be59859d81aff50ffb3a860644 SHA256 dac1360a34e0f24222873247ae1933e27f760e6207356dff142c81bc30e6f8a2
 DIST blitz-0.9.tar.gz 3124301 RMD160 1e1b39a5975f9e5b423365c2d1b047fe0285ed2f SHA1 055a4bcb47903e5c2446884d2df1494ac3e24034 SHA256 88b7c5e062b06767d04511776cf706316026b9357b128e126be88935626d2bcb
-EBUILD blitz-0.9-r1.ebuild 1468 RMD160 d41d606937aabbdca1cbae9ed2ebfe1fe395a454 SHA1 e19cd06b28b4ba77d0f38bfd91a332138407167b SHA256 d0ee9a7b9f825e7c07fca3bc382639631be671622b98620a66b5f29fb7120131
-EBUILD blitz-0.9.ebuild 1300 RMD160 fd2d7a8989b47804d2b3d36dbc00455be78ffec1 SHA1 06ed367e81e1122fb81b82d6fee9975272772a37 SHA256 2659f2471a7cba5e1dccfd0ce9e2201195a481df0ba27a8cf94cbe049be4ed18
-MISC ChangeLog 3891 RMD160 183b66359e94845397413593a79735e022c7528e SHA1 4add265d3a339517f7e4be45723924489299e3ff SHA256 76a9b4ba7d2ca97c7720f51961e41871421a7a4e450f0688ad0879b7bc9b27c2
+EBUILD blitz-0.9-r1.ebuild 1455 RMD160 4fc523d8c1453bba29b79a2411b4a946bb1f85f4 SHA1 c506b805efb545dae72b58bc208a59f119eb525c SHA256 a356e0f5c6561eb244deb8ce76f4489d07bb421ac15c7c4b6497a42142aa9366
+EBUILD blitz-0.9-r2.ebuild 1545 RMD160 5fe9b48d373be2fb22dfca2247bfa1ce0e276dcf SHA1 5aa48be722400a86dfb4c28699bbcd76936816b8 SHA256 a1018a018872ab8af41d1751ae21a050aea800dbba259ca59db9c6af788e3cd8
+EBUILD blitz-0.9.ebuild 1288 RMD160 7ba8d3335fbc4f09dc2df84dc67a77d94e5ed3dc SHA1 d0f9d181106195e11078106e359c2c4b5f8d9dc1 SHA256 76dcf08e299ebcd68925bc1596de3d6a6010aee9294f982c9250ab3e0bd2cd9a
+MISC ChangeLog 4216 RMD160 3642bf5bbc37a4c0412b85e4987ab7e55c5ce37f SHA1 ef5bbed7d5b8872acc5ef980d8494f9799e76b13 SHA256 d32ff3574884b2a2c7e1fa5bec3afb38dd8d6a60bf7290e94b6d0ea92ad2d24d
 MISC metadata.xml 304 RMD160 4534779aede454ff4fd69acfd9ec78063a09b75a SHA1 d4976e87786afbac02939a1654ffc94124b92931 SHA256 3bb1511a946ae2fec05abd0c8b47847d0ada2ded4c5db17039116f714f12af25
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIEwOi1ycZbhPLE2ARArQsAJ0SHVC2z2dHI9tlZdMRYCpOrF8tTgCePqBU
+O+q3M9XTJJjDV3Ixk34OBLc=
+=xpO+
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/blitz/blitz-0.9-r1.ebuild b/dev-libs/blitz/blitz-0.9-r1.ebuild
index 143590c6ccf0..5144621f700d 100644
--- a/dev-libs/blitz/blitz-0.9-r1.ebuild
+++ b/dev-libs/blitz/blitz-0.9-r1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.9-r1.ebuild,v 1.2 2008/04/01 15:48:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.9-r1.ebuild,v 1.3 2008/04/26 10:27:37 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
 DESCRIPTION="High-performance C++ numeric library"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.oonumerics.org/blitz"
-IUSE="debug doc examples icc"
+IUSE="debug doc examples"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="|| ( GPL-2 Blitz-Artistic )"
 
-DEPEND="icc? ( dev-lang/icc )
-		doc? ( app-doc/doxygen )"
+DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
 FORTAN="g77"
@@ -30,7 +29,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 	# ICC: if we've got it, use it
-	use icc && myconf="--with-cxx=icc" || myconf="--with-cxx=gcc"
+	[[ $(tc-getCXX) = ic*c ]] && myconf="--with-cxx=icc" || myconf="--with-cxx=gcc"
 
 	export CC=$(tc-getCC) CXX=$(tc-getCXX)
 	econf \
diff --git a/dev-libs/blitz/blitz-0.9-r2.ebuild b/dev-libs/blitz/blitz-0.9-r2.ebuild
new file mode 100644
index 000000000000..33123cc97e52
--- /dev/null
+++ b/dev-libs/blitz/blitz-0.9-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.9-r2.ebuild,v 1.1 2008/04/26 10:27:37 bicatali Exp $
+
+inherit eutils
+
+DESCRIPTION="High-performance C++ numeric library"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.oonumerics.org/blitz"
+IUSE="debug doc examples"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="|| ( GPL-2 Blitz-Artistic )"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# remove examples compiling
+	sed -i \
+		-e 's/blitz-uninstalled.pc//' \
+		-e 's/examples//g' \
+		Makefile.in || die "sed failed"
+	epatch "${FILESDIR}"/${P}-gcc-4.3-missing-includes.patch
+}
+
+src_compile() {
+	# blas and fortran are only useful for benchmarks
+	econf \
+		--enable-shared \
+		--disable-cxx-flags-preset \
+		--disable-fortran \
+		--without-blas \
+		$(use_enable doc doxygen) \
+		$(use_enable doc html-docs) \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake lib || die "emake lib failed"
+}
+
+src_test() {
+	# exprctor fails if BZ_DEBUG flag is not set
+	# CXXFLAGS gets overwritten
+	emake AM_CXXFLAGS="-DBZ_DEBUG" check-testsuite || die "selftest failed"
+}
+
+src_install () {
+	dodir /usr/share/doc/${PF}/html
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		install || die "emake install failed"
+	dodoc ChangeLog ChangeLog.1 README README.binutils TODO AUTHORS NEWS
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.cpp
+	fi
+}
diff --git a/dev-libs/blitz/blitz-0.9.ebuild b/dev-libs/blitz/blitz-0.9.ebuild
index 5b38ad8f5760..9c0337508b22 100644
--- a/dev-libs/blitz/blitz-0.9.ebuild
+++ b/dev-libs/blitz/blitz-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.9.ebuild,v 1.8 2008/04/01 15:48:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.9.ebuild,v 1.9 2008/04/26 10:27:37 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -8,9 +8,9 @@ DESCRIPTION="High-performance C++ numeric library"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://www.oonumerics.org/blitz"
 #DEPEND="doc? ( virtual/tetex )"
-DEPEND="icc? ( dev-lang/icc )"
+DEPEND=""
 RDEPEND=""
-IUSE="icc"
+IUSE=""
 
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
@@ -27,7 +27,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 	# ICC: if we've got it, use it
-	use icc && myconf="--with-cxx=icc" || myconf="--with-cxx=gcc"
+	[[ $(tc-getCXX) = ic*c ]] && myconf="--with-cxx=icc" || myconf="--with-cxx=gcc"
 	#use doc && myconf="$myconf --enable-latex-docs"
 	myconf="${myconf} --enable-maintainer-mode --disable-doxygen --disable-dot"
 	myconf="${myconf} --enable-shared"
@@ -44,5 +44,5 @@ src_install () {
 	dodir /usr/share/doc/${PF}
 	emake DESTDIR=${D} docdir=/usr/share/doc/${PF} install || die
 	dodoc ChangeLog ChangeLog.1 LICENSE README README.binutils \
-	      TODO COPYING LEGAL AUTHORS NEWS
+		  TODO COPYING LEGAL AUTHORS NEWS
 }