gentoo resync : 29.10.2017

6 files changed, 93 insertions, 1 deletions

diff --git a/app-crypt/kencfs-plasma/Manifest b/app-crypt/kencfs-plasma/Manifest
index 334d6e22b548..3f84b4431204 100644
--- a/app-crypt/kencfs-plasma/Manifest
+++ b/app-crypt/kencfs-plasma/Manifest
@@ -1,3 +1,8 @@
+AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
+AUX kencfs-1.6.2-desktop.patch 228 SHA256 d39d44d5714e6976e7cdf18abe22e0134b02800ca7c45651d98225fa310ddcf4 SHA512 0f96b65f43fd08cfa116381e5db1ceec81eebb076dca9349d7d3781651bdc7d04e8f4d0cc611f793e581416304174286db98c6aee814059520a47f26bf885d92 WHIRLPOOL 2685f3cd9f7fc2bb385a19d228e95d254255fd010f4dbb37ecb3b2ce7f506ff74d032874540d674ae915997a12c3b780d10e25952e19182b832ccef41d317b49
+AUX kencfs-plasma-2.0.1_alpha-include.patch 267 SHA256 d2fcbf056c642acd35a1b565b7cac9d94c3db2a04c842ba4e1a50ebf5f10707b SHA512 74646bab28c76db89d441e7528ad288f44522dc20f53b5b12b8140d1a61c86d9ae0fb9f559d37fe1de912f176a366000d77b67a3fe3657a3428304a2ce2a29a1 WHIRLPOOL b195a1780e7747800d144e423baaba27b07d5fb540b8a2ee1fef05d5335b7029318dea1a818f7ed153a914918d3313ff730b86767762e55726e9f46c4264f7d9
+DIST kencfs-1.6.4.tar.gz 221386 SHA256 3e88cd2bf0d11ce83746fb5b1e385f172ed506cde922ee2811f9cdbaaa80c4ca SHA512 44dacd0a17194b61d2d73820851b496d6052dbab3893a030db2e63c1be0d1569d80cc75ce0c179381e98b60c5e27ccead8ee257f53f57dea508808616abb514d WHIRLPOOL 8b7f372c8c8304f3a3249a74a565ea77c4c3f255c6db3cf66a2a62951be1b8010e9696dc5d5ac44ea1e39d189c63e4a1ccf562cd4886578e8a2383756e48d24b
 DIST kencfs-plasma-2.0.1a.tar.gz 216580 SHA256 8a46fd2f2f490323350ae17d34d7c10de1afe73943413a3e2cc10e52d3dd6eb6 SHA512 a9093680bb141c18e2d4ed8a966f7176c40c10fa0ee6e5cee25ae26ef3f94e6ffc7e3f0a7b55321640e4ba6e484d75755f901b53688dbfc5c22a1c0b1e01cfac WHIRLPOOL 146aedf68686611be6bbe69c7b9370e27780c7bf33f1ea962c4b48a895770be0b50a03257a8d74b38eef99fbbdfa85a7c116b7f7385b80e343a3063b79f895e6
-EBUILD kencfs-plasma-2.0.1_alpha.ebuild 896 SHA256 6988818e053f2daa732fe7fe75ee996960cda99570291c57bd3b365b03607fd2 SHA512 011f88640c115e3770f1fc58a01864d847b6e3d3b01842b55211241bbf6f01d3e1816cb034f09e569c70e60056705d06239a420af8150885b87be681f6c0c328 WHIRLPOOL 2bb43b2a5edef7af4a4f63d6e4148c1aae0dbbb4f24742c805576a366994cf70a3e0ed614c2a3a2194eeb31ccaea10526d8657f48ca5b44d6a8b64c704e22e9f
+EBUILD kencfs-plasma-1.6.4.ebuild 891 SHA256 db4cb243e3010bb7c5a2d6f6926bfc69df34aa73f6d482eadf779c7113e190ac SHA512 13da37f7e2323b1a889ef6bc23e6af36b818e37e6bf0a52258b36a15275b418455804dac67467ac2717448cf477d7c7fa68ca4d12c635f5259a0d645c867acb4 WHIRLPOOL d93ea87216c394866c6d14ee37d9d46192e30929ebbd05979f8cd61dd0296cd58d9fc0d3daf102dd965ee2dd3ecfaf19bcc992459e92eb80c710466505f2d4a4
+EBUILD kencfs-plasma-2.0.1_alpha.ebuild 942 SHA256 fadc04940792dc53bdf8a291877782e4e2603df4546e87211966bfaad6632cdb SHA512 bdc8261ada220cf77dac4f95ccbb38354e2b4d67e8219367ae3a949b1724a53d2c32e8c9381010d1449d73f85087d2feea00ec87c88d13671825f7d6d420d17e WHIRLPOOL c800b13a5d2e0a723823d06e528b4e209a3c454788b723fda4a192db9b01f362716b03fa40ea1a7af44789e19a14982a4e73ab7a58038dbcdb57373deb292771
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
new file mode 100644
index 000000000000..6687ac0f1f9b
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.4.0-encfs5.patch
@@ -0,0 +1,13 @@
+Support older encfs5 volumes wrt Gentoo bug #446652.
+
+--- a/fsDialog.cpp
++++ b/fsDialog.cpp
+@@ -161,7 +161,7 @@
+ 
+     arg << cr << pm << "-S";
+     p->start(prg,arg);
+-    if (! QFile::exists(cr+"/.encfs6.xml")) p->write("\n");
++    if (! (QFile::exists(cr+"/.encfs6.xml") || QFile::exists(cr+"/.encfs5")) ) p->write("\n");
+     p->write(pw.toLocal8Bit().data());
+     p->write("\n");
+     p->waitForFinished();
diff --git a/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
new file mode 100644
index 000000000000..2d8683f11e46
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-1.6.2-desktop.patch
@@ -0,0 +1,11 @@
+--- a/kencfs.desktop
++++ b/kencfs.desktop
+@@ -2,7 +2,7 @@
+ Name=KEncFS
+ Exec=kencfs
+ Icon=kencfs/kencfs-icon
+-Categories=System;Security
++Categories=Qt;KDE;System;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
diff --git a/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
new file mode 100644
index 000000000000..2bdd692c122f
--- /dev/null
+++ b/app-crypt/kencfs-plasma/files/kencfs-plasma-2.0.1_alpha-include.patch
@@ -0,0 +1,13 @@
+Fix build when kdelibs is not installed.
+
+--- a/mainwindow.cpp
++++ b/mainwindow.cpp
+@@ -52,7 +52,7 @@
+ 
+ QStandardItemModel *model;
+ 
+-#include <KDE/KWallet/Wallet>
++#include <KWallet>
+ using KWallet::Wallet;
+ Wallet *m_wallet;
+ QString WalletFolder="Kencfs-Plasma";
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
new file mode 100644
index 000000000000..3661c4b1d3f3
--- /dev/null
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-1.6.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-plasma/}"
+inherit qmake-utils
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="https://www.linux-apps.com/content/show.php?content=134003"
+SRC_URI="https://dl.opendesktop.org/api/files/download/id/1486311191/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	kde-frameworks/kdelibs:4
+"
+RDEPEND="${DEPEND}
+	kde-frameworks/kwallet:5
+	sys-fs/encfs
+"
+
+PATCHES=(
+	"${FILESDIR}/${MY_PN}-1.4.0-encfs5.patch"
+	"${FILESDIR}/${MY_PN}-1.6.2-desktop.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	sed -i ${MY_PN}.pro -e "/^doc.path =/s/${MY_PN}/${MY_PN}-${PVR}/" \
+		|| die "sed docdir failed"
+}
+
+src_configure() {
+	eqmake4
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
index 51d97e164f65..5b6df0f1ffd6 100644
--- a/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
+++ b/app-crypt/kencfs-plasma/kencfs-plasma-2.0.1_alpha.ebuild
@@ -30,6 +30,8 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+
 src_prepare() {
 	default