Version bump #129007 by Raphael.

(Portage version: 2.1_pre7-r4)

4 files changed, 340 insertions, 1 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index f40217bb33f7..a63a00fe23bb 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.70 2006/03/30 18:25:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.71 2006/04/10 03:44:09 vapier Exp $
+
+*gmp-4.2 (10 Apr 2006)
+
+  10 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/gmp-4.2-ABI-multilib.patch, +gmp-4.2.ebuild:
+  Version bump #129007 by Raphael.
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gmp-4.1.4-r3.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-libs/gmp/files/digest-gmp-4.2 b/dev-libs/gmp/files/digest-gmp-4.2
new file mode 100644
index 000000000000..fb55947b93a2
--- /dev/null
+++ b/dev-libs/gmp/files/digest-gmp-4.2
@@ -0,0 +1,6 @@
+MD5 aa4a4534e8870ab8ba3c093239057cca gmp-4.2.tar.bz2 1726594
+RMD160 6ae9b4dc0d8517795f10528e7928fbf15fb1d2d2 gmp-4.2.tar.bz2 1726594
+SHA256 374d658b7168bea13bb23cc4fb2fd4c12b449191325b46bb4e78b9a59c8d889e gmp-4.2.tar.bz2 1726594
+MD5 fc03fead381d8307e90e73d0c789bc89 gmp-man-4.2.pdf 994954
+RMD160 a200db375245209a52604656c28eb8bcc61832d0 gmp-man-4.2.pdf 994954
+SHA256 c0cf53d949b5829f9401051ce63f39ed6ec92d082f713d8e9f26b38d3f02bed6 gmp-man-4.2.pdf 994954
diff --git a/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch b/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch
new file mode 100644
index 000000000000..ec170be9db25
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-4.2-ABI-multilib.patch
@@ -0,0 +1,262 @@
+Gentoo uses ABI env var already
+
+--- gmp-4.2/configure
++++ gmp-4.2/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-*-*) ;;
+         *)
+@@ -3195,7 +3195,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"
+@@ -3300,12 +3300,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
+@@ -3391,7 +3391,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-*-*.
+   #
+@@ -3629,7 +3629,7 @@
+ 
+ cat >&5 <<EOF
+ User:
+-ABI=$ABI
++GMPABI=$GMPABI
+ CC=$CC
+ CFLAGS=$CFLAGS_or_unset
+ CPPFLAGS=$CPPFLAGS_or_unset
+@@ -3650,24 +3650,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
+@@ -5118,7 +5118,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
+@@ -6358,16 +6358,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
+ 
+ 
+ 
+@@ -8820,12 +8820,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
+@@ -9009,7 +9009,7 @@
+ 
+ cat >&5 <<EOF
+ Decided:
+-ABI=$ABI
++GMPABI=$GMPABI
+ CC=$CC
+ CFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
+@@ -9018,7 +9018,7 @@
+ CXXFLAGS=$CXXFLAGS
+ path=$path
+ EOF
+-echo "using ABI=\"$ABI\""
++echo "using GMPABI=\"$GMPABI\""
+ echo "      CC=\"$CC\""
+ echo "      CFLAGS=\"$CFLAGS\""
+ echo "      CPPFLAGS=\"$CPPFLAGS\""
+@@ -30058,7 +30058,7 @@
+ 
+       case $host in
+         *-*-aix*)
+-	  case $ABI in
++	  case $GMPABI in
+ 	    64 | aix64)
+ echo "include_mpn(\`powerpc64/aix.m4')" >> $gmp_tmpconfigm4i
+  ;;
+@@ -30068,7 +30068,7 @@
+           esac
+           ;;
+         *-*-linux*)
+-	  case $ABI in
++	  case $GMPABI in
+ 	    mode64)
+ echo "include_mpn(\`powerpc64/linux64.m4')" >> $gmp_tmpconfigm4i
+  ;;
+@@ -30078,7 +30078,7 @@
+           esac
+           ;;
+         *-*-darwin*)
+-	  case $ABI in
++	  case $GMPABI in
+ 	    mode64)
+ echo "include_mpn(\`powerpc64/darwin.m4')" >> $gmp_tmpconfigm4i
+  ;;
+@@ -30095,7 +30095,7 @@
+ 
+       ;;
+     sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
+-      case $ABI in
++      case $GMPABI in
+         64)
+ 
+ echo "$as_me:$LINENO: checking if the assembler accepts \".register\"" >&5
+@@ -30177,7 +30177,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
+@@ -34079,7 +34078,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.ebuild b/dev-libs/gmp/gmp-4.2.ebuild
new file mode 100644
index 000000000000..c1cc44ee7a34
--- /dev/null
+++ b/dev-libs/gmp/gmp-4.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.2.ebuild,v 1.1 2006/04/10 03:44:11 vapier Exp $
+
+inherit flag-o-matic eutils libtool
+
+DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
+HOMEPAGE="http://www.swox.com/gmp/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+	doc? ( http://www.swox.se/${PN}/${PN}-man-${PV}.pdf )"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc nocxx"
+
+RDEPEND=""
+DEPEND=""
+
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
+	use ppc64 && epatch "${FILESDIR}"/${PN}-4.1.4-asm-dots.patch
+	epatch "${FILESDIR}"/${P}-ABI-multilib.patch
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+}
+
+src_compile() {
+	filter-flags -ffast-math
+
+	# GMP believes hppa2.0 is 64bit
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		is_hppa_2_0=1
+		export CHOST="${CHOST/2.0/1.1}"
+	fi
+
+	econf \
+		--localstatedir=/var/state/gmp \
+		--disable-mpfr \
+		--disable-mpbsd \
+		$(use_enable !nocxx cxx) \
+		|| die "configure failed"
+
+	# Fix the ABI for hppa2.0
+	if [ ! -z "${is_hppa_2_0}" ]; then
+		sed -i "${S}/config.h" -e 's:pa32/hppa1_1:pa32/hppa2_0:'
+		export CHOST="${CHOST/1.1/2.0}"
+	fi
+
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make 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}/
+}