From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
Date: Mon, 23 Jan 2017 22:22:39 +0000 (UTC) [thread overview]
Message-ID: <1485210144.4253275cb926d196b7a3566ff28a8cf756ae8138.asturm@gentoo> (raw)
commit: 4253275cb926d196b7a3566ff28a8cf756ae8138
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 22:14:39 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:22:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4253275c
sci-geosciences/gpsbabel: Drop USE=qt5
Gentoo-bug: 606952
The buildsystem does not properly support that case.
Package-Manager: portage-2.3.0
sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 61 +++++++++++---------------
1 file changed, 26 insertions(+), 35 deletions(-)
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
index 01af5b8..324948b 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
@@ -15,30 +15,28 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="doc qt5"
+IUSE="doc"
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
- qt5? (
- 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
- )
"
DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
doc? (
dev-lang/perl
dev-libs/libxslt
app-text/docbook-xml-dtd:4.1.2
)
- qt5? ( dev-qt/linguist:5 )
"
DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
@@ -73,26 +71,23 @@ src_prepare() {
src_configure() {
econf \
$(use_with doc doc "${S}"/doc/manual) \
- $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') \
- $(usex qt5 LUPDATE=$(qt5_get_bindir)/lupdate '') \
- $(usex qt5 QMAKE=$(qt5_get_bindir)/qmake '') \
+ LRELEASE=$(qt5_get_bindir)/lrelease \
+ LUPDATE=$(qt5_get_bindir)/lupdate \
+ QMAKE=$(qt5_get_bindir)/qmake \
--with-zlib=system
- if use qt5; then
- pushd "${S}/gui" > /dev/null || die
- lrelease *.ts || die
- eqmake5
- popd > /dev/null
- fi
+ pushd "${S}/gui" > /dev/null || die
+ lrelease *.ts || die
+ eqmake5
+ popd > /dev/null
}
src_compile() {
default
- if use qt5; then
- pushd "${S}/gui" > /dev/null || die
- emake
- popd > /dev/null
- fi
+
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
if use doc; then
perl xmldoc/makedoc || die
@@ -101,17 +96,13 @@ src_compile() {
}
src_install() {
- if use doc; then
- HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
- fi
+ use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
default
- if use qt5; 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
+ 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"
}
next reply other threads:[~2017-01-23 22:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 22:22 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-02-26 22:58 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=1485210144.4253275cb926d196b7a3566ff28a8cf756ae8138.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