[gentoo-commits] repo/gentoo:master commit in: net-ftp/oneclickftp/

[Davide Pesavento]

commit:     070656e250301bda9295f923a0ee45bbe8820a32
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 18:00:37 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 30 18:00:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=070656e2

net-ftp/oneclickftp: migrate to EAPI 6

Package-Manager: portage-2.3.0_rc1

 net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild b/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
index 893c235..d6c31df 100644
--- a/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
+++ b/net-ftp/oneclickftp/oneclickftp-0.5.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=2
-inherit eutils qt4-r2
+EAPI=6
+
+inherit eutils qmake-utils
 
 DESCRIPTION="The somehow different FTP client"
 HOMEPAGE="http://oneclickftp.sourceforge.net/"
@@ -15,11 +16,14 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	|| ( app-crypt/qca:2 app-crypt/qca:2[qt4] )
-	dev-qt/qtgui:4"
+	app-crypt/qca:2[qt4(+)]
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-qt47.patch
+	"${FILESDIR}/${P}-qt47.patch"
 )
 
 src_configure() {
@@ -27,8 +31,10 @@ src_configure() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die
+	emake INSTALL_ROOT="${D}" install
+
 	doicon res/icons/${PN}.png
 	make_desktop_entry ${PN} ${PN}
-	dodoc CHANGELOG
+
+	einstalldocs
 }