4 files changed, 51 insertions, 134 deletions
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9d8d7d1c870a..f0f9e765f913 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,7 +1,8 @@
-DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86
-DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
+AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7
+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.9.7.ebuild 2195 BLAKE2B 59279b53ecd9acd372f6aeed6996ec5d33a20beb5599fbd7119f8f68c5445630e5bd39b5bf736dfb4f69766510897438ebbdf51b64697e26015dffc181f21179 SHA512 27c020e374be8e31072be14de1ce2f27e03466fb46e72e79b621d07ebeff834a729b0d7b1f2d626933ccf42e33dd874902d6b23bd100e5d8ea326429e50ff561
-EBUILD cryfs-0.9.9.ebuild 2417 BLAKE2B 12f97673529667e8896b28f0cb2eb2955566252d1c363dc96a8de5e1a07b99ed79f10f3695fd82afc3894f945397a8fd8c4f8dbd02b5d910987dc6c40e6d309a SHA512 67d73e33975be8d8afe588d9c91da6ac025576c6fb92f08b86b5ae2a55e131c49af6e826de2d453ce77fa6494c232be731cffad2c9050837d04669c62101d41c
-EBUILD cryfs-9999.ebuild 2416 BLAKE2B 0492c25b60c3c563691fcc6085d3c8e82454c366f900c58be6a776bb337c232f145a3a74e28a8db185a06136ed1bba8cbb1ff2e8f9aa0c213d406219622a5c07 SHA512 ca4e83f9adb1377997dca058ef897a8e574a14c877b5744755904b489f9bb767a58a1f6c9c01b5512d22fcd92db5dc18ffdf26228689c78116df49cc1faecc4d
+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
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
deleted file mode 100644
index fa5832c7cd9f..000000000000
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-SLOT=0
-IUSE="libressl test update-check"
-
-LICENSE="LGPL-3 BSD-2 MIT"
-# cryfs - LGPL-3
-# scrypt - BSD-2
-# spdlog - MIT
-
-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
-	https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S="${WORKDIR}"
-fi
-
-RDEPEND=">=dev-libs/boost-1.56:=
-	>=dev-libs/crypto++-5.6.3:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=( "${WORKDIR}/${P}-spdlog.patch" )
-
-# tests work, but let install fail
-# revisit with 0.9.8 version bump.
-RESTRICT="test"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
-
-	# remove non-applicable warning
-	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
-}
-
-src_configure() {
-	# upstream restricts installing files to Release configuration
-	# (CMAKE_BUILD_TYPE does not affect anything else)
-	local CMAKE_BUILD_TYPE=Release
-	local mycmakeargs=(
-		"-DBoost_USE_STATIC_LIBS=off"
-		"-DCRYFS_UPDATE_CHECKS=$(usex update-check)"
-		"-DBUILD_TESTING=$(usex test)"
-	)
-
-	cmake-utils_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
-		"${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[@]"
-		die "At least one test failed"
-	fi
-}
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 61780cc28cc6..6410d2cde5d7 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -27,7 +27,7 @@ else
 	S="${WORKDIR}"
 fi
 
-RDEPEND=">=dev-libs/boost-1.56:=
+RDEPEND="<dev-libs/boost-1.70:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
 	>=sys-fs/fuse-2.8.6:=
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 12a15789f0d6..d401918aecc4 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -1,61 +1,66 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+EAPI=7
 
-inherit cmake-utils python-any-r1 flag-o-matic
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+inherit cmake-utils flag-o-matic linux-info python-any-r1
 
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-SLOT=0
-IUSE="custom-optimization libressl test update-check"
-
-LICENSE="LGPL-3 BSD-2 MIT"
-# cryfs - LGPL-3
-# scrypt - BSD-2
-# spdlog - MIT
-
-if [[ "${PV}" == 9999 ]] ; then
+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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}"
 fi
 
-RDEPEND=">=dev-libs/boost-1.56:=
-	>=dev-libs/crypto++-5.6.3:=
+DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
+HOMEPAGE="https://www.cryfs.org/"
+
+# cryfs - LGPL-3
+# spdlog - MIT
+# crypto++ - Boost-1.0
+LICENSE="LGPL-3 MIT Boost-1.0"
+SLOT="0"
+IUSE="custom-optimization debug libressl test"
+
+RDEPEND="
+	>=dev-libs/boost-1.65.1:=
 	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:= )"
+	libressl? ( dev-libs/libressl:= )
+"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
+	${PYTHON_DEPS}
+"
+
+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-utils_src_prepare
 
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -i -e '/CurlHttpClientTest.cpp/d' -e '/FakeHttpClientTest.cpp/d' test/cpp-utils/CMakeLists.txt || die
+	# don't install compressed manpage
+	cmake_comment_add_subdirectory doc
 
-	# remove non-applicable warning
-	sed -i -e '/WARNING! This is a debug build. Performance might be slow./d' src/cryfs-cli/Cli.cpp || die
+	# 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
 }
 
 src_configure() {
-	# upstream restricts installing files to Release configuration
-	# (CMAKE_BUILD_TYPE does not affect anything else)
-	local CMAKE_BUILD_TYPE
-	local -a mycmakeargs
-	CMAKE_BUILD_TYPE=Release
-	mycmakeargs=(
-		"-DBoost_USE_STATIC_LIBS=off"
-		"-DCRYFS_UPDATE_CHECKS=$(usex update-check)"
-		"-DBUILD_TESTING=$(usex test)"
+	local mycmakeargs=(
+		-DBoost_USE_STATIC_LIBS=OFF
+		-DCRYFS_UPDATE_CHECKS=OFF
+		-DBUILD_SHARED_LIBS=OFF
+		-DBUILD_TESTING=$(usex test)
 	)
 	use custom-optimization || append-flags -O3
 
@@ -63,12 +68,10 @@ src_configure() {
 }
 
 src_test() {
-	local TMPDIR
-	TMPDIR="${T}"
+	local TMPDIR="${T}"
 	addread /dev/fuse
 	addwrite /dev/fuse
-	local -a tests_failed
-	tests_failed=()
+	local tests_failed=()
 
 	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
@@ -87,7 +90,6 @@ src_install() {
 	# work around upstream issue with cmake not creating install target
 	# in Makefile if we enable BUILD_TESTING
 	dobin "${BUILD_DIR}/src/cryfs-cli/cryfs"
-	gzip -cd "${BUILD_DIR}/doc/cryfs.1.gz" > "${T}/cryfs.1" || die
-	doman "${T}/cryfs.1"
+	doman doc/man/cryfs.1
 	einstalldocs
 }