Version bump wrt bug #504054. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

4 files changed, 67 insertions, 30 deletions

diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog
index 9359cbc754a6..81c9dcb6cb65 100644
--- a/app-crypt/kencfs/ChangeLog
+++ b/app-crypt/kencfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/kencfs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.6 2013/03/02 19:14:26 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.7 2014/03/10 10:21:27 johu Exp $
+
+*kencfs-1.3.0 (10 Mar 2014)
+
+  10 Mar 2014; Johannes Huber <johu@gentoo.org>
+  +files/kencfs-1.3.0-build-fix.patch, +kencfs-1.3.0.ebuild, -kencfs-1.2.ebuild,
+  files/kencfs-1.2-desktop.patch, files/kencfs-1.2-gcc-4.7.patch:
+  Version bump wrt bug #504054. Remove old.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> kencfs-1.2-r1.ebuild,
   kencfs-1.2.ebuild:
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
new file mode 100644
index 000000000000..eb0a1cc10220
--- /dev/null
+++ b/app-crypt/kencfs/files/kencfs-1.3.0-build-fix.patch
@@ -0,0 +1,12 @@
+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.2.ebuild b/app-crypt/kencfs/kencfs-1.2.ebuild
deleted file mode 100644
index 68d1a7a60569..000000000000
--- a/app-crypt/kencfs/kencfs-1.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.2.ebuild,v 1.3 2013/03/02 19:14:26 hwoarang Exp $
-
-EAPI=4
-
-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"
-IUSE=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="kde-base/kdelibs
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}
-	sys-fs/encfs
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1-underlinking.patch"
-	"${FILESDIR}/${P}-gcc-4.7.patch"
-)
diff --git a/app-crypt/kencfs/kencfs-1.3.0.ebuild b/app-crypt/kencfs/kencfs-1.3.0.ebuild
new file mode 100644
index 000000000000..e92d56d53f6a
--- /dev/null
+++ b/app-crypt/kencfs/kencfs-1.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.3.0.ebuild,v 1.1 2014/03/10 10:21:27 johu Exp $
+
+EAPI=5
+
+LANGS="it ro"
+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
+"
+RDEPEND="${DEPEND}
+	kde-base/kwalletd
+	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}/${P}-build-fix.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
+}