gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 2 insertions, 126 deletions

diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 336e1d8dd854..bed1a57597ff 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,6 +1,3 @@
-AUX librnp-0.17.0-dont-bundle-sexp.patch 1073 BLAKE2B be3a0068f0134aea8347be9f95c82a54eaf8fed1158ee23c6909966f65508fe07a45bee1f78799f5f2c497214afad26b2170aefd9de348bd66e9bb0d978a3083 SHA512 295488e925bd764532e12cecc0b574487528c0d6e14aa78a7504c9ab55ed8a5c82a938995038d9a40eee49f8e229e2dfafe89ed4ce726ecc22672b3579ef6761
-DIST librnp-0.17.0.tar.gz 2996461 BLAKE2B 9a6ea0452f067464ef52cef395c2969ba9912c5ed32ac6f4d860a3410965dbfbb1ad5c0d4f25489011d869222a4362a90463f521efe5af4b7c412f0ed1e4570b SHA512 0aa5262aa3be163b8a8931d6b9200ced52bb640cd7b02b50009cfb8d5fe1e664d27b2c4a0a3e534cf59d6ea42fbc1c62c970a07cadc27ab6962e0f69f996f74d
 DIST librnp-0.17.1.tar.gz 3515288 BLAKE2B 279cd5c669b469112066c4754a9a5a5c9fbe3ba225be4f85bc507aad9f29cfa166f90cb3dfe83ea8e29964fdfbbf926438fb36bb345da494ed7f70586fa8d7b6 SHA512 0224f79e4dd4b72ddd9c191218327da5485ed1d81321cc3a167cfeea68c00e47cec9151a4177e65e5560039345db3a52e41a093adfdf833f57e867bc559494a5
-EBUILD librnp-0.17.0-r3.ebuild 1932 BLAKE2B 5ec8fe6ba0119f30f81201cff3dd4b669741b4bbdb3db65996bf1bb23e5267fb552a75edffa00e5d4e9b2f178ab50ad8c539c5d6532d8d041cba531484c20758 SHA512 f3b43221e5ce01ae2a64e4c418a04000b9c0d7ef5020f7ef50d2960d5ee95bde15298beed85e5015a5e383b36eece1120391b000513e68aaa8b2e3e92806f032
-EBUILD librnp-0.17.1-r1.ebuild 1877 BLAKE2B 24396a654d81d72342f9fb4b8b059043f62cfa030deee7f38ab0aa43987553fe70118c74f286a28519705bbf5ab482d53154535dcf29822d3942aecd850c1261 SHA512 1b53ab95d4534bb46eb020b9fd5e4d82cfcdc40ca3895e0b0d2a48837971a0ea9352ec28277a4458a4e6815b869d231cf8e2bc29f64418deb6b9db6260bd9190
+EBUILD librnp-0.17.1-r1.ebuild 1876 BLAKE2B 8a7db63eb8468c525452096804bae4c21e75ab2c394afc54be0e4f9c675381d1f6f643523bfe8781656bc9019964c3f342e659bb99b5b85c99bda50738aef6bd SHA512 b38c5b674437c0cab50e49cb4d8f8bef56f7b081a6d40d7e9918118ef1bfd45bed30a707fa2e2f7ffd4df032f1b150965730c2a99f49522245c930594b04c2bc
 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
deleted file mode 100644
index 4e8b67a2f5f7..000000000000
--- a/dev-util/librnp/files/librnp-0.17.0-dont-bundle-sexp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-r3.ebuild b/dev-util/librnp/librnp-0.17.0-r3.ebuild
deleted file mode 100644
index 1ffd2d040346..000000000000
--- a/dev-util/librnp/librnp-0.17.0-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake multiprocessing
-
-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 ~arm64 ~loong ~ppc64 x86"
-IUSE="+botan man test"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/json-c:=
-	=dev-libs/sexpp-0.8.6*[-static-libs(-)]
-	sys-libs/zlib
-	botan? ( dev-libs/botan:2= )
-	!botan? ( >=dev-libs/openssl-1.1.1:= )"
-DEPEND="${RDEPEND}
-	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_jobs) -R .* --output-on-failure || die
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-}
diff --git a/dev-util/librnp/librnp-0.17.1-r1.ebuild b/dev-util/librnp/librnp-0.17.1-r1.ebuild
index d1db4721c531..aa8e956edb43 100644
--- a/dev-util/librnp/librnp-0.17.1-r1.ebuild
+++ b/dev-util/librnp/librnp-0.17.1-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P/*lib/}"
 
 LICENSE="Apache-2.0 BSD BSD-2"
 SLOT="0/0.16.1"
-KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~loong ~ppc64 x86"
 
 IUSE="+botan man test"
 RESTRICT="!test? ( test )"