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