[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocksdb/

[Patrick McLean]

commit:     4ac20848528e57c6d1e46b69f7c0058dc03edbe8
Author:     Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Thu Feb 25 23:34:53 2021 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 00:44:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac20848

dev-libs/rocksdb: Version bump, rm old, gflags dep (bug #755662)

Add gflags dep to RDEPEND to fix bug #755662

Closes: https://bugs.gentoo.org/755662
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 dev-libs/rocksdb/Manifest                          |  4 +-
 dev-libs/rocksdb/rocksdb-6.14.5.ebuild             | 49 ----------------------
 ...ksdb-6.14.6.ebuild => rocksdb-6.14.6-r1.ebuild} |  8 ++--
 dev-libs/rocksdb/rocksdb-6.15.2.ebuild             | 49 ----------------------
 ...rocksdb-6.15.4.ebuild => rocksdb-6.15.5.ebuild} |  8 ++--
 5 files changed, 7 insertions(+), 111 deletions(-)

diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index f1845d55405..f885d2d8583 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,4 +1,2 @@
-DIST rocksdb-6.14.5.tar.gz 6396476 BLAKE2B c5fc6e9e306ad428285d2c42958804ff403e14fc6b0c2f1231f49197a98937c0703422e1c14f357fb2b3c138fc038ce46c57cce1d184e4babec3c094b00e5180 SHA512 76e4a5b8a7061e42e9d010d04204429a446c857b29a199456db1f207a4849bedc98c7368346b87fa3a69ee5a3d68abedc943248b960273194a9e71634c767258
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
-DIST rocksdb-6.15.2.tar.gz 6499824 BLAKE2B e0fa1dd2c7a7b03e561690c6ac16b15bfafeb27ce226765a591c365b4c2f665138170e0b37f3c65990d6a78a63dbab1f78b875c4a81ca63df46d9118aab34c00 SHA512 1471776a87f1136a7276fbc4c53a1b69ca40110adf49ac459d6f641c1ef8a75482cff3c9b89482ff4edaa186c9a6d0285d38c544c6abf2931508359cfe4cf1a9
-DIST rocksdb-6.15.4.tar.gz 6499986 BLAKE2B ab0d34f4e8a0b99f695380cc07c886ca292bc0ab3cf34d0b2bc6b6c24e42cb6f1b134997f13843d312964e25a66d62be615d19e005ac1e230172925552ca7bcb SHA512 2c8c7c031f368d329826d00f4e507b532b58dcfc6c75b792a027923b5d916c2a43fb2d4e336d3a6d047a90c0280fb80f0cad3311779d6c5e0d74bcd002cbb246
+DIST rocksdb-6.15.5.tar.gz 6501252 BLAKE2B f85c6b54043019692a7174e41b69625650d072ee4de1f2850628854af4b5672ff7072ab5c41de84bca9ad0713a1eea7ad7c5cca5ba9b3b96c4bd492a01b5e859 SHA512 c0918fd48bc1e57be9e30452c5cd0c2ba627a15012ab6922404d6cddffdf80799e4442b14d03cbe13a9a9acbdf1736c505cc6f5406efefbf68aba71ec05cf5f0

diff --git a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild b/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
deleted file mode 100644
index ba80cbff8eb..00000000000
--- a/dev-libs/rocksdb/rocksdb-6.14.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Embeddable, persistent key-value store for fast storage"
-HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	dev-python/zstandard:=
-	sys-libs/zlib:=
-	jemalloc? ( dev-libs/jemalloc:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DFAIL_ON_WARNINGS=OFF
-		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DPORTABLE=ON
-		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
-		-DWITH_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}

diff --git a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
similarity index 92%
rename from dev-libs/rocksdb/rocksdb-6.14.6.ebuild
rename to dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
index 380bf0d081a..52fa5972a51 100644
--- a/dev-libs/rocksdb/rocksdb-6.14.6.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
@@ -14,18 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
-COMMON_DEPEND="
+DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
+	dev-cpp/gflags:=
 	dev-python/zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(

diff --git a/dev-libs/rocksdb/rocksdb-6.15.2.ebuild b/dev-libs/rocksdb/rocksdb-6.15.2.ebuild
deleted file mode 100644
index 380bf0d081a..00000000000
--- a/dev-libs/rocksdb/rocksdb-6.15.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Embeddable, persistent key-value store for fast storage"
-HOMEPAGE="http://rocksdb.org https://github.com/facebook/rocksdb/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	app-arch/lz4:=
-	app-arch/snappy:=
-	dev-python/zstandard:=
-	sys-libs/zlib:=
-	jemalloc? ( dev-libs/jemalloc:= )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DFAIL_ON_WARNINGS=OFF
-		-DFORCE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
-		-DFORCE_AVX=$(usex cpu_flags_x86_avx ON OFF)
-		-DFORCE_SSE42=$(usex cpu_flags_x86_sse4_2 ON OFF)
-		-DPORTABLE=ON
-		-DWITH_JEMALLOC=$(usex jemalloc ON OFF)
-		-DWITH_TESTS=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/*.a || die
-	fi
-}

diff --git a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
similarity index 93%
rename from dev-libs/rocksdb/rocksdb-6.15.4.ebuild
rename to dev-libs/rocksdb/rocksdb-6.15.5.ebuild
index 82c631ca50f..eca7931e375 100644
--- a/dev-libs/rocksdb/rocksdb-6.15.4.ebuild
+++ b/dev-libs/rocksdb/rocksdb-6.15.5.ebuild
@@ -14,18 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_sse4_2 jemalloc static-libs"
 
-COMMON_DEPEND="
+DEPEND="
 	app-arch/bzip2:=
 	app-arch/lz4:=
 	app-arch/snappy:=
+	dev-cpp/gflags
 	dev-python/zstandard:=
 	sys-libs/zlib:=
 	jemalloc? ( dev-libs/jemalloc:= )
 "
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gflags
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(