old

(Portage version: 2.2_pre5)

8 files changed, 0 insertions, 1123 deletions

diff --git a/dev-libs/gmp/files/4.2.1/aix.m4-RW.diff b/dev-libs/gmp/files/4.2.1/aix.m4-RW.diff
deleted file mode 100644
index 4a4810b3e27e..000000000000
--- a/dev-libs/gmp/files/4.2.1/aix.m4-RW.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: mpn/powerpc32/aix.m4
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpn/powerpc32/aix.m4,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -p -2 -r1.3 -r1.4
-*** mpn/powerpc32/aix.m4	19 Apr 2006 08:40:28 -0000	1.3
---- mpn/powerpc32/aix.m4	8 May 2006 09:47:12 -0000	1.4
-*************** m4_assert_numargs(2)
-*** 52,56 ****
-  `	.toc
-  tc$2:
-! 	.tc	$2[TC], $2[RW]')'
-  `	lwz	$1, tc$2(2)')
-  
---- 52,56 ----
-  `	.toc
-  tc$2:
-! 	.tc	$2[TC], $2')'
-  `	lwz	$1, tc$2(2)')
-  
diff --git a/dev-libs/gmp/files/4.2.1/configure-ppc.diff b/dev-libs/gmp/files/4.2.1/configure-ppc.diff
deleted file mode 100644
index c566311213dd..000000000000
--- a/dev-libs/gmp/files/4.2.1/configure-ppc.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: configure
-===================================================================
-RCS file: /home/cvsfiles/gmp42/configure,v
-retrieving revision 1.11
-retrieving revision 1.13
-diff -p -2 -r1.11 -r1.13
-*** configure	4 May 2006 16:25:33 -0000	1.11
---- configure	12 May 2006 16:00:27 -0000	1.13
-*************** _ACEOF
-*** 2963,2969 ****
-      cc_cflags="-O2"
-      gcc_cflags="-O2 -mpowerpc"
-!     gcc_cflags_optlist="precomp subtype cpu"
-      gcc_cflags_precomp="-no-cpp-precomp"
-      gcc_cflags_subtype="-force_cpusubtype_ALL"	# for vmx on darwin
-  
-      # grab this object, though it's not a true cycle counter routine
---- 2963,2971 ----
-      cc_cflags="-O2"
-      gcc_cflags="-O2 -mpowerpc"
-!     gcc_cflags_optlist="precomp subtype asm cpu"
-      gcc_cflags_precomp="-no-cpp-precomp"
-      gcc_cflags_subtype="-force_cpusubtype_ALL"	# for vmx on darwin
-+     gcc_cflags_asm=""
-+     gcc_cflags_cpu=""
-  
-      # grab this object, though it's not a true cycle counter routine
-*************** _ACEOF
-*** 2976,2980 ****
-        powerpc7400)
-          path="powerpc32/vmx powerpc32/750 powerpc32" ;;
-!       powerpc745?)
-          path="powerpc32/vmx powerpc32 powerpc32" ;;
-        *)
---- 2978,2982 ----
-        powerpc7400)
-          path="powerpc32/vmx powerpc32/750 powerpc32" ;;
-!       powerpc74[45]?)
-          path="powerpc32/vmx powerpc32 powerpc32" ;;
-        *)
-*************** _ACEOF
-*** 3010,3015 ****
-        powerpc740)   gcc_cflags_cpu="-mcpu=740" ;;
-        powerpc7400 | powerpc7410)
-  		    gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;;
-!       powerpc745?)  gcc_cflags_cpu="-mcpu=7450" ;;
-        powerpc750)   gcc_cflags_cpu="-mcpu=750" ;;
-        powerpc801)   gcc_cflags_cpu="-mcpu=801" ;;
---- 3012,3020 ----
-        powerpc740)   gcc_cflags_cpu="-mcpu=740" ;;
-        powerpc7400 | powerpc7410)
-+ 		    gcc_cflags_asm="-Wa,-maltivec"
-  		    gcc_cflags_cpu="-mcpu=7400 -mcpu=750" ;;
-!       powerpc74[45]?)
-! 		    gcc_cflags_asm="-Wa,-maltivec"
-! 		    gcc_cflags_cpu="-mcpu=7450" ;;
-        powerpc750)   gcc_cflags_cpu="-mcpu=750" ;;
-        powerpc801)   gcc_cflags_cpu="-mcpu=801" ;;
diff --git a/dev-libs/gmp/files/4.2.1/gmpxx.h.ternary.diff b/dev-libs/gmp/files/4.2.1/gmpxx.h.ternary.diff
deleted file mode 100644
index 79bbb1ab3807..000000000000
--- a/dev-libs/gmp/files/4.2.1/gmpxx.h.ternary.diff
+++ /dev/null
@@ -1,519 +0,0 @@
-Index: gmpxx.h
-===================================================================
-RCS file: /home/cvsfiles/gmp42/gmpxx.h,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -p -2 -r1.4 -r1.5
-*** gmpxx.h	8 Apr 2006 19:58:48 -0000	1.4
---- gmpxx.h	31 Oct 2006 10:40:59 -0000	1.5
-*************** struct __gmp_cmp_function
-*** 1278,1367 ****
-  };
-  
-- struct __gmp_ternary_addmul // z = w + v * u
-- {
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, mpz_srcptr u)
--   { mpz_set(z, w); mpz_addmul(z, v, u); }
-- 
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, unsigned long int l)
--   { mpz_set(z, w); mpz_addmul_ui(z, v, l); }
--   static void eval(mpz_ptr z, mpz_srcptr w, unsigned long int l, mpz_srcptr v)
--   { mpz_set(z, w); mpz_addmul_ui(z, v, l); }
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, signed long int l)
--   {
--     mpz_set(z, w);
--     if (l >= 0)
--       mpz_addmul_ui(z, v, l);
--     else
--       mpz_submul_ui(z, v, -l);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, signed long int l, mpz_srcptr v)
--   {
--     mpz_set(z, w);
--     if (l >= 0)
--       mpz_addmul_ui(z, v, l);
--     else
--       mpz_submul_ui(z, v, -l);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, double d)
--   {
--     mpz_t temp;
--     mpz_init_set_d(temp, d);
--     mpz_set(z, w);
--     mpz_addmul(z, v, temp);
--     mpz_clear(temp);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, double d, mpz_srcptr v)
--   {
--     mpz_t temp;
--     mpz_init_set_d(temp, d);
--     mpz_set(z, w);
--     mpz_addmul(z, temp, v);
--     mpz_clear(temp);
--   }
-- };
-- 
-- struct __gmp_ternary_submul // z = w - v * u
-- {
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, mpz_srcptr u)
--   { mpz_set(z, w); mpz_submul(z, v, u); }
-- 
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, unsigned long int l)
--   { mpz_set(z, w); mpz_submul_ui(z, v, l); }
--   static void eval(mpz_ptr z, mpz_srcptr w, unsigned long int l, mpz_srcptr v)
--   { mpz_set(z, w); mpz_submul_ui(z, v, l); }
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, signed long int l)
--   {
--     mpz_set(z, w);
--     if (l >= 0)
--       mpz_submul_ui(z, v, l);
--     else
--       mpz_addmul_ui(z, v, -l);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, signed long int l, mpz_srcptr v)
--   {
--     mpz_set(z, w);
--     if (l >= 0)
--       mpz_submul_ui(z, v, l);
--     else
--       mpz_addmul_ui(z, v, -l);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, mpz_srcptr v, double d)
--   {
--     mpz_t temp;
--     mpz_init_set_d(temp, d);
--     mpz_set(z, w);
--     mpz_submul(z, v, temp);
--     mpz_clear(temp);
--   }
--   static void eval(mpz_ptr z, mpz_srcptr w, double d, mpz_srcptr v)
--   {
--     mpz_t temp;
--     mpz_init_set_d(temp, d);
--     mpz_set(z, w);
--     mpz_submul(z, temp, v);
--     mpz_clear(temp);
--   }
-- };
-- 
-  struct __gmp_rand_function
-  {
---- 1278,1281 ----
-*************** __GMPZQ_DEFINE_EXPR(__gmp_binary_minus)
-*** 2863,3277 ****
-  
-  
-- /* Integer ternary expressions of the kind `a+b*c' or `a*b+c' can be
--    evaluated directly via mpz_addmul */
-- 
-- // a + b * c
-- #define __GMP_DEFINE_TERNARY_EXPR(eval_fun1, eval_fun2, eval_both)          \
--                                                                             \
-- template <>                                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<mpz_class, mpz_class, eval_fun1> >, eval_fun2> >  \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<mpz_class, mpz_class, eval_fun1> > val2_type; \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   { eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),          \
--        expr.val2.get_val2().get_mpz_t()); }                                 \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T>                                                          \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<mpz_class, T, eval_fun1> >, eval_fun2> >          \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<mpz_class, T, eval_fun1> > val2_type;         \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   { eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),          \
--        expr.val2.get_val2()); }                                             \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T>                                                          \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<T, mpz_class, eval_fun1> >, eval_fun2> >          \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<T, mpz_class, eval_fun1> > val2_type;         \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   { eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), expr.val2.get_val1(),                      \
--        expr.val2.get_val2().get_mpz_t()); }                                 \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T>                                                          \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr<mpz_t, T>, eval_fun1> >,    \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <mpz_class, __gmp_expr<mpz_t, T>, eval_fun1> > val2_type;               \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val2.get_val2());                                   \
--     eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),          \
--        temp.get_mpz_t());                                                   \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T>                                                          \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>, mpz_class, eval_fun1> >,    \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <__gmp_expr<mpz_t, T>, mpz_class, eval_fun1> > val2_type;               \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val2.get_val1());                                   \
--     eval_both::eval(z, expr.val1.get_mpz_t(), temp.get_mpz_t(),             \
-- 		    expr.val2.get_val2().get_mpz_t());                      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>, U, eval_fun1> >,            \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <__gmp_expr<mpz_t, T>, U, eval_fun1> > val2_type;                       \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val2.get_val1());                                   \
--     eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), temp.get_mpz_t(), expr.val2.get_val2());   \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<T, __gmp_expr<mpz_t, U>, eval_fun1> >,            \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <T, __gmp_expr<mpz_t, U>, eval_fun1> > val2_type;                       \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val2.get_val2());                                   \
--     eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), expr.val2.get_val1(), temp.get_mpz_t());   \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr             \
-- <mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>, __gmp_expr<mpz_t, U>,       \
--   eval_fun1> >, eval_fun2> >                                                \
-- {                                                                           \
-- private:                                                                    \
--   typedef mpz_class val1_type;                                              \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <__gmp_expr<mpz_t, T>, __gmp_expr<mpz_t, U>, eval_fun1> > val2_type;    \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val2.get_val1());                                  \
--     mpz_class temp2(expr.val2.get_val2());                                  \
--     eval_both::eval                                                         \
--       (z, expr.val1.get_mpz_t(), temp1.get_mpz_t(), temp2.get_mpz_t());     \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T>                                                          \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, mpz_class, eval_fun1> >,   \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<mpz_class, mpz_class, eval_fun1> > val2_type; \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val1);                                              \
--     eval_both::eval(z, temp.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),  \
-- 		    expr.val2.get_val2().get_mpz_t());                      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, U, eval_fun1> >,           \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<mpz_class, U, eval_fun1> > val2_type;         \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val1);                                              \
--     eval_both::eval(z, temp.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),  \
-- 		    expr.val2.get_val2());                                  \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<U, mpz_class, eval_fun1> >,           \
--   eval_fun2> >                                                              \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr                                                        \
--     <mpz_t, __gmp_binary_expr<U, mpz_class, eval_fun1> > val2_type;         \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp(expr.val1);                                              \
--     eval_both::eval(z, temp.get_mpz_t(), expr.val2.get_val1(),              \
-- 		    expr.val2.get_val2().get_mpz_t());                      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<mpz_class, __gmp_expr<mpz_t, U>,      \
--   eval_fun1> >, eval_fun2> >                                                \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <mpz_class, __gmp_expr<mpz_t, U>, eval_fun1> > val2_type;               \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val1);                                             \
--     mpz_class temp2(expr.val2.get_val2());                                  \
--     eval_both::eval                                                         \
--       (z, temp1.get_mpz_t(), expr.val2.get_val1().get_mpz_t(),              \
--        temp2.get_mpz_t());                                                  \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U>                                                 \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, U>, mpz_class,      \
--   eval_fun1> >, eval_fun2> >                                                \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <__gmp_expr<mpz_t, U>, mpz_class, eval_fun1> > val2_type;               \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val1);                                             \
--     mpz_class temp2(expr.val2.get_val1());                                  \
--     eval_both::eval(z, temp1.get_mpz_t(), temp2.get_mpz_t(),                \
-- 		    expr.val2.get_val2().get_mpz_t());                      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U, class V>                                        \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, U>, V,              \
--   eval_fun1> >, eval_fun2> >                                                \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--   <__gmp_expr<mpz_t, U>, V, eval_fun1> > val2_type;                         \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val1);                                             \
--     mpz_class temp2(expr.val2.get_val1());                                  \
--     eval_both::eval                                                         \
--       (z, temp1.get_mpz_t(), temp2.get_mpz_t(), expr.val2.get_val2());      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U, class V>                                        \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<U, __gmp_expr<mpz_t, V>,              \
--   eval_fun1> >, eval_fun2> >                                                \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--     <U, __gmp_expr<mpz_t, V>, eval_fun1> > val2_type;                       \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val1);                                             \
--     mpz_class temp2(expr.val2.get_val2());                                  \
--     eval_both::eval                                                         \
--       (z, temp1.get_mpz_t(), expr.val2.get_val1(), temp2.get_mpz_t());      \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };                                                                          \
--                                                                             \
-- template <class T, class U, class V>                                        \
-- class __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, T>,             \
--   __gmp_expr<mpz_t, __gmp_binary_expr<__gmp_expr<mpz_t, U>,                 \
--   __gmp_expr<mpz_t, V>, eval_fun1> >, eval_fun2> >                          \
-- {                                                                           \
-- private:                                                                    \
--   typedef __gmp_expr<mpz_t, T> val1_type;                                   \
--   typedef __gmp_expr<mpz_t, __gmp_binary_expr                               \
--   <__gmp_expr<mpz_t, U>, __gmp_expr<mpz_t, V>, eval_fun1> > val2_type;      \
--                                                                             \
--   __gmp_binary_expr<val1_type, val2_type, eval_fun2> expr;                  \
-- public:                                                                     \
--   __gmp_expr(const val1_type &val1, const val2_type &val2)                  \
--     : expr(val1, val2) { }                                                  \
--   void eval(mpz_ptr z) const                                                \
--   {                                                                         \
--     mpz_class temp1(expr.val1);                                             \
--     mpz_class temp2(expr.val2.get_val1());                                  \
--     mpz_class temp3(expr.val2.get_val2());                                  \
--     eval_both::eval                                                         \
--       (z, temp1.get_mpz_t(), temp2.get_mpz_t(), temp3.get_mpz_t());         \
--   }                                                                         \
--   const val1_type & get_val1() const { return expr.val1; }                  \
--   const val2_type & get_val2() const { return expr.val2; }                  \
--   unsigned long int get_prec() const { return mpf_get_default_prec(); }     \
-- };
-- 
-- 
-- __GMP_DEFINE_TERNARY_EXPR(__gmp_binary_multiplies, __gmp_binary_plus,
-- 			  __gmp_ternary_addmul)
-- __GMP_DEFINE_TERNARY_EXPR(__gmp_binary_multiplies, __gmp_binary_minus,
-- 			  __gmp_ternary_submul)
-  
-  /**************** Macros for defining functions ****************/
---- 2777,2780 ----
diff --git a/dev-libs/gmp/files/4.2.1/ia64-popcount.diff b/dev-libs/gmp/files/4.2.1/ia64-popcount.diff
deleted file mode 100644
index dbbce20f6bec..000000000000
--- a/dev-libs/gmp/files/4.2.1/ia64-popcount.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: mpn/ia64/popcount.asm
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpn/ia64/popcount.asm,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -p -2 -r1.2 -r1.3
-*** mpn/ia64/popcount.asm	20 Mar 2006 14:00:18 -0000	1.2
---- mpn/ia64/popcount.asm	19 May 2006 22:24:32 -0000	1.3
-*************** dnl  to write mpn_hamdist with the same 
-*** 26,29 ****
---- 26,33 ----
-  include(`../config.m4')
-  
-+ define(ABI32,
-+ m4_assert_onearg()
-+ `ifdef(`HAVE_ABI_32',`$1')')
-+ 
-  C INPUT PARAMETERS
-  C sp = r32
-*************** PROLOGUE(mpn_popcount)
-*** 34,39 ****
-  	.prologue
-  	.save	ar.lc, r2
-! 		mov	r2 = ar.lc
-  	.body
-  		and	r22 = 3, r33
-  		shr.u	r23 = r33, 2	;;
---- 38,47 ----
-  	.prologue
-  	.save	ar.lc, r2
-! ABI32(`		addp4	r32 = 0, r32')	C M  src extend
-! 		mov	r2 = ar.lc	C I0	
-! ABI32(`		zxt4	r33 = r33')	C I1  size extend
-! 		;;
-  	.body
-+ 
-  		and	r22 = 3, r33
-  		shr.u	r23 = r33, 2	;;
diff --git a/dev-libs/gmp/files/4.2.1/mpz_set_d.diff b/dev-libs/gmp/files/4.2.1/mpz_set_d.diff
deleted file mode 100644
index 6c4d0cfdcbbb..000000000000
--- a/dev-libs/gmp/files/4.2.1/mpz_set_d.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-*** mpz/set_d.c	14 Mar 2006 15:57:54 -0000	1.1
---- mpz/set_d.c	31 May 2006 14:50:05 -0000	1.2
-*************** mpz_set_d (mpz_ptr r, double d)
-*** 57,60 ****
---- 58,64 ----
-      _mpz_realloc (r, rn);
-  
-+   if (rn <= 0)
-+     rn = 0;
-+ 
-    rp = PTR (r);
-  
diff --git a/dev-libs/gmp/files/4.2.1/x86-fat.diff b/dev-libs/gmp/files/4.2.1/x86-fat.diff
deleted file mode 100644
index 5b19e6cba4b7..000000000000
--- a/dev-libs/gmp/files/4.2.1/x86-fat.diff
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: mpn/generic/addsub_n.c
-===================================================================
-RCS file: /home/cvsfiles/gmp42/mpn/generic/addsub_n.c,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -p -2 -r1.1 -r1.2
-*** mpn/generic/addsub_n.c	14 Mar 2006 15:57:54 -0000	1.1
---- mpn/generic/addsub_n.c	15 May 2006 22:38:42 -0000	1.2
-***************
-*** 1,5 ****
-  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
-  
-! Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-  
-  This file is part of the GNU MP Library.
---- 1,5 ----
-  /* mpn_addsub_n -- Add and Subtract two limb vectors of equal, non-zero length.
-  
-! Copyright 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
-  
-  This file is part of the GNU MP Library.
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 59,63 ****
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-  	  acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 59,63 ----
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc
-  	  acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 65,69 ****
-  	  acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 65,69 ----
-  	  acyo = acyn + mpn_add_1 (r1p + off, r1p + off, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 82,86 ****
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 82,86 ----
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_sub_nc
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 88,92 ****
-  	  scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
-  #endif
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-  	  acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 88,92 ----
-  	  scyo = scyn + mpn_sub_1 (r2p + off, r2p + off, this_n, scyo);
-  #endif
-! #if HAVE_NATIVE_mpn_add_nc
-  	  acyo = mpn_add_nc (r1p + off, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 98,102 ****
-    else
-      {
-!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2=s2 or vice versa)
-  	 Need temporary storage.  */
-        mp_limb_t tp[PART_SIZE];
---- 98,102 ----
-    else
-      {
-!       /* r1 and r2 are identical to s1 and s2 (r1==s1 and r2==s2 or vice versa)
-  	 Need temporary storage.  */
-        mp_limb_t tp[PART_SIZE];
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 106,110 ****
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc || !HAVE_NATIVE_mpn_add_n
-  	  acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
-  #else
---- 106,110 ----
-  	{
-  	  this_n = MIN (n - off, PART_SIZE);
-! #if HAVE_NATIVE_mpn_add_nc
-  	  acyo = mpn_add_nc (tp, s1p + off, s2p + off, this_n, acyo);
-  #else
-*************** mpn_addsub_n (mp_ptr r1p, mp_ptr r2p, mp
-*** 112,116 ****
-  	  acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc || !HAVE_NATIVE_mpn_sub_n
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
---- 112,116 ----
-  	  acyo = acyn + mpn_add_1 (tp, tp, this_n, acyo);
-  #endif
-! #if HAVE_NATIVE_mpn_sub_nc
-  	  scyo = mpn_sub_nc (r2p + off, s1p + off, s2p + off, this_n, scyo);
-  #else
-Index: configure
-===================================================================
-RCS file: /home/cvsfiles/gmp42/configure,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -p -2 -r1.13 -r1.14
-*** configure	12 May 2006 16:00:27 -0000	1.13
---- configure	17 May 2006 10:27:28 -0000	1.14
-*************** echo "include_mpn(\`sparc32/sparc-defs.m
-*** 3550,3555 ****
-      esac
-  
-!     # If the user asked for a fat build, override the path set above
-      if test $enable_fat = yes; then
-        extra_functions="$extra_functions fat fat_entry"
-        path="x86/fat x86"
---- 3550,3557 ----
-      esac
-  
-!     # If the user asked for a fat build, override the path and flags set above
-      if test $enable_fat = yes; then
-+       gcc_cflags_cpu=""
-+       gcc_cflags_arch=""
-        extra_functions="$extra_functions fat fat_entry"
-        path="x86/fat x86"
diff --git a/dev-libs/gmp/files/gmp-4.2.1-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2.1-ABI-multilib.patch
deleted file mode 100644
index da38a744efe2..000000000000
--- a/dev-libs/gmp/files/gmp-4.2.1-ABI-multilib.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-Gentoo uses ABI env var already
-
---- gmp-4.2.1/configure
-+++ gmp-4.2.1/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 AR ac_ct_AR LIBGMP_DLL 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 AR ac_ct_AR LIBGMP_DLL 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*-*-* | 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.1-r1.ebuild b/dev-libs/gmp/gmp-4.2.1-r1.ebuild
deleted file mode 100644
index 5bd2382501f9..000000000000
--- a/dev-libs/gmp/gmp-4.2.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.1-r1.ebuild,v 1.3 2007/10/07 16:41:47 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://gmplib.org/${PN}-man-${PV}.pdf )"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="doc nocxx"
-
-RDEPEND=""
-DEPEND=""
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-	epatch "${FILESDIR}"/${P}-ABI-multilib.patch
-	epatch "${FILESDIR}"/${P}-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}/
-}