Cleaned out old versions. Fixed 4.1.4 with ABI=standardin bug #81913. amd64 considerations as per bug #79662.

(Portage version: 2.0.51.16)

9 files changed, 17 insertions, 198 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index 69ce68ae33ff..77a8cdfcd67b 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/gmp
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.48 2005/02/15 08:28:37 dragonheart Exp $
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org> -files/longlong.patch,
+  -files/randraw.c.41.diff, -gmp-4.1.2.ebuild, -gmp-4.1.3.ebuild,
+  gmp-4.1.4.ebuild:
+  Cleaned out old versions. Fixed 4.1.4 with ABI=standard as suggested by Leo
+  Laursen <ll_news@stofanet.dk> in bug #81913. amd64 considerations as per 
+  bug #79662.
 
   27 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   +files/gmp-4.1.4-multilib.patch, gmp-4.1.4.ebuild:
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 9f9459372683..d951c5a9ce7e 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,23 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 755cdb64470f2dffb5c6eb3396360aa3 ChangeLog 6286
-MD5 7f0069e02ff9fe7cb4367728fb6fb6f7 gmp-4.1.2.ebuild 1444
-MD5 c9691db1294910d38441c83dd624900d gmp-4.1.3.ebuild 1847
-MD5 fa4fa44386af423802ece789bc22e7b4 gmp-4.1.4.ebuild 1941
+MD5 a5093d134f87f7e614cac4370d7110b9 gmp-4.1.4.ebuild 2009
+MD5 8a8fa3483991de24899b6b2527013101 ChangeLog 6573
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 1dbc1772df649dae89ad8e00042c5b46 files/amd64.patch 1166
-MD5 265f53218c05ee4ac1192b1fee5d5038 files/digest-gmp-4.1.2 62
-MD5 5e16de635136241e3ca3d414a8e1d181 files/digest-gmp-4.1.3 62
 MD5 8c7f521cf77fb56ab019223cf92a6bca files/digest-gmp-4.1.4 62
-MD5 d646f32e97b41529d4ab5066c69bc856 files/longlong.patch 473
 MD5 d70b080c2f0efd82a800ba8a1af7b305 files/ppc64-gmp-acinclude.patch 474
-MD5 8458ecf3c3c6b27f949d1b1c1e6a9cc7 files/randraw.c.41.diff 585
+MD5 1dbc1772df649dae89ad8e00042c5b46 files/amd64.patch 1166
 MD5 ee91d8f397ce79dd0ff7e4ae48a47b21 files/gmp-4.1.4-multilib.patch 2864
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB+V9/ArHZZzCEUG0RAtcLAJ43Oa9cAZ94AnnBxaSA/EhpwlrzLACeIcKW
-0Ujt4xDYmRh/DkNxidhL9/E=
-=4IPA
------END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/files/digest-gmp-4.1.2 b/dev-libs/gmp/files/digest-gmp-4.1.2
deleted file mode 100644
index 0eedbe389fdd..000000000000
--- a/dev-libs/gmp/files/digest-gmp-4.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01c7fbd6abbb8824a22161f6c6bbdaf0 gmp-4.1.2.tar.gz 2159329
diff --git a/dev-libs/gmp/files/digest-gmp-4.1.3 b/dev-libs/gmp/files/digest-gmp-4.1.3
deleted file mode 100644
index 2eb37989469b..000000000000
--- a/dev-libs/gmp/files/digest-gmp-4.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdbb9136fa22a0ccf028d0f87aae1dd2 gmp-4.1.3.tar.gz 2198898
diff --git a/dev-libs/gmp/files/longlong.patch b/dev-libs/gmp/files/longlong.patch
deleted file mode 100644
index aa934a3aecb8..000000000000
--- a/dev-libs/gmp/files/longlong.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- longlong.old	2003-10-14 18:52:52.000000000 -0400
-+++ longlong.h	2003-10-14 18:53:52.000000000 -0400
-@@ -715,8 +715,10 @@
-   } while (0)
- #define count_trailing_zeros(count, x)					\
-   do {									\
-+    UDItype __cbtmp;							\
-     ASSERT ((x) != 0);							\
--    __asm__ ("bsfq %1,%0" : "=r" (count) : "rm" ((UDItype)(x)));	\
-+    __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x)));	\
-+   (count) = __cbtmp;							\
-   } while (0)
- #endif /* x86_64 */
- 
diff --git a/dev-libs/gmp/files/randraw.c.41.diff b/dev-libs/gmp/files/randraw.c.41.diff
deleted file mode 100644
index 7eb4ff06937e..000000000000
--- a/dev-libs/gmp/files/randraw.c.41.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: randraw.c
-===================================================================
-RCS file: /home/cvsfiles/gmp/randraw.c,v
-retrieving revision 1.18
-retrieving revision 1.19
-diff -u -r1.18 -r1.19
---- randraw.c	2002/05/14 16:59:44	1.18
-+++ randraw.c	2002/06/09 08:12:03	1.19
-@@ -112,10 +112,8 @@
-   if (seedn == 0)
-     {
-       /* Seed is 0.  Result is C % M.  Assume table is sensibly stored,
--       with C smaller than M*/
-+	 with C smaller than M.  */
-       *rp = c;
--
--      ASSERT_ALWAYS (((mp_limb_t) 1 << m2exp) > c);
- 
-       *seedp = c;
-       SIZ (rstate->_mp_seed) = 1;
diff --git a/dev-libs/gmp/gmp-4.1.2.ebuild b/dev-libs/gmp/gmp-4.1.2.ebuild
deleted file mode 100644
index a72712e6bb3d..000000000000
--- a/dev-libs/gmp/gmp-4.1.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.26 2005/01/27 21:14:06 eradicator Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
-SRC_URI="mirror://gnu/gmp/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha hppa amd64 ia64"
-IUSE=""
-
-DEPEND="sys-apps/gawk
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	sys-devel/gcc
-	virtual/libc"
-
-RDEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-	use amd64 && epatch ${FILESDIR}/longlong.patch
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	elibtoolize
-
-	local myconf=""
-	use sparc || myconf="--enable-mpfr"
-	use hppa && export CHOST="hppa-unknown-linux-gnu"
-
-	econf \
-		--localstatedir=/var/state/gmp \
-		--enable-cxx \
-		--enable-mpbsd \
-		--disable-fft \
-		${myconf} \
-		|| die "configure failed"
-	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
-}
-
-src_test() {
-
-	# the total check is broken due to a deprecated header use
-	# t-locale.cc:24:23: strstream.h: No such file or directory
-	make -C tests/mpf check-TESTS
-
-}
diff --git a/dev-libs/gmp/gmp-4.1.3.ebuild b/dev-libs/gmp/gmp-4.1.3.ebuild
deleted file mode 100644
index b3d48efd7dc9..000000000000
--- a/dev-libs/gmp/gmp-4.1.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.12 2005/01/27 21:14:06 eradicator Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
-SRC_URI="mirror://gnu/gmp/${P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~mips alpha arm hppa amd64 ia64 s390 ppc64"
-IUSE="debug"
-
-DEPEND="sys-apps/gawk
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/libtool
-	sys-devel/gcc
-	virtual/libc"
-
-RDEPEND="virtual/libc"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-
-#   This patch will actually be somewhat short lived as it's really
-#   somewhat of a hack. The toolchain folks (alanm) have a set of patches
-#   to remove the use of the '.' form in ppc64 assembler
-	use ppc64 && epatch ${FILESDIR}/ppc64-gmp-acinclude.patch
-
-	autoreconf
-}
-
-src_compile() {
-	filter-flags -ffast-math
-
-	elibtoolize
-
-	local myconf=""
-	use sparc || myconf="--enable-mpfr"
-	use hppa && export CHOST="hppa-unknown-linux-gnu"
-
-	econf \
-		--localstatedir=/var/state/gmp \
-		--enable-cxx \
-		--enable-mpbsd \
-		${myconf} \
-		|| die "configure failed"
-	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
-}
-
-src_test() {
-
-
-	# It's pretty slow to run all the checks, and not really necessary
-	# on every build of this package.  Just run the checks when
-	# debugging is enabled.  (23 Feb 2003 agriffis)
-	if use debug ; then
-		emake check || die "make check failed"
-	else
-	# Quick partial test
-		make -C tests/cxx/ check-TESTS
-	fi
-
-}
diff --git a/dev-libs/gmp/gmp-4.1.4.ebuild b/dev-libs/gmp/gmp-4.1.4.ebuild
index 3cfe71ee26e6..3b5c5e314f93 100644
--- a/dev-libs/gmp/gmp-4.1.4.ebuild
+++ b/dev-libs/gmp/gmp-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2005/01/27 21:39:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.4.ebuild,v 1.11 2005/02/15 08:28:37 dragonheart Exp $
 
 inherit flag-o-matic libtool eutils multilib
 
@@ -63,6 +63,11 @@ src_compile() {
 		--enable-mpbsd \
 		${myconf} \
 		|| die "configure failed"
+	if use amd64; then
+		export ABI=64
+	else
+		export ABI=standard
+	fi
 	emake || die "emake failed"
 
 }