gentoo resync : 30.06.2018

4 files changed, 5 insertions, 38 deletions

diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 8f6745dec488..ba76f8a2d1c1 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,10 +1,8 @@
 AUX mpc-1.0.3-mpfr-4.0.0.patch 3748 BLAKE2B 906ee3ff90ab1d9aad58caae7b1185d99d6e09f30f9fe80e9673c0ef499b4fff349b61c6de77502e2e3eecc68ecab6d00453cf1525cb8b404a6f7be9b90ec3b5 SHA512 7ecdc20adce8d71c268e7b090a484441f2b807c19caef637de0bd97cdc12534d7b24f6d7cae80e3c1ecbf7c6445f81cb63b219869797e69de3dbae0e268d9caa
 AUX mpc-1.0.3-no-ulp.patch 904 BLAKE2B 33f96aa9ce60823ac9b84a604ac84c87fd0d4d8eec9b08880f70920aad24775a00cfadf0e76f08274d829f3a7ef03f22d8f440f0207ccaa7f98f1c4911d0beb1 SHA512 22bf9f04ba745d66469a23366d405b7b32bd7454e2240d01995b0dd04e156f23fa1bd842b520799af899ff96650bd050f4675d7a9cba6ebd68ba8fb5d658a0a6
-DIST mpc-1.0.2.tar.gz 633173 BLAKE2B 9d58d8a41bf4a2d7a82842dc1e76f7fc1376dac950919ae72d1cb04fe70132747a22dcbec91391e1f5aa857c96de553aa21548f20f139742ae4b2463df473d63 SHA512 0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
 DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4303d0a31e809d649897bc3547e9b06271dae4e80be569ee67e2a84f86b662e05dac0ca36ff87e95fcbd62 SHA512 0028b76df130720c1fad7de937a0d041224806ce5ef76589f19c7b49d956071a683e2f20d154c192a231e69756b19e48208f2889b0c13950ceb7b3cfaf059a43
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
-EBUILD mpc-1.0.2-r1.ebuild 981 BLAKE2B 71d7b022a3c84d93e7ef8b11aab30f12958275f3e32ca64023318f4d30a24827062571a85e010a39584fb757f8bb6f9e794efd83267b6052ec80049bb1e4610f SHA512 3e2b2b5b6e6d7656fd1a93ee177ac8f1c893f7dd5ba358b7c503a21c8f2160e5d28fe21d12dbb6550e11024454e2f346276a23a073871c6581daaa488fd24ce2
 EBUILD mpc-1.0.3-r2.ebuild 1105 BLAKE2B dc62c597630b6de0c870eff40e6322b75af258926185a296f55353976c3cfa2ff3f4d189f97001de02c1e4b1665f808c1d3944846abe5839775a0aac7bc0f72e SHA512 73fc04828fdf561b94d830a3b2604bccd53e8ef0669a4af28ca8402e797c8eff2e851074874142f1ea23aebbd7def75b4b03b26ff75456d84d368922b7386ec7
-EBUILD mpc-1.0.3.ebuild 993 BLAKE2B 352678502aadd1658d1daf2cf03bc8f8c5cea4675c67cbddb5279a966650b7ca2b6af774d8a99ee24b1040b2d7371fd7c36581521a939db237f90fdfbc9226ce SHA512 62b330fdd8a1dcf0fb94b3638dea88db73a72b36b31c59ac40d67cc56a7ad382799c5fa16ea4b33963acbdb2cb68f464198c4f42f3cb9f0c281420aca599d15e
-EBUILD mpc-1.1.0-r1.ebuild 962 BLAKE2B 5f1682385882d2355e0c7e0046e3466c27516c67aefdf0485b66e5fd3350126c75a2ec5a92ea4d0fb43c6cd1018679aa730e982d30547945f48e99f6fb322199 SHA512 04b2b9ca031d7db8d9b5515c09396574259d8bbf1552db12a3f03126f6857c9a2224c3628f6f37f57d918f513e014ad503ef61b292ee4eaea96068854a022dc2
+EBUILD mpc-1.0.3.ebuild 1015 BLAKE2B afd85b4bcbfebbdea5b2fd505552f81d2b58e1e639fcc6f0eb3f8d88a1235c35fa04151a4f8d7ee4499e77fad87be3b9f63b5ee738af139fdeb95f488d76cb42 SHA512 f0451c7c73564ac34d08a6de5c985c1c34eea2a7a5e44617ee6304fcebe9899ff7f46072685edee15a1e3c75b1f4beff273a871b3109ea77e35072405daa2aab
+EBUILD mpc-1.1.0-r1.ebuild 953 BLAKE2B 8a96c5856edaf54eab23ad5625164636c818b53a0bb66155d8c0fe99b280942d8421fdbafdc988764dbbc03d93b34665ce61d69f6cbe29c113e4abefd787fcfc SHA512 c4435f9c47e4b2c2165fd380b749cfb02ecfb77ddd17fe51afd46e9d8ada086b29f92ead62481327b0a5baca60380bf7b2f57b609b6561ace4ab5ccba535bdfa
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.0.2-r1.ebuild b/dev-libs/mpc/mpc-1.0.2-r1.ebuild
deleted file mode 100644
index ff52574def90..000000000000
--- a/dev-libs/mpc/mpc-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit 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 ~amd64-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[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	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 10ab5b199b70..cabde2f027f2 100644
--- a/dev-libs/mpc/mpc-1.0.3.ebuild
+++ b/dev-libs/mpc/mpc-1.0.3.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-4.3.2[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?]"
+	>=dev-libs/mpfr-2.4.2[${MULTILIB_USEDEP},static-libs?]
+	<dev-libs/mpfr-4.0.0"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index e0916f5d95dd..745967b5ccbd 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
 HOMEPAGE="http://mpc.multiprecision.org/"
-SRC_URI="https://ftp.gnu.org/gnu/mpc/${P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"