gentoo resync : 15.01.2020

5 files changed, 5 insertions, 123 deletions

diff --git a/dev-libs/leveldb/Manifest b/dev-libs/leveldb/Manifest
index 1a00fdfac2b3..289c3437eab7 100644
--- a/dev-libs/leveldb/Manifest
+++ b/dev-libs/leveldb/Manifest
@@ -1,11 +1,9 @@
 AUX leveldb-1.18-configure.patch 1452 BLAKE2B d67c8a226fe8640a5c19d7e7d8e293d0ef31dd01c4813794640ca7f40be8e0c09a084205a6dc954748b2877d8fac1b419ddc9d2461a894bf9de8e53b48852926 SHA512 86bae8c8d5d722435bedc68333c97f318847c93503368d815157a46ab15ad1795f8a585027dcecb7a94c338d25eeb69f94df87f2da2cd9f5805838f0a29dc08e
 AUX leveldb-1.18-mips.patch 1399 BLAKE2B ea9bf52ce2c6482c8a43116c5782b2219af3d8a7eafb39a7d0742695b144f50c5f53e33c85ec562c690b78313146eef7a1edf41eb178bb6b9d8e179d87d72576 SHA512 8d968371007d163cbbb87546cbfe246e399f083bacea415f2d8b68355a5d3363df51f34e9bd29ee558ae475414b3c331b7473ef2d7e432ebfa786d55a08b2e54
 AUX leveldb-1.20-memenv-so.patch 1877 BLAKE2B fa75c48f438248ec73765d959bbe746b3b4887d1fbfe1b33287a81a9a3fcb5ffabc5eacc350e214dfc40b78c8df7e6246bbf5a889b5d2fded5101da5a8fb72c0 SHA512 31fd9cafe226ceb83cb9a0b526ef4941e29406a182e366521ba2d78dba9ed3e7f32a088362ff9b751a82e30b12a12acd8f4d38808dde288116170417e4de8200
-AUX leveldb-1.9.0-configure.patch 990 BLAKE2B 8e658003078100ee071d79709532e37edec29aca816cd5864faea8f2cbad6d4212da09a268dec767b695823557f0d38744d13932eb0fcb50dee7ad065018ed92 SHA512 28f08e257d0f067d93ea88ee30719c092660ab7d220a55d4fa1cec5c5fd8195465e374670aa46c7a125f218ae3a689f3bb58ce66ddc720a2fc1caed552ed27e5
-AUX leveldb-1.9.0-forwardcompat.patch 3464 BLAKE2B 628e0898b9648d14bdd8a043b0646d8af0300310b9b03d7224e52b5be2a2be60d39934b1885bb602334aa64f5f3dbcd7d0ed32e936f3575047005f0d27e03438 SHA512 d55d4469a9cb118688233b82df3f19d08a8fb3f53a3d1d990d485a0cb91872eb2fd3699288369a96ee59739be730ce9437f9d1f8b51d095dd014adf475de7824
 AUX leveldb-1.9.0-memenv-so.patch 1957 BLAKE2B b26ddad37bba050ae2626aad164a3e403fc8ff3a050f79b08d11c19aff27d729bbcb51b35489badc4981f6ceee518482b9d8ceb30585dcc28a1a21f86d097413 SHA512 fbd1e43dba18b9dc8717651052323ea71182a758eccc3637f3ab1aade1a5de5b00f6a54ea0a8f34e2b9a91173b72eb23530ae77bc2b1ac0e454e0e2dfffcfd75
 DIST leveldb-1.18.tar.gz 209376 BLAKE2B 08d63fe8aed45d38befd29caddee5a229ff847d254b30be55715793a621e840641d53af47e4fd93286ff0445d6001be26aa00063c075681659f7ceb692184249 SHA512 3d9c55a7bf8692914784ec33c273704ce9978496b071c7b661708f049d0d4ccd51a44441f50c3e536725caeb9896575192f52708a4bb1c0222cecdeec89919a3
 DIST leveldb-1.20.tar.gz 223141 BLAKE2B 57ab5cb191679b8fbfaa28fa0a61ee1dcd757bb9c70215dd325daebfd93b30aa9bbe3c993a1758aa9804a7cd6f2c31df7cf98bdf98320cd1aebc14f5eb77d9a5 SHA512 c59258f2f58ce2d5680e9ab3da4ab0923d91cd4648dcf63cdaa26cdde92bf45e094544539ad11d8e09a4a4813435286143ed0e86c21c6c31a0596903ed4744d2
-EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a2d85d2b76188cf1da2b5651933c085eb91439b7385aaca594d3074124fb771bd858725745a0269e8ecd17e2be5cafbaee13cce5ca32550f0d4069fad3994be4 SHA512 f564389eba2fb0d5189c9dff09c85373990efcd412148e6bd53ab715fac22a29a0a405981768b5c40ed487f68d2aa721196dbfd94cb499e27d769126e2938533
-EBUILD leveldb-1.20.ebuild 1756 BLAKE2B 11c82a4377faf026bd0670f46b3348141cb5837e13fd64110bf99bb71813097825be3aba2302284e69053f553de0b8b424cbe9b5551c326f1bfcc8d387bfbfcc SHA512 518acb56db4cbb85fd7e71bfb5d32de33aa08c6a958bab3fefcb30b738f856b39042d3edda04e0ebdcc5a7c15abaef6acbcb9c1bae9d351d74eb93611a603ed1
+EBUILD leveldb-1.18-r2.ebuild 1866 BLAKE2B a1f89384c07ac4ebc92daea56c8d795fe378275bfc72cbaa8e41ee754176113a936f670b570466fa3824c98eac093e25a8fa1d7c0e6cc6499a3ba5ec499fe8d6 SHA512 8ca2b28ef83e6e08ee85b6d055d6cfc09b4e294c2d68e0c06918a10a009492b5a4bc804e1527fd202cf0adf39a0c0d1e6df2dfbff6b353ca43445ae214909917
+EBUILD leveldb-1.20.ebuild 1755 BLAKE2B 0fe19dead939d81398ad0c54874393300221f7b45a1ec24dda1949ff2080d8d6bf5275efa1a51c83c0251b247cf5fcf4328ca26116ae6cd35dd9450411dba8bf SHA512 125ffe35e50299b19f937fdcd5a0876b5e576555b0bed70ed1cb2a29e908ed626a24f4a39ba4173de1cf0db923f9d8359bf068e640e2f9944e66c65229d79492
 MISC metadata.xml 400 BLAKE2B 770ed89274db8fd29e68bcc792bd9f593ea0785ff4f1651d85902bb0272cfdff3914ecd98e81dea4160ad085e1e0da6938ebfa801b2b5484cf5edd6666908e24 SHA512 b7284da0474b747738d6da09be217c815ec8b333f2b1f571594531fb77ec15a6cf4564b6053dbab84ceb94f3bcc5d16ed374780852920a7ca823df0ed00be5dc
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch b/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
deleted file mode 100644
index d25fe01f6835..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/build_detect_platform b/build_detect_platform
-index 5801d20..4b4bb0d 100755
---- a/build_detect_platform
-+++ b/build_detect_platform
-@@ -169,20 +169,30 @@ EOF
- 
-     # Test whether Snappy library is installed
-     # http://code.google.com/p/snappy/
-+if [ "${USE_SNAPPY:-auto}" = "auto" ]; then
-     $CXX $CXXFLAGS -x c++ - -o /dev/null 2>/dev/null  <<EOF
-       #include <snappy.h>
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_SNAPPY="yes"
-+    fi
-+fi
-+    if [ "$USE_SNAPPY" = "yes" ]; then
-         COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY"
-         PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
-     fi
- 
-     # Test whether tcmalloc is available
-+if [ "${USE_TCMALLOC:-auto}" = "auto" ]; then
-     $CXX $CXXFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null  <<EOF
-       int main() {}
- EOF
-     if [ "$?" = 0 ]; then
-+        USE_TCMALLOC="yes"
-+    fi
-+fi
-+    if [ "$USE_TCMALLOC" = "yes" ]; then
-         PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
-     fi
- fi
diff --git a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch b/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
deleted file mode 100644
index 1c21dbe09ff5..000000000000
--- a/dev-libs/leveldb/files/leveldb-1.9.0-forwardcompat.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ur leveldb-1.9.0.orig/db/db_test.cc leveldb-1.9.0/db/db_test.cc
---- leveldb-1.9.0.orig/db/db_test.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/db_test.cc	2014-03-28 22:58:59.000000000 +0000
-@@ -139,7 +139,7 @@
- 
-     Status s = target()->NewWritableFile(f, r);
-     if (s.ok()) {
--      if (strstr(f.c_str(), ".sst") != NULL) {
-+      if (strstr(f.c_str(), ".sst") != NULL || strstr(f.c_str(), ".ldb") != NULL) {
-         *r = new SSTableFile(this, *r);
-       } else if (strstr(f.c_str(), "MANIFEST") != NULL) {
-         *r = new ManifestFile(this, *r);
-diff -ur leveldb-1.9.0.orig/db/filename.cc leveldb-1.9.0/db/filename.cc
---- leveldb-1.9.0.orig/db/filename.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.cc	2014-03-28 23:07:48.000000000 +0000
-@@ -34,6 +34,11 @@
-   return MakeFileName(name, number, "sst");
- }
- 
-+std::string LDBTableFileName(const std::string& name, uint64_t number) {
-+  assert(number > 0);
-+  return MakeFileName(name, number, "ldb");
-+}
-+
- std::string DescriptorFileName(const std::string& dbname, uint64_t number) {
-   assert(number > 0);
-   char buf[100];
-@@ -106,7 +111,7 @@
-     Slice suffix = rest;
-     if (suffix == Slice(".log")) {
-       *type = kLogFile;
--    } else if (suffix == Slice(".sst")) {
-+    } else if (suffix == Slice(".sst") || suffix == Slice(".ldb")) {
-       *type = kTableFile;
-     } else if (suffix == Slice(".dbtmp")) {
-       *type = kTempFile;
-diff -ur leveldb-1.9.0.orig/db/filename.h leveldb-1.9.0/db/filename.h
---- leveldb-1.9.0.orig/db/filename.h	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/filename.h	2014-03-28 23:07:43.000000000 +0000
-@@ -36,6 +36,7 @@
- // in the db named by "dbname".  The result will be prefixed with
- // "dbname".
- extern std::string TableFileName(const std::string& dbname, uint64_t number);
-+extern std::string LDBTableFileName(const std::string& dbname, uint64_t number);
- 
- // Return the name of the descriptor file for the db named by
- // "dbname" and the specified incarnation number.  The result will be
-diff -ur leveldb-1.9.0.orig/db/repair.cc leveldb-1.9.0/db/repair.cc
---- leveldb-1.9.0.orig/db/repair.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/repair.cc	2014-03-28 23:13:28.000000000 +0000
-@@ -263,6 +263,14 @@
-     std::string fname = TableFileName(dbname_, t->meta.number);
-     int counter = 0;
-     Status status = env_->GetFileSize(fname, &t->meta.file_size);
-+    if (!status.ok()) {
-+      // Try alternate file name.
-+      fname = LDBTableFileName(dbname_, t->meta.number);
-+      Status s2 = env_->GetFileSize(fname, &t->meta.file_size);
-+      if (s2.ok()) {
-+        status = Status::OK();
-+      }
-+    }
-     if (status.ok()) {
-       Iterator* iter = table_cache_->NewIterator(
-           ReadOptions(), t->meta.number, t->meta.file_size);
-diff -ur leveldb-1.9.0.orig/db/table_cache.cc leveldb-1.9.0/db/table_cache.cc
---- leveldb-1.9.0.orig/db/table_cache.cc	2013-01-07 21:07:29.000000000 +0000
-+++ leveldb-1.9.0/db/table_cache.cc	2014-03-28 23:12:39.000000000 +0000
-@@ -54,6 +54,12 @@
-     RandomAccessFile* file = NULL;
-     Table* table = NULL;
-     s = env_->NewRandomAccessFile(fname, &file);
-+    if (!s.ok()) {
-+      std::string ldb_fname = LDBTableFileName(dbname_, file_number);
-+      if (env_->NewRandomAccessFile(ldb_fname, &file).ok()) {
-+        s = Status::OK();
-+      }
-+    }
-     if (s.ok()) {
-       s = Table::Open(*options_, file, file_size, &table);
-     }
diff --git a/dev-libs/leveldb/leveldb-1.18-r2.ebuild b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
index ddfee8667bc6..0a4ac6bfd31c 100644
--- a/dev-libs/leveldb/leveldb-1.18-r2.ebuild
+++ b/dev-libs/leveldb/leveldb-1.18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ IUSE="+snappy static-libs +tcmalloc kernel_FreeBSD"
 DEPEND="tcmalloc? ( dev-util/google-perftools )
 	snappy? (
 		app-arch/snappy:=
-		static-libs? ( app-arch/snappy[static-libs] )
+		static-libs? ( app-arch/snappy[static-libs(-)] )
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-libs/leveldb/leveldb-1.20.ebuild b/dev-libs/leveldb/leveldb-1.20.ebuild
index c23b914b691b..432617312207 100644
--- a/dev-libs/leveldb/leveldb-1.20.ebuild
+++ b/dev-libs/leveldb/leveldb-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # https://github.com/google/leveldb/issues/536
 SLOT="0/1"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+snappy static-libs kernel_FreeBSD +tcmalloc test"
 RESTRICT="!test? ( test )"