gentoo resync : 30.04.2018

6 files changed, 46 insertions, 100 deletions

diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index e426afd7e12d..70b262638aec 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,10 +1,8 @@
 AUX encfs-1.7.5-fix-pod.patch 648 BLAKE2B b90d601239563c3d0eeee899c04fda42440c9c0a36d71347a81da4fdd031bd4afcac30e2452540b52bde9bb0ad7aca0afa697b66daa5a51e023508882b54e672 SHA512 aab2d30ebf3545391256dc6d5d18b4dcb0b15ab754272faac8aa48be213229265485dbc20691e3cc51d589baf3d6f27e6016a34b3ac9559f32a96f67ca891815
-DIST encfs-1.7.5.tar.gz 168162 BLAKE2B 9f8d91f89363690e876f9831566c4c11a9079365b350ca5cece3fdf6b4546a07c4491e6d4bb5548230e66efd1e7edeef1cdd7119f0d90b635dfcf1ef8d59383b SHA512 e0cb9181d9c6c54a36dd19ab7a78d6f9ad0f017129d1addab012e72e00a3bb7e19481a2fbc511fd2a505c8b971cd93a02e556c6420b07acfba68ac3c37d224d7
-DIST encfs-1.8.1.tar.gz 316534 BLAKE2B 318b4ec8e17a7187c299e1287ad1927db2da64c961f1d552cc989191c77d72a6db43e048f48bfa8940814083027875e70d18658b776d060e49e2254e7dda00d4 SHA512 47e6cdded84c65bdb98c14774472a2f9df67f2bea05e4c2e20811d785c5ee458b708030922db9a5b49382495235a329bc8e889d104cc8501cd954119699847c6
 DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5
 DIST encfs-1.9.4.tar.gz 2794574 BLAKE2B 95f0a96eedf52984fadfc6fb34c938d61b80310f97dc163cb7f8340fca8d6a56be574190cc56cad00fdfde2b907fc594ecaba3e4f2a90da171c84d8c4ab43630 SHA512 082e35e6eae4730b5e7827eed729422f9d995ebe9e441c5f9725f39cc2f46f014ac1479c7b0a7ce04e9e7228c1a93ecf5b4228e667fc48e6a7d3b68d2324cd0b
-EBUILD encfs-1.7.5.ebuild 944 BLAKE2B 15eddfdf2608b1a7bc9790759024ff989ac7af61f7cb3dbf83cb030c51a0db54ee403dd451f285ed08203e4aa05e15ab339f1d108cbbc39e1eab56acc5dfc27e SHA512 7cc33ba27c23b1220cdd59a494fe92c219041c3dcff2189301ac8ba1d635ea117e41c6d5658fa3ad00d883df0961ac9ba56e44c7b09149670f95d3b7d6cc4848
-EBUILD encfs-1.8.1.ebuild 1186 BLAKE2B e1e6f0bc4fba1fe1d9f2eb7b4896a5011ee519bb9af631881dbf747f632b2fec0d8cdb128d441c0be56efcc7806afd8299dea81c392822608ed09a29cc5b45dc SHA512 d9133dbcf045e0a9fdef6c7fe8f7e8aa67b82d776f0f05388c93a891a54c3f9f48ab4d2ec232e358c54e2d713248a45a66ef950825e4e2677157f7fde154a1a9
-EBUILD encfs-1.9.2.ebuild 917 BLAKE2B c0bbf0422cda02419568c1f1751f12233a4573b6334b811b68683dcab4a0e0c7a4c95553a93e5e62fa97e0c70901bafe87bbb89a7f7276a258eb839e2feb5c8a SHA512 c42df19a3f6c7bf81a37b249922fc56e2f748534265e9baf2a2009feb253eab63b48d86354ac716b467f4562bb69a1a7523b6b6dc5e4e1db59a898e0205db8e1
-EBUILD encfs-1.9.4.ebuild 940 BLAKE2B 53a67a8f4a0a2d0c957b994ef7eae21708dc56ba1ae973333d8c1315eba8dac5e55e02c011683ed2ef2b4352230aa05ee4d6f3bbc32bfcff318a67c9b8bbf1f1 SHA512 f8295008195ebe80076cc099a9ff2b039791a210a4815195a90bca377ab15c9eb39dd9c56a1fc781e5e9f3873be4eb730e6e598f54d24235ea63d8e6e9258dad
+DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
+EBUILD encfs-1.9.2.ebuild 924 BLAKE2B 8edaf582da614574a50f99efedbd25bbab3e8eb93971c6470fa1ebac75de8ef9990356cea694f0ca0acf2166891871b16d5baf79400f7cee49e9657b519a6a6b SHA512 6f73d9abae72f2d70c4fc31456d9aab72b640e6e3c4000e82bea61b7d0993c13aac19f2076e5a90509480eed1238ead59a06cac81160f7c2a73449a934c19ce5
+EBUILD encfs-1.9.4.ebuild 951 BLAKE2B 5e799e7ebb386d59c3a357a0d62b597868176f1812e6c122f166e73c9617229dd83548e64bd7a0444b65e65e8931d1fb29434d4dfdeb4542cbd1056ced0f9eee SHA512 b1a24789a087d9f71d4264336a5cd682a4b70710c9482e6ddc30de485cf6e051ce71cc69a4e8b907e0c4b3da5ab494ca7be40628197ca1f5e490f9b3e3b9717c
+EBUILD encfs-1.9.5.ebuild 952 BLAKE2B fdc0a63d1ed0b27e118b4750b0bbe778a9677dc8d10b8f29e9fea6695ab7e75e31a4bf3c3605b32a5c0d8bdf3b03c89b1bfe5fd0243a3f7a587e4e1165f36114 SHA512 6ef4d7a1bd2e4b0df88a11e0467e5085c491510bf9984103c16b192088826c7596790b80adf84edc092cb2f94a9977e540ad125167b17f4f72dd1d708b44c13b
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.7.5.ebuild b/sys-fs/encfs/encfs-1.7.5.ebuild
deleted file mode 100644
index 8d95f5d6548a..000000000000
--- a/sys-fs/encfs/encfs-1.7.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
-HOMEPAGE="https://vgough.github.io/encfs/"
-SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="xattr"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/openssl:0
-	>=dev-libs/rlog-1.4
-	>=sys-fs/fuse-2.7.0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	xattr? ( sys-apps/attr )
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}/encfs-1.7.5-fix-pod.patch"
-	eautoreconf
-}
-
-src_configure() {
-	use xattr || export ac_cv_header_attr_xattr_h=no
-
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sys-fs/encfs/encfs-1.8.1.ebuild b/sys-fs/encfs/encfs-1.8.1.ebuild
deleted file mode 100644
index 6624588a26f7..000000000000
--- a/sys-fs/encfs/encfs-1.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils multilib
-
-DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
-HOMEPAGE="https://vgough.github.io/encfs/"
-SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
-IUSE="xattr nls"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/openssl:0
-	>=dev-libs/rlog-1.3
-	>=sys-fs/fuse-2.5
-	sys-libs/zlib"
-# Your libc probably provides xattrs, but to be safe
-# we'll dep on sys-apps/attr.  This should be fixed
-# if we ever create a virtual/attr.
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	xattr? ( sys-apps/attr )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# configure searches for either attr/xattr.h or sys/xattr.h
-	use xattr || export ac_cv_header_{attr,sys}_xattr_h=no
-
-	econf \
-		$(use_enable nls) \
-		--disable-valgrind \
-		--enable-openssl \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README.md
-	find "${D}" -name '*.la' -delete
-}
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index 12b573ed9cba..f51c6b663be6 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/encfs/encfs-1.9.4.ebuild b/sys-fs/encfs/encfs-1.9.4.ebuild
index accf2d71fe27..91dded583cbc 100644
--- a/sys-fs/encfs/encfs-1.9.4.ebuild
+++ b/sys-fs/encfs/encfs-1.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~sparc ~x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5.ebuild
new file mode 100644
index 000000000000..258bb0115cbd
--- /dev/null
+++ b/sys-fs/encfs/encfs-1.9.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit cmake-utils
+
+DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
+HOMEPAGE="https://vgough.github.io/encfs/"
+SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="libressl nls"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	dev-libs/tinyxml2:0=
+	sys-fs/fuse:=
+	sys-libs/zlib"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+# Build dir is hardcoded in test suite, but we restrict them
+# because they can lead to false negatives, bug #630486
+RESTRICT="test"
+BUILD_DIR="${S}/build"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DUSE_INTERNAL_TINYXML=OFF
+		-DBUILD_UNIT_TESTS=OFF
+	)
+	cmake-utils_src_configure
+}