[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-01-21 16:14 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-01-21 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a92dff5c1d72c6aa07c6e4ca4fe35542663aaced
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 16:09:12 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 16:12:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92dff5c

sci-geosciences/gpsbabel: Restrict tests

Gentoo-bug: 421699

Package-Manager: portage-2.3.0

 sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild | 4 +++-
 sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
index d4a5d6a..aa27934 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-xmldoc.patch"
 )
 
+RESTRICT="test" # bug 421699
+
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	epatch_user

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
index dbb2764..b9ebe85 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -44,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-xmldoc.patch"
 )
 
+RESTRICT="test" # bug 421699
+
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	epatch_user


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-01-23 22:22 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-01-23 22:22 UTC (permalink / raw
  To: gentoo-commits

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"
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-02-26 22:58 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-02-26 22:58 UTC (permalink / raw
  To: gentoo-commits

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>


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-03-02 19:39 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-03-02 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     e076f30a3fe166e6038709cec03c500c5ed39f85
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 00:41:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar  2 19:39:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e076f30a

sci-geosciences/gpsbabel: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4099

 sci-geosciences/gpsbabel/Manifest              |   1 -
 sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild | 100 -------------------------
 2 files changed, 101 deletions(-)

diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index e7520daf3af..3ea15a21663 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,4 +1,3 @@
-DIST gpsbabel-1.4.3.tar.gz 5616398 SHA256 c9b81ebbd65a34e7fe741c18985c1ead65123fd09fa0ecbf882bc47a87c4f5d8 SHA512 4e0e5c6bb04a55a4ed809a769bbcf6eb61bdc115cbf24745d8ce51875d7e1044129a8c7249f560c652626317f44a56efb2eb2da4c2d564996793b0aa75e0cf75 WHIRLPOOL 70fe1f7a486bab21f04d2cd328ae49466f442b1a8532d4cdc33e4fd6fce2ef9d9c38caa76a6db7ee9fc4d462f502776bb05b67105f308369604ec1c75552c917
 DIST gpsbabel-1.4.4.tar.gz 7811264 SHA256 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944 SHA512 07b12dfe2127a399d973fa793fe3437cbda8f3425f3317100767b7fda549d9ea6bdda1429822ade671e219c99d95bc7feb16a8d177779b457aafb373141c515a WHIRLPOOL 576c60b0868648500552b4058c385af7912d0eaf1f63541cbcdf568c5dc96f46a5f204a981e525eced267a2060aeb4f04935ae45f67f0236c03f57f3a52bfaf9
 DIST gpsbabel-1.5.4.tar.gz 9099765 SHA256 59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b WHIRLPOOL a3de57048f43582fa64b85a3d37de5d378226842c7eca634f4334481f3dbbc99cee8b9d14bccb949fdc1976116a5b9bcc6318033138501e197c44b48cc244aec
 DIST gpsbabel.org-style3.css 2171 SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 WHIRLPOOL 419e1b8c386e3cbf96247ec231873bb0263e35e540451dfcda50e6c6f6452cef03825f527e3c970e452600d869721260e7970dabbe89070b9117d09c95da815a

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
deleted file mode 100644
index 11385256f9d..00000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils qt4-r2 autotools
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="
-	mirror://gentoo/${P}.tar.gz
-	doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="doc qt4"
-
-RDEPEND="
-	dev-libs/expat
-	sci-libs/shapelib
-	virtual/libusb:0
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtwebkit:4
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.1.2
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable_statistic_uploading.patch"
-	"${FILESDIR}/${PN}-disable_update_check.patch"
-	"${FILESDIR}/${PN}-disable_version_check.patch"
-	"${FILESDIR}/${P}-fix_binary_name.patch"
-	"${FILESDIR}/${PN}-freebsd.patch"
-	"${FILESDIR}/${PN}-use_system_shapelib.patch"
-	"${FILESDIR}/${PN}-xmldoc.patch"
-)
-
-RESTRICT="test" # bug 421699
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-	rm -rf shapelib || die
-
-	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with doc doc "${S}"/doc/manual) \
-		--with-zlib=system
-
-	if use qt4; then
-		pushd "${S}/gui" > /dev/null || die
-		lrelease *.ts || die
-		eqmake4
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	emake
-	if use qt4; then
-		pushd "${S}/gui" > /dev/null || die
-		emake
-		popd > /dev/null
-	fi
-
-	if use doc; then
-		perl xmldoc/makedoc || die
-		emake gpsbabel.html
-	fi
-}
-
-src_install() {
-	default
-	dodoc README*
-
-	if use qt4; then
-		dobin gui/objects/gpsbabelfe
-		insinto /usr/share/qt4/translations/
-		doins gui/gpsbabel*_*.qm
-		newicon gui/images/appicon.png ${PN}.png
-		make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
-	fi
-
-	if use doc; then
-		dohtml gpsbabel.*
-	fi
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-03-10  0:12 Michael Weber
  0 siblings, 0 replies; 24+ messages in thread
From: Michael Weber @ 2017-03-10  0:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f85b6bd74b87c6e8ca6e017ea1957c71bb2b1c2a
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 00:12:07 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 00:12:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85b6bd7

sci-geosciences/gpsbabel: Add ~ppc keyword (bug 611050).

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
index a4e3de163ea..daa0f9210f3 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="doc +gui"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-06-15  7:49 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-06-15  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3c84571e219c5428b967f3401953b45bc293f4d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 07:48:10 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 07:48:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c84571e

sci-geosciences/gpsbabel: Fix icon/.desktop install

Stable revbump to add missing eutils.eclass.

Thanks-to: Siuchung Cheung (Clement) <clement.cc <AT> gmail.com>
Gentoo-bug: 621814

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 114 ++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
new file mode 100644
index 00000000000..2b4af46ab15
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils qmake-utils
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc +gui"
+
+RDEPEND="
+	dev-libs/expat
+	dev-qt/qtcore: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}
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	gui? ( dev-qt/linguist:5 )
+"
+
+DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
+	"${FILESDIR}/${P}-disable_statistic_uploading.patch"
+	"${FILESDIR}/${P}-disable_update_check.patch"
+	"${FILESDIR}/${P}-disable_version_check.patch"
+	"${FILESDIR}/${P}-use_system_shapelib.patch"
+	"${FILESDIR}/${P}-use_system_zlib.patch"
+	"${FILESDIR}/${P}-xmldoc.patch"
+)
+
+RESTRICT="test" # bug 421699
+
+src_prepare() {
+	default
+
+	# remove bundled libs and cleanup
+	rm -r shapelib zlib || die
+	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
+
+	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}"
+
+	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 \
+		--with-zlib=system
+
+	if use gui; then
+		pushd "${S}/gui" > /dev/null || die
+		lrelease *.ts || die
+		eqmake5
+		popd > /dev/null
+	fi
+}
+
+src_compile() {
+	default
+	if use gui; then
+		pushd "${S}/gui" > /dev/null || die
+		emake
+		popd > /dev/null
+	fi
+
+	if use doc; then
+		perl xmldoc/makedoc || die
+		emake gpsbabel.html
+	fi
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
+
+	default
+
+	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
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-06-17 18:30 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-06-17 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3f5b0aa5b8e7ab9c4a4ffb5fdb043547d8b74d22
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 18:29:16 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 18:29:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5b0aa5

sci-geosciences/gpsbabel: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild | 114 -------------------------
 1 file changed, 114 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
deleted file mode 100644
index daa0f9210f3..00000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools qmake-utils
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="doc +gui"
-
-RDEPEND="
-	dev-libs/expat
-	dev-qt/qtcore: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}
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		dev-lang/perl
-		dev-libs/libxslt
-	)
-	gui? ( dev-qt/linguist:5 )
-"
-
-DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
-	"${FILESDIR}/${P}-disable_statistic_uploading.patch"
-	"${FILESDIR}/${P}-disable_update_check.patch"
-	"${FILESDIR}/${P}-disable_version_check.patch"
-	"${FILESDIR}/${P}-use_system_shapelib.patch"
-	"${FILESDIR}/${P}-use_system_zlib.patch"
-	"${FILESDIR}/${P}-xmldoc.patch"
-)
-
-RESTRICT="test" # bug 421699
-
-src_prepare() {
-	default
-
-	# remove bundled libs and cleanup
-	rm -r shapelib zlib || die
-	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
-
-	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}"
-
-	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 \
-		--with-zlib=system
-
-	if use gui; then
-		pushd "${S}/gui" > /dev/null || die
-		lrelease *.ts || die
-		eqmake5
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	default
-	if use gui; then
-		pushd "${S}/gui" > /dev/null || die
-		emake
-		popd > /dev/null
-	fi
-
-	if use doc; then
-		perl xmldoc/makedoc || die
-		emake gpsbabel.html
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
-
-	default
-
-	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
-}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-07-09 19:12 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-07-09 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     8e0899e224a5341f266d2a3df0ec50a58ac15670
Author:     Jan Kundrát <jkt <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  4 23:21:41 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 19:11:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0899e2

sci-geosciences/gpsbabel: Fix Qt5's lrelease

My `lrelease` in the default $PATH is a wrapper provided by qtchooser.
It fails when invoked directly.

The ebuild was already half-correct because it used a full path to Qt5's
lrelease when configuring the build :).
Closes: https://github.com/gentoo/gentoo/pull/5043

 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
index 2b4af46ab15..23dd56b2ebf 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 
 	if use gui; then
 		pushd "${S}/gui" > /dev/null || die
-		lrelease *.ts || die
+		$(qt5_get_bindir)/lrelease *.ts || die
 		eqmake5
 		popd > /dev/null
 	fi


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2017-08-26 19:19 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2017-08-26 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b578954203bd27b6517911b8eb8166e032ff0153
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 18:53:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 19:18:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5789542

sci-geosciences/gpsbabel: Fix missing dev-qt/linguist-tools:5 DEPEND

Reported-by: ad PC <adpc <AT> riseup.net>
Gentoo-bug: 628946
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
index 23dd56b2ebf..5e68061b6b0 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
 		dev-lang/perl
 		dev-libs/libxslt
 	)
-	gui? ( dev-qt/linguist:5 )
+	gui? ( dev-qt/linguist-tools:5 )
 "
 
 DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2019-10-11 15:37 Michał Górny
  0 siblings, 0 replies; 24+ messages in thread
From: Michał Górny @ 2019-10-11 15:37 UTC (permalink / raw
  To: gentoo-commits

commit:     24733819576188640456ee9440f4f95fad903df9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:37:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:37:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24733819

sci-geosciences: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
index 14286808591..cc1c9bde096 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc +gui"
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2020-01-12 11:14 David Seifert
  0 siblings, 0 replies; 24+ messages in thread
From: David Seifert @ 2020-01-12 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     d611b0ab61cf496fd0e1765a347830785d21c4dc
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:13:35 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:13:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d611b0ab

sci-geosciences/gpsbabel: Remove local USE="gui"

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-geosciences/gpsbabel/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
index be769e6d50b..72fdaa5c14e 100644
--- a/sci-geosciences/gpsbabel/metadata.xml
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -8,7 +8,4 @@
 	<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>


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2020-05-20 23:25 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-20 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     438d0fa1f676fa03fe4b89b8bd3186af5433da29
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 23:24:55 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 20 23:25:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438d0fa1

sci-geosciences/gpsbabel: EAPI-7 bump, use desktop.eclass

Drop superfluous ${S}

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild | 45 +++++++++++++----------
 1 file 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 cc1c9bde096..3b07666bdf5 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
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2020-05-21 10:57 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2020-05-21 10:57 UTC (permalink / raw
  To: gentoo-commits

commit:     2046cfd03c5a47686348f6c389bb445b6c286b15
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 10:53:51 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2021-05-28  1:14 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-05-28  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     26a3ddf088c3363bbe4d9ffaec95c25f70bb7024
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 01:14:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 01:14:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a3ddf0

sci-geosciences/gpsbabel: sync live ebuild

Bug: https://bugs.gentoo.org/689586
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild | 22 ++++--
 sci-geosciences/gpsbabel/gpsbabel-9999.ebuild  | 96 ++++++++------------------
 2 files changed, 45 insertions(+), 73 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
index 51a9005c067..d4975828466 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,13 +10,21 @@ MY_P="${PN}_${MY_PV}"
 
 DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz
-	doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+	SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+else
+	SRC_URI="
+		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
+		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
+	"
+	KEYWORDS="~amd64 ~ppc ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="
@@ -37,8 +45,8 @@ BDEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-xmldoc.patch
-	"${FILESDIR}"/${P}-use_system_shapelib.patch
+	"${FILESDIR}"/${PN}-1.7.0-xmldoc.patch
+	"${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch
 )
 
 S="${WORKDIR}/${PN}-${MY_P}"

diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 5a4fa28eacd..d4975828466 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_PV=${PV//./_}
-inherit autotools desktop qmake-utils
+inherit qmake-utils
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
 
 DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
-LICENSE="GPL-2"
-
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
@@ -23,84 +23,56 @@ else
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc +gui"
+IUSE="doc"
 
+DEPEND="
+	dev-libs/expat
+	dev-qt/qtcore:5
+	sci-libs/shapelib:=
+	sys-libs/zlib
+	virtual/libusb:0
+"
 BDEPEND="
+	virtual/pkgconfig
 	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
-	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}"
-
-DOCS=( AUTHORS README.{contrib,igc,mapconverter,md,xmapwpt} )
+RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.4-disable_statistic_uploading.patch
-	"${FILESDIR}"/${PN}-1.6.0-disable_update_check.patch
-	"${FILESDIR}"/${PN}-1.5.4-disable_version_check.patch
-	"${FILESDIR}"/${PN}-9999-use_system_shapelib.patch
-	"${FILESDIR}"/${PN}-9999-xmldoc.patch
+	"${FILESDIR}"/${PN}-1.7.0-xmldoc.patch
+	"${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch
 )
 
-RESTRICT="test" # bug 421699
+S="${WORKDIR}/${PN}-${MY_P}"
 
 src_prepare() {
 	default
 
-	# remove bundled libs and cleanup
-	rm -r shapelib || die
-
-	if use doc; then
-		cp "${DISTDIR}/gpsbabel.org-style3.css" . || die
-	fi
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+	# remove prerequisite zlib/zlib.h
+	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
+	# remove failing test (fixed by f91d28bf)
+	rm testo.d/arc-project.test || die
 
-	eautoreconf
+	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
 }
 
 src_configure() {
-	local myeconfargs=(
-		$(use_with doc doc doc/manual)
-		LRELEASE=$(qt5_get_bindir)/lrelease
-		LUPDATE=$(qt5_get_bindir)/lupdate
-		QMAKE=$(qt5_get_bindir)/qmake
+	econf \
+		$(use_with doc doc "${S}"/doc/manual) \
+		QMAKE=$(qt5_get_bindir)/qmake \
 		--with-zlib=system
-	)
-	econf "${myeconfargs[@]}"
-
-	if use gui; then
-		pushd gui > /dev/null || die
-		$(qt5_get_bindir)/lrelease *.ts || die
-		eqmake5
-		popd > /dev/null
-	fi
 }
 
 src_compile() {
 	default
-	if use gui; then
-		pushd gui > /dev/null || die
-		emake
-		popd > /dev/null
-	fi
 
 	if use doc; then
 		perl xmldoc/makedoc || die
@@ -109,15 +81,7 @@ src_compile() {
 }
 
 src_install() {
-	use doc && local HTML_DOCS=( ${PN}.html ${PN}.org-style3.css )
+	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
 
 	default
-
-	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
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2021-10-24 23:34 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-10-24 23:34 UTC (permalink / raw
  To: gentoo-commits

commit:     dff431c4808b0c312be12924a83a7e4381da6140
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 23:33:53 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 23:33:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff431c4

sci-geosciences/gpsbabel: use libusb:1, drop old expat dependency

- Upstream are no longer using libexpat
- Now uses libusb 1.0, not 0.x

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gpsbabel/{gpsbabel-1.7.0.ebuild => gpsbabel-1.7.0-r1.ebuild}       | 3 +--
 sci-geosciences/gpsbabel/gpsbabel-9999.ebuild                          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
similarity index 98%
rename from sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
rename to sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index d4975828466..4da02d15793 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -28,11 +28,10 @@ SLOT="0"
 IUSE="doc"
 
 DEPEND="
-	dev-libs/expat
 	dev-qt/qtcore:5
 	sci-libs/shapelib:=
 	sys-libs/zlib
-	virtual/libusb:0
+	virtual/libusb:1
 "
 BDEPEND="
 	virtual/pkgconfig

diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index d4975828466..4da02d15793 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -28,11 +28,10 @@ SLOT="0"
 IUSE="doc"
 
 DEPEND="
-	dev-libs/expat
 	dev-qt/qtcore:5
 	sci-libs/shapelib:=
 	sys-libs/zlib
-	virtual/libusb:0
+	virtual/libusb:1
 "
 BDEPEND="
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2021-10-27 22:33 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2021-10-27 22:33 UTC (permalink / raw
  To: gentoo-commits

commit:     a767e205d23680b6c7f0787e24dfadd54966969d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 22:31:18 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 22:31:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a767e205

sci-geosciences/gpsbabel: Stabilize 1.7.0-r1 amd64, #820080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index 4da02d15793..f87502efa32 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
 		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
 	"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2022-02-14 10:35 Jakov Smolić
  0 siblings, 0 replies; 24+ messages in thread
From: Jakov Smolić @ 2022-02-14 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     66a3edb1745a943e3ea24c7ee5b1790289986bb0
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 10:35:07 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 10:35:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a3edb1

sci-geosciences/gpsbabel: Stabilize 1.7.0-r1 x86, #820080

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index f87502efa322..809c7f441b8e 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ else
 		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
 		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
 	"
-	KEYWORDS="amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2023-01-29 15:43 Andrew Ammerlaan
  0 siblings, 0 replies; 24+ messages in thread
From: Andrew Ammerlaan @ 2023-01-29 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2a3a85a81407a68676476346377bb9ba20e66e4c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 15:38:26 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 15:43:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a3a85a8

sci-geosciences/gpsbabel: bump to 1.8.0

Co-authored-by: Bjørn Kagelmacher <DL7RAY <AT> t-online.de>
Signed-off-by: Bjørn Kagelmacher <DL7RAY <AT> t-online.de>
Closes: https://github.com/gentoo/gentoo/pull/28324
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-geosciences/gpsbabel/Manifest              |  1 +
 sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild | 96 ++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 62174a8748c6..350daaef98c1 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,2 +1,3 @@
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
+DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
new file mode 100644
index 000000000000..47952f41dd2f
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake desktop xdg
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+else
+	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc gui"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	gui? ( dev-qt/linguist-tools:5 )
+"
+# Even with gui disabled, still links with qtcore
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	dev-qt/qtcore:5
+	gui? (
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qttranslations:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
+
+src_prepare() {
+	cmake_src_prepare
+
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=$(usex gui)
+		-DGPSBABEL_EMBED_MAP=$(usex gui)
+		-DGPSBABEL_EMBED_TRANSLATIONS=$(usex gui)
+	)
+
+	cmake_src_configure
+}
+
+cmake_src_compile() {
+	cmake_build gpsbabel
+	use gui && cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
+}
+
+src_install() {
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	if use gui; then
+		dobin gui/GPSBabelFE/gpsbabelfe
+		insinto /usr/share/${PN}/translations/
+		doins gui/gpsbabel*_*.qm
+		newicon gui/images/appicon.png ${PN}.png
+		domenu gui/gpsbabel.desktop
+	fi
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-03-14  2:25 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-03-14  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     9ab2a18c756f5ff7b962584d3563fa7c554add79
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 01:30:38 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 01:59:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ab2a18c

sci-geosciences/gpsbabel: mark as LTO-unsafe

Only in older versions. It is fixed starting 1.9.0

Closes: https://bugs.gentoo.org/862576
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild | 9 +++++++--
 sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
index f6c49d49af26..36dfe7b2188f 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit qmake-utils
+inherit flag-o-matic qmake-utils
 
 MY_PV="${PV//./_}"
 MY_P="${PN}_${MY_PV}"
@@ -64,6 +64,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/862576
+	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
+	filter-lto
+
 	econf \
 		$(use_with doc doc "${S}"/doc/manual) \
 		QMAKE=$(qt5_get_bindir)/qmake \

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
index cfe639e603e8..7e4d5bf44ef1 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit cmake desktop xdg
+inherit cmake desktop flag-o-matic xdg
 
 MY_PV="${PV//./_}"
 MY_P="${PN}_${MY_PV}"
@@ -76,6 +76,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/862576
+	# Fixed in newer versions: https://github.com/GPSBabel/gpsbabel/pull/824
+	filter-lto
+
 	local mycmakeargs=(
 		-DGPSBABEL_WITH_LIBUSB=pkgconfig
 		-DGPSBABEL_WITH_SHAPELIB=pkgconfig


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-03-14  2:25 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-03-14  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d6a64ecb93b8809c4a5d43b18ea7d8dcc574f4db
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 01:24:02 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 01:59:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a64ecb

sci-geosciences/gpsbabel: update live for file deletions in 1.9.0

Some trivial DOCS files no longer exist (or were deprecated). Yay for
docs files no one reads causing the build to fail. ;)

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 35c11165c352..e5796ceebf81 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
+DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-03-14  2:25 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-03-14  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     055faefeb641ce9d594adfa8da7d26a0e592306f
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 01:10:10 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 01:59:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055faefe

sci-geosciences/gpsbabel: sync live ebuild

Last "synced" in commit 26a3ddf088c3363bbe4d9ffaec95c25f70bb7024 but
unfortunately at the time it somehow set S= twice, resulting in:

 * Checking out https://github.com/gpsbabel/gpsbabel.git to /var/tmp/portage/sci-geosciences/gpsbabel-9999/work/gpsbabel-9999 ...

 * ERROR: sci-geosciences/gpsbabel-9999::gentoo failed (prepare phase):
 *   The source directory '/var/tmp/portage/sci-geosciences/gpsbabel-9999/work/gpsbabel-gpsbabel_9999' doesn't exist

???

It's also really old and still uses EAPI 7 and qmake while the stable
releases have followed upstream over to cmake.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 106 ++++++++++++++++----------
 1 file changed, 64 insertions(+), 42 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 4da02d15793a..35c11165c352 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -1,38 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit qmake-utils
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake desktop xdg
 
 MY_PV="${PV//./_}"
 MY_P="${PN}_${MY_PV}"
 
 DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
-	SRC_URI="doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
 else
-	SRC_URI="
-		https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz
-		doc? ( https://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
-	"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc"
+IUSE="doc qt6"
 
-DEPEND="
-	dev-qt/qtcore:5
-	sci-libs/shapelib:=
-	sys-libs/zlib
-	virtual/libusb:1
-"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
@@ -40,47 +32,77 @@ BDEPEND="
 		dev-lang/perl
 		dev-libs/libxslt
 	)
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtserialport:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets,xml]
+		dev-qt/qtserialport:6
+		dev-qt/qtwebchannel:6
+		dev-qt/qtwebengine:6[widgets]
+		dev-qt/qt5compat:6
+	)
 "
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,mapconverter,md} gui/README.{contrib,gui} )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.0-xmldoc.patch
-	"${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
 )
 
-S="${WORKDIR}/${PN}-${MY_P}"
-
 src_prepare() {
-	default
+	cmake_src_prepare
 
 	# ensure bundled libs are not used
 	rm -r shapelib zlib || die
-	# remove prerequisite zlib/zlib.h
-	sed -i -e "s: zlib\/[a-z]*\.h::g" Makefile.in || die
-	# remove failing test (fixed by f91d28bf)
-	rm testo.d/arc-project.test || die
-
-	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
 }
 
 src_configure() {
-	econf \
-		$(use_with doc doc "${S}"/doc/manual) \
-		QMAKE=$(qt5_get_bindir)/qmake \
-		--with-zlib=system
-}
+	local mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=ON
+		-DGPSBABEL_EMBED_MAP=ON
+		-DGPSBABEL_EMBED_TRANSLATIONS=ON
+		-DUSE_QT6="$(usex qt6)"
+	)
 
-src_compile() {
-	default
+	cmake_src_configure
+}
 
-	if use doc; then
-		perl xmldoc/makedoc || die
-		emake gpsbabel.html
-	fi
+cmake_src_compile() {
+	cmake_build gpsbabel
+	cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
 }
 
 src_install() {
-	use doc && HTML_DOCS=( "${S}"/${PN}.html "${S}"/${PN}.org-style3.css )
-
-	default
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	dobin gui/GPSBabelFE/gpsbabelfe
+	insinto /usr/share/${PN}/translations/
+	doins gui/gpsbabel*_*.qm
+	newicon gui/images/appicon.png ${PN}.png
+	domenu gui/gpsbabel.desktop
 }


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-03-14  2:25 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-03-14  2:25 UTC (permalink / raw
  To: gentoo-commits

commit:     30fa4565fd1b77b66da73abd05be3920dd279fa1
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 14 01:27:11 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 01:59:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fa4565

sci-geosciences/gpsbabel: add 1.9.0

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/Manifest              |   1 +
 sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild | 108 +++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index 350daaef98c1..32945c4dae51 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -1,3 +1,4 @@
 DIST gpsbabel.org-style3.css 2171 BLAKE2B 7fafef65e37d7c7cd183be06caafdbf303ac334484d7c09b4e668e8845f156f850b6f4cc6ac1aa081627367e999fa30d3505400e2aabd03fa117f6389318254f SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83
 DIST gpsbabel_1_7_0.tar.gz 16718984 BLAKE2B 8b824eb2a024f61e30abed80afe5e8ba8943771aff401171e7622eb3eb3d16cd2890964ccf0abfd28925d604087c57f013dc37bfac5d16ccdb97d2386a92ec29 SHA512 9df9d9cd65c3f33c0f39b4064e448834ad651ead368a3be3ea107f754ff0ac1500eb2111cddf43ecad61fe65b3412181842571fbba3387dd3dd36ff5c23e2911
 DIST gpsbabel_1_8_0.tar.gz 15104689 BLAKE2B 63cdc42b3b26517c1631f0fa38ecbeac9d4b72326df683322ab21129b3e0321c7a3cfabfe80b485b335c21dd32a538ff7454a479324ebb382216154d7513bc25 SHA512 93137586cf887e185d96f06f59be4456cf9bae976979b9e5caad6ae8017c148d4c4c0fc182e8bd4c8547c3ed040c46f74e6f3cfb5f7b566d54fbc7fd767e27e4
+DIST gpsbabel_1_9_0.tar.gz 14514572 BLAKE2B cdea8c74c1a75c4707b071b8a08fe83ce7fd3c6a6fd107c00d8fed958c9674c9f81de548a5cab7f9613a5d9f41834219f93bf7cabbc356047ef07f6667347bfe SHA512 e8591aef8015470471ff7ff6a75ab4a71a584f8de2ac00f3957d06ee76145bf1f53c26a12b8d963f1b96ce09270f54fbd5e96c80eccbeb8466ff94a75b72972d

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
new file mode 100644
index 000000000000..e5796ceebf81
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit cmake desktop xdg
+
+MY_PV="${PV//./_}"
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
+else
+	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc qt6"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	!qt6? ( dev-qt/linguist-tools:5 )
+	qt6? ( dev-qt/qttools:6[linguist] )
+"
+
+RDEPEND="
+	dev-libs/expat
+	sci-libs/shapelib:=
+	sys-libs/zlib:=[minizip]
+	virtual/libusb:1
+	!qt6? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtserialport:5
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets,xml]
+		dev-qt/qtserialport:6
+		dev-qt/qtwebchannel:6
+		dev-qt/qtwebengine:6[widgets]
+		dev-qt/qt5compat:6
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# ensure bundled libs are not used
+	rm -r shapelib zlib || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGPSBABEL_WITH_LIBUSB=pkgconfig
+		-DGPSBABEL_WITH_SHAPELIB=pkgconfig
+		-DGPSBABEL_WITH_ZLIB=pkgconfig
+		-DGPSBABEL_MAPPREVIEW=ON
+		-DGPSBABEL_EMBED_MAP=ON
+		-DGPSBABEL_EMBED_TRANSLATIONS=ON
+		-DUSE_QT6="$(usex qt6)"
+	)
+
+	cmake_src_configure
+}
+
+cmake_src_compile() {
+	cmake_build gpsbabel
+	cmake_build gpsbabelfe
+	use doc && cmake_build gpsbabel.html
+}
+
+src_install() {
+	use doc && dodoc gpsbabel.html
+	einstalldocs
+
+	dobin gpsbabel
+	dobin gui/GPSBabelFE/gpsbabelfe
+	insinto /usr/share/${PN}/translations/
+	doins gui/gpsbabel*_*.qm
+	newicon gui/images/appicon.png ${PN}.png
+	domenu gui/gpsbabel.desktop
+}


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-08-31 21:55 Sam James
  0 siblings, 0 replies; 24+ messages in thread
From: Sam James @ 2024-08-31 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     738e47003039afaa97d12bb3dc2e5915e3bfb53e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 21:54:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 21:54:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738e4700

sci-geosciences/gpsbabel: Stabilize 1.9.0 amd64, #938841

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
index 5b61f9f33ebe..6898cab90cd3 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
 else
 	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 


^ permalink raw reply related	[flat|nested] 24+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/
@ 2024-09-02  9:10 Andreas Sturmlechner
  0 siblings, 0 replies; 24+ messages in thread
From: Andreas Sturmlechner @ 2024-09-02  9:10 UTC (permalink / raw
  To: gentoo-commits

commit:     8b3353e6b9d7a6dc7d478da2ddfaebbde626d141
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 21:31:00 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 09:09:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3353e6

sci-geosciences/gpsbabel: Drop IUSE qt6, ~x86 from 9999

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-geosciences/gpsbabel/gpsbabel-9999.ebuild | 39 ++++++++-------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
index 5b61f9f33ebe..8f8e29366683 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
@@ -12,61 +12,44 @@ MY_P="${PN}_${MY_PV}"
 DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="https://www.gpsbabel.org/ https://github.com/gpsbabel/gpsbabel"
 
-if [[ ${PV} == 9999 ]] ; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/gpsbabel/gpsbabel.git"
 else
 	SRC_URI="https://github.com/gpsbabel/gpsbabel/archive/gpsbabel_${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64"
 	S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc qt6"
+IUSE="doc"
 
 BDEPEND="
+	dev-qt/qttools:6[linguist]
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd:4.1.2
 		dev-lang/perl
 		dev-libs/libxslt
 	)
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
 "
-
 RDEPEND="
 	dev-libs/expat
+	dev-qt/qt5compat:6
+	dev-qt/qtbase:6[gui,network,widgets,xml]
+	dev-qt/qtserialport:6
+	dev-qt/qtwebchannel:6
+	dev-qt/qtwebengine:6[widgets]
 	sci-libs/shapelib:=
 	sys-libs/zlib:=[minizip]
 	virtual/libusb:1
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtserialport:5
-		dev-qt/qtwebchannel:5
-		dev-qt/qtwebengine:5[widgets]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	qt6? (
-		dev-qt/qtbase:6[gui,network,widgets,xml]
-		dev-qt/qtserialport:6
-		dev-qt/qtwebchannel:6
-		dev-qt/qtwebengine:6[widgets]
-		dev-qt/qt5compat:6
-	)
 "
-
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" )
 
 src_prepare() {
 	cmake_src_prepare
@@ -83,7 +66,7 @@ src_configure() {
 		-DGPSBABEL_MAPPREVIEW=ON
 		-DGPSBABEL_EMBED_MAP=ON
 		-DGPSBABEL_EMBED_TRANSLATIONS=ON
-		-DUSE_QT6="$(usex qt6)"
+		-DUSE_QT6=ON
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2024-09-02  9:10 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-10  0:12 [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/ Michael Weber
  -- strict thread matches above, loose matches on Subject: below --
2024-09-02  9:10 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-02 19:39 Andreas Sturmlechner
2017-02-26 22:58 Andreas Sturmlechner
2017-01-23 22:22 Andreas Sturmlechner
2017-01-21 16:14 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox