[gentoo-commits] repo/gentoo:master commit in: x11-misc/basqet/, x11-misc/basqet/files/

[gentoo-commits] repo/gentoo:master commit in: x11-misc/basqet/, x11-misc/basqet/files/

[David Seifert]

commit:     ec07fdb4b4dc25f1e202ab0e85cedb21a2d29e77
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Feb 27 18:11:05 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Mar  1 20:44:48 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec07fdb4

x11-misc/basqet: EAPI bump 4 -> 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4091

 .../{basqet-0.2.0.ebuild => basqet-0.2.0-r1.ebuild}       | 15 +++++++++------
 x11-misc/basqet/files/basqet-0.2.0-desktop.patch          |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/x11-misc/basqet/basqet-0.2.0.ebuild b/x11-misc/basqet/basqet-0.2.0-r1.ebuild
similarity index 70%
rename from x11-misc/basqet/basqet-0.2.0.ebuild
rename to x11-misc/basqet/basqet-0.2.0-r1.ebuild
index 03607ac53ed..3dac0761f60 100644
--- a/x11-misc/basqet/basqet-0.2.0.ebuild
+++ b/x11-misc/basqet/basqet-0.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit qt4-r2
+inherit qmake-utils
 
 DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
 HOMEPAGE="https://bitbucket.org/ridderby/basqet"
@@ -22,8 +22,11 @@ S=${WORKDIR}/release_${PV}
 
 PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
 
-src_prepare() {
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake4 ${PN}.pro PREFIX="${EPREFIX}"/usr
+}
 
-	sed -i 's:PREFIX = /usr/local:PREFIX = /usr:' ${PN}.pro || die
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
 }

diff --git a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
index 161ad1d8fd3..d0320a6f637 100644
--- a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
+++ b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
@@ -1,5 +1,5 @@
---- basqet.desktop
-+++ basqet.desktop
+--- a/basqet.desktop
++++ b/basqet.desktop
 @@ -1,9 +1,9 @@
  [Desktop Entry]
 -Version=0.2.0