commit:     f5d53e285fa32a7a326d4fef664cf15d1b5298ab
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 12:44:18 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 12:49:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d53e28

dev-libs/double-conversion: Drop 3.1.4-r1

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/double-conversion/Manifest                |  1 -
 .../double-conversion-3.1.4-r1.ebuild              | 58 --------------------
 .../0001-CMake-install-to-correct-lib-dir.patch    | 63 ----------------------
 3 files changed, 122 deletions(-)

diff --git a/dev-libs/double-conversion/Manifest 
b/dev-libs/double-conversion/Manifest
index 6166c3613fb..4cf74861afc 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1,2 +1 @@
-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

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 055a8017e28..00000000000
--- 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/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 3dbbfafec11..00000000000
--- 
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 <ja...@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 <ja...@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
-

Reply via email to