touch mpir to enable testing on non-x86/amd64 archs. Remove old mpir.

4 files changed, 13 insertions, 49 deletions

diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index 1d62c94d3..15be9c166 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2010; François Bissey <f.r.bissey@massey.ac.nz>
+  -mpir-1.2.2.ebuild, mpir-1.3.1.ebuild:
+  Make the dependency on yasm on x86/amd64 olnly. This will allow testing on
+  other archs. Fix a typo, the ebuild is not under "atack" 
+  anymore. Remove old version.
+
 *mpir-1.2.2 (19 Feb 2010)
 
   19 Feb 2010; François Bissey <f.r.bissey@massey.ac.nz>
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 898c243ea..53407a471 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,9 +1,7 @@
 AUX mpir-1.2.2-yasm.patch 2049 RMD160 33138854e9429ee5fd57fc547a50bfec02aa51bc SHA1 03a513b9a832734324bc6116cf06c4ebca17f2c3 SHA256 483aff2973c89ce78fe46ef965bbbe8e06d7ba8d75bf64c651a1e379ebebe581
 AUX mpir-1.3.0-ABI-multilib.patch 3903 RMD160 3f961212097a7957f2cc831929c545cfc3e80e2b SHA1 cda3a90665716132f5078eedb0fdfca2eff3d4b2 SHA256 3db2dc41f385d6c8ce9da8406a42072c8462e6e15eba0b6ff93664ef31c00957
 AUX mpir-1.3.0-yasm.patch 1741 RMD160 a10820ce5a350f746cab4981ccf40ca9f40e1cca SHA1 5aa4003a7ff6d3f1f4d36734acd90c41cb8b39f0 SHA256 32d1ed07d65b033c70d78cb85ae3cb551ba2f7871d50ad9f3e991abec9bcc5c1
-DIST mpir-1.2.2.tar.gz 4276405 RMD160 11bfa2c4de8c1131498722638f8f2e4242651918 SHA1 bd012e207f2c750dfc23af6ac25b96bdd7009354 SHA256 6e070f6a2cc104596f197ac551cac0a35f64e3de5522891db544a1417b7f908a
 DIST mpir-1.3.1.tar.gz 4359993 RMD160 d80d0e88fcea5508aea34f198a50f5beb20abe0e SHA1 8494bea32a0e1eed1bfc679f118490243bc5a0c6 SHA256 866c4a66904e1a600fe4ee09a485afcc30f1d950c5797b965288babc81009b66
-EBUILD mpir-1.2.2.ebuild 830 RMD160 2c22f6a0328a998c031565f6de6a38a655804317 SHA1 a8a56a6004fdae7868504de6398698b8431451fa SHA256 edd2a1ffeeb6dc8eb69a15931a13cdb59b9347abba78bf55c3d395c650dcc150
-EBUILD mpir-1.3.1.ebuild 1540 RMD160 705a2431edbccc1c414b134af271559914308d67 SHA1 52a16dbfed850771558e45a04a7b0aaad646c5cf SHA256 10f4b42968d7ee657af3aa67760657207e55b43b53bc8a134799b6486a0be6d9
-MISC ChangeLog 1756 RMD160 3e60cc82e6b5da6a6a1915335a0e73064309a5fe SHA1 be6644733fe7cc897ba433764c5d2d52e42d6a7a SHA256 69b0132839d40f6efa7f9201be235cd394ed13de47b5477e11f1656e31403247
+EBUILD mpir-1.3.1.ebuild 1478 RMD160 8766f97c31040c6487b574baf7dc7eeffb511ee2 SHA1 5f5def20670ade166855424e4cf303f1d70147db SHA256 96d520a63f545eeb587904f6bcfa313f4a58fe2ec15159bc658c9b48bd6eddaa
+MISC ChangeLog 2024 RMD160 f4deb5cbebd2990497e54dc7908754631f598217 SHA1 10a3f00b0fa60c974e08737eaa02dad254a30078 SHA256 4c43580d2584fef3baed882898354474779f7fbf01384ef54c80ac559524fcd2
 MISC metadata.xml 516 RMD160 dcd6e4599dfc146ef42a021dcfbaf65444d5b272 SHA1 a922010b05f992381656820c3c93697da3b30b70 SHA256 d4a7736b383f142b29166bca022254c5e4e599a3304886ca73491dd7b5954d76
diff --git a/sci-libs/mpir/mpir-1.2.2.ebuild b/sci-libs/mpir/mpir-1.2.2.ebuild
deleted file mode 100644
index 9e1024480..000000000
--- a/sci-libs/mpir/mpir-1.2.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils versionator autotools
-
-DESCRIPTION="MPIR is a 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/${PN}-$(replace_version_separator 3 -).tar.gz"
-RESTRICT="mirror"
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="nocxx"
-
-DEPEND="dev-lang/yasm"
-RDEPEND=""
-
-src_prepare(){
-	epatch "${FILESDIR}/${P}-yasm.patch"
-	eautoreconf
-}
-
-src_configure() {
-	unset ABI
-
-	econf $(use_enable !nocxx cxx) \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README NEWS
-}
diff --git a/sci-libs/mpir/mpir-1.3.1.ebuild b/sci-libs/mpir/mpir-1.3.1.ebuild
index a08def78a..fc4e8ec6d 100644
--- a/sci-libs/mpir/mpir-1.3.1.ebuild
+++ b/sci-libs/mpir/mpir-1.3.1.ebuild
@@ -16,10 +16,8 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64"
 IUSE="+cxx cpudetection"
 
-# Beware: cpudetection aka fat binaries only works on x86/amd64
-# When we enable more cpus we will have to carefully filter.
-
-DEPEND="dev-lang/yasm"
+DEPEND="x86? ( dev-lang/yasm )
+	amd64? ( dev-lang/yasm )"
 RDEPEND=""
 
 src_prepare(){
@@ -27,14 +25,14 @@ src_prepare(){
 	epatch "${FILESDIR}/${PN}-1.3.0-ABI-multilib.patch"
 	# FIXME: 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 x64/amd64.
+	#        GMP solution as yasm is used, at least on x86/amd64.
 	#        Furthermore we are able to patch config.ac.
 	eautoreconf
 }
 
 src_configure() {
 # beware that cpudetection aka fat binaries is x86/amd64 only.
-# It will need to be filtered when extended to other archs
+# Place mpir in profiles/arch/$arch/package.use.mask when making it available on $arch.
 	econf \
 		$(use_enable cxx) \
 		$(use_enable cpudetection fat) \
@@ -50,5 +48,5 @@ pkg_postinst() {
 	elog "The mpir ebuild is still under development."
 	elog "Help us improve the ebuild in:"
 	elog "http://bugs.gentoo.org/show_bug.cgi?id=293383"
-	elog "This ebuild is known to have an executable atack problem"
+	elog "This ebuild is known to have an executable stack problem"
 }