gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 126 deletions

diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 69c3ebcc006f..eff76fb1c8c5 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,6 +1,3 @@
-AUX 0001-CMake-install-to-correct-lib-dir.patch 1957 BLAKE2B a8139d2c7474b96526ba983a3d66ae406c5239f04585b0c9156b9f85ce456924ebf6cc0fe052c48670229fbe86523ba40a7d0d37cfd2badc54d0b6cb4b99e8b9 SHA512 1145dffdba811bc09dd76c0f39fc6bae275a1c94ca4700bfa0487db85f48e3a899c0010af39549990d2610bac3d5f0fd6b0faeb000b6c8cd22e2bc6f2c0f8069
-DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
 DIST double-conversion-3.1.5.tar.gz 7023792 BLAKE2B ed70a554bd52e23aadecbeaa6607dfcdb670450b95e2ff699c784512e6cb0c022f51f6ab775ebc5b3c293f991e5200ff5528d689c74dae92e8e68bedf672c5ac SHA512 0aeabdbfa06c3c4802905ac4bf8c2180840577677b47d45e1c91034fe07746428c9db79260ce6bdbdf8b584746066cea9247ba43a9c38155caf1ef44e214180a
-EBUILD double-conversion-3.1.4-r1.ebuild 1413 BLAKE2B 84e0a0d86df46566dfdfd37c1d43fa4667c47ad62f8cb1e274c0ed5f0aa9ffeb9ab019c12be0abc959d152ef37c1d1d8a3f6fcc7bc4d9059f12ae9d0e4ad0006 SHA512 dd10edb94846e496187fbcd4d877e87075426d78616162c0823c934e984da4d82232d996918a78b62dfd43003f2e715b2994c15b22d8be53be9ac073cf00261f
-EBUILD double-conversion-3.1.5.ebuild 456 BLAKE2B cf4218e87915914583c82ccffde6bf92bac0bbaa546394a227e002b713cf746950e815f3327bde1461c5e25c5135b27f4886c239a18f0c34a8e43fa099cdcfc2 SHA512 94f9e80922ae6b45b4e679009729dfd3849ee60f5aeddc177311afe165792e443537b882eccf1dc02cc9f0fad6bbcbeb84cf084569de6cda1f306562e4cc4fe8
+EBUILD double-conversion-3.1.5.ebuild 455 BLAKE2B 6b6456dbf67f13ad2c7c748405e2c541fb2dbc6a9e0548cf57f0d75a615568b05387ba4e0dd7e27c527d813aa4c333750d3ad12298d0245d8a3d92727e0ac71a SHA512 8c6c27d13c2e5c7c89880e4592765d3b29d5f84132fd5126303741255b6a4109f92bced87993a2b6625fed46106fd9b60fc04031ee03aa139d812a4af4bc6f2f
 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
deleted file mode 100644
index 055a8017e283..000000000000
--- a/dev-libs/double-conversion/double-conversion-3.1.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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-linux ~x86-linux"
-IUSE="static-libs test"
-RESTRICT="!test? ( 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/double-conversion-3.1.5.ebuild b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
index 0bc709db3550..678e180ce05e 100644
--- a/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
+++ b/dev-libs/double-conversion/double-conversion-3.1.5.ebuild
@@ -11,4 +11,4 @@ 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-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
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
deleted file mode 100644
index 3dbbfafec111..000000000000
--- a/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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
-