Add patch by PhobosK <phobosk@fastmail.fm> to support encfs5 volumes, wrt bug #446652. Migrate to EAPI 5, respect DOCDIR & LINGUAS, and fix .desktop validation.

(Portage version: 2.1.11.36/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 76 insertions, 1 deletions

diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog
index 74185981ea31..9cc88c736a8b 100644
--- a/app-crypt/kencfs/ChangeLog
+++ b/app-crypt/kencfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/kencfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.4 2012/09/26 17:25:13 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.5 2012/12/11 13:30:01 kensington Exp $
+
+*kencfs-1.2-r1 (11 Dec 2012)
+
+  11 Dec 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kencfs-1.2-desktop.patch, +files/kencfs-1.2-encfs5.patch,
+  +kencfs-1.2-r1.ebuild:
+  Add patch by PhobosK <phobosk@fastmail.fm> to support encfs5 volumes, wrt bug
+  #446652. Migrate to EAPI 5, respect DOCDIR & LINGUAS, and fix .desktop
+  validation.
 
   26 Sep 2012; Michael Palimaka <kensington@gentoo.org> -kencfs-1.1.ebuild:
   Remove old.
diff --git a/app-crypt/kencfs/files/kencfs-1.2-desktop.patch b/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
new file mode 100644
index 000000000000..900f027f4abc
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.2-desktop.patch
@@ -0,0 +1,11 @@
+--- /tmp/kencfs.desktop	2012-12-12 00:06:01.000000000 +1100
++++ kencfs.desktop	2012-12-12 00:07:54.000000000 +1100
+@@ -2,7 +2,7 @@
+ Name=KEncFS
+ Exec=kencfs
+ Icon=document-encrypt
+-Categories=System;Security
++Categories=Qt;KDE;System;Security;
+ Terminal=false
+ Type=Application
+ StartupNotify=false
diff --git a/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
new file mode 100644
index 000000000000..58f3e0db8266
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.2-encfs5.patch
@@ -0,0 +1,11 @@
+--- 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.2-r1.ebuild b/app-crypt/kencfs/kencfs-1.2-r1.ebuild
new file mode 100644
index 000000000000..2208bc215511
--- /dev/null
+++ b/app-crypt/kencfs/kencfs-1.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.2-r1.ebuild,v 1.1 2012/12/11 13:30:01 kensington Exp $
+
+EAPI=5
+LANGS="it"
+
+inherit qt4-r2
+
+DESCRIPTION="GUI frontend for encfs"
+HOMEPAGE="http://kde-apps.org/content/show.php?content=134003"
+SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="kde-base/kdelibs
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4
+"
+RDEPEND="${DEPEND}
+	sys-fs/encfs
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-underlinking.patch"
+	"${FILESDIR}/${P}-desktop.patch"
+	"${FILESDIR}/${P}-encfs5.patch"
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+
+	sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.1/${PF}/" \
+		|| die "sed docdir failed"
+
+	if ! use linguas_it ; then
+		sed -i ${PN}.pro -e "s/*.qm//" \
+			|| die "sed TRANSLATIONS failed"
+	fi
+}