gentoo auto-resync : 03:05:2023 - 11:25:06

3 files changed, 119 insertions, 0 deletions

diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index f2fc398dccd9..b4f7ea6f3795 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,3 +1,6 @@
+AUX librnp-0.17.0-dont-bundle-sexp.patch 1073 BLAKE2B be3a0068f0134aea8347be9f95c82a54eaf8fed1158ee23c6909966f65508fe07a45bee1f78799f5f2c497214afad26b2170aefd9de348bd66e9bb0d978a3083 SHA512 295488e925bd764532e12cecc0b574487528c0d6e14aa78a7504c9ab55ed8a5c82a938995038d9a40eee49f8e229e2dfafe89ed4ce726ecc22672b3579ef6761
 DIST librnp-0.16.3.tar.gz 2897854 BLAKE2B 71e39e810bdbee351c8136df1d11621daccb1738db691b99244ffe5bd2ea372c3ef520ade7cd63c38510fae0f252d5a1c2ceb44db3fbffbd64dfc10612341e29 SHA512 b133fb1f9aab6e9b5caecdcf0bd9f2c67a62a98543ca1ac6a7cf4a35b7a571d53e4fa99cefc98f8253117cf0de16194db309efa03bc40fd3556f9b84cf51a942
+DIST librnp-0.17.0.tar.gz 2996461 BLAKE2B 9a6ea0452f067464ef52cef395c2969ba9912c5ed32ac6f4d860a3410965dbfbb1ad5c0d4f25489011d869222a4362a90463f521efe5af4b7c412f0ed1e4570b SHA512 0aa5262aa3be163b8a8931d6b9200ced52bb640cd7b02b50009cfb8d5fe1e664d27b2c4a0a3e534cf59d6ea42fbc1c62c970a07cadc27ab6962e0f69f996f74d
 EBUILD librnp-0.16.3.ebuild 1666 BLAKE2B 2858d566a6efbedca19f28d50abaaa59a80d4d480a105d9f5ae2ae58f87d4c0d784675109d15639f0bed4ad772e2521dbe384244af987d518f76e5823436a88a SHA512 b150cc2fe6a6e75dd415b733b47b45b7004540a0cbdfb0684535753d932c3bf622e7fd173ae128a7d6229dedbf710c80c7695dea138d5a1ec2741e42566818fc
+EBUILD librnp-0.17.0.ebuild 1798 BLAKE2B 0a551a59c9da9a610464e88833f09174e15a979c5d5810d4890ff7d14183b1b54dd5804547b9a6d1d3191987deaf0f5b4e76341b5f5593ac81a378e7e8a71fb1 SHA512 1efab4e883e3b213f3e0e12538b6ac9e6c649aa450bd2fd32c818a74c4ca934db94a410dcc27fb1594187977667e56228ac26d05d588bc959a827410d3966dcf
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch b/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch
new file mode 100644
index 000000000000..4e8b67a2f5f7
--- /dev/null
+++ b/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch
@@ -0,0 +1,36 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2023-05-02 11:01:48.000000000 +0300
++++ b/CMakeLists.txt	2023-05-03 11:57:06.095299932 +0300
+@@ -176,11 +176,6 @@
+ endif()
+ add_subdirectory(src/common)
+ 
+-set(WITH_SEXP_CLI OFF)
+-set(WITH_SEXP_TESTS OFF)
+-set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development)
+-add_subdirectory(src/libsexp EXCLUDE_FROM_ALL)
+-
+ add_subdirectory(src/lib)
+ add_subdirectory(src/rnp)
+ add_subdirectory(src/rnpkeys)
+diff -Naur a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+--- a/src/lib/CMakeLists.txt	2023-05-02 11:01:48.000000000 +0300
++++ b/src/lib/CMakeLists.txt	2023-05-03 10:59:25.147032470 +0300
+@@ -433,7 +433,7 @@
+       COMPONENT development
+   )
+ 
+-  install(TARGETS librnp-static sexp
++  install(TARGETS librnp-static
+     EXPORT rnp-targets
+     ARCHIVE
+       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
+@@ -441,7 +441,7 @@
+   )
+ else(BUILD_SHARED_LIBS)
+ # static libraries only
+-install(TARGETS librnp sexp
++install(TARGETS librnp
+     EXPORT rnp-targets
+     ARCHIVE
+       DESTINATION  "${CMAKE_INSTALL_LIBDIR}"
diff --git a/dev-util/librnp/librnp-0.17.0.ebuild b/dev-util/librnp/librnp-0.17.0.ebuild
new file mode 100644
index 000000000000..846d10a8806d
--- /dev/null
+++ b/dev-util/librnp/librnp-0.17.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High performance C++ OpenPGP library"
+HOMEPAGE="https://www.rnpgp.org/ https://github.com/rnpgp/rnp"
+SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2"
+SLOT="0/0.16.1"
+KEYWORDS="~amd64"
+IUSE="+botan man test"
+
+RDEPEND="app-arch/bzip2
+	dev-libs/json-c:=
+	sys-libs/zlib
+	botan? ( dev-libs/botan:2= )
+	!botan? ( >=dev-libs/openssl-1.1.1:= )"
+DEPEND="${RDEPEND}
+	dev-libs/sexp[static-libs]
+	test? ( dev-cpp/gtest )"
+BDEPEND="man? ( dev-ruby/asciidoctor )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${P/*lib/}"
+
+PATCHES=( "${FILESDIR}"/librnp-0.17.0-dont-bundle-sexp.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test on off)
+
+		-DCRYPTO_BACKEND=$(usex botan botan openssl)
+
+		-DDOWNLOAD_GTEST=off
+
+		-DENABLE_COVERAGE=off
+		-DENABLE_DOC=$(usex man on off)
+		-DENABLE_FUZZERS=off
+		-DENABLE_SANITIZERS=off
+	)
+
+	if use botan; then
+		local mycmakeargs+=(
+			-DENABLE_AEAD=on
+			-DENABLE_BLOWFISH=on
+			-DENABLE_BRAINPOOL=on
+			-DENABLE_CAST5=on
+			-DENABLE_IDEA=on
+			-DENABLE_RIPEMD160=on
+			-DENABLE_SM2=on
+			-DENABLE_TWOFISH=on
+		)
+
+	# OpenSSL support is still not as complete as botan.
+	# https://github.com/rnpgp/rnp/issues/1877 SM2,
+	# https://github.com/openssl/openssl/issues/2046 TWOFISH (won't be implemented).
+	else
+		local mycmakeargs+=(
+			-DENABLE_AEAD=on
+			-DENABLE_BLOWFISH=on
+			-DENABLE_BRAINPOOL=on
+			-DENABLE_CAST5=on
+			-DENABLE_IDEA=on
+			-DENABLE_RIPEMD160=on
+			-DENABLE_SM2=off
+			-DENABLE_TWOFISH=off
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/src/tests || die
+	ctest -j"${MAKEOPTS}" -R .* --output-on-failure || die
+}