[gentoo-commits] repo/gentoo:master commit in: dev-libs/leveldb/files/, dev-libs/leveldb/

[Andreas Sturmlechner]

commit:     a81257e3c45a87f4a8454d41656cf2a489b9b9ee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 08:51:29 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 18:04:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a81257e3

dev-libs/leveldb: Drop 1.18-r2, EAPI5--, overshadowed by 1.20

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

 dev-libs/leveldb/Manifest                          |  1 -
 dev-libs/leveldb/files/leveldb-1.18-mips.patch     | 48 ---------------
 .../leveldb/files/leveldb-1.9.0-memenv-so.patch    | 60 ------------------
 dev-libs/leveldb/leveldb-1.18-r2.ebuild            | 72 ----------------------
 4 files changed, 181 deletions(-)

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 5300c8eab87..bc1f7b31856 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,2 +1 @@
-DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2

diff --git a/dev-libs/leveldb/files/leveldb-1.18-mips.patch b/dev-libs/leveldb/files/leveldb-1.18-mips.patch
deleted file mode 100644
index 379223d210b..00000000000
--- a/dev-libs/leveldb/files/leveldb-1.18-mips.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/google/leveldb/pull/272
-
-From f216400e702a51c900f2ce0285fdd6a21d3dd87b Mon Sep 17 00:00:00 2001
-From: Ben Chan <benchan@××××××××.org>
-Date: Thu, 11 Sep 2014 21:38:48 -0700
-Subject: [PATCH] CHROMIUMOS: Add memory barrier implementation for MIPS.
-
-This CL is based on the patch authored by David Turner <digit@××××××.com>,
-see https://code.google.com/p/leveldb/issues/detail?id=109
-
-BUG=chromium:413517
-TEST=`emerge-{x86,amd64,arm,mipsel-o32}-generic leveldb`
-
-Reviewed-on: https://chromium-review.googlesource.com/217834
----
- port/atomic_pointer.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
-index 35ae550..341909e 100644
---- a/port/atomic_pointer.h
-+++ b/port/atomic_pointer.h
-@@ -36,6 +36,8 @@
- #define ARCH_CPU_X86_FAMILY 1
- #elif defined(__ARMEL__)
- #define ARCH_CPU_ARM_FAMILY 1
-+#elif defined(__mips__)
-+#define ARCH_CPU_MIPS_FAMILY 1
- #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc64__)
- #define ARCH_CPU_PPC_FAMILY 1
- #endif
-@@ -83,6 +85,13 @@ inline void MemoryBarrier() {
- }
- #define LEVELDB_HAVE_MEMORY_BARRIER
- 
-+// MIPS
-+#elif defined(ARCH_CPU_MIPS_FAMILY) && defined(__GNUC__)
-+inline void MemoryBarrier() {
-+  __asm__ __volatile__("sync" : : : "memory");
-+}
-+#define LEVELDB_HAVE_MEMORY_BARRIER
-+
- #endif
- 
- // AtomicPointer built using platform-specific MemoryBarrier()
--- 
-2.3.0
-

diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch b/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
deleted file mode 100644
index 0df587a3f9c..00000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-memenv-so.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- leveldb-1.9.0.orig/Makefile	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/Makefile	2014-03-28 22:11:05.000000000 +0000
-@@ -61,37 +61,45 @@
- # Should we build shared libraries?
- ifneq ($(PLATFORM_SHARED_EXT),)
- 
-+SHARED1 = $(PLATFORM_SHARED_EXT)
-+
- ifneq ($(PLATFORM_SHARED_VERSIONED),true)
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1)
- SHARED3 = $(SHARED1)
--SHARED = $(SHARED1)
-+SHARED=%.$(SHARED1)
- else
- # Update db.h if you change these.
- SHARED_MAJOR = 1
- SHARED_MINOR = 9
--SHARED1 = libleveldb.$(PLATFORM_SHARED_EXT)
- SHARED2 = $(SHARED1).$(SHARED_MAJOR)
- SHARED3 = $(SHARED1).$(SHARED_MAJOR).$(SHARED_MINOR)
--SHARED = $(SHARED1) $(SHARED2) $(SHARED3)
--$(SHARED1): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED1)
--$(SHARED2): $(SHARED3)
--	ln -fs $(SHARED3) $(SHARED2)
-+SHARED=%.$(SHARED1) %.$(SHARED2) %.$(SHARED3)
-+%.$(SHARED1): %.$(SHARED3)
-+	ln -fs $< $@
-+%.$(SHARED2): %.$(SHARED3)
-+	ln -fs $< $@
- endif
- 
--$(SHARED3):
--	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SOURCES) -o $(SHARED3) $(LIBS)
-+%.SHARED: $(SHARED)
-+	@true
-+
-+%.$(SHARED3):
-+	$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$*.$(SHARED2) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $^ -o $@ $(LIBS)
-+
-+libleveldb.$(SHARED3): $(SOURCES)
-+libmemenv.$(SHARED3): $(MEMENV_SOURCES)
-+
-+.SECONDARY: $(subst %,libleveldb,$(SHARED)) $(subst %,libmemenv,$(SHARED))
- 
- endif  # PLATFORM_SHARED_EXT
- 
--all: $(SHARED) $(LIBRARY)
-+all: libleveldb.SHARED $(LIBRARY)
- 
- check: all $(PROGRAMS) $(TESTS)
- 	for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done
- 
- clean:
--	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
-+	-rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(subst %,libleveldb,$(SHARED)) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o build_config.mk
- 	-rm -rf ios-x86/* ios-arm/*
- 
- $(LIBRARY): $(LIBOBJECTS)

diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
deleted file mode 100644
index 30880ffd674..00000000000
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib toolchain-funcs versionator
-
-DESCRIPTION="A fast key-value storage library written at Google"
-HOMEPAGE="http://leveldb.org/ https://github.com/google/leveldb"
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
-
-DEPEND="tcmalloc? ( dev-util/google-perftools )
-	snappy? (
-		app-arch/snappy:=
-		static-libs? ( app-arch/snappy[static-libs(-)] )
-	)"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.18-mips.patch
-	epatch "${FILESDIR}"/${PN}-1.18-configure.patch #541186
-
-	local SHARED_MINOR=$(get_version_component_range 2)
-	sed \
-		-e "s/\(^ SHARED_MINOR =\).*/\1 ${SHARED_MINOR}/" \
-		"${FILESDIR}/${PN}-1.9.0-memenv-so.patch" > memenv-so.patch
-	epatch memenv-so.patch
-}
-
-src_configure() {
-	# These vars all get picked up by build_detect_platform
-	# which the Makefile runs for us automatically.
-	tc-export AR CC CXX
-	export OPT="-DNDEBUG ${CPPFLAGS}"
-	local targetos
-	if use kernel_FreeBSD; then
-		targetos="FreeBSD"
-	else
-		targetos="Linux"
-	fi
-
-	TARGET_OS=${targetos} \
-	USE_SNAPPY=$(usex snappy) \
-	USE_TCMALLOC=no \
-	TMPDIR=${T} \
-	sh -x ./build_detect_platform build_config.mk ./
-}
-
-src_compile() {
-	emake $(usex static-libs 'libmemenv.a' 'LIBRARY=') all libmemenv.SHARED
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/include
-	doins -r include/*
-	# This matches the path Debian picked.  Upstream provides no guidance.
-	insinto /usr/include/leveldb/helpers
-	doins helpers/memenv/memenv.h
-
-	dolib.so libleveldb*$(get_libname)*
-	use static-libs && dolib.a libleveldb.a libmemenv.a
-	dolib.so libmemenv*$(get_libname)*
-}