diff options
Diffstat (limited to 'sci-geosciences')
19 files changed, 66 insertions, 700 deletions
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest index 93102aff1a8d..00176557ca89 100644 --- a/sci-geosciences/folium/Manifest +++ b/sci-geosciences/folium/Manifest @@ -1,2 +1,2 @@ -DIST folium-0.18.0.tar.gz 8193343 BLAKE2B d36bedfc8038bd71bc0f22ab0c998bab8b32f8e521c32a6a9b0f6f0cc8d1804310346d7531d83e96efc3f804de1eeef5e2ec851b67b9a5e79ab64d42d5410e60 SHA512 a37dfa47b5bd256298df151ad48d71dfeaf5170c6b4e02d28a3f73aa749cfaf931e4ee91110dd3d027f047d46f309111beeca52dfcfafebe5f38597421ecb3c2 DIST folium-0.19.2.tar.gz 8193746 BLAKE2B 65a3a45748b9f42e6a76057b554e3759806912bbb4336848c25e5ddb7cf6f5d04f8a4e786ca400a99f28c2f8a02607d9dc9e5edb15770c158eecd4a0843806a8 SHA512 df932f599308105b0e2bb8db2bad35e25ed823c3ed34abc36d494a80e671f683c0d6debdf8d20fc22e5582e2072ccd8307707b5fdab0d62bc128898d6c795073 +DIST folium-0.19.3.tar.gz 8193962 BLAKE2B 956cb050527270ffa54a2d8331e453e10359ebf99be0e37decffd512cd3f1a3dfde626840608d9e84621b9a4b0e5f5cd278d8cf25533debe8b5e2a1a88b51fe6 SHA512 2ff2fca474ff7ab911b184a2b144ca5253bc04a673f61f668efcd9ea2041f50ed3172daab7ae86209bd1aa51da3894358cfb0eec7203de9692886aea88c2a202 diff --git a/sci-geosciences/folium/folium-0.18.0.ebuild b/sci-geosciences/folium/folium-0.19.3.ebuild index 4aa2aa656206..1f4b583ab221 100644 --- a/sci-geosciences/folium/folium-0.18.0.ebuild +++ b/sci-geosciences/folium/folium-0.19.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2024 Gentoo Authors +# Copyright 2021-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,14 +35,12 @@ BDEPEND=" distutils_enable_tests pytest -src_prepare() { - rm -r tests/selenium || die # require chromedriver - rm tests/test_folium.py || die # require geopandas - rm tests/test_raster_layers.py || die # require xyzservices - rm tests/plugins/test_time_slider_choropleth.py || die # require geopandas - rm tests/test_repr.py || die # require geckodriver - default -} +EPYTEST_IGNORE=( + tests/selenium # require chromedriver + tests/test_folium.py # require geopandas + tests/plugins/test_time_slider_choropleth.py # require geopandas + tests/test_repr.py # require geckodriver +) python_test() { epytest -m 'not web' diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-qmake-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-xmldoc.patch index 2bf36f39a84c..2bf36f39a84c 100644 --- a/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-qmake-xmldoc.patch +++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.9.0-xmldoc.patch diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild index 5a4ed28f31f5..bf23fbf825dc 100644 --- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild +++ b/sci-geosciences/gpsbabel/gpsbabel-1.9.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ 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 ~arm64" + KEYWORDS="amd64 ~arm64" S="${WORKDIR}/gpsbabel-gpsbabel_${MY_PV}" fi @@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.{contrib,igc,md} gui/README.gui ) PATCHES=( "${FILESDIR}/${PN}-1.8.0-no-automagic-qt5-qt6.patch" - "${FILESDIR}"/${P}-qmake-xmldoc.patch + "${FILESDIR}"/${P}-xmldoc.patch "${FILESDIR}"/${P}-xmllint.patch ) @@ -69,6 +69,7 @@ src_prepare() { rm -r shapelib zlib || die use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}" + use gui || sed -i -e '/add_subdirectory(gui)/d' CMakeLists.txt || die } src_configure() { @@ -76,9 +77,6 @@ src_configure() { -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) -DUSE_QT6=ON ) diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild deleted file mode 100644 index 56e727b1bd61..000000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.9.0.ebuild +++ /dev/null @@ -1,108 +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 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,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 -} diff --git a/sci-geosciences/gpsd/gpsd-3.25.ebuild b/sci-geosciences/gpsd/gpsd-3.25.ebuild deleted file mode 100644 index 93bbf3abe0f0..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.25.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{10..11} ) -SCONS_MIN_VERSION="2.3.0" - -inherit distutils-r1 scons-utils systemd toolchain-funcs udev - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" - inherit git-r3 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="https://gpsd.gitlab.io/gpsd/" - -LICENSE="BSD-2" -SLOT="0/30" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax navcom nmea2000 oceanserver oncore - rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp +python qt5 selinux +shm +sockets static systemd test udev usb X" -REQUIRED_USE=" - X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/gpsd - acct-group/dialout - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez:= ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - $(python_gen_any_dep 'dev-build/scons[${PYTHON_USEDEP}]') - test? ( app-alternatives/bc )" -RDEPEND+=" selinux? ( sec-policy/selinux-gpsd )" - -# asciidoctor package is for man page generation -if [[ ${PV} == *9999* ]] ; then - BDEPEND+=" dev-ruby/asciidoctor" -fi - -python_check_deps() { - has_version -b "dev-build/scons[${PYTHON_USEDEP}]" || return 1 -} - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConscript | awk '{print $1}' | LC_ALL=C sort - ) ) - - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - # bug #807661 - sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die - - default - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - - # bug #796476 - python_export_utf8_locale - - # Extract python info out of SConscript so we can use saner distribute - pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConscript ; } - local pyprogs=$(pyarray python_progs) - local pybins=$("${PYTHON}" -c "${pyprogs}; \ - print(list(set(python_progs) - {'xgps', 'xgpsspeed', 'ubxtool', 'zerk'}))" || die "Unable to list pybins") - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" - use gpsd_protocols_greis && pybins+="+ ['zerk']" - local pysrcs=$(pyarray packet_ffi_extension) - local packet=$("${PYTHON}" -c "${pysrcs}; print(packet_ffi_extension)" || die "Unable to extract packet types") - - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConscript ; } - pyvar2() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - - # Post 3.19 the clienthelpers were merged into gps.packet - - # TODO: Fix hardcoding https://gpsd.io/ for now for @URL@ - sed \ - -e "s|@VERSION@|$(pyvar2 gpsd_version | sed -e 's:\"::g')|" \ - -e "s|@URL@|https://gpsd.io/|" \ - -e "s|@DEVMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@DOWNLOAD@|$(pyvar download)|" \ - -e "s|@IRCCHAN@|$(pyvar ircchan)|" \ - -e "s|@ISSUES@|$(pyvar bugtracker)|" \ - -e "s|@MAILMAN@|$(pyvar mailman)|" \ - -e "s|@PROJECTPAGE@|$(pyvar projectpage)|" \ - -e "s|@SUPPORT@|https://gpsd.io/SUPPORT.html|" \ - -e "s|@WEBSITE@|https://gpsd.io/|" \ - "${S}"/packaging/gpsd-setup.py.in > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - scons_opts=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - rundir="/run" - chrpath=False - gpsd_user=gpsd - gpsd_group=dialout - nostrip=True - systemd=$(usex systemd) - unitdir="$(systemd_get_systemunitdir)" - shared=$(usex !static True False) - bluez=$(usex bluetooth) - libgpsmm=$(usex cxx) - clientdebug=$(usex debug) - dbus_export=$(usex dbus) - ipv6=$(usex ipv6) - timing=$(usex latency-timing) - ncurses=$(usex ncurses) - ntpshm=$(usex ntp) - pps=$(usex ntp) - python=$(usex python) - # force a predictable python libdir because lib vs. lib64 usage differs - # from 3.5 to 3.6+ - $(usex python python_libdir="${EPREFIX}"/python-discard "") - qt=$(usex qt5) - shm_export=$(usex shm) - socket_export=$(usex sockets) - usb=$(usex usb) - ) - - if [[ ${PV} != *9999* ]] ; then - scons_opts+=( manbuild=False ) - fi - - use X && scons_opts+=( xgps=1 xgpsspeed=1 ) - use qt5 && scons_opts+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) ) - done - - # bug #809260 - python_setup -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons "${scons_opts[@]}" - - pushd "${P}" || die - ln -sf ../setup.py . || die - use python && distutils-r1_src_compile - popd || die -} - -src_test() { - escons "${scons_opts[@]}" check -} - -python_test() { - # Silence QA check which gets confused by layout(?). We do run the tests. - :; -} - -src_install() { - DESTDIR="${D}" escons install "${scons_opts[@]}" $(usev udev udev-install) - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* - find "${D}"/python-discard/ -type d -delete - # Install correct multi-python copy - pushd "${P}" || die - use python && distutils-r1_src_install - popd || die -} - -pkg_postinst() { - use udev && udev_reload -} diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml index f7825c1f5ebf..c6d870b1b680 100644 --- a/sci-geosciences/gpsd/metadata.xml +++ b/sci-geosciences/gpsd/metadata.xml @@ -18,7 +18,6 @@ <flag name="latency-timing">support latency timing information</flag> <flag name="ntp">Enable <pkg>net-misc/ntp</pkg> shared memory interface and PPS kernel support for GPS time</flag> - <flag name="sockets">export gpsd over unix sockets</flag> <flag name="shm">export gpsd over shared memory</flag> </use> <upstream> diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest index 8d93e2891cc7..0cd04002d070 100644 --- a/sci-geosciences/gpxsee/Manifest +++ b/sci-geosciences/gpxsee/Manifest @@ -1,3 +1,2 @@ DIST gpxsee-13.27.tar.gz 5639124 BLAKE2B f3e10b1580e6e96f106d789abf9273530a36f528e4971b430c4b83d0a056f065a08faca28d850a7983df7fc7cc5fcab1d564a88d4337ad7ea4c33b4e2b22579c SHA512 88ed97d6a6813385ce9194d7b18935f410fc69f25072f0a5de20ac19464a1be9ec7c28ac9de2533b3153bb6d43ab2f84428faef0c687d2dffbb39bad4df1c96b -DIST gpxsee-13.32.tar.gz 5551655 BLAKE2B c04aca4c79202b32ca49e2e609e497cac4a92bff08a5b075fea0a8b3d1bbbed9dd5e6a1b5725ffe9a79cdce28b989333c49b0372ef518a1a467aa4ee287eda21 SHA512 2b607742bb0ee2f173721544e205fa98e25c2bf23349811a039a5fd24524edf7e9cba5b64733c7edaa0415bb4b22bf3c4362f9fff342aadf14afc9e1ecd35864 DIST gpxsee-13.33.tar.gz 5557400 BLAKE2B b1aaf16567ab4f35120cf5dd43f9c29136f8dfe04ba85d4876ed135a5f84ebf3626aac9cb1c63cd7b732245a6fbb76bcedb3255d6157796a7a68c938f1da8d1e SHA512 9ae1c59ca9e3b1ceb36fb1923da7f599c6c3f11be05d789629a0a425c11a634cf5a98f78390fb5b0838f7da4e96cce807fe146d0125671d3567b17cbbf1ae9cb diff --git a/sci-geosciences/gpxsee/gpxsee-13.32.ebuild b/sci-geosciences/gpxsee/gpxsee-13.32.ebuild deleted file mode 100644 index b754057f64d5..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-13.32.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh_CN" -inherit plocale qmake-utils xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="qt6" - -RDEPEND=" - qt6? ( - dev-qt/qtbase:6 - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - ) - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - qt6? ( dev-qt/qttools:6 ) - !qt6? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - plocale_find_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - plocale_for_each_disabled_locale rm_ts -} - -src_compile() { - if use qt6; then - $(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake6 gpxsee.pro - else - $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake5 gpxsee.pro - fi - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/gpxsee/gpxsee-13.33-r1.ebuild b/sci-geosciences/gpxsee/gpxsee-13.33-r1.ebuild new file mode 100644 index 000000000000..3bdb41535e80 --- /dev/null +++ b/sci-geosciences/gpxsee/gpxsee-13.33-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="GPXSee" +PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh_CN" +inherit plocale qmake-utils xdg + +DESCRIPTION="Viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" +HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee" +SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +RDEPEND=" + dev-qt/qtbase:6=[concurrent,gui,network,opengl,sql,widgets] + dev-qt/qtpositioning:6 + dev-qt/qtsvg:6 +" +DEPEND="${RDEPEND} + dev-qt/qtserialport:6 +" +BDEPEND="dev-qt/qttools:6[linguist]" + +PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) + +src_prepare() { + default + + plocale_find_changes lang "${PN}_" '.ts' + + rm_ts() { + sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro + } + + plocale_for_each_disabled_locale rm_ts +} + +src_configure() { + $(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" + eqmake6 gpxsee.pro +} + +src_install() { + emake INSTALL_ROOT="${D}" install + dodoc README.md +} diff --git a/sci-geosciences/gpxsee/gpxsee-13.33.ebuild b/sci-geosciences/gpxsee/gpxsee-13.33.ebuild deleted file mode 100644 index b754057f64d5..000000000000 --- a/sci-geosciences/gpxsee/gpxsee-13.33.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="ca cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh_CN" -inherit plocale qmake-utils xdg - -MY_PN="GPXSee" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files" -HOMEPAGE="https://www.gpxsee.org/ https://github.com/tumic0/GPXSee" -SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="qt6" - -RDEPEND=" - qt6? ( - dev-qt/qtbase:6 - dev-qt/qtpositioning:6 - dev-qt/qtserialport:6 - ) - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - qt6? ( dev-qt/qttools:6 ) - !qt6? ( dev-qt/linguist-tools:5 ) -" - -PATCHES=( "${FILESDIR}"/${PN}-7.33.patch ) - -src_prepare() { - default - - plocale_find_changes lang "${PN}_" '.ts' - - rm_ts() { - sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro - } - - plocale_for_each_disabled_locale rm_ts -} - -src_compile() { - if use qt6; then - $(qt6_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake6 gpxsee.pro - else - $(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed" - eqmake5 gpxsee.pro - fi - emake -} - -src_install() { - emake INSTALL_ROOT="${D}" install - dodoc README.md -} diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest index baeff086177c..0317f3747524 100644 --- a/sci-geosciences/josm-bin/Manifest +++ b/sci-geosciences/josm-bin/Manifest @@ -1,9 +1,6 @@ -DIST josm-bin-19230.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394 -DIST josm-bin-19230.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0 DIST josm-bin-19253.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394 DIST josm-bin-19253.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0 DIST josm-bin-19265.desktop 638 BLAKE2B d3a5e0204d0188e72eed65e71edd079b5aa025b82f13c515605f7d5bb9f96fc93e4a24c9eea76c6c4027f54f1c449cda811f5c59e0f2ab54975ab3b1bf221ee7 SHA512 328bc131d5985cd164e3ffa27f61241098329ac01954e1cdde1dcab92261eb3e84d69c9b158f2bb944b02f373c3868bea1850ae335f9dabe3c2314d16d651394 DIST josm-bin-19265.mime.xml 831 BLAKE2B cc37da2b38a38481e00df0b72dcb9699a4dddb6777a4e71d83bb26f3d48a62e6b4abcc5b6fe8b45624eb3ecfeb231feefa714655e5911eeba203d103a7ab17d6 SHA512 7828c6f281f2701ce0f9e5cfbb57e75ecffab7936ce508c97a796ca820d237c7599bea9fc784825a8006e8fc07ebdd7b091d4d20d6767f9de6ca4e1cf42b58b0 -DIST josm-snapshot-19230.jar 18351669 BLAKE2B 9df67d0006b21d72bd7d3aec5fa1699d00ff806085311cc57aa678cec20f66bf4627511d58b952c736e144a3b4d0f134f8e39ef1e713802fff0f658bda5cb596 SHA512 964a4f3de4edd3db8323585ad171a4cd2108acd2d9a379ea31a997619e3bdbda48de94fd8bc537c01772baa7cca4454f83e66483bc34869a8f40ebcc121f4767 DIST josm-snapshot-19253.jar 18361067 BLAKE2B b2765e33c73e7ed3b9bbc72ba52ed6df142a81f9ee31ecf1b20e8dbe79cf61e18fab80c15dbbeaf9b29c06d1f04c0f362a157ef3a0993a1baa7a1eadca00b6b8 SHA512 36d40422080cf6f14db53623796ce73d6c61f956916493021f2002146f8f254781caa3fd48c905f1f78b0baff63b51c6566620c2e5627f505e15b1a794dfc1f7 DIST josm-snapshot-19265.jar 18383098 BLAKE2B 986ac6b09a1ac042da5ec922914da7cc6a752b3c2bde8281fe24fdc395534d4bedd4b166e7f0b616ad233f03d2926cbe071f06a2440bc6812ccb13cf3783288a SHA512 6c13b9ab7849265df153af0c2cf0b00ec0f73cacb15b16c0d7e4e5fb3e73e15b15b769f279ee51f89539c7c479060a8676892d6cf869ddbb0158bd57c3dbf7ee diff --git a/sci-geosciences/josm-bin/josm-bin-19230.ebuild b/sci-geosciences/josm-bin/josm-bin-19230.ebuild deleted file mode 100644 index 9d9039a4a7d7..000000000000 --- a/sci-geosciences/josm-bin/josm-bin-19230.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop java-utils-2 xdg - -DESCRIPTION="Java-based editor for the OpenStreetMap project" -HOMEPAGE="https://josm.openstreetmap.de/" -# PV should be stable here https://josm.openstreetmap.de/wiki/StartupPage -SRC_URI=" - https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar - https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop -> ${P}.desktop - https://josm.openstreetmap.de/export/${PV}/josm/trunk/native/linux/tested/usr/share/mime/packages/josm.xml \ - -> ${P}.mime.xml -" -S="${WORKDIR}" - -LICENSE="Apache-2.0 GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="amd64 ~x86" - -RDEPEND=">=virtual/jre-1.8" -BDEPEND="app-arch/unzip" - -src_unpack() { - default - - cp "${DISTDIR}/${P}.desktop" "org.openstreetmap.${PN}.desktop" || die -} - -src_prepare() { - default - - sed -i -e 's/^Exec=josm/Exec=josm-bin/' "org.openstreetmap.${PN}.desktop" || die - sed -i -e 's/^Icon=org.openstreetmap.josm/Icon=org.openstreetmap.josm-bin/' "org.openstreetmap.${PN}.desktop" || die -} - -src_install() { - java-pkg_newjar "${DISTDIR}/josm-snapshot-${PV}.jar" ${PN}.jar - java-pkg_dolauncher ${PN} --jar ${PN}.jar \ - --java_args "\ - --add-exports=java.base/sun.security.action=ALL-UNNAMED \ - --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED \ - --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED" - - local icon_size - for icon_size in 16 32 48; do - newicon -s ${icon_size} -t hicolor \ - images/logo_${icon_size}x${icon_size}x32.png "org.openstreetmap.${PN}.png" - newicon -s ${icon_size} -t locolor \ - images/logo_${icon_size}x${icon_size}x8.png "org.openstreetmap.${PN}.png" - done - newicon -s scalable images/logo.svg "org.openstreetmap.${PN}.svg" - domenu "${WORKDIR}/org.openstreetmap.${PN}.desktop" - insinto /usr/share/mime/packages - newins "${DISTDIR}/${P}.mime.xml" "${PN}.xml" -} diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest index 608550816edb..e7b266c69e16 100644 --- a/sci-geosciences/osm2pgsql/Manifest +++ b/sci-geosciences/osm2pgsql/Manifest @@ -1,2 +1 @@ -DIST osm2pgsql-1.4.0.tar.gz 2429430 BLAKE2B 5d93a159a87c9cb12d85be8b89377f720e0d94564574f70d6f3686b215a99250967655d0eeee3dcda2742fcab356ecf62de2b4bab384d69a641a06829c401388 SHA512 f0eaceb7f78087a58bba3bbfafbb9d6d70aecd4c3ba1cfb0ce784116b52a57c69855c1a7459cce8b963c87955de269ca320cf4a3934b6ff5ad29b7554e07dd9e DIST osm2pgsql-2.0.0.tar.gz 2712209 BLAKE2B 064bca5796f8ede6f6fb816c8fa3758f066788c8e41c300b4a9cadd8058ca9bed49379a260ee8e5990d7a38061808f7ec78d2895c4964e5546b2ed3862d74239 SHA512 24310f0370fe5e5f87f81f553c61cc24ec80d29054f0679a2d34a3f1d72eacff93ef59611ba0938e552c9faf167f187d7117f5a08f0c0c26f258d95ebee86743 diff --git a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch b/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch deleted file mode 100644 index d7f35345ef52..000000000000 --- a/sci-geosciences/osm2pgsql/files/osm2pgsql-1.4.0-cmake_lua_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -185,7 +185,7 @@ - include_directories(SYSTEM ${LUAJIT_INCLUDE_DIR}) - set(HAVE_LUAJIT 1) - else() -- find_package(Lua REQUIRED) -+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED) - include_directories(SYSTEM ${LUA_INCLUDE_DIR}) - endif() - set(HAVE_LUA 1) diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild deleted file mode 100644 index accfe28a233f..000000000000 --- a/sci-geosciences/osm2pgsql/osm2pgsql-1.4.0-r100.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..4} luajit ) - -inherit cmake lua-single - -DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database" -HOMEPAGE="https://osm2pgsql.org/" -SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+lua" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -COMMON_DEPEND=" - app-arch/bzip2 - dev-db/postgresql:= - dev-libs/expat - sci-libs/proj:= - sys-libs/zlib - lua? ( ${LUA_DEPS} ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost:= -" -RDEPEND="${COMMON_DEPEND} - dev-db/postgis -" - -# Tries to connect to local postgres server and other shenanigans -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0-cmake_lua_version.patch -) - -src_configure() { - # Setting WITH_LUAJIT without "if use lua" guard is safe, upstream - # CMakeLists.txt only evaluates it if WITH_LUA is true. - local mycmakeargs=( - -DWITH_LUA=$(usex lua) - -DWITH_LUAJIT=$(usex lua_single_target_luajit) - -DBUILD_TESTS=OFF - ) - # To prevent the "unused variable" QA warning - if use lua && ! use lua_single_target_luajit; then - mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) - fi - cmake_src_configure -} diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 7a04578bb1f6..bec627eadcd2 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,2 +1,2 @@ DIST qmapshack-1.17.1.tar.gz 56704889 BLAKE2B 1fda3f9874f39eb6b7a0c71ac7b681ebc0f6ea7ae2eefae2b6de4d780556fc5aee45aff230bebcf6ba025959beccffe14a59002fd9552b339892956d2fdd5c50 SHA512 79bdeb59e366cefb2d2a6c9bd084760b5935c93f385a6f2d26bdd25bb4af6939003decc4659afd1567a3b6698a0048e5c79baa716139fc20a96cc0e8dc206d9c -DIST qmapshack-1.17.1_p601.tar.gz 56720740 BLAKE2B 7fd8232e0c5b693d565897dff90ac6c6012918f2739d9cbfa48e7629e3a905609f47b9665d1a7666a131da64739a499a54f9959d275ab4c7f013db0e83d9760a SHA512 9378e1d42a6217cbf169fc67476765f6700886b59518a1c800c5a639b2822e8116cabaac28c147f3a52014bb2393deb1a8e8b7b9c4112f1990361d0376530c80 +DIST qmapshack-1.17.1_p602.tar.gz 56718904 BLAKE2B 1ff2176373201b77f232a6158d853dce1916137f524b05cfd3703314425a293c09a776c417f092b7fda60fd417476736ddaea0e756349fe27e8da38e511ab55d SHA512 3620e3a2f9f5bd3e251779116539bbc6d7bdeb5b25c99df68ee5c6922d31eb3de1019ef02297db92690edba78204c48f163f4223a5f1e0b11c8603a3756d8b17 diff --git a/sci-geosciences/qmapshack/files/dbus-r1.patch b/sci-geosciences/qmapshack/files/dbus-r1.patch deleted file mode 100644 index 0ab4294f63ad..000000000000 --- a/sci-geosciences/qmapshack/files/dbus-r1.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt ---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/CMakeLists.txt 2024-09-30 20:02:57.701618381 +0200 -+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/CMakeLists.txt 2024-09-30 20:05:59.159600329 +0200 -@@ -200,9 +200,9 @@ - - if(USE_QT6DBus) - find_package(Qt6DBus REQUIRED) -- if(Qt5DBus_FOUND) -+ if(Qt6DBus_FOUND) - add_definitions(-DHAVE_DBUS) -- endif(Qt5DBus_FOUND) -+ endif(Qt6DBus_FOUND) - endif(USE_QT6DBus) - - # Everything included. Let's finetune the mess a bit more -diff '--color=auto' -ur qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt ---- qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34.orig/src/qmapshack/CMakeLists.txt 2024-09-30 20:02:57.687618460 +0200 -+++ qmapshack-1f009ac0be1d1c2a4c31aa1283f4009e88685d34/src/qmapshack/CMakeLists.txt 2024-09-30 20:06:51.470306845 +0200 -@@ -368,12 +368,12 @@ - ) - - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set( SRCS - ${SRCS} - device/CDeviceWatcherLinux.cpp - ) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - - if (APPLE) -@@ -746,12 +746,12 @@ - ) - - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set( HDRS - ${HDRS} - device/CDeviceWatcherLinux.h - ) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - - if(APPLE) -@@ -977,11 +977,11 @@ - ) - endif(${DEVELOPMENT_VERSION}) - --if(Qt5DBus_FOUND) -+if(Qt6DBus_FOUND) - set(DBUS_LIB Qt6::DBus) --else(Qt5DBus_FOUND) -+else(Qt6DBus_FOUND) - set(DBUS_LIB) --endif(Qt5DBus_FOUND) -+endif(Qt6DBus_FOUND) - - target_link_libraries(${APPLICATION_NAME} - Qt6::Widgets diff --git a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild index 656f6b3977ce..e1c1be1c79ab 100644 --- a/sci-geosciences/qmapshack/qmapshack-1.17.1_p601.ebuild +++ b/sci-geosciences/qmapshack/qmapshack-1.17.1_p602.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit cmake xdg DESCRIPTION="GPS mapping utility" HOMEPAGE="https://github.com/Maproom/qmapshack/wiki" -COMMIT="b53959a305587f0a7f2330b99267b3b24abb76f4" +COMMIT="23d6fe3e11bd251f123fdba1f1cf2ac8170d4f83" SRC_URI="https://github.com/Maproom/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/${PN}-${COMMIT} LICENSE="GPL-3+" @@ -31,8 +31,6 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-qt/qttools:6[linguist]" -PATCHES=( "${FILESDIR}"/dbus-r1.patch ) - src_configure() { local mycmakeargs=( -DUSE_QT6DBus=$(usex dbus) ) cmake_src_configure |