gentoo resync : 20.03.2022

4 files changed, 16 insertions, 50 deletions

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index d3f797580b52..1d45739c45f0 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -5,6 +5,5 @@ AUX leveldb-1.23-system-testdeps.patch 920 BLAKE2B 2e2a01c801ba852e312b13beb3dc7
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
 DIST leveldb-1.23.tar.gz 242925 BLAKE2B ef9ac853cdc2f376b9b4299c1017db8c262cb318ad771f40fe81c9fb71ea06ee56ac533b3e8af4e6fdd28577a2f87cfd103ecb49098187d099ccd6019b8ca1d2 SHA512 ac15eac29387b9f702a901b6567d47a9f8c17cf5c7d8700a77ec771da25158c83b04959c33f3d4de7a3f033ef08f545d14ba823a8d527e21889c4b78065b0f84
 EBUILD leveldb-1.20.ebuild 1696 BLAKE2B cf3635413925eb7fda325336206a17ba3449559e4c70b8f66db79dc0704d4acd5c1f5f08f5e5a9b7b73ebdf9366ab0cb09e94b3957497147e8518e266235414c SHA512 2267e43e96a97110a190882aeb053aee5ef40e6735059989320ba272db5e86a66e384883f10afba274d05c41054f050d22851b89c6be769c6e881e5a9762a681
-EBUILD leveldb-1.23-r1.ebuild 940 BLAKE2B c8845aaaedf9dae20e102864641a6562f402c5e13673b17bc9246b721aeddd2e3a8abf2188a8da5327f66176e9749c900c5a541c564d44a5c0bbe1b1bdfe0004 SHA512 9b34fa37095e60d03c2f04e14bbb774e671bc6eefabcdd15f472c03ca4a72d725a6fd0da442df8ad9d2112043bb3422ac1cc000649a10ee08cd434c47d1011f6
-EBUILD leveldb-1.23-r2.ebuild 1026 BLAKE2B 5b3232e693b5e6314250b9387be8767b19e8e9afee3dc0050d7bdb88a5066102addb0af2261d27222c4f2f2348139c82b73ae610e85440fbab46534396bd305a SHA512 9d8321e5199085c127d11451b136434b1c53a76fc9191ae446e526009aa019edfc8380b045274804beff6bc687d617c93f676e1b07a730a10d928bbd02b6494c
-MISC metadata.xml 511 BLAKE2B 2108f2600f79e95a7afe0d3f2b96afe529ec8b2aec0eba1e4231e902c118b9332f11dd952db93c95f2d6133362d2315435e17da153cf17fb7382da18a8651377 SHA512 44a3726f1dfb71c1abd07b2c3b0c9e0243ac74fa23f87c8564c503d192944879196433e3cae9849ad1fec79f20e72156fed412cbb18d0fbb573d987830f640d4
+EBUILD leveldb-1.23-r3.ebuild 1134 BLAKE2B efba3d4436da5c60522ae83a8a2c9e2358678ee2e54b8a75c16e2fe7c0f1228ba76f1b885fbd65dac9bee02d45474484f4a3249b63993a15fb11f1d22ecd051a SHA512 837a1c5c69162c0e816fc9ae0434bd7385980117725f124fecb5d5eb0f3ec1de9c5978db03b9904101c88688252263168667e97c50c6aaa1a35bd0cda75e06e1
+MISC metadata.xml 392 BLAKE2B 5912a3fb0a2763269de18e8be23215dfb0002d5e4fc4a7cf9870f36a2583bc64497e77320e83ce6437349fde84c5d38a5574e248920d1b26dfb6003e79f809b9 SHA512 7da9c4c217de039a538f7c9e87e102cbcbb843da7a1ffbc773e4f8498bcd39cfc3ee83e7d34298ec77d8ea806bd754f48300ce285ea9d409c823b72f626b67d6
diff --git a/dev-libs/leveldb/leveldb-1.23-r1.ebuild b/dev-libs/leveldb/leveldb-1.23-r1.ebuild
deleted file mode 100644
index 498da29525eb..000000000000
--- a/dev-libs/leveldb/leveldb-1.23-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="crc32c? ( dev-libs/crc32c )
-	snappy? ( app-arch/snappy )
-	tcmalloc? ( dev-util/google-perftools )"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.23-system-testdeps.patch
-	"${FILESDIR}"/${PN}-1.23-remove-benchmark-dep.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-DLEVELDB_BUILD_BENCHMARKS=OFF
-		-DLEVELDB_BUILD_TESTS=$(usex test)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/leveldb/leveldb-1.23-r2.ebuild b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
index 398757537db1..13684bcf2b50 100644
--- a/dev-libs/leveldb/leveldb-1.23-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.23-r3.ebuild
@@ -11,14 +11,15 @@ SRC_URI="https://github.com/google/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+crc32c +snappy +tcmalloc test"
-
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+snappy +tcmalloc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="crc32c? ( dev-libs/crc32c )
-	snappy? ( app-arch/snappy )
-	tcmalloc? ( dev-util/google-perftools )"
+DEPEND="
+	dev-libs/crc32c
+	snappy? ( app-arch/snappy:= )
+	tcmalloc? ( dev-util/google-perftools:= )
+"
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-cpp/gtest )"
 
@@ -34,9 +35,15 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
+		-DHAVE_CRC32C=ON
 		-DLEVELDB_BUILD_BENCHMARKS=OFF
+		-DHAVE_SNAPPY=$(usex snappy)
+		-DHAVE_TCMALLOC=$(usex tcmalloc)
 		-DLEVELDB_BUILD_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }
+
+src_test() {
+	TEST_TMPDIR="${T}" TEMP="${T}" cmake_src_test
+}
diff --git a/dev-libs/leveldb/metadata.xml b/dev-libs/leveldb/metadata.xml
index e937f6bb5998..0c3bde759c88 100644
--- a/dev-libs/leveldb/metadata.xml
+++ b/dev-libs/leveldb/metadata.xml
@@ -9,7 +9,4 @@
 		<remote-id type="github">google/leveldb</remote-id>
 		<bugs-to>https://github.com/google/leveldb/issues</bugs-to>
 	</upstream>
-	<use>
-		<flag name="crc32c">Link against <pkg>dev-libs/crc32c</pkg> for accelerated CRC32C calculation</flag>
-	</use>
 </pkgmetadata>