use systems CC instead of gcc (bug 457912)

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

3 files changed, 75 insertions, 16 deletions

diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index d0abe3cae914..11f0c5565b79 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mpir
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.17 2013/02/18 20:34:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.18 2013/02/19 16:03:02 tomka Exp $
+
+*mpir-2.6.0-r1 (19 Feb 2013)
+
+  19 Feb 2013; Thomas Kahle <tomka@gentoo.org> +mpir-2.6.0-r1.ebuild:
+  use systems CC instead of gcc (bug 457912)
 
   18 Feb 2013; Agostino Sarubbo <ago@gentoo.org> mpir-2.6.0.ebuild:
   Stable for ppc, wrt bug #457822
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index 8aa4d90b4136..edd8819cc1ba 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -10,23 +10,14 @@ DIST mpir-2.5.1.tar.lzma 2515775 SHA256 70d5855db369e96eb62fa9db06b0930fda4b82a0
 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.5.1.ebuild 1714 SHA256 d0df3c1871a60f050db1010c1500df0b3a3fb27fff976fd11b88da7b23c8c849 SHA512 6a20710fca5e6e507fcde087900a5da14835ca840c090ab4764472257c7df33872f4fa54ca0e946828fe80fead01894b535e5eec0412aced22f2af282c590a16 WHIRLPOOL 1625271269e619bc4b1a08c7c661f7d362e606082bb60a314cc7bebf00d75b89fdcd71a2ac0f14fe4a3f59f42c62adba972683b52e48d6d9ebf8b7d14a18cd39
+EBUILD mpir-2.6.0-r1.ebuild 1744 SHA256 9fde8e453636d7b039d9c2e1c64ec11b34a0ffe947cd0affa501e52a5d43da5c SHA512 cf85f514323df162d3f9dfe40da8852cedb8be92175cd18757af32451061a67963b64ebc76c2a829e2e6568cc31c661029d38c6c7fdccd425062e1532bf8f3ab WHIRLPOOL 0d35da9c4edbab30c52414cf22097204a4bde65d6f8e51a5252b5b95387c68a3a9f24469137c441f73a32731ed80b4a52b05d90cc3853b2cd1e77d541074e11a
 EBUILD mpir-2.6.0.ebuild 1706 SHA256 aa3d3113aa4dc848c8f5345fa2e4ac99bdf51c33884be487fcf2f5d00d81d11e SHA512 e2e3c709b9f95c049c6293ca67fb0dc78bdbafd4efddf9ea95c666856ca8906c7d751a5d9b5982bd293d40aba83f7e27aa7fead9c5a1abbb39dafbf09b9dfb66 WHIRLPOOL 7f09b2ddbcfe9de61684f485fcc958b89c507f2b591634109733aada44ebbd4e79ee00d6c543351f2cda9d473765ca2139e3ee007a3da8be78ea4dd211f93c42
-MISC ChangeLog 2483 SHA256 e213a5240dd2610c1c1ef59f3fb2e571b4f18414f9fa1c9fc3dfc3adbb882c7d SHA512 57a9bf1966ade9adfa955a62c10b239f9981c710384cea24811eca6d4577379aad768e09c5cdaa7e101932bddd59e6b52ee52f37751f6961281f649501b9ac00 WHIRLPOOL 42c760502eeb6d17ccccf7a6ca46e3d2f745509040788bb1f5477189d30a37df1dfa4923bbb5c7ccfaf12261d474dafd8cdf86ce4df2090f07280ad37a4e54e0
+MISC ChangeLog 2631 SHA256 b7ab2754703cecff31f2185af46ea41aad5bf526e57d6265e4267e5c1661ab89 SHA512 0c0501a5273089ba59fed8ace91b793dc8b4229443b35cd1eb040dc82e34c2cfcb62f1f43985fa9f82518d49aeba52120ff598e2f32f3b1e34ec3d9b7c33468f WHIRLPOOL 01ba24d78332e0081237187f6c5455979e7da4995267fd1ae61d524c089b30593a0c1686a0b59ca74266861386035342f69fab77b93ab9b7d207cfdf5de21aff
 MISC metadata.xml 784 SHA256 0188fbe61ac973a5d01ef17bc65013d9855f02cdf80870db9cb9e7211d80a4c1 SHA512 505734b0b37cd6c758e26cd5acd26410fda809321768ec09ab97a1572a21407b4c56f8f5782931fb58845ef353471a3c4379ee0cd4b3b48ee6b67ca0f7da8404 WHIRLPOOL 973b88902920027862b727265cb30015ef8ca804ae1f7c3d4a3073d87204f82c5c027bde8cdc8d9019dd1e3ac3ed6bd99ed42d4bd396f4207a7b10687aff3c38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRIo+2AAoJELp701BxlEWfFB0P/i/DixyS1t8LEta+iqO+lYGe
-GQm8rV/HHpy2oQfVP8ixIt4KFh7aWVjmrqdCfvrmAdlQgYH2YIzUU9ZieGMqpzOx
-BA7VTn55ilBatoQEeUDc6T25/fFTXAIIhZDCDiuPn1snzi/HeD/SwDh0wofAVWi7
-vx9rPPJzEw3f9xqb/unBpRO+nLXZos/GWbgFMTOyVKtlRHHFlLn2+IKSrNl4I9/A
-u0u08/95VEEsNy8SuKeBFpOB3fyuu0nN90dWl6imGCdX0njZdrcyLFE/rAcWHPWn
-tFnzVieB/jPLt0gd8yvI7ZE/mW0rzozmC1W/mXE1klLCmu6f/c8GR7+GYIpJbskI
-iYt9vC0hY9RbwiI+3klmYVH/A9W3m0Inwq4yQb9kwhZxZyBRgLfErOqf6917dPYJ
-5pTGdwKHR56jueWxf4f+Cm+7nK1weIDcJc2t7AOT/AxETOKYaxTs9C/rNxrwSphH
-9I8Lu/Mp1nfSbKT9axo/MvXRQVYnaMgyH6ZG9ZmIVskttN3dCgu3tr+RWZUW9vNX
-GUdQ0kJP+z4f5UcE+/pEU0i8v5WTTD7/qaP+ekDwHYwOHCHEEoolW04JXVEmnGO4
-oeAqhOiZHrwDmhN0kWQ2uL0UoSZ4pX6Ry+vjqa8SIWoJe/ugSREvKLNUPXthXoQk
-Qr6gEXtybAQIMSX8XTub
-=oFjP
+iF4EAREIAAYFAlEjojcACgkQid6yGVZcMrzE0AEAjUshq2H7CNJJZwz4iEGq1ulF
+YArK/XvGKXXHgrE3CokA+QHGI8CbfxIAmKfHmoOv4dHeAxQnbE2QqwIouHageQbk
+=p666
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mpir/mpir-2.6.0-r1.ebuild b/sci-libs/mpir/mpir-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..f18e6567c1f8
--- /dev/null
+++ b/sci-libs/mpir/mpir-2.6.0-r1.ebuild
@@ -0,0 +1,63 @@
+# 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.6.0-r1.ebuild,v 1.1 2013/02/19 16:03:02 tomka Exp $
+
+EAPI=4
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
+HOMEPAGE="http://www.mpir.org/"
+SRC_URI="http://www.mpir.org/${P}.tar.lzma"
+
+LICENSE="LGPL-3"
+SLOT="0"
+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() {
+	tc-export CC
+	epatch \
+		"${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
+	# 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"
+	local i
+	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.
+	myeconfargs+=(
+		$(use_enable cxx)
+		$(use_enable cpudetection fat)
+	)
+	autotools-utils_src_configure
+}