gentoo resync : 14.07.2018

4 files changed, 54 insertions, 56 deletions

diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 8ca29ff306b7..93bb7028b417 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,6 +1,4 @@
-AUX double-conversion-2.0.1-scons.patch 350 BLAKE2B 870bb737ed41db86f438743cbb0b19f5fd681438b32647b9a4aa8ade15b36bef7a879a571f1952eccb1a612a9601a3d9d58f808f94488b1541256979f0ec3a41 SHA512 d0f89b18e870f384c729faa993eb72cdd449fe293c2a9a3885dcba0e93884d4e9fc2fad38828798e9ff999f1519f31f9569ae1de1deeae0dff740df7ac16b6f7
-DIST double-conversion-2.0.1.tar.gz 7014148 BLAKE2B df8df63f601076bd827ef95b2a2cde8bec6a85fb6ee81a879556481a168c2a101b3ca130ed6f45ca515281ea139e4a607a03934b05fc0a2fe5bacdf56033f2b3 SHA512 a4773dc95e9267d8426dda976586aa1ba968ead28b118caae9b1b7c123d1eea4aba5b588fde9a109a99a068a79a3a2426f12d6caadea8c548d4250e56eff33a4
 DIST double-conversion-3.0.0.tar.gz 7019526 BLAKE2B 631973dadefa8bbf7e4acffd44968dfbf6b7dbeeb045fbbe0df7824a890991f510131647a52646fcd2b069b8b886a7b66a82434b829bdcb58bd8f503fecc7d18 SHA512 5057af6e72f2aaace56ebdd9a0ddfa34318cbdfeabec5c361b60e6c92f160c8999c046c50f8c6f8d590eb8e97aa70bb6e97ba8148f0dc95dbc42f204fcdc1abf
-EBUILD double-conversion-2.0.1.ebuild 1053 BLAKE2B 4ba64d131e5b5f954ba588ffdc1ae6bb6e51165d9a8d32776bb81be49cd31b33ab790bca1c0dd8f587f701bd43033fb0ad91f4efa86bca8b091e2c6dd1aa3e7e SHA512 dd9bbe6cfd4d816dd6595a76cbf223eecbd8122966bdca2050f3835610fead7ace07c478f1fbd27c291e26f1bea80898eac7f6ebfcf02730d7b896109905fb7d
+EBUILD double-conversion-3.0.0-r1.ebuild 1353 BLAKE2B 5349043968384e1246fe72a352d967dd45ab5e0387da1fd1ea9fa6df5a04fa7038c07a9836861ccd70432c7c5cc052b224ade8701138f26b46d5f7fd69bf0bfe SHA512 5cf8c41a67bea073dbd871aef16103457e5fc26ef4e138b75154821d66c7bd8617cf4291de90bb1e8359e25e87d243ed7d7eb838f3bb77e60f3a14f9a87a6dbe
 EBUILD double-conversion-3.0.0.ebuild 617 BLAKE2B eeeab151a1432c666abf6e5c4340a838d4961b857b7e7ff54f41e39b05915333cb02e18aa53ed38fbcc4894a15d3fdb54ecad429f6c21142e551f8cf08f72cab SHA512 35369bd050c61dbd0ca29f12e360ea81a9320646aeba2763455cedbd746959fcb868eedeb334e2557af717a73350cc5508aac61f3ce910b594ba91210c035ce4
 MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
diff --git a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild b/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
deleted file mode 100644
index 15ab24390e36..000000000000
--- a/dev-libs/double-conversion/double-conversion-2.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit scons-utils eutils toolchain-funcs
-
-DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
-HOMEPAGE="https://github.com/google/double-conversion"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-LIBNAME=lib${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-scons.patch
-}
-
-src_compile() {
-	sed -i -e "s/g++/$(tc-getCXX)/" SConstruct || die
-	escons ${LIBNAME}.so.1
-	use static-libs && escons ${LIBNAME}.a
-}
-
-src_test() {
-	escons run_tests
-	export LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}"
-	./run_tests --list | tr -d '<' | xargs ./run_tests || die
-}
-
-src_install() {
-	dolib.so ${LIBNAME}.so*
-	use static-libs && dolib.a ${LIBNAME}.a
-	insinto /usr/include/double-conversion
-	doins src/{double-conversion,utils}.h
-	dodoc README Changelog AUTHORS
-}
diff --git a/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..786bdf2fd13a
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.0.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+		if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+			mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
+		fi
+
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+	[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+	myinstall() {
+		[[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
+		[[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
+			dolib ${BUILD_DIR}/double-conversion/libdouble-conversion.a
+	}
+
+	multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch b/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
deleted file mode 100644
index da7f2f9cb3a6..000000000000
--- a/dev-libs/double-conversion/files/double-conversion-2.0.1-scons.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct.orig	2014-03-31 12:40:22.186757814 -0700
-+++ SConstruct	2014-03-31 12:46:21.726024868 -0700
-@@ -18,7 +18,8 @@
- # for shared lib, requires scons 2.3.0
- env['SHLIBVERSION'] = '1.0.0'
- 
--CCFLAGS = []
-+CCFLAGS = [os.environ['CXXFLAGS']]
-+
- if int(debug):
-   CCFLAGS.append(ARGUMENTS.get('CXXFLAGS', '-g -Wall -Werror'))
- if int(optimize):