gentoo auto-resync : 21:06:2023 - 13:19:15

3 files changed, 2 insertions, 77 deletions

diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index d1c061acf4ce..37defb3317ba 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,6 +1,4 @@
 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 1893 BLAKE2B 7ea816c630850a83840ba4d2acc010bd30142b62a14eb6589ab1e5dbf1b6cbf5aeea6ec8697f64a1e89490b9c490fc7922c6181c9514c34082216c8a962d8a7d SHA512 0699e0d019e4edfcb573dbc314c95f503dc8c5b429b44a02f7dad12451dac1221333a119dace68faa44d21f45d9d0bf968c6e10267a7ddab599666bf3a5dbbaa
+EBUILD librnp-0.17.0-r2.ebuild 1905 BLAKE2B 9138ba1b5dc878947a532bbe1704f1c334f92d46c39f1ea89e47276c3e52e0892e18298a870d55140665475ce00dc8bf7a72b8bc6bf5aee8e4227e2978460b40 SHA512 52d597ce4e45e9b3ce4fae2e0ac19554b52b678705602d2c3d61102eaaf1ce23370e4446bd2852ac6e981ffbd16371059c72b8aa48a80987160d2c93bd6278e5
 MISC metadata.xml 430 BLAKE2B 739d6cddc56f385ad2b1679f6b3d9ba567ce77ec536894ca3861ad7ad127fd60c395db49b31d89963df12c03d8cf69fc6f083f5d3361b790079952c1e76ccf03 SHA512 ad7b3e6332741e1f2eae9e158d5ca767f5985a8f5c86eb5f21b7ee0214b9c7fdd2e90beddf1a9287218edf35aff39bd7ff1a4f1d15eb10552ab664738f8d1959
diff --git a/dev-util/librnp/librnp-0.16.3.ebuild b/dev-util/librnp/librnp-0.16.3.ebuild
deleted file mode 100644
index 92d66a7681ba..000000000000
--- a/dev-util/librnp/librnp-0.16.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 ~arm64 ~ppc64 x86"
-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}
-	test? ( dev-cpp/gtest )"
-BDEPEND="man? ( dev-ruby/asciidoctor )"
-
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P/*lib/}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test on off)
-
-		-DCRYPTO_BACKEND=$(usex botan botan openssl)
-
-		-DDOWNLOAD_GTEST=off
-		-DDOWNLOAD_RUBYRNP=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_BRAINPOOL=on
-			-DENABLE_IDEA=on
-			-DENABLE_SM2=on
-			-DENABLE_TWOFISH=on
-		)
-
-	# OpenSSL support is still not as complete as botan.
-	# https://github.com/rnpgp/rnp/issues/1642 (v. 0.17.0),
-	# 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=off
-			-DENABLE_BRAINPOOL=on
-			-DENABLE_IDEA=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
-}
diff --git a/dev-util/librnp/librnp-0.17.0.ebuild b/dev-util/librnp/librnp-0.17.0-r2.ebuild
index e63d51851794..9991b6588a92 100644
--- a/dev-util/librnp/librnp-0.17.0.ebuild
+++ b/dev-util/librnp/librnp-0.17.0-r2.ebuild
@@ -16,11 +16,11 @@ IUSE="+botan man test"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/json-c:=
+	>=dev-libs/sexp-0.8.5[-static-libs(-)]
 	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 )"