Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:
  Version bump.

Conflicts:
	dev-cpp/eigen/ChangeLog
	dev-cpp/eigen/Manifest

3 files changed, 118 insertions, 4 deletions

diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog
index 3485cb25c..87125c3db 100644
--- a/dev-cpp/eigen/ChangeLog
+++ b/dev-cpp/eigen/ChangeLog
@@ -2,10 +2,20 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.44 2011/03/25 16:01:28 jlec Exp $
 
+*eigen-3.0.2 (29 Aug 2011)
+
+  29 Aug 2011; Justin Lecher <jlec@gentoo.org> +eigen-3.0.2.ebuild:
+  Corrected doc installation, thanks James Cloos for the fix
+
   29 Aug 2011; Justin Lecher <jlec@gentoo.org> eigen-3.0.1-r2.ebuild,
   eigen-9999.ebuild, metadata.xml:
   Corrected doc installation, thanks James Cloos for the fix
 
+* eigen-3.0.2 (29 Aug 2011)
+
+  29 Aug 2011; Andrea Arteaga <andyspiros@gmail.com> eigen-3.0.2.ebuild
+  Version bump.
+
   19 Aug 2011; Andrea Arteaga <andyspiros@gmail.com> eigen-9999.ebuild
   Removed ~x86 and ~amd64 keyworkds (mask).
 
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index b66a4ac2c..9f00bd8f5 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,15 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+- - -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST eigen-3.0.1.tar.bz2 903484 RMD160 ac3343dddc208cada82d316b78b1b34d7031eafe SHA1 6fe629cd1eaef1a44430a068ff7202fc27209ee4 SHA256 d4d10aabe3fb92b2eadf71a0f15f0129864c6f80def31bdbd2a8d8ead132e5a6
+DIST eigen-3.0.2.tar.bz2 955760 RMD160 7686dc72ac8ee96cb055d4bca8cd6da526d5780c SHA1 2bcc7a6b415f5c75b5e061a399c3f9ab9aadb708 SHA256 cd76169b426f89b667db24beaaaf2d982b48664d9615ad781bdf9e83f0be5e5f
 EBUILD eigen-3.0.1-r2.ebuild 2038 RMD160 ba6b7960f7e73cf8389a4efbcc932a622dcf84c9 SHA1 52082b7904a0a703e79d939c0568ee509dad2803 SHA256 446e2f58e41b8285c24774e83a58a941adfd786310ff7ead28c1a099d1d703b4
+EBUILD eigen-3.0.2.ebuild 2106 RMD160 6c1dbc11ebdf4863eec35197c9f43093a4c592a6 SHA1 2375bc3c4d7909baccd2328c3a5452209d1b68c2 SHA256 ea53c2ae7f23d78dc9cee892eff8f258f81c609da9851f7259faa90345f95bc9
 EBUILD eigen-9999.ebuild 1965 RMD160 09b9d492e0f8d51545f58c77c914a96aa9fe3f13 SHA1 1407975ba4b73388d740824817e0f9954f730dc7 SHA256 7383a573d2a00ad8ee49ddffde8da0676499241e2e35a61de96ca42fdc2c2642
-MISC ChangeLog 6884 RMD160 d0e697788824bc536b36e37511d061f3b25355b5 SHA1 b4a4b5e3de519ce3f210e3d6f2b4be227b9854b8 SHA256 1550fadb6e93415a0bab6282c6ee36b9c1d5e93c296c8a7deee4a12987070c5f
+MISC ChangeLog 7160 RMD160 1b592a23619fc1c3582711a8cf74fa17db264b33 SHA1 94ff55a08c02413f2f569ea6315f031835d31c88 SHA256 0af3a8db785fd761aee523a54e91233d9e0b437f225cbad4c1fb2150ad24eb9f
 MISC metadata.xml 867 RMD160 aa9dd92c298151ecc8c6f7bbb4d18f85be82bfac SHA1 06d4827b1fd0f87cf7aa23ca28b389a2c0dcc785 SHA256 6d74c99087833e44098a46949815591563c8df4a3812444472f1330d64155548
+- - -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk5bpo0ACgkQgAnW8HDreRYeewCfYRTHSb/z4yZ5q5KbXedrA0t2
+jwgAn2ME0gnmkzMQyu7Kq8QIHFbIMafV
+=RbMg
+- - -----END PGP SIGNATURE-----
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk5bprYACgkQgAnW8HDreRYF9gCgsVLd1KmwZvnQRV1L3qf99qfS
+7zoAnj8tmfZywJcZvo4Egr7qjNmsd023
+=Zddv
+- -----END PGP SIGNATURE-----
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk5bpfwACgkQgAnW8HDreRZD5wCgkhbqB2+raAeBY23+MMyBw8U6
-Ji4Ani4WHyVV6yka96G/+NiRPXNc0IR0
-=mjUi
+iEYEAREKAAYFAk5bpsEACgkQgAnW8HDreRYUzQCgnjfBSL5ewtIe+aa5Y8Sk2+Hc
+8f8AoKUdU0+PH7iDWW47Da2/jDIPnpya
+=+N9e
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/eigen/eigen-3.0.2.ebuild b/dev-cpp/eigen/eigen-3.0.2.ebuild
new file mode 100644
index 000000000..57a955794
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.0.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit cmake-utils alternatives-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="http://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 GPL-2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="adolc fortran fftw doc gmp sparse static-libs test"
+
+CDEPEND="adolc? ( sci-libs/adolc[sparse?] )
+	fftw? ( >=sci-libs/fftw-3 )
+	gmp? ( dev-libs/gmp dev-libs/mpfr )
+	sparse? ( dev-cpp/sparsehash
+			sci-libs/cholmod
+			sci-libs/superlu
+			sci-libs/umfpack )"
+
+DEPEND="doc? ( app-doc/doxygen )
+	test? ( ${CDEPEND} )"
+
+RDEPEND="!dev-cpp/eigen:0
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A} && mv ${PN}* ${P}
+}
+
+src_configure() {
+	#TOFIX: static-libs for blas are always built with PIC
+	#TOFIX: BTL benchmarks
+	#TOFIX: is it worth fixing all the automagic given no library is built?
+	mycmakeargs=(
+		-DEIGEN_BUILD_BTL=OFF
+	)
+	CMAKE_BUILD_TYPE="release" cmake-utils_src_configure
+	use fortran && FORTRAN_LIBS="blas" # lapack not ready yet
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	pushd "${S}_build" > /dev/null
+	use doc && emake doc
+	use fortran && emake ${FORTRAN_LIBS}
+	use test && emake buildtests
+	popd > /dev/null
+}
+
+src_install() {
+	cmake-utils_src_install
+	use doc && dohtml -r "${CMAKE_BUILD_DIR}"/doc/html/*
+	local x
+	for x in ${FORTRAN_LIBS}; do
+		local libname="eigen_${x}"
+		cd "${CMAKE_BUILD_DIR}"/${x}
+		dolib.so lib${libname}.so
+		use static-libs && newlib.a lib${libname}_static.a lib${libname}.a
+		#TOFIX: lapack implementation needs a Requires: field in pc file.
+		cat <<-EOF > ${libname}.pc
+			prefix="${EPREFIX}"/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ${PN}
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -l${libname}
+			Libs.private: -lm
+		EOF
+		alternatives_for ${x} eigen 0 \
+			/usr/$(get_libdir)/pkgconfig/${x}.pc ${libname}.pc
+		insinto /usr/$(get_libdir)/pkgconfig
+		doins ${libname}.pc
+	done
+}