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 }
