Version bump, remove old. Migrate to EAPI 4, drop useless debug use flag, build tests correctly. Fixes bug #427682.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 51 insertions, 26 deletions

diff --git a/dev-cpp/eigen/ChangeLog b/dev-cpp/eigen/ChangeLog
index 90eb28a36d71..e86bc6b1ac84 100644
--- a/dev-cpp/eigen/ChangeLog
+++ b/dev-cpp/eigen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/eigen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.58 2012/03/08 03:04:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.59 2012/07/26 14:03:12 kensington Exp $
+
+*eigen-3.0.6 (26 Jul 2012)
+
+  26 Jul 2012; Michael Palimaka <kensington@gentoo.org> +eigen-3.0.6.ebuild,
+  -eigen-3.0.2.ebuild:
+  Version bump, remove old. Migrate to EAPI 4, drop useless debug use flag,
+  build tests correctly. Fixes bug #427682.
 
 *eigen-3.0.5 (08 Mar 2012)
 
@@ -234,4 +241,3 @@
   15 May 2007; Marcus D. Hanwell <cryos@gentoo.org> +metadata.xml,
   +eigen-1.0.5.ebuild:
   Initial import.
-
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 06f4027d903d..98609b18f838 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX eigen-3.0.0-gcc46.patch 479 SHA256 9078958a063104a6cf865b2d3343839f1e22eb7dcebf66a17575a772ee9374bd SHA512 551f71d7c99105f8a20cf9779013744b98b0661c07ee421669dfda8bfcb5f69f3d792b7f1432b34ccc8577853db792aca87c3a7a78b3ce98f0610e82f5d36cd1 WHIRLPOOL a66efdc18d32bf158805bef18fe55b1417e31643cf1b733272192775cb59015d23503ddc48706807a77fd579a7c9599dd614281e47b844e3519f87188f6cb5d9
 AUX eigen-3.0.2-latex.patch 703 SHA256 9a3ef1554413b22dc219e9e83f2c43cc122c5a62e39f94bd184122e923bccd05 SHA512 3ce4859d9cd13dc01498a57d3b9878bf1c86509ea7a3ab340558e54c9e4e18bfc96ce8a1a7da69165ec3002bb35041058fa1e0b97d039649033e2bc2bf60b1e7 WHIRLPOOL 55eae1e7122e7790c410523337b1e527bf2fc7d1c395ffd9ce64f2334a6bf3891ad21f7c4f04c563f97992fe435e0ace7e23fdfe5967bdd67869145d9c75d4d7
 DIST eigen-2.0.16.tar.bz2 367748 SHA256 0c9379d6bfdde78c5a1794e0bdfcc875688bea4a9ff2e40b8a631a8c4981687b SHA512 23ca985204d003f280646631554274d58d8321b8ac4f4cc87d47dbb0a22ec15554d50d075f0c941efc55c5ae4c827f2259c1196f2480e7095dff11d990a2e463 WHIRLPOOL 8b97f6f1ba6f6e60214af8741cff715e6ab0aa1b400325e38f32cd68ef26f2a35517423f0157282c8d969fcc1d64e39629e030ec9a2ce3321aea9111923961b5
 DIST eigen-2.0.17.tar.bz2 367890 SHA256 7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960 SHA512 8fa0e4507864f61c30de14e3b29d963eb8b777d1a6bb04192d53e1f4c9db323b9fab2ddcedb63bf2af243fe0e26dcd717e97eb72216b6a1d444e455520192c72 WHIRLPOOL d80f12b378e23b758e4dbd173b87bed93bc42a97f2541b653b4373ea6ce0803bd712de00cf5a014a72cd439bb3ad10fd24b2ef8982975e044ff4d7bb2b63f585
-DIST eigen-3.0.2.tar.bz2 955760 SHA256 cd76169b426f89b667db24beaaaf2d982b48664d9615ad781bdf9e83f0be5e5f SHA512 6fa2d50ee5cbaa6fa4f60969285b9f76f791ad045bf510cd9a76aa55b5476179fc22e98c3cfa671be901085717bdd28eccefb9f7d95e51f01632debe4945d362 WHIRLPOOL f97cbf23a0511f1c1cb1df9d099e3c4fa50f30d73f575ab033ff5cf02e1edd533a0ea81d2a4e520550d8772dee53adead99cf2e487262e359935c215f9545d99
 DIST eigen-3.0.5.tar.bz2 960679 SHA256 eea706ea59b534d0c8dba6f94f022158e54f812f171c9956f89873ecb1ee577c SHA512 37d0bf932d97fc7315ef836976cdba7aaa9938aba6abf6ed7562bd0ef7de7f01b9bdb7980bae13f5432ff0342b230883f00aea5bcf96d3364007694b40fc566e WHIRLPOOL 5f0060cb80b6824782ab39274b8763288b90bfad0e446dfe3965b40b8502e7660986ac7924c6f1e127f57cbe6e37ed51cb374442b8d24e5babd7559d161e2b8b
+DIST eigen-3.0.6.tar.bz2 961722 SHA256 32e1275a105339003ba34007dd07dc1c62077d75882f3eeddd40a7ec5a5bfd87 SHA512 97cf5126984848f31b3c45c44d7ee6b8d42eca459ff2cc5535413efc768254a1ab738d935c70f9a457a9eaee5faa3c1b08c1f17193b6fcecb5ae0f0b6b32d1fa WHIRLPOOL e17409a807228b63b866c282f767c9107e6c0b45ad84bb311a5ef70053dca3d48580c8839bb6b8fcf5c5bab1a0c102413a96c06007bfbd2218bf260c4a522586
 EBUILD eigen-2.0.16.ebuild 1670 SHA256 90173035fd03b1a0742d79c5cf9fca83ba847cd4a7c6a234b4650b3aadc5bf04 SHA512 e34e69d81a0717f76f9e8ce3b0eae5197050306494c077a4a1b4eb5c4cbfe380b1a97a3996f63877f0cc2aee32a581f4b3986cba8e0d3f061d390daed74638b7 WHIRLPOOL de191401b9ac52678a266391fc7900ae4f60cc40c6668f588c7a39e72959c674269ffc2cc8b2d782b66968d3333ecffd631428f4cb430697a9f75e53ecfe05f4
 EBUILD eigen-2.0.17.ebuild 1673 SHA256 ab2a42b047e3eebe5ead2f671c3698093c4d7463cf88ddf9ff303ac8ba49e43b SHA512 218a6f53523440e60129ada1abea826915c73c485a26b2acae0a7d1f9c891d62dc00bf1b618c52190c67d182cf5d78dde559452dafdc8f5b8c7e47304bc9297c WHIRLPOOL 94c8d01b50e8c161f6b2a046b127a813c134f400f7a39583f70c3e8d26cfc8fa3c30c2b42f3ca7ce0f75a7aeff930e8be78edc528e03f0e37f26e8e43fda49e1
-EBUILD eigen-3.0.2.ebuild 1445 SHA256 2914624b206a735a5a3562fab677def92ea464a45b19dffacd76f8ce5620517b SHA512 d1bf6c98467e3da747cd57dabda11a2fe0abb700d47f13c2e37ef0266e5b358b2f3a8429559500a3e6d77e333984b8542d38d1e85ae16e27916d29a380b80949 WHIRLPOOL 15a63c2100bf06233b043fc8a5aefc9f7753320098dd34885aaad79d5969bce3676d68d25f0dfeade6879b90db78b5d5f5e010363b8036f6300acf6bb3125fd5
 EBUILD eigen-3.0.5.ebuild 1406 SHA256 a1e05f0339615389e6af330a9a2bcf3913c4da05cd13f0e656dc8df09095e2c8 SHA512 009f8c5e2a25cfb843552425c76b38e7c5a63141b2e282c98b607e911224cc0abcaf1af296aecbcf898a53026c6e3e1575f15edda1e8cd3aa69c2e4aa2dad886 WHIRLPOOL 90fbef3e13f451344dc1ecc0397d10bfb9391244956a800832096a571fb2bc46d607ee6030e64eeb08380129072a60cc2c3c98173249e22e62f75d475d968c62
-MISC ChangeLog 7616 SHA256 b9bf13d2a91b93104af98c9759398e531c7ea37ed8d815d11ffcd539ddadab32 SHA512 9b6c2912f9b77fc61d882c72ea70ad04da44b5d2773549d5a23eff03a6623396b24a92e69e8f5a6613742853972f6e06c59a819a0684cc35ee5b7b96abbccdaf WHIRLPOOL 7bbb65881affc202aee7d48f0a3c6b9400b999908500fdcceff9d0676b24bc8f07c6b614b8dff171d1d7b33cb27710aea9a6d58ffc74f9caa929d4b1b5d8a376
+EBUILD eigen-3.0.6.ebuild 1566 SHA256 f8f65409991c61757ca09b98732c9f415e6d81a7c0abee51e512d60770f6c8bd SHA512 0ce2dbca871d6bcafa21629af5a4d43725e374e135f5dfb9347ddcf4981fe0301258862435a4e2e3be255f1b754b8f739c2c70b7cebdb0a4628f1fee405a48fa WHIRLPOOL 84d3afe4619bdf0549a0d9fdf75d9971dda115e6c62be5d92d84c4483bba0f504176decebc798171697fa797386c73913272d1553346dcb0c33886a8a5d6e7f5
+MISC ChangeLog 7865 SHA256 28af78b7e151e6360a8cdecaea294e3ed256104f1fa69688ab360f9d2467a2cd SHA512 02996521301e91cca6fae9ef2f1d3a99963d8d9b1214adf97101dde37958ec4edfde01f0314c1612ce99f0f472d5f268bd494aa4e9b4b938b23bcd93786eab09 WHIRLPOOL a2f1338357bc0e698ba8e739f060098c1fe60fa16a51467439c90c7095b84086fd8712521b77b729024b65c33cab00f95f510e6a412d7bc05a4da61ee085708c
 MISC metadata.xml 552 SHA256 1225f434950c4fadf5f30d53a399f4c5f24bc69c2a332a2829feb46a2163f3fe SHA512 a503cb7ac175e81aec641534370674e497d4cd120aff09b63371e6226a1e3832dc1367f80bab5e384422e202aded030a1aa8f2ad4b7493fd07b9a4b15ac0ddae WHIRLPOOL 401bcc30d12a19e5a7337d695359f673ded876b60417d14628e442e9aab9c435f901791538c699f49e65c85ca358e23cfc74a7ffeb7812a6467b669ae2b09e78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQEU4VAAoJEMbwO6tnXQ0sAh0H/2l1ssLkiV0Bj13yz6jeFM8g
+NCzR/Io4JT8SESdEc61Na2ueLgzHEVZndWKG7LskaCOxlsUs4CVDpJ1ThJrXPHq/
+XXUYAJdPcEb5QK0QcSrXrBimK4u59XezS1m6IcVqtoKs7hbdB9H+jWuCGUJhOHmM
+7hBDJTXhj/pRq56lbRYT1qFHHTZ24OIV7U2sJRU7JOxYBd8ZEU7FIDwjXcF22TLl
+h56G0LjW/lEbiBY/Q4Az6nIjBGE3zbG5gNuuqyQ2u91ucQFL5MV9ksxaZYbJ/syL
+bbnc6RYxKSPfHy6hElOmf8RTBrAEDfQjNe0WGqE+IDGSpBhyhM8A26buBFDePxM=
+=OESE
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/eigen/eigen-3.0.2.ebuild b/dev-cpp/eigen/eigen-3.0.6.ebuild
index 15ddc6a1cba6..ff5ce9dbf87a 100644
--- a/dev-cpp/eigen/eigen-3.0.2.ebuild
+++ b/dev-cpp/eigen/eigen-3.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-3.0.2.ebuild,v 1.2 2011/09/30 21:38:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/eigen-3.0.6.ebuild,v 1.1 2012/07/26 14:03:12 kensington Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit cmake-utils
 
@@ -18,14 +18,19 @@ IUSE="debug doc"
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="!dev-cpp/eigen:0"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0-gcc46.patch
-	"${FILESDIR}"/${PN}-3.0.2-latex.patch
-)
-
 src_unpack() {
-	unpack ${A}
-	mv ${PN}* ${P}
+	default
+	mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0-gcc46.patch
+
+	sed -i CMakeLists.txt \
+		-e "/add_subdirectory(demos/d" \
+		-e "/add_subdirectory(blas/d" \
+		-e "/add_subdirectory(lapack/d" \
+		|| die "sed disable unused bundles failed"
 }
 
 src_configure() {
@@ -41,16 +46,7 @@ src_configure() {
 src_compile() {
 	cmake-utils_src_compile
 	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"
-		emake doc || die "building documentation failed"
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use doc; then
-		cd "${CMAKE_BUILD_DIR}"/doc
-		dohtml -r html/* || die "dohtml failed"
+		cmake-utils_src_compile doc
 	fi
 }
 
@@ -58,8 +54,17 @@ src_test() {
 	mycmakeargs=(
 		-DEIGEN_BUILD_TESTS=ON
 		-DEIGEN_TEST_NO_FORTRAN=ON
+		-DEIGEN_TEST_NO_OPENGL=ON
 	)
 	cmake-utils_src_configure
-	cmake-utils_src_compile
+	cmake-utils_src_compile buildtests
 	cmake-utils_src_test
 }
+
+src_install() {
+	cmake-utils_src_install
+	if use doc; then
+		cd "${CMAKE_BUILD_DIR}"/doc
+		dohtml -r html/*
+	fi
+}