bump to 2.3.1, remove old

Package-Manager: portage-2.1.9.49/cvs/Linux i686

5 files changed, 17 insertions, 140 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/Manifest b/sci-libs/mpir/Manifest
index 75407a76babb..7ea7e598ca15 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,31 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX mpir-1.3.0-ABI-multilib.patch 3903 RMD160 3f961212097a7957f2cc831929c545cfc3e80e2b SHA1 cda3a90665716132f5078eedb0fdfca2eff3d4b2 SHA256 3db2dc41f385d6c8ce9da8406a42072c8462e6e15eba0b6ff93664ef31c00957
-AUX mpir-2.0.0-yasm.patch 1735 RMD160 70ef89894167b239461c7a10e2a8ac594a553712 SHA1 c74be424e98b1c5c01fa4d3c193bb68a50fda1f7 SHA256 c2217abb8993d5d88e26f6d8b1704a65aa170a0a3c4fad82266b620092173656
 AUX mpir-2.2.0-yasm.patch 2000 RMD160 78f93ced35f5c4bf88c051080b67a26467783653 SHA1 eeed8eb5fc421fb1a530dc7897b9cca581f36f2a SHA256 c1d0e2fc1e844dac937dd2019b406a329c0b9696dddb2afa85c8beaf8d312d1c
-DIST mpir-2.1.3.tar.gz 4699633 RMD160 926de30c19bedeed65cd0cb946152712954caa2e SHA1 fb8c42a55ee6ef6ae293727774d769ee19d83e62 SHA256 9c7a3972eac27e25d143937bbbac58e95d25f09236832e1f8787ac3fae6e0de9
-DIST mpir-2.2.0.tar.bz2 3353301 RMD160 3a2de67d58f5c088a90b5349a8ed734730bea7c7 SHA1 362e0ca49038d84f0a2e18948f915b62211e89be SHA256 81813dca7a1de4be787e389a41b8a3a17531d5422be615e97622c8b37a3abbed
 DIST mpir-2.2.1.tar.bz2 3352215 RMD160 d06e2de92d7610da124b49eb40c5e613cd80e4b8 SHA1 cc2612d0edaaf02785d8a93e1d35fc0c1d404a74 SHA256 172937988ec6d2fba8f280f0e132ab6b8c343c327bd980b69e65163849664372
-EBUILD mpir-2.1.3.ebuild 1697 RMD160 7527750c1d4200eed1943661e1dd1abb258de922 SHA1 33b3a62b4a750508b8d35430865c06a3ba4defdf SHA256 36350025e9f2fae3aa25d611767087efdbc494ca2496053c87cf292f01df3261
-EBUILD mpir-2.2.0.ebuild 1699 RMD160 6bba1cdd6a9be1a636aff79a76a8b0a041c1e1d7 SHA1 3ad478f494a7f28fabf486ff5cde917240f98a68 SHA256 ddc2087db916fa2db11457f48333371080278f8ff90f5366e4f94e8f5f09d0a7
+DIST mpir-2.3.1.tar.bz2 3284025 RMD160 b4605c08f77109625397fcfc2409198cbc024dea SHA1 c0174426a2d0f5b0bac470aceeb0a4da14311a26 SHA256 469c2554cfe34a468319a5efea5071e8a27f511e882355d33a62172fd14894c7
 EBUILD mpir-2.2.1.ebuild 1701 RMD160 7085e37f6abc32da14e79ec589f9624201105a34 SHA1 88adc58e34a5bbba0d642e6e42f110c003cf3ae2 SHA256 f18180fc49b2d43c1bf49c600dc5f36841bcbdb7373eb9f23f7ac3dca4ffbab4
-MISC ChangeLog 877 RMD160 e1a2ca677accb17cb505b2ca8080ab3cfc991b1c SHA1 31bf6b7bb22af386d3c8a9f6f2c4ec3197e2695b SHA256 c1b7199da51b6563ee3c1f9163433c0703abe2b4bfb95c3f8b4be9801de72046
+EBUILD mpir-2.3.1.ebuild 1699 RMD160 45cb6bcd5a94b3ca951a85a957c195d80f94aaa4 SHA1 97a959b005fb5c69e97ebcb4d14d91dbcc4d9eff SHA256 cb8402ccb3d8a01e3f3f7c109896a1f5c7b08404e4ca0ff713d7bd03966578b1
+MISC ChangeLog 1019 RMD160 92c15753d551fdb9fef2ccdcae259fd664fa9d35 SHA1 b302ea480d19ed9b5226f0e55eda20b95f09d23c SHA256 b50ed1bab72fa71e23817f9852e46f4c3403f79ed5b51d34adc808ae5bb6f933
 MISC metadata.xml 784 RMD160 ff84adf5c55fb3f30eae61447ca148041d4e23d8 SHA1 a56f8fe3d0ebcd85d1ae26705eddab41c9879681 SHA256 0188fbe61ac973a5d01ef17bc65013d9855f02cdf80870db9cb9e7211d80a4c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNyZ/qAAoJEPqDWhW0r/LCu8IP/iv/b6VaFbOmBPT9Y7rYr0AP
-CTKyFTrtxPkv10dLu8g1yRC2WAWfRD7UAGxDBM4Si2hENL3k2ucuvHyiHJVH7TqO
-D4IxdjYYlTm/0o49W/w+L1yEHvcqod4vSykLohUHsdEtHszwN1iKyf/w5De1UMDY
-1DHOXbcrIGZ3eDGjV/RF4ywEXYrkHdtupu9ZmAo8gbiDUHndHYt7TlBs9k1jlCSJ
-IbL+wXzcr3lSnGdIbEPeQyStysZygKy1sFtLDsfHtg2CTHlTEZLWjKBv85E8GGkJ
-kCxln7CstA3K4ww64koMhiPkaEgdR1cn1BcAVDEFysYvwsogaf+fVJmBxaC6v/dN
-oPktgOXqljawZMDXcjSwekrQXAeiCtXIKCL+xoieJXMrOSjvr9EALL+XTqU6pcFk
-XznRv+G84fJDYcHt9v1O3HDuu6zVsiEoLpaEtxuZuX8qM8U2ym9SsmQv2oxtiWxF
-lSjXioxkFfNYZ4m2e0buCMuZQxXD6b+nCEjwAFBl+y/8B1XHlo4cmPNf5rgkGskv
-UC+/Dmx9E1X/5ovPxWwa2DuJriRpuQTmkkQvvY4jifrFpER1vPDk13qC0JJnk9XI
-zqbVmQsZZvdzwdIoMqrbe+JmEmzY163uUH4WZp1z+qa5UgOttWHnemAplepsVYdz
-aEKP8+ZjjsAr/ksoOQWd
-=x9tN
+iF4EAREIAAYFAk3OSioACgkQodBTJSDyo66QdgD+O/C48do2Rns1Fwt+PoXCAuf3
+BaBCiKcH9/xZWiqpWAoA/3icxP/7yZRcz7psR0OvF/BQDujsxzADSoCY0oMFScXt
+=qmd0
 -----END PGP SIGNATURE-----
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