sci-libs/qd: Fix for test, underlinking problem, #423449

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

6 files changed, 59 insertions, 29 deletions

diff --git a/sci-libs/qd/ChangeLog b/sci-libs/qd/ChangeLog
index 5e87cda86ee7..66b180ef83a1 100644
--- a/sci-libs/qd/ChangeLog
+++ b/sci-libs/qd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/qd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/ChangeLog,v 1.11 2012/04/18 23:20:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/ChangeLog,v 1.12 2012/06/25 16:53:25 jlec Exp $
+
+  25 Jun 2012; Justin Lecher <jlec@gentoo.org> qd-2.3.12.ebuild,
+  files/qd-2.3.12-autotools.patch, qd-2.3.13.ebuild,
+  +files/qd-2.3.13-autotools.patch:
+  Fix for test, underlinking problem, #423449
 
 *qd-2.3.13 (18 Apr 2012)
 
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 40247b5e639b..07a3f11ca47d 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qd-2.3.11-configure-version.patch 433 RMD160 4fbc1b82034698b50de75b88c9b6484586fc23f3 SHA1 94f64374762df6cd1da5d23aa5450c9828d4f4bf SHA256 116f808b5e25cb4911063dde20ebca568366e502d33a9dd3143412cd6c3a6173
 AUX qd-2.3.11-docpath.patch 376 RMD160 577a0ba79455307b04c1d10ef610216f8a95f0b5 SHA1 f5606a3b5b98045a69ac8a528e32c8d577bd2a0e SHA256 52e2ca6ee5f80ed4c385645e7b316ac9c72e67c8dfac98fe73b2733b3352d07f
-AUX qd-2.3.12-autotools.patch 16230 RMD160 8ae9bffecde8c9a5d3af38894e19af1339d26d3b SHA1 7a553cf5ad3d8746a9693a8a4ade061ba2e851e3 SHA256 856c176b506708a036fe22903d58a472fb36dcb33a6a469d0ad162c869288273
+AUX qd-2.3.12-autotools.patch 16291 RMD160 cbd9bf81007a2ca514555108c83817b3be66fee8 SHA1 417c61913b933d8b5a329168e12eb780d99cba75 SHA256 21398247f9843d3af416c96bc36454283e2f96067d15430ae1ea9d6d31e32077
+AUX qd-2.3.13-autotools.patch 499 RMD160 4fb05329125ca9b1d774d884b19aa9d2393ea689 SHA1 83273e8f600121dbf44510e2268ba2ca54652854 SHA256 d397cebb0c92058813a44f20064398575eda874681b9407d9b93fc90d7404d91
 AUX qd-2.3.7-test.patch 305 RMD160 009f10bb3dba3b4191194dcd9418ce08b70e3bf0 SHA1 4f94582903ef6c75c8887df241e88d0a617ee057 SHA256 f4da52c9c23969bc07a178dd4a250cbbdb0f9fd8c5905620669c8a012548fbe2
 DIST qd-2.3.11.tar.gz 700309 RMD160 44d858feba1190845ff17e1f2e54afc4c0643c62 SHA1 9f66ceb4a0d5373e8f02c783ceaa2d653114c6eb SHA256 0bbd376c45c6c8572fc86f9ed8a477f560b78dd5c0a9f63b6db1f46263c67970
 DIST qd-2.3.12.tar.gz 700145 RMD160 daecff500f9f88fe5fe50eabffadd7b69b8ad12f SHA1 78ca159be52337d923b70cea1789d03d344fd663 SHA256 e13b99a3b2ff7f8a56a5fcdf1b238270d1581750ab23fef8eb386e63c0e04ff5
 DIST qd-2.3.13.tar.gz 1449514 RMD160 08b6f55cea438694b3ebed7db5427efd09771842 SHA1 f46d63eb5e21172a6f66884b4ddbb352b327a9ca SHA256 578722fc515c54b4a2bd946d765412622139307cacb882e4b5ca2f314ed9c965
 DIST qd-2.3.9.tar.gz 595952 RMD160 782b27a13654d9d132a6f9f885d8ad176e1e1fda SHA1 d7a0c6fd3854dbed5204b8e4fa7d0ad8801be717 SHA256 080021d9d88d0ac5ca74c2c472c271367e44570fead8a05aa939549870cab768
 EBUILD qd-2.3.11.ebuild 965 RMD160 9e31365a6019524f9b1b891d928809d8a67259f9 SHA1 bb55684850242ed7520a936094c76f3078d5bde6 SHA256 cb67d20cdce9cd8bac4d0b3be7d269c4db803e4b14a086fe47ba2c478a27d192
-EBUILD qd-2.3.12.ebuild 1015 RMD160 77458139b7b16d2c18cc63269b723bbba2779586 SHA1 38a6e8dd3fec8a8aaf0d5ec7d3683b2cd2f03ae5 SHA256 0725a2359e3c6b9539b92ee4ec6a61c1b05abe43a7ff60694b5ebbff5a00bb37
-EBUILD qd-2.3.13.ebuild 930 RMD160 096a19764c3b9793ece9c75d477e4dcff304f485 SHA1 1ea832b60ead678ec90eea9fb5b0ef33e51610dd SHA256 5f780f5275ac3e589438cef191a49321212431dab18d5960d3401696feee3264
+EBUILD qd-2.3.12.ebuild 1036 RMD160 15c97f4f42c420984067c1036d344470c88dda53 SHA1 b63a0c16d771e44baaf8c4ffe2bc27c57da8c612 SHA256 79c82df7680606fb2e54086f6a135fbc29e486d4f510ac2d24f15bbe8256f60f
+EBUILD qd-2.3.13.ebuild 1036 RMD160 9c682cb46e19a94f5fa71e12797fa9eac71003b2 SHA1 ff64cdc49318759cc95599fb0bce13cbfcc015e3 SHA256 b7ccd6dc3a4cc3fe42acd2284ded82b97702aecaa61f93c5663f16ffb2f280f6
 EBUILD qd-2.3.9.ebuild 974 RMD160 4fc054bad1e1447ec108f22a0a9be88f40155a4a SHA1 570b8bf5e34bee8369a3ce847587d4b3e262e3ba SHA256 c13f79d29b8e8ed1ac9f0e444028014e3edef7684ce29f3e66cb077ea390dfdb
-MISC ChangeLog 1809 RMD160 b435060b165c0446e6abea0430d76fb60f958cb1 SHA1 be3f43dbd66360467085d37a2357c4d4135487d0 SHA256 575ed9beb30841e1f3488505eca5fd1df5492a5eab756accc13cbcfe045af7ac
+MISC ChangeLog 2006 RMD160 5a3d9cfd500ae164e5a8b8606d02760eb1e6a7f0 SHA1 3f55b1aa6cf3b1deabb9d5ef68bbb8c92d6426c7 SHA256 9506426c55bd421931ec9dea35099a6d2002faf701df5174c31507dc7ae49376
 MISC metadata.xml 334 RMD160 40c1d8c9f178cd40a09f7c40e9ac335ade0059ca SHA1 b765fa3da44b33d6bce4f6d80ef34df1d9b6366c SHA256 3444d77952a6cffa63be0a5082a506a95fdf3cb93a0fc5811bd86dee40ae7cda
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+PTEQACgkQ1ycZbhPLE2B7FACeMGYVvww7bzLKm4A3tCCr7t5T
-7zwAn21zm+vl1TkP7zxAGS7+35fS4vxE
-=uMMn
+iEYEAREKAAYFAk/ol5EACgkQgAnW8HDreRZObQCfY4r1InmSwbtkm5GPJ6c6kPnd
+hYoAoMyJDMgpvYvI3vOrVnpLGMB9om1f
+=XAXv
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/qd/files/qd-2.3.12-autotools.patch b/sci-libs/qd/files/qd-2.3.12-autotools.patch
index 1389c519712e..346ac61151a5 100644
--- a/sci-libs/qd/files/qd-2.3.12-autotools.patch
+++ b/sci-libs/qd/files/qd-2.3.12-autotools.patch
@@ -28,7 +28,7 @@ diff -Nur qd-2.3.12.orig/fortran/Makefile.am qd-2.3.12/fortran/Makefile.am
  
  if UPCASE_MODULE
  DDEXT=DDEXT.$(module_ext)
-@@ -14,17 +14,18 @@
+@@ -14,17 +14,19 @@ QDMOD=qdmodule.$(module_ext)
  DDMOD=ddmodule.$(module_ext)
  endif
  
@@ -43,6 +43,7 @@ diff -Nur qd-2.3.12.orig/fortran/Makefile.am qd-2.3.12/fortran/Makefile.am
 -$(QDEXT): qdext.o
 +lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
 +libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
++libqdmod_la_LIBADD = $(FCLIBS)
 +libqd_f_main_la_SOURCES = main.cpp
 +ddmod.lo: $(DDEXT) ddext.lo
 +qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
diff --git a/sci-libs/qd/files/qd-2.3.13-autotools.patch b/sci-libs/qd/files/qd-2.3.13-autotools.patch
new file mode 100644
index 000000000000..6a89cb6607b2
--- /dev/null
+++ b/sci-libs/qd/files/qd-2.3.13-autotools.patch
@@ -0,0 +1,15 @@
+ fortran/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/fortran/Makefile.am b/fortran/Makefile.am
+index 1ab54f7..7889fa3 100644
+--- a/fortran/Makefile.am
++++ b/fortran/Makefile.am
+@@ -16,6 +16,7 @@ endif
+ 
+ lib_LTLIBRARIES = libqdmod.la libqd_f_main.la
+ libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
++libqdmod_la_LIBADD = $(FCLIBS)
+ libqd_f_main_la_SOURCES = main.cpp
+ ddmod.lo: $(DDEXT) ddext.lo
+ qdmod.lo: ddmod.lo $(DDMOD) qdext.lo
diff --git a/sci-libs/qd/qd-2.3.12.ebuild b/sci-libs/qd/qd-2.3.12.ebuild
index 5d669e3bc015..972be7d96fb5 100644
--- a/sci-libs/qd/qd-2.3.12.ebuild
+++ b/sci-libs/qd/qd-2.3.12.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.12.ebuild,v 1.1 2012/01/12 22:53:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.12.ebuild,v 1.2 2012/06/25 16:53:25 jlec Exp $
 
 EAPI=4
 
-inherit autotools eutils fortran-2
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils fortran-2
 
 DESCRIPTION="Quad-double and double-double float arithmetics"
 HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
@@ -22,21 +24,20 @@ pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-shared \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-shared
 		$(use_enable fortran enable_fortran)
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
+
 	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
 	dosym qd_real.h /usr/include/qd/qd.h
 	dosym dd_real.h /usr/include/qd/dd.h
diff --git a/sci-libs/qd/qd-2.3.13.ebuild b/sci-libs/qd/qd-2.3.13.ebuild
index d4124ee9b288..e1089fc5e736 100644
--- a/sci-libs/qd/qd-2.3.13.ebuild
+++ b/sci-libs/qd/qd-2.3.13.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.13.ebuild,v 1.1 2012/04/18 23:20:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.13.ebuild,v 1.2 2012/06/25 16:53:25 jlec Exp $
 
 EAPI=4
 
-inherit eutils fortran-2
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils fortran-2
 
 DESCRIPTION="Quad-double and double-double float arithmetics"
 HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
@@ -22,16 +24,20 @@ pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 }
 
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-shared \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-shared
 		$(use_enable fortran enable_fortran)
+		)
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
+
 	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
 	dosym qd_real.h /usr/include/qd/qd.h
 	dosym dd_real.h /usr/include/qd/dd.h