bump to 2.3.1, remove old

(Portage version: 2.1.9.49/cvs/Linux i686)

4 files changed, 10 insertions, 120 deletions

diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index aa571ebe8310..d1271c605d43 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mpir
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.5 2011/05/10 20:27:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.6 2011/05/14 09:27:18 tomka Exp $
+
+*mpir-2.3.1 (14 May 2011)
+
+  14 May 2011; Thomas Kahle <tomka@gentoo.org> -mpir-2.2.0.ebuild,
+  +mpir-2.3.1.ebuild:
+  bump to 2.3.1, remove old
 
   10 May 2011; Markos Chandras <hwoarang@gentoo.org> mpir-2.2.1.ebuild:
   Stable on amd64 wrt bug #366377
diff --git a/sci-libs/mpir/files/mpir-2.0.0-yasm.patch b/sci-libs/mpir/files/mpir-2.0.0-yasm.patch
deleted file mode 100644
index 156851bae97e..000000000000
--- a/sci-libs/mpir/files/mpir-2.0.0-yasm.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.in.orig	2010-05-20 22:50:45.883576257 +1200
-+++ configure.in	2010-05-20 22:51:52.405575089 +1200
-@@ -1596,8 +1596,6 @@
-     ;;
- esac
- 
--AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes")
--
- CFLAGS_or_unset=${CFLAGS-'(unset)'}
- CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
- 
-@@ -1995,7 +1993,7 @@
- GMP_CHECK_LIBM_FOR_BUILD
- 
- 
--MPIR_AS="/yasm/yasm"
-+MPIR_AS="yasm"
- 
- # How to assemble, used with CFLAGS etc, see mpn/Makeasm.am.
- # Using the compiler is a lot easier than figuring out how to invoke the
-@@ -3373,9 +3371,6 @@
- # FIXME: Upcoming version of autoconf/automake don't like broken lines.
- #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
- 
--#     allways configure all subdirectorys , even if there are not going to be built , 
--AC_CONFIG_SUBDIRS([yasm])
--
- if test $enable_fat = yes; then
- YASM_MAC_INC=yasm_mac.inc.fat
- else
---- mpn/Makeasm.am.orig	2010-05-20 22:52:23.080577062 +1200
-+++ mpn/Makeasm.am	2010-05-20 22:53:17.802576960 +1200
-@@ -111,4 +111,4 @@
- #  .as assembler, assembled with Yasm
- 
- .as.lo:
--	$(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(top_builddir)$(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+	$(LIBTOOL) --mode=compile --tag=CC $(top_srcdir)/strip_fPIC.sh $(MPIR_AS) -I $(top_builddir) $(OBJECT_FORMAT) $(GSYM_FLAG) -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
---- Makefile.am.orig	2010-05-20 22:57:02.288576440 +1200
-+++ Makefile.am	2010-05-20 22:57:14.616576831 +1200
-@@ -93,10 +93,6 @@
- 
- SUBDIRS = tests
- 
--if BUILD_YASM
--SUBDIRS += yasm
--endif
--
- SUBDIRS += mpn mpz mpq mpf printf scanf cxx demos tune doc
- 
- EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
diff --git a/sci-libs/mpir/mpir-2.1.3.ebuild b/sci-libs/mpir/mpir-2.1.3.ebuild
deleted file mode 100644
index 56e7d8f249bd..000000000000
--- a/sci-libs/mpir/mpir-2.1.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.1.3.ebuild,v 1.2 2010/11/13 12:51:24 jlec Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-DESCRIPTION="Library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp"
-HOMEPAGE="http://www.mpir.org/"
-SRC_URI="http://www.mpir.org/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cxx cpudetection"
-
-DEPEND="x86? ( dev-lang/yasm )
-	amd64? ( dev-lang/yasm )"
-RDEPEND=""
-
-src_prepare(){
-	epatch \
-		"${FILESDIR}/${PN}-2.0.0-yasm.patch" \
-		"${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch"
-	# In the same way there was QA regarding executable stacks
-	# with GMP we have some here as well. We cannot apply the
-	# GMP solution as yasm is used, at least on x86/amd64.
-	# Furthermore we are able to patch config.ac.
-
-	ebegin "Patching assembler files to remove executable sections"
-
-	for i in $(find . -type f -name '*.asm') ; do
-		cat >> $i <<-EOF
-			#if defined(__linux__) && defined(__ELF__)
-			.section .note.GNU-stack,"",%progbits
-			#endif
-		EOF
-	done
-
-	for i in $(find . -type f -name '*.as') ; do
-		cat >> $i <<-EOF
-			%ifidn __OUTPUT_FORMAT__,elf
-			section .note.GNU-stack noalloc noexec nowrite progbits
-			%endif
-		EOF
-	done
-
-	eend
-
-	eautoreconf
-}
-
-src_configure() {
-# beware that cpudetection aka fat binaries is x86/amd64 only.
-# Place mpir in profiles/arch/$arch/package.use.mask when making it available on $arch.
-	econf \
-		$(use_enable cxx) \
-		$(use_enable cpudetection fat)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README NEWS || die
-}
diff --git a/sci-libs/mpir/mpir-2.2.0.ebuild b/sci-libs/mpir/mpir-2.3.1.ebuild
index 673e770d6eca..ce3b4b890dea 100644
--- a/sci-libs/mpir/mpir-2.2.0.ebuild
+++ b/sci-libs/mpir/mpir-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.2.0.ebuild,v 1.1 2010/12/16 09:55:08 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.3.1.ebuild,v 1.1 2011/05/14 09:27:18 tomka Exp $
 
 EAPI="3"
 
@@ -21,7 +21,7 @@ RDEPEND=""
 
 src_prepare(){
 	epatch \
-		"${FILESDIR}/${PN}-${PV}-yasm.patch" \
+		"${FILESDIR}/${PN}-2.2.0-yasm.patch" \
 		"${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch"
 	# In the same way there was QA regarding executable stacks
 	# with GMP we have some here as well. We cannot apply the