gentoo resync : 05.12.2021

3 files changed, 82 insertions, 0 deletions

diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index cff52dc4ede6..8a34bf1c62e9 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -2,8 +2,10 @@ AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 970 BLA
 AUX snappy-1.1.9-clang-werror.patch 662 BLAKE2B 232e844f269658a757fbb904744b778d1f4c0f5127fb5596143463056238d8e0c1e448bfa0223cf061c2175e397c11965f1db9899434e8777fbc1bf310f0805b SHA512 82424729bbc8698fb0ff3827dfc5cbda9000cb5a80b6f668e30bcea38f1022a7008c60a56fc9b52dc57e771cf59766e4a43f60e04e0f750001c510e71f4263cc
 AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c26dfc140b768a08fe265cca26a0dce0eb43a1283eb55659c1fbf8e36e7037e65ec3f5ef970eb6436822fb6af212981f1facb SHA512 0b867b60b6e90551ab3c1ce4990775f2b0085d68fae72c4b63925f772b565cd86e9ad36659dae3a5cfb621ee628a0a547c82356f0f44d67ca2cc4ad9bfe16333
 AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
+AUX snappy-1.1.9_remove-no-rtti.patch 1420 BLAKE2B de5194681f365e8d34ac9f56fb3951caad18f1f8af9c3fd65e0ce21de0dd45e8b5fa28c831d04bedc88c8a9fd3b3745c6bacd696b407bb23be766e259ec05aea SHA512 96e16b453ee5e7718930227c8203a5e814e5c0183cf3e13a310d232551dff32bae08dd88552acd714cf373cf7f052630d9c4091776c72d3f451dd395f8bba1b2
 DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
 DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
 EBUILD snappy-1.1.8.ebuild 1832 BLAKE2B 7fb98c5cb96af2d0c928871ec1f53c1402e536d1b9063b137822d6229ac90f6ea397a81a92269a3c67bb3e5551b05158439e552b6ac4deb3905ed8e34ee92f8d SHA512 11813434621156c662bdbb1acce6b1279f8ad3e7ddf0eb446cac0961357334cd3b89fa9f640c01cb29e49d8c560253184287eee0cc763d1da7cb83840fa09f11
+EBUILD snappy-1.1.9-r1.ebuild 1191 BLAKE2B 3cdbd74367582d55d7e6dc02b81be64e5feeed2192397f89630832e965916b8bf8ebbc14747676ad0f69dca1e9c14d873a1cdd986981622937e225c5b3d3c3c8 SHA512 9e4f4ecaad7cbc652bf34a4402da75e616c4cdb78f2c3c70ac1dbc1ef6d0f335c889fa1261d58f4c32da754920bbb1ed4cc73a828e1fff24ae7e6316983c29ff
 EBUILD snappy-1.1.9.ebuild 1171 BLAKE2B 561f36ded3988a51e03ead969d965d11415348e0cc1541fe1d52ec2264bd62feb52db7c4ccc8fc5a26e5a109544395a893b42b71c9f752580386f2767f9f1d81 SHA512 3c1af7733450e69145afc58f568d27735d20ea7570af7f9b4939a88ce440ed096f0888794e495271d848eba08d28e2301473a26af7fc018f9a35b07b6cb9ecb7
 MISC metadata.xml 744 BLAKE2B b404083b800d59914c748d3a31aa13bb341dcb8f5fc227d3c003428455d459d0d011b2cd10e7d5d3cef3e73f66b14611fd04be409567392943cf1d09f0e4f066 SHA512 204079f9e40c81853343be190058b8dda25a25015c91704c98574151e7b06760d9c8f475790f95ebcbdce48c0b06a8e3e612c3183db1f4aa0b7ced8024c22fd2
diff --git a/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch
new file mode 100644
index 000000000000..16528b59457c
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9_remove-no-rtti.patch
@@ -0,0 +1,35 @@
+From 516fdcca6606502e2d562d20c01b225c8d066739 Mon Sep 17 00:00:00 2001
+From: holmes1412 <liyingxin1412@gmail.com>
+Date: Fri, 28 May 2021 21:46:53 +0800
+Subject: [PATCH] remove Disable-RTTI flags for the convenient of derivation
+
+---
+ CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 672561e..31afaa0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+   add_definitions(-D_HAS_EXCEPTIONS=0)
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Wall for clang and gcc.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+@@ -76,10 +72,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Disable C++ exceptions.
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ 
+ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.9-r1.ebuild
new file mode 100644
index 000000000000..74b9e884e633
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.9-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}_gcc_inline.patch"
+	"${FILESDIR}/${P}_external_gtest.patch"
+	"${FILESDIR}/${P}-clang-werror.patch"
+	"${FILESDIR}/${P}_remove-no-rtti.patch"
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSNAPPY_BUILD_TESTS=$(usex test)
+		-DSNAPPY_BUILD_BENCHMARKS=OFF
+		# Options below are related to benchmarking, that we disable.
+		-DHAVE_LIBZ=NO
+		-DHAVE_LIBLZO2=NO
+		-DHAVE_LIBLZ4=NO
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# run tests directly to get verbose output
+	cd "${S}" || die
+	"${BUILD_DIR}"/snappy_unittest || die
+}