From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4ACF813835A for ; Thu, 21 May 2020 10:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DB17E0784; Thu, 21 May 2020 10:57:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 17942E0784 for ; Thu, 21 May 2020 10:57:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88A7B34F742 for ; Thu, 21 May 2020 10:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AF25254 for ; Thu, 21 May 2020 10:57:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1590058616.2046cfd03c5a47686348f6c389bb445b6c286b15.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsbabel/gpsbabel-9999.ebuild X-VCS-Directories: sci-geosciences/gpsbabel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2046cfd03c5a47686348f6c389bb445b6c286b15 X-VCS-Branch: master Date: Thu, 21 May 2020 10:57:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b5ca93e-ca2c-47b9-b9a1-1020a07a1450 X-Archives-Hash: 0b88097daaacd23265b47d1ee26964a2 commit: 2046cfd03c5a47686348f6c389bb445b6c286b15 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 21 10:53:51 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 21 10:56:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2046cfd0 sci-geosciences/gpsbabel: Sync 9999 with 1.5.4-r1 changes Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 44 +++++++++++++++------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild index e7b3f8abc91..5a4fa28eacd 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit autotools eutils qmake-utils +EAPI=7 MY_PV=${PV//./_} +inherit autotools desktop qmake-utils DESCRIPTION="GPS waypoints, tracks and routes converter" HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel" @@ -27,6 +26,14 @@ fi SLOT="0" 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 @@ -42,14 +49,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} ) @@ -69,21 +69,25 @@ src_prepare() { # remove bundled libs and cleanup rm -r shapelib || 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 @@ -93,7 +97,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 @@ -105,7 +109,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