gentoo resync : 20.10.2021

3 files changed, 2 insertions, 103 deletions

diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index e089fd953067..2f4d8beaa176 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,8 +2,6 @@ AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
-DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.2-r1.ebuild 2180 BLAKE2B bf826cc26d0ec5aeace2d411744192891aa3b14f6ae18e76d183b247b34eabf7809f9f7b9238ba2d705761fec12bffa1ef069657b2672145485e2f5f55a4216a SHA512 778e1d7bc641f0ba5bd428098c72b0079ad7db796394816e1d35e7db639fb661be9b90e8cdd6fd58855fcbc5634afb465b8c1b4e7c018d33eb60cf64980f0b4e
-EBUILD cryfs-0.10.3-r1.ebuild 2321 BLAKE2B 12262873ce9b8ea55bcb1158472a7efa302a29cc0f180747aef103d2f98bbf544e47acf3ca59cd4cf47aea8a3610eeb6a185e7b2700ad4c65e62bbf35b43bdc0 SHA512 9a4c9bf496d995f48fa63dcc86b9ebc0f410788eb1375712352c0b9e8bd667683c2987d5f430af404220564e0dd986f125d43083259470732f7a21664521c7c3
+EBUILD cryfs-0.10.3-r1.ebuild 2320 BLAKE2B 503a13941bd1fabc274921702634bd575d08615a3a9749921f068bc12d03afc6ef66f15515f2807a80d6a2544fef79f3bb69532ecf1422d894833844e8a4e95a SHA512 30cbb54d4a7f1323d8330937e81149e6e0e9c0f8b7b46c8e8688b51427dd40192830e0dd252c77ace2b196a9739ed2cb610dab85acbf6d39c9eaa5688880e097
 MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395
diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
deleted file mode 100644
index 5f06da1a12ff..000000000000
--- a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.1:=
-	>=dev-libs/crypto++-8.2.0:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:0
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	# TODO upstream:
-	"${FILESDIR}/${P}-unbundle-libs.patch"
-	"${FILESDIR}/${P}-install-targets.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~FUSE_FS"
-	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# don't install compressed manpage
-	cmake_comment_add_subdirectory doc
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
-		-i test/cpp-utils/CMakeLists.txt || die
-
-	# /dev/fuse access denied
-	sed -e "/CliTest_IntegrityCheck/d" \
-		-i test/cryfs-cli/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBoost_USE_STATIC_LIBS=OFF
-		-DCRYFS_UPDATE_CHECKS=OFF
-		-DBUILD_SHARED_LIBS=OFF
-		-DUSE_SYSTEM_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	use debug || append-flags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_test() {
-	local TMPDIR="${T}"
-	local tests_failed=()
-
-	# fspp fuse tests hang, bug # 699044
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
-		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
-	done
-
-	if [[ -n ${tests_failed[@]} ]] ; then
-		eerror "The following tests failed:"
-		eerror "${tests_failed[@]}"
-		die "At least one test failed"
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	doman doc/man/cryfs.1
-}
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index e6d04c05f241..199c5a6badd1 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 	S="${WORKDIR}"
 fi