Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/basqet/, x11-misc/basqet/files/
Date: Wed, 01 Mar 2017 20:46:01
Message-Id: 1488401088.ec07fdb4b4dc25f1e202ab0e85cedb21a2d29e77.soap@gentoo
1 commit: ec07fdb4b4dc25f1e202ab0e85cedb21a2d29e77
2 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 27 18:11:05 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 1 20:44:48 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec07fdb4
7
8 x11-misc/basqet: EAPI bump 4 -> 6
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Closes: https://github.com/gentoo/gentoo/pull/4091
12
13 .../{basqet-0.2.0.ebuild => basqet-0.2.0-r1.ebuild} | 15 +++++++++------
14 x11-misc/basqet/files/basqet-0.2.0-desktop.patch | 4 ++--
15 2 files changed, 11 insertions(+), 8 deletions(-)
16
17 diff --git a/x11-misc/basqet/basqet-0.2.0.ebuild b/x11-misc/basqet/basqet-0.2.0-r1.ebuild
18 similarity index 70%
19 rename from x11-misc/basqet/basqet-0.2.0.ebuild
20 rename to x11-misc/basqet/basqet-0.2.0-r1.ebuild
21 index 03607ac53ed..3dac0761f60 100644
22 --- a/x11-misc/basqet/basqet-0.2.0.ebuild
23 +++ b/x11-misc/basqet/basqet-0.2.0-r1.ebuild
24 @@ -1,9 +1,9 @@
25 -# Copyright 1999-2013 Gentoo Foundation
26 +# Copyright 1999-2017 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=4
30 +EAPI=6
31
32 -inherit qt4-r2
33 +inherit qmake-utils
34
35 DESCRIPTION="Keep your notes, pictures, ideas, and information in Baskets"
36 HOMEPAGE="https://bitbucket.org/ridderby/basqet"
37 @@ -22,8 +22,11 @@ S=${WORKDIR}/release_${PV}
38
39 PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
40
41 -src_prepare() {
42 - qt4-r2_src_prepare
43 +src_configure() {
44 + eqmake4 ${PN}.pro PREFIX="${EPREFIX}"/usr
45 +}
46
47 - sed -i 's:PREFIX = /usr/local:PREFIX = /usr:' ${PN}.pro || die
48 +src_install() {
49 + emake INSTALL_ROOT="${D}" install
50 + einstalldocs
51 }
52
53 diff --git a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
54 index 161ad1d8fd3..d0320a6f637 100644
55 --- a/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
56 +++ b/x11-misc/basqet/files/basqet-0.2.0-desktop.patch
57 @@ -1,5 +1,5 @@
58 ---- basqet.desktop
59 -+++ basqet.desktop
60 +--- a/basqet.desktop
61 ++++ b/basqet.desktop
62 @@ -1,9 +1,9 @@
63 [Desktop Entry]
64 -Version=0.2.0