Re-enable a working test and disable the proper failing one in the autotools patch. Added static-libs flag.

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

5 files changed, 29 insertions, 22 deletions

diff --git a/sci-libs/amd/ChangeLog b/sci-libs/amd/ChangeLog
index 2dd5a3a784df..ad6481ef8062 100644
--- a/sci-libs/amd/ChangeLog
+++ b/sci-libs/amd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/amd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.24 2010/12/22 07:50:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.25 2010/12/22 18:18:12 bicatali Exp $
+
+  22 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> amd-2.2.0.ebuild,
+  files/amd-2.2.0-autotools.patch, amd-2.2.1.ebuild:
+  Re-enable a working test and disable the proper failing one in the autotools
+  patch. Added static-libs flag.
 
   22 Dec 2010; Justin Lecher <jlec@gentoo.org> files/2.2.1-test.patch:
   Remove bad test, #348272
diff --git a/sci-libs/amd/Manifest b/sci-libs/amd/Manifest
index 4f752124d6ab..d7d9a494674a 100644
--- a/sci-libs/amd/Manifest
+++ b/sci-libs/amd/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 AUX 2.2.1-test.patch 282 RMD160 4dfa458b220b57cab5fcaaba3e79a2b653a9b20e SHA1 b03e59e6d7b4e3cb10d05688d8a87d74173fd3c0 SHA256 40a1441351f6c4666497a19296780ca760cfb3026000703d85bf26883a3b24eb
-AUX amd-2.2.0-autotools.patch 3097 RMD160 b813efa2a13c978cbf5397cff13ed03099e4bfd5 SHA1 8396445c02b2de23cc137934ee1e221345c429f6 SHA256 0628a044b1b75d2578753ee44b422ea358a8a631308c01323d9cac9562d173c5
+AUX amd-2.2.0-autotools.patch 3098 RMD160 b1123cd0f0f6942beb08d97e95818facfad6377e SHA1 623bdcdbb408518b1407f88ea3e9e64e87e63715 SHA256 fd2577078eebb8bf8232f30d3958cb07273fa8f1d23eb9f344a1e6602624faa2
 AUX amd-2.2.0-tests.patch 562 RMD160 a5237705bfaabb62495f5e7985f7f94988014f32 SHA1 ec1c2c3b7916328c16eb1e05f82d5c5ff28f83ba SHA256 614b9995daf5af3b377fc288285fd9f41fad306c8578b0d2d7525cc567658ac0
 DIST AMD-2.2.0.tar.gz 267728 RMD160 1cbc9f5a0abe2ccd132a1509b2d2b5ee0da9822c SHA1 862d2fd3538f31f37e9d133204e04ff36ed59c0f SHA256 b4978ed99f61204456a27b1c86aa149f49dbead5df12decd8c34e15547e75ff8
 DIST AMD-2.2.1.tar.gz 268478 RMD160 a4a4621c14a1ff857ecd9402afb8cbc722538c00 SHA1 d04b68d51a6eb41068ae20bdf74bd7c32d2690db SHA256 cc2b3c2a25f06ef273062a22cb2fb4296ece002de2e4d28487d4dd93c4c605a2
-EBUILD amd-2.2.0.ebuild 1052 RMD160 58654e380a5223fb976db1531f6994f670d49fab SHA1 0477d5574d0efa26d25464f6ded282492f0ad87d SHA256 98d300149cc46bc86f87328330fe011a2a7f6b4f444872b5d66b12efa4503344
-EBUILD amd-2.2.1.ebuild 1054 RMD160 7e54a1624f29167e48da1f848714abbf2bd3bcf4 SHA1 924df651e40bde00898a4a06cddf72418ae51f4a SHA256 b23411ac017c2615e9c45f75b4ab509a3a196193792ff639e14ad61fd1c3e7c4
-MISC ChangeLog 2991 RMD160 85008258818b36f7e6d335b6bf786923c49d2d64 SHA1 86eb6a03de0b6e0056333afdbabbdf232ef45503 SHA256 389698514b10d79972160ed32a50b025b8c7ebeb0afd6b4e7fb0a0681e160718
+EBUILD amd-2.2.0.ebuild 1021 RMD160 fcd2d7c37d7252d1ae15103548ce50932208ea83 SHA1 b9158db6459a4c33e08ea1c3a89f2e01be4b217a SHA256 b6ead74f18e280734b1e08a9b143fe17f3b2b9b4ead664d386f32ac49a6489a1
+EBUILD amd-2.2.1.ebuild 1096 RMD160 673579278ed9f6d331b7aa55a30776937ae98f6e SHA1 fcc083878d4e4f7457f592aab179d835825c9093 SHA256 bf81e954070de9425cdd0466f844f1b4c1c347cc4f3e70c508effc39895fe6d5
+MISC ChangeLog 3234 RMD160 a7aa7b663b493c56c1ef84b646bd8401676020e6 SHA1 6978d90b19586081ef82d9d19408ee74a98308f9 SHA256 4bb7a32a55cced7c28dfbc8b46a3fe89cc841276483d08e85c965884db7067e7
 MISC metadata.xml 477 RMD160 862cf002fe528fd7da887cab28f90543039f4cce SHA1 f2dcbe5f6d5a2a6054929827b0ab33fd312498a0 SHA256 23293ac4525f781e34728c4faea25ecd9ac2f98a3b6c843a5dc83a1160c8ed2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0RrdwACgkQgAnW8HDreRbsiACgnNPtV8heknLdTBQEFe3FOtmE
-afwAnjZQeKFWsGGqmDm86mubOkgez7/n
-=zhvr
+iEYEARECAAYFAk0SQO0ACgkQ1ycZbhPLE2DpuQCgml1tZC3+KivS9j2ZLRM8jLi3
+3ooAoKMZoE8nZI3M2qccHhiVT1dGSLKG
+=JIOC
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/amd/amd-2.2.0.ebuild b/sci-libs/amd/amd-2.2.0.ebuild
index f0f9d7fc79bf..694b758c4007 100644
--- a/sci-libs/amd/amd-2.2.0.ebuild
+++ b/sci-libs/amd/amd-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.19 2010/12/16 14:18:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.0.ebuild,v 1.20 2010/12/22 18:18:12 bicatali Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -23,8 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-tests.patch
+		"${FILESDIR}"/${P}-autotools.patch
 	eautoreconf
 }
 
diff --git a/sci-libs/amd/amd-2.2.1.ebuild b/sci-libs/amd/amd-2.2.1.ebuild
index f949552045b8..0743b25c3186 100644
--- a/sci-libs/amd/amd-2.2.1.ebuild
+++ b/sci-libs/amd/amd-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.4 2010/12/16 14:18:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.5 2010/12/22 18:18:12 bicatali Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
+IUSE="doc static-libs"
 
 RDEPEND="sci-libs/ufconfig"
 DEPEND="${RDEPEND}"
@@ -24,11 +24,14 @@ S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-2.2.0-autotools.patch \
-		"${FILESDIR}"/${PV}-test.patch
+		"${FILESDIR}"/${PN}-2.2.0-autotools.patch
 	eautoreconf
 }
 
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
diff --git a/sci-libs/amd/files/amd-2.2.0-autotools.patch b/sci-libs/amd/files/amd-2.2.0-autotools.patch
index 8e53f9cf42f4..6ecb39fb3d9e 100644
--- a/sci-libs/amd/files/amd-2.2.0-autotools.patch
+++ b/sci-libs/amd/files/amd-2.2.0-autotools.patch
@@ -26,24 +26,24 @@ diff -Nur ../AMD.orig/Demo/Makefile.am ./Demo/Makefile.am
 +	amd_simple \
 +	amd_demo \
 +	amd_demo2 \
++	amd_l_demo \
 +	amd_f77demo \
-+	amd_f77simple \
-+	amd_f77cross
++	amd_f77simple
 +# buggy demo
-+#	amd_l_demo
++#	amd_f77cross
 +
 +amd_demo_SOURCES = amd_demo.c
-+#amd_l_demo_SOURCES = amd_l_demo.c
++amd_l_demo_SOURCES = amd_l_demo.c
 +amd_demo2_SOURCES = amd_demo2.c
 +amd_simple_SOURCES = amd_simple.c
-+amd_f77demo_SOURCES = amd_f77demo.f
 +
++amd_f77demo_SOURCES = amd_f77demo.f
 +amd_f77demo_LDADD = $(LDADD) $(top_builddir)/Source/libamdf77.la
 +amd_f77simple_SOURCES = amd_f77simple.f
 +amd_f77simple_LDADD = $(LDADD) $(top_builddir)/Source/libamdf77.la
 +amd_f77wrapper_CPPFLAGS = -DDINT
-+amd_f77cross_SOURCES = amd_f77cross.f amd_f77wrapper.f
-+amd_f77cross_LDADD = $(LDADD) $(top_builddir)/Source/libamdf77.la
++#amd_f77cross_SOURCES = amd_f77cross.f amd_f77wrapper.f
++#amd_f77cross_LDADD = $(LDADD) $(top_builddir)/Source/libamdf77.la
 +
 +check-local: $(check_PROGRAMS)
 +	@for i in $(check_PROGRAMS); do \