Multilib fixes and libtoolize --copy --force. No bump since it just affects compilation.

(Portage version: 2.0.51-r15)

5 files changed, 129 insertions, 12 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index e2966ef50e9a..69ce68ae33ff 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.46 2004/12/21 17:00:36 kloeri Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.47 2005/01/27 21:14:06 eradicator Exp $
+
+  27 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/gmp-4.1.4-multilib.patch, gmp-4.1.4.ebuild:
+  Multilib fixes and libtoolize --copy --force. No bump since it just affects
+  compilation.
 
   21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> gmp-4.1.4.ebuild:
   Stable on alpha.
diff --git a/dev-libs/gmp/files/gmp-4.1.4-multilib.patch b/dev-libs/gmp/files/gmp-4.1.4-multilib.patch
new file mode 100644
index 000000000000..5ca49a9092bd
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-4.1.4-multilib.patch
@@ -0,0 +1,101 @@
+diff -Naurp gmp-4.1.4.orig/configure.in gmp-4.1.4/configure.in
+--- gmp-4.1.4.orig/configure.in	2004-09-21 06:02:43.000000000 -0700
++++ gmp-4.1.4/configure.in	2005-01-27 12:50:33.627680514 -0800
+@@ -291,7 +291,7 @@ esac],
+ # hugely bloat the output.
+ 
+ 
+-AC_ARG_VAR(ABI, [desired ABI (for processors supporting more than one ABI)])
++AC_ARG_VAR(GMPABI, [desired ABI (for processors supporting more than one ABI)])
+ 
+ # abilist needs to be non-empty, "standard" is just a generic name here
+ abilist="standard"
+@@ -1081,7 +1081,7 @@ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
+ 
+ cat >&AC_FD_CC <<EOF
+ configure:__line__: User:
+-ABI=$ABI
++GMPABI=$GMPABI
+ CC=$CC
+ CFLAGS=$CFLAGS_or_unset
+ CPPFLAGS=$CPPFLAGS_or_unset
+@@ -1102,15 +1102,15 @@ done
+ # 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
+-    AC_MSG_ERROR([ABI=$ABI is not among the following valid choices: $abilist])
++    AC_MSG_ERROR([GMPABI=$GMPABI is not among the following valid choices: $abilist])
+   fi
+-  abilist="$ABI"
++  abilist="$GMPABI"
+ fi
+ 
+ found_compiler=no
+@@ -1311,14 +1311,14 @@ if test $found_compiler = yes; then
+     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/\./_/'`
++  ABI_nodots=`echo $GMPABI | sed 's/\./_/'`
+   GMP_DEFINE_RAW("define_not_for_expansion(\`HAVE_ABI_$ABI_nodots')", POST)
+ 
+ 
+@@ -1480,7 +1480,7 @@ fi
+ 
+ cat >&AC_FD_CC <<EOF
+ configure:__line__: Decided:
+-ABI=$ABI
++GMPABI=$GMPABI
+ CC=$CC
+ CFLAGS=$CFLAGS
+ CPPFLAGS=$CPPFLAGS
+@@ -1489,7 +1489,7 @@ CXX=$CXX
+ CXXFLAGS=$CXXFLAGS
+ path=$path
+ EOF
+-echo "using ABI=\"$ABI\""
++echo "using GMPABI=\"$GMPABI\""
+ echo "      CC=\"$CC\""
+ echo "      CFLAGS=\"$CFLAGS\""
+ echo "      CPPFLAGS=\"$CPPFLAGS\""
+@@ -2012,13 +2012,13 @@ if test "$gmp_asm_syntax_testing" != no;
+       GMP_INCLUDE_MPN(powerpc32/powerpc-defs.m4)
+       case $host in
+         powerpc*-*-aix*)
+-	  case $ABI in
++	  case $GMPABI in
+ 	    64 | aix64) GMP_INCLUDE_MPN(powerpc64/aix.m4) ;;
+             *)          GMP_INCLUDE_MPN(powerpc32/aix.m4) ;;
+           esac
+           ;;
+         powerpc*-*-linux*)
+-	  case $ABI in
++	  case $GMPABI in
+ 	    64) GMP_INCLUDE_MPN(powerpc64/linux64.m4) ;;
+           esac
+           ;;
+@@ -2028,7 +2028,7 @@ if test "$gmp_asm_syntax_testing" != no;
+       GMP_INCLUDE_MPN(powerpc32/aix.m4)
+       ;;
+     sparcv9*-*-* | ultrasparc*-*-* | sparc64-*-*)
+-      case $ABI in
++      case $GMPABI in
+         64)
+           GMP_ASM_SPARC_REGISTER
+           ;;
diff --git a/dev-libs/gmp/gmp-4.1.2.ebuild b/dev-libs/gmp/gmp-4.1.2.ebuild
index 4095d27cedca..a72712e6bb3d 100644
--- a/dev-libs/gmp/gmp-4.1.2.ebuild
+++ b/dev-libs/gmp/gmp-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.2.ebuild,v 1.25 2004/09/23 04:46:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.2.ebuild,v 1.26 2005/01/27 21:14:06 eradicator Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/dev-libs/gmp/gmp-4.1.3.ebuild b/dev-libs/gmp/gmp-4.1.3.ebuild
index 46892594cae4..b3d48efd7dc9 100644
--- a/dev-libs/gmp/gmp-4.1.3.ebuild
+++ b/dev-libs/gmp/gmp-4.1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.3.ebuild,v 1.11 2004/11/06 02:11:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.3.ebuild,v 1.12 2005/01/27 21:14:06 eradicator Exp $
 
 inherit flag-o-matic libtool eutils
 
diff --git a/dev-libs/gmp/gmp-4.1.4.ebuild b/dev-libs/gmp/gmp-4.1.4.ebuild
index 40639476500f..b79f21ecbc89 100644
--- a/dev-libs/gmp/gmp-4.1.4.ebuild
+++ b/dev-libs/gmp/gmp-4.1.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4.ebuild,v 1.8 2004/12/21 17:00:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4.ebuild,v 1.9 2005/01/27 21:14:06 eradicator Exp $
 
-inherit flag-o-matic libtool eutils
+inherit flag-o-matic libtool eutils multilib
 
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
 SRC_URI="mirror://gnu/gmp/${P}.tar.gz"
@@ -30,13 +30,24 @@ src_unpack () {
 	# to remove the use of the '.' form in ppc64 assembler
 	if use ppc64 ; then
 		epatch ${FILESDIR}/ppc64-gmp-acinclude.patch
-		autoreconf || die
 	fi
 
 	# fix problems for -O3 or higher; bug #66780
-	use amd64 && epatch ${FILESDIR}/amd64.patch
+	if use amd64; then
+		epatch ${FILESDIR}/amd64.patch
+	fi
+
+	if has_multilib_profile; then
+		epatch ${FILESDIR}/${PN}-4.1.4-multilib.patch
+	fi
 
-	elibtoolize
+	if use ppc64 || has_multilib_profile; then
+		export WANT_AUTOCONF=2.5
+		libtoolize --copy --force
+		autoreconf || die
+	else
+		elibtoolize
+	fi
 }
 
 src_compile() {