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.

Package-Manager: portage-2.1.11.36/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 87 insertions, 9 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/Manifest b/app-crypt/kencfs/Manifest
index f02082ea3a0c..7db2d743efba 100644
--- a/app-crypt/kencfs/Manifest
+++ b/app-crypt/kencfs/Manifest
@@ -2,19 +2,22 @@
 Hash: SHA256
 
 AUX kencfs-1.1-underlinking.patch 361 SHA256 93b4c1a8fd5a052a837c84e2080f7784225cf8c5d944dd023cc83892a5849322 SHA512 03cf67e23a256a311090945970f5ca8e77c49272929b600d3a66fb390c0af822c802626ed6a2346429fa9d3ed7dcd7c9f25e3bf979527e7bf2c5f71ed9a641a2 WHIRLPOOL 46a023fe3cc1efdd7cf2e3c9a553928eecb091d8bf3530b6313e3bb73c0e74dfa0f8f5fd77469e1b08c8dbe91220594c2ff98140a43c85fa7646f21e3ea659d3
+AUX kencfs-1.2-desktop.patch 299 SHA256 db7edbdcbb48a405036b30873ac2347f66eced790e86a32d948573a7600aec15 SHA512 50beac6bcc37090239749264d695f95accca75b3896460cdd35ed9b9deb51e7ea43e6a0793e202f8b97fcfc50bf8bfa2fdbfb2c982b52487cc9761b4aef20121 WHIRLPOOL 595ab31fb59c848290b14481a2f7df3b1ac50f1958536328ebd6bd2591fe0cf95cf832280a00952a6c9a8e6c3925411958728d32195febc0586d72bbf5f895c2
+AUX kencfs-1.2-encfs5.patch 488 SHA256 db7566dafc8d4171368b41dc04e63b7cff42edc71c328f8072ba6096404c8626 SHA512 b23cf9dcef915342b10ba0d873896674ad7c8c6f7821f32dad71197d9edde1812bca8e31bc9dcdad477610c5f23f4830275555acb27434a1363bbbec01ea1ae1 WHIRLPOOL 71edf4cccecbb779787ab993c9d50d4490579b277c7f8ecde5e5a0591ce69269ad3b92706c22b8b64a2aa1852307a3da746277fd0cd428f6025be02e1b731cde
 AUX kencfs-1.2-gcc-4.7.patch 173 SHA256 84088eb5a8d1f9559cd23b080baa7b4f32d35ae482ff0c64b68733897a0224c0 SHA512 45eb6bd036677c4981ccbfa4b7f6f0873e32b10310a771ad46010f9ac7e95ead9a47bf3dfa3061fb78ddec68d35f951901a9d28a87fd6b1705e40393b2ed828f WHIRLPOOL 9becb22823818884fc8d1c62e2ceb9b5c2bd6730a7da903fcfbac7c2607182e6d12cb3a30031be2a120998043e899236e40c453323ffee6f5d9b3b6d6ef4eacc
 DIST 134003-kencfs-1.2.tar.gz 79623 SHA256 0769d0e5500edbdd90886af4dc5e668c37aee0ba9c4e29e5202ce05169f10a42 SHA512 f94a90bd20475c913910dfcdb1b1d229bddb84dc0d478e04a35af3b0ad461bb29ec45ebea8c76a5899c131f80b16c7f0923da58dd2085b1da272bb6d29dbd203 WHIRLPOOL eeb9229eebf175259ee44c37204b17e1de37a291cbb27e52592bdc5a8394a6644f5a6d81b3ee462a50a33d9aa84faa6c01539de6a2b1d8e85e12fc8ca8d4b87d
+EBUILD kencfs-1.2-r1.ebuild 980 SHA256 fba5fdf0fc2ea5d968f76a4094c44b52e308a19a736240178e532487d1946143 SHA512 b27873dc59d9fd0518dd90c6dcc7a0813d584a152a75aeec7cc3cb2ab7472debdba148693f83dcbc18ce55ab139c936cd5e4f2711d8aa9b4aaa91556698b5740 WHIRLPOOL 8f313c40cea75c7ec8360d82dade33a4c40144282e6b114215267dc201d553f25a7798f94eb609b3ed78d15eaa699f5808bc5fd3eb65f0be608cedcb527e7624
 EBUILD kencfs-1.2.ebuild 649 SHA256 dde786f29dd88a6fba272e34b82bb42ede1a2e29b77c3184f45e2c52aac66aed SHA512 573695d388a17dd780a9e3f552605bbf34646b9cdee3053c898b48012da393dcd48279843718d0ea737d1e651717f3e81e00d2ee57c5b1f8afcba2cfd236f5b6 WHIRLPOOL 7073c10bfcf4d7c21e14e8c552418e961d92b937724a8f762d93efca7acdbbe1418cecc4339b9aa124178e600ee42853ec3f157fd81852736f09fd359aca8527
-MISC ChangeLog 795 SHA256 3b7f767675b0073cea21ea434b8fc6a8132a383ed4e6abe1f8f75bef239189cf SHA512 ac2d094910fcdd6b0fc405dd971c3283f117457573279ecb1c19cb9de5a4d6808a634fe384d30937b326f49e49e8e9a6ccb1b1cd0a03206e6bdd8add0fb09d70 WHIRLPOOL e1f7cf5f8efb0493223560079a032f14e080a8e698ce2b97a05a74baf5a16bae2e8212353422f7159e31782fe303440b0d5f2fbac679bc84e45d46565c50319a
+MISC ChangeLog 1141 SHA256 d7cc0919299a99ff9821176cafad6aa55753d0fd07c387f9c703d9dd9b6f642f SHA512 46ff08cb5c22e5ad3d848d8a0311580446442a201c1e6e6791219298dfefb0b1b10a36d078077db72f6d98b578f98bdecc5372c69fd95a05c6828397f36c4172 WHIRLPOOL 17fbe3661f88330fabc7c6c4ca6753ce1cc567b08165e00935435a399c868ac58a7747766aabe3df30dacf589e8fdaf448671d23b09c89ba794a51a588e37c60
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYzpMAAoJEMbwO6tnXQ0sZokH/jHz9MWo+ViC1NK6JgVKiJ5P
-Gp4y58hpbXXFdNHAOyCQxzpaNfiQTlg0cg/3s/Tx/kl5YIg3/gSgSfCTCLF7PDdg
-lYV2jH0UghVL2MrMTgLiAPTNeuNjYIuI0KzeSg4HJYpq3WDBtfW9I6TAow3kVmg5
-MbEx079GwbNz0l5N/UP+AGMOs332+/D+CQWrstumxlC8qvNzSm2vyd3rhsyYrWuK
-YXK+KLbMBbpAkEg1PGgMYlMF022IEVkmApD2SADSNVwa66+G01ihR8cLxiX3TQ/G
-kC2TfLBsJScyHmRyy18t4AQi89AXyNHX+uenK+H6hUxRRkY4e80biWzASVMkzrk=
-=akE+
+iQEcBAEBCAAGBQJQxzTpAAoJEMbwO6tnXQ0sDcQH/2LYMOtuspIMoA2T/DXApg7X
+xW3tvkuNCiHlzgb80Z/Ojcy+THVnswVsS50n5lYADRGqYnkWQUT6W0JZHMCSISE5
+ULpSqQsiWCVPeH4cqgx21tx5UWI+qi3QB6yynSg0UHSJ0uY6bSOPZpJ8PWIp6HEF
+gQox84IYSAoQcMA9UPRF/sEOx3KFzzkuxZHeE+cE1VtiGqIdlajZWxMx22ENMB98
+Lh+4NGPFizcyXBqYERJjpEOWvepzsXJ+JVJetz5mwA8/Ko+fRyeXTEVWS22LOIRV
+kVIesJNsZKuvDqi/uI7dyc9645pOaYuPiqIlOZ28rQ3ccVhVvgUJl83iVeRTXcw=
+=dvur
 -----END PGP SIGNATURE-----
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
+}