gentoo resync : 12.10.2017

3 files changed, 17 insertions, 15 deletions

diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index ea776c2f1f8a..84819e68ae37 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,4 +1,5 @@
+DIST cryfs-0.9.7-spdlog.patch.xz 28204 SHA256 8b88dd29c16edde13cb421778a927d46822e79d9f8031f0da80fd3375798cc44 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86 WHIRLPOOL 5b5255b54fae22b9426811879ef83e61b82eaac627cc9bb03b136765de62828760124bc7136f9b948704a2ffbc7f7fe3febe7b7dcb075901b556abadb5bae9bd
 DIST cryfs-0.9.7.tar.xz 970588 SHA256 c998069217c29c026a944da47eea0a9e73eda914ef0f891f436701bcbdbbe4d7 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b WHIRLPOOL c5560f8c87bcdaf3dd3bc1cded88fdbc3f74a2284584cad1f55e4dd380849290eb56b265fd4ea98a2f8b3ea842b733e6a0d77a9013efe294a5ec3a342897bd19
-EBUILD cryfs-0.9.7.ebuild 1937 SHA256 9ce34cbb0e2f0fafa879b3a832702323045a0d82b4d2fe94825ae7b0eb0da94e SHA512 9b8f50a59a6b8db328ab9fb8725aeeb589196cfb786a99c0a6ccfeecac7537b12beb1563d45ca268447667239aec268cfd52be6273506ddd0cde69b944176268 WHIRLPOOL 7e211151357cfb2ae36f01b71b40d97c5b87df5553051eaee956b9fb2c7bb2d54e1a093bd3e543353d613eb1ad0c6fe7df779e1fd450d3475ed5d6d3174bbe31
-EBUILD cryfs-9999.ebuild 1937 SHA256 9ce34cbb0e2f0fafa879b3a832702323045a0d82b4d2fe94825ae7b0eb0da94e SHA512 9b8f50a59a6b8db328ab9fb8725aeeb589196cfb786a99c0a6ccfeecac7537b12beb1563d45ca268447667239aec268cfd52be6273506ddd0cde69b944176268 WHIRLPOOL 7e211151357cfb2ae36f01b71b40d97c5b87df5553051eaee956b9fb2c7bb2d54e1a093bd3e543353d613eb1ad0c6fe7df779e1fd450d3475ed5d6d3174bbe31
+EBUILD cryfs-0.9.7.ebuild 2076 SHA256 b65e6334b65ad52b0f87fbaa2e0a3d05751f668320e8d23c8401a8ba3085a3c1 SHA512 006ab059fa8fe787e9ab68939b96e5e8c5ad78d88a8ec6db2728102b89222a3880b460d75c53a08385e0b5cfd959745bd44775ad3a19d42e65c4d9f9101950e9 WHIRLPOOL 2e190f1aa2c8b99a322250cbd9a1d13885ffc5a94987c78a8944285c28a7d40bd53383618ac725e4677e7aafb5b81109a63685bb5c84473a2a60438327599e87
+EBUILD cryfs-9999.ebuild 1971 SHA256 8503216fdf4e4054ec3bb8400c0a46c9cdd94994e0a039b81354ec61430c3c61 SHA512 6a8d717593da53d4db604c4bb49c1f742d57c9d2058edbec416fbf26f30c470cc89cc17a1c7b7d44fc98a6f21d14e6a3692465fea7da4f6040978eda902e69c8 WHIRLPOOL ce7a44e5656e2deadb09e6e6075a1b404125920258da7fcfe9ffd2afe7066f01b3d52c8a1008ab5ad61108c3bb8efc46cef79e4b9cf1c0d0a723117e7b3c3fa6
 MISC metadata.xml 516 SHA256 a4732095885a80fa95c3ab2d6d1f35a1912930562de424b8304419d5c13ac336 SHA512 d452400e202e5f1ce607cdd554e7e40ee626b43dcc344b3d9f87bbdd2bc4b6bf072615e09b26adcf5a0a751837db62f2f02c4c5421510d929be6e935bcf03dd4 WHIRLPOOL f03565893870b31964dff43d3b4123062696fe3a9977173098d5eb4bd21e58c5d3062858665cf46fdfb12aa83b999fb86df8824502aadadae3304f7a3078910e
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
index cc9eea2b0e7b..a8e370eff006 100644
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
 HOMEPAGE="https://www.cryfs.org/"
 
 SLOT=0
-IUSE="test update-check"
+IUSE="libressl test update-check"
 
 LICENSE="LGPL-3 BSD-2 MIT"
 # cryfs - LGPL-3
@@ -20,10 +20,9 @@ LICENSE="LGPL-3 BSD-2 MIT"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-	SRC_URI=""
-	KEYWORDS=""
 else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
+	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 ~x86"
 	S="${WORKDIR}"
 fi
@@ -32,18 +31,21 @@ RDEPEND=">=dev-libs/boost-1.56:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
 	>=sys-fs/fuse-2.8.6:=
-	dev-libs/openssl:0="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
+PATCHES=( "${WORKDIR}/${P}-spdlog.patch" )
+
 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
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index cc9eea2b0e7b..3689ed8b7db5 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
 HOMEPAGE="https://www.cryfs.org/"
 
 SLOT=0
-IUSE="test update-check"
+IUSE="libressl test update-check"
 
 LICENSE="LGPL-3 BSD-2 MIT"
 # cryfs - LGPL-3
@@ -20,8 +20,6 @@ LICENSE="LGPL-3 BSD-2 MIT"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -32,18 +30,19 @@ RDEPEND=">=dev-libs/boost-1.56:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
 	>=sys-fs/fuse-2.8.6:=
-	dev-libs/openssl:0="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
 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
-
-	cmake-utils_src_prepare
 }
 
 src_configure() {