1 |
commit: 107e45305f9a333558d96c1305db5a67880c5d44 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 26 21:37:55 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 26 22:57:43 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107e4530 |
7 |
|
8 |
sci-geosciences/gpsbabel: Re-add USE=qt5 (as USE=gui) |
9 |
|
10 |
This reverts commit 4253275cb926d196b7a3566ff28a8cf756ae8138 |
11 |
and takes USE flag suggestion from bug #610996. Qt5Core is |
12 |
always required. |
13 |
|
14 |
metadata.xml: Add upstream info, cleanup indentation. |
15 |
|
16 |
Tested-by: Luis Ressel <aranea <AT> aixah.de> |
17 |
Gentoo-bug: 610996 |
18 |
|
19 |
sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 53 +++++++++++++++----------- |
20 |
sci-geosciences/gpsbabel/metadata.xml | 14 +++++-- |
21 |
2 files changed, 40 insertions(+), 27 deletions(-) |
22 |
|
23 |
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild |
24 |
index 90efc99304..9a72144ada 100644 |
25 |
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild |
26 |
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild |
27 |
@@ -7,7 +7,7 @@ EAPI=6 |
28 |
inherit autotools qmake-utils |
29 |
|
30 |
DESCRIPTION="GPS waypoints, tracks and routes converter" |
31 |
-HOMEPAGE="http://www.gpsbabel.org/" |
32 |
+HOMEPAGE="http://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" |
33 |
SRC_URI=" |
34 |
https://dev.gentoo.org/~asturm/${P}.tar.gz |
35 |
doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )" |
36 |
@@ -15,28 +15,30 @@ LICENSE="GPL-2" |
37 |
|
38 |
SLOT="0" |
39 |
KEYWORDS="amd64 x86 ~x86-fbsd" |
40 |
-IUSE="doc" |
41 |
+IUSE="doc +gui" |
42 |
|
43 |
RDEPEND=" |
44 |
dev-libs/expat |
45 |
dev-qt/qtcore:5 |
46 |
- dev-qt/qtgui:5 |
47 |
- dev-qt/qtnetwork:5 |
48 |
- dev-qt/qtwebchannel:5 |
49 |
- dev-qt/qtwebengine:5[widgets] |
50 |
- dev-qt/qtwidgets:5 |
51 |
- dev-qt/qtxml:5 |
52 |
sci-libs/shapelib:= |
53 |
sys-libs/zlib[minizip] |
54 |
virtual/libusb:0 |
55 |
+ gui? ( |
56 |
+ dev-qt/qtgui:5 |
57 |
+ dev-qt/qtnetwork:5 |
58 |
+ dev-qt/qtwebchannel:5 |
59 |
+ dev-qt/qtwebengine:5[widgets] |
60 |
+ dev-qt/qtwidgets:5 |
61 |
+ dev-qt/qtxml:5 |
62 |
+ ) |
63 |
" |
64 |
DEPEND="${RDEPEND} |
65 |
- dev-qt/linguist-tools:5 |
66 |
doc? ( |
67 |
+ app-text/docbook-xml-dtd:4.1.2 |
68 |
dev-lang/perl |
69 |
dev-libs/libxslt |
70 |
- app-text/docbook-xml-dtd:4.1.2 |
71 |
) |
72 |
+ gui? ( dev-qt/linguist:5 ) |
73 |
" |
74 |
|
75 |
DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) |
76 |
@@ -76,18 +78,21 @@ src_configure() { |
77 |
QMAKE=$(qt5_get_bindir)/qmake \ |
78 |
--with-zlib=system |
79 |
|
80 |
- pushd "${S}/gui" > /dev/null || die |
81 |
- lrelease *.ts || die |
82 |
- eqmake5 |
83 |
- popd > /dev/null |
84 |
+ if use gui; then |
85 |
+ pushd "${S}/gui" > /dev/null || die |
86 |
+ lrelease *.ts || die |
87 |
+ eqmake5 |
88 |
+ popd > /dev/null |
89 |
+ fi |
90 |
} |
91 |
|
92 |
src_compile() { |
93 |
default |
94 |
- |
95 |
- pushd "${S}/gui" > /dev/null || die |
96 |
- emake |
97 |
- popd > /dev/null |
98 |
+ if use gui; then |
99 |
+ pushd "${S}/gui" > /dev/null || die |
100 |
+ emake |
101 |
+ popd > /dev/null |
102 |
+ fi |
103 |
|
104 |
if use doc; then |
105 |
perl xmldoc/makedoc || die |
106 |
@@ -100,9 +105,11 @@ src_install() { |
107 |
|
108 |
default |
109 |
|
110 |
- dobin gui/objects/gpsbabelfe |
111 |
- insinto /usr/share/${PN}/translations/ |
112 |
- doins gui/gpsbabel*_*.qm |
113 |
- newicon gui/images/appicon.png ${PN}.png |
114 |
- make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience" |
115 |
+ if use gui; then |
116 |
+ dobin gui/objects/gpsbabelfe |
117 |
+ insinto /usr/share/${PN}/translations/ |
118 |
+ doins gui/gpsbabel*_*.qm |
119 |
+ newicon gui/images/appicon.png ${PN}.png |
120 |
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience" |
121 |
+ fi |
122 |
} |
123 |
|
124 |
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml |
125 |
index d78f809818..be769e6d50 100644 |
126 |
--- a/sci-geosciences/gpsbabel/metadata.xml |
127 |
+++ b/sci-geosciences/gpsbabel/metadata.xml |
128 |
@@ -1,8 +1,14 @@ |
129 |
<?xml version="1.0" encoding="UTF-8"?> |
130 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
131 |
<pkgmetadata> |
132 |
- <maintainer type="project"> |
133 |
- <email>sci-geosciences@g.o</email> |
134 |
- <name>Gentoo Geosciences Project</name> |
135 |
- </maintainer> |
136 |
+ <maintainer type="project"> |
137 |
+ <email>sci-geosciences@g.o</email> |
138 |
+ <name>Gentoo Geosciences Project</name> |
139 |
+ </maintainer> |
140 |
+ <upstream> |
141 |
+ <remote-id type="github">gpsbabel/gpsbabel</remote-id> |
142 |
+ </upstream> |
143 |
+ <use> |
144 |
+ <flag name="gui">Enable the graphical user interface (requires <pkg>dev-qt/qtwebengine</pkg>)</flag> |
145 |
+ </use> |
146 |
</pkgmetadata> |