commit: 15c70ac44ee6fcdedaed99c2da2c14213f6fee1b Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 31 21:56:26 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Sep 14 19:55:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c70ac4
sci-geosciences/gpsbabel: drop 1.7.0-r1, 1.8.0-r1 Bug: https://bugs.gentoo.org/938841 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-geosciences/gpsbabel/Manifest | 3 - .../files/gpsbabel-1.7.0-use_system_shapelib.patch | 118 --------------------- .../gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch | 13 --- sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild | 91 ---------------- sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild | 113 -------------------- 5 files changed, 338 deletions(-) diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 32945c4dae51..fd35d4f0d4e5 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,4 +1 @@ -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/files/gpsbabel-1.7.0-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch deleted file mode 100644 index 744400906963..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-use_system_shapelib.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 5ace8da1..1acadf3e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ - # Extra modules in Jeeps that we don't use - # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o - --SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o -+SHAPE=-lshp - - ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ - zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ -@@ -120,7 +120,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \ - src/core/textstream.o \ - src/core/usasciicodec.o \ - src/core/xmlstreamwriter.o \ -- $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - DEPFILES = $(OBJS:.o=.d) -@@ -153,10 +153,10 @@ toolinfo - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @USB_DEPS@ @GPSBABEL_DEBUG@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) @USB_DEPS@ -- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in -@@ -513,7 +513,7 @@ filter_vecs.o: filter_vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - ggv_bin.h globalsat_sport.h gpx.h src/core/xmlstreamwriter.h \ - src/core/xmltag.h kml.h xmlgeneric.h legacyformat.h lowranceusr.h \ - mynav.h nmea.h osm.h qstarz_bl_1000.h random.h shape.h \ -- shapelib/shapefil.h subrip.h unicsv.h src/core/textstream.h xcsv.h \ -+ subrip.h unicsv.h src/core/textstream.h xcsv.h \ - garmin_fs.h jeeps/gps.h jeeps/../defs.h jeeps/gpsport.h \ - jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h jeeps/gpsutil.h \ - jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ -@@ -538,7 +538,7 @@ garmin.o: garmin.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ - globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ - kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ -- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ -+ qstarz_bl_1000.h random.h shape.h subrip.h \ - unicsv.h src/core/textstream.h xcsv.h yahoo.h - garmin_device_xml.o: garmin_device_xml.cc defs.h config.h zlib/zlib.h \ - zlib/zconf.h formspec.h inifile.h gbfile.h session.h \ -@@ -825,7 +825,7 @@ magproto.o: magproto.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - dg-100.h energympro.h garmin_fit.h geojson.h src/core/file.h ggv_bin.h \ - globalsat_sport.h gpx.h src/core/xmlstreamwriter.h src/core/xmltag.h \ - kml.h xmlgeneric.h legacyformat.h lowranceusr.h mynav.h nmea.h osm.h \ -- qstarz_bl_1000.h random.h shape.h shapelib/shapefil.h subrip.h \ -+ qstarz_bl_1000.h random.h shape.h subrip.h \ - unicsv.h src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h \ - jeeps/../defs.h jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h \ - jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ -@@ -841,7 +841,7 @@ main.o: main.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - garmin_fit.h geojson.h ggv_bin.h globalsat_sport.h gpx.h \ - src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ - legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ -- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ -+ random.h shape.h subrip.h unicsv.h \ - src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ -@@ -961,10 +961,7 @@ session.o: session.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h - shape.o: shape.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ -- shape.h format.h shapelib/shapefil.h --shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h --shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h --shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h -+ shape.h format.h - skyforce.o: skyforce.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h -@@ -1059,7 +1056,7 @@ vecs.o: vecs.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ - src/core/file.h ggv_bin.h globalsat_sport.h gpx.h \ - src/core/xmlstreamwriter.h src/core/xmltag.h kml.h xmlgeneric.h \ - legacyformat.h lowranceusr.h mynav.h nmea.h osm.h qstarz_bl_1000.h \ -- random.h shape.h shapelib/shapefil.h subrip.h unicsv.h \ -+ random.h shape.h subrip.h unicsv.h \ - src/core/textstream.h xcsv.h garmin_fs.h jeeps/gps.h jeeps/../defs.h \ - jeeps/gpsport.h jeeps/gpsdevice.h jeeps/gpssend.h jeeps/gpsread.h \ - jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h \ -diff --git a/shape.cc b/shape.cc -index 933eb95a..f2ec5365 100644 ---- a/shape.cc -+++ b/shape.cc -@@ -32,7 +32,7 @@ - - #include "defs.h" - #include "shape.h" --#include "shapelib/shapefil.h" -+#include <libshp/shapefil.h> - - - #if SHAPELIB_ENABLED -diff --git a/shape.h b/shape.h -index 0ce05af7..09931eff 100644 ---- a/shape.h -+++ b/shape.h -@@ -27,7 +27,7 @@ - - #include "defs.h" // for arglist_t, ARGTYPE_STRING, Waypoint, route_head, CET_CHARSET_ASCII, FF_CAP_RW_ALL, ff_cap, ff_type, ff_type_file - #include "format.h" // for Format --#include "shapelib/shapefil.h" // for DBFHandle, SHPAPI_CALL, SHPHandle -+#include <libshp/shapefil.h> // for DBFHandle, SHPAPI_CALL, SHPHandle - - - #if SHAPELIB_ENABLED diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch deleted file mode 100644 index 56c60a553485..000000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.7.0-xmldoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2017-01-21 00:32:50.921546762 +0100 -+++ b/Makefile.in 2017-01-21 00:55:45.362728521 +0100 -@@ -278,8 +278,8 @@ - --stringparam html.cleanup "1" \ - --stringparam make.clean.html "1" \ - --stringparam html.valid.html "1" \ -- --stringparam html.stylesheet \ -- "https://www.gpsbabel.org/style3.css"; \ -+ --nonet \ -+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ - xmldoc/readme.xml - diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild deleted file mode 100644 index 36dfe7b2188f..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic 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"; -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" -IUSE="doc" - -DEPEND=" - dev-qt/qtcore:5 - sci-libs/shapelib:= - sys-libs/zlib - virtual/libusb:1 -" -BDEPEND=" - virtual/pkgconfig - doc? ( - app-text/docbook-xml-dtd:4.1.2 - dev-lang/perl - dev-libs/libxslt - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-xmldoc.patch - "${FILESDIR}"/${PN}-1.7.0-use_system_shapelib.patch -) - -S="${WORKDIR}/${PN}-${MY_P}" - -src_prepare() { - default - - # 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() { - # -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 \ - --with-zlib=system -} - -src_compile() { - default - - 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 -} diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild deleted file mode 100644 index 878957ca68bc..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.8.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# 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 flag-o-matic 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 ~arm64" - 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,mapconverter,md} gui/README.{contrib,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() { - # -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 - -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 -}
