Version bump wrt bug #549458.

(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 13 insertions, 20 deletions

diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog
index 58a4a2cfc27f..81803763ca53 100644
--- a/app-crypt/kencfs/ChangeLog
+++ b/app-crypt/kencfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/kencfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.10 2014/09/04 12:47:23 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.11 2015/05/15 18:59:38 kensington Exp $
+
+*kencfs-1.5.0 (15 May 2015)
+
+  15 May 2015; Michael Palimaka <kensington@gentoo.org> +kencfs-1.5.0.ebuild,
+  -files/kencfs-1.2-encfs5.patch, -kencfs-1.3.1.ebuild:
+  Version bump wrt bug #549458.
 
 *kencfs-1.4.0 (04 Sep 2014)
 
diff --git a/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
deleted file mode 100644
index 58f3e0db8266..000000000000
--- a/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/fsDialog.cpp	2011-06-12 17:26:23.000000000 +0300
-+++ b/fsDialog.cpp	2012-12-09 22:51:40.329612830 +0200
-@@ -132,7 +132,7 @@
-         QStringList arg;
-         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");
-         text.append("\n");
-         p->write(text.toLocal8Bit().data());
-         p->waitForFinished();
diff --git a/app-crypt/kencfs/kencfs-1.3.1.ebuild b/app-crypt/kencfs/kencfs-1.5.0.ebuild
index 719d622d1849..326b8b07b47c 100644
--- a/app-crypt/kencfs/kencfs-1.3.1.ebuild
+++ b/app-crypt/kencfs/kencfs-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.3.1.ebuild,v 1.1 2014/05/01 16:17:12 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.5.0.ebuild,v 1.1 2015/05/15 18:59:38 kensington Exp $
 
 EAPI=5
 
@@ -21,20 +21,18 @@ DEPEND="
 	kde-base/kdelibs:4
 "
 RDEPEND="${DEPEND}
-	kde-base/kwalletd
+	kde-base/kwalletd:4
 	sys-fs/encfs
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2-desktop.patch"
-	"${FILESDIR}/${PN}-1.2-encfs5.patch"
-	"${FILESDIR}/${PN}-1.2-gcc-4.7.patch"
-	"${FILESDIR}/${PN}-1.3.0-build-fix.patch"
+	"${FILESDIR}/${PN}-1.4.0-encfs5.patch"
 )
 
 src_prepare() {
 	qt4-r2_src_prepare
 
-	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.3/${PF}/" \
+	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.5/${PF}/" \
 		|| die "sed docdir failed"
 }