[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/gmp/files/, dev-libs/gmp/

[gentoo-commits] repo/proj/prefix:master commit in: dev-libs/gmp/files/, dev-libs/gmp/

[Fabian Groffen]

commit:     c69d84cfc6301160b8aa3f11e5956fa4c32b2b12
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 16:22:06 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 16:22:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c69d84cf

dev-libs/gmp: sync for bug #579452

Package-Manager: portage-2.2.28-prefix

 dev-libs/gmp/Manifest                              |  4 +--
 .../gmp/files/gmp-6.1.0-noexecstack-detect.patch   | 23 +++++++++++++
 .../gmp/{gmp-6.0.0a.ebuild => gmp-6.1.0.ebuild}    | 39 +++++++++-------------
 dev-libs/gmp/metadata.xml                          |  8 +++--
 4 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 9d523a4..96575c2 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,6 +1,6 @@
 DIST gmp-5.0.5.tar.xz 1671264 SHA256 e87015a825a2445e169931ee27849d52576a2d9e338d1383dcb36fed68d0006f SHA512 79f69ed7959af18e626d4b21b5707ebd7701261ebc2cc9f78fa03c5efa9eb1c1aef2ba8728cdbc34fb09ba333aeba0f88ba7e4d87d6a93b21f936f9d8ee1174a WHIRLPOOL c224f0ce28762e8987b5c5a817d24412d1c85e7bab2f173b138f463cc380d85ab02585d4c2a0e5052c34a405e6cec1f744edb0ee525002d6b77584ff6ecb601b
 DIST gmp-5.1.3.tar.xz 1818812 SHA256 dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071 SHA512 44bbec2b2a6480d4c9a9a633cca4fe0de966c13bc08bdcd8b934d81e21f3dfacaecf273f149dc613d365277d280ecee43cffdafaec1bd1239a7ed903f8658b5b WHIRLPOOL 0c4365a129136655046a8e46c4e2487a981c03de97ec47899f752cbd6e61661c6068b19c547acce8436f7a9af91396545c9bf7aa9de73a0f29384bbfebef927f
-DIST gmp-6.0.0a.tar.xz 1904112 SHA256 9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764 SHA512 50368f4368b244b442438ce1768cf0f1166e490d1bafb8feda1ffc90fea3807e7328f30f3faa861799e4f5ff6e3113049ca3231b2f48571e4583fc3d60441816 WHIRLPOOL 81639a9d433ce9ccb26527af309c7c41437bb3463e5986cce3b35f81b527068a2304ec3287e660454f850dedab61463a077f49d4ea2b7ee87eec94b15730c394
+DIST gmp-6.1.0.tar.xz 1950316 SHA256 68dadacce515b0f8a54f510edf07c1b636492bcdb8e8d54c56eb216225d16989 SHA512 3647f07914e6c01b28d94f2d9783e50b0ca9f742a694f56d5759e79a057143ded578b71707ff909c6b0f5710862974606461608e73b33af3114b5338670d8630 WHIRLPOOL 54de621aa9d7c6896fe454e399b8716743d7ac41e312180f8211c961ec8eb358423e75992aa22ee6809ae57cb143783d271e5c0fca61714a556a12ee55882a05
 DIST gmp-man-5.0.5.pdf 1162914 SHA256 33c7456155bf39704eb1c874849315a925140014b4ad8a8c6f0e07e4fde6a9f2 SHA512 2207266e1187f9951e01f02c6c70eb8bde78fd8d748f144c1bcb10702510f79ee9dd698347d80cac2445112c1554919e734dafd48ebc4662e39b9031b3147544 WHIRLPOOL 1becb075143db9fb26662fed68f760624d381306831a9a58234d5e82303290497bb7b99582a1ab77bd8a72de70e97b516e113264aa307774a4632faf223624c8
 DIST gmp-man-5.1.3.pdf 1159009 SHA256 56b0e21329f46ef1d59c1f191afc82c59f8b72273a8131ed9b5000b7d0689c38 SHA512 ba6a4b0bd2b5ee4d284dd13e9c5531fcb9cfbbbc80f40df458d73c80a1aa250b750cfdd5039998e8b0c7259a8b4d24bd0c7b59a90108f9b680bee62e6948d59e WHIRLPOOL ade206d7e1f543ed028f51e247067eec4511bd0f2499103e1e6296fad2bf50c4f8e09cf7688cc5dd56ee572cf889508ac7918f85e5f91d29d088882f7734a4e0
-DIST gmp-man-6.0.0a.pdf 1187496 SHA256 b38ed1d760b20c01b734b65380ab667373fa48d8203f762a434cd3f326c67a38 SHA512 528972502d65d23b58c47a594a628e648f11cc027bd0894a39b8f892bb421ceabb7f35640a9eede21cea791f5f597ed4661a1f73444c56a6fb31fa6e362d96c2 WHIRLPOOL e6c4eb3a9adc82496a1872223ceb153e05c3aabd2323aeb38064739a5200eb8fc24fa3bb96f5fb1e632cc90a2576bd3966bae3c7a7a0c750ca56faeb30837eea
+DIST gmp-man-6.1.0.pdf 825716 SHA256 c3fea59f39497839b48010e612d0ef898c3efea9c0601a3b4d1597628c8ea40e SHA512 cec172766c6f5dce6b7306edbd542a63788df590391b8b2e6fb4e9d48947b2fbb47dd23acaf74eab6d35cb627bcb804e7ebb1d63aa5f043e4daa4558b698a5a0 WHIRLPOOL afe825c4dbbde11c2c013d6aa3e168d6e59743f647269487df2679d944b5aa748319e455211f2c20137f56e7177ea0543182a4f5bef8274b205b0a3c03254c81

diff --git a/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch b/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch
new file mode 100644
index 0000000..558ba60
--- /dev/null
+++ b/dev-libs/gmp/files/gmp-6.1.0-noexecstack-detect.patch
@@ -0,0 +1,23 @@
+gmp's -Wa,--noexecstack check is based on glibc's, so backport a change
+that went into it there:
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=215a87451d1fd623fd2699fa57f16f8ab6f6a2f3
+https://sourceware.org/bugzilla/show_bug.cgi?id=6428
+
+this is to workaround broken clang assembler that fails w/CFLAGS=-g:
+http://crbug.com/585930
+https://llvm.org/bugs/show_bug.cgi?id=11740
+
+patch has been sent upstream too:
+https://gmplib.org/list-archives/gmp-bugs/2016-February/003916.html
+
+--- a/configure
++++ b/configure
+@@ -11339,7 +11339,7 @@ EOF
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; } \
+      && grep .note.GNU-stack conftest.s >/dev/null \
+-     && { ac_try='${CC} $CFLAGS $CPPFLAGS -Wa,--noexecstack
++     && { ac_try='${CC} $ASMFLAGS -Wa,--noexecstack
+                        -c -o conftest.o conftest.s >/dev/null'
+   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+   (eval $ac_try) 2>&5

diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.1.0.ebuild
similarity index 79%
rename from dev-libs/gmp/gmp-6.0.0a.ebuild
rename to dev-libs/gmp/gmp-6.1.0.ebuild
index 964e773..55b774b 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.1.0.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-6.0.0a.ebuild,v 1.3 2015/03/09 17:53:52 blueness Exp $
+# $Id$
 
-EAPI="4"
+EAPI="5"
 
-inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
+inherit flag-o-matic eutils libtool multilib-minimal
 
 MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
 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
+SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
+	mirror://gnu/${PN}/${MY_P}.tar.xz
 	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
 
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
-SLOT="0"
-
+# The subslot reflects the C & C++ SONAMEs.
+SLOT="0/10.4"
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc cxx pgo static-libs"
+IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
 	app-arch/xz-utils"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
-	!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-)"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P%a}
 
@@ -40,6 +38,8 @@ src_prepare() {
 	# note: we cannot run autotools here as gcc depends on this package
 	elibtoolize
 
+	epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
+
 	# 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
@@ -54,7 +54,7 @@ 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"
+		GMPABI="1.0"
 	fi
 
 	# ABI mappings (needs all architectures supported)
@@ -74,9 +74,8 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf \
 		--localstatedir="${EPREFIX}"/var/state/gmp \
 		--enable-shared \
+		$(use_enable asm assembly) \
 		$(use_enable cxx) \
-		$(use_enable static-libs static) \
-		|| die
 		$(use_enable static-libs static)
 }
 
@@ -115,11 +114,3 @@ multilib_src_install_all() {
 	einstalldocs
 	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${ED}"/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
-}

diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index b419bd1..02ee38f 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer type="project">
+	<email>toolchain@gentoo.org</email>
+	<name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
- <flag name='pgo'>after building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
+	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
+	<flag name="pgo">After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
 </use>
 </pkgmetadata>