Add patch from upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 192 insertions, 2 deletions

diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index 1f02a34f747d..957f27e9a6c6 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.94 2009/02/27 14:46:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.95 2009/03/03 00:26:33 vapier Exp $
+
+*mpfr-2.4.1_p1 (03 Mar 2009)
+
+  03 Mar 2009; Mike Frysinger <vapier@gentoo.org> +files/2.4.1/patch01,
+  +mpfr-2.4.1_p1.ebuild:
+  Add patch from upstream.
 
   27 Feb 2009; Brent Baude <ranger@gentoo.org> mpfr-2.3.2.ebuild:
   stable ppc64, bug 255195
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 29e75b1fa2b7..8442fab10fab 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/patch01 8409 RMD160 ab6214e9177740552b5dfb543c5202b6d7c298da SHA1 3fe727c465ea76e2a2fc81ad470872d4c466343c SHA256 452e7bec28f702f0220f2d4445760e21bba8e5922788979a7ed3bc3c51129cdb
 AUX 2.3.2/mpfr-2.3.2-svn5664.patch 4568 RMD160 ee6bd77f9364ee65ee94063904f05a0560d7fbc3 SHA1 aad3852b7aa358b31b8ca236f49bb9145977b62e SHA256 67e524431789012e5dd607a028154fb01d1fbc769a04d5d25875723a9e3157a5
 AUX 2.3.2/mpfr-2.3.2-svn5752.patch 16389 RMD160 a7a84d0f71855721d3075050da93e585c680b83d SHA1 3706623b2bb0b95b888de0ca51ae2df25bc39ba0 SHA256 a94f42c67133a74ac65d8ada5766f1720e39b0313c0ec4d6ed0bf315c3d39f96
 AUX 2.4.0/patch01 11176 RMD160 ecc7c71253f4fef987b4567bc46829dd8c6ffa35 SHA1 7e3c49e2afe59d75274cedbd688de744f93b595e SHA256 52eb42b513ecab574d9d14ed2d63e019942e62b9ea5f8d31cdd92aa5ac8583bd
+AUX 2.4.1/patch01 3512 RMD160 a68a65e3ba90fabb8d634d69b172a32162488661 SHA1 82eb4c34685b6d655d33e0dfcea003248a8967d9 SHA256 6abd8c5abac124041fc0508fbcfdb04f564d0f78118235d70edd81daa3b6169d
 DIST mpfr-2.3.2.tar.lzma 816537 RMD160 eff9b819dee971cd907dde461cd525c473516e29 SHA1 1c48c7a545b571e54ea2418bd1eae8b5e3bfe753 SHA256 d8285d3f7fc824eb1fe86ebeb5b8e5064265be8e7439d5aec49bafcb53d710be
 DIST mpfr-2.4.0.tar.lzma 903115 RMD160 a9db0f2b2dcd9b6a855f2e5f7a794a152dc48f43 SHA1 345ac4edfb324e7c4ea944540007996a78788c1e SHA256 98a690bc941cfc7a741ae69e659438f8af171cb0d4dcb1e0c54d13e32ada62df
 DIST mpfr-2.4.1.tar.lzma 903875 RMD160 e848db799fc3b6a4681de3b38df8809c2369f266 SHA1 6145947361fac880b87976e21e28fab12ccf4881 SHA256 95e507b26bac3b64215bc3cf1463525781582d40358b09becdb24d058b31def8
@@ -10,5 +14,13 @@ EBUILD mpfr-2.3.2.ebuild 1405 RMD160 52cad473b496c4353981514da22253ca202c59e5 SH
 EBUILD mpfr-2.4.0.ebuild 1482 RMD160 f300833add9b9befe8c651f6ce11d9570ca9f5f7 SHA1 9291f0ef4963d92fe8ab4b090a9a48bbb6de396b SHA256 37fe8ba2cd6cc7aca3b6759f3f7cbf69353e14a9ddb2c9a2144d877122b801cc
 EBUILD mpfr-2.4.0_p1.ebuild 1485 RMD160 5ef0789aad172a3304812fd8e869e929febc584f SHA1 f74e990665773829a7911264568f2d26777593a2 SHA256 802a29adbf34c7c235d5895741160bf477538b2936515130246566947dbbf31f
 EBUILD mpfr-2.4.1.ebuild 1482 RMD160 8587384fa46c3487e8300b3c1d4a25fc5ee7a2c9 SHA1 b847158d8d6c82caa3887c8b8ddcf27eaffb2b44 SHA256 d7d2628085612b1be45594c7d2eb67d61c36ab0e70e16be38e4c5b63ff053324
-MISC ChangeLog 11432 RMD160 a74aaa27cbd64ad3d8521bf45879bf57f9bfcf38 SHA1 0f56ec20af20cac0322c46e102cd2f952d76b3a9 SHA256 feac8c5c0f16479aeec6a678343fb57b5b9362251386386231478abf9cf98d78
+EBUILD mpfr-2.4.1_p1.ebuild 1485 RMD160 807f58a8e6aef1050bc3b8441dc263e4bcf169ad SHA1 6d97f4a97980daec2878fe4585deb171033d1897 SHA256 27562ff1577c805170fb02df68f247bbe184fe9ca77714f1032af054ad12cc05
+MISC ChangeLog 11587 RMD160 d729f9054ebc9d3f69a1c2f9175a7b5dc410c8fa SHA1 501d077e6430ffa7739ad45c05807d25bed53a2b SHA256 55eb0f296762d9a05934e831a4922899cb52252cc584a92e038c2410b44da993
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmseT4ACgkQn/5bYzqsSmGGhQCfXG65m4djEL0hz+6xngzp7Qwd
+eVYAoIzJF7AFFKWDv162nHbwksSozG+O
+=j8oQ
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/mpfr/files/2.4.1/patch01 b/dev-libs/mpfr/files/2.4.1/patch01
new file mode 100644
index 000000000000..ae927889388f
--- /dev/null
+++ b/dev-libs/mpfr/files/2.4.1/patch01
@@ -0,0 +1,123 @@
+diff -Naurd mpfr-2.4.1-a/PATCHES mpfr-2.4.1-b/PATCHES
+--- mpfr-2.4.1-a/PATCHES	2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/PATCHES	2009-02-27 16:56:29.000000000 +0000
+@@ -0,0 +1 @@
++remainder-neg
+diff -Naurd mpfr-2.4.1-a/VERSION mpfr-2.4.1-b/VERSION
+--- mpfr-2.4.1-a/VERSION	2009-02-25 16:16:08.000000000 +0000
++++ mpfr-2.4.1-b/VERSION	2009-02-27 16:55:37.000000000 +0000
+@@ -1 +1 @@
+-2.4.1
++2.4.1-p1
+diff -Naurd mpfr-2.4.1-a/mpfr.h mpfr-2.4.1-b/mpfr.h
+--- mpfr-2.4.1-a/mpfr.h	2009-02-25 16:16:08.000000000 +0000
++++ mpfr-2.4.1-b/mpfr.h	2009-02-27 16:55:38.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 2
+ #define MPFR_VERSION_MINOR 4
+ #define MPFR_VERSION_PATCHLEVEL 1
+-#define MPFR_VERSION_STRING "2.4.1"
++#define MPFR_VERSION_STRING "2.4.1-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-2.4.1-a/rem1.c mpfr-2.4.1-b/rem1.c
+--- mpfr-2.4.1-a/rem1.c	2009-02-20 09:43:17.000000000 +0000
++++ mpfr-2.4.1-b/rem1.c	2009-02-27 16:55:15.000000000 +0000
+@@ -170,7 +170,12 @@
+     }
+ 
+   if (mpz_cmp_ui (r, 0) == 0)
+-    inex = mpfr_set_ui (rem, 0, GMP_RNDN);
++    {
++      inex = mpfr_set_ui (rem, 0, GMP_RNDN);
++      /* take into account sign of x */
++      if (signx < 0)
++        mpfr_neg (rem, rem, GMP_RNDN);
++    }
+   else
+     {
+       if (rnd_q == GMP_RNDN)
+@@ -190,6 +195,9 @@
+                 *quo += 1;
+             }
+         }
++      /* take into account sign of x */
++      if (signx < 0)
++        mpz_neg (r, r);
+       inex = mpfr_set_z (rem, r, rnd);
+       /* if ex > ey, rem should be multiplied by 2^ey, else by 2^ex */
+       MPFR_EXP (rem) += (ex > ey) ? ey : ex;
+@@ -198,13 +206,6 @@
+   if (quo)
+     *quo *= sign;
+ 
+-  /* take into account sign of x */
+-  if (signx < 0)
+-    {
+-      mpfr_neg (rem, rem, GMP_RNDN);
+-      inex = -inex;
+-    }
+-
+   mpz_clear (mx);
+   mpz_clear (my);
+   mpz_clear (r);
+diff -Naurd mpfr-2.4.1-a/tests/tremquo.c mpfr-2.4.1-b/tests/tremquo.c
+--- mpfr-2.4.1-a/tests/tremquo.c	2009-02-20 09:43:15.000000000 +0000
++++ mpfr-2.4.1-b/tests/tremquo.c	2009-02-27 16:55:15.000000000 +0000
+@@ -25,6 +25,36 @@
+ 
+ #include "mpfr-test.h"
+ 
++static void
++bug20090227 (void)
++{
++  mpfr_t x, y, r1, r2;
++  int inex1, inex2;
++
++  mpfr_init2 (x, 118);
++  mpfr_init2 (y, 181);
++  mpfr_init2 (r1, 140);
++  mpfr_init2 (r2, 140);
++  mpfr_set_si (x, -1, GMP_RNDN);
++  mpfr_set_str_binary (y, "1.100100100001111110110101010001000100001011010001100001000110100110001001100011001100010100010111000000011011100000111001101000100101001000000100100111000001000100010100110011111010");
++  inex1 = mpfr_remainder (r1, x, y, GMP_RNDU);
++  /* since the quotient is -1, r1 is the rounding of x+y */
++  inex2 = mpfr_add (r2, x, y, GMP_RNDU);
++  if (mpfr_cmp (r1, r2))
++    {
++      printf ("Error in mpfr_remainder (bug20090227)\n");
++      printf ("Expected ");
++      mpfr_dump (r2);
++      printf ("Got      ");
++      mpfr_dump (r1);
++      exit (1);
++    }
++  mpfr_clear (x);
++  mpfr_clear (y);
++  mpfr_clear (r1);
++  mpfr_clear (r2);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -50,6 +80,8 @@
+ 
+   tests_start_mpfr ();
+ 
++  bug20090227 ();
++
+   mpfr_init (x);
+   mpfr_init (y);
+   mpfr_init (r);
+diff -Naurd mpfr-2.4.1-a/version.c mpfr-2.4.1-b/version.c
+--- mpfr-2.4.1-a/version.c	2009-02-25 16:16:08.000000000 +0000
++++ mpfr-2.4.1-b/version.c	2009-02-27 16:55:38.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "2.4.1";
++  return "2.4.1-p1";
+ }
diff --git a/dev-libs/mpfr/mpfr-2.4.1_p1.ebuild b/dev-libs/mpfr/mpfr-2.4.1_p1.ebuild
new file mode 100644
index 000000000000..4051136c9b84
--- /dev/null
+++ b/dev-libs/mpfr/mpfr-2.4.1_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.1_p1.ebuild,v 1.1 2009/03/03 00:26:33 vapier Exp $
+
+# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
+inherit eutils
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
+HOMEPAGE="http://www.mpfr.org/"
+SRC_URI="http://www.mpfr.org/mpfr-current/${MY_P}.tar.lzma"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/gmp-4.1.4-r2"
+DEPEND="${RDEPEND}
+	app-arch/lzma-utils"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -d ${FILESDIR}/${PV} ]] && epatch "${FILESDIR}"/${PV}/*.patch
+	[[ ${PLEVEL} == ${PV} ]] && return 0
+	for ((i=1; i<=PLEVEL; ++i)) ; do
+		patch=patch$(printf '%02d' ${i})
+		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
+			epatch "${FILESDIR}"/${MY_PV}/${patch}
+		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
+			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
+		else
+			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
+			die "patch ${i} missing - please report to bugs.gentoo.org"
+		fi
+	done
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+	dohtml *.html
+}