diff options
| -rw-r--r-- | sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 45 |
1 files changed, 25 insertions, 20 deletions
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild index cc1c9bde0965..3b07666bdf59 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils qmake-utils +inherit autotools desktop qmake-utils DESCRIPTION="GPS waypoints, tracks and routes converter" HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" @@ -16,6 +16,14 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="doc +gui" +BDEPEND=" + doc? ( + app-text/docbook-xml-dtd:4.1.2 + dev-lang/perl + dev-libs/libxslt + ) + gui? ( dev-qt/linguist-tools:5 ) +" RDEPEND=" dev-libs/expat dev-qt/qtcore:5 @@ -31,14 +39,7 @@ RDEPEND=" dev-qt/qtxml:5 ) " -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) - gui? ( dev-qt/linguist-tools:5 ) -" +DEPEND="${RDEPEND}" DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} ) @@ -65,21 +66,25 @@ src_prepare() { mv configure.in configure.ac || die sed -i -e "/^configure:/s/configure.in/configure.ac/" Makefile.in || die - use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" + if use doc; then + cp "${DISTDIR}/gpsbabel.org-style3.css" . || die + fi eautoreconf } src_configure() { - econf \ - $(use_with doc doc "${S}"/doc/manual) \ - LRELEASE=$(qt5_get_bindir)/lrelease \ - LUPDATE=$(qt5_get_bindir)/lupdate \ - QMAKE=$(qt5_get_bindir)/qmake \ + local myeconfargs=( + $(use_with doc doc doc/manual) + LRELEASE=$(qt5_get_bindir)/lrelease + LUPDATE=$(qt5_get_bindir)/lupdate + QMAKE=$(qt5_get_bindir)/qmake --with-zlib=system + ) + econf "${myeconfargs[@]}" if use gui; then - pushd "${S}/gui" > /dev/null || die + pushd gui > /dev/null || die $(qt5_get_bindir)/lrelease *.ts || die eqmake5 popd > /dev/null @@ -89,7 +94,7 @@ src_configure() { src_compile() { default if use gui; then - pushd "${S}/gui" > /dev/null || die + pushd gui > /dev/null || die emake popd > /dev/null fi @@ -101,7 +106,7 @@ src_compile() { } src_install() { - use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css ) + use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css ) default |