5 files changed, 22 insertions, 82 deletions
diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog
index 338df0b279fa..2488c9d6b521 100644
--- a/app-crypt/kencfs/ChangeLog
+++ b/app-crypt/kencfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/kencfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.15 2015/08/02 18:55:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.16 2015/08/03 13:20:22 kensington Exp $
+
+  03 Aug 2015; Michael Palimaka <kensington@gentoo.org>
+  -files/kencfs-1.2-gcc-4.7.patch, -files/kencfs-1.3.0-build-fix.patch,
+  -kencfs-1.4.0.ebuild:
+  Remove old.
 
   02 Aug 2015; Agostino Sarubbo <ago@gentoo.org> kencfs-1.5.0.ebuild:
   Stable for x86, wrt bug #549456
diff --git a/app-crypt/kencfs/Manifest b/app-crypt/kencfs/Manifest
index ada126681c3f..189e7227a91c 100644
--- a/app-crypt/kencfs/Manifest
+++ b/app-crypt/kencfs/Manifest
@@ -2,29 +2,26 @@
 Hash: SHA256
 
 AUX kencfs-1.2-desktop.patch 299 SHA256 db7edbdcbb48a405036b30873ac2347f66eced790e86a32d948573a7600aec15 SHA512 50beac6bcc37090239749264d695f95accca75b3896460cdd35ed9b9deb51e7ea43e6a0793e202f8b97fcfc50bf8bfa2fdbfb2c982b52487cc9761b4aef20121 WHIRLPOOL 595ab31fb59c848290b14481a2f7df3b1ac50f1958536328ebd6bd2591fe0cf95cf832280a00952a6c9a8e6c3925411958728d32195febc0586d72bbf5f895c2
-AUX kencfs-1.2-gcc-4.7.patch 173 SHA256 84088eb5a8d1f9559cd23b080baa7b4f32d35ae482ff0c64b68733897a0224c0 SHA512 45eb6bd036677c4981ccbfa4b7f6f0873e32b10310a771ad46010f9ac7e95ead9a47bf3dfa3061fb78ddec68d35f951901a9d28a87fd6b1705e40393b2ed828f WHIRLPOOL 9becb22823818884fc8d1c62e2ceb9b5c2bd6730a7da903fcfbac7c2607182e6d12cb3a30031be2a120998043e899236e40c453323ffee6f5d9b3b6d6ef4eacc
-AUX kencfs-1.3.0-build-fix.patch 532 SHA256 3115277ee88434dc43cbb66b41f951ae4244b9493178e5bbe87488e5f467f2b9 SHA512 8fb1caf124f750dc872acb3f812ed2530b7f18540a834edd71e0bc7154868856cd5c630905c239180b31b41bca64712d19e1335623a6b9d8a18d2b0fb40ff8a9 WHIRLPOOL bafe3e700f3ae882f225c13a31dfac8bde01a4c763ee0d0a0fb36843a3fa738de1b322329e3ebd5c69f9395fe5e97e21b7eab8c88fdcb2751a4ec3de6dca0fe6
 AUX kencfs-1.4.0-encfs5.patch 413 SHA256 4c0eab8077163535d519cdd9de70c8561a4f3f5698f8c1a9c559d3271b1ee317 SHA512 47cb411f80bb4270d3c7e0b132949e2b0185b5170228120ee336fc1bb8ee83c9c0a960746407e8934097381a558be941d08d6e28b774423e58102a3f82a66ae0 WHIRLPOOL 5565e1de3feb3c10ef76afd90015f633e7b90ea985956ad0e2f6d37905bbd4d8ca2c0eb93bf67140bdc7b9c7d3c56d3cd16017b530ee87b6ce4950c401cb035b
-DIST 134003-kencfs-1.4.0.tar.gz 157751 SHA256 4a91258d44bddfd3ab9a2cbe389852cf5b0bfa865a6061358f86725d836c7f81 SHA512 d95e553f08f8d7e476dabb2bdcdfbb94254c6e8d0de50da3997260ed93007a68f211764fc8c80cadefe0eddbc5f31e1f564b850486f654867f6f64757262c6b0 WHIRLPOOL cd8b07279d3365de6dd98f1092edf1930499606cd417227e9076a1fd59dd3c12d6c169901d9602ea603b2170a745f98db22685213622fcaaa677c9c120623c2b
 DIST 134003-kencfs-1.5.0.tar.gz 156217 SHA256 b53314fe022b6fb20d427a6c9a1d08be5df87823754a7d22724a9f3960fe24f0 SHA512 0168a0241c9e2e614b5d796c02cc9103596040e4cdd1349c250f0d25d20bfe7f8c3ad6f192f57e5b519d83ffdaec8eabf389d3d0286da282cfe42e78e5c966f3 WHIRLPOOL 42964b27d48ef3a816f657d417a044f2d60bd7d895bdaa2701d96e9c666f60d0e967ddf9536033f1d3207181973f9524cd1b29897b3ab2527a58edef329704e4
-EBUILD kencfs-1.4.0.ebuild 899 SHA256 d729ba290e6cec31fffec96dc06729c3749fae09a7152f4df713e5e1b212fb0a SHA512 a887894c94e6b44a7089abfebe5eaecf83303a95bb30c0e7695f904c2c27d1547ec6a96f88686f94ef88aa6c6e826d6c1e3407bfab7d83530a89b5dd86c88859 WHIRLPOOL afe19b5ffa7722875362e94f2642cf4940bda2b556ca1c5aef88769e9bce0afae5bddd65e15fe38f5e11df20203e52dea963475735f4a3941eae980bf857eddc
 EBUILD kencfs-1.5.0.ebuild 808 SHA256 28b5417079b425c4844822405460ab65100e421e8729f7cfc2a9eeeb5cda6f37 SHA512 f700d915710a6ec7611408d367264bf5fe3b1bd9c2856dbd9e706f29d6cab8d1593a5e7e193897813912e7c6a78e9245b84252a4b1dcf7e399c3aeeb7b5bede2 WHIRLPOOL 803e8c3389bab77b9c64ef91e9e148a844a2718c4faeed2168a7ff3621c7919f6a35a1ff9e06b511008605989bbc3607c4401b413c11312ff8ca80014b73342e
-MISC ChangeLog 2470 SHA256 b0b28fec8c7f6299e9f03345326fd01bbf8de59ef7caee65f1022c90f4dad635 SHA512 323e2896d81a088ed03d1b9a981154c06caced7ee3b2b8105bff92afe3ad0c5b27ea4dfe010ad351d90a45ca4dd0a4477df4fe3da243c26d32f8527160e57efd WHIRLPOOL ef1fc7f57d5d454c4084471740aa4abc9ce471c2f75d1adeba9c691e5c2c206da70d78cd60d380ef6b2b8bc435aa512d59cfa81ec5d1ce691d8285d83984ab54
+MISC ChangeLog 2644 SHA256 01a32d4dfeca20561235cc382f170cda00ea155b5863970820ecfe5298e58f84 SHA512 24df8a5a5ead26fe64c9f9059d52fa74be7bf5da54ca07eb327b57f38f30c90221c519868ad9c8deffd16a9f3f71022848d2a5b7adbed3dcef03679094ea0141 WHIRLPOOL 1e4c5302fa53aa2b738c4b8c9e619b6122ee391e574986fa8943a8f5f50baaf04a471d76f0371e00befe5fa27e8da65a5196c8d72507df012d68ae44897c5f6d
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJVvmexAAoJELp701BxlEWfjGsQAI4LpjPjFT/02JUlwuzKR/N4
-XRs8XmnVXoJCO8IrEMMfj++djZkTRXKcBm9pVmvwQNXxj1kqZOeasIbfvsNS5jbU
-DuT0HnrwdDOIqmC2QTzfwSfBxzXe6jbvvCC7XT1aWhXQaCGDYj7FGnWsd2HjVbKk
-82ZYPXyDOTXUjFD7t/GNBIaeXBoBCCD+sZjXsvSPhpb8OENUwjBaBnjnBTI2yA+y
-8Mc5NWktEcwrf2TF896ZZG4OYIdycjOxTOgQD0Y4c4HiFXKcQIJz+VKRX601Ez5n
-aMLNcsNE0x/mo39yfnpDWTVCeMAXxcXhdmZSXASvIjhB5oT8Yvls3ljqMhAUJEnm
-GUYqDOQ5oM4e8KPDywTfDTyxGpkpTaEF5ZENj9GceTH3u8gD4SgdIA4952SvsSJr
-IIGrIQh44oeUZhUHmcuU9dlp+Nv42SI2XmaTLSs1fwFukYcmDDcrTd6HtJsvcPfg
-pkH2phmCDqosOMJN5QeFfJFCEHK5V1UwrRg+9gmEsNPVzoqtYLJgx6G+6V8Ml+np
-8zmtpL9/ptaxuFJ3GW/cTBsfpCLinH2Fb0xjY0Vr12CF44WL67HU6rTJ8OMgY4mU
-D0YLMNM9wDvnNvkZW6xf0qsnmrmnpwI3Q/FiPjXAoJ2RkT33j0/0k7UJJHVsW49l
-lfGj3sLHMOeLWFQscLhb
-=bq+p
+iQJiBAEBCABMBQJVv2qVRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7Ml+EACQVaQFjbnxRbKQtIALdmqxx7eihRotvjHnz4Ppy5h0vOSk5G5ZGliyDriU
+AUz6cwTbICdpqyXN9JfnpIQBNPBNtJuk8yBKvX3FiBA9YSP5n+R+zKn9g5Br9RaQ
+qkIAM3VsMfdWz0k17cb6KLxFta11JFfxYGnVeFjG7d5rQYX1gJF8gIv2K7P+f9P8
+OV7rZNKyS9GNJ6tFqqfKl4UjlvVQiRuNLrvKKH8QzEkMZcF4+Rm/qYVBgpcPmI5d
+lmTLjCYsB6mwtOcwl4K2neKR3axWUbfmvsczvbypYuUt7U18ml5uKfzfcT0S/9CJ
+R97R/fJ2IiFCP0g6lbhPBhwtkqbOI9cqt6sSO4V5MCji5WnlpPLGfo7Bxl7hihUa
+MidxnbqhutTzCF0RjN0HeC8MOTxGaA32IEeBkleXnjYpxqERrhzl6qLXk0iTP0hY
+xdwvHfj4XTOjSJJ7+618F4BdnaD0GM6NEKfcVou7bpiszaNYlKNXfUeabXhgYEXU
+rilNYvQFmnOPe3GkXyHInl8MvDuQ4LzLH0gGXn9RpKkEc4CP9klLjaZjAQe4YiPQ
++PmPEERDZZQ3ne4mGklQwkgCKJnw3uca8Nuev8y3XbjHron7j5jgWOM32gPE3qyb
+QoUlBO1Y1+3RrWljhYnVx7KzscgwDaO+PXLXwiEHKTC+fKTTSA==
+=INfX
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch b/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch
deleted file mode 100644
index d4b41a7e4750..000000000000
--- a/app-crypt/kencfs/files/kencfs-1.2-gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qtlocalpeer.cpp
-+++ qtlocalpeer.cpp
-@@ -57,6 +57,7 @@
- #endif
- #if defined(Q_OS_UNIX)
- #include <time.h>
-+#include <unistd.h>
- #endif
- 
- namespace QtLP_Private {
diff --git a/app-crypt/kencfs/files/kencfs-1.3.0-build-fix.patch b/app-crypt/kencfs/files/kencfs-1.3.0-build-fix.patch
deleted file mode 100644
index eb0a1cc10220..000000000000
--- a/app-crypt/kencfs/files/kencfs-1.3.0-build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN kencfs-1.3.0.old/qtlocalpeer.cpp kencfs-1.3.0/qtlocalpeer.cpp
---- kencfs-1.3.0.old/qtlocalpeer.cpp	2013-01-08 21:04:48.000000000 +0100
-+++ kencfs-1.3.0/qtlocalpeer.cpp	2014-03-10 11:03:16.909581255 +0100
-@@ -100,7 +100,7 @@
-         socketName += QLatin1Char('-') + QString::number(sessionId, 16);
-     }
- #else
--    socketName += QLatin1Char('-') + QString::number(QtLP_Private::getuid(), 16);
-+    socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
- #endif
- 
-     server = new QLocalServer(this);
diff --git a/app-crypt/kencfs/kencfs-1.4.0.ebuild b/app-crypt/kencfs/kencfs-1.4.0.ebuild
deleted file mode 100644
index 737281cb7b5a..000000000000
--- a/app-crypt/kencfs/kencfs-1.4.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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.4.0.ebuild,v 1.2 2015/06/04 18:58:27 kensington Exp $
-
-EAPI=5
-
-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="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	kde-base/kdelibs:4
-"
-RDEPEND="${DEPEND}
-	kde-apps/kwalletd:4
-	sys-fs/encfs
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2-desktop.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}/" \
-		|| die "sed docdir failed"
-}