Add multilib support #481306 by Alexis Ballier.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 139 insertions, 15 deletions

diff --git a/dev-libs/gmp/ChangeLog b/dev-libs/gmp/ChangeLog
index d0ef094d0b29..996572b1776b 100644
--- a/dev-libs/gmp/ChangeLog
+++ b/dev-libs/gmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/gmp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.179 2013/10/02 22:36:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/ChangeLog,v 1.180 2013/10/12 19:40:19 vapier Exp $
+
+*gmp-5.1.3-r1 (12 Oct 2013)
+
+  12 Oct 2013; Mike Frysinger <vapier@gentoo.org> +gmp-5.1.3-r1.ebuild:
+  Add multilib support #481306 by Alexis Ballier.
 
 *gmp-5.1.3 (02 Oct 2013)
 
diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 5dc698f94f51..f77c0a136c44 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -43,23 +43,24 @@ EBUILD gmp-5.0.5.ebuild 2759 SHA256 5db00b82a974c7da6f5b9b78ea27d5948bc99c5b02d2
 EBUILD gmp-5.1.0.ebuild 3120 SHA256 4210039c47b340af11aaf6455e65a2e86bdb400a192825e942bf2c6a29589ced SHA512 c31a265ad8a23aae3425e80500e0e64cdf9783f003c5768fb2cbafcb264f9608d51254650945ff993c895f64bb50ba24b2c00967ae939b492e9fe7ab7321eaeb WHIRLPOOL ed27f4f3e51eac8a18f41e3ae26c3a522adc09c63ef7d8affcc30222506d9816f7681c1e6650dfb2853f786a2c0a2297b440c78f98764a5775ad24ccb236457c
 EBUILD gmp-5.1.1.ebuild 3068 SHA256 9e50599c1339a519972ada85b6fafb7c5189ea4edaf76e1285023cac36d63e5f SHA512 511b63ab427744f9a73f27193414f52fc2bc596919b9a9b019974de0576c0b1a9ce5c293e8fdd6fa9578ab0ca85d09066ba9e01616d0408a0c89224d7e8fb20d WHIRLPOOL 966a8af3cde957283aefc4d7190185b86cf6d2d9f5f837c80d3744b7b8c6be07b15f480846b29be2ab6d15e14855e30757a36b0e8470f933731e16621c9ee066
 EBUILD gmp-5.1.2.ebuild 3022 SHA256 2c8f0a2227c7dbf458a4dfa9daf0560b3b60b6391c4bd24242054138aeda7905 SHA512 9d3a343945fbfa3afc7ea853e6baca5b950bfc6973ce8ede480c8cddd7dfa5babd6800284a240980763e3b3a8461c0a203433394b2fa5c22b428f76e993021db WHIRLPOOL 4fe671c4b509a5eb64a5bd4c48a9133bc091eba739668999c56093356c8b78339b11c097fa515b8d5e789c18cb78deb7b6cfb1f495b0f5a929c73cfe477f32c5
+EBUILD gmp-5.1.3-r1.ebuild 3130 SHA256 78d4281c78d2fc49d6c89611d23a5affbb816b69646318883cad7c15237483ec SHA512 ee8ce2d190a28a89e598cea92b6a851c4888ec2eba6316fbdb95166ff2897a9627683a1fd2048c1921a15b79941b2a30183372e687ab9b1796bd14e60821ff42 WHIRLPOOL 7bd7ccc6e254a79cc704825f901a02a77320147299fc7aef9519b2fcdf9946a4b9ed9cb8b889c70e4a68bda01e9e506fe8788b8fffb04acb177030df0230a931
 EBUILD gmp-5.1.3.ebuild 3022 SHA256 b463d359f27e3b88357e305128afeff9acfb27a6a78f926ce2f33d3bf723fb6c SHA512 c01a121a0bb563a28de457dd4adfff969880e826740932392b8e6cd9b79b9fe13e40edca58bf01e1fb3c56d56d6d942654257b902a1933dd5ec83068b8ca5886 WHIRLPOOL 110b62a3e533e185c8ed36a97be559edb20a0d3e4168d6269608acc6a94d7c5bf535d96904535172d781632db99026c36242b39342267155f78e22d066a421ce
-MISC ChangeLog 23772 SHA256 b7b885b040c4772c1dc0292c56e0a88e429635870f362910234eb2b39556e77a SHA512 3ce101ef5141b2e1bf1071cceaf6ab1f17d7efa8ab5126c8282673d5ebfc0cbc7187620f3faa329961a272f0eb89d56e70398737263fe4b5370c2492c39a557a WHIRLPOOL 4bad165d30a97382afa0349d1fd03bdb4abe1d5fbc53a87df7492c3aafda0fa62a32d30b3575484c825b691a54daf8613b62a16cad89fdc114166104d669ae4b
+MISC ChangeLog 23924 SHA256 466176abafab992cd165c9a174cd2a5a5f4d569061ac5d35b2ad148ec2bd13eb SHA512 e34723e4e66b7021a24b30884d8bb10ef0bc1d44186cf2299bb3418998ae815684d27ea796096a0bc16d16ad9b16b6d026aadf2b2b617eb853b2ab2e3594d05a WHIRLPOOL 143fe33cd70f59e8a439338a04617a152b5f0ce2a6f1eb6dee7afbbf6e2e9db0be964dde8cc23652c04451846fa1565ad6e0c2debf0b60f83f7ce8939bd99f3c
 MISC metadata.xml 315 SHA256 f6cfb0b2b72dab3e088b68df3d21db3f8463b30571e6de17d1431a57f1bc8d26 SHA512 109d0cbf90eff7264eb6502397024425664d8349229ba334797fcca61852e92ea2c3064579c4765793a69e2811a44ffa63b3091f2ffa5a433dc22ab308a2bcba WHIRLPOOL 3320121476ba2740ee9ee338374cccc853990f229e0cb3a23b5c0ed3e925485f5fd4b797b04ec4ae419eadfc5b9a057dcd9435fe507cca65560e09ad158c1ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSTKAFAAoJELEHsLL7fEFWZzEQALhRXVTLfR2tA6oWGIBEoB3M
-X66Ne+lOWlTXt+WnvOvFQjJLq7KXBkJUt3THjfRwHYH4PIBK98hGDOhvC4Cc+IxQ
-BYy4ZjNu7WVsVjzhiDQnnrvw6mD2FyiLCprhywhSLwp/XldPiWVP0qQZXrktAqK8
-VfSi5IA9tsFcLsf2db/qSyLMuXYCI7frHlBZzLCOCFLXlQRzVlEMAPfOCtoCDt76
-KT7x9VhroTw4zNzYO5hdXilVZ0Hzx3CTgx69xrw0DeIrrGXA8MPI5S14SnEPxs4J
-D79TrKzCMyd6UttYddQZ52BJiahSJC4+aBghTsGBnlcWWjMnG/4CTSBU372o4JPA
-iAMAkUMLBQ3QGCpEj6N6OuQZ5wlw6YBIFsObdcrOg1izOXviSen0I8ttMPcid2Qq
-aYIX+GLXQA/dergHwpakdnguRw8PGP5RtobIZpQWIAn9uyeE6hWoZqvkcV/gXRTe
-/a1hHcNioKli0U7BFvn1J6U2Bo2JjeN/s8Vk1QAesaP/bQyguKU/OGgXjNdriVtI
-jz1xMjB3SaI5FpEzVoJYomatxWka7nuO6uhcwdE7eNaRStkNKLXuJZl6WmxubapE
-ElbVELKVBHZ1T66I2l22BCI8KilRaWYShmjIgE3eX3OJUewsFLMlttOuu4SGpuRP
-uAWgDnlKhz8T7lYqdYCz
-=7hom
+iQIcBAEBCAAGBQJSWaWoAAoJELEHsLL7fEFWm+sQAJRZxz83Ht3jJ+nDzZOSIHlQ
+lVpF0XKNjdGVmwdlhoHNuA8/NwoHTpFUMwoVcCv+ZK8sqlYA49PLDroa9QT9+qFw
+Gjbnbo99xrELsAOAh/swaWXZUb92Z+dNIYMBddvRUBxIDNBY/di0QHHyValdzrNX
+sIvaxinPE37cxtQ/jWi6HgRDU0HIRl6MvVoW6EKtzBhPpHHdBBVtb5Nhxzngmuu+
+sfqEi5Ye90MJT52RHFMFUIoDLVIdRPrUQfOvmr7fzp0TO8mkmlbzOWCnaJHWtOPf
+aouFiEtZ+RxsRPfQGR1ELvAaGR4Q3Ix9rPnSpbckyDfG36c6mWnfYpEMTP69+M/o
+T+80+8kiX3pOYrnMfSG5X2+Szq446ChF2Eh6gPTsJpavRPy8bAbF9eJLTvF4r8LL
+6oOywHEQnShUEoz69OUZHNGKEmJ7tAYHZPRdqmZ9iEJ28zxYVVwqoDU5F3rItMV0
+hOBVZHWuj+336smOwMFvarjqB0Iwyl63qC8ZqJS+2azsqmSkERBE/7KdP+VO2C3v
+RRux6fWFF1uiIicOQ4XXDAi8ocJTh/9HhzK1dj85yGdHyubKzLGbTfednQltZIXe
+R/UGlJWUFiLEAmuAaeF2jD0UDlw0itqupUA42BXKgeizjeh2uG3cWQgBraC4f4oX
+Zao+MrfNUSzF4ruNokz9
+=DxSM
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gmp/gmp-5.1.3-r1.ebuild b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
new file mode 100644
index 000000000000..fe762601c340
--- /dev/null
+++ b/dev-libs/gmp/gmp-5.1.3-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.1 2013/10/12 19:40:19 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
+
+MY_PV=${PV/_p*}
+MY_P=${PN}-${MY_PV}
+PLEVEL=${PV/*p}
+DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
+HOMEPAGE="http://gmplib.org/"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="doc cxx pgo static-libs"
+
+DEPEND="sys-devel/m4
+	app-arch/xz-utils"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
+HTML_DOCS=( doc )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
+
+src_prepare() {
+	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
+	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
+
+	# disable -fPIE -pie in the tests for x86  #236054
+	if use x86 && gcc-specs-pie ; then
+		epatch "${FILESDIR}"/${PN}-5.1.0-x86-nopie-tests.patch
+	fi
+
+	# note: we cannot run autotools here as gcc depends on this package
+	elibtoolize
+
+	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
+	# So, to avoid patching the source constantly, wrap things up.
+	mv configure configure.wrapped || die
+	cat <<-\EOF > configure
+	#!/bin/sh
+	exec env ABI="$GMPABI" "$0.wrapped" "$@"
+	EOF
+	chmod a+rx configure
+}
+
+multilib_src_configure() {
+	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
+	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
+	if [[ ${CHOST} == hppa2.0-* ]] ; then
+		export GMPABI="1.0"
+	fi
+
+	# ABI mappings (needs all architectures supported)
+	case ${ABI} in
+		32|x86)       GMPABI=32;;
+		64|amd64|n64) GMPABI=64;;
+		[onx]32)      GMPABI=${ABI};;
+	esac
+	export GMPABI
+
+	tc-export CC
+	ECONF_SOURCE="${S}" econf \
+		--localstatedir=/var/state/gmp \
+		$(use_enable cxx) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	emake
+
+	if use pgo ; then
+		emake -j1 -C tune tuneup
+		ebegin "Trying to generate tuned data"
+		./tune/tuneup | tee gmp.mparam.h.new
+		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
+			mv gmp-mparam.h.new gmp-mparam.h
+			emake clean
+			emake
+		fi
+	fi
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	# should be a standalone lib
+	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
+	# this requires libgmp
+	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
+	use static-libs \
+		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
+		|| rm -f "${la}"
+}
+
+multilib_src_install_all() {
+	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
+}