Removed old, keyword amd64-linux, x86-linux

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

14 files changed, 18 insertions, 1062 deletions

diff --git a/sci-libs/arprec/ChangeLog b/sci-libs/arprec/ChangeLog
index c7ed47851d48..b1f5fb49c4b9 100644
--- a/sci-libs/arprec/ChangeLog
+++ b/sci-libs/arprec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/arprec
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/ChangeLog,v 1.10 2012/04/18 23:25:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/ChangeLog,v 1.11 2012/08/03 16:47:24 bicatali Exp $
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -arprec-2.2.10.ebuild,
+  -arprec-2.2.9.ebuild, -files/arprec-2.2.9-autotools.patch,
+  arprec-2.2.13.ebuild:
+  Removed old, keyword amd64-linux, x86-linux
 
 *arprec-2.2.13 (18 Apr 2012)
 
@@ -53,4 +58,3 @@
   14 Apr 2009; Andrey Grozin <grozin@gentoo.org> +metadata.xml,
   +arprec-2.2.2.ebuild:
   Initial import
-
diff --git a/sci-libs/arprec/arprec-2.2.10.ebuild b/sci-libs/arprec/arprec-2.2.10.ebuild
deleted file mode 100644
index 5c8980675bd7..000000000000
--- a/sci-libs/arprec/arprec-2.2.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.10.ebuild,v 1.1 2012/03/13 16:43:11 bicatali Exp $
-
-EAPI=4
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Arbitrary precision float arithmetics and functions"
-HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran qd static-libs"
-
-DEPEND="fortran? ( virtual/fortran )
-	qd? ( sci-libs/qd[fortran=] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.9-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable fortran enable_fortran) \
-		$(use_enable qd enable_qd)
-}
-
-src_compile() {
-	emake
-	use fortran && emake toolkit
-}
-
-src_install() {
-	default
-	if use fortran; then
-		cd toolkit
-		./mathinit || die "mathinit failed"
-		exeinto /usr/libexec/${PN}
-		doexe mathtool
-		insinto /usr/libexec/${PN}
-		doins *.dat
-		newdoc README README.mathtool
-	fi
-	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-libs/arprec/arprec-2.2.13.ebuild b/sci-libs/arprec/arprec-2.2.13.ebuild
index 74b6c4561c28..240fea105ba8 100644
--- a/sci-libs/arprec/arprec-2.2.13.ebuild
+++ b/sci-libs/arprec/arprec-2.2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.13.ebuild,v 1.1 2012/04/18 23:25:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.13.ebuild,v 1.2 2012/08/03 16:47:24 bicatali Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran qd static-libs"
 
 DEPEND="fortran? ( virtual/fortran )
diff --git a/sci-libs/arprec/arprec-2.2.9.ebuild b/sci-libs/arprec/arprec-2.2.9.ebuild
deleted file mode 100644
index 70abd52a2f56..000000000000
--- a/sci-libs/arprec/arprec-2.2.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.9.ebuild,v 1.1 2012/03/06 18:00:03 bicatali Exp $
-
-EAPI=4
-
-inherit eutils fortran-2 autotools
-
-DESCRIPTION="Arbitrary precision float arithmetics and functions"
-HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran qd static-libs"
-
-DEPEND="fortran? ( virtual/fortran )
-	qd? ( sci-libs/qd[fortran=] )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		$(use_enable fortran enable_fortran) \
-		$(use_enable qd enable_qd)
-}
-
-src_compile() {
-	emake
-	use fortran && emake toolkit
-}
-
-src_install() {
-	default
-	if use fortran; then
-		cd toolkit
-		./mathinit || die "mathinit failed"
-		exeinto /usr/libexec/${PN}
-		doexe mathtool
-		insinto /usr/libexec/${PN}
-		doins *.dat
-		newdoc README README.mathtool
-	fi
-	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
-}
diff --git a/sci-libs/arprec/files/arprec-2.2.9-autotools.patch b/sci-libs/arprec/files/arprec-2.2.9-autotools.patch
deleted file mode 100644
index be2746c65bd2..000000000000
--- a/sci-libs/arprec/files/arprec-2.2.9-autotools.patch
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -Nur arprec-2.2.9.orig/arprec-config.in arprec-2.2.9/arprec-config.in
---- arprec-2.2.9.orig/arprec-config.in	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/arprec-config.in	2012-03-06 17:51:18.000000000 +0000
-@@ -17,7 +17,7 @@
- FC="@FC@"
- FCLIBS="-L$libdir -larprecmod -larprec @LIBS@ @FCLIBS@"
- FCFLAGS="@CONFIG_FCFLAGS@"
--MODINC="@ax_f90_modflag@$libdir/arprec"
-+MODINC="@ax_f90_modflag@$includedir/arprec"
- FMAINLIB="-L$libdir -larprec_f_main"
- 
- configure_args="@CONFIGURE_ARGS@"
-diff -Nur arprec-2.2.9.orig/configure.ac arprec-2.2.9/configure.ac
---- arprec-2.2.9.orig/configure.ac	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/configure.ac	2012-03-06 17:51:18.000000000 +0000
-@@ -233,8 +233,9 @@
- AM_CONDITIONAL(HAVE_FORTRAN, [test "x$enable_fortran" = "xyes"])
- AM_CONDITIONAL(UPCASE_MODULE, [test "$module_case" = "uppercase"])
- 
--# Check ranlib
--AC_PROG_RANLIB
-+# Check libtool (will check for ranlib and friends)
-+AC_DISABLE_SHARED
-+AC_PROG_LIBTOOL
- 
- # Checks for libraries.
- 
-diff -Nur arprec-2.2.9.orig/fortran/Makefile.am arprec-2.2.9/fortran/Makefile.am
---- arprec-2.2.9.orig/fortran/Makefile.am	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/fortran/Makefile.am	2012-03-06 17:51:18.000000000 +0000
-@@ -1,10 +1,10 @@
- if HAVE_FORTRAN
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
--LDADD = libarprec_f_main.a libarprecmod.a $(top_builddir)/src/libarprec.a $(FCLIBS)
-+LDADD = libarprec_f_main.la libarprecmod.la $(top_builddir)/src/libarprec.la $(FCLIBS)
- 
--lib_LIBRARIES = libarprecmod.a libarprec_f_main.a
--libarprecmod_a_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f
--libarprec_f_main_a_SOURCES = main.cpp
-+lib_LTLIBRARIES = libarprecmod.la libarprec_f_main.la
-+libarprecmod_la_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f
-+libarprec_f_main_la_SOURCES = main.cpp
- 
- if UPCASE_MODULE
- MPCOMPLEXMOD = MPCOMPLEXMOD.$(module_ext)
-@@ -29,15 +29,16 @@
- MODULES = $(MPCOMPLEXMOD) $(MPDEFMOD) $(MPGENMOD) $(MPINTMOD) \
- 	  $(MPMODULE) $(MPMODULEM) $(MPMODULEX) $(MPREALMOD)
- 
--$(MPDEFMOD) $(MPINTMOD) $(MPREALMOD) $(MPCOMPLEXMOD) $(MPGENMOD) $(MPMODULE): mp_mod.o
-+$(MPDEFMOD) $(MPINTMOD) $(MPREALMOD) $(MPCOMPLEXMOD) $(MPGENMOD) $(MPMODULE): mp_mod.lo
- 
--mp_modm.o: mp_mod.o
--$(MPMODULEM): mp_modm.o
-+mp_modm.lo: mp_mod.lo
-+$(MPMODULEM): mp_modm.lo
- 
--mp_modx.o: mp_mod.o
--$(MPMODULEX): mp_modx.o
-+mp_modx.lo: mp_mod.lo
-+$(MPMODULEX): mp_modx.lo
- 
--pkglib_DATA = $(MODULES)
-+arprecmoddir = $(includedir)/arprec
-+arprecmod_HEADERS = $(MODULES)
- 
- DEMO = pslq1$(EXEEXT) pslq2$(EXEEXT) pslq3$(EXEEXT) pslqm1$(EXEEXT) \
-        pslqm2$(EXEEXT) pslqm3$(EXEEXT) quadgs$(EXEEXT) quaderf$(EXEEXT) \
-diff -Nur arprec-2.2.9.orig/m4/ax_cxx_fma.m4 arprec-2.2.9/m4/ax_cxx_fma.m4
---- arprec-2.2.9.orig/m4/ax_cxx_fma.m4	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/m4/ax_cxx_fma.m4	2012-03-06 17:51:18.000000000 +0000
-@@ -19,14 +19,14 @@
-     case $name in
-       ibm)
-         # IBM VisualAge C++ __fmadd / __fmsub.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        #include <builtins.h>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          double x = __fmadd(1.0 + d, 1.0 - d, -1.0);
-                          double y = __fmsub(1.0 + d, 1.0 - d, 1.0);
-                          return (x == -d*d && y == -d*d) ? 0 : 1;
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="__fmadd(x,y,z)"
-                        ax_cxx_fms="__fmsub(x,y,z)"
-                        AC_DEFINE([ARPREC_VACPP_BUILTINS_H], [1], 
-@@ -34,22 +34,22 @@
-       ;;
-       gnu)
-         # Later gcc (3.4 and later) have __builtin_fma that seems to work.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return (__builtin_fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="__builtin_fma(x,y,z)"
-                        ax_cxx_fms="__builtin_fma(x,y,-z)"])
-       ;;
-       c99)
-         # Try C99 fma() function.  Some platforms doesn't seem to implement this
-         # correctly (Apple gcc-3.3 for example).
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return (fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="fma(x,y,z)"
-                        ax_cxx_fms="fma(x,y,-z)"])
-       ;;
-@@ -57,11 +57,11 @@
-         # Try relying on the compiler to optimize x * y + z into an fma.
-         # This method is not recommended since if it is inlined it does not
-         # always produce the same correct code.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return ( (1.0 + d) * (1.0 - d) - 1.0 == -d*d ? 0 : 1);
--                       }],
-+                       }])],
-                        [ax_cxx_fma="((x)*(y) + (z))"
-                         ax_cxx_fms="((x)*(y) - (z))"])
-       ;;
-diff -Nur arprec-2.2.9.orig/m4/ax_f90_module_flag.m4 arprec-2.2.9/m4/ax_f90_module_flag.m4
---- arprec-2.2.9.orig/m4/ax_f90_module_flag.m4	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/m4/ax_f90_module_flag.m4	2012-03-06 17:51:18.000000000 +0000
-@@ -16,7 +16,7 @@
- 
- AC_DEFUN([AX_F90_MODULE_FLAG],[
- AC_CACHE_CHECK([fortran 90 modules inclusion flag],
--ax_f90_modflag,
-+ax_cv_f90_modflag,
- [AC_LANG_PUSH(Fortran)
- i=0
- while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
-@@ -24,24 +24,24 @@
- done
- mkdir tmpdir_$i
- cd tmpdir_$i
--AC_COMPILE_IFELSE([module conftest_module
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
-    contains
-    subroutine conftest_routine
-    write(*,'(a)') 'gotcha!'
-    end subroutine conftest_routine
-    end module conftest_module
--  ],[],[])
-+  ])],[],[])
- cd ..
- ax_f90_modflag="not found"
- for ax_flag in "-I " "-M" "-p"; do
-   if test "$ax_f90_modflag" = "not found" ; then
-     ax_save_FCFLAGS="$FCFLAGS"
-     FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i"
--    AC_COMPILE_IFELSE([program conftest_program
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([program conftest_program
-        use conftest_module
-        call conftest_routine
-        end program conftest_program
--      ],[ax_f90_modflag="$ax_flag"],[])
-+      ])],[ax_f90_modflag="$ax_flag"],[])
-     FCFLAGS="$ax_save_FCFLAGS"
-   fi
- done
-diff -Nur arprec-2.2.9.orig/m4/ax_f90_module_style.m4 arprec-2.2.9/m4/ax_f90_module_style.m4
---- arprec-2.2.9.orig/m4/ax_f90_module_style.m4	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/m4/ax_f90_module_style.m4	2012-03-06 17:51:18.000000000 +0000
-@@ -21,7 +21,7 @@
- 
- AC_DEFUN([AX_F90_MODULE_STYLE],[
- AC_CACHE_CHECK([fortran 90 modules naming style],
--ax_f90_module_style, 
-+ax_cv_f90_module_style, 
- [AC_LANG_PUSH(Fortran)
- i=0
- while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
-@@ -29,13 +29,13 @@
- done
- mkdir tmpdir_$i
- cd tmpdir_$i
--AC_COMPILE_IFELSE([module conftest_module
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
-    contains
-    subroutine conftest_routine
-    write(*,'(a)') 'gotcha!'
-    end subroutine conftest_routine
-    end module conftest_module
--  ],
-+  ])],
-   [ax_f90_modext=`ls | sed -n 's,conftest_module\.,,p'`
-    if test x$ax_f90_modext = x ; then
- dnl Some F90 compilers put module filename in uppercase letters
-diff -Nur arprec-2.2.9.orig/m4/ax_fc_backslash_flag.m4 arprec-2.2.9/m4/ax_fc_backslash_flag.m4
---- arprec-2.2.9.orig/m4/ax_fc_backslash_flag.m4	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/m4/ax_fc_backslash_flag.m4	2012-03-06 17:51:18.000000000 +0000
-@@ -11,9 +11,9 @@
-     if test "x$ax_flag" != "xnone"; then
-       FCFLAGS="$save_FCFLAGS $ax_flag"
-     fi
--    AC_COMPILE_IFELSE([[program test
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([program test
-       print *, '\'
--      end program]], [ax_fc_backslash_flag=$ax_flag])
-+      end program])], [ax_fc_backslash_flag=$ax_flag])
-   fi
- done
- AC_LANG_POP(Fortran)
-diff -Nur arprec-2.2.9.orig/m4/ax_fc_etime.m4 arprec-2.2.9/m4/ax_fc_etime.m4
---- arprec-2.2.9.orig/m4/ax_fc_etime.m4	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/m4/ax_fc_etime.m4	2012-03-06 17:51:18.000000000 +0000
-@@ -4,9 +4,9 @@
- ax_fc_etime=
- ax_fc_etime_names="etime etime_"
- for name in $ax_fc_etime_names; do
--  AC_LINK_IFELSE([AC_LANG_PROGRAM(, [[
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM(, [AC_LANG_SOURCE([
-       real*4 t(2), tot
--      tot = $name(t)]])], 
-+      tot = $name(t)])])],
-     [ax_fc_etime=$name], [])
-   if test "x$ax_fc_etime" != "x"; then
-     break;
-diff -Nur arprec-2.2.9.orig/Makefile.am arprec-2.2.9/Makefile.am
---- arprec-2.2.9.orig/Makefile.am	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/Makefile.am	2012-03-06 17:51:18.000000000 +0000
-@@ -2,21 +2,20 @@
- SUBDIRS = src tests include fortran toolkit
- 
- bin_SCRIPTS=arprec-config
--docdir=${datadir}/doc/${PACKAGE}
- dist_doc_DATA = README doc/arprec.pdf
- 
- cpp-demo:
--	cd tests && make demo
-+	$(MAKE) -C tests demo
- 
- if HAVE_FORTRAN
- 
- fortran-demo:
--	cd fortran && make demo
-+	$(MAKE) -C fortran demo
- 
- demo: fortran-demo cpp-demo
- 
- toolkit:
--	cd toolkit && make toolkit
-+	$(MAKE) -C toolkit toolkit
- 
- else
- 
-@@ -31,7 +30,7 @@
- endif
- 
- time:
--	cd tests && make time
-+	$(MAKE) -C tests time
- 
- changelog:
- 	git log >ChangeLog
-diff -Nur arprec-2.2.9.orig/src/Makefile.am arprec-2.2.9/src/Makefile.am
---- arprec-2.2.9.orig/src/Makefile.am	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/src/Makefile.am	2012-03-06 17:51:18.000000000 +0000
-@@ -13,9 +13,9 @@
-       dble.cpp                                                         \
-       small_inline.h
- 
--lib_LIBRARIES = libarprec.a
-+lib_LTLIBRARIES = libarprec.la
- 
--libarprec_a_SOURCES = $(SRC)
-+libarprec_la_SOURCES = $(SRC)
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
- 
-diff -Nur arprec-2.2.9.orig/tests/Makefile.am arprec-2.2.9/tests/Makefile.am
---- arprec-2.2.9.orig/tests/Makefile.am	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/tests/Makefile.am	2012-03-06 17:51:42.000000000 +0000
-@@ -1,4 +1,4 @@
--LDADD = $(top_builddir)/src/libarprec.a
-+LDADD = $(top_builddir)/src/libarprec.la
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
- 
- TESTS = mp_test c_mp_test io
-@@ -19,9 +19,9 @@
- 
- f_mp_test_SOURCES = f_mp_test.f
- f_mp_test_LINK = $(CXXLINK)
--f_mp_test_LDADD = $(top_builddir)/fortran/libarprecmod.a \
--               $(top_builddir)/fortran/libarprec_f_main.a \
--               $(LDADD) $(top_builddir)/src/libarprec.a $(FCLIBS)
-+f_mp_test_LDADD = $(top_builddir)/fortran/libarprecmod.la \
-+               $(top_builddir)/fortran/libarprec_f_main.la \
-+               $(LDADD) $(top_builddir)/src/libarprec.la $(FCLIBS)
- endif
- 
- mp_timer_SOURCES = mp_timer.cpp tictoc.cpp
-diff -Nur arprec-2.2.9.orig/toolkit/Makefile.am arprec-2.2.9/toolkit/Makefile.am
---- arprec-2.2.9.orig/toolkit/Makefile.am	2012-03-06 17:50:59.000000000 +0000
-+++ arprec-2.2.9/toolkit/Makefile.am	2012-03-06 17:51:18.000000000 +0000
-@@ -1,9 +1,9 @@
- if HAVE_FORTRAN
- AM_CPPFLAGS=-I$(top_builddir)
- AM_FFLAGS=@ax_f90_modflag@$(top_builddir)/fortran
--LDADD = $(top_builddir)/fortran/libarprec_f_main.a \
--        $(top_builddir)/fortran/libarprecmod.a \
--        $(top_builddir)/src/libarprec.a $(FCLIBS)
-+LDADD = $(top_builddir)/fortran/libarprec_f_main.la \
-+        $(top_builddir)/fortran/libarprecmod.la \
-+        $(top_builddir)/src/libarprec.la $(FCLIBS)
- 
- TOOLKIT = mathinit$(EXEEXT) mathtool$(EXEEXT)
- EXTRA_PROGRAMS = $(TOOLKIT)
-@@ -19,6 +19,18 @@
- nodist_mathtool_SOURCES = second.f
- nodist_EXTRA_mathtool_SOURCES = dummy.cpp
- mathtool_LINK = $(CXXLINK)
-+if UPCASE_MODULE
-+GLOBDATAMOD = GLOBDATA.$(module_ext)
-+else
-+GLOBDATAMOD = globdata.$(module_ext)
-+endif
-+$(GLOBDATAMOD): globdata.o
-+mathinit.o: $(GLOBDATAMOD)
-+mathtool.o: $(GLOBDATAMOD)
-+pqlsub.o: $(GLOBDATAMOD)
-+rootsub.o: $(GLOBDATAMOD)
-+quadsub.o: $(GLOBDATAMOD)
-+zetapz.o: $(GLOBDATAMOD)
- 
- toolkit: $(TOOLKIT)
- 
diff --git a/sci-libs/qd/ChangeLog b/sci-libs/qd/ChangeLog
index 66b180ef83a1..c6adf8b7cac7 100644
--- a/sci-libs/qd/ChangeLog
+++ b/sci-libs/qd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.12 2012/06/25 16:53:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/ChangeLog,v 1.13 2012/08/03 16:43:50 bicatali Exp $
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/qd-2.3.11-configure-version.patch, -files/qd-2.3.11-docpath.patch,
+  -files/qd-2.3.12-autotools.patch, -files/qd-2.3.7-test.patch,
+  -qd-2.3.11.ebuild, -qd-2.3.12.ebuild, -qd-2.3.9.ebuild, qd-2.3.13.ebuild:
+  Removed old, keyword amd64-linux, x86-linux
 
   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,
@@ -57,4 +63,3 @@
   14 Apr 2009; Andrey Grozin <grozin@gentoo.org> +files/qd-2.3.7-test.patch,
   +metadata.xml, +qd-2.3.7.ebuild:
   Initial import
-
diff --git a/sci-libs/qd/files/qd-2.3.11-configure-version.patch b/sci-libs/qd/files/qd-2.3.11-configure-version.patch
deleted file mode 100644
index 616fdb77c610..000000000000
--- a/sci-libs/qd/files/qd-2.3.11-configure-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2011-05-16 12:27:31.759991392 +1000
-+++ configure.ac	2011-05-16 12:27:56.026801099 +1000
-@@ -1,6 +1,6 @@
- #                                               -*- Autoconf -*-
- # Process this file with autoconf to produce a configure script.
--define([QD_PATCH_VERSION], 7)
-+define([QD_PATCH_VERSION], 11)
- AC_PREREQ(2.60)
- AC_INIT(qd, 2.3.QD_PATCH_VERSION, yozo@cs.berkeley.edu)
- AC_CONFIG_SRCDIR([src/qd_real.cpp])
diff --git a/sci-libs/qd/files/qd-2.3.11-docpath.patch b/sci-libs/qd/files/qd-2.3.11-docpath.patch
deleted file mode 100644
index 3fb730cbe000..000000000000
--- a/sci-libs/qd/files/qd-2.3.11-docpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2011-05-16 12:28:25.462931216 +1000
-+++ Makefile.am	2011-05-16 12:28:59.978393577 +1000
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = config src include tests fortran
- 
--docdir=${datadir}/doc/${PACKAGE}
-+docdir=${datadir}/doc/${PACKAGE}-${VERSION}
- BUILT_SOURCES = docs/qd.pdf
- dist_doc_DATA = README docs/qd.pdf
- dist_noinst_DATA = docs/Makefile \
diff --git a/sci-libs/qd/files/qd-2.3.12-autotools.patch b/sci-libs/qd/files/qd-2.3.12-autotools.patch
deleted file mode 100644
index 346ac61151a5..000000000000
--- a/sci-libs/qd/files/qd-2.3.12-autotools.patch
+++ /dev/null
@@ -1,439 +0,0 @@
-diff -Nur qd-2.3.12.orig/configure.ac qd-2.3.12/configure.ac
---- 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)
- 
- # Add libraries
--LIBS="$LIBS -lm"
-+AC_CHECK_LIB(m,sqrt)
- 
- # libtool stuff
--# AC_DISABLE_SHARED
--# AC_PROG_LIBTOOL
--AC_PROG_RANLIB
-+AC_DISABLE_SHARED
-+AC_PROG_LIBTOOL
- 
- # 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-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
--LDADD=libqdmod.a libqd_f_main.a $(top_builddir)/src/libqd.a $(FCLIBS)
-+LDADD=libqdmod.la libqd_f_main.la $(top_builddir)/src/libqd.la $(FCLIBS)
- 
- if UPCASE_MODULE
- DDEXT=DDEXT.$(module_ext)
-@@ -14,17 +14,19 @@ QDMOD=qdmodule.$(module_ext)
- DDMOD=ddmodule.$(module_ext)
- endif
- 
--lib_LIBRARIES = libqdmod.a libqd_f_main.a
--libqdmod_a_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp
--libqd_f_main_a_SOURCES = main.cpp
--ddmod.o: ddext.o
--qdmod.o: ddmod.o qdext.o
--$(QDMOD): qdmod.o
--$(DDMOD): ddmod.o
--$(DDEXT): ddext.o
--$(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
-+$(QDMOD): qdmod.lo $(DDMOD)
-+$(DDMOD): ddmod.lo
-+$(DDEXT): ddext.lo
-+$(QDEXT): qdext.lo $(DDEXT) 
- 
--pkglib_DATA = $(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-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])
- AC_LANG_PUSH(C++)
--AC_COMPILE_IFELSE([
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <time.h>
- int main() {
-   struct timespec tv;
-   return clock_gettime(CLOCK_REALTIME, &tv);
- }
--], [ax_cxx_clock_gettime="yes"], [ax_cxx_clock_gettime="no"])
-+])], [ax_cxx_clock_gettime="yes"], [ax_cxx_clock_gettime="no"])
- AC_LANG_POP(C++)
- 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-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++)
- ax_cxx_copysign=
--AC_COMPILE_IFELSE([#include <cmath>
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                    int main() {
-                      std::copysign(1.0, 1.0);
-                      return 0;
--                   }], 
-+                   }])], 
-                    [AC_MSG_RESULT(std::copysign)
-                     ax_cxx_copysign="std::copysign(x, y)"])
- if test "x$ax_cxx_copysign" = "x"; then
--  AC_COMPILE_IFELSE([#include <cmath>
-+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                      int main() {
-                        ::copysign(1.0, 1.0);
-                        return 0;
--                     }], 
-+                     }])], 
-                      [AC_MSG_RESULT(::copysign)
-                       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-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)
-         # IBM VisualAge C++ __fmadd / __fmsub.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        #include <builtins.h>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          double x = __fmadd(1.0 + d, 1.0 - d, -1.0);
-                          double y = __fmsub(1.0 + d, 1.0 - d, 1.0);
-                          return (x == -d*d && y == -d*d) ? 0 : 1;
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="__fmadd(x,y,z)"
-                        ax_cxx_fms="__fmsub(x,y,z)"
-                        AC_DEFINE([QD_VACPP_BUILTINS_H], [1], 
-@@ -34,11 +34,11 @@
-       ;;
-       gnu)
-         # Later gcc (3.4 and later) have __builtin_fma that seems to work.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return (__builtin_fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="__builtin_fma(x,y,z)"
-                        ax_cxx_fms="__builtin_fma(x,y,-z)"])
-       ;;
-@@ -46,22 +46,22 @@
-         # Intel and HP compilers for IA 64 architecture seems to have 
-         # _Asm_fma/fms macros.  Not much documentation is available for 
-         # these...
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return (_Asm_fma(2, 1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="_Asm_fma(2, x,y,z)"
-                        ax_cxx_fms="_Asm_fms(2, x,y,z)"])
-       ;;
-       c99)
-         # Try C99 fma() function.  Some platforms doesn't seem to implement this
-         # correctly (Apple gcc-3.3 for example).
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return (fma(1.0 + d, 1.0 - d, -1.0) == -d*d ? 0 : 1);
--                       }], 
-+                       }])], 
-                       [ax_cxx_fma="fma(x,y,z)"
-                        ax_cxx_fms="fma(x,y,-z)"])
-       ;;
-@@ -69,11 +69,11 @@
-         # Try relying on the compiler to optimize x * y + z into an fma.
-         # This method is not recommended since if it is inlined it does not
-         # always produce the same correct code.
--        AC_RUN_IFELSE([#include <cmath>
-+        AC_RUN_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                        int main() {
-                          double d = std::ldexp(1.0, -52);
-                          return ( (1.0 + d) * (1.0 - d) - 1.0 == -d*d ? 0 : 1);
--                       }],
-+                       }])],
-                        [ax_cxx_fma="((x)*(y) + (z))"
-                         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-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++)
- ax_cxx_isfinite=
--AC_COMPILE_IFELSE([#include <cmath>
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                    int main() {
-                      std::isfinite(1.0);
-                      return 0;
--                   }], 
-+                   }])], 
-                    [AC_MSG_RESULT(std::isfinite)
-                     ax_cxx_isfinite="std::isfinite(x)"])
- if test "x$ax_cxx_isfinite" = "x"; then
--  AC_COMPILE_IFELSE([#include <cmath>
-+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                      int main() {
-                        ::isfinite(1.0);
-                        return 0;
--                     }], 
-+                     }])], 
-                      [AC_MSG_RESULT(::isfinite)
-                       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-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++)
- ax_cxx_isinf=
--AC_COMPILE_IFELSE([#include <cmath>
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                    int main() {
-                      std::isinf(1.0);
-                      return 0;
--                   }], 
-+                   }])], 
-                    [AC_MSG_RESULT(std::isinf)
-                     ax_cxx_isinf="std::isinf(x)"])
- if test "x$ax_cxx_isinf" = "x"; then
--  AC_COMPILE_IFELSE([#include <cmath>
-+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                      int main() {
-                        ::isinf(1.0);
-                        return 0;
--                     }], 
-+                     }])], 
-                      [AC_MSG_RESULT(::isinf)
-                       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-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++)
- ax_cxx_isnan=
--AC_COMPILE_IFELSE([#include <cmath>
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                    int main() {
-                      std::isnan(1.0);
-                      return 0;
--                   }], 
-+                   }])], 
-                    [AC_MSG_RESULT(std::isnan)
-                     ax_cxx_isnan="std::isnan(x)"])
- if test "x$ax_cxx_isnan" = "x"; then
--  AC_COMPILE_IFELSE([#include <cmath>
-+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include <cmath>
-                      int main() {
-                        ::isnan(1.0);
-                        return 0;
--                     }], 
-+                     }])], 
-                      [AC_MSG_RESULT(::isnan)
-                       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-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],[
- AC_CACHE_CHECK([fortran 90 modules inclusion flag],
--ax_f90_modflag,
-+ax_cv_f90_modflag,
- [AC_LANG_PUSH(Fortran)
- i=0
- while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
-@@ -24,24 +24,24 @@
- done
- mkdir tmpdir_$i
- cd tmpdir_$i
--AC_COMPILE_IFELSE([module conftest_module
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
-    contains
-    subroutine conftest_routine
-    write(*,'(a)') 'gotcha!'
-    end subroutine conftest_routine
-    end module conftest_module
--  ],[],[])
-+  ])],[],[])
- cd ..
- ax_f90_modflag="not found"
- for ax_flag in "-I " "-M" "-p"; do
-   if test "$ax_f90_modflag" = "not found" ; then
-     ax_save_FCFLAGS="$FCFLAGS"
-     FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i"
--    AC_COMPILE_IFELSE([program conftest_program
-+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([program conftest_program
-        use conftest_module
-        call conftest_routine
-        end program conftest_program
--      ],[ax_f90_modflag="$ax_flag"],[])
-+      ])],[ax_f90_modflag="$ax_flag"],[])
-     FCFLAGS="$ax_save_FCFLAGS"
-   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-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],[
- AC_CACHE_CHECK([fortran 90 modules naming style],
--ax_f90_module_style, 
-+ax_cv_f90_module_style, 
- [AC_LANG_PUSH(Fortran)
- i=0
- while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do
-@@ -29,13 +29,13 @@
- done
- mkdir tmpdir_$i
- cd tmpdir_$i
--AC_COMPILE_IFELSE([module conftest_module
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([module conftest_module
-    contains
-    subroutine conftest_routine
-    write(*,'(a)') 'gotcha!'
-    end subroutine conftest_routine
-    end module conftest_module
--  ],
-+  ])],
-   [ax_f90_modext=`ls | sed -n 's,conftest_module\.,,p'`
-    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-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_"
- for name in $ax_fc_etime_names; do
--  AC_LINK_IFELSE([AC_LANG_PROGRAM(, [[
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM(, [AC_LANG_SOURCE([
-       real*4 t(2), tot
--      tot = $name(t)]])], 
-+      tot = $name(t)])])],
-     [ax_fc_etime=$name], [])
-   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-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
- 
--docdir=${datadir}/doc/${PACKAGE}
- BUILT_SOURCES = docs/qd.pdf
- dist_doc_DATA = README docs/qd.pdf
- dist_noinst_DATA = docs/Makefile \
-@@ -24,7 +23,7 @@
- doc: docs/qd.pdf
- 
- docs/qd.pdf:
--	cd docs && $(MAKE) qd.pdf
-+	$(MAKE) -C docsqd.pdf
- 
- changelog:
- 	git log >ChangeLog
-@@ -33,12 +32,12 @@
- 	rm -f ${distdir}/ChangeLog && git log >${distdir}/ChangeLog
- 
- cpp-demo:
--	cd tests && make demo
-+	$(MAKE) -C tests demo
- 
- if HAVE_FORTRAN
- 
- fortran-demo:
--	cd fortran && make demo
-+	$(MAKE) -C fortran demo
- 
- demo: cpp-demo fortran-demo
- 
-@@ -52,7 +51,7 @@
- endif
- 
- time:
--	cd tests && make time
-+	$(MAKE) -C tests time
- 
- 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-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
- 
--lib_LIBRARIES = libqd.a
-+lib_LTLIBRARIES = libqd.la
- 
--libqd_a_SOURCES = $(SRC)
-+libqd_la_SOURCES = $(SRC)
- 
- 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-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
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/include -I$(top_srcdir)/include
- 
- TESTS = qd_test pslq_test c_test
-@@ -15,9 +15,9 @@
- 
- f_test_SOURCES = f_test.f
- f_test_LINK=$(CXXLINK)
--f_test_LDADD = $(top_builddir)/fortran/libqdmod.a \
--               $(top_builddir)/fortran/libqd_f_main.a \
--               $(LDADD) $(top_builddir)/src/libqd.a $(FCLIBS)
-+f_test_LDADD = $(top_builddir)/fortran/libqdmod.la \
-+               $(top_builddir)/fortran/libqd_f_main.la \
-+               $(LDADD) $(top_builddir)/src/libqd.la $(FCLIBS)
- endif
- 
- CLEANFILES=qd_timer quadt_test huge
diff --git a/sci-libs/qd/files/qd-2.3.7-test.patch b/sci-libs/qd/files/qd-2.3.7-test.patch
deleted file mode 100644
index 4dc1154b8277..000000000000
--- a/sci-libs/qd/files/qd-2.3.7-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: qd-2.3.7/tests/quadt_test.cpp
-===================================================================
---- qd-2.3.7.orig/tests/quadt_test.cpp
-+++ qd-2.3.7/tests/quadt_test.cpp
-@@ -11,6 +11,7 @@
-  * code (see quadt.h).
-  */
- 
-+#include <string.h>
- #include <cmath>
- #include <cstdlib>
- #include <cstdio>
diff --git a/sci-libs/qd/qd-2.3.11.ebuild b/sci-libs/qd/qd-2.3.11.ebuild
deleted file mode 100644
index 21182bd55158..000000000000
--- a/sci-libs/qd/qd-2.3.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.11.ebuild,v 1.3 2011/06/21 15:08:06 jlec Exp $
-
-EAPI=4
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran"
-
-DEPEND="
-	fortran? ( virtual/fortran )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.3.7-test.patch \
-		"${FILESDIR}"/${P}-configure-version.patch \
-		"${FILESDIR}"/${P}-docpath.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable fortran enable_fortran)
-}
-
-src_install() {
-	default
-	dosym /usr/include/qd/qd_real.h /usr/include/qd/qd.h
-	dosym /usr/include/qd/dd_real.h /usr/include/qd/dd.h
-}
diff --git a/sci-libs/qd/qd-2.3.12.ebuild b/sci-libs/qd/qd-2.3.12.ebuild
deleted file mode 100644
index 972be7d96fb5..000000000000
--- a/sci-libs/qd/qd-2.3.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.2 2012/06/25 16:53:25 jlec Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fortran static-libs"
-
-DEPEND="fortran? ( virtual/fortran )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-shared
-		$(use_enable fortran enable_fortran)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	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 e1089fc5e736..02f63992eda7 100644
--- a/sci-libs/qd/qd-2.3.13.ebuild
+++ b/sci-libs/qd/qd-2.3.13.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/06/25 16:53:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.13.ebuild,v 1.3 2012/08/03 16:43:50 bicatali Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran static-libs"
 
 DEPEND="fortran? ( virtual/fortran )"
@@ -28,10 +28,8 @@ PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
 
 src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--enable-shared
 		$(use_enable fortran enable_fortran)
-		)
+	)
 	autotools-utils_src_configure
 }
 
diff --git a/sci-libs/qd/qd-2.3.9.ebuild b/sci-libs/qd/qd-2.3.9.ebuild
deleted file mode 100644
index a8ec5a2d46f2..000000000000
--- a/sci-libs/qd/qd-2.3.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/qd/qd-2.3.9.ebuild,v 1.3 2011/06/21 15:08:06 jlec Exp $
-
-EAPI=2
-
-inherit eutils fortran-2
-
-DESCRIPTION="Quad-double and double-double float arithmetics"
-HOMEPAGE="http://crd.lbl.gov/~dhbailey/mpdist/"
-SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran"
-
-DEPEND="
-	fortran? ( virtual/fortran )
-	"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.3.7-test.patch
-}
-
-src_configure() {
-	econf $(use_enable fortran enable_fortran)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS NEWS TODO || die "dodoc failed"
-	cd "${D}"/usr/share/doc || die "cd failed"
-	mv ${PN}/${PN}.pdf ${PF}/ || die "mv failed"
-	rm -rf ${PN}/ || die "rm failed"
-}