From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
Date: Sun, 26 Feb 2017 22:58:57 +0000 (UTC) [thread overview]
Message-ID: <1488149863.107e45305f9a333558d96c1305db5a67880c5d44.asturm@gentoo> (raw)
commit: 107e45305f9a333558d96c1305db5a67880c5d44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 21:37:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 22:57:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107e4530
sci-geosciences/gpsbabel: Re-add USE=qt5 (as USE=gui)
This reverts commit 4253275cb926d196b7a3566ff28a8cf756ae8138
and takes USE flag suggestion from bug #610996. Qt5Core is
always required.
metadata.xml: Add upstream info, cleanup indentation.
Tested-by: Luis Ressel <aranea <AT> aixah.de>
Gentoo-bug: 610996
sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 53 +++++++++++++++-----------
sci-geosciences/gpsbabel/metadata.xml | 14 +++++--
2 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
index 90efc99304..9a72144ada 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
@@ -7,7 +7,7 @@ EAPI=6
inherit autotools qmake-utils
DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="http://www.gpsbabel.org/"
+HOMEPAGE="http://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
SRC_URI="
https://dev.gentoo.org/~asturm/${P}.tar.gz
doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
@@ -15,28 +15,30 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="doc"
+IUSE="doc +gui"
RDEPEND="
dev-libs/expat
dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwebchannel:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
sci-libs/shapelib:=
sys-libs/zlib[minizip]
virtual/libusb:0
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebchannel:5
+ dev-qt/qtwebengine:5[widgets]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
"
DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
doc? (
+ app-text/docbook-xml-dtd:4.1.2
dev-lang/perl
dev-libs/libxslt
- app-text/docbook-xml-dtd:4.1.2
)
+ gui? ( dev-qt/linguist:5 )
"
DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
@@ -76,18 +78,21 @@ src_configure() {
QMAKE=$(qt5_get_bindir)/qmake \
--with-zlib=system
- pushd "${S}/gui" > /dev/null || die
- lrelease *.ts || die
- eqmake5
- popd > /dev/null
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ lrelease *.ts || die
+ eqmake5
+ popd > /dev/null
+ fi
}
src_compile() {
default
-
- pushd "${S}/gui" > /dev/null || die
- emake
- popd > /dev/null
+ if use gui; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
if use doc; then
perl xmldoc/makedoc || die
@@ -100,9 +105,11 @@ src_install() {
default
- dobin gui/objects/gpsbabelfe
- insinto /usr/share/${PN}/translations/
- doins gui/gpsbabel*_*.qm
- newicon gui/images/appicon.png ${PN}.png
- make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ if use gui; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/${PN}/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
}
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
index d78f809818..be769e6d50 100644
--- a/sci-geosciences/gpsbabel/metadata.xml
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>sci-geosciences@gentoo.org</email>
- <name>Gentoo Geosciences Project</name>
- </maintainer>
+ <maintainer type="project">
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gpsbabel/gpsbabel</remote-id>
+ </upstream>
+ <use>
+ <flag name="gui">Enable the graphical user interface (requires <pkg>dev-qt/qtwebengine</pkg>)</flag>
+ </use>
</pkgmetadata>
next reply other threads:[~2017-02-26 22:59 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-26 22:58 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-02 9:10 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/ Andreas Sturmlechner
2024-08-31 21:55 Sam James
2024-03-14 2:25 Sam James
2024-03-14 2:25 Sam James
2024-03-14 2:25 Sam James
2024-03-14 2:25 Sam James
2023-01-29 15:43 Andrew Ammerlaan
2022-02-14 10:35 Jakov Smolić
2021-10-27 22:33 Sam James
2021-10-24 23:34 Sam James
2021-05-28 1:14 Sam James
2020-05-21 10:57 Andreas Sturmlechner
2020-05-20 23:25 Andreas Sturmlechner
2020-01-12 11:14 David Seifert
2019-10-11 15:37 Michał Górny
2017-08-26 19:19 Andreas Sturmlechner
2017-07-09 19:12 Andreas Sturmlechner
2017-06-17 18:30 Andreas Sturmlechner
2017-06-15 7:49 Andreas Sturmlechner
2017-03-10 0:12 Michael Weber
2017-03-02 19:39 Andreas Sturmlechner
2017-01-23 22:22 Andreas Sturmlechner
2017-01-21 16:14 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488149863.107e45305f9a333558d96c1305db5a67880c5d44.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox