[gentoo-commits] repo/gentoo:master commit in: dev-libs/double-conversion/files/, dev-libs/double-conversion/
commit: f5d53e285fa32a7a326d4fef664cf15d1b5298ab
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Mar 17 12:44:18 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 17 12:49:45 2020 +
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 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..000
--- 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..000
---
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
-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
- 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:
- # * /lib/cmake/
- # * /lib/
- # * /include/
--set(config_install_dir "lib/cmake/${PROJECT_NAME}")
--set(include_install_dir "include")
-+set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/double-conversion/files/, dev-libs/double-conversion/
commit: 4bcc694c0c386f221bd5ac2c8e1497f4f4c6053a
Author: Jason Zaman gentoo org>
AuthorDate: Sun Apr 14 08:52:34 2019 +
Commit: Jason Zaman gentoo org>
CommitDate: Sun Apr 14 16:27:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcc694c
dev-libs/double-conversion: bump to 3.1.4
Signed-off-by: Jason Zaman gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-libs/double-conversion/Manifest| 1 +
.../double-conversion-3.1.4.ebuild | 57
.../0001-CMake-install-to-correct-lib-dir.patch| 63 ++
3 files changed, 121 insertions(+)
diff --git a/dev-libs/double-conversion/Manifest
b/dev-libs/double-conversion/Manifest
index 73582e8f656..50fee14e1ea 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1 +1,2 @@
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
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4.ebuild
b/dev-libs/double-conversion/double-conversion-3.1.4.ebuild
new file mode 100644
index 000..82f78b5b2f8
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.4.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/2"
+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 000..3dbbfafec11
--- /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
+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
+---
+ 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:
+ # * /lib/cmake/
+ # * /lib/
+ # * /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
