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@aixah.de>
Gentoo-bug: 610996

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
index 90efc99304d2431035b79b72c47b65d5b655917b..9a72144adaa2f3bbca2a45da0280f86634e411c8 100644 (file)
--- 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 d78f8098182808d83256b982c84ef7a30c4c8b56..be769e6d50b3393bdb2ba53e120a39e0c028f6d9 100644 (file)
--- 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>