bump (bug 452340), remove old

Package-Manager: portage-2.1.11.42/cvs/Linux x86_64
Manifest-Sign-Key: 0x89DEB219565C32BC

5 files changed, 81 insertions, 88 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/Manifest b/sci-libs/mpir/Manifest
index 77e94a62a94f..e90256cfc773 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -4,20 +4,19 @@ Hash: SHA256
 AUX mpir-1.3.0-ABI-multilib.patch 3903 SHA256 3db2dc41f385d6c8ce9da8406a42072c8462e6e15eba0b6ff93664ef31c00957 SHA512 a1b008f7daccb03a5e6c7af6311d96279ff2d052201f54ef32890ad0404e79e179a0a8d60e2adde5a0b487e16325ce2df4d0fd74464411c983e9630833662886 WHIRLPOOL ae123f02a8e2868f19ad27802042ba45d6e40204ecdf982e346e503ef6808d3f6fafd9b4da336db92164327f2af9e59dfd5e51d97876097ba18a60c30a4ef70b
 AUX mpir-2.2.0-yasm.patch 2000 SHA256 c1d0e2fc1e844dac937dd2019b406a329c0b9696dddb2afa85c8beaf8d312d1c SHA512 92efdd03892b2da3a73872ff87801aec73fda119f6b74ab29e4239c9cfc9a47370f05a56f3fe82158855003fb8d880523ea32f4150c5bae2fc2d720e9bf308f2 WHIRLPOOL ad39be4a12468ca41eb3b76c52175e984250f813d965c163cf99935c0d20eb9f7888a15e6f622a631db3564747497d311b1fec904c1851b8f1ad37e247efd985
 AUX mpir-2.5.1-automake-1.12.patch 3388 SHA256 dc003924094f88d89582a5e4d626e67c6edacf8e81ee5080fff34fae1b9f836a SHA512 d96b238d2a0deaae1d5489121db02766bfde34e602cf137a608a862584192694da6bd61a27dce3294c62cb950fdbc80b71302585f9cf4a2ac0e5f68c48a66846 WHIRLPOOL 949cb479df53d8d643fdefa95199c777516b843368ef7c68e40fc85429c2736a4d62bda469c9b08224016af223617c573795f6d4041045c90997511a0513fd28
-DIST mpir-2.2.1.tar.bz2 3352215 SHA256 172937988ec6d2fba8f280f0e132ab6b8c343c327bd980b69e65163849664372
-DIST mpir-2.3.1.tar.bz2 3284025 SHA256 469c2554cfe34a468319a5efea5071e8a27f511e882355d33a62172fd14894c7
-DIST mpir-2.4.0.tar.bz2 3347496 SHA256 01562d0d4e81d7e273eb54dec334e9694cb2e14289944f8713b960f089c3bfa6
+AUX mpir-2.6.0-yasm.patch 1897 SHA256 e7102052ea1bcda73107ec6c89c20a5f8e1233e9b85732d8847e74ba69a322ae SHA512 0ac3f67f9f8e340e02e4e33e84a482388c45cb59c0d62adf316bc94d1450144b0afcaa639ab9f18fe3a5bc74bb6c2730fdf910b036b4a79272aa28276256ec5c WHIRLPOOL eac13201f78bfe52297aa3787d7896f0d1da1d949118991836ef08559a1ec1ad5eba634b8886e47358bed17790ad79aecda028ad9af978a50c7490771c3bd777
+DIST mpir-2.2.1.tar.bz2 3352215 SHA256 172937988ec6d2fba8f280f0e132ab6b8c343c327bd980b69e65163849664372 SHA512 ec5957fc84aca1da0d837974b77c11af85df9522cbcc45be800235ff52b5e3c041050fe249ce97602942c6859c17bd0f90666bb4c150ad4b43be6c2030d0145e WHIRLPOOL e0c9b7d13c4e01e2fbed13f0149a77470ac0779a16c8f9f9d595be03ab57a52e1c3b70d61c2cb4f806c47f05cecf35888985826c1cd74a9812ae3a970ed8317a
 DIST mpir-2.5.1.tar.lzma 2515775 SHA256 70d5855db369e96eb62fa9db06b0930fda4b82a0d9062c208b02862efc2fe4ac SHA512 40af2f6e5ec5e4ad0330538e6e617adc2ae917d608f7130abd9e7cba95659258eb9bd86838fddbcaa942c21d05f059f54772918da05a5940aa00bd43ebc32c00 WHIRLPOOL f12f4a26e0bb9014feeac788ab3db33ddb6f46e06576a71c70c2bcb21bd2fb4f848af748a6610b003a9348e6328390194bb9bffe39431ba273dc327039111d15
+DIST mpir-2.6.0.tar.lzma 2472231 SHA256 2d2cd75a21a73bcd8898f092e4f123016b578288d7c7eab2df05df5e1921695f SHA512 e2608beeb72651c9b2e47f8fb2bcf672f8c74e2cd622e17cd19b12100b66e929ee31d102d2901816379b23aee1a3ea3a854e3e10ebffe2a6e4772748858f911d WHIRLPOOL 4759be848778fc4f34e87083e83e3697bfb57b9c9360ab69666afadc1b2652285a3c2a4c14321d9091ed90d0df307e89e34875a7592e24c2e405453a0b6f6e06
 EBUILD mpir-2.2.1.ebuild 1697 SHA256 f3c59c5e3f69db7d1bd5d9f8c8658e124a5dfbb0a6839f063e6d5cb383f307f1 SHA512 848fb5c4351f9ae87b4ecb86d0dd6a299dd1eea1c740de0923ad660715a2c5d9fbfc670b64dc9eb76616993d038b1dcd60e8ff1d360843bfb8aa2d034ca92b4f WHIRLPOOL e7cd7d1d066d1824fa436f866443d34e637ef116e75fef7eac34d8921c5f11492a58ebfae1348c10c9ea0ab6123600589a95feb741b756c1c751bcf8851ae5c0
-EBUILD mpir-2.3.1.ebuild 1705 SHA256 752d447901f3c8c79e762fb66e50259c4e1f327d3bb83a16508c1d1950e8a62f SHA512 06d8579b02cee94afa058ff98d22fcff25c1c4e8ef3649e0be8ea5a3f85a5610d0c893456d5cb9c993ae6e4164baa98db485cf6268681866e43e7b15c0420fe9 WHIRLPOOL 2eedbcd5e5b704defbf966ba1b0f91f8b72008a4eb7ca19519e08b98bdb1dcd92eb4c1e00dd2673433d8e228f0718006174fcc1af658fc0a4e1281e76960dfca
-EBUILD mpir-2.4.0.ebuild 1684 SHA256 6c910a6d563b1c763637ffad7a9b2899685400bc888e14e1fdd01098b7c7c6e9 SHA512 04546956c133878a18df838cfcde94e983691cec6cbe3c28a7065c0306867ccd491f42fe0558600fe3513d7fa60925f42ebc1450c2764223242986995a821e89 WHIRLPOOL f7728d282891f6908a609398a881e356666baad582a3decfff9e40216ffc48c08dd53907112844ce0c93403a304b7e12f3f4f866fdc3ba7e704c57dedcc7a906
 EBUILD mpir-2.5.1.ebuild 1714 SHA256 d0df3c1871a60f050db1010c1500df0b3a3fb27fff976fd11b88da7b23c8c849 SHA512 6a20710fca5e6e507fcde087900a5da14835ca840c090ab4764472257c7df33872f4fa54ca0e946828fe80fead01894b535e5eec0412aced22f2af282c590a16 WHIRLPOOL 1625271269e619bc4b1a08c7c661f7d362e606082bb60a314cc7bebf00d75b89fdcd71a2ac0f14fe4a3f59f42c62adba972683b52e48d6d9ebf8b7d14a18cd39
-MISC ChangeLog 1978 SHA256 b5282c9ecd5a9d7c0b31b3b62df1e1284661faa8d0354834569da27ada226621 SHA512 b974df185502d258c431851b701bb32eb3a9623287cd5672c665f170ef7e72782a41d7ab6bf649705f02ed19079a9f510b27533eb8cbbd589e60600dd49cd209 WHIRLPOOL 0f6e03f2e387071892bb985a681a5bcc1be9af5a49c76a1400d09eb091fa053b189b082224eb6424ad7890cf0d5e553e9f306c1368bc6f66a49e8701dadde95c
+EBUILD mpir-2.6.0.ebuild 1711 SHA256 d3e1ea03043fa578741dc1d27336b2ad955210450b62a8bc7e174add3c0db79e SHA512 92f7d0bcb2be1f5b1f47d4189d3c08f0a7343a9cde2fbd893f35c84e1e3b9274702db8fc16eff7969553b0b98ef3b1d64325a8d41e6d6e03bb0880ed8bab8871 WHIRLPOOL 7b2cee1e0fca279ce2064ed1bb908acaa869e749443072bbb8cb06cbe44fb8ceaa4d9607eb73a46001af6c364a64ae85c34042651c5d62774435ea1624e80637
+MISC ChangeLog 2174 SHA256 4a7905db0927c9b2be3dc22abc00d2bbbeaa41d3c6acfe0ac79bf80f9261efaf SHA512 34bd6c36f88eb34660396a6e3caedad107e6d0a037163d9c934b0a8ea65316d387d24ecdd681bad4d6300109d9032efd93a23fc964aacca2da5edfb10de7f77f WHIRLPOOL 9882a9aeaa037dcd852337ce920ceee87e9a0cd88cf08c470120b5ecf009bf27a49bf2f782cba8627bb5c56deccf74508b2fe371346f0b3163759676d92203fd
 MISC metadata.xml 784 SHA256 0188fbe61ac973a5d01ef17bc65013d9855f02cdf80870db9cb9e7211d80a4c1 SHA512 505734b0b37cd6c758e26cd5acd26410fda809321768ec09ab97a1572a21407b4c56f8f5782931fb58845ef353471a3c4379ee0cd4b3b48ee6b67ca0f7da8404 WHIRLPOOL 973b88902920027862b727265cb30015ef8ca804ae1f7c3d4a3073d87204f82c5c027bde8cdc8d9019dd1e3ac3ed6bd99ed42d4bd396f4207a7b10687aff3c38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAcLFMACgkQ1ycZbhPLE2AqSgCffBpib/4y2vYrjfPJe9rSyfYT
-iLUAn3EYxtgfq3Gjyh8iIOf4+4ft8R/Y
-=zxAT
+iF4EAREIAAYFAlD2fWoACgkQid6yGVZcMrxB5QD/UWdSEtZL+GuUCQTqw+B4Cz0v
+DPNFhh7DpyhEjIXyQPkA/3GBXV9OjF2wJDtel4NxS5deEs5sQ2V/7MaGjsdNSYTF
+=mdda
 -----END PGP SIGNATURE-----
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
 }