Version bump. Patch applied upstream. Fix mathtool according to bug #446418 thanks to James Cloos

(Portage version: 2.2.01.21418-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 14 insertions, 110 deletions

diff --git a/sci-libs/arprec/ChangeLog b/sci-libs/arprec/ChangeLog
index 413e60d48a0a..d8519aad3922 100644
--- a/sci-libs/arprec/ChangeLog
+++ b/sci-libs/arprec/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2012/11/30 17:15:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/ChangeLog,v 1.16 2012/12/11 00:47:27 bicatali Exp $
+
+*arprec-2.2.16 (11 Dec 2012)
+
+  11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> +arprec-2.2.16.ebuild,
+  -arprec-2.2.13.ebuild, -arprec-2.2.15.ebuild,
+  -files/arprec-2.2.15-fix-enabling.patch:
+  Version bump. Patch applied upstream. Fix mathtool according to bug #446418
+  thanks to James Cloos
 
   30 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> arprec-2.2.15.ebuild:
   Build in source as easy fix for bug #445306
diff --git a/sci-libs/arprec/arprec-2.2.13.ebuild b/sci-libs/arprec/arprec-2.2.13.ebuild
deleted file mode 100644
index de41cc535f27..000000000000
--- a/sci-libs/arprec/arprec-2.2.13.ebuild
+++ /dev/null
@@ -1,49 +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.13.ebuild,v 1.4 2012/10/18 21:12:44 jlec Exp $
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2
-
-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 ~amd64-linux ~x86-linux"
-IUSE="doc fortran qd static-libs"
-
-DEPEND="qd? ( sci-libs/qd[fortran=] )"
-RDEPEND="${DEPEND}"
-
-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.15.ebuild b/sci-libs/arprec/arprec-2.2.16.ebuild
index b8e8d17080ac..533e5351163c 100644
--- a/sci-libs/arprec/arprec-2.2.15.ebuild
+++ b/sci-libs/arprec/arprec-2.2.16.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.15.ebuild,v 1.2 2012/11/30 17:15:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/arprec/arprec-2.2.16.ebuild,v 1.1 2012/12/11 00:47:27 bicatali Exp $
 
 EAPI=4
 
@@ -22,8 +22,6 @@ IUSE="doc fma fortran qd static-libs"
 DEPEND="qd? ( sci-libs/qd[fortran=] )"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-fix-enabling.patch )
-
 src_configure() {
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
@@ -45,9 +43,12 @@ src_install() {
 		cd toolkit
 		./mathinit || die "mathinit failed"
 		exeinto /usr/libexec/${PN}
-		doexe mathtool
+		doexe .libs/mathtool
 		insinto /usr/libexec/${PN}
 		doins *.dat
+		echo > mathtool.exe "#!${EROOT}/bin/sh"
+		echo >> mathtool.exe "cd ${EROOT}/usr/libexec/arprec && exec ./mathtool"
+		newbin mathtool.exe mathtool
 		newdoc README README.mathtool
 	fi
 	use doc || rm "${ED}"/usr/share/doc/${PF}/*.pdf
diff --git a/sci-libs/arprec/files/arprec-2.2.15-fix-enabling.patch b/sci-libs/arprec/files/arprec-2.2.15-fix-enabling.patch
deleted file mode 100644
index e836dd6add71..000000000000
--- a/sci-libs/arprec/files/arprec-2.2.15-fix-enabling.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- configure.ac.orig	2012-11-29 19:50:09.547028887 -0800
-+++ configure.ac	2012-11-29 19:52:14.380660761 -0800
-@@ -36,7 +36,7 @@
- 
- # Checks for command-line options
- # --enable-inline option.
--AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
-+AC_ARG_ENABLE(inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions.  [[default=yes]]]))
- AC_MSG_CHECKING([if commonly used function is to be inlined])
- if test "x$enable_inline" != "xno"; then
-   enable_inline="yes"
-@@ -45,7 +45,7 @@
- AC_MSG_RESULT($enable_inline)
- 
- # --enable-debug
--AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
-+AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]]))
- AC_MSG_CHECKING([if debugging code is to be enabled])
- if test "x$enable_debug" = "xyes"; then
-   AC_DEFINE([ARPREC_DEBUG], [1], [Define to 1 to enable debugging code.])
-@@ -55,7 +55,7 @@
- AC_MSG_RESULT($enable_debug)
- 
- # --enable-always-fix-fpu
--AC_ARG_ENABLE(enable_always_fix_fpu, AC_HELP_STRING(--enable-always-fix-fpu, [Use FPU fix whenever C interface is called.  [[default=no]]]))
-+AC_ARG_ENABLE(always_fix_fpu, AC_HELP_STRING(--enable-always-fix-fpu, [Use FPU fix whenever C interface is called.  [[default=no]]]))
- if test "x$enable_always_fix_fpu" = "xyes"; then
-   AC_DEFINE([ALWAYS_FIX_FPU], [1], [Define to 1 to use FPU fix whenever C interface is called.])
- else
-@@ -119,7 +119,7 @@
- fi
- 
- # --enable-qd
--AC_ARG_ENABLE(enable-qd, AC_HELP_STRING(--enable-qd, [Use quad-double (QD)
-+AC_ARG_ENABLE(qd, AC_HELP_STRING(--enable-qd, [Use quad-double (QD)
- library. [[default=no]]]))
- if test "x$enable_qd" = "xyes"; then
-   AC_CHECK_QD([2.3], [CXXFLAGS="$CXXFLAGS $QD_CXXFLAGS"])
-@@ -129,7 +129,7 @@
- fi
- 
- # --enable-fma
--AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
-+AC_ARG_ENABLE(fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,c99,ibm,compiler).  Use this option with care.  [[default=auto]]]))
- if test "x$enable_fma" = "x"; then
-   enable_fma="auto"
- fi
-@@ -175,7 +175,7 @@
-     FCFLAGS="-O2"
-   fi
- fi
--AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran interfaces [[default=auto]]]))
-+AC_ARG_ENABLE(fortran, AC_HELP_STRING(--enable-fortran, [build Fortran interfaces [[default=auto]]]))
- if test "x$enable_fortran" != "xno"; then
-   AC_LANG_PUSH(Fortran)
-   AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90])