summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-01-08 14:10:49 +0000
committerMike Frysinger <vapier@gentoo.org>2010-01-08 14:10:49 +0000
commit7ca296941d15d7e21c9095003b33c5c00461665e (patch)
tree872d0774b61bb02fe040eabca10af701bd1cc141 /dev-libs/gmp
parentversion bump (diff)
downloadhistorical-7ca296941d15d7e21c9095003b33c5c00461665e.tar.gz
historical-7ca296941d15d7e21c9095003b33c5c00461665e.tar.bz2
historical-7ca296941d15d7e21c9095003b33c5c00461665e.zip
old
Diffstat (limited to 'dev-libs/gmp')
-rw-r--r--dev-libs/gmp/files/4.2.4/mpf_eq.diff308
-rw-r--r--dev-libs/gmp/files/4.2.4/mpf_set_str.c.4.diff32
-rw-r--r--dev-libs/gmp/files/4.2.4/perfpow.c.diff169
-rw-r--r--dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch262
-rw-r--r--dev-libs/gmp/gmp-4.2.4.ebuild76
-rw-r--r--dev-libs/gmp/gmp-4.3.0.ebuild76
6 files changed, 0 insertions, 923 deletions
diff --git a/dev-libs/gmp/files/4.2.4/mpf_eq.diff b/dev-libs/gmp/files/4.2.4/mpf_eq.diff
deleted file mode 100644
index 5510cb852685..000000000000
--- a/dev-libs/gmp/files/4.2.4/mpf_eq.diff
+++ /dev/null
@@ -1,308 +0,0 @@
-Index: doc/gmp.texi
-===================================================================
-RCS file: /home/cvsfiles/gmp42/doc/gmp.texi,v
-retrieving revision 1.25
-retrieving revision 1.28
-diff -p -2 -r1.25 -r1.28
-*** doc/gmp.texi 18 Sep 2008 15:36:28 -0000 1.25
---- doc/gmp.texi 8 Nov 2008 23:38:20 -0000 1.28
-*************** equal, zero otherwise. I.e., test if @v
-*** 4850,4856 ****
- equal.
-
-! Caution: Currently only whole limbs are compared, and only in an exact
-! fashion. In the future values like 1000 and 0111 may be considered the same
-! to 3 bits (on the basis that their difference is that small).
- @end deftypefun
-
---- 4850,4859 ----
- equal.
-
-! Caution 1: All version of GMP up to version 4.2.4 compared just whole limbs,
-! meaning sometimes more than @var{op3} bits, sometimes fewer.
-!
-! Caution 2: This function will consider XXX11...111 and XX100...000 different,
-! even if ... is replaced by a semi-infinite number of bits. Such numbers are
-! really just one ulp off, and should be considered equal.
- @end deftypefun
-
-Index: mpf/eq.c
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpf/eq.c,v
-retrieving revision 1.2
-retrieving revision 1.5
-diff -p -2 -r1.2 -r1.5
-*** mpf/eq.c 30 Aug 2007 18:19:40 -0000 1.2
---- mpf/eq.c 8 Nov 2008 23:31:18 -0000 1.5
-***************
-*** 1,5 ****
- /* mpf_eq -- Compare two floats up to a specified bit #.
-
-! Copyright 1993, 1995, 1996, 2001, 2002 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
---- 1,5 ----
- /* mpf_eq -- Compare two floats up to a specified bit #.
-
-! Copyright 1993, 1995, 1996, 2001, 2002, 2008 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
-*************** along with the GNU MP Library. If not,
-*** 20,23 ****
---- 20,24 ----
- #include "gmp.h"
- #include "gmp-impl.h"
-+ #include "longlong.h"
-
- int
-*************** mpf_eq (mpf_srcptr u, mpf_srcptr v, unsi
-*** 27,30 ****
---- 28,33 ----
- mp_size_t usize, vsize, size, i;
- mp_exp_t uexp, vexp;
-+ mp_limb_t diff;
-+ int cnt;
-
- uexp = u->_mp_exp;
-*************** mpf_eq (mpf_srcptr u, mpf_srcptr v, unsi
-*** 54,61 ****
-
- /* 2. Are the exponents different? */
-! if (uexp > vexp)
-! return 0; /* ??? handle (uexp = vexp + 1) */
-! if (vexp > uexp)
-! return 0; /* ??? handle (vexp = uexp + 1) */
-
- usize = ABS (usize);
---- 57,62 ----
-
- /* 2. Are the exponents different? */
-! if (uexp != vexp)
-! return 0;
-
- usize = ABS (usize);
-*************** mpf_eq (mpf_srcptr u, mpf_srcptr v, unsi
-*** 94,104 ****
- }
-
-! if (size > (n_bits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS)
-! size = (n_bits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-
-! up += usize - size;
-! vp += vsize - size;
-
-! for (i = size - 1; i >= 0; i--)
- {
- if (up[i] != vp[i])
---- 95,113 ----
- }
-
-! up += usize; /* point just above most significant limb */
-! vp += vsize; /* point just above most significant limb */
-
-! count_leading_zeros (cnt, up[-1]);
-! if ((vp[-1] >> (GMP_LIMB_BITS - 1 - cnt)) != 1)
-! return 0; /* msb positions different */
-
-! n_bits += cnt - GMP_NAIL_BITS;
-!
-! size = MIN (size, (n_bits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS);
-!
-! up -= size; /* point at least significant relevant limb */
-! vp -= size; /* point at least significant relevant limb */
-!
-! for (i = size - 1; i > 0; i--)
- {
- if (up[i] != vp[i])
-*************** mpf_eq (mpf_srcptr u, mpf_srcptr v, unsi
-*** 106,109 ****
- }
-
-! return 1;
- }
---- 115,119 ----
- }
-
-! diff = (up[0] ^ vp[0]) >> GMP_NUMB_BITS - 1 - (n_bits - 1) % GMP_NUMB_BITS;
-! return diff == 0;
- }
-Index: tests/cxx/t-prec.cc
-===================================================================
-RCS file: /home/cvsfiles/gmp42/tests/cxx/t-prec.cc,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -p -2 -r1.4 -r1.5
-*** tests/cxx/t-prec.cc 30 Aug 2007 23:14:40 -0000 1.4
---- tests/cxx/t-prec.cc 8 Nov 2008 23:33:02 -0000 1.5
-***************
-*** 1,5 ****
- /* Test precision of mpf_class expressions.
-
-! Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
---- 1,5 ----
- /* Test precision of mpf_class expressions.
-
-! Copyright 2001, 2002, 2003, 2008 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
-*************** check_mpf (void)
-*** 62,66 ****
- ASSERT_ALWAYS_PREC
- (g, "0.11111 11111 11111 11111 11111 11111 11111 11111 11111 11111"
-! " 11111 11111 11111 11111 11111 11", very_large_prec);
- }
- {
---- 62,66 ----
- ASSERT_ALWAYS_PREC
- (g, "0.11111 11111 11111 11111 11111 11111 11111 11111 11111 11111"
-! " 11111 11111 11111 11111 11111 111", very_large_prec);
- }
- {
-*************** check_mpf (void)
-*** 70,74 ****
- ASSERT_ALWAYS_PREC
- (g, "0.06666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 66666 66666 67", very_large_prec);
- }
-
---- 70,74 ----
- ASSERT_ALWAYS_PREC
- (g, "0.06666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 66666 66666 667", very_large_prec);
- }
-
-*************** check_mpf (void)
-*** 95,99 ****
- ASSERT_ALWAYS_PREC
- (i, "15.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 33333 33333 333", very_large_prec);
- }
- {
---- 95,99 ----
- ASSERT_ALWAYS_PREC
- (i, "15.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 33333 33333 33333 33333 3", very_large_prec);
- }
- {
-*************** check_mpf (void)
-*** 102,106 ****
- ASSERT_ALWAYS_PREC
- (g, "-1.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 33333 33333 333", very_large_prec);
- }
- {
---- 102,106 ----
- ASSERT_ALWAYS_PREC
- (g, "-1.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 33333 33333 33333 33333 33", very_large_prec);
- }
- {
-*************** check_mpf (void)
-*** 118,122 ****
- ASSERT_ALWAYS_PREC
- (g, "1.66666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 667", very_large_prec);
- }
-
---- 118,122 ----
- ASSERT_ALWAYS_PREC
- (g, "1.66666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 66666 66666 67", very_large_prec);
- }
-
-*************** check_mpf (void)
-*** 143,147 ****
- g = mpf_class(1 / f);
- ASSERT_ALWAYS_PREC
-! (g, "0.11111 11111 11111 11111 11111 11111 11111 111", medium_prec);
- }
- {
---- 143,147 ----
- g = mpf_class(1 / f);
- ASSERT_ALWAYS_PREC
-! (g, "0.11111 11111 11111 11111 11111 11111 11111 1111", medium_prec);
- }
- {
-*************** check_mpf (void)
-*** 151,155 ****
- ASSERT_ALWAYS_PREC
- (g, "0.06666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 667", large_prec);
- }
-
---- 151,155 ----
- ASSERT_ALWAYS_PREC
- (g, "0.06666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 6667", large_prec);
- }
-
-*************** check_mpf (void)
-*** 159,163 ****
- h = mpf_class(f / g + 1, large_prec);
- ASSERT_ALWAYS_PREC
-! (h, "1.33333 33333 33333 33333 33333 33333 33333 33333 33333 3333",
- large_prec);
- }
---- 159,164 ----
- h = mpf_class(f / g + 1, large_prec);
- ASSERT_ALWAYS_PREC
-! (h, "1.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 333",
- large_prec);
- }
-*************** check_mpf (void)
-*** 171,175 ****
- ASSERT_ALWAYS_PREC
- (g, "2.66666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 667", very_large_prec);
- }
-
---- 172,176 ----
- ASSERT_ALWAYS_PREC
- (g, "2.66666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 66666 66666 66666 66666 67", very_large_prec);
- }
-
-*************** check_mpf (void)
-*** 180,184 ****
- g = mpf_class(f - q, large_prec);
- ASSERT_ALWAYS_PREC
-! (g, "2.66666 66666 66666 66666 66666 66666 66666 66666 66666 6667",
- large_prec);
- }
---- 181,186 ----
- g = mpf_class(f - q, large_prec);
- ASSERT_ALWAYS_PREC
-! (g, "2.66666 66666 66666 66666 66666 66666 66666 66666 66666 66666"
-! " 66666 667",
- large_prec);
- }
-*************** check_mpf (void)
-*** 189,193 ****
- g = mpf_class(f - q);
- ASSERT_ALWAYS_PREC
-! (g, "2.66666 66666 66666 66666 66666 6667", medium_prec);
- }
- {
---- 191,195 ----
- g = mpf_class(f - q);
- ASSERT_ALWAYS_PREC
-! (g, "2.66666 66666 66666 66666 66666 66666 66666 667", medium_prec);
- }
- {
-*************** check_mpf (void)
-*** 197,201 ****
- g = mpf_class(f + q);
- ASSERT_ALWAYS_PREC
-! (g, "15.33333 33333 33333 33333 33333 33333 33333 33333 33333 3333",
- large_prec);
- }
---- 199,204 ----
- g = mpf_class(f + q);
- ASSERT_ALWAYS_PREC
-! (g, "15.33333 33333 33333 33333 33333 33333 33333 33333 33333 33333"
-! " 33333 33",
- large_prec);
- }
diff --git a/dev-libs/gmp/files/4.2.4/mpf_set_str.c.4.diff b/dev-libs/gmp/files/4.2.4/mpf_set_str.c.4.diff
deleted file mode 100644
index 287ee585b281..000000000000
--- a/dev-libs/gmp/files/4.2.4/mpf_set_str.c.4.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: mpf/set_str.c
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpf/set_str.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -p -2 -r1.6 -r1.7
-*** mpf/set_str.c 25 Aug 2008 14:13:11 -0000 1.6
---- mpf/set_str.c 9 Nov 2008 00:28:18 -0000 1.7
-*************** mpf_set_str (mpf_ptr x, const char *str,
-*** 138,142 ****
---- 138,147 ----
- }
-
-+ /* Default base to decimal. */
-+ if (base == 0)
-+ base = 10;
-+
- exp_base = base;
-+
- if (base < 0)
- {
-*************** mpf_set_str (mpf_ptr x, const char *str,
-*** 166,173 ****
- }
-
-- /* Default base to decimal. */
-- if (base == 0)
-- base = 10;
--
- /* Locate exponent part of the input. Look from the right of the string,
- since the exponent is usually a lot shorter than the mantissa. */
---- 171,174 ----
diff --git a/dev-libs/gmp/files/4.2.4/perfpow.c.diff b/dev-libs/gmp/files/4.2.4/perfpow.c.diff
deleted file mode 100644
index 4c55678147a8..000000000000
--- a/dev-libs/gmp/files/4.2.4/perfpow.c.diff
+++ /dev/null
@@ -1,169 +0,0 @@
-Copyright 1998, 1999, 2000, 2001, 2005, 2008 Free Software Foundation, Inc.
-
-This file is part of the GNU MP Library.
-
-The GNU MP Library is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-The GNU MP Library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with the GNU MP Library. If not, see http://www.gnu.org/licenses/.
-
-Index: mpz/perfpow.c
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpz/perfpow.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -p -2 -r1.2 -r1.3
-*** mpz/perfpow.c 30 Aug 2007 18:19:44 -0000 1.2
---- mpz/perfpow.c 26 Dec 2008 19:46:24 -0000 1.3
-***************
-*** 2,6 ****
- zero otherwise.
-
-! Copyright 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
---- 2,6 ----
- zero otherwise.
-
-! Copyright 1998, 1999, 2000, 2001, 2005, 2008 Free Software Foundation, Inc.
-
- This file is part of the GNU MP Library.
-*************** static const unsigned short primes[] =
-*** 60,63 ****
---- 60,65 ----
-
-
-+ #define POW2P(a) (((a) & ((a) - 1)) == 0)
-+
- int
- mpz_perfect_power_p (mpz_srcptr u)
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 73,78 ****
- TMP_DECL;
-
-! if (usize == 0)
-! return 1; /* consider 0 a perfect power */
-
- n2 = mpz_scan1 (u, 0);
---- 75,80 ----
- TMP_DECL;
-
-! if (mpz_cmpabs_ui (u, 1) <= 0)
-! return 1; /* -1, 0, and +1 are perfect powers */
-
- n2 = mpz_scan1 (u, 0);
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 80,86 ****
- return 0; /* 2 divides exactly once. */
-
-- if (n2 != 0 && (n2 & 1) == 0 && usize < 0)
-- return 0; /* 2 has even multiplicity with negative U */
--
- TMP_MARK;
-
---- 82,85 ----
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 90,93 ****
---- 89,100 ----
-
- mpz_tdiv_q_2exp (u2, u, n2);
-+ mpz_abs (u2, u2);
-+
-+ if (mpz_cmp_ui (u2, 1) == 0)
-+ {
-+ TMP_FREE;
-+ /* factoring completed; consistent power */
-+ return ! (usize < 0 && POW2P(n2));
-+ }
-
- if (isprime (n2))
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 98,101 ****
---- 105,111 ----
- prime = primes[i];
-
-+ if (mpz_cmp_ui (u2, prime) < 0)
-+ break;
-+
- if (mpz_divisible_ui_p (u2, prime)) /* divisible by this prime? */
- {
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 116,125 ****
- }
-
-- if ((n & 1) == 0 && usize < 0)
-- {
-- TMP_FREE;
-- return 0; /* even multiplicity with negative U, reject */
-- }
--
- n2 = gcd (n2, n);
- if (n2 == 1)
---- 126,129 ----
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 129,136 ****
- }
-
-! if (mpz_cmpabs_ui (u2, 1) == 0)
- {
- TMP_FREE;
-! return 1; /* factoring completed; consistent power */
- }
-
---- 133,141 ----
- }
-
-! if (mpz_cmp_ui (u2, 1) == 0)
- {
- TMP_FREE;
-! /* factoring completed; consistent power */
-! return ! (usize < 0 && POW2P(n2));
- }
-
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 170,173 ****
---- 175,182 ----
- {
- unsigned long int nth;
-+
-+ if (usize < 0 && POW2P(n2))
-+ return 0;
-+
- /* We found some factors above. We just need to consider values of n
- that divides n2. */
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 185,190 ****
- if (exact)
- {
-! TMP_FREE;
-! return 1;
- }
- if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
---- 194,202 ----
- if (exact)
- {
-! if (! (usize < 0 && POW2P(nth)))
-! {
-! TMP_FREE;
-! return 1;
-! }
- }
- if (mpz_cmp_ui (q, SMALLEST_OMITTED_PRIME) < 0)
-*************** mpz_perfect_power_p (mpz_srcptr u)
-*** 200,203 ****
---- 212,218 ----
-
- n2prime:
-+ if (usize < 0 && POW2P(n2))
-+ return 0;
-+
- exact = mpz_root (NULL, u2, n2);
- TMP_FREE;
diff --git a/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch
deleted file mode 100644
index 312a1a39950e..000000000000
--- a/dev-libs/gmp/files/gmp-4.2.3-ABI-multilib.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-Gentoo uses ABI env var already
-
---- gmp-4.2.3/configure
-+++ gmp-4.2.3/configure
-@@ -489,7 +489,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS GMPABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR ASMFLAGS AR ac_ct_AR LIBGMP_DLL SED LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS LTLIBOBJS'
- ac_subst_files=''
-
- # Initialize some variables set by options.
-@@ -930,10 +930,10 @@
- ac_env_target_alias_value=$target_alias
- ac_cv_env_target_alias_set=${target_alias+set}
- ac_cv_env_target_alias_value=$target_alias
--ac_env_ABI_set=${ABI+set}
--ac_env_ABI_value=$ABI
--ac_cv_env_ABI_set=${ABI+set}
--ac_cv_env_ABI_value=$ABI
-+ac_env_GMPABI_set=${GMPABI+set}
-+ac_env_GMPABI_value=$GMPABI
-+ac_cv_env_GMPABI_set=${GMPABI+set}
-+ac_cv_env_GMPABI_value=$GMPABI
- ac_env_CC_set=${CC+set}
- ac_env_CC_value=$CC
- ac_cv_env_CC_set=${CC+set}
-@@ -1091,7 +1091,7 @@
- include additional configurations [automatic]
-
- Some influential environment variables:
-- ABI desired ABI (for processors supporting more than one ABI)
-+ GMPABI desired ABI (for processors supporting more than one ABI)
- CC C compiler command
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
-@@ -2670,7 +2670,7 @@
- # (64-bit), but not both, so there's no option to choose the desired
- # mode, we must instead detect which of the two it is. This is done by
- # checking sizeof(long), either 4 or 8 bytes respectively. Do this in
-- # ABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
-+ # GMPABI=1.0 too, in case someone tries to build that with a 2.0w gcc.
- #
- gcc_cflags="-O2"
- gcc_cflags_optlist="arch"
-@@ -2694,11 +2694,11 @@
- # gcc 2.7.2.3 knows -mpa-risc-1-0 and -mpa-risc-1-1
- # gcc 2.95 adds -mpa-risc-2-0, plus synonyms -march=1.0, 1.1 and 2.0
- #
-- # We don't use -mpa-risc-2-0 in ABI=1.0 because 64-bit registers may not
-+ # We don't use -mpa-risc-2-0 in GMPABI=1.0 because 64-bit registers may not
- # be saved by the kernel on an old system. Actually gcc (as of 3.2)
- # only adds a few float instructions with -mpa-risc-2-0, so it would
- # probably be safe, but let's not take the chance. In any case, a
-- # configuration like --host=hppa2.0 ABI=1.0 is far from optimal.
-+ # configuration like --host=hppa2.0 GMPABI=1.0 is far from optimal.
- #
- case $host_cpu in
- hppa1.0*) gcc_cflags_arch="-mpa-risc-1-0" ;;
-@@ -2733,9 +2733,9 @@
- cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"
- cc_20n_testlist="hpc-hppa-2-0"
-
-- # ABI=2.0w is available for hppa2.0w and hppa2.0, but not for
-+ # GMPABI=2.0w is available for hppa2.0w and hppa2.0, but not for
- # hppa2.0n, on the assumption that that the latter indicates a
-- # desire for ABI=2.0n.
-+ # desire for GMPABI=2.0n.
- case $host in
- hppa2.0n-*-*) ;;
- *)
-@@ -3203,7 +3203,7 @@
- # mode, but not set our ABI. For some reason it's sparc where this
- # keeps coming up, presumably users there are accustomed to driving the
- # compiler mode that way. The effect of our testlist setting is to
-- # reject ABI=64 in favour of ABI=32 if the user has forced the flags to
-+ # reject GMPABI=64 in favour of GMPABI=32 if the user has forced the flags to
- # 32-bit mode.
- #
- abilist="32"
-@@ -3308,12 +3308,12 @@
- case $host_cpu in
- sparc64 | sparcv9* | ultrasparc*)
- case $host in
-- # Solaris 6 and earlier cannot run ABI=64 since it doesn't save
-- # registers properly, so ABI=32 is left as the only choice.
-+ # Solaris 6 and earlier cannot run GMPABI=64 since it doesn't save
-+ # registers properly, so GMPABI=32 is left as the only choice.
- #
- *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
-
-- # BSD sparc64 ports are 64-bit-only systems, so ABI=64 is the only
-+ # BSD sparc64 ports are 64-bit-only systems, so GMPABI=64 is the only
- # choice. In fact they need no special compiler flags, gcc -m64
- # is the default, but it doesn't hurt to add it. v9 CPUs always
- # use the sparc64 port, since the plain 32-bit sparc ports don't
-@@ -3399,7 +3399,7 @@
- # -O, but lets assume that's no longer true.
- #
- # -m32 forces 32-bit mode on a bi-arch 32/64 amd64 build of gcc. -m64 is
-- # the default in such a build (we think), so -m32 is essential for ABI=32.
-+ # the default in such a build (we think), so -m32 is essential for GMPABI=32.
- # This is, of course, done for any $host_cpu, not just x86_64, so we can
- # get such a gcc into the right mode to cross-compile to say i486-*-*.
- #
-@@ -3639,7 +3639,7 @@
-
- cat >&5 <<EOF
- User:
--ABI=$ABI
-+GMPABI=$GMPABI
- CC=$CC
- CFLAGS=$CFLAGS_or_unset
- CPPFLAGS=$CPPFLAGS_or_unset
-@@ -3660,24 +3660,24 @@
- # If the user specifies an ABI then it must be in $abilist, after that
- # $abilist is restricted to just that choice.
- #
--if test -n "$ABI"; then
-+if test -n "$GMPABI"; then
- found=no
- for abi in $abilist; do
-- if test $abi = "$ABI"; then found=yes; break; fi
-+ if test $abi = "$GMPABI"; then found=yes; break; fi
- done
- if test $found = no; then
-- { { echo "$as_me:$LINENO: error: ABI=$ABI is not among the following valid choices: $abilist" >&5
--echo "$as_me: error: ABI=$ABI is not among the following valid choices: $abilist" >&2;}
-+ { { echo "$as_me:$LINENO: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&5
-+echo "$as_me: error: GMPABI=$GMPABI is not among the following valid choices: $abilist" >&2;}
- { (exit 1); exit 1; }; }
- fi
-- abilist="$ABI"
-+ abilist="$GMPABI"
- fi
-
- found_compiler=no
-
- for abi in $abilist; do
-
-- echo "checking ABI=$abi"
-+ echo "checking GMPABI=$abi"
-
- # Suppose abilist="64 32", then for abi=64, will have abi1="_64" and
- # abi2="_64". For abi=32, will have abi1="_32" and abi2="". This is how
-@@ -5128,7 +5128,7 @@
- # For -march settings which enable SSE2 we exclude certain bad
- # gcc versions and we need an OS knowing how to save xmm regs.
- #
-- # This is only for ABI=32, any 64-bit gcc is good and any OS
-+ # This is only for GMPABI=32, any 64-bit gcc is good and any OS
- # knowing x86_64 will know xmm.
- #
- # -march=k8 was only introduced in gcc 3.3, so we shouldn't need
-@@ -6368,16 +6368,16 @@
- done
- fi
-
-- ABI="$abi"
-+ GMPABI="$abi"
- CC="$cc"
- CFLAGS="$cflags"
- CPPFLAGS="$cppflags"
-
-
- # Could easily have this in config.h too, if desired.
-- ABI_nodots=`echo $ABI | sed 's/\./_/'`
-+ GMPABI_nodots=`echo $GMPABI | sed 's/\./_/'`
-
--echo "define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')" >> $gmp_tmpconfigm4p
-+echo "define_not_for_expansion(\`HAVE_ABI_$GMPABI_nodots')" >> $gmp_tmpconfigm4p
-
-
-
-@@ -8830,12 +8830,12 @@
- # If there's any sse2 or mmx in the path, check whether the assembler
- # supports it, and remove if not.
- #
--# We only need this in ABI=32, for ABI=64 on x86_64 we can assume a new
-+# We only need this in GMPABI=32, for GMPABI=64 on x86_64 we can assume a new
- # enough assembler.
- #
- case $host in
- i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-* | geode*-*-* | athlon64-*-* | core2-*-* | x86_64-*-*)
-- if test "$ABI" = 32; then
-+ if test "$GMPABI" = 32; then
- case "$path $fat_path" in
- *mmx*) echo "$as_me:$LINENO: checking if the assembler knows about MMX instructions" >&5
- echo $ECHO_N "checking if the assembler knows about MMX instructions... $ECHO_C" >&6
-@@ -9019,7 +9019,7 @@
-
- cat >&5 <<EOF
- Decided:
--ABI=$ABI
-+GMPABI=$GMPABI
- CC=$CC
- CFLAGS=$CFLAGS
- CPPFLAGS=$CPPFLAGS
-@@ -9028,7 +9028,7 @@
- CXXFLAGS=$CXXFLAGS
- path=$path
- EOF
--echo "using ABI=\"$ABI\""
-+echo "using GMPABI=\"$GMPABI\""
- echo " CC=\"$CC\""
- echo " CFLAGS=\"$CFLAGS\""
- echo " CPPFLAGS=\"$CPPFLAGS\""
-@@ -30005,7 +30005,7 @@
-
- case $host in
- *-*-aix*)
-- case $ABI in
-+ case $GMPABI in
- 64 | aix64)
- echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i
- ;;
-@@ -30015,7 +30015,7 @@
- esac
- ;;
- *-*-linux* | *-*-*bsd*)
-- case $ABI in
-+ case $GMPABI in
- mode64)
- echo "include_mpn(\`powerpc64/elf.m4')" >> $gmp_tmpconfigm4i
- ;;
-@@ -30025,7 +30025,7 @@
- esac
- ;;
- *-*-darwin*)
-- case $ABI in
-+ case $GMPABI in
- mode64)
- echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i
- ;;
-@@ -30048,7 +30048,7 @@
-
- ;;
- sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
-- case $ABI in
-+ case $GMPABI in
- 64)
-
- echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5
-@@ -30130,7 +30130,7 @@
- echo "define(<ALIGN_FILL_0x90>,<$gmp_cv_asm_align_fill_0x90>)" >> $gmp_tmpconfigm4
-
-
-- case $ABI in
-+ case $GMPABI in
- 32)
-
- echo "include_mpn(\`x86/x86-defs.m4')" >> $gmp_tmpconfigm4i
-@@ -34032,7 +34032,7 @@
- s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t
- s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t
- s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t
--s,@ABI@,$ABI,;t t
-+s,@GMPABI@,$GMPABI,;t t
- s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t
- s,@HAVE_HOST_CPU_FAMILY_powerpc@,$HAVE_HOST_CPU_FAMILY_powerpc,;t t
- s,@GMP_LDFLAGS@,$GMP_LDFLAGS,;t t
diff --git a/dev-libs/gmp/gmp-4.2.4.ebuild b/dev-libs/gmp/gmp-4.2.4.ebuild
deleted file mode 100644
index 304621034257..000000000000
--- a/dev-libs/gmp/gmp-4.2.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.4.ebuild,v 1.8 2009/02/21 22:05:51 vapier Exp $
-
-inherit flag-o-matic eutils libtool
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-# doc? ( http://www.nada.kth.se/~tege/${PN}-man-${PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nocxx" #doc
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack () {
- unpack ${A}
- cd "${S}"
- [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
- epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
- epatch "${FILESDIR}"/${PN}-4.2.3-ABI-multilib.patch
- epatch "${FILESDIR}"/${PN}-4.2.1-s390.diff
-
- sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' \
- Makefile.in */Makefile.in */*/Makefile.in
-
- # note: we cannot run autotools here as gcc depends on this package
- elibtoolize
-}
-
-src_compile() {
- # GMP believes hppa2.0 is 64bit
- local is_hppa_2_0
- if [[ ${CHOST} == hppa2.0-* ]] ; then
- is_hppa_2_0=1
- export CHOST=${CHOST/2.0/1.1}
- fi
-
- # ABI mappings (needs all architectures supported)
- case ${ABI} in
- 32|x86) export GMPABI=32;;
- 64|amd64|n64) export GMPABI=64;;
- o32|n32) export GMPABI=${ABI};;
- esac
-
- econf \
- --localstatedir=/var/state/gmp \
- --disable-mpfr \
- --disable-mpbsd \
- $(use_enable !nocxx cxx) \
- || die "configure failed"
-
- # Fix the ABI for hppa2.0
- if [[ -n ${is_hppa_2_0} ]] ; then
- sed -i \
- -e 's:pa32/hppa1_1:pa32/hppa2_0:' \
- "${S}"/config.h || die
- export CHOST=${CHOST/1.1/2.0}
- fi
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS ChangeLog NEWS README
- dodoc doc/configuration doc/isa_abi_headache
- dohtml -r doc
-
- #use doc && cp "${DISTDIR}"/gmp-man-${PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
diff --git a/dev-libs/gmp/gmp-4.3.0.ebuild b/dev-libs/gmp/gmp-4.3.0.ebuild
deleted file mode 100644
index 28fbf92a1d01..000000000000
--- a/dev-libs/gmp/gmp-4.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.3.0.ebuild,v 1.1 2009/04/27 06:46:22 vapier Exp $
-
-inherit flag-o-matic eutils libtool
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-# doc? ( http://www.nada.kth.se/~tege/${PN}-man-${PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nocxx" #doc
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack () {
- unpack ${A}
- cd "${S}"
- [[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
- epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
- epatch "${FILESDIR}"/${PN}-4.3.0-ABI-multilib.patch
- epatch "${FILESDIR}"/${PN}-4.2.1-s390.diff
-
- sed -i -e 's:ABI = @ABI@:GMPABI = @GMPABI@:' \
- Makefile.in */Makefile.in */*/Makefile.in
-
- # note: we cannot run autotools here as gcc depends on this package
- elibtoolize
-}
-
-src_compile() {
- # GMP believes hppa2.0 is 64bit
- local is_hppa_2_0
- if [[ ${CHOST} == hppa2.0-* ]] ; then
- is_hppa_2_0=1
- export CHOST=${CHOST/2.0/1.1}
- fi
-
- # ABI mappings (needs all architectures supported)
- case ${ABI} in
- 32|x86) export GMPABI=32;;
- 64|amd64|n64) export GMPABI=64;;
- o32|n32) export GMPABI=${ABI};;
- esac
-
- econf \
- --localstatedir=/var/state/gmp \
- --disable-mpfr \
- --disable-mpbsd \
- $(use_enable !nocxx cxx) \
- || die "configure failed"
-
- # Fix the ABI for hppa2.0
- if [[ -n ${is_hppa_2_0} ]] ; then
- sed -i \
- -e 's:pa32/hppa1_1:pa32/hppa2_0:' \
- "${S}"/config.h || die
- export CHOST=${CHOST/1.1/2.0}
- fi
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS ChangeLog NEWS README
- dodoc doc/configuration doc/isa_abi_headache
- dohtml -r doc
-
- #use doc && cp "${DISTDIR}"/gmp-man-${PV}.pdf "${D}"/usr/share/doc/${PF}/
-}