Version bump, take maintainership, fixes doc install

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

6 files changed, 219 insertions, 5 deletions

diff --git a/dev-libs/blitz/ChangeLog b/dev-libs/blitz/ChangeLog
index 5c3e5d7a587f..61a506e3a241 100644
--- a/dev-libs/blitz/ChangeLog
+++ b/dev-libs/blitz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/blitz
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.41 2011/07/20 13:56:51 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.42 2012/08/13 21:11:11 bicatali Exp $
+
+*blitz-0.10 (13 Aug 2012)
+
+  13 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> +blitz-0.10.ebuild,
+  +files/blitz-0.10-docs.patch, +files/blitz-0.10-gcc47.patch, metadata.xml:
+  Version bump, take maintainership, fixes doc install
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #34534
diff --git a/dev-libs/blitz/Manifest b/dev-libs/blitz/Manifest
index 78106923f091..977aa7ddd67e 100644
--- a/dev-libs/blitz/Manifest
+++ b/dev-libs/blitz/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX blitz-0.10-docs.patch 2824 SHA256 aa1dd23e6d38bf6a4540e4b0b49503e5a851aebeb0315ee7e3a8fba7aba02a60 SHA512 c20fe575a5466c11ec386a3e826622035826b0fea133c3f212809d5b39f0ea058418b347e425daded48141b5ef1446af655f221a60e1919f3867442673ff9707 WHIRLPOOL 0fd569f2705adc4614ca5b4b98df875461deba4ce71ea5cbe75bfe3dbf82cb99b2a60ef28f2d0615e16b311e027e27464aa15a9e7aadc61aa2840108024b16c6
+AUX blitz-0.10-gcc47.patch 1534 SHA256 b455d0b68b1c992ac58f546c7b3ec51e754cfceacf85f3c5e7d5c7c077018f29 SHA512 1cc37eba48e7e486dd53f9441b375be2f8140fe634e2fbf3a1bfb0225a7eb0810f95b3f02c66c674d88a97a13f598677867ad77472dc0cd7a3b936a5e3c185de WHIRLPOOL 0ec3824febc62abe6b039b6f49e52123ad21dcb92ed5b29ec22b378982fe4a92a3ecbfd19a76a0187615572476caa0ab2386b6abd53a700bc72d6e74c7ef9076
 AUX blitz-0.9-gcc-4.3-missing-includes.patch 404 SHA256 dac1360a34e0f24222873247ae1933e27f760e6207356dff142c81bc30e6f8a2 SHA512 4eb0bf6104cb04ed895166e07c9dbe12bbe37e40f292540c0191304a5087dc8f8dc9f8a6080ec29ce9585a12949a5edb7d38dd30afce5fc6c49cec255afa5db6 WHIRLPOOL ed1b624d7816658e0357e400d8d61d8086613c98f328f43f80b5fa9205d26fc1c7e92ef5ec31894f70cdbd7cd00a418869d11fadf5b86310c4d1bdaac5ab1db7
+DIST blitz-0.10.tar.gz 3777276 SHA256 804ef0e6911d43642a2ea1894e47c6007e4c185c866a7d68bad1e4c8ac4e6f94 SHA512 04fb0c8735d8ae173e6e907bd04fd739c482b7816c25b7dfe58c8641b90c17321e9a6849ced73a04ca9cc55439070de1a1e395497887317b553b0550fa0a2462 WHIRLPOOL ab091832e5dd34f0d2a0f6584c000962946b42f32175fb589fc5c329807e6f75cc81c921c4da3d9e60bc211de0746af1a5f30dc5776761993434a0b8e32ebf6e
 DIST blitz-0.9.tar.gz 3124301 SHA256 88b7c5e062b06767d04511776cf706316026b9357b128e126be88935626d2bcb SHA512 93cce436fa86d7e3d7f93c93aaa0c8bfbe3e3b04f22ef2bc8096a2b700b6a6a8e76c9c84edff550464daeebabe8648ff58639fb46a4c059aa7059606cf3e0913 WHIRLPOOL d7166efa7996bb8ca8055d3a4a0cc6b2ac6bc2e042cfcf2108da1ea5d7656076bb76eaa222b9359c65cfd59ecd0f843ac61daaed97483a3b27cc8606ba3b6ef8
+EBUILD blitz-0.10.ebuild 1581 SHA256 2adc9133c8b2dfce549f3df5bcb8ce907c01d844c4412eb449b503d20c2d5f73 SHA512 0e7533f74a7c59df406bc16bb90fd2aebf04db09192ae877dc99ebb3707116cbce101967cfe50c760654b7b03ea36c5ca3da54d3cc02f589b4c0c2932933947f WHIRLPOOL c5a4d36f8a40723631b6f2d72a849b349b8798c2381555999001e7b001bf617825a45f0b8fb68f6f92900c059f7417bf60e90ad327f4d9b4182c950cb8d5e588
 EBUILD blitz-0.9-r3.ebuild 1639 SHA256 b4acba570ccbdd4f2711e88c9c4a4bc890b703f56e3e67b29468ad734b061c67 SHA512 cbafdd21d74ee94b549a8bdde69ecb49146d44841c9ec4f20abd3717a844178169d4ecb80585f78b912ddeab916d7bbdf9fafd66ec9fadc9c015538b76985b24 WHIRLPOOL 4b25e8386f5214b8ecf98408d5361821a6daf3c225054b2fd2317890f96f8af4bc3bd5e1223ea2d337d3dfb3338e42e721178a43e79f0b60a8086ad39d4e409b
 EBUILD blitz-0.9.ebuild 1368 SHA256 78dc8b28e9e570ac893f067d8371da64b1aa7d6d445ddb0e084e45c1db9c9515 SHA512 d3ac99b7e7bc3a43d337dbd555ffd8f5f35bfa0a0c83465ac079c55f5b8ea08a659564fee053d85018c81567863e92e34cba0b641d6fc1b3048cf3caa2cf4066 WHIRLPOOL 144edef99d58355c41d012e63dc41ff2acd6b1e532d0cfdbea8c3575bb24a479f93593b45747f1c60a6fa784b501dc18199670d83ff5379f27becec868a2381f
-MISC ChangeLog 5763 SHA256 7374c1e9954acbbf79388095e09afeee41146cae48279045f09b7e29ad8749ff SHA512 c417e1a1b56d3a2567569477acf54761896a7712576698703437731ae1e364702da7719734cc8a7e547655fe4492843b7d6387c8047931f6b623647473b1f139 WHIRLPOOL e1c04b407ba30feefef57ebf5c04d36ed3505fbb2114d62831fe33672810fd33c529524d04bc3daab0485f89b8d26e761240af8554534c074aba158856a3585c
-MISC metadata.xml 157 SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f SHA512 4f271b4deed62e5ddabaa61b2c0ba18af241b6128455590e4162da56403962a21c39cb494e54357dc83d944b9756d3cb8ecc5be1f73ac12505d112610dc1eb05 WHIRLPOOL 78c6cca8353a608f6baadb9a88cd1e10348f39dad3d17151f929bb8d91e4cf64840e060b6c7083663c8d56320faddbc855863654e34d1280fa3c24cadeb9c653
+MISC ChangeLog 6001 SHA256 b2d1f165428ee332ee2f4f9689a4f32ad6ee0b81d524ca6743be3906f8ef3afe SHA512 a6aac49bbd8b65d5c1d9dcc6bdb013e1b83dcbcea70209717ee3ec0c0530cf668df7b7e6e87a47770416bb9f5e8c3822e767359826a5438a11071bd892966e0d WHIRLPOOL f0d50a3516fe9ef94c6a6a1ac805fb71f0810f6b9726d074845ae493158de59925eaaf26da6391d5795624c0a4024770578f1765e69cbd490821105126300b54
+MISC metadata.xml 817 SHA256 36204559e777276c4c4c1a9748de2cc19d266aa11421fb9bf8be13c6b5df925d SHA512 699698553f726ebc003667f418db0979d921c3377d8c8861d792d1d2cf332f56bf51de0afb0682f9dc45580f9fefe91aed31f4704d4bf9528cd1581fcd29973c WHIRLPOOL 2269f63d8cb566762183c0e0f073f60e8576dc1072eef3ca4b357ba94ef1d3dd8229efcb4429f98151b17bcfb5e0dcca304e704c6e8ddf9004e06252b48a145a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlApbXkACgkQ1ycZbhPLE2BWSwCfXg0rB4JgO+wvEiTqQgDwoVXe
+GOcAoJwnIWHBzJfnyuHLjtPWn6iBIzJs
+=KjBT
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/blitz/blitz-0.10.ebuild b/dev-libs/blitz/blitz-0.10.ebuild
new file mode 100644
index 000000000000..e82ea2534714
--- /dev/null
+++ b/dev-libs/blitz/blitz-0.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.10.ebuild,v 1.1 2012/08/13 21:11:11 bicatali Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils multilib
+
+DESCRIPTION="High-performance C++ numeric library"
+HOMEPAGE="http://blitz.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="boost debug doc examples static-libs"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
+LICENSE="|| ( LGPL-3 Artistic-2 BSD )"
+
+RDEPEND="boost? ( >=dev-libs/boost-1.40 )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[dot] )"
+
+PATCHES=( "${FILESDIR}"/${P}-{docs,gcc47}.patch )
+
+src_configure() {
+	# blas / fortran only needed for benchmarks
+	use doc && doxygen -u doc/doxygen/Doxyfile.in
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		--enable-shared
+		--disable-cxx-flags-preset
+		--disable-fortran
+		--without-blas
+		$(use_enable boost serialization)
+		$(use_enable debug)
+		$(use_enable doc doxygen)
+		$(use_enable doc html-docs)
+		$(use_with boost boost "${EPREFIX}/usr")
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile lib $(use doc && echo info html pdf)
+}
+
+src_test() {
+	pushd ${AUTOTOOLS_BUILD_DIR} > /dev/null
+	emake check-testsuite check-examples
+	popd > /dev/null
+}
+
+src_install () {
+	autotools-utils_src_install $(use doc&& echo install-html install-pdf)
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.{cpp,f}
+	fi
+}
diff --git a/dev-libs/blitz/files/blitz-0.10-docs.patch b/dev-libs/blitz/files/blitz-0.10-docs.patch
new file mode 100644
index 000000000000..dd0dca77af36
--- /dev/null
+++ b/dev-libs/blitz/files/blitz-0.10-docs.patch
@@ -0,0 +1,88 @@
+* respect user's docdir,htmldir,pdfdir at configuration time
+* install recursive for doxygen generated
+* works for out-of-source directory installation
+
+bicatali@gentoo.org Aug 2012
+
+diff -Nur doc.orig/doxygen/Makefile.am doc/doxygen/Makefile.am
+--- doc.orig/doxygen/Makefile.am	2012-05-11 13:11:13.000000000 -0700
++++ doc/doxygen/Makefile.am	2012-08-13 13:44:27.616583722 -0700
+@@ -2,7 +2,6 @@
+ 
+ # Support doxygen documentation ?
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/doxygen
+ 
+ DISTCLEANFILES = Doxyfile doxygen-warning 
+ 
+@@ -84,29 +83,27 @@
+ 		$(RM) -rf latex; \
+ 	fi
+ 
+-# Install hooks
+-make-install-dirs:
+-	@if test '!' -d $(DESTDIR)$(docdir) ; \
+-		then mkdir -p $(DESTDIR)$(docdir) ; \
+-	fi
+ 
+-install-data-hook: make-install-dirs
++install-data-hook:
+ 	@if test -d html; then \
+-		echo Installing HTML documentation into $(DESTDIR)$(docdir) ; \
+-		$(INSTALL_DATA) html/* $(DESTDIR)$(docdir) ; \
++		echo Installing HTML documentation into $(DESTDIR)$(htmldir) ; \
++		$(MKDIR_P) $(DESTDIR)$(htmldir) ; \
++		cp -r html/* $(DESTDIR)$(htmldir) ; \
+ 	fi
+ 	@if test -f $(PACKAGE).pdf; then \
+-		echo Installing PDF manual into $(DESTDIR)$(docdir) ; \
+-		$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(docdir) ; \
++		echo Installing PDF manual into $(DESTDIR)$(pdfdir) ; \
++		$(MKDIR_P) $(DESTDIR)$(pdfdir) ; \
++		$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir) ; \
+ 	fi
+ 	@if test -f $(PACKAGE).ps; then \
+-		echo Installing PS manual into $(DESTDIR)$(docdir) ; \
+-		$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(docdir) ; \
++		echo Installing PS manual into $(DESTDIR)$(psdir) ; \
++		$(MKDIR_P) $(DESTDIR)$(psdir) ; \
++		$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir) ; \
+ 	fi
+ 
+ uninstall-hook: 
+ 	@echo Uninstalling doxygen documentation directory ; \
+-	rm -rf "$(DESTDIR)$(docdir)";
++	rm -rf "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(psdir)" "$(DESTDIR)$(pdfdir)" ;
+ 
+ 
+ 
+diff -Nur doc.orig/Makefile.am doc/Makefile.am
+--- doc.orig/Makefile.am	2012-05-11 13:11:13.000000000 -0700
++++ doc/Makefile.am	2012-08-13 13:54:04.490647132 -0700
+@@ -4,8 +4,6 @@
+ 
+ SUBDIRS = examples stencils doxygen
+ 
+-# docdir directory to install the doc (pdf ps html) 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ 
+ DVIPS=export TEXPICTS=$(srcdir); dvips
+ AM_MAKEINFOFLAGS = --no-split -I$(srcdir)
+@@ -78,7 +76,7 @@
+ # Install also the images into the directory html 
+ install-html-local:
+ 	test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+-	$(INSTALL_DATA) *.gif *.jpg $(DESTDIR)$(htmldir)
++	$(INSTALL_DATA) $(srcdir)/*.gif $(srcdir)/*.jpg $(DESTDIR)$(htmldir)
+ 
+ .PHONY: html
+ 
+@@ -86,7 +84,7 @@
+ 
+ # Install also the images into the directory containing the html files
+ install-html-local:
+-	$(INSTALL_DATA) *.gif *.jpg blitz.html
++	$(INSTALL_DATA) $(srcdir)/*.gif $(srcdir)/*.jpg $(top_builddir)/doc/blitz.html
+ 
+ endif
+ 
diff --git a/dev-libs/blitz/files/blitz-0.10-gcc47.patch b/dev-libs/blitz/files/blitz-0.10-gcc47.patch
new file mode 100644
index 000000000000..d0b35665567b
--- /dev/null
+++ b/dev-libs/blitz/files/blitz-0.10-gcc47.patch
@@ -0,0 +1,33 @@
+diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h
+--- blitz-0.10/blitz/bzdebug.h	2012-05-11 22:11:13.000000000 +0200
++++ blitz-0.10.new/blitz/bzdebug.h	2012-06-28 15:42:38.060656045 +0200
+@@ -117,15 +117,15 @@
+     }
+   }
+ 
+-    #define BZASSERT(X)        checkAssert(X, __FILE__, __LINE__)
+-    #define BZPRECONDITION(X)  checkAssert(X, __FILE__, __LINE__)
+-    #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__)
+-    #define BZSTATECHECK(X,Y)  checkAssert(X == Y, __FILE__, __LINE__)
++    #define BZASSERT(X)        blitz::checkAssert(X, __FILE__, __LINE__)
++    #define BZPRECONDITION(X)  blitz::checkAssert(X, __FILE__, __LINE__)
++    #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__)
++    #define BZSTATECHECK(X,Y)  blitz::checkAssert(X == Y, __FILE__, __LINE__)
+     #define BZPRECHECK(X,Y)                                    \
+         {                                                      \
+             if ((assertFailMode == false) && (!(X)))           \
+                 BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \
+-            checkAssert(X, __FILE__, __LINE__);                \
++            blitz::checkAssert(X, __FILE__, __LINE__);                \
+         }
+ 
+     #define BZ_DEBUG_MESSAGE(X)                                          \
+@@ -138,7 +138,7 @@
+         }
+ 
+     #define BZ_DEBUG_PARAM(X) X
+-    #define BZ_PRE_FAIL        checkAssert(0)
++    #define BZ_PRE_FAIL        blitz::checkAssert(0)
+     #define BZ_ASM_DEBUG_MARKER
+ 
+ #elif defined(BZ_DEBUG)
diff --git a/dev-libs/blitz/metadata.xml b/dev-libs/blitz/metadata.xml
index bc97bb6ee207..40b4558aaa0c 100644
--- a/dev-libs/blitz/metadata.xml
+++ b/dev-libs/blitz/metadata.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cpp</herd>
+<herd>cpp</herd>
+<maintainer>
+  <email>bicatali@gentoo.org</email>
+  <description>feel free to fix/update</description>
+</maintainer>
+<longdescription lang='en'>
+  Blitz++ is a meta-template library for array
+  manipulation in C++ with a speed comparable to Fortran
+  implementations, while preserving an object-oriented
+  interface. These results are being obtained not through better
+  optimizing compilers, preprocessors, or language extensions, but
+  through the use of template techniques. By using templates cleverly,
+  optimizations such as loop fusion, unrolling, tiling, and algorithm
+  specialization can be performed automatically at compile time.
+</longdescription>
 </pkgmetadata>