DEBUG -> use debug

6 files changed, 38 insertions, 88 deletions

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index e7172db5c3a4..21b7fe47d481 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,10 +1,8 @@
-MD5 b723fc4f3dbd903ee00e6e753b30fe14 ChangeLog 2773
-MD5 f79eb7d1e38268e11502df71503ea25a gmp-3.1.1-r1.ebuild 1126
-MD5 6a327bb9bf42e555cfc797dc790f0c02 gmp-4.1-r1.ebuild 1224
-MD5 9e739a343ea0e445e667683a03cb09f0 gmp-4.1.2.ebuild 1248
-MD5 b6ce42f308c3d45d6443c30881869cac gmp-4.1.ebuild 1178
 MD5 ffc8c02b002c5b444e1688450be88fca files/digest-gmp-3.1.1-r1 62
-MD5 6fe67063d13e286170b681d7220f6bb7 files/digest-gmp-4.1 60
 MD5 6fe67063d13e286170b681d7220f6bb7 files/digest-gmp-4.1-r1 60
-MD5 265f53218c05ee4ac1192b1fee5d5038 files/digest-gmp-4.1.2 62
 MD5 8458ecf3c3c6b27f949d1b1c1e6a9cc7 files/randraw.c.41.diff 585
+MD5 265f53218c05ee4ac1192b1fee5d5038 files/digest-gmp-4.1.2 62
+MD5 98d1f8810583818e4e667061d2d5ec59 gmp-3.1.1-r1.ebuild 1010
+MD5 cd3c68e3870d04df530125ab40cab9a2 gmp-4.1-r1.ebuild 1070
+MD5 b723fc4f3dbd903ee00e6e753b30fe14 ChangeLog 2773
+MD5 58d8fa2ae9b9f31cf846816df7743732 gmp-4.1.2.ebuild 1243
diff --git a/dev-libs/gmp/files/digest-gmp-4.1 b/dev-libs/gmp/files/digest-gmp-4.1
deleted file mode 100644
index ba4a0292f8d7..000000000000
--- a/dev-libs/gmp/files/digest-gmp-4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d6afbdf7e02615fa16867896ce0e03d3 gmp-4.1.tar.gz 2145387
diff --git a/dev-libs/gmp/gmp-3.1.1-r1.ebuild b/dev-libs/gmp/gmp-3.1.1-r1.ebuild
index 8bde993e817f..cb05f091dc3f 100644
--- a/dev-libs/gmp/gmp-3.1.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-3.1.1-r1.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-3.1.1-r1.ebuild,v 1.12 2003/03/15 14:48:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-3.1.1-r1.ebuild,v 1.13 2003/08/03 02:10:33 vapier Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
-KEYWORDS="x86 sparc "                                                                  
-SLOT="0"    
+SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
+
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc"
+
 DEPEND="virtual/glibc
 	~sys-devel/m4-1.4"
 RDEPEND="virtual/glibc"
 
 src_compile() {                           
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --infodir=/usr/share/info				\
-		    --enable-mpfr					\
-		    --enable-mpbsd
-	assert
-
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--enable-mpfr \
+		--enable-mpbsd \
+		|| die
 	make || die
 }
 
diff --git a/dev-libs/gmp/gmp-4.1-r1.ebuild b/dev-libs/gmp/gmp-4.1-r1.ebuild
index 5c9a3e7aba06..88a3f36ac4a2 100644
--- a/dev-libs/gmp/gmp-4.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-4.1-r1.ebuild
@@ -1,39 +1,32 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1-r1.ebuild,v 1.14 2003/03/15 14:48:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1-r1.ebuild,v 1.15 2003/08/03 02:10:33 vapier Exp $
 
 DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
+SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="0"    
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="~sys-devel/m4-1.4"
 
-
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch < ${FILESDIR}/randraw.c.41.diff
+	epatch ${FILESDIR}/randraw.c.41.diff
 }
 
 src_compile() {                           
-	if [ "${ARCH}" = "sparc" ]
-	then
-		econf \
-			--localstatedir=/var/state/gmp \
-			--enable-cxx \
-			--enable-mpbsd || die "configure failed"
-	else
-	        econf \
-        	        --localstatedir=/var/state/gmp \
-               	 	--enable-cxx \
-         	        --enable-mpbsd \
-         	        --enable-mpfr || die "configure failed"
-	fi
+	local myconf=""
+	[ "${ARCH}" != "sparc" ] && myconf="--enable-mpfr"
+        econf \
+		--localstatedir=/var/state/gmp \
+		--enable-cxx \
+		--enable-mpbsd \
+		${myconf} \
+		|| die "configure failed"
 
 	make || die "make failed"
 }
diff --git a/dev-libs/gmp/gmp-4.1.2.ebuild b/dev-libs/gmp/gmp-4.1.2.ebuild
index b7c718c56dd4..ccf11acbc652 100644
--- a/dev-libs/gmp/gmp-4.1.2.ebuild
+++ b/dev-libs/gmp/gmp-4.1.2.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.5 2003/03/15 14:48:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.2.ebuild,v 1.6 2003/08/03 02:10:33 vapier Exp $
 
-inherit flag-o-matic
-inherit libtool
+inherit flag-o-matic libtool
+filter-flags -ffast-math
 
 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"
 
-KEYWORDS="~x86 ~ppc ~sparc alpha"
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha"
 
 DEPEND="~sys-devel/m4-1.4"
 
-filter-flags -ffast-math
-
 src_compile() {
 	elibtoolize
 
@@ -27,14 +25,14 @@ src_compile() {
 		--localstatedir=/var/state/gmp \
 		--enable-cxx \
 		--enable-mpbsd \
-		${myconf} || die "configure failed"
-
+		${myconf} \
+		|| die "configure failed"
 	emake || die "emake failed"
 
 	# 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 [ -n "$DEBUG" ]; then
+	if [ `use debug` ] ; then
 		make check || die "make check failed"
 	fi
 }
diff --git a/dev-libs/gmp/gmp-4.1.ebuild b/dev-libs/gmp/gmp-4.1.ebuild
deleted file mode 100644
index 459d92cd725d..000000000000
--- a/dev-libs/gmp/gmp-4.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-4.1.ebuild,v 1.8 2003/03/15 14:48:09 azarah Exp $
-
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-SRC_URI="ftp://prep.ai.mit.edu/gnu/gmp/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/gmp/gmp.html"
-KEYWORDS="x86 sparc "                                                                  
-SLOT="0"    
-LICENSE="LGPL-2"
-DEPEND="virtual/glibc
-	~sys-devel/m4-1.4"
-RDEPEND="virtual/glibc"
-
-src_compile() {                           
-	./configure \
-		--build=${CHOST} \
-		--host=${CHOST} \
-		--target=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc \
-		--localstatedir=/var/state/gmp \
-		--enable-cxx \
-		--enable-mpbsd \
-		--enable-mpfr || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {                               
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog COPYING* NEWS README
-	dodoc doc/configuration doc/isa_abi_headache
-	dohtml -r doc
-}