bump to 2.2.0

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

4 files changed, 133 insertions, 5 deletions

diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index 57e7cfc6ea01..175ed916efe3 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mpir
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.2 2010/11/13 12:51:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.3 2010/12/16 09:55:08 tomka Exp $
+
+*mpir-2.2.0 (16 Dec 2010)
+
+  16 Dec 2010; Thomas Kahle <tomka@gentoo.org> +mpir-2.2.0.ebuild,
+  +files/mpir-2.2.0-yasm.patch:
+  bump to 2.2.0
 
   13 Nov 2010; Justin Lecher <jlec@gentoo.org> mpir-2.1.3.ebuild:
   Some QA
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index d00c3312e6b7..29f417ab0e08 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 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
 EBUILD mpir-2.1.3.ebuild 1697 RMD160 7527750c1d4200eed1943661e1dd1abb258de922 SHA1 33b3a62b4a750508b8d35430865c06a3ba4defdf SHA256 36350025e9f2fae3aa25d611767087efdbc494ca2496053c87cf292f01df3261
-MISC ChangeLog 512 RMD160 189f684ce4d342ebd5f09e302158c80267b53f00 SHA1 a51a1ee815dce0afe6f7ca09362e768e926f3b64 SHA256 1f2a2bdcc301b722c535c080e50a9f006b676fed2324e44ae5963da9fcf32e35
+EBUILD mpir-2.2.0.ebuild 1699 RMD160 6bba1cdd6a9be1a636aff79a76a8b0a041c1e1d7 SHA1 3ad478f494a7f28fabf486ff5cde917240f98a68 SHA256 ddc2087db916fa2db11457f48333371080278f8ff90f5366e4f94e8f5f09d0a7
+MISC ChangeLog 656 RMD160 331f3bbd74a63a9066769ae963fc8c35b5a9770e SHA1 04baaa47c736ca922cda767e1397f7c6862895b4 SHA256 e924dc136d68f2f7d9e95cc0b15f64ae9c11bc06d027526ce4b9e0f201357d75
 MISC metadata.xml 784 RMD160 ff84adf5c55fb3f30eae61447ca148041d4e23d8 SHA1 a56f8fe3d0ebcd85d1ae26705eddab41c9879681 SHA256 0188fbe61ac973a5d01ef17bc65013d9855f02cdf80870db9cb9e7211d80a4c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzeidoACgkQgAnW8HDreRZXMQCcDNbkAGnAuOmXjp+jPMUHOLTx
-BvUAn3Zha49RBSwyeEQ9C5QCgQOj7YHH
-=Hw2y
+iEYEARECAAYFAk0J4gMACgkQnZsgo/h8kNYPEgCfamm2gitbG4IyW4aDpoiRdEHh
+9XoAnR0WQCAd5ml3Y6vJHtGdyPI5L0bR
+=hOvB
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mpir/files/mpir-2.2.0-yasm.patch b/sci-libs/mpir/files/mpir-2.2.0-yasm.patch
new file mode 100644
index 000000000000..e717891a4e64
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-2.2.0-yasm.patch
@@ -0,0 +1,54 @@
+diff -U 3 -dHrN mpir-2.2.0.orig/configure.in mpir-2.2.0/configure.in
+--- mpir-2.2.0.orig/configure.in	2010-12-16 10:16:19.000000000 +0100
++++ mpir-2.2.0/configure.in	2010-12-16 10:16:53.000000000 +0100
+@@ -1455,8 +1455,6 @@
+     ;;
+ esac
+ 
+-AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes")
+-
+ CFLAGS_or_unset=${CFLAGS-'(unset)'}
+ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
+ 
+@@ -1848,7 +1846,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
+@@ -3161,9 +3159,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])
+-
+ case $host in
+   *-w64-mingw*)
+ 	if test $enable_fat = yes; then
+diff -U 3 -dHrN mpir-2.2.0.orig/Makefile.am mpir-2.2.0/Makefile.am
+--- mpir-2.2.0.orig/Makefile.am	2010-12-16 10:16:21.000000000 +0100
++++ mpir-2.2.0/Makefile.am	2010-12-16 10:17:19.000000000 +0100
+@@ -95,10 +95,6 @@
+ 
+ SUBDIRS = tests
+ 
+-if BUILD_YASM
+-SUBDIRS += yasm
+-endif
+-
+ SUBDIRS += mpn mpz mpq mpf printf scanf cxx tune doc
+ 
+ EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
+diff -U 3 -dHrN mpir-2.2.0.orig/mpn/Makeasm.am mpir-2.2.0/mpn/Makeasm.am
+--- mpir-2.2.0.orig/mpn/Makeasm.am	2010-12-16 10:16:18.000000000 +0100
++++ mpir-2.2.0/mpn/Makeasm.am	2010-12-16 10:16:35.000000000 +0100
+@@ -112,4 +112,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)/'`$<
diff --git a/sci-libs/mpir/mpir-2.2.0.ebuild b/sci-libs/mpir/mpir-2.2.0.ebuild
new file mode 100644
index 000000000000..673e770d6eca
--- /dev/null
+++ b/sci-libs/mpir/mpir-2.2.0.ebuild
@@ -0,0 +1,65 @@
+# 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.2.0.ebuild,v 1.1 2010/12/16 09:55:08 tomka 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.bz2"
+
+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}-${PV}-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
+}