gentoo auto-resync : 07:03:2023 - 23:58:31

4 files changed, 97 insertions, 1 deletions

diff --git a/dev-libs/thrift/Manifest b/dev-libs/thrift/Manifest
index 10ac1e22afac..a624ab46a93f 100644
--- a/dev-libs/thrift/Manifest
+++ b/dev-libs/thrift/Manifest
@@ -1,4 +1,7 @@
 AUX thrift-0.16.0-network-tests.patch 1184 BLAKE2B fc1737e6169a480718edeff366734a01cee43626f84a0785b0f7fe2cdad4ef964da5ef9c685d8c8fee32d8f719e1f4eb7c260a6c6a960e8fea89898a59cd6f16 SHA512 248de672f603c94919bf67890715a037030d378c80ec7dc849ee3677392353d89903e35ed3c0144ab3e1ff371bfb6eba861d11332844fec99b87bcb3476a1a7e
+AUX thrift-0.18.1-tests.patch 1266 BLAKE2B 93937699f0b34d3dd273563f94fe5a55b0fc8d2fc349d446945756ec941ed1a9e4d84a7dd7deb3b5dd8237c999d28fbf3c901cb7af2c96782d7af229b4d99e88 SHA512 bdb9628c6db7e17e0ac7752e9bed600a040b1d9ec405e160ec127114ee7dece6b500e0cf768d3873986241e6d9607981cbafb15a6899e199870b63cf10c404d5
 DIST thrift-0.16.0.tar.gz 4085114 BLAKE2B 17c35096f6848fb0795e4cb125fed3068c8e1e53f67f404f4dcab67df7a42fc049a7d615591c861eb9e59e3333e21f185e8615663008bc7c846a03722ea8b834 SHA512 468fff6be2def85959fdf8adac92a0cfa7f786083b3bafb2c31427dfe5725f4d10962052d13ea960828f6a317778d35e66b602744a570212352bfc637ae586e0
-EBUILD thrift-0.16.0-r1.ebuild 945 BLAKE2B a6afbc4a551e9c1d73a89e0ae50d905965ac0494e9fcc4ea6ef01da760080fb34ebd7fe7f05fcf15343bf66828424fbffaebae8dd335962de533eed91479fc9e SHA512 7a5ba87a5aef42656f60173975643c9a30e98a906a81c0434671e517139b085f99b3e400cb44ef7df3852547381ed64c9a2d46e4cf446da6fdee61886ca9d82c
+DIST thrift-0.18.1.tar.gz 4310494 BLAKE2B 3e6c7e03059341e79d3f58e16b55761888b530b3d31dd22853026486a1303725ee5d5e6e5dd7a5e6bf8e57a2d3cf36ffc829cdb194d990cadedfc63f4f3e0874 SHA512 9c9a462aa8b6fddefd5bb9d2c950570eb2d3beaa7c9d37fceee677bdc1fdeb521b796f4eeee8a1fd9a7649f84449f6c0572305210e67402eb97682ca7f6e851b
+EBUILD thrift-0.16.0-r1.ebuild 962 BLAKE2B d2ae25d309a8e761f1f7d7456d460763ed8f5daa54deae959b7494d8640f60d18d9f1d0e0cc41aa5be5f443da0e8eff204f6c7ae9b488da94967966b49979aa3 SHA512 96b2b75a61e0b2268285c5436204182d230b54ac16b18a7b675287a9aa405bc92416fbac69bb3c568bb2e6bd4bda638998a9cc4e065a5362d79ef58e30177beb
+EBUILD thrift-0.18.1.ebuild 1095 BLAKE2B 62e9cc1865d7ac6ba33f61596c895f0564cca9099514fb735bd648a8b994431494dfd0a1416250d289365c042e5ff240804f72b5e585335ecfebda28f6a46a68 SHA512 b19dea23d7210dece9cfb1b370dacad21432c0003320d0aa69192f27e7f7b3b078d37a3c74d9c943fad92eacf6fc3d53674288ac2ab4be806963450bfcfa0544
 MISC metadata.xml 489 BLAKE2B 2b2c924951cd9c5dfa2a9d4f50f4a74b3f422d853fdf61248424500d792f87a9348335a80e54c2c110039274060ec8df87f3369c8ff81c3dc8d515cb7de58fa8 SHA512 f15102234cb9eb25272e4d1788b7cdd4274ef9c5ad0d2af3521533d86a4145b0f2789385ce9663f9d0aa9161c218d357cc76d56e5c47ed597c56f7ac35d8a373
diff --git a/dev-libs/thrift/files/thrift-0.18.1-tests.patch b/dev-libs/thrift/files/thrift-0.18.1-tests.patch
new file mode 100644
index 000000000000..7716e0c743c2
--- /dev/null
+++ b/dev-libs/thrift/files/thrift-0.18.1-tests.patch
@@ -0,0 +1,33 @@
+diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt
+index 1117cd9f3..5f56aaca8 100644
+--- a/lib/cpp/test/CMakeLists.txt
++++ b/lib/cpp/test/CMakeLists.txt
+@@ -318,28 +318,6 @@ target_link_libraries(OpenSSLManualInitTest
+ target_link_libraries(OpenSSLManualInitTest thrift)
+ add_test(NAME OpenSSLManualInitTest COMMAND OpenSSLManualInitTest)
+ 
+-add_executable(SecurityTest SecurityTest.cpp)
+-target_link_libraries(SecurityTest
+-    testgencpp
+-    ${Boost_LIBRARIES}
+-)
+-target_link_libraries(SecurityTest thrift)
+-if (NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT MINGW)
+-    target_link_libraries(SecurityTest -lrt)
+-endif ()
+-add_test(NAME SecurityTest COMMAND SecurityTest -- "${CMAKE_CURRENT_SOURCE_DIR}/../../../test/keys")
+-
+-add_executable(SecurityFromBufferTest SecurityFromBufferTest.cpp)
+-target_link_libraries(SecurityFromBufferTest
+-    testgencpp
+-    ${Boost_LIBRARIES}
+-)
+-target_link_libraries(SecurityFromBufferTest thrift)
+-if (NOT MSVC AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT MINGW)
+-    target_link_libraries(SecurityFromBufferTest -lrt)
+-endif ()
+-add_test(NAME SecurityFromBufferTest COMMAND SecurityFromBufferTest -- "${CMAKE_CURRENT_SOURCE_DIR}/../../../test/keys")
+-
+ endif()
+ 
+ if(WITH_QT5)
diff --git a/dev-libs/thrift/thrift-0.16.0-r1.ebuild b/dev-libs/thrift/thrift-0.16.0-r1.ebuild
index 22f3fc9e88b4..ac2dfd839f6b 100644
--- a/dev-libs/thrift/thrift-0.16.0-r1.ebuild
+++ b/dev-libs/thrift/thrift-0.16.0-r1.ebuild
@@ -27,6 +27,7 @@ BDEPEND=""
 REQUIRED_USE="
 	test? ( ssl )
 "
+MAKEOPTS+=" -j1"
 
 PATCHES=(
 	"${FILESDIR}/thrift-0.16.0-network-tests.patch"
diff --git a/dev-libs/thrift/thrift-0.18.1.ebuild b/dev-libs/thrift/thrift-0.18.1.ebuild
new file mode 100644
index 000000000000..aa5ea1c6aa6b
--- /dev/null
+++ b/dev-libs/thrift/thrift-0.18.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C++ bindings for Apache Thrift"
+HOMEPAGE="https://thrift.apache.org/lib/cpp.html"
+SRC_URI="mirror://apache/thrift/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="libevent lua +ssl test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-libs/openssl:=
+	sys-libs/zlib:=
+	libevent? ( dev-libs/libevent:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/bison
+"
+
+REQUIRED_USE="
+	test? ( ssl libevent )
+"
+
+PATCHES=(
+	"${FILESDIR}/thrift-0.16.0-network-tests.patch"
+	"${FILESDIR}/thrift-0.18.1-tests.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CPP=ON
+		-DBUILD_C_GLIB=OFF
+		-DBUILD_JAVA=OFF
+		-DBUILD_JAVASCRIPT=OFF
+		-DBUILD_NODEJS=OFF
+		-DBUILD_PYTHON=OFF
+		-DBUILD_TESTING=$(usex test 'ON' 'OFF')
+		-DWITH_LIBEVENT=$(usex libevent 'ON' 'OFF')
+		-DWITH_OPENSSL=$(usex ssl 'ON' 'OFF')
+		-DWITH_ZLIB=ON
+		-Wno-dev
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	MAKEOPTS="-j1" cmake_src_test
+}