1 |
commit: 438d0fa1f676fa03fe4b89b8bd3186af5433da29 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 20 23:24:55 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 20 23:25:13 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438d0fa1 |
7 |
|
8 |
sci-geosciences/gpsbabel: EAPI-7 bump, use desktop.eclass |
9 |
|
10 |
Drop superfluous ${S} |
11 |
|
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 45 +++++++++++++---------- |
16 |
1 file changed, 25 insertions(+), 20 deletions(-) |
17 |
|
18 |
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild |
19 |
index cc1c9bde096..3b07666bdf5 100644 |
20 |
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild |
21 |
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild |
22 |
@@ -1,9 +1,9 @@ |
23 |
-# Copyright 1999-2017 Gentoo Foundation |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=7 |
29 |
|
30 |
-inherit autotools eutils qmake-utils |
31 |
+inherit autotools desktop qmake-utils |
32 |
|
33 |
DESCRIPTION="GPS waypoints, tracks and routes converter" |
34 |
HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" |
35 |
@@ -16,6 +16,14 @@ SLOT="0" |
36 |
KEYWORDS="amd64 ~ppc x86" |
37 |
IUSE="doc +gui" |
38 |
|
39 |
+BDEPEND=" |
40 |
+ doc? ( |
41 |
+ app-text/docbook-xml-dtd:4.1.2 |
42 |
+ dev-lang/perl |
43 |
+ dev-libs/libxslt |
44 |
+ ) |
45 |
+ gui? ( dev-qt/linguist-tools:5 ) |
46 |
+" |
47 |
RDEPEND=" |
48 |
dev-libs/expat |
49 |
dev-qt/qtcore:5 |
50 |
@@ -31,14 +39,7 @@ RDEPEND=" |
51 |
dev-qt/qtxml:5 |
52 |
) |
53 |
" |
54 |
-DEPEND="${RDEPEND} |
55 |
- doc? ( |
56 |
- app-text/docbook-xml-dtd:4.1.2 |
57 |
- dev-lang/perl |
58 |
- dev-libs/libxslt |
59 |
- ) |
60 |
- gui? ( dev-qt/linguist-tools:5 ) |
61 |
-" |
62 |
+DEPEND="${RDEPEND}" |
63 |
|
64 |
DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) |
65 |
|
66 |
@@ -65,21 +66,25 @@ src_prepare() { |
67 |
mv configure.in configure.ac || die |
68 |
sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die |
69 |
|
70 |
- use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" |
71 |
+ if use doc; then |
72 |
+ cp "${DISTDIR}/gpsbabel.org-style3.css" . || die |
73 |
+ fi |
74 |
|
75 |
eautoreconf |
76 |
} |
77 |
|
78 |
src_configure() { |
79 |
- econf \ |
80 |
- $(use_with doc doc "${S}"/doc/manual) \ |
81 |
- LRELEASE=$(qt5_get_bindir)/lrelease \ |
82 |
- LUPDATE=$(qt5_get_bindir)/lupdate \ |
83 |
- QMAKE=$(qt5_get_bindir)/qmake \ |
84 |
+ local myeconfargs=( |
85 |
+ $(use_with doc doc doc/manual) |
86 |
+ LRELEASE=$(qt5_get_bindir)/lrelease |
87 |
+ LUPDATE=$(qt5_get_bindir)/lupdate |
88 |
+ QMAKE=$(qt5_get_bindir)/qmake |
89 |
--with-zlib=system |
90 |
+ ) |
91 |
+ econf "${myeconfargs[@]}" |
92 |
|
93 |
if use gui; then |
94 |
- pushd "${S}/gui" > /dev/null || die |
95 |
+ pushd gui > /dev/null || die |
96 |
$(qt5_get_bindir)/lrelease *.ts || die |
97 |
eqmake5 |
98 |
popd > /dev/null |
99 |
@@ -89,7 +94,7 @@ src_configure() { |
100 |
src_compile() { |
101 |
default |
102 |
if use gui; then |
103 |
- pushd "${S}/gui" > /dev/null || die |
104 |
+ pushd gui > /dev/null || die |
105 |
emake |
106 |
popd > /dev/null |
107 |
fi |
108 |
@@ -101,7 +106,7 @@ src_compile() { |
109 |
} |
110 |
|
111 |
src_install() { |
112 |
- use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css ) |
113 |
+ use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css ) |
114 |
|
115 |
default |