Fixed qd-config script for modules installed in include directory

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

3 files changed, 53 insertions, 45 deletions

diff --git a/sci-libs/qd/ChangeLog b/sci-libs/qd/ChangeLog
index 5e6f14ceb3d2..7b9b44c43feb 100644
--- a/sci-libs/qd/ChangeLog
+++ b/sci-libs/qd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2012/01/12 23:09:27 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/ChangeLog,v 1.10 2012/01/13 04:33:03 bicatali Exp $
+
+  13 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  files/qd-2.3.12-autotools.patch:
+  Fixed qd-config script for modules installed in include directory
 
   12 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
   files/qd-2.3.12-autotools.patch:
diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest
index 1f218759233c..4302736aa686 100644
--- a/sci-libs/qd/Manifest
+++ b/sci-libs/qd/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 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 15939 RMD160 0dfba4b1cbfcbd89a9fc35032496f71e390d21d3 SHA1 c2331759cf4fef482456f43eb796db3be07fac69 SHA256 40f7b0d4f7783a9ef0e853d4e4bec5699a0734d5d6a9875c8bf3566c33a573f1
+AUX qd-2.3.12-autotools.patch 16230 RMD160 8ae9bffecde8c9a5d3af38894e19af1339d26d3b SHA1 7a553cf5ad3d8746a9693a8a4ade061ba2e851e3 SHA256 856c176b506708a036fe22903d58a472fb36dcb33a6a469d0ad162c869288273
 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
@@ -11,12 +11,12 @@ DIST qd-2.3.9.tar.gz 595952 RMD160 782b27a13654d9d132a6f9f885d8ad176e1e1fda SHA1
 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.9.ebuild 974 RMD160 4fc054bad1e1447ec108f22a0a9be88f40155a4a SHA1 570b8bf5e34bee8369a3ce847587d4b3e262e3ba SHA256 c13f79d29b8e8ed1ac9f0e444028014e3edef7684ce29f3e66cb077ea390dfdb
-MISC ChangeLog 1476 RMD160 3155550622c330cf30302a78ef6699ef325abfa2 SHA1 22bc3e3f4ebbd154f53440382d01558db7a6886d SHA256 7184a328a4308d9fdf22bf43c5d649e3e0ca59364c689eda3ca2c53ef67265b2
+MISC ChangeLog 1636 RMD160 166fa45ba50a1810b194b0da4a17c4f20ed8679f SHA1 3e2450d9767f9add1c4a7c69ba91cb22a84e8880 SHA256 8fae79ff74fe83d49603f6509f7446e1c32bccd3086d36999598bc53788a3b49
 MISC metadata.xml 334 RMD160 40c1d8c9f178cd40a09f7c40e9ac335ade0059ca SHA1 b765fa3da44b33d6bce4f6d80ef34df1d9b6366c SHA256 3444d77952a6cffa63be0a5082a506a95fdf3cb93a0fc5811bd86dee40ae7cda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8PaC8ACgkQ1ycZbhPLE2DpNQCeM+g/lRmp11jS6mAqEq/TiFZ3
-658AoJ6Sr7NvAg45Jd31J2GN0UmiNxVb
-=DG6W
+iEYEARECAAYFAk8PtAgACgkQ1ycZbhPLE2DfZQCeKnR83ZpXSkX5nBOfRFojONz+
+QrcAoIOBkpRO94lv/e/Ccfazci9PKd+T
+=z9lz
 -----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 f4ad4fbb5971..1389c519712e 100644
--- a/sci-libs/qd/files/qd-2.3.12-autotools.patch
+++ b/sci-libs/qd/files/qd-2.3.12-autotools.patch
@@ -1,14 +1,6 @@
-Patch for autotools for:
-* allow build of shared libraries with libtool
-* fix m4 macros for newer autoconf
-* modernize configure.ac
-* fix parallel make issues with fortran modules
-
-Sebastien Fabbro Jan. 2012
-
 diff -Nur qd-2.3.12.orig/configure.ac qd-2.3.12/configure.ac
---- qd-2.3.12.orig/configure.ac	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/configure.ac	2012-01-12 22:34:18.000000000 +0000
+--- qd-2.3.12.orig/configure.ac	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/configure.ac	2012-01-13 04:15:47.000000000 +0000
 @@ -308,12 +308,11 @@
  AC_SUBST(FFLAGS, $FCFLAGS)
  
@@ -26,8 +18,8 @@ diff -Nur qd-2.3.12.orig/configure.ac qd-2.3.12/configure.ac
  # Output
  AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile 
 diff -Nur qd-2.3.12.orig/fortran/Makefile.am qd-2.3.12/fortran/Makefile.am
---- qd-2.3.12.orig/fortran/Makefile.am	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/fortran/Makefile.am	2012-01-12 22:48:19.000000000 +0000
+--- qd-2.3.12.orig/fortran/Makefile.am	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/fortran/Makefile.am	2012-01-13 04:15:47.000000000 +0000
 @@ -1,6 +1,6 @@
  if HAVE_FORTRAN
  AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
@@ -36,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,17 @@
+@@ -14,17 +14,18 @@
  DDMOD=ddmodule.$(module_ext)
  endif
  
@@ -60,13 +52,14 @@ diff -Nur qd-2.3.12.orig/fortran/Makefile.am qd-2.3.12/fortran/Makefile.am
 +$(QDEXT): qdext.lo $(DDEXT) 
  
 -pkglib_DATA = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT)
-+include_HEADERS = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT)
++qdmoddir = $(includedir)/$(PACKAGE)
++qdmod_HEADERS = $(QDMOD) $(QDEXT) $(DDMOD) $(DDEXT)
  
  DEMO=quaderq$(EXEEXT) quadgsq2d$(EXEEXT) quadgsq$(EXEEXT) \
       quadtsq$(EXEEXT) quadtsq2d$(EXEEXT)
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4 qd-2.3.12/m4/ax_cxx_clock_gettime.m4
---- qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_clock_gettime.m4	2012-01-12 22:11:48.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_clock_gettime.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -3,13 +3,13 @@
  AC_DEFUN([AX_CXX_CLOCK_GETTIME], [
  AC_MSG_CHECKING([for clock_gettime useability])
@@ -84,8 +77,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_clock_gettime.m4 qd-2.3.12/m4/ax_cxx_clock_ge
  AC_MSG_RESULT([$ax_cxx_clock_gettime])
  ])
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_copysign.m4 qd-2.3.12/m4/ax_cxx_copysign.m4
---- qd-2.3.12.orig/m4/ax_cxx_copysign.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_copysign.m4	2012-01-12 22:12:57.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_copysign.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_copysign.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -6,19 +6,19 @@
  AC_MSG_CHECKING([for copysign])
  AC_LANG_PUSH(C++)
@@ -111,8 +104,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_copysign.m4 qd-2.3.12/m4/ax_cxx_copysign.m4
                        ax_cxx_copysign="::copysign(x, y)"], 
                       [AC_MSG_RESULT(none)
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_fma.m4 qd-2.3.12/m4/ax_cxx_fma.m4
---- qd-2.3.12.orig/m4/ax_cxx_fma.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_fma.m4	2012-01-12 21:58:52.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_fma.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_fma.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -19,14 +19,14 @@
      case $name in
        ibm)
@@ -186,8 +179,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_fma.m4 qd-2.3.12/m4/ax_cxx_fma.m4
                          ax_cxx_fms="((x)*(y) - (z))"])
        ;;
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_isfinite.m4 qd-2.3.12/m4/ax_cxx_isfinite.m4
---- qd-2.3.12.orig/m4/ax_cxx_isfinite.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_isfinite.m4	2012-01-12 22:13:36.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_isfinite.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isfinite.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -6,19 +6,19 @@
  AC_MSG_CHECKING([for isfinite])
  AC_LANG_PUSH(C++)
@@ -213,8 +206,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_isfinite.m4 qd-2.3.12/m4/ax_cxx_isfinite.m4
                        ax_cxx_isfinite="::isfinite(x)"], 
                       [AC_MSG_RESULT(none)
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_isinf.m4 qd-2.3.12/m4/ax_cxx_isinf.m4
---- qd-2.3.12.orig/m4/ax_cxx_isinf.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_isinf.m4	2012-01-12 22:14:20.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_isinf.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isinf.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -6,19 +6,19 @@
  AC_MSG_CHECKING([for isinf])
  AC_LANG_PUSH(C++)
@@ -240,8 +233,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_isinf.m4 qd-2.3.12/m4/ax_cxx_isinf.m4
                        ax_cxx_isinf="::isinf(x)"], 
                       [AC_MSG_RESULT(none)
 diff -Nur qd-2.3.12.orig/m4/ax_cxx_isnan.m4 qd-2.3.12/m4/ax_cxx_isnan.m4
---- qd-2.3.12.orig/m4/ax_cxx_isnan.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_cxx_isnan.m4	2012-01-12 22:14:58.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_cxx_isnan.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_cxx_isnan.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -6,19 +6,19 @@
  AC_MSG_CHECKING([for isnan])
  AC_LANG_PUSH(C++)
@@ -267,8 +260,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_cxx_isnan.m4 qd-2.3.12/m4/ax_cxx_isnan.m4
                        ax_cxx_isnan="::isnan(x)"], 
                       [AC_MSG_RESULT(none)
 diff -Nur qd-2.3.12.orig/m4/ax_f90_module_flag.m4 qd-2.3.12/m4/ax_f90_module_flag.m4
---- qd-2.3.12.orig/m4/ax_f90_module_flag.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_f90_module_flag.m4	2012-01-12 22:28:24.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_f90_module_flag.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_f90_module_flag.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -16,7 +16,7 @@
  
  AC_DEFUN([AX_F90_MODULE_FLAG],[
@@ -308,8 +301,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_f90_module_flag.m4 qd-2.3.12/m4/ax_f90_module_fla
    fi
  done
 diff -Nur qd-2.3.12.orig/m4/ax_f90_module_style.m4 qd-2.3.12/m4/ax_f90_module_style.m4
---- qd-2.3.12.orig/m4/ax_f90_module_style.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_f90_module_style.m4	2012-01-12 22:28:50.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_f90_module_style.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_f90_module_style.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -21,7 +21,7 @@
  
  AC_DEFUN([AX_F90_MODULE_STYLE],[
@@ -336,8 +329,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_f90_module_style.m4 qd-2.3.12/m4/ax_f90_module_st
     if test x$ax_f90_modext = x ; then
  dnl Some F90 compilers put module filename in uppercase letters
 diff -Nur qd-2.3.12.orig/m4/ax_fc_etime.m4 qd-2.3.12/m4/ax_fc_etime.m4
---- qd-2.3.12.orig/m4/ax_fc_etime.m4	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/m4/ax_fc_etime.m4	2012-01-12 22:42:03.000000000 +0000
+--- qd-2.3.12.orig/m4/ax_fc_etime.m4	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/m4/ax_fc_etime.m4	2012-01-13 04:15:47.000000000 +0000
 @@ -4,9 +4,9 @@
  ax_fc_etime=
  ax_fc_etime_names="etime etime_"
@@ -351,8 +344,8 @@ diff -Nur qd-2.3.12.orig/m4/ax_fc_etime.m4 qd-2.3.12/m4/ax_fc_etime.m4
    if test "x$ax_fc_etime" != "x"; then
      break;
 diff -Nur qd-2.3.12.orig/Makefile.am qd-2.3.12/Makefile.am
---- qd-2.3.12.orig/Makefile.am	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/Makefile.am	2012-01-12 20:21:15.000000000 +0000
+--- qd-2.3.12.orig/Makefile.am	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/Makefile.am	2012-01-13 04:15:47.000000000 +0000
 @@ -1,7 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  SUBDIRS = config src include tests fortran
@@ -394,10 +387,21 @@ diff -Nur qd-2.3.12.orig/Makefile.am qd-2.3.12/Makefile.am
  
  bin_SCRIPTS=qd-config
  
-
+diff -Nur qd-2.3.12.orig/qd-config.in qd-2.3.12/qd-config.in
+--- qd-2.3.12.orig/qd-config.in	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/qd-config.in	2012-01-13 04:17:47.000000000 +0000
+@@ -30,7 +30,7 @@
+ FCLIBS="-L$libdir -lqdmod -lqd @LIBS@ @FCLIBS@"
+ FMAINLIB="-L$libdir -lqd_f_main"
+ FCFLAGS="@REQ_FCFLAGS@"
+-MODFLAG="@ax_f90_modflag@$libdir/qd"
++MODFLAG="@ax_f90_modflag@$includedir/qd"
+ 
+ build="@BUILDER@-@BUILDDATE@"
+ configure_args="@CONFIGURE_ARGS@"
 diff -Nur qd-2.3.12.orig/src/Makefile.am qd-2.3.12/src/Makefile.am
---- qd-2.3.12.orig/src/Makefile.am	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/src/Makefile.am	2012-01-12 19:49:45.000000000 +0000
+--- qd-2.3.12.orig/src/Makefile.am	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/src/Makefile.am	2012-01-13 04:15:47.000000000 +0000
 @@ -1,9 +1,9 @@
  SRC = c_dd.cpp c_qd.cpp dd_real.cpp dd_const.cpp \
        fpu.cpp qd_real.cpp qd_const.cpp util.cpp bits.cpp util.h
@@ -411,8 +415,8 @@ diff -Nur qd-2.3.12.orig/src/Makefile.am qd-2.3.12/src/Makefile.am
  AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
  
 diff -Nur qd-2.3.12.orig/tests/Makefile.am qd-2.3.12/tests/Makefile.am
---- qd-2.3.12.orig/tests/Makefile.am	2012-01-12 19:44:25.000000000 +0000
-+++ qd-2.3.12/tests/Makefile.am	2012-01-12 20:06:49.000000000 +0000
+--- qd-2.3.12.orig/tests/Makefile.am	2012-01-13 04:15:25.000000000 +0000
++++ qd-2.3.12/tests/Makefile.am	2012-01-13 04:15:47.000000000 +0000
 @@ -1,4 +1,4 @@
 -LDADD = $(top_builddir)/src/libqd.a
 +LDADD = $(top_builddir)/src/libqd.la