gentoo resync : 28.04.2019

4 files changed, 127 insertions, 1 deletions

diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index c90b6b91f33f..59b6ee6f8791 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,3 +1,6 @@
+AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
 DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
+DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 EBUILD double-conversion-3.0.3.ebuild 1345 BLAKE2B 054cea2fe264a7f76cd26b48a72718eb806c22a89e47b697b8163618c62dd4c6c112c9030aef9bf42487c63c004413ca86faef3cc99b00132077de4755dc694a SHA512 5f525223d86923f672e0652effd7b30dfcbffa4b507ab4c5151d00b3b427e45619f50eaa4f80ef4750f02041440f47360636436ce4ba19cff6fa2f0b1e19a1e4
-MISC metadata.xml 606 BLAKE2B 6c92fbf6c8247fdaa5f1cdf29f58b91b8374d8b8b4785a408145584030dfd06ba939999626575ea97bd7fcd65c2774f4e0bee6844a00e0f1c28d89f8e117d79f SHA512 0d6b6503f8ac11ede082ac8a1ec267620d5e6cbdb151ebd20cd775e9b832e396c434e6ef6e843d13ceedb9cea7dae002e93564d823161f4ff845053699c3312a
+EBUILD double-conversion-3.1.4-r1.ebuild 1406 BLAKE2B ee2c19ab3f09979f74a8d0ca893f20c6fb6af182903cde3b83dc1cf395bfde2c715d4a62d03d84c04226ccb1f28bb4cf6a5688c02fed5e10873518fd02725df5 SHA512 7df8b0d1ee62142b4c9f74b0187514d7fb1f79efd5cffec13273675576a2f9ab6a89ab2fd54d7dde173159d5adba6f6beb30896088960fb25bc6af221803aee2
+MISC metadata.xml 681 BLAKE2B add558ddf626cde6768c25b9a6c3f004ca0e588e99f247d7c1000ca9e7f572429a2d321af2c39b82b61ad1cf66b87f108a241100f6ef28cf85f8daf172e05489 SHA512 e7eee783d9ed17369d7dabdb78eb1bed547c6d75a527b418fc42815ab161688740633d062d59f6b7b30ca26872b40163a8188eefbb4f2eb19299a8809bd49524
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
new file mode 100644
index 000000000000..12f039be2356
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}/0001-CMake-install-to-correct-lib-dir.patch"
+)
+
+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.a ${BUILD_DIR}/libdouble-conversion.a
+	}
+
+	multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
new file mode 100644
index 000000000000..3dbbfafec111
--- /dev/null
+++ b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
@@ -0,0 +1,63 @@
+From 0d65c903c600d983eabfa5be793fa60c346d8303 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 14 Apr 2019 16:38:10 +0800
+Subject: [PATCH] CMake: install to correct lib dir
+
+64-bit libraries should be installed in /usr/lib64, not in /usr/lib/
+Make the destination lib dir configurable.
+
+Commit e13e72e17692f5dc0036460d734c637b563f3ac7 removed
+include(GNUInstallDirs) and ${CMAKE_INSTALL_LIBDIR} which broke
+installing on 64-bit systems.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ CMakeLists.txt | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9f4be8..2a06c71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,12 +40,13 @@ endif()
+ ####
+ # Installation (https://github.com/forexample/package-example)
+ 
++include(GNUInstallDirs)
++
+ # Layout. This works for all platforms:
+ #   * <prefix>/lib/cmake/<PROJECT-NAME>
+ #   * <prefix>/lib/
+ #   * <prefix>/include/
+-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
+-set(include_install_dir "include")
++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+ 
+ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+ 
+@@ -81,17 +82,17 @@ configure_package_config_file(
+ install(
+     TARGETS double-conversion
+     EXPORT "${targets_export_name}"
+-    LIBRARY DESTINATION "lib"
+-    ARCHIVE DESTINATION "lib"
+-    RUNTIME DESTINATION "bin"
+-    INCLUDES DESTINATION "${include_install_dir}"
++    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+ 
+ # Headers:
+ #   * double-conversion/*.h -> <prefix>/include/double-conversion/*.h
+ install(
+     FILES ${headers}
+-    DESTINATION "${include_install_dir}/double-conversion"
++    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/double-conversion"
+ )
+ 
+ # Config
+-- 
+2.21.0
+
diff --git a/dev-libs/double-conversion/metadata.xml b/dev-libs/double-conversion/metadata.xml
index 2ffe8a46d242..e9ea0aac45f6 100644
--- a/dev-libs/double-conversion/metadata.xml
+++ b/dev-libs/double-conversion/metadata.xml
@@ -5,6 +5,9 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+	</maintainer>
 	<longdescription lang="en">
 		This library consists of efficient conversion routines that have
 		been extracted from the V8 JavaScript engine. The code has been