summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild31
-rw-r--r--sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild31
-rw-r--r--sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild (renamed from sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild)5
-rw-r--r--sci-geosciences/GeographicLib/Manifest3
-rw-r--r--sci-geosciences/GeographicLib/metadata.xml2
-rw-r--r--sci-geosciences/bt747/metadata.xml2
-rw-r--r--sci-geosciences/congen/metadata.xml2
-rw-r--r--sci-geosciences/dcw-gmt/metadata.xml2
-rw-r--r--sci-geosciences/folium/Manifest1
-rw-r--r--sci-geosciences/folium/files/folium-0.12.1-gentoo.patch14
-rw-r--r--sci-geosciences/folium/files/folium-0.12.1-scm.patch12
-rw-r--r--sci-geosciences/folium/files/folium-0.12.1-setup.patch11
-rw-r--r--sci-geosciences/folium/folium-0.12.1.ebuild42
-rw-r--r--sci-geosciences/folium/metadata.xml18
-rw-r--r--sci-geosciences/foxtrotgps/Manifest2
-rw-r--r--sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch33
-rw-r--r--sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch24
-rw-r--r--sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch37
-rw-r--r--sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild34
-rw-r--r--sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild (renamed from sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild)17
-rw-r--r--sci-geosciences/foxtrotgps/metadata.xml2
-rw-r--r--sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild2
-rw-r--r--sci-geosciences/geocode-glib/metadata.xml2
-rw-r--r--sci-geosciences/geopy/Manifest1
-rw-r--r--sci-geosciences/geopy/geopy-2.2.0.ebuild21
-rw-r--r--sci-geosciences/geopy/metadata.xml17
-rw-r--r--sci-geosciences/gmaptool/metadata.xml2
-rw-r--r--sci-geosciences/gmt/metadata.xml2
-rw-r--r--sci-geosciences/gnome-maps/Manifest1
-rw-r--r--sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild2
-rw-r--r--sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild56
-rw-r--r--sci-geosciences/gnome-maps/metadata.xml2
-rw-r--r--sci-geosciences/gpsbabel/metadata.xml2
-rw-r--r--sci-geosciences/gpscorrelate/metadata.xml2
-rw-r--r--sci-geosciences/gpsd/Manifest2
-rw-r--r--sci-geosciences/gpsd/gpsd-3.21.ebuild6
-rw-r--r--sci-geosciences/gpsd/gpsd-3.23-r2.ebuild212
-rw-r--r--sci-geosciences/gpsd/gpsd-3.23.1.ebuild212
-rw-r--r--sci-geosciences/gpsd/gpsd-9999.ebuild87
-rw-r--r--sci-geosciences/gpsd/metadata.xml2
-rw-r--r--sci-geosciences/gpx-viewer/metadata.xml2
-rw-r--r--sci-geosciences/gpxlab/metadata.xml2
-rw-r--r--sci-geosciences/gpxsee/Manifest4
-rw-r--r--sci-geosciences/gpxsee/gpxsee-9.5.ebuild (renamed from sci-geosciences/gpxsee/gpxsee-9.1.ebuild)0
-rw-r--r--sci-geosciences/gpxsee/gpxsee-9.6.ebuild (renamed from sci-geosciences/gpxsee/gpxsee-9.2.ebuild)0
-rw-r--r--sci-geosciences/gpxsee/metadata.xml2
-rw-r--r--sci-geosciences/grass/grass-9999.ebuild18
-rw-r--r--sci-geosciences/grass/metadata.xml5
-rw-r--r--sci-geosciences/gshhg-gmt/metadata.xml2
-rw-r--r--sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild4
-rw-r--r--sci-geosciences/gshhs-data/metadata.xml2
-rw-r--r--sci-geosciences/gshhs/metadata.xml2
-rw-r--r--sci-geosciences/gtk-g-rays2/metadata.xml2
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml2
-rw-r--r--sci-geosciences/harmonics-dwf-free/metadata.xml2
-rw-r--r--sci-geosciences/josm-bin/Manifest2
-rw-r--r--sci-geosciences/josm-bin/josm-bin-18191.ebuild32
-rw-r--r--sci-geosciences/josm-bin/josm-bin-18193.ebuild32
-rw-r--r--sci-geosciences/josm-bin/metadata.xml16
-rw-r--r--sci-geosciences/josm/josm-99999.ebuild2
-rw-r--r--sci-geosciences/josm/metadata.xml2
-rw-r--r--sci-geosciences/laszip/metadata.xml2
-rw-r--r--sci-geosciences/liblas/metadata.xml2
-rw-r--r--sci-geosciences/libtcd/metadata.xml2
-rw-r--r--sci-geosciences/mapserver/metadata.xml2
-rw-r--r--sci-geosciences/mc2bsbh/metadata.xml2
-rw-r--r--sci-geosciences/merkaartor/metadata.xml2
-rw-r--r--sci-geosciences/metadata.xml2
-rw-r--r--sci-geosciences/mtkbabel/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-br24radar/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-dr/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-findit/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-gxradar/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-iacfleet/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-objsearch/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-oesenc/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-otcurrent/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-polar/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-radar/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-route/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-squiddio/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-statusbar/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-watchdog/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-weather_routing/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugin-weatherfax/metadata.xml2
-rw-r--r--sci-geosciences/opencpn-plugins-meta/metadata.xml2
-rw-r--r--sci-geosciences/opencpn/metadata.xml2
-rw-r--r--sci-geosciences/osm-gps-map/metadata.xml2
-rw-r--r--sci-geosciences/osm2pgsql/metadata.xml2
-rw-r--r--sci-geosciences/osmctools/metadata.xml2
-rw-r--r--sci-geosciences/qgis/Manifest2
-rw-r--r--sci-geosciences/qgis/metadata.xml2
-rw-r--r--sci-geosciences/qgis/qgis-3.20.2.ebuild206
-rw-r--r--sci-geosciences/qgis/qgis-3.20.3.ebuild206
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild1
-rw-r--r--sci-geosciences/qmapshack/metadata.xml2
-rw-r--r--sci-geosciences/readosm/metadata.xml2
-rw-r--r--sci-geosciences/routino/metadata.xml2
-rw-r--r--sci-geosciences/swmm/metadata.xml2
-rw-r--r--sci-geosciences/tcd-utils/metadata.xml2
-rw-r--r--sci-geosciences/viking/metadata.xml2
-rw-r--r--sci-geosciences/xtide/metadata.xml2
107 files changed, 1400 insertions, 192 deletions
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
deleted file mode 100644
index 65db138fee5..00000000000
--- a/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ classes for performing conversions between geographic coordinates"
-HOMEPAGE="https://geographiclib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/geographiclib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
- doc? ( >=app-doc/doxygen-1.8.7 )
-"
-
-src_configure() {
- econf \
- --disable-static
- # Automagic deps..
- sed -e "s/SUBDIRS =.*$/SUBDIRS = src man tools $(usex doc doc "") include cmake/" -i Makefile || die
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild
deleted file mode 100644
index 3721cff1645..00000000000
--- a/sci-geosciences/GeographicLib/GeographicLib-1.51.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ classes for performing conversions between geographic coordinates"
-HOMEPAGE="https://geographiclib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/geographiclib/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/19"
-KEYWORDS="~amd64 ~arm"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="
- doc? ( >=app-doc/doxygen-1.8.7 )
-"
-
-src_configure() {
- econf \
- --disable-static
- # Automagic deps..
- sed -e "s/SUBDIRS =.*$/SUBDIRS = src man tools $(usex doc doc "") include cmake/" -i Makefile || die
-}
-
-src_install() {
- default
- find "${D}" -name "*.la" -delete || die
-}
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild
index 50bc12fbb31..892d850baaa 100644
--- a/sci-geosciences/GeographicLib/GeographicLib-1.51-r1.ebuild
+++ b/sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild
@@ -17,10 +17,6 @@ LICENSE="MIT"
SLOT="0/19"
KEYWORDS="~amd64 ~arm"
IUSE="doc examples python"
-# To-Do:find out why this doesn't work
-# 105/167 Test #105: GeodSolve82 ......................***Failed
-# Required regular expression not found. Regex=[20\.0010* 0\.0* 180\.0* 20\.0010* 0\.0* 180\.0* 0\.0* 0\.0* 0\.0* 1\.0* 1\.0* -?0
-RESTRICT="test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -71,7 +67,6 @@ src_compile() {
}
src_test() {
- # Only 1 failing test in the C code, python passes for me
cmake_src_test
if use python; then
diff --git a/sci-geosciences/GeographicLib/Manifest b/sci-geosciences/GeographicLib/Manifest
index 0d81676b128..fb8fd5f0210 100644
--- a/sci-geosciences/GeographicLib/Manifest
+++ b/sci-geosciences/GeographicLib/Manifest
@@ -1,2 +1 @@
-DIST GeographicLib-1.50.1.tar.gz 2463854 BLAKE2B bed7d003dee92e794af993d8fef6cbf1233f9e3f37f53dd6026f16a237dba46bb4d4e2db7adea7931b632bb419288c9731c79cf65f15a4f35e95e8ada34a8f42 SHA512 1db874f30957a0edb8a1df3eee6db73cc993629e3005fe912e317a4ba908e7d7580ce483bb0054c4b46370b8edaec989609fb7e4eb6ba00c80182db43db436f1
-DIST GeographicLib-1.51.tar.gz 2470362 BLAKE2B 5e0a0f44d3b0c62ed7e28285b240cab07a7592e5bf4b181c25b62d8462bb7e2c21f6fcb09577c5f766578803c4b303fdb69af006d3ae62a8b5cb80e92b76236f SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead
+DIST GeographicLib-1.52.tar.gz 2432658 BLAKE2B 87328de1774ab9aec05355362c9a1760cf62864135b97a3e9cb1382b0ec9825b032f6c67a5e02b762c3009a3876a9cd995e3a49a3ad3c051dcd36446b55d0191 SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859
diff --git a/sci-geosciences/GeographicLib/metadata.xml b/sci-geosciences/GeographicLib/metadata.xml
index efc517b3724..e2f2a267068 100644
--- a/sci-geosciences/GeographicLib/metadata.xml
+++ b/sci-geosciences/GeographicLib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ros@gentoo.org</email>
diff --git a/sci-geosciences/bt747/metadata.xml b/sci-geosciences/bt747/metadata.xml
index 179b0d19f5c..f66bedbe631 100644
--- a/sci-geosciences/bt747/metadata.xml
+++ b/sci-geosciences/bt747/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/congen/metadata.xml b/sci-geosciences/congen/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/sci-geosciences/congen/metadata.xml
+++ b/sci-geosciences/congen/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/dcw-gmt/metadata.xml b/sci-geosciences/dcw-gmt/metadata.xml
index ee1e16a0a99..60e3da2bfc2 100644
--- a/sci-geosciences/dcw-gmt/metadata.xml
+++ b/sci-geosciences/dcw-gmt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/folium/Manifest b/sci-geosciences/folium/Manifest
new file mode 100644
index 00000000000..696e7bd3865
--- /dev/null
+++ b/sci-geosciences/folium/Manifest
@@ -0,0 +1 @@
+DIST folium-0.12.1.tar.gz 20033236 BLAKE2B 00e9fb369be9300ca04f9ba3fed18ca28a4985111ccd358312570773b80906df292e14a6f4acbd8ea7686f1b807017f729ad918b3b025af321faf5d7686333db SHA512 b19d2180c36160a370e6ab5ccfacf74ba7b735610d43e69a5200529c776e9c11ee42f4f7fa1ee54621f52b0f2e1fc1f86bc9a146c4a924831b12578643a69616
diff --git a/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch b/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
new file mode 100644
index 00000000000..e2fbf5f35e1
--- /dev/null
+++ b/sci-geosciences/folium/files/folium-0.12.1-gentoo.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg 2021-07-30 23:31:49.026429515 +0200
++++ b/setup.cfg 2021-07-30 23:32:04.638212109 +0200
+@@ -11,11 +11,6 @@
+ parentdir_prefix =
+
+ [tool:pytest]
+-flake8-max-line-length = 121
+-flake8-ignore =
+- docs/* ALL
+-select = C,E,F,W,B,B950
+-ignore = E203, E501, W503
+
+ [metadata]
+ description-file = README.md
diff --git a/sci-geosciences/folium/files/folium-0.12.1-scm.patch b/sci-geosciences/folium/files/folium-0.12.1-scm.patch
new file mode 100644
index 00000000000..78992bafa05
--- /dev/null
+++ b/sci-geosciences/folium/files/folium-0.12.1-scm.patch
@@ -0,0 +1,12 @@
+--- a/setup.py 2021-07-30 23:29:57.320896714 +0200
++++ b/setup.py 2021-07-30 23:30:05.608787963 +0200
+@@ -89,9 +89,4 @@
+ extras_require={"testing": ["pytest"]},
+ install_requires=install_requires,
+ zip_safe=False,
+- use_scm_version={
+- "write_to": "folium/_version.py",
+- "write_to_template": '__version__ = "{version}"',
+- "tag_regex": r"^(?P<prefix>v)?(?P<version>[^\+]+)(?P<suffix>.*)?$",
+- },
+ )
diff --git a/sci-geosciences/folium/files/folium-0.12.1-setup.patch b/sci-geosciences/folium/files/folium-0.12.1-setup.patch
new file mode 100644
index 00000000000..9689d36b3a7
--- /dev/null
+++ b/sci-geosciences/folium/files/folium-0.12.1-setup.patch
@@ -0,0 +1,11 @@
+--- a/setup.cfg 2021-08-28 17:01:33.388959675 +0200
++++ b/setup.cfg 2021-08-28 17:01:44.492801731 +0200
+@@ -18,7 +18,7 @@
+ ignore = E203, E501, W503
+
+ [metadata]
+-description-file = README.md
++description_file = README.md
+ license_file = LICENSE.txt
+
+ [bdist_wheel]
diff --git a/sci-geosciences/folium/folium-0.12.1.ebuild b/sci-geosciences/folium/folium-0.12.1.ebuild
new file mode 100644
index 00000000000..2639558415d
--- /dev/null
+++ b/sci-geosciences/folium/folium-0.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python Data, Leaflet.js Maps"
+HOMEPAGE="https://github.com/python-visualization/folium"
+SRC_URI="https://github.com/python-visualization/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-scm.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-setup.patch
+)
+
+RDEPEND="sci-libs/branca[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pandas[${PYTHON_USEDEP}]
+ )"
+BDEPEND=""
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ rm -r tests/selenium || die
+ default
+}
+
+python_test() {
+ epytest -m 'not web'
+}
diff --git a/sci-geosciences/folium/metadata.xml b/sci-geosciences/folium/metadata.xml
new file mode 100644
index 00000000000..4bcda37c1e9
--- /dev/null
+++ b/sci-geosciences/folium/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ Python Data, Leaflet.js Maps
+ folium builds on the data wrangling strengths of the Python ecosystem
+ and the mapping strengths of the Leaflet.js library.
+ Manipulate your data in Python, then visualize it in a Leaflet map
+ via folium.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">python-visualization/folium</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 91b2999896a..90f9bb38422 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1 +1 @@
-DIST foxtrotgps-1.2.0.tar.xz 1666752 BLAKE2B 35fa2c67376154d4e6e6d5c2fcd5f3584bc246f35d1295b37352e8394313ae1db6c981fb54ee34fcc80d34bf3a9167ec80fa25971df9ef512c2bdc4a37f7d933 SHA512 fdea60bb22b223512ba75651386dcd3c2f7843f18dea8bde85b7498d8909931d44c2d877338c57d3a3b9e46ede9a29e14ecb918182142bce7e8cb5f4e674cb1b
+DIST foxtrotgps-1.2.2.tar.xz 1692120 BLAKE2B a8a70948992cd25609189caae3ec4136d056f86c85dc8b6e9610e935f60499f7bd78f083cc3f3e0904ec56eadb492babb7c8016e0270ea3285dadd99b32fcca8 SHA512 57b436221698fd81e58052f847e19999783e8dd1a165b196c80616591f22b36896454a87dd5a3c2c25bdd4654b8110dc0f320f70f0592ed58210fcc0be98f2ff
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
new file mode 100644
index 00000000000..23930212f31
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-fix-some-receivers.patch
@@ -0,0 +1,33 @@
+From ea27c684924b8d8a560ca6fe1f25443624d54a93 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 18 Aug 2021 20:18:03 +0100
+Subject: [PATCH] Fix some GPS receivers
+
+Rebased version of upstream patch:
+https://bazaar.launchpad.net/~foxtrotgps-team/foxtrotgps/trunk/revision/329
+
+Conservatively added an extra API version check for gpsd.
+
+Bug: https://bugs.gentoo.org/808883
+---
+ src/gps_functions.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/gps_functions.c b/src/gps_functions.c
+index 602b06e..4f30cbb 100644
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -762,7 +762,9 @@ cb_gpsd_data(GIOChannel *src, GIOCondition condition, gpointer data)
+ {
+ gpsdata->fix.time = (time_t) 0;
+ }
+-#if GPSD_API_MAJOR_VERSION >= 9
++#if GPSD_API_MAJOR_VERSION >= 10
++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX || libgps_gpsdata.fix.mode >= MODE_2D);
++#elif GPSD_API_MAJOR_VERSION >= 9
+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
+ #else
+ gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
+--
+2.33.0
+
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch
new file mode 100644
index 00000000000..5a67f26de56
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gcc10.patch
@@ -0,0 +1,24 @@
+diff -ur a/src/callbacks.c b/src/callbacks.c
+--- a/src/callbacks.c 2019-07-10 08:35:12.000000000 +0300
++++ b/src/callbacks.c 2020-10-16 19:29:48.777271945 +0300
+@@ -46,7 +46,7 @@
+ static gboolean maximized = FALSE;
+
+
+-GtkWidget *dialog10 = NULL;
++static GtkWidget *dialog10 = NULL;
+
+
+ static int local_x = 0;
+diff -ur a/src/tracks.c b/src/tracks.c
+--- a/src/tracks.c 2019-07-10 08:35:12.000000000 +0300
++++ b/src/tracks.c 2020-10-16 19:30:12.205982533 +0300
+@@ -30,7 +30,7 @@
+
+ GSList *loaded_track = NULL;
+ GtkWidget *window12;
+-GtkWidget *dialog10;
++static GtkWidget *dialog10;
+
+
+
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch
new file mode 100644
index 00000000000..87e973c47c8
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-1.2.2-gpsd-api9.patch
@@ -0,0 +1,37 @@
+diff -ur a/src/gps_functions.c b/src/gps_functions.c
+--- a/src/gps_functions.c
++++ b/src/gps_functions.c
+@@ -753,12 +753,20 @@
+ {
+ gpsdata->satellites_used = libgps_gpsdata.satellites_used;
+ gpsdata->hdop = libgps_gpsdata.dop.hdop;
++#if GPSD_API_MAJOR_VERSION >= 9 /* API change. gpsd version 3.20 and subsequent. */
++ gpsdata->fix.time = libgps_gpsdata.fix.time.tv_sec + (libgps_gpsdata.fix.time.tv_nsec*1e-9);
++#else
+ gpsdata->fix.time = libgps_gpsdata.fix.time;
++#endif
+ if (isnan(gpsdata->fix.time))
+ {
+ gpsdata->fix.time = (time_t) 0;
+ }
++#if GPSD_API_MAJOR_VERSION >= 9
++ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX);
++#else
+ gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX);
++#endif
+ if (gpsdata->valid)
+ {
+ gpsdata->seen_valid = TRUE;
+@@ -767,7 +775,11 @@
+ gpsdata->fix.longitude = libgps_gpsdata.fix.longitude;
+ gpsdata->fix.speed = libgps_gpsdata.fix.speed;
+ gpsdata->fix.heading = libgps_gpsdata.fix.track;
++#if GPSD_API_MAJOR_VERSION >= 9
++ gpsdata->fix.altitude = libgps_gpsdata.fix.altMSL;
++#else
+ gpsdata->fix.altitude = libgps_gpsdata.fix.altitude;
++#endif
+ }
+
+ g_source_remove(watchdog);
+
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
new file mode 100644
index 00000000000..cc36b1da8d8
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2
+
+DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)"
+HOMEPAGE="https://www.foxtrotgps.org/"
+SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/libxml2:2
+ gnome-base/libglade
+ media-libs/libexif
+ net-misc/curl
+ >=sci-geosciences/gpsd-2.90:=
+ sys-apps/dbus
+ x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gpsd-api9.patch"
+ "${FILESDIR}/${P}-gcc10.patch"
+ "${FILESDIR}/${P}-fix-some-receivers.patch"
+)
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
index f3c9efbbf8e..5db8c34ce19 100644
--- a/sci-geosciences/foxtrotgps/foxtrotgps-1.2.0.ebuild
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit gnome2
@@ -11,18 +11,23 @@ SRC_URI="https://www.foxtrotgps.org/releases/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
RDEPEND="
dev-libs/libxml2:2
- gnome-base/gconf:2
gnome-base/libglade
media-libs/libexif
net-misc/curl
- >=sci-geosciences/gpsd-2.90
+ >=sci-geosciences/gpsd-2.90:=
sys-apps/dbus
x11-libs/gtk+:2
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
sys-devel/gettext
"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gpsd-api9.patch"
+ "${FILESDIR}/${P}-gcc10.patch"
+)
diff --git a/sci-geosciences/foxtrotgps/metadata.xml b/sci-geosciences/foxtrotgps/metadata.xml
index d196f9fe574..39fb816fa65 100644
--- a/sci-geosciences/foxtrotgps/metadata.xml
+++ b/sci-geosciences/foxtrotgps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
index eb3b042409e..4a9436e1a61 100644
--- a/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.26.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/geocode-glib"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="gtk-doc +introspection test"
RDEPEND="
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
index f4c3acdf586..2a0d060bc40 100644
--- a/sci-geosciences/geocode-glib/metadata.xml
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/sci-geosciences/geopy/Manifest b/sci-geosciences/geopy/Manifest
new file mode 100644
index 00000000000..a67caaea0ae
--- /dev/null
+++ b/sci-geosciences/geopy/Manifest
@@ -0,0 +1 @@
+DIST geopy-2.2.0.tar.gz 289811 BLAKE2B f876a867a19e5178eba1fa6b7389159e820fc6a9c9a6ac4beb807e2b1b121612a526b5f7290d5fd6db3e259cbd03a86695775d4cad39662126d5f5b7194b19bd SHA512 78b6c2e4726dd50ad97e3425a0459b4611eed54c06c16a2b397db9c3fd9878d76f9eba26ce353908315fea469a76b4044401f5ba37aab3752e9649fd35db16cd
diff --git a/sci-geosciences/geopy/geopy-2.2.0.ebuild b/sci-geosciences/geopy/geopy-2.2.0.ebuild
new file mode 100644
index 00000000000..0eca56b94d7
--- /dev/null
+++ b/sci-geosciences/geopy/geopy-2.2.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for several popular geocoding web services"
+HOMEPAGE="https://github.com/geopy/geopy"
+SRC_URI="https://github.com/geopy/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+# Need geocoding service to test
+RESTRICT="test"
+
+RDEPEND=">=sci-geosciences/GeographicLib-1.51-r1[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
diff --git a/sci-geosciences/geopy/metadata.xml b/sci-geosciences/geopy/metadata.xml
new file mode 100644
index 00000000000..e47cc76db87
--- /dev/null
+++ b/sci-geosciences/geopy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tupone@gentoo.org</email>
+ <name>Tupone Alfredo</name>
+ </maintainer>
+ <longdescription lang="en">
+ geopy is a Python client for several popular geocoding web services.
+ geopy makes it easy for Python developers to locate the coordinates
+ of addresses, cities, countries, and landmarks across the globe using
+ third-party geocoders and other data sources.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">geopy/geopy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/gmaptool/metadata.xml b/sci-geosciences/gmaptool/metadata.xml
index 263a3db7525..5a83999da18 100644
--- a/sci-geosciences/gmaptool/metadata.xml
+++ b/sci-geosciences/gmaptool/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index ce97db5b54d..3a11971d2b8 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index ea8c61b201e..66d7c9b9b5d 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,2 +1,3 @@
DIST gnome-maps-40.2.tar.xz 3542008 BLAKE2B 65f23bf61e2e3c24afa80b74400dd929510c91ec463aa7e36759b1ddc60814538e21d883df37b98b5d4da851705e5f8e78e9d54a8b50a9cfd490a3e965f34b87 SHA512 6214ebeb8f5dc5fb28e0aab659a2b9f56d6b0c7b9248cd3482a268a6694ca04c75d91686a7029ec96904efcfca91a028d66d17b6311efa7e95b76379c68f6a0e
DIST gnome-maps-40.3.tar.xz 3542308 BLAKE2B cc1430a9b66ee638fb64d0bf907a8472833137cbedd19f264bf2933618af493fc4a1ece0fd9fa2edb70ab50e24a434b4775d8c81eb830958014559e2a454e0b6 SHA512 2372a3e12eb17ec9f33521fecf7f74d1edb217dd8ff6f7565485ccd8d55ff535f7eff475284a402acb9da6781b389186bcd5e4df919340374be3b244f4100077
+DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild
index 5ec15782805..eefd9635912 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
# Pure introspection dependencies found by grepping imports.gi in ${S}
RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
new file mode 100644
index 00000000000..5ec15782805
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+ >=dev-libs/glib-2.66.0:2
+ x11-libs/pango[introspection]
+ >=dev-libs/gjs-1.66.0
+ >=dev-libs/gobject-introspection-0.10.1:=
+ >=x11-libs/gtk+-3.22:3[introspection]
+ >=app-misc/geoclue-0.12.99:2.0[introspection]
+ >=gui-libs/libhandy-0.84:1=
+ >=dev-libs/libgee-0.16:0.8[introspection]
+ >=dev-libs/folks-0.10:=
+ >=sci-geosciences/geocode-glib-3.15.2[introspection]
+ >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+ dev-libs/libxml2:2
+ >=net-libs/rest-0.7.90:0.7[introspection]
+
+ app-crypt/libsecret[introspection]
+ dev-libs/libgweather[introspection]
+ media-libs/clutter-gtk:1.0[introspection]
+ media-libs/clutter:1.0[introspection]
+ net-libs/gnome-online-accounts[introspection]
+ net-libs/libgfbgraph[introspection]
+ net-libs/libsoup:2.4[introspection]
+ net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postinst() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/sci-geosciences/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml
index 39980802b1d..7b343b06be8 100644
--- a/sci-geosciences/gnome-maps/metadata.xml
+++ b/sci-geosciences/gnome-maps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
index 72fdaa5c14e..e6efed8c4a6 100644
--- a/sci-geosciences/gpsbabel/metadata.xml
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml
index c432c978e36..a365fca487d 100644
--- a/sci-geosciences/gpscorrelate/metadata.xml
+++ b/sci-geosciences/gpscorrelate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index cb4314ceceb..9dd813f6555 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1 +1,3 @@
DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e
+DIST gpsd-3.23.1.tar.gz 4904121 BLAKE2B 277c0c12cbe73d7c637cb0e6ce7b6ba15bead55efbbc7f4c9d9d5524f76d60261438df31b66c491e92216d8f3f7e6a13759c0e0cdd200cfae3cc3d616bf98dd5 SHA512 fccfac363103282581e4ea8236ce40e4600a01f02489c1aaec721a13deac556bac046a3b76f8a5e21fe8c736056e872d8c7f2e4ed2d38a164323dd9738f00388
+DIST gpsd-3.23.tar.gz 4893363 BLAKE2B 502c1f2103f3b4224f3bc654bfe6e08e7ddf84707a0db6369e52608c095d5d082da020091ebca27d403cf74fa0bee5ebe1550068263d8d7a55143da2bc1a7350 SHA512 967cc9801271418023630df02b457b76108968992151f6e80b569e99b856bd79cc3d0369d2088f3bc609b2ab22b29dba87639bf466bf262ab80b2b3f04055f8b
diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild
index 8d563919cfa..b37701583b4 100644
--- a/sci-geosciences/gpsd/gpsd-3.21.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.21.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
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
fi
DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
@@ -42,7 +42,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-user/gpsd
>=net-misc/pps-tools-0.0.20120407
- bluetooth? ( net-wireless/bluez )
+ bluetooth? ( net-wireless/bluez:= )
dbus? (
sys-apps/dbus
dev-libs/dbus-glib
diff --git a/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
new file mode 100644
index 00000000000..ef5c01d69fe
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.23-r2.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 ~arm ~arm64 ~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"
+SLOT="0/29"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+ gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+ oceanserver oncore passthrough 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 +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
+ $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
+ 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
+ test? ( sys-devel/bc )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+ BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+python_check_deps() {
+ has_version -b "dev-util/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
+
+ # 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="\$prefix/$(get_libdir)"
+ 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_install() {
+ DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex 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
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.23.1.ebuild b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
new file mode 100644
index 00000000000..41d26755b6a
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.23.1.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+SCONS_MIN_VERSION="2.3.0"
+
+inherit udev distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~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"
+SLOT="0/29"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+ gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+ oceanserver oncore passthrough 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 +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
+ $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
+ 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
+ test? ( sys-devel/bc )"
+
+# asciidoctor package is for man page generation
+if [[ ${PV} == *9999* ]] ; then
+ BDEPEND+=" dev-ruby/asciidoctor"
+fi
+
+python_check_deps() {
+ has_version -b "dev-util/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
+
+ # 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="\$prefix/$(get_libdir)"
+ 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_install() {
+ DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex 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
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 0424345e875..41d26755b6a 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -4,24 +4,24 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
SCONS_MIN_VERSION="2.3.0"
-inherit udev multilib distutils-r1 scons-utils toolchain-funcs
+inherit udev distutils-r1 scons-utils toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git"
inherit git-r3
else
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~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"
-SLOT="0/27"
+SLOT="0/29"
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
@@ -30,7 +30,7 @@ GPSD_PROTOCOLS=(
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 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static systemd test udev usb X"
REQUIRED_USE="X? ( python )
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
gpsd_protocols_isync? ( gpsd_protocols_ublox )
@@ -42,8 +42,10 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-user/gpsd
+ acct-group/dialout
>=net-misc/pps-tools-0.0.20120407
- bluetooth? ( net-wireless/bluez )
+ $(python_gen_any_dep 'dev-util/scons[${PYTHON_USEDEP}]')
+ bluetooth? ( net-wireless/bluez:= )
dbus? (
sys-apps/dbus
dev-libs/dbus-glib
@@ -63,36 +65,33 @@ RDEPEND="
gpsd_protocols_greis? ( dev-python/pyserial )
usb? ( virtual/libusb:1 )
X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
test? ( sys-devel/bc )"
-# xml packages are for man page generation
+# asciidoctor package is for man page generation
if [[ ${PV} == *9999* ]] ; then
- DEPEND+="
- app-text/xmlto
- =app-text/docbook-xml-dtd-4.1*"
+ BDEPEND+=" dev-ruby/asciidoctor"
fi
+python_check_deps() {
+ has_version -b "dev-util/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}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+ 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
- # Avoid useless -L paths to the install dir
- sed -i \
- -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
- SConstruct || die
-
- #Fix systemd binary paths
- sed -i -e 's/local\///' 'systemd/gpsd.service'
- sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in'
+ # bug #807661
+ sed -i -e 's:$SRCDIR/gpsd.hotplug:$SRCDIR/../gpsd.hotplug:' SConscript || die
default
@@ -102,8 +101,8 @@ src_prepare() {
python_prepare_all() {
python_setup
- # Extract python info out of SConstruct so we can use saner distribute
- pyarray() { sed -n "/^ *$1 *= *\\[/,/\\]/p" SConstruct ; }
+ # 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")
@@ -114,17 +113,25 @@ python_prepare_all() {
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" SConstruct ; }
+ 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@|$(pyvar gpsd_version)|" \
- -e "s|@URL@|$(pyvar website)|" \
- -e "s|@EMAIL@|$(pyvar devmail)|" \
+ -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|@GPS_PACKET_SOURCES@|${packet}|" \
- -e "/@GPS_CLIENT_SOURCES@/d" \
- -e "s|@SCRIPTS@|${pybins}|" \
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ -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
}
@@ -138,7 +145,8 @@ src_configure() {
gpsd_user=gpsd
gpsd_group=dialout
nostrip=True
- manbuild=False
+ systemd=$(usex systemd)
+ unitdir="\$prefix/$(get_libdir)"
shared=$(usex !static True False)
bluez=$(usex bluetooth)
libgpsmm=$(usex cxx)
@@ -159,6 +167,10 @@ src_configure() {
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 )
@@ -167,6 +179,9 @@ src_configure() {
for protocol in ${GPSD_PROTOCOLS[@]} ; do
scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) )
done
+
+ # bug #809260
+ python_setup
}
src_compile() {
@@ -175,11 +190,14 @@ src_compile() {
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_install() {
- DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "")
+ DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install '')
newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
newinitd "${FILESDIR}"/gpsd.init-2 gpsd
@@ -188,6 +206,7 @@ src_install() {
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
}
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index e37603bc069..c56212e9f7f 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gpx-viewer/metadata.xml b/sci-geosciences/gpx-viewer/metadata.xml
index d78f8098182..d3369ac7793 100644
--- a/sci-geosciences/gpx-viewer/metadata.xml
+++ b/sci-geosciences/gpx-viewer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gpxlab/metadata.xml b/sci-geosciences/gpxlab/metadata.xml
index b9ac2eb6253..68d6d15cbcc 100644
--- a/sci-geosciences/gpxlab/metadata.xml
+++ b/sci-geosciences/gpxlab/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 8a57225fa97..bd866277049 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,3 +1,3 @@
DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
-DIST gpxsee-9.1.tar.gz 4295570 BLAKE2B b2753bc53003279b84f2811cbbe7195d6941e821fe03dfe95206eaa8c86a6df255530fddd4b13f82036e6404fe547d3a3a33f0c5c65df38aa17eb32285dde14f SHA512 2be51e5df8155175c786cfb265bc02a2abbd848a26b5d38a4bdc82a9677ee32711d11c9623168b5706b299529576d2cecfbb37cae90ff24177ebb5a7b70e3439
-DIST gpxsee-9.2.tar.gz 4434460 BLAKE2B e12994afd9673d859d8846e56d17ae86368f312390d7bee835ff02b4e08ab7330c9138d1af451c0c6a44866e2b044c01111d9de77ce0a40b47c48377e6d9589c SHA512 6469f06a21814d25a56899e79d055f166d6c3ab6ecdcea851f87a4991d74ff4e99fec9924ecd4c3065dcf8cb8eed53bdff66c2e3f5642978e6333d80a75f8262
+DIST gpxsee-9.5.tar.gz 4708913 BLAKE2B 41607294b7eec5b8c0edc33ab52319fdf6608b3d9cba7223788e779e41945a43551bf6d3490aa56ed599ad8cca20e0570fbd5423e45247924b399f853dbad014 SHA512 d7f31f526497d51a3a3851b911d1c71e4617c316b65be1a87fe175eda7d115732e2dc2acf6e1e2da68d18428a1bb87d908e44896a3b1ee1f7c9521d74d14a46b
+DIST gpxsee-9.6.tar.gz 4720704 BLAKE2B b7f0b52074d1a3b4acf699110452b541eb2c1d84f54c35db70ebd1024e94f0998feb0196cf97ea0f7d6d484d63450172913e37c8ef17d6acca2aa16eb90f4d81 SHA512 e48e20a448aadbc13555de5bce15638aec87c1105af0416f4ef14f32eba6b5ef28b60552704a40d8a4ffe8cc23adbf9bc5f84ce0f9d05981d54b8df504200cfd
diff --git a/sci-geosciences/gpxsee/gpxsee-9.1.ebuild b/sci-geosciences/gpxsee/gpxsee-9.5.ebuild
index af40115090c..af40115090c 100644
--- a/sci-geosciences/gpxsee/gpxsee-9.1.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-9.5.ebuild
diff --git a/sci-geosciences/gpxsee/gpxsee-9.2.ebuild b/sci-geosciences/gpxsee/gpxsee-9.6.ebuild
index af40115090c..af40115090c 100644
--- a/sci-geosciences/gpxsee/gpxsee-9.2.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-9.6.ebuild
diff --git a/sci-geosciences/gpxsee/metadata.xml b/sci-geosciences/gpxsee/metadata.xml
index a568df1e302..0e4114d603a 100644
--- a/sci-geosciences/gpxsee/metadata.xml
+++ b/sci-geosciences/gpxsee/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild
index a77634827df..68ab67f5dad 100644
--- a/sci-geosciences/grass/grass-9999.ebuild
+++ b/sci-geosciences/grass/grass-9999.ebuild
@@ -3,14 +3,14 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8,9} )
PYTHON_REQ_USE="sqlite" # bug 572440
-WANT_AUTOCONF="2.1"
+WANT_AUTOCONF="2.5"
WX_GTK_VER="3.0-gtk3"
-inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
+inherit autotools desktop git-r3 python-single-r1 toolchain-funcs wxwidgets xdg
-MY_P="${PN}7.9"
+MY_P="${PN}8.0"
MY_PM="${MY_P/.}"
DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
@@ -216,6 +216,8 @@ src_install() {
sed -i "s|${ED}|/|g" "${scriptMakeDir}/${file}" || die
done
+ mv ${D}/usr/bin/grass ${D}/usr/bin/${MY_PM} || die
+
# get proper folder for grass path in script
local gisbase=/usr/$(get_libdir)/${MY_PM}
sed -e "s:GISBASE = os.path.normpath(\"${D}/usr/$(get_libdir)/${MY_PM}\"):\
@@ -228,13 +230,13 @@ GISBASE = os.path.normpath(\"${gisbase}\"):" \
"${ED}"${gisbase}/etc/fontcap || die
# set proper python interpreter
- sed -e "s:os.environ\['GRASS_PYTHON'\] = \"python3\":\
-os.environ\['GRASS_PYTHON'\] = \"${EPYTHON}\":" \
+ sed -e "s:os.environ\[\"GRASS_PYTHON\"\] = \"python3\":\
+os.environ\[\"GRASS_PYTHON\"\] = \"${EPYTHON}\":" \
-i "${ED}"/usr/bin/${MY_PM} || die
- # set proper GISDBASE directory path in the demolocation .grassrc79 file
+ # set proper GISDBASE directory path in the demolocation .grassrc80 file
sed -e "s:GISDBASE\:.*$:GISDBASE\: ${gisbase}:" \
- -i "${ED}"${gisbase}/demolocation/.grassrc79 || die
+ -i "${ED}"${gisbase}/demolocation/.grassrc80 || die
if use X; then
local GUI="-gui"
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index e62b0339f08..b1f11eec947 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>mario.haustein@hrz.tu-chemnitz.de</email>
@@ -23,4 +23,7 @@
<flag name="liblas">Include support for LAS and LAZ encoded LiDAR files through <pkg>sci-geosciences/liblas</pkg></flag>
<flag name="opencl">Enable OpenCL support</flag>
</use>
+ <upstream>
+ <remote-id type="github">OSGeo/grass</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sci-geosciences/gshhg-gmt/metadata.xml b/sci-geosciences/gshhg-gmt/metadata.xml
index 71e2884352e..75acc6f6ef6 100644
--- a/sci-geosciences/gshhg-gmt/metadata.xml
+++ b/sci-geosciences/gshhg-gmt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
index f4ec0dab634..37c8476bd8c 100644
--- a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
+++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs data"
HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
@@ -12,6 +12,8 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+BDEPEND="app-arch/unzip"
+
src_install() {
dodoc gshhs/README.TXT
rm gshhs/README.TXT || die
diff --git a/sci-geosciences/gshhs-data/metadata.xml b/sci-geosciences/gshhs-data/metadata.xml
index 71e2884352e..75acc6f6ef6 100644
--- a/sci-geosciences/gshhs-data/metadata.xml
+++ b/sci-geosciences/gshhs-data/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gshhs/metadata.xml b/sci-geosciences/gshhs/metadata.xml
index 3e37aee7d8b..dd2953636a7 100644
--- a/sci-geosciences/gshhs/metadata.xml
+++ b/sci-geosciences/gshhs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/gtk-g-rays2/metadata.xml b/sci-geosciences/gtk-g-rays2/metadata.xml
index d78f8098182..d3369ac7793 100644
--- a/sci-geosciences/gtk-g-rays2/metadata.xml
+++ b/sci-geosciences/gtk-g-rays2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/harmonics-dwf-free/metadata.xml b/sci-geosciences/harmonics-dwf-free/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/sci-geosciences/harmonics-dwf-free/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
new file mode 100644
index 00000000000..75395af14e7
--- /dev/null
+++ b/sci-geosciences/josm-bin/Manifest
@@ -0,0 +1,2 @@
+DIST josm-snapshot-18191.jar 16013739 BLAKE2B 69ebf2e44d0b92b928adb3c17e5c99fd74ee305fe7d6888147a95bc62b5f33a0d4a6ff7af13e9781d8ffda36e04e237089439b00de4f329f1500d71cf8de88ff SHA512 1c1d04fe21e379004eb31677887550241365f6bf306286c3cd655044dfadd36d5cea5d54a77c09bc6cb3c648c3fb927f75d800776d9d92b85c1bd318621a4479
+DIST josm-snapshot-18193.jar 16013832 BLAKE2B fba7f88f9833a4ccdd24be1a2554681dc77cd5d810ca9d5b960df350987a138d43804770f5adc61d0ee6a553e5d54753a3b9353ff344dff2a0d4d33b3221a6ed SHA512 13caae201e543468d27e44811ce3a5d774c9942b702c995a3b3cf8b893e925d2b23392537b6338f5835e2014e2e08144015a210b12a553706983ac07e172308d
diff --git a/sci-geosciences/josm-bin/josm-bin-18191.ebuild b/sci-geosciences/josm-bin/josm-bin-18191.ebuild
new file mode 100644
index 00000000000..d042ecaab17
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18191.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
+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_install() {
+ java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
+ java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+ 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 ${PN}.png
+ newicon -s ${icon_size} -t locolor \
+ images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+ done
+ make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm-bin/josm-bin-18193.ebuild b/sci-geosciences/josm-bin/josm-bin-18193.ebuild
new file mode 100644
index 00000000000..d042ecaab17
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18193.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-utils-2 xdg
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="https://josm.openstreetmap.de/"
+SRC_URI="https://josm.openstreetmap.de/download/josm-snapshot-${PV}.jar"
+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_install() {
+ java-pkg_newjar "${DISTDIR}/${A}" ${PN}.jar
+ java-pkg_dolauncher ${PN} --jar ${PN}.jar
+
+ 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 ${PN}.png
+ newicon -s ${icon_size} -t locolor \
+ images/logo_${icon_size}x${icon_size}x8.png ${PN}.png
+ done
+ make_desktop_entry ${PN} "Java OpenStreetMap Editor" ${PN} "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm-bin/metadata.xml b/sci-geosciences/josm-bin/metadata.xml
new file mode 100644
index 00000000000..fd262cef61d
--- /dev/null
+++ b/sci-geosciences/josm-bin/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>henning@hennsch.de</email>
+ <name>Henning Schild</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/josm/josm-99999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index fb12e465c39..58def9eb19e 100644
--- a/sci-geosciences/josm/josm-99999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -45,6 +45,6 @@ src_install() {
java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
- newicon images/logo.png josm.png || die "newicon failed"
+ newicon images/logo.svg josm.svg || die "newicon failed"
make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
}
diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml
index d78f8098182..d3369ac7793 100644
--- a/sci-geosciences/josm/metadata.xml
+++ b/sci-geosciences/josm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml
index ea02a3f068e..32b4a940de7 100644
--- a/sci-geosciences/laszip/metadata.xml
+++ b/sci-geosciences/laszip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/liblas/metadata.xml b/sci-geosciences/liblas/metadata.xml
index 1d79989d97b..b2aca9b4f32 100644
--- a/sci-geosciences/liblas/metadata.xml
+++ b/sci-geosciences/liblas/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/sci-geosciences/libtcd/metadata.xml
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
index 5844269c69d..c804c6ffa18 100644
--- a/sci-geosciences/mapserver/metadata.xml
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/mc2bsbh/metadata.xml b/sci-geosciences/mc2bsbh/metadata.xml
index 56df135ff5a..0885e8a081b 100644
--- a/sci-geosciences/mc2bsbh/metadata.xml
+++ b/sci-geosciences/mc2bsbh/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
index 47721d5d2eb..45f8b6b3867 100644
--- a/sci-geosciences/merkaartor/metadata.xml
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/metadata.xml b/sci-geosciences/metadata.xml
index aaa3e74aea9..74e3e490ba6 100644
--- a/sci-geosciences/metadata.xml
+++ b/sci-geosciences/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The sci-geosciences category contains geosciences-related software.
diff --git a/sci-geosciences/mtkbabel/metadata.xml b/sci-geosciences/mtkbabel/metadata.xml
index 5926eee8e35..1a9511913f7 100644
--- a/sci-geosciences/mtkbabel/metadata.xml
+++ b/sci-geosciences/mtkbabel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
index 6fa59ff0bcc..f3804ddd191 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-climatology/metadata.xml b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
index 7fc64c64cfe..404cfa34be8 100644
--- a/sci-geosciences/opencpn-plugin-climatology/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-dr/metadata.xml b/sci-geosciences/opencpn-plugin-dr/metadata.xml
index 40869ffafb0..bfcdc2c8524 100644
--- a/sci-geosciences/opencpn-plugin-dr/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-dr/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-findit/metadata.xml b/sci-geosciences/opencpn-plugin-findit/metadata.xml
index 50efe0522e2..593e75551d7 100644
--- a/sci-geosciences/opencpn-plugin-findit/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-findit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-gxradar/metadata.xml b/sci-geosciences/opencpn-plugin-gxradar/metadata.xml
index d8606ec694c..6eb333eb3bb 100644
--- a/sci-geosciences/opencpn-plugin-gxradar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-gxradar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml b/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml
index b55736430c4..549efe21a11 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-iacfleet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-launcher/metadata.xml b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
index df7742b3737..0013243bd2d 100644
--- a/sci-geosciences/opencpn-plugin-launcher/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
index a71066b8627..ad45721e907 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
index 385e7441b77..3d9099985ab 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml b/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml
index ae33cb3e72c..03ebf568b0f 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
index 145aae3bde6..a9821ba361d 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-oesenc/metadata.xml b/sci-geosciences/opencpn-plugin-oesenc/metadata.xml
index 5609ab0afb6..404774cea45 100644
--- a/sci-geosciences/opencpn-plugin-oesenc/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-oesenc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml b/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml
index 37fc2f734d5..eb4cb234357 100644
--- a/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-otcurrent/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-polar/metadata.xml b/sci-geosciences/opencpn-plugin-polar/metadata.xml
index 3d00c813eab..53ba7350c27 100644
--- a/sci-geosciences/opencpn-plugin-polar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-polar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-radar/metadata.xml b/sci-geosciences/opencpn-plugin-radar/metadata.xml
index 71fc4947125..ea23384e621 100644
--- a/sci-geosciences/opencpn-plugin-radar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-radar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-route/metadata.xml b/sci-geosciences/opencpn-plugin-route/metadata.xml
index 6e6d546794c..ade38083217 100644
--- a/sci-geosciences/opencpn-plugin-route/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-route/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-squiddio/metadata.xml b/sci-geosciences/opencpn-plugin-squiddio/metadata.xml
index adb0998c135..231eec4da1e 100644
--- a/sci-geosciences/opencpn-plugin-squiddio/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-squiddio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
index 1e209f74839..77d49fe0bb5 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-watchdog/metadata.xml b/sci-geosciences/opencpn-plugin-watchdog/metadata.xml
index 7c616379306..8c518ba29da 100644
--- a/sci-geosciences/opencpn-plugin-watchdog/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-watchdog/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
index 49008f4636d..c3c784e1bb1 100644
--- a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
index 876385098e2..cd6445f1b39 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn-plugins-meta/metadata.xml b/sci-geosciences/opencpn-plugins-meta/metadata.xml
index 49f32f114fc..95aede5f749 100644
--- a/sci-geosciences/opencpn-plugins-meta/metadata.xml
+++ b/sci-geosciences/opencpn-plugins-meta/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
index 5e5fb62ddab..6d3ea5cafd0 100644
--- a/sci-geosciences/opencpn/metadata.xml
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mschiff@gentoo.org</email>
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
index 81788a1dd46..357b2be6f0c 100644
--- a/sci-geosciences/osm-gps-map/metadata.xml
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>marecki@gentoo.org</email>
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index 5c2215ccfe5..133a781279f 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/osmctools/metadata.xml b/sci-geosciences/osmctools/metadata.xml
index 9016058737b..e2de9488672 100644
--- a/sci-geosciences/osmctools/metadata.xml
+++ b/sci-geosciences/osmctools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>conikost@gentoo.org</email>
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index d96957089cb..c5380f06630 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,3 +1,5 @@
DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
DIST qgis-3.20.0.tar.bz2 131619071 BLAKE2B c6644b6e858a38c5b15846d39293d5b92b849efb44d147b8968a5630db413b427150f20722a24e806a14af877b88c0b06774777fd01dd8753cd9305ba1c40e33 SHA512 0f1d9527d3cf4241ed7688fe4f13e459beb7848c99492a995ac30d8b0c874f3198007d25d9fbde51cc36e6e08029a2fdd2d023c88423adb925a0a99778df27bc
+DIST qgis-3.20.2.tar.bz2 132063211 BLAKE2B 4482cb84e258d26313bab7fd045e3e0fee8541d6857de8f2192a351b51256b94e2c945c4e117d6394ee178c16b8e5a2f15cc1a51f99600e789a32ae14edb9601 SHA512 64d78fe16db1ae17dd22c5f05e83dac4ba50185a1c76e8dfe3205eeb39aa11d970ca59c83db72ff9828dc1610076fceab5a9fc797d6be2314165e95d3d9f2087
+DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index c54d1821656..a63b6aef6b2 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2.ebuild
new file mode 100644
index 00000000000..51cd2ec672e
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.20.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+ inherit git-r3
+else
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="amd64 x86"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/protobuf:=
+ dev-libs/qtkeychain[qt5(+)]
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtserialport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-gfx/exiv2:=
+ >=sci-libs/gdal-3.0.4:=[geos]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sys-libs/zlib
+ >=sci-libs/proj-4.9.3:=
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( dev-qt/qt3d:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( =sci-geosciences/grass-7*:= )
+ hdf5? ( sci-libs/hdf5:= )
+ mapserver? ( dev-libs/fcgi )
+ netcdf? ( sci-libs/netcdf:= )
+ opencl? ( virtual/opencl )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/future[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/owslib[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/sip-5:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ')
+ )
+ qml? ( dev-qt/qtdeclarative:5 )
+ serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qttest:5
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+ sci-geosciences/gpsbabel
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+ sys-devel/bison
+ sys-devel/flex
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=share/man/
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DQWT_INCLUDE_DIR=/usr/include/qwt6
+ -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+ -DPEDANTIC=OFF
+ -DUSE_CCACHE=OFF
+ -DWITH_ANALYSIS=ON
+ -DWITH_APIDOC=OFF
+ -DWITH_GUI=ON
+ -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GSL=$(usex georeferencer)
+ -DWITH_GRASS7=$(usex grass)
+ $(cmake_use_find_package hdf5 HDF5)
+ -DWITH_SERVER=$(usex mapserver)
+ $(cmake_use_find_package netcdf NetCDF)
+ -DUSE_OPENCL=$(usex opencl)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QUICK=$(usex qml)
+ -DWITH_QT5SERIALPORT=$(usex serial)
+ -DWITH_QTWEBKIT=OFF
+ )
+
+ if use grass; then
+ readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+ readarray -d'.' -t v <<<"${f[2]}"
+ grassdir="grass${v[0]}${v[1]}"
+
+ GRASSDIR=/usr/$(get_libdir)/${grassdir}
+ mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+ mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/qgis/python
+ fi
+
+ if use grass; then
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild b/sci-geosciences/qgis/qgis-3.20.3.ebuild
new file mode 100644
index 00000000000..ba166c28197
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.20.3.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_REQ_USE="sqlite"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+ inherit git-r3
+else
+ SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
+ examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit cmake desktop python-single-r1 qmake-utils xdg
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass hdf5 mapserver netcdf opencl oracle polar postgres python qml serial"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python )"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/qca:2[qt5(+),ssl]
+ >=dev-db/spatialite-4.2.0
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/libzip:=
+ dev-libs/protobuf:=
+ dev-libs/qtkeychain[qt5(+)]
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtpositioning:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtserialport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-gfx/exiv2:=
+ >=sci-libs/gdal-3.0.4:=[geos]
+ sci-libs/geos
+ sci-libs/libspatialindex:=
+ sys-libs/zlib
+ >=sci-libs/proj-4.9.3:=
+ >=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+ >=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+ 3d? ( dev-qt/qt3d:5 )
+ georeferencer? ( sci-libs/gsl:= )
+ grass? ( =sci-geosciences/grass-7*:= )
+ hdf5? ( sci-libs/hdf5:= )
+ mapserver? ( dev-libs/fcgi )
+ netcdf? ( sci-libs/netcdf:= )
+ opencl? ( virtual/opencl )
+ oracle? (
+ dev-db/oracle-instantclient:=
+ sci-libs/gdal:=[oracle]
+ )
+ polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] )
+ postgres? ( dev-db/postgresql:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/future[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/owslib[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[designer,network,sql,svg,${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ <dev-python/sip-5:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=sci-libs/gdal-2.2.3[python,${PYTHON_USEDEP}]
+ postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+ ')
+ )
+ qml? ( dev-qt/qtdeclarative:5 )
+ serial? ( dev-qt/qtserialport:5 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/qttest:5
+ python? ( ${PYTHON_DEPS} )
+"
+RDEPEND="${COMMON_DEPEND}
+ sci-geosciences/gpsbabel
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-qt/linguist-tools:5
+ sys-devel/bison
+ sys-devel/flex
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQGIS_MANUAL_SUBDIR=share/man/
+ -DQGIS_LIB_SUBDIR=$(get_libdir)
+ -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
+ -DQWT_INCLUDE_DIR=/usr/include/qwt6
+ -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
+ -DPEDANTIC=OFF
+ -DUSE_CCACHE=OFF
+ -DWITH_ANALYSIS=ON
+ -DWITH_APIDOC=OFF
+ -DWITH_GUI=ON
+ -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
+ -DWITH_QSPATIALITE=ON
+ -DENABLE_TESTS=OFF
+ -DWITH_3D=$(usex 3d)
+ -DWITH_GSL=$(usex georeferencer)
+ -DWITH_GRASS7=$(usex grass)
+ $(cmake_use_find_package hdf5 HDF5)
+ -DWITH_SERVER=$(usex mapserver)
+ $(cmake_use_find_package netcdf NetCDF)
+ -DUSE_OPENCL=$(usex opencl)
+ -DWITH_ORACLE=$(usex oracle)
+ -DWITH_QWTPOLAR=$(usex polar)
+ -DWITH_POSTGRESQL=$(usex postgres)
+ -DWITH_BINDINGS=$(usex python)
+ -DWITH_CUSTOM_WIDGETS=$(usex python)
+ -DWITH_QUICK=$(usex qml)
+ -DWITH_QT5SERIALPORT=$(usex serial)
+ -DWITH_QTWEBKIT=OFF
+ )
+
+ if use grass; then
+ readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
+ readarray -d'.' -t v <<<"${f[2]}"
+ grassdir="grass${v[0]}${v[1]}"
+
+ GRASSDIR=/usr/$(get_libdir)/${grassdir}
+ mycmakeargs+=( -DGRASS_PREFIX7=${GRASSDIR} )
+ fi
+
+ use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) ||
+ mycmakeargs+=( -DWITH_QGIS_PROCESS=OFF ) # FIXME upstream issue #39973
+
+ # bugs 612956, 648726
+ addpredict /dev/dri/renderD128
+ addpredict /dev/dri/renderD129
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /usr/share/mime/packages
+ doins debian/qgis.xml
+
+ if use examples; then
+ docinto examples
+ dodoc -r "${WORKDIR}"/qgis_sample_data/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ if use python; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/qgis/python
+ fi
+
+ if use grass; then
+ python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ elif use python; then
+ elog "Support of PostgreSQL is disabled."
+ elog "But some installed python-plugins import the psycopg2 module."
+ elog "If you do not need these plugins just disable them"
+ elog "in the Plugins menu, else you need to set USE=\"postgres\""
+ fi
+
+ xdg_pkg_postinst
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 5c5913d97ad..ba166c28197 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -123,6 +123,7 @@ src_configure() {
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
-DQWT_INCLUDE_DIR=/usr/include/qwt6
-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
+ -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DWITH_ANALYSIS=ON
diff --git a/sci-geosciences/qmapshack/metadata.xml b/sci-geosciences/qmapshack/metadata.xml
index a6e334e2ae4..ce8949a638a 100644
--- a/sci-geosciences/qmapshack/metadata.xml
+++ b/sci-geosciences/qmapshack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/sci-geosciences/readosm/metadata.xml b/sci-geosciences/readosm/metadata.xml
index 2761b1b9e5c..080560a80ec 100644
--- a/sci-geosciences/readosm/metadata.xml
+++ b/sci-geosciences/readosm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>sci-geosciences@gentoo.org</email>
diff --git a/sci-geosciences/routino/metadata.xml b/sci-geosciences/routino/metadata.xml
index 4b9330ffe67..42758c787c2 100644
--- a/sci-geosciences/routino/metadata.xml
+++ b/sci-geosciences/routino/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>grozin@gentoo.org</email>
diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/sci-geosciences/swmm/metadata.xml
+++ b/sci-geosciences/swmm/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/tcd-utils/metadata.xml b/sci-geosciences/tcd-utils/metadata.xml
index 6f49eba8f49..85e4ed814fa 100644
--- a/sci-geosciences/tcd-utils/metadata.xml
+++ b/sci-geosciences/tcd-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
index 7051ff1293b..178eb9cbdd6 100644
--- a/sci-geosciences/viking/metadata.xml
+++ b/sci-geosciences/viking/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>graaff@gentoo.org</email>
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 7a38bb90096..115e9d64a66 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>