gentoo resync : 03.11.2019

4 files changed, 18 insertions, 16 deletions

diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index f0f9e765f913..3ede03d59c76 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,7 +2,7 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3d
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
-EBUILD cryfs-0.10.2.ebuild 2176 BLAKE2B 0d5d52ad79243859d2cd741db459d79d3ac9f5c69c8a77c3b5c0b60f5ea7e53e05f40075d9c45167e62c59667cbdc93439d3b82eee46c9cda1f361bccf328b8c SHA512 2fb435ce767b2844185fecc504adc2af1037c9048bfc64e2feb906c1312c36a98d1a09c12480deb810273ec6f34325597daf44e324fbe90fbb1763ef17b22757
-EBUILD cryfs-0.9.9.ebuild 2416 BLAKE2B 3ae72de8b7e913cbda42205d4eb60038e63b036cccf8924bb40c182c2bf89e18c672ce128d536aa61209b7c87c7de32c8a01daca968040ff2b8b8ea9cfc5692b SHA512 2c46dac9921a85eaf5a848a6a8cc84972f94713dc7af73fdc61f17f65b6adbdc07d698d2123bd9b0d00da479821981eabf3313d094af0cc2c61b9e5f3e590fd7
-EBUILD cryfs-9999.ebuild 2226 BLAKE2B 944388cd9bd2679567c2ee1b986a24b6b2b9781daa887329d4a2f9a457cf71dfe93bcbcdc66fc0d75a0e061c5b5440bfdb2bae13b5e58845ae54ccd1f97c5d09 SHA512 9d2397a6a4ef1cfc684fb751d891f725cba405509088805a4da1f8c5c32e6d00496b722140ecafca36ebf123dc116d89ec58df1625a0ffdc84bb697c3461c5b7
+EBUILD cryfs-0.10.2.ebuild 2256 BLAKE2B 2e9805db0bea6aecdf7c423dbd28e04ff2bd05037e93d7d7d5be3e4f3c06747edeee53a2fe6ff1f68a61d095a7155495d16612b7f47949e4fd9fbbeaa8ede1c5 SHA512 f589cee37d595d567248579d701e88ed36560aa767d8b468e7c98b2bccce602417fe2c1105af9a40d43257e74bcb35860221404124ba2bc06ff8acc1d0ca1659
+EBUILD cryfs-0.9.9-r1.ebuild 2417 BLAKE2B 64ea74e6da4876f568c2d419958c24f52f6be192034885517470557f06e2431ed43a87e24d02d7e73fee72b2f6c8cd81c11ed0f6a01a2a96a6055a987527070f SHA512 d69ffe66b45080e33b5ea58b33cf36541f6fe723387ba0a83d6ca7cdad55c46bbbc6002bcba882b9c18472ad109531083a258ea3228b36135785a95aba007cb1
+EBUILD cryfs-9999.ebuild 2308 BLAKE2B 1bded931f5fc1d0ab2d518e67100db4e4acbfdfcfee31481e2e16cf213542fced29d9704119fa606eea2d4419a5c403a0c843c742ff919adb7a0f112279be3f5 SHA512 5650bea45fd38dd81eeb5ead4eea51d2b6e9259f25c85ef4fb37e611cd5142ad93d6b11d2e1cd63f7b91b1802b5f46e7b9c336a86a4bc364b493465ac636c5b7
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 56ffbdfc5458..c9fb983741fd 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}"
 fi
 
@@ -57,6 +57,10 @@ src_prepare() {
 	# 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() {
@@ -74,16 +78,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# 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
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
index 6410d2cde5d7..d3e493e3ecb9 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
@@ -27,10 +27,10 @@ else
 	S="${WORKDIR}"
 fi
 
-RDEPEND="<dev-libs/boost-1.70:=
+RDEPEND=">=dev-libs/boost-1.56:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:=
+	>=sys-fs/fuse-2.8.6:0
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )"
 DEPEND="${RDEPEND}
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index d401918aecc4..5cd7961f3996 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -53,6 +53,10 @@ src_prepare() {
 	# 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() {
@@ -69,16 +73,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# 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
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"