bump (bug 452340), remove old

(Portage version: 2.1.11.42/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

4 files changed, 73 insertions, 79 deletions

diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index b02188cbfe86..75b6cdf86a75 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mpir
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.13 2012/08/03 19:53:49 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.14 2013/01/16 10:14:00 tomka Exp $
+
+*mpir-2.6.0 (16 Jan 2013)
+
+  16 Jan 2013; Thomas Kahle <tomka@gentoo.org> +files/mpir-2.6.0-yasm.patch,
+  +mpir-2.6.0.ebuild, -mpir-2.3.1.ebuild, -mpir-2.4.0.ebuild:
+  bump (bug 452340), remove old
 
   03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> mpir-2.5.1.ebuild:
   keyword amd64-linux x86-linux
diff --git a/sci-libs/mpir/files/mpir-2.6.0-yasm.patch b/sci-libs/mpir/files/mpir-2.6.0-yasm.patch
new file mode 100644
index 000000000000..3c6b1881f170
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-2.6.0-yasm.patch
@@ -0,0 +1,52 @@
+diff -U 3 -dHrN mpir-2.6.0.orig/configure.in mpir-2.6.0/configure.in
+--- mpir-2.6.0.orig/configure.in	2013-01-16 10:51:13.141047276 +0100
++++ mpir-2.6.0/configure.in	2013-01-16 10:51:52.437353115 +0100
+@@ -1295,8 +1295,6 @@
+     ;;
+ esac
+ 
+-AM_CONDITIONAL(BUILD_YASM, test "$want_yasm" = "yes")
+-
+ CFLAGS_or_unset=${CFLAGS-'(unset)'}
+ CPPFLAGS_or_unset=${CPPFLAGS-'(unset)'}
+ 
+@@ -1681,7 +1679,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
+@@ -2984,7 +2982,6 @@
+ #        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*)
+diff -U 3 -dHrN mpir-2.6.0.orig/Makefile.am mpir-2.6.0/Makefile.am
+--- mpir-2.6.0.orig/Makefile.am	2013-01-16 10:51:13.121047120 +0100
++++ mpir-2.6.0/Makefile.am	2013-01-16 10:52:25.675611816 +0100
+@@ -98,10 +98,6 @@
+ 
+ SUBDIRS = tests
+ 
+-if BUILD_YASM
+-SUBDIRS += yasm
+-endif
+-
+ SUBDIRS += mpn fft mpz mpq mpf printf scanf cxx tune doc
+ 
+ EXTRA_DIST = configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf
+diff -U 3 -dHrN mpir-2.6.0.orig/mpn/Makeasm.am mpir-2.6.0/mpn/Makeasm.am
+--- mpir-2.6.0.orig/mpn/Makeasm.am	2013-01-16 10:51:13.045046528 +0100
++++ mpir-2.6.0/mpn/Makeasm.am	2013-01-16 10:53:25.333076126 +0100
+@@ -119,4 +119,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.3.1.ebuild b/sci-libs/mpir/mpir-2.3.1.ebuild
deleted file mode 100644
index 39ae8e0097f6..000000000000
--- a/sci-libs/mpir/mpir-2.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2011/06/29 19:00:09 ranger 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 ~ppc ~x86"
-IUSE="+cxx cpudetection"
-
-DEPEND="x86? ( dev-lang/yasm )
-	amd64? ( dev-lang/yasm )"
-RDEPEND=""
-
-src_prepare(){
-	epatch \
-		"${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
-	# 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.4.0.ebuild b/sci-libs/mpir/mpir-2.6.0.ebuild
index 39a25e7cde18..5cbdb12fb374 100644
--- a/sci-libs/mpir/mpir-2.4.0.ebuild
+++ b/sci-libs/mpir/mpir-2.6.0.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.4.0.ebuild,v 1.2 2011/08/15 09:22:11 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.6.0.ebuild,v 1.1 2013/01/16 10:14:00 tomka Exp $
 
 EAPI=4
 
 inherit eutils autotools-utils
 
-DESCRIPTION="Library for arbitrary precision integer arithmetic derived from version 4.2.1 of gmp"
+DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
 HOMEPAGE="http://www.mpir.org/"
-SRC_URI="http://www.mpir.org/${P}.tar.bz2"
+SRC_URI="http://www.mpir.org/${P}.tar.lzma"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+cxx cpudetection static-libs"
 
 DEPEND="x86? ( dev-lang/yasm )
 	amd64? ( dev-lang/yasm )"
 RDEPEND=""
 
-src_prepare(){
+src_prepare() {
 	epatch \
-		"${FILESDIR}/${PN}-2.2.0-yasm.patch" \
-		"${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch"
+		"${FILESDIR}"/${PN}-2.6.0-yasm.patch \
+		"${FILESDIR}"/${PN}-1.3.0-ABI-multilib.patch \
+		"${FILESDIR}"/${PN}-2.5.1-automake-1.12.patch
 
 	# In the same way there was QA regarding executable stacks
 	# with GMP we have some here as well. We cannot apply the
@@ -50,12 +51,12 @@ src_prepare(){
 }
 
 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.
-	myeconfargs=(
+	# 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.
+	myeconfargs+=(
 		$(use_enable cxx)
 		$(use_enable cpudetection fat)
-		$(use_enable static-libs static)
 	)
 	autotools-utils_src_configure
 }