diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-09-04 12:47:23 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-09-04 12:47:23 +0000 |
| commit | 4a61c3ff143018f366bceb4a3ce59fe17767490c (patch) | |
| tree | 099d9b23c3983c238425ed9ccc88b790b5085f1f /app-crypt | |
| parent | Old. (diff) | |
| download | gentoo-2-4a61c3ff143018f366bceb4a3ce59fe17767490c.tar.gz gentoo-2-4a61c3ff143018f366bceb4a3ce59fe17767490c.tar.bz2 gentoo-2-4a61c3ff143018f366bceb4a3ce59fe17767490c.zip | |
Version bump wrt bug #521844. Remove old.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/kencfs/ChangeLog | 8 | ||||
| -rw-r--r-- | app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch | 13 | ||||
| -rw-r--r-- | app-crypt/kencfs/kencfs-1.4.0.ebuild (renamed from app-crypt/kencfs/kencfs-1.3.0.ebuild) | 18 |
3 files changed, 26 insertions, 13 deletions
diff --git a/app-crypt/kencfs/ChangeLog b/app-crypt/kencfs/ChangeLog index 40e13053db46..58a4a2cfc27f 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.9 2014/05/01 16:17:12 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/ChangeLog,v 1.10 2014/09/04 12:47:23 kensington Exp $ + +*kencfs-1.4.0 (04 Sep 2014) + + 04 Sep 2014; Michael Palimaka <kensington@gentoo.org> + +files/kencfs-1.4.0-encfs5.patch, +kencfs-1.4.0.ebuild, -kencfs-1.3.0.ebuild: + Version bump wrt bug #521844. Remove old. *kencfs-1.3.1 (01 May 2014) diff --git a/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch new file mode 100644 index 000000000000..6687ac0f1f9b --- /dev/null +++ b/app-crypt/kencfs/files/kencfs-1.4.0-encfs5.patch @@ -0,0 +1,13 @@ +Support older encfs5 volumes wrt Gentoo bug #446652. + +--- a/fsDialog.cpp ++++ b/fsDialog.cpp +@@ -161,7 +161,7 @@ + + 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"); + p->write(pw.toLocal8Bit().data()); + p->write("\n"); + p->waitForFinished(); diff --git a/app-crypt/kencfs/kencfs-1.3.0.ebuild b/app-crypt/kencfs/kencfs-1.4.0.ebuild index e92d56d53f6a..8212d4426142 100644 --- a/app-crypt/kencfs/kencfs-1.3.0.ebuild +++ b/app-crypt/kencfs/kencfs-1.4.0.ebuild @@ -1,10 +1,9 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.4.0.ebuild,v 1.1 2014/09/04 12:47:23 kensington Exp $ EAPI=5 -LANGS="it ro" inherit qt4-r2 DESCRIPTION="GUI frontend for encfs" @@ -19,28 +18,23 @@ IUSE="" DEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 - kde-base/kdelibs + 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}/${P}-build-fix.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.1/${PF}/" \ + sed -i ${PN}.pro -e "/^doc.path =/s/${PN}-1.3/${PF}/" \ || die "sed docdir failed" - - if ! use linguas_it ; then - sed -i ${PN}.pro -e "s/*.qm//" \ - || die "sed TRANSLATIONS failed" - fi } |