gentoo resync : 28.12.2017

4 files changed, 69 insertions, 4 deletions

diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 2ff5c7129456..dc14c1f8162c 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,9 +1,11 @@
 AUX mpc-1.0.3-mpfr-4.0.0.patch 3095 BLAKE2B abc3625c12590b3cdab86f81f211b0235e2553a92a32e57fc08b43312dffab126d7ea063dc91aaa93b6df72203f44d1a266b47c2f764ecaf2819f5ac3df3c7d7 SHA512 ecaf150fffba88b613d0526c9d8fcb948fffb9fa38b8a4b2d08410a9948847c3409cffe424fb9f4ccac74f9b7cfdb010db3c6cf861fe44fe8f789a1a5c1837e6
+AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
 DIST mpc-1.0.1.tar.gz 624125 BLAKE2B ba5c63f5e0cdcff2cfd5b93d152f70422232bca472b5153209b525794e338f11bdd0e371a055535aa31bb3b8991a5f6ef645b1bf2393027803bf84c0d4346991 SHA512 fa381e75999bba626ba08d73225285b03c6d2f6cca87881b28829925d1624eaed1c9b544f75e7281cf5d8dcdd7831025a4eafc05f88f13375f9e08239a8a9303
 DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 EBUILD mpc-1.0.1.ebuild 1234 BLAKE2B 6dead805fb50ba9ba666489508a3651fa9caeaf96941aacd3a387ea071b4e78a42cb1f14b5f847873fe402377ef0fcc7dd325d0567318f20f42f2d892729c8b8 SHA512 f4c78bc29a2f787fc88ca6b9a3f6f6058a152d4aa1367672c99fec73e5c5baaa3659da9db77d8c03f1d792331e0d2983987425f1a75afb7dbbde3db0b9fc366f
 EBUILD mpc-1.0.2-r1.ebuild 996 BLAKE2B 9c36199c2f71d9eeeab7eb92ccfb9db51763cf49ab7888524a5e4b801fe28f0a4173b591b2bb057cca186eda9d55101237d906544a686960a765b07e78396949 SHA512 282f0cb69c00a7777fd4a37a6f750e30ad4af8e68d5c5c47399582d5a509ec7a4756f9c0a85152d2042e612e4d4576d0ebf9b45a1fa25cdf88e40bfd20aa0535
 EBUILD mpc-1.0.2.ebuild 924 BLAKE2B fc40ac815a768a881d9f649345f44c1b9506368ec78b1a27b2703860ad70a1b672e59ad9232a0158716703d3ab4322fe317e6e4079c32bd048d8f79bd718ccc9 SHA512 072141030433d3646010b1a94f5a623bad734dc7e68756b37d3dce20a9f4e8c1482c0958c1bf3628c6251a46cdd82e2a85d364f3187e2bb8cf945b26a7622416
-EBUILD mpc-1.0.3.ebuild 1077 BLAKE2B 0bcc6bf08281c1707c7c23f7ddad442a6c0c17ab9fcc0b24dd6e166da93231c40d0e1187fec941119dc8f4f12263e550b129f1f89165701f5dcd049d6ea1dfc7 SHA512 903265d0b159ea09f93eb6d855eb775ed400c01fd04300840fe117ee9e6864694f586835ce0d39185179e29566cdb94cbd619b53c595de2832419b41702791ac
+EBUILD mpc-1.0.3-r1.ebuild 1138 BLAKE2B 45c91b468a2d84794a03e415295fe430ff70b1e6d0e4bbab8f0bf4009c0f1cd5b80901b309007f72fd3e15dc9a1d5ced8b3c1d148534a4418e03c6f32b87ed39 SHA512 f683e3615ef491ed160fe782bf5a1a5ce380b88a9be00b34de837fab324841016c405a467250e2546510f26e75c58cea5bb00ef96ef88d6f70bc8eec2feab27b
+EBUILD mpc-1.0.3.ebuild 1010 BLAKE2B 0a3d2092c5164964148e96ecefc789cbc842ae4cd013c310d8c37c10c168d782a3f70c2480dfe03958505498e87c6ee6a135f87eede1f3831ba13e7b40e33053 SHA512 0ff8e3a6ed9c7c8ec8c937e3aa7acd31384044a06d7c90a59994108b320dd2eb480e0c90828d0ee29341c24934c898c4b2217435c4cfc536811efe07d40ab19f
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch
new file mode 100644
index 000000000000..445e94191030
--- /dev/null
+++ b/dev-libs/mpc/files/mpc-1.0.3-no-ulp.patch
@@ -0,0 +1,25 @@
+mpfr-4.0.0 removed 'mpfr_add_one_ulp' and 'mpfr_sub_one_ulp'
+
+From 5eaa17651b759c7856a118835802fecbebcf46ad Mon Sep 17 00:00:00 2001
+From: Paul Zimmermann <Paul.Zimmermann@inria.fr>
+Date: Wed, 4 Oct 2017 22:09:40 +0200
+Subject: [PATCH] replace obsolete mpfr_add_one_ulp/mpfr_sub_one_ulp functions
+
+---
+ src/mpc-impl.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/mpc-impl.h b/src/mpc-impl.h
+index 4026765..5420691 100644
+--- a/src/mpc-impl.h
++++ b/src/mpc-impl.h
+@@ -60,2 +60,4 @@ along with this program. If not, see http://www.gnu.org/licenses/ .
+-#define MPFR_ADD_ONE_ULP(x) mpfr_add_one_ulp (x, GMP_RNDN)
+-#define MPFR_SUB_ONE_ULP(x) mpfr_sub_one_ulp (x, GMP_RNDN)
++#define MPFR_ADD_ONE_ULP(x) \
++  (mpfr_sgn (x) > 0 ? mpfr_nextabove (x) : mpfr_nextbelow (x))
++#define MPFR_SUB_ONE_ULP(x) \
++  (mpfr_sgn (x) > 0 ? mpfr_nextbelow (x) : mpfr_nextabove (x))
+-- 
+2.15.1
+
diff --git a/dev-libs/mpc/mpc-1.0.3-r1.ebuild b/dev-libs/mpc/mpc-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..c35082341337
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.0.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils libtool multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="http://mpc.multiprecision.org/"
+SRC_URI="http://www.multiprecision.org/mpc/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/gmp-4.3.2:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-2.4.2:0=[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mpfr-4.0.0.patch
+	"${FILESDIR}"/${P}-no-ulp.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize #347317
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/mpc/mpc-1.0.3.ebuild b/dev-libs/mpc/mpc-1.0.3.ebuild
index 66845b9d3d0b..198111c0b081 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="4"
 
-inherit autotools eutils libtool multilib-minimal
+inherit eutils libtool multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
 HOMEPAGE="http://mpc.multiprecision.org/"
@@ -19,8 +19,6 @@ DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-mpfr-4.0.0.patch
-	eautoreconf
 	elibtoolize #347317
 }