gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-geosciences
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
18 files changed, 515 insertions, 378 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 7c305d885199..1f4c1554dfa0 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index b27dd420528d..f4bb2b5d6c3e 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,6 @@
+AUX gnome-maps-meson-0.61.patch 916 BLAKE2B f2affee9ce30596872b806da7833ec5f9dcf21db26b3ff2f5b9688b45658f40388c7103bbb0dd03de314c5d5e556c91229b86afda7f2081b876d8dce9b4c6af8 SHA512 a201b6e631c8bf8dc6d15c864266414eb659740d34bdfcc3fa021ac03c6585012e921c77135acde6b4be06fc2f1e7828e30de4ca2e7595f72b4f082bc6b00092
 DIST gnome-maps-40.5.tar.xz 3542648 BLAKE2B bbc45882e314667def29b8d7491afba2e1649ef62a6898a58b4afd93bd26537af73588d9cecd0ed06fc53c8083ade6d33f468b4a51481886d30abdc13558be80 SHA512 1d53dda1b96fb5a6db4152380f9136f2e66cbc0062434254cc0b47e999c19dfcbde6bc1d6bc787474eab83b29293a1e207cf41b177f7cd01b29ccb15a6628d15
-DIST gnome-maps-41.1.tar.xz 2187384 BLAKE2B 792ada987c513118411233b477373db015e55b5c4da2405d40f69833fbce3d0fdfec4c194fdfa762d5642039c4965db9a606d6206e8c52b16a4f7c26ae9b54ab SHA512 ff750c009c0409bdf87a08b2a89296f5f214f8fa294c7470e99841fc6f155ae14cf9bfd388a65231e03c4c4fdbe5606c90b2bf5897e756a1699a19782f89a5db
 DIST gnome-maps-41.2.tar.xz 2187460 BLAKE2B 83f93f9cf371e4275cb73e9a847be6400a4f736fe605266a1f371bc03af13b37af3bae04d5d0a7dbddd8605c099af92030ed8dec555f1f1b59339c9f907b3b21 SHA512 b0f167797986224d5b51df4be44731409241935513f6863ef844121b8b29829ed6ba1e37a2478b93e79dab5f9825e1632ef74f576f37990c9f9779b8de24cddc
-EBUILD gnome-maps-40.5.ebuild 1500 BLAKE2B c4ada54156ab4d3faf9f6991df7cca4677f6e50165b742545e38d2b3997ba2670b4d08ea4e503f710a2468e365829a225801586edb12a61a00f124a83f119612 SHA512 150c00848281da75a4cabd680686901bc9d4d547e15c26aa44c30fb7c647760d201f28dd754e6dcbfd0176c989b6fdcabbfd035b98c4ecc99dbe869e0cddfdf6
-EBUILD gnome-maps-41.1.ebuild 1502 BLAKE2B 5e9fc6c4e38b790fcf7cbc206d1f0c1b7da5fe36182f4f3bf516ccb823df956b3615b0d062b19a6290008cafb56afedf59bd26c03e58f7c6f062a5ad2d5bc892 SHA512 801383b53bc33c4a8461d879bfffd6fb521caac0d84fabae2824c8c1f8c4bb0d070afa07a156893cdb0ee638ffaf5361dfad6e30654577c34ad6b5975f7a853c
-EBUILD gnome-maps-41.2.ebuild 1509 BLAKE2B 173f08541d5c370677bd42b4d440b88da47cb3affe90a59e0cfe99759c41d45d5e382de06a5fa55eba0e2e86ce1b3b96c12a59477c17268b7d116a3145858b15 SHA512 5394e17c69da91212dde8efff026a643e7ae2f9631633bf5fb81ab7cdabe9d180dec6eb7deacb019f96e9030f54ab9237dcd44df4ba7743c152873a106e1829b
+EBUILD gnome-maps-40.5.ebuild 1556 BLAKE2B ab90b78a02ae92718e4e351286a82c29148746012c8ac9a28380a562eb0b6a39851c863b7668226a0a763853b8368e5e17304844d4f8be2ef6b594364b3c28ce SHA512 1b0b7a229feba6a6f8114d5fa53d6b1942778eabf5da1f95dd7a3ef27b77bcd70a07176ada416a67c5ff5fa966f659bf3c351a14b4f7cbf001aa2449213169ef
+EBUILD gnome-maps-41.2.ebuild 1565 BLAKE2B dfb99da4d0b3a191d0d4651437125936c4e8ca930f16ef5a2def6c18efcc8f5b185b9610508234ba2be8aca3426dce0c3d794d3b4bc5f2a4cf5e59ceee19273d SHA512 3fe31768485b7004da5c2efdcf818ff93a1ea892db640edd3dab7812bebef711d1bf48aac2c08a219b26d41372fb7b323e4e63eace34ff91bd12a71b540feb32
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
new file mode 100644
index 000000000000..1ef4d4555c93
--- /dev/null
+++ b/sci-geosciences/gnome-maps/files/gnome-maps-meson-0.61.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/831655
+https://gitlab.gnome.org/GNOME/gnome-maps/-/commit/def20cbb26e59e5023fe157e691de48d7afe7210
+
+From e81cbf910755c0387677a43a7427da4ec073e1eb Mon Sep 17 00:00:00 2001
+From: Marcus Lundblad <ml@update.uu.se>
+Date: Fri, 14 Jan 2022 23:33:43 +0100
+Subject: [PATCH] meson: Remove unnesseray argument to i18n.merg_file
+
+This causes a build failure with meson 0.60 (or later).
+Remove it, as it's ignored also for earlier meson versions.
+
+Fixes #418
+
+(cherry picked from commit def20cbb26e59e5023fe157e691de48d7afe7210)
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2be4ee73..4ef7eba0 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ install_data(
+ appdata = app_id + '.appdata.xml'
+ 
+ appdata_file = i18n.merge_file(
+-	appdata,
+ 	input: appdata + '.in',
+ 	output: appdata,
+ 	po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
index eefd96359122..a710f389c1d4 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-40.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -45,6 +45,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/gnome-maps-meson-0.61.patch"
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild
deleted file mode 100644
index 5ec15782805f..000000000000
--- a/sci-geosciences/gnome-maps/gnome-maps-41.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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/gnome-maps-41.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
index c14cf93f29ac..678e95e601f2 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-41.2.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/gnome-maps-meson-0.61.patch"
+)
+
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 6681b8d09e20..b796bcccaeee 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,6 +1,10 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
 DIST gpxsee-10.0.tar.gz 4994900 BLAKE2B 5f0e59655da285461de39bcac51b65ae4965723a5a438b88eb55b22f0e9398db94edce283f0bd1218d0b78375edf9e9d3e2148079cf12c9927819a0235df7f08 SHA512 bc081fdc9000be6f605b137fe5de282d11508b994b34d1e515913e33829516893c7748d9c5a5ec2639e36e665db8dc99656364498abd0e21069a7fc34b251f9f
+DIST gpxsee-10.1.tar.gz 5118085 BLAKE2B 699b54e4d910c2f2c82ecae71b95af88170d2fa754eb9359ea8dc31e65f4f0dbbc6d8a21a9542c9e2d7eccc7b193f222ef0e066eca1366f88c609765589b8893 SHA512 a29466cab39f69e65791f5d519502b98a1659e3b307725f6e0b04261a6882ee053c8a31398304ae6fd6135460592f6063891e68cf9bde4a87106119582ebc46f
+DIST gpxsee-10.2.tar.gz 5118104 BLAKE2B 5651b68008f28394a76d7b04e6bd9721b85e388de8a90a7ceb84cd71950367a216491079f38ed759340d5b6abb7561ca5a61ab80d4f5d8d5be9f24f408d3fd50 SHA512 802d382d95648125f589c000f63e815570e8eb6c6f00feed75a84efe06739adf4b32a52793f841fb088a13e8b9bb8453f2d92b12d4e33a0ca336282fe1740b5f
 DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b
 EBUILD gpxsee-10.0.ebuild 1127 BLAKE2B 3933226f6889696d60554467117c4029ebc945c7251183f3b13f4c53982519420fc9eb0a15d2ad1a613dc766e2633031be233af7e3cf08c8842f1b57fb9d3245 SHA512 7dda94addff64c2342ca9791f3bc91af912fde65356fd402694cd68c0d0fa4ec58b55fd3899cfa235eb751f0ee728fd82bd643a5b1cb1a55d1c850a2457b5033
+EBUILD gpxsee-10.1.ebuild 1130 BLAKE2B 9f9472042dafb5575440e564f1415b9eabff748ddae489686e1f35495f9d11b92759afdea86b1d215754c21ed4ae078a1c912313cedbce735b87486270852a6f SHA512 0450c351201ea53f84bd345d950793a4a4b6bd8873646442278c1aa82dc215ac9f7029da9f06e7c528552df5fd954dddb88f3df49bf592953e948ee9c997126d
+EBUILD gpxsee-10.2.ebuild 1130 BLAKE2B 9f9472042dafb5575440e564f1415b9eabff748ddae489686e1f35495f9d11b92759afdea86b1d215754c21ed4ae078a1c912313cedbce735b87486270852a6f SHA512 0450c351201ea53f84bd345d950793a4a4b6bd8873646442278c1aa82dc215ac9f7029da9f06e7c528552df5fd954dddb88f3df49bf592953e948ee9c997126d
 EBUILD gpxsee-9.12.ebuild 1120 BLAKE2B 8dc901c2dde2c921a160217c8b42de6f0ecdf251477bd880930a11e0816e3b0c6618de2f47d8b7bbc1628b31ab3adcb372d1d191a4f59f349bb45d84e072e9a6 SHA512 1e5a65b940b790a787fab3c711bc3b8513069346ed164c3b8c55da0701f5b80a074ce72abb0aa1ba33cde2fe69aa8413de367e36df64fd72aba4bc6b05979b15
 MISC metadata.xml 453 BLAKE2B e7f32299798b2f8b3d91dcdf0c4c024e8296a3cfa0f0a35acfc52475b4b2df0f276b6a9e9718a2f3593dde7fd9ee11afc06c601235db7e272ec552b072bd139c SHA512 c66111588383b1363eb07d3f1d9efd2adad37ee6bac9d159847f642b2ed864e1bb26db8f67fc94e9a5ca4d28623e8dc8d15395132e46d1e4fca17cbf6986dc35
diff --git a/sci-geosciences/gpxsee/gpxsee-10.1.ebuild b/sci-geosciences/gpxsee/gpxsee-10.1.ebuild
new file mode 100644
index 000000000000..05603a86cae0
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-10.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh"
+inherit desktop plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtpositioning:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/gpxsee/gpxsee-10.2.ebuild b/sci-geosciences/gpxsee/gpxsee-10.2.ebuild
new file mode 100644
index 000000000000..05603a86cae0
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-10.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en eo es fi fr hu it ko nb pl pt_BR ru sv tr uk zh"
+inherit desktop plocale qmake-utils xdg
+
+MY_PN="GPXSee"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
+HOMEPAGE="https://www.gpxsee.org/"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtpositioning:5"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
+
+src_prepare() {
+	default
+
+	plocale_find_changes lang "${PN}_" '.ts'
+
+	rm_ts() {
+		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
+	}
+
+	plocale_for_each_disabled_locale rm_ts
+}
+
+src_compile() {
+	lrelease gpxsee.pro
+	eqmake5 gpxsee.pro
+	emake
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README.md
+}
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 191418f36c50..d14dde13bc6d 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,7 +1,8 @@
+AUX grass-8.0.0-mkhtml.patch 10339 BLAKE2B 39b55a1c33b751508128533bcfb513d3aab9227985ff142eb346c02997599afc228274a7aa8b02258def491816b98fb52b307007facfcb00b79657afd42a88c7 SHA512 a4eca79ccadf77b863b254a83fab8eaa096bbf977bfe54cd4de3ee914f55e3499fe42615904b1717ffbb0da06334306543f0562203793adaa0770926498dfece
 AUX grass-flock.patch 577 BLAKE2B 0f4e0b06e1d8273cb954be9596a68adbd51b099b0a19bf2d4dc695de3a06bffc4df42eedca76977d552a26578238ffb10fb1b2b5242c4b6ffda83eaba7c41764 SHA512 36d8408f553ebfeb5cdc97c43ffae3ce6f77b713069d0d30d734748fb812800d4dafc76921d95fa8455c4ec4a55311703499f4aec97ad13b97b9549ab463cb3c
 DIST grass-7.8.6.tar.gz 66331264 BLAKE2B bb5a3387f74bc30b7ce3230765cecdc7e61ded8693d888e6cefc2d491022496409d053e170293fcef392a9c9178a41b070767e1ce90b57b448b189c9e16a2761 SHA512 6db10a20e5b70f0ce9a8fc4d6966c6f078453a88fa8f0577c1c62303f9787fa3bf3369e281f7ca864280c865e3ef022c51d8805d1258ea04da45e63cd34c27df
-DIST grass-8.0.0RC2.tar.gz 64942585 BLAKE2B fc7499def2029acb9b547c688eaaad986daae5c80b085bbe876d7bca4d4c7547867375edee752705e30ab215d0b8e0c7f017e94802a549569a525196bbd7bcb4 SHA512 9e624c54974e253dce1b93a0ce1c51eaa421d8baacdf61b03893d34c5cd36af76915ab035fb9bb78af4c16e1efc12bb501a707e335e312a12cf2c17a2b0d6f61
+DIST grass-8.0.0.tar.gz 64944539 BLAKE2B 61ea667321599026f2514333e5fe47313d232236a818458939e968d80ed88a511ddc29e2b51edd082bd246b614a0b121b10c09e9059ae31fd5c211e9844d89b1 SHA512 29bd57fb017937b0f3ad105790449704c6f12b56ffe79091f0aceed328f4da5293dd42cc3071158aad5386a51309f35a4f0b9bbd57221431e705f51880c2ce42
 EBUILD grass-7.8.6-r1.ebuild 7055 BLAKE2B e38aeec61d89be4a584760e6af906e8ff1e080176110a05a27fe8610b3b87109a49a2ab7160c2f7fe47047d203cdb52ac7be917982e744b4e827e746c34ff7d2 SHA512 3bf3595b0f1a1dc296f6c2f8a05eef8b6621ef6609e4f207d1710a916f9b8b6791e4424b0806b032fc3f925d7b714f43a48e9750aa700075e4c99a955d0ad930
-EBUILD grass-8.0.0_rc2.ebuild 7100 BLAKE2B e89a9b0c322ff59622c020fecd242382348f82dccf5dcd91df50ec714491a78594b07914375540f394f410840e18360ea2f754436d37297855a7ac3cd83ba2a8 SHA512 cad285bc9af71481f229276fe31f7f8a5bbd6b8a231a29ff28e5ef417527db4afc0ccdbca2913bcd06a8aca06cff1706ed69819bccc97b8c20ce49f31e5557a0
+EBUILD grass-8.0.0.ebuild 7140 BLAKE2B 5422398098357271b96af670b425a18f8b4b4c961dc584813c71b76293d0ee43de5140406e2f6eb8fb582d6dcd5eeb868042ed5b0661662a5c2c55c651e091ba SHA512 0873ee2a14e77cd5ff8ab62407e116e54b4606afcbca0b83f584327e4b0f0602ca7fa5b001f1cd20fb5661963e746589a669fa1fcaf6dfecada7a6c5483c1d83
 EBUILD grass-9999.ebuild 6963 BLAKE2B cae7116cd7dbeb06f66c6f33237b4f10d5aa339d86bbf34a416c71bb82d37bacdc68a628a6b40b3ba97aa77bc586dc2bc731faf740aecbc17c84fbac0e427840 SHA512 2792f7a120049a58541433ac119f7358c07cb403c35c07ffd34a5f7d55eb67232e49ff9c2acc5d5a5ec7be5cd16b03ba97ff6e54a00536282975986ef4b0ecf3
 MISC metadata.xml 1166 BLAKE2B ae97d82be74c6782d74f256a40fbdb13590f5434f19f9980dbd51f182c687f24bd6068ab37a23958f583b299a3b4a5949526c0a9791a5620e1774db768f46f07 SHA512 c9b5cc9316da6e3fe396550bb1216f8a3376b6e6a088b6a289b0b008b0c34b0486dc357893ec19868023e800533f5e354addfca1a07d5e070dd4a556b96cd446
diff --git a/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
new file mode 100644
index 000000000000..1eb46012f6a4
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-8.0.0-mkhtml.patch
@@ -0,0 +1,316 @@
+--- a/lib/init/variables.html
++++ b/lib/init/variables.html
+@@ -234,12 +234,7 @@ PERMANENT
+   <dt>GRASS_PERL</dt>
+   <dd>[used during install process for generating man pages]<br>
+     set Perl with path.</dd>
+-
+-  <dt>GRASS_PROXY</dt>
+-  <dd>[used during addon install/reinstall process for generating man
+-    pages (download commit from GitHub API server and remote modules.xml file)]<br>
+-    set the proxy with: <tt>GRASS_PROXY="http=&lt;value&gt;,ftp=&lt;value&gt;"</tt>.</dd>
+-
++  
+   <dt>GRASS_SKIP_MAPSET_OWNER_CHECK</dt>
+   <dd>By default it is not possible to work with MAPSETs that are
+     not owned by current user. Setting this variable to any non-empty value
+--- a/scripts/g.extension/g.extension.py
++++ b/scripts/g.extension/g.extension.py
+@@ -354,6 +354,7 @@ def download_addons_paths_file(url, response_format, *args, **kwargs):
+                 ),
+             )
+         return response
++
+     except HTTPError as err:
+         if err.code == 403 and err.msg == "rate limit exceeded":
+             gscript.warning(
+@@ -2588,8 +2589,6 @@ def main():
+         proxy = urlrequest.ProxyHandler(PROXIES)
+         opener = urlrequest.build_opener(proxy)
+         urlrequest.install_opener(opener)
+-        # Required for mkhtml.py script (get addon git commit from GitHub API server)
+-        os.environ["GRASS_PROXY"] = options["proxy"]
+ 
+     # define path
+     options["prefix"] = resolve_install_prefix(
+--- a/utils/mkhtml.py
++++ b/utils/mkhtml.py
+@@ -16,7 +16,6 @@
+ #
+ #############################################################################
+ 
+-import http
+ import sys
+ import os
+ import string
+@@ -25,9 +24,6 @@ from datetime import datetime
+ import locale
+ import json
+ import pathlib
+-import shutil
+-import subprocess
+-import time
+ 
+ try:
+     # Python 2 import
+@@ -35,26 +31,11 @@ try:
+ except ImportError:
+     # Python 3 import
+     from html.parser import HTMLParser
+-
+-from six.moves.urllib import request as urlrequest
+-from six.moves.urllib.error import HTTPError, URLError
+-
+ try:
+     import urlparse
+ except ImportError:
+     import urllib.parse as urlparse
+ 
+-try:
+-    import grass.script as gs
+-except ImportError:
+-    # During compilation GRASS GIS
+-    gs = None
+-
+-HEADERS = {
+-    "User-Agent": "Mozilla/5.0",
+-}
+-HTTP_STATUS_CODES = list(http.HTTPStatus)
+-
+ if sys.version_info[0] == 2:
+     PY2 = True
+ else:
+@@ -65,24 +46,6 @@ if not PY2:
+     unicode = str
+ 
+ 
+-grass_version = os.getenv("VERSION_NUMBER", "unknown")
+-trunk_url = ""
+-addons_url = ""
+-if grass_version != "unknown":
+-    major, minor, patch = grass_version.split(".")
+-    grass_git_branch = "releasebranch_{major}_{minor}".format(
+-        major=major,
+-        minor=minor,
+-    )
+-    base_url = "https://github.com/OSGeo"
+-    trunk_url = "{base_url}/grass/tree/{branch}/".format(
+-        base_url=base_url, branch=grass_git_branch
+-    )
+-    addons_url = "{base_url}/grass-addons/tree/grass{major}/".format(
+-        base_url=base_url, major=major
+-    )
+-
+-
+ def _get_encoding():
+     encoding = locale.getdefaultlocale()[1]
+     if not encoding:
+@@ -105,151 +68,6 @@ def decode(bytes_):
+     return unicode(bytes_)
+ 
+ 
+-def urlopen(url, *args, **kwargs):
+-    """Wrapper around urlopen. Same function as 'urlopen', but with the
+-    ability to define headers.
+-    """
+-    request = urlrequest.Request(url, headers=HEADERS)
+-    return urlrequest.urlopen(request, *args, **kwargs)
+-
+-
+-def set_proxy():
+-    """Set proxy"""
+-    proxy = os.getenv("GRASS_PROXY")
+-    if proxy:
+-        proxies = {}
+-        for ptype, purl in (p.split("=") for p in proxy.split(",")):
+-            proxies[ptype] = purl
+-        urlrequest.install_opener(
+-            urlrequest.build_opener(urlrequest.ProxyHandler(proxies))
+-        )
+-
+-
+-set_proxy()
+-
+-
+-def download_git_commit(url, response_format, *args, **kwargs):
+-    """Download module/addon last commit from GitHub API
+-
+-    :param str url: url address
+-    :param str response_format: content type
+-
+-    :return urllib.request.urlopen or None response: response object or
+-                                                     None
+-    """
+-    try:
+-        response = urlopen(url, *args, **kwargs)
+-        if not response.code == 200:
+-            index = HTTP_STATUS_CODES.index(response.code)
+-            desc = HTTP_STATUS_CODES[index].description
+-            gs.fatal(
+-                _(
+-                    "Download commit from <{url}>, return status code "
+-                    "{code}, {desc}".format(
+-                        url=url,
+-                        code=response.code,
+-                        desc=desc,
+-                    ),
+-                ),
+-            )
+-        if response_format not in response.getheader("Content-Type"):
+-            gs.fatal(
+-                _(
+-                    "Wrong downloaded commit file format. "
+-                    "Check url <{url}>. Allowed file format is "
+-                    "{response_format}.".format(
+-                        url=url,
+-                        response_format=response_format,
+-                    ),
+-                ),
+-            )
+-        return response
+-    except HTTPError as err:
+-        gs.warning(
+-            _(
+-                "The download of the commit from the GitHub API "
+-                "server wasn't successful, <{}>. Commit and commit "
+-                "date will not be included in the <{}> addon html manual "
+-                "page.".format(err.msg, pgm)
+-            ),
+-        )
+-    except URLError:
+-        gs.warning(
+-            _(
+-                "Download file from <{url}>, failed. Check internet "
+-                "connection. Commit and commit date will not be included "
+-                "in the <{pgm}> addon manual page.".format(url=url, pgm=pgm)
+-            ),
+-        )
+-
+-
+-def get_last_git_commit(src_dir, is_addon, addon_path):
+-    """Get last module/addon git commit
+-
+-    :param str src_dir: module/addon source dir
+-    :param bool is_addon: True if it is addon
+-    :param str addon_path: addon path
+-
+-    :return dict git_log: dict with key commit and date, if not
+-                          possible download commit from GitHub API server
+-                          values of keys have "unknown" string
+-    """
+-    unknown = "unknown"
+-    git_log = {"commit": unknown, "date": unknown}
+-    datetime_format = "%A %b %d %H:%M:%S %Y"  # e.g. Sun Jan 16 23:09:35 2022
+-    if is_addon:
+-        grass_addons_url = (
+-            "https://api.github.com/repos/osgeo/grass-addons/commits?path={path}"
+-            "&page=1&per_page=1&sha=grass{major}".format(
+-                path=addon_path,
+-                major=major,
+-            )
+-        )  # sha=git_branch_name
+-    else:
+-        core_module_path = os.path.join(
+-            *(set(src_dir.split(os.path.sep)) ^ set(topdir.split(os.path.sep)))
+-        )
+-        grass_modules_url = (
+-            "https://api.github.com/repos/osgeo/grass/commits?path={path}"
+-            "&page=1&per_page=1&sha={branch}".format(
+-                branch=grass_git_branch,
+-                path=core_module_path,
+-            )
+-        )  # sha=git_branch_name
+-
+-    if shutil.which("git"):
+-        if os.path.exists(src_dir):
+-            git_log["date"] = time.ctime(os.path.getmtime(src_dir))
+-        stdout, stderr = subprocess.Popen(
+-            args=["git", "log", "-1", src_dir],
+-            stdout=subprocess.PIPE,
+-            stderr=subprocess.PIPE,
+-        ).communicate()
+-        stdout = decode(stdout)
+-        stderr = decode(stderr)
+-
+-        if stderr and "fatal: not a git repository" in stderr:
+-            response = download_git_commit(
+-                url=grass_addons_url if is_addon else grass_modules_url,
+-                response_format="application/json",
+-            )
+-            if response:
+-                commit = json.loads(response.read())
+-                if commit:
+-                    git_log["commit"] = commit[0]["sha"]
+-                    git_log["date"] = datetime.strptime(
+-                        commit[0]["commit"]["author"]["date"],
+-                        "%Y-%m-%dT%H:%M:%SZ",
+-                    ).strftime(datetime_format)
+-        else:
+-            if stdout:
+-                commit = stdout.splitlines()
+-                git_log["commit"] = commit[0].split(" ")[-1]
+-                commit_date = commit[2].lstrip("Date:").strip()
+-                git_log["date"] = commit_date.rsplit(" ", 1)[0]
+-    return git_log
+-
+-
+ html_page_footer_pages_path = (
+     os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+     if os.getenv("HTML_PAGE_FOOTER_PAGES_PATH")
+@@ -261,6 +79,14 @@ pgm = sys.argv[1]
+ src_file = "%s.html" % pgm
+ tmp_file = "%s.tmp.html" % pgm
+ 
++grass_version = os.getenv("VERSION_NUMBER", "unknown")
++trunk_url = ""
++addons_url = ""
++if grass_version != "unknown":
++    major, minor, patch = grass_version.split(".")
++    trunk_url = f"https://github.com/OSGeo/grass/tree/releasebranch_{major}_{minor}/"
++    addons_url = f"https://github.com/OSGeo/grass-addons/tree/grass{major}/"
++
+ header_base = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+@@ -295,9 +121,6 @@ sourcecode = string.Template(
+   <a href="${URL_SOURCE}">${PGM} source code</a>
+   (<a href="${URL_LOG}">history</a>)
+ </p>
+-<p>
+-  ${DATE_TAG}
+-</p>
+ """
+ )
+ 
+@@ -624,7 +447,6 @@ else:
+     source_url = addons_url
+     pgmdir = os.path.sep.join(curdir.split(os.path.sep)[-3:])
+ url_source = ""
+-addon_path = None
+ if os.getenv("SOURCE_URL", ""):
+     addon_path = get_addon_path()
+     if addon_path:
+@@ -655,23 +477,11 @@ if index_name:
+     else:
+         url_log = url_source.replace(tree, commits)
+ 
+-    git_commit = get_last_git_commit(
+-        src_dir=curdir,
+-        addon_path=addon_path if addon_path else None,
+-        is_addon=True if addon_path else False,
+-    )
+-    if git_commit["commit"] == "unknown":
+-        date_tag = "Accessed: {date}".format(date=git_commit["date"])
+-    else:
+-        date_tag = "Latest change: {date} in commit: {commit}".format(
+-            date=git_commit["date"], commit=git_commit["commit"]
+-        )
+     sys.stdout.write(
+         sourcecode.substitute(
+             URL_SOURCE=url_source,
+             PGM=pgm,
+             URL_LOG=url_log,
+-            DATE_TAG=date_tag,
+         )
+     )
+     sys.stdout.write(
diff --git a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild b/sci-geosciences/grass/grass-8.0.0.ebuild
index 1a9dc30646ec..598e8b0ea52d 100644
--- a/sci-geosciences/grass/grass-8.0.0_rc2.ebuild
+++ b/sci-geosciences/grass/grass-8.0.0.ebuild
@@ -85,6 +85,7 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# bug 746590
 	"${FILESDIR}/${PN}-flock.patch"
+	"${FILESDIR}/${PN}-${PV}-mkhtml.patch"
 )
 
 pkg_setup() {
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index 1be1fa086c87..c598dcfafa6d 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,5 +1,7 @@
 DIST josm-snapshot-18193.jar 16013832 BLAKE2B fba7f88f9833a4ccdd24be1a2554681dc77cd5d810ca9d5b960df350987a138d43804770f5adc61d0ee6a553e5d54753a3b9353ff344dff2a0d4d33b3221a6ed SHA512 13caae201e543468d27e44811ce3a5d774c9942b702c995a3b3cf8b893e925d2b23392537b6338f5835e2014e2e08144015a210b12a553706983ac07e172308d
 DIST josm-snapshot-18303.jar 16144437 BLAKE2B 95222aafb509af2614a43aedc7b95a466d2ea533a9148c61da4eb547642d8e7509657e680f3402add03fbea73934417a58fe74418c67df312317c4518ebb5cd8 SHA512 1c1de8b4c90445ee139c553bb889a6477065a40d8e4db1516e8f79edeb8bccbd2065789536ec697fbd430970c59584c791e886c7a02c6061fb57089db6946e02
+DIST josm-snapshot-18360.jar 16186460 BLAKE2B ee973137823d0084b11c35f3e70435e6f88659009c822c2a24c90d1130dd04cc3879913dac587771b179529a1b1dd53d1e2ff6e4f10284d2ef6d7710388fe40e SHA512 e12c3ed6af206bb30475e301e5e674ee613062fc51a3731f778dfdcff7d6dcd2610b6d301e6085d92e1f3074bb1f53e22f61ab3953797c47188fff7d886699e3
 EBUILD josm-bin-18193.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
 EBUILD josm-bin-18303.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+EBUILD josm-bin-18360.ebuild 904 BLAKE2B 9ed52ecb81273d828594dc0d0ee3cfa286c08fecfaf3a1605a8de715e9d45eaa7da69a998860bf511992cac1225deacb3b8f3733209dbe450cc4d6dc92af3d38 SHA512 f3fa3232bff0f2ad95afe62f0979e11b38010dd9a27765ec71c1002f32ecae3d0c13feb74b74b682a1fea84da44bb915841057bd8305a7a6c9c742eae3eab197
 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d
diff --git a/sci-geosciences/josm-bin/josm-bin-18360.ebuild b/sci-geosciences/josm-bin/josm-bin-18360.ebuild
new file mode 100644
index 000000000000..3a5ff50d232a
--- /dev/null
+++ b/sci-geosciences/josm-bin/josm-bin-18360.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 08c25a25c80d..6e581371d3de 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,7 +1,4 @@
-AUX mapserver-7.6.2-proj8.patch 544 BLAKE2B 607130bce382bfb4198d8ef4f45048d1091d842cab29730f85149e7250b9659ebe93ac47b79e2addddbfc480d11c5a30d5f07b91479dedcfc9678d7a69404fb1 SHA512 5b2e2a33027c23e812fbd4c358320980886fd16ea1a127bf8945dff396a1038b79f1a139f304c16469117794d227bf7ce0863caaca85a3be518f3807fcb8ce0d
 AUX mapserver-oracle21.patch 636 BLAKE2B 4e102514dab3e51343b3021c74f2bb49cdd5406f4d2f800fa1a01c0825a8dbc78ee2064ba006612a430c7295cd81e98efd2ca3b603958d9a67d0fb2a28b700b2 SHA512 84e4f9128bbda24ae7488fbb5637879a37da098976f33c6c53e37e2950532e4d9fb1e3bf3b327e320fd82f0eb6acfd5528e009fc28ae945e1ab4d92aed314c86
-DIST mapserver-7.6.2.tar.gz 2715806 BLAKE2B 230e4f52c526d72ac7f46cfe4ef8e547d7ae74c01d75637ad301d4e69b90d301f02ecb8fe7d838c9ee15c022ed7980aa2f9236e08a6daedafb65a2499a9473e5 SHA512 842c2cf891df6c8dc630fac5419caa31701d732a748264f7d5b6cceaf192fa420f1863fdd18cc791a417dcdc800fed5c3e5c43ac688142f32a1a6edda4c9f791
 DIST mapserver-7.6.4.tar.gz 2718735 BLAKE2B 4d9fc6d215a55af32e0cc125f6119e0e477ddc5a5b2dbea6df1cc7e1ffaf6319f3a855329749aa07f1bca88e79a71c67cb2e8bd62e30bd60e44ecc1b8283d4ce SHA512 ccca87b650df3c1784ba82ca4a58960585d72fb4004fcea43c0dcabf03b9617ba51870bc63dbb2238a7eeb8d4337b6ff152587150912a74eeaf4a3e3d2d584ce
-EBUILD mapserver-7.6.2-r1.ebuild 7175 BLAKE2B 3184bad696c9d1449303c4b67e8619b8c93279ea7e8f542b816aa6598d2a40ac2937cf6b051292068ecf15a4356d07d68e4540549f82096c23c2c681a89bae2d SHA512 f9501e6dcc58d720aadc1588e27806219ab7b46eaf6f69af40f45a3460f7b17a4467d81b17fef50895a903a79828abdc9b4d96cd9b6e30a08663f159c67ddf50
-EBUILD mapserver-7.6.4.ebuild 7146 BLAKE2B 27a990a1cc1fab13d17eb30958f2ad36d80a978d32dd9eb51c0e4d83a12522a035e95d21227f6ce2a08a8c33798aec385c9f413783d5f7f8b219870c086d6457 SHA512 c53929f5abb435a47d93007955d0baeed044ccef31032d5f7d498e8e9a5f34d00c959d4f8f20f8e1047a8e27b5b2eb38ab68e18352048e4065c476fd21a02eee
+EBUILD mapserver-7.6.4.ebuild 7146 BLAKE2B c3a9628c28010f5904f91e855c1ba6581c6f0aa78d68ec85c7132609659bbfa6695d3624f3c3ce06b354a3baf969aab477b4f440e0541096882618c390dc6c20 SHA512 4fca8950718e2d888c1886ffa6310b6c263893964f9232d69e0d5ffd08b1947d8eda31433bf1d7ef078d1758aa15121f2c22fef1c5ea7f961f203a515e791423
 MISC metadata.xml 497 BLAKE2B b0517aa597d42116849e9f7ecdbf2cb2b479f5c57c7f0fe413dab870555abe82ac5dc07c624cabf769bfd2332300f2860e40cfd1ed375bafa109a347b670232b SHA512 3d58797fb05f9c45359e9ac2302a2432e9b61d300f1c01b27ef562da860311e777b7675b0f162eb2c490cdea0440c9f7b9a3323a89feef01589385ec30a5b64d
diff --git a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch b/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
deleted file mode 100644
index 24a5066c01c9..000000000000
--- a/sci-geosciences/mapserver/files/mapserver-7.6.2-proj8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/MapServer/MapServer/issues/6249
-
-From e56a020789c024f985c61e49d66f3eb92d350232 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 8 Mar 2021 15:19:50 +0100
-Subject: [PATCH] FindProj.cmake: allow finding PROJ 8 that has no longer
- proj_api.h (fixes #6249)
-
---- a/cmake/FindProj.cmake
-+++ b/cmake/FindProj.cmake
-@@ -6,7 +6,7 @@
- #    PROJ_LIBRARY
- 
- 
--FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
-+FIND_PATH(PROJ_INCLUDE_DIR NAMES proj.h proj_api.h)
- 
- FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i)
- 
diff --git a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild b/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
deleted file mode 100644
index a9f1ea99c8ad..000000000000
--- a/sci-geosciences/mapserver/mapserver-7.6.2-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Variables for the miscellaneous bindings we provide
-PHP_EXT_OPTIONAL_USE="php"
-PHP_EXT_NAME="php_mapscriptng"
-PHP_EXT_SKIP_PHPIZE="yes"
-PHP_EXT_SKIP_PATCHES="yes"
-
-USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-WEBAPP_MANUAL_SLOT=yes
-WEBAPP_OPTIONAL=yes
-
-inherit cmake depend.apache perl-functions php-ext-source-r3 python-r1 webapp
-
-DESCRIPTION="Development environment for building spatially enabled webapps"
-HOMEPAGE="https://mapserver.org/"
-SRC_URI="https://download.osgeo.org/mapserver/${P}.tar.gz"
-
-LICENSE="Boost-1.0 BSD BSD-2 ISC MIT tcltk"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-# NOTE: opengl removed for now as no support for it in upstream CMake
-IUSE="apache bidi cairo geos mysql oracle perl php postgis python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests:
-# Included tests (tests/*) are seriously outdated
-# Upstream's main test suite (msautotest/*) is not in the release tarball,
-# and upstream sets 'export-ignore' for that directory.
-#
-# The eclasses used normally try to run test suites themselves,
-# or skip if nothing was found.
-# However, because of the php-ext-* eclass usage, this fails and would
-# cause errors running non-existent tests, so we have to restrict here.
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/expat-2.2.8
-	dev-libs/libxml2:2=
-	dev-libs/libxslt[crypt]
-	>=dev-libs/protobuf-c-1.3.2:=
-	>=media-libs/freetype-2.9.1-r3
-	>=media-libs/gd-2.0.12:=[truetype,jpeg,png,zlib]
-	>=media-libs/giflib-5.2.1:=
-	>=media-libs/libpng-1.6.37:=
-	>=net-misc/curl-7.69.1
-	>=sci-libs/gdal-3.0.4:=[oracle?]
-	>=sci-libs/proj-6.2.1:=
-	virtual/jpeg
-	virtual/libiconv
-	>=x11-libs/agg-2.5-r3
-	apache? (
-		app-admin/webapp-config
-		dev-libs/fcgi
-	)
-	bidi? (
-		dev-libs/fribidi
-		media-libs/harfbuzz:=
-	)
-	cairo? ( x11-libs/cairo )
-	geos? ( sci-libs/geos )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oracle? ( dev-db/oracle-instantclient:=	)
-	perl? ( dev-lang/perl:= )
-	postgis? (
-		dev-db/postgis
-		dev-db/postgresql:=
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	perl? ( >=dev-lang/swig-4.0 )
-	php? ( >=dev-lang/swig-4.0 )
-	python? (
-		>=dev-lang/swig-4.0
-		>=dev-python/setuptools-44.1.0
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-proj8.patch
-	"${FILESDIR}"/${PN}-oracle21.patch
-)
-
-want_apache2 apache
-
-pkg_setup() {
-	use apache && webapp_pkg_setup
-	use perl && perl_set_version
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	use php && php-ext-source-r3_src_prepare
-	use python && python_copy_sources
-}
-
-_generate_cmake_args() {
-	# Provides a simple, bare config for bindings to build upon
-	# Need WITH_WMS=ON or build fails
-	local args=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CAIRO=OFF"
-		"-DWITH_FCGI=OFF"
-		"-DWITH_FRIBIDI=OFF"
-		"-DWITH_GEOS=OFF"
-		"-DWITH_GIF=OFF"
-		"-DWITH_HARFBUZZ=OFF"
-		"-DWITH_ICONV=OFF"
-		"-DWITH_PROTOBUFC=OFF"
-		"-DWITH_POSTGIS=OFF"
-		"-DWITH_WMS=ON"
-		"-DWITH_WCS=OFF"
-		"-DWITH_WFS=OFF"
-	)
-
-	echo "${args[@]}"
-}
-
-src_configure() {
-	# NOTE: We could make this based on _generate_cmake_args, but
-	# then we wouldn't be as-explicit about what is enabled/not,
-	# and reliant on defaults not changing.
-	# Readability and maintainability is better this way.
-	local mycmakeargs=(
-		"-DCMAKE_SKIP_RPATH=ON"
-		"-DINSTALL_LIB_DIR=/usr/$(get_libdir)"
-		"-DWITH_CLIENT_WMS=ON"
-		"-DWITH_CLIENT_WFS=ON"
-		"-DWITH_CURL=ON"
-		"-DWITH_GIF=ON"
-		"-DWITH_ICONV=ON"
-		"-DWITH_KML=ON"
-		"-DWITH_LIBXML2=ON"
-		"-DWITH_PHPNG=OFF"
-		"-DWITH_PROTOBUFC=ON"
-		"-DWITH_SOS=ON"
-		"-DWITH_WMS=ON"
-		"-DWITH_WFS=ON"
-		"-DWITH_WCS=ON"
-		"-DWITH_XMLMAPFILE=ON"
-		"-DWITH_APACHE_MODULE=$(usex apache ON OFF)"
-		"-DWITH_CAIRO=$(usex cairo ON OFF)"
-		"-DWITH_FCGI=$(usex apache ON OFF)"
-		"-DWITH_GEOS=$(usex geos ON OFF)"
-		"-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)"
-		"-DWITH_MYSQL=$(usex mysql ON OFF)"
-		"-DWITH_FRIBIDI=$(usex bidi ON OFF)"
-		"-DWITH_HARFBUZZ=$(usex bidi ON OFF)"
-		"-DWITH_POSTGIS=$(usex postgis ON OFF)"
-		"-DWITH_PERL=$(usex perl ON OFF)"
-	)
-
-	use perl && mycmakeargs+=( "-DCUSTOM_PERL_SITE_ARCH_DIR=$(perl_get_raw_vendorlib)" )
-
-	# Configure the standard build first
-	cmake_src_configure
-
-	# Minimal build for bindings
-	# Note that we use _generate_cmake_args to get a clean config each time, then add
-	# in options as appropriate. Otherwise we'd get contamination between bindings.
-	if use python ; then
-		mycmakeargs=(
-			$(_generate_cmake_args)
-			"-DWITH_PYTHON=ON"
-		)
-
-		python_foreach_impl cmake_src_configure
-		python_foreach_impl python_optimize
-	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Take a blank config each time
-			# Add in only *this* slot's PHP includes dir, etc
-			mycmakeargs=(
-				$(_generate_cmake_args)
-				"-DWITH_PHPNG=ON"
-				"-DPHP_CONFIG_EXECUTABLE=${PHPCONFIG}"
-				"-DPHP_INCLUDES=${PHPPREFIX}"
-			)
-
-			BUILD_DIR="${S}/php${slot}" cmake_src_configure
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python ; then
-		python_foreach_impl cmake_src_compile
-	fi
-
-	if use php ; then
-		local slot=
-		for slot in $(php_get_slots) ; do
-			# Switch to the slot's build dir
-			php_init_slot_env "${slot}"
-
-			# Force cmake to build in it
-			BUILD_DIR="${S}/php${slot}" cmake_src_compile
-
-			# Return to where we left off, in case we add more
-			# to this phase.
-			cd "${S}" || die
-		done
-	fi
-}
-
-src_install() {
-	# Needs to be first
-	use apache && webapp_src_preinst
-
-	if use python ; then
-		python_foreach_impl cmake_src_install
-		python_foreach_impl python_optimize
-	fi
-
-	if use php ; then
-		php-ext-source-r3_createinifiles
-
-		local slot=
-		for slot in $(php_get_slots) ; do
-			php_init_slot_env "${slot}"
-
-			BUILD_DIR="${S}/php${slot}" cmake_src_install
-
-			cd "${S}" || die
-		done
-	fi
-
-	# Install this last because this build is the most "fully-featured"
-	cmake_src_install
-
-	if use apache ; then
-		# We need a mapserver symlink available in cgi-bin
-		dosym ../../../../../../../usr/bin/mapserv /usr/share/webapps/${PN}/${PV}/hostroot/cgi-bin/mapserv
-		webapp_src_install
-	fi
-}
-
-pkg_preinst() {
-	# We need to cache the value here of HAD_PHP because we want the
-	# original package version, not the result of us installing a new one
-	HAD_PHP=
-	has_version 'sci-geosciences/mapserver[php]' && HAD_PHP=1
-}
-
-pkg_postinst() {
-	use apache && webapp_pkg_postinst
-
-	# Let upgrading (from a pre-rewrite version) users know that the PHP module changed
-	local replacing_version=
-	for replacing_version in ${REPLACING_VERSIONS} ; do
-		if ver_test "7.6.0" -gt "${replacing_version}" ; then
-			if use php && [[ ${HAD_PHP} -eq 1 ]] ; then
-				elog "Note that MapServer has deprecated the old PHP extension"
-				elog "You can read more at: "
-				elog "URL: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-2-to-7-4-migration"
-				elog "This may involve porting some of your PHP scripts to use the new module."
-			fi
-
-			# Only show the message once
-			break
-		fi
-	done
-}
-
-pkg_prerm() {
-	use apache && webapp_pkg_prerm
-}
diff --git a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
index 3c1b5cb396a8..3dabd26adb30 100644
--- a/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
+++ b/sci-geosciences/mapserver/mapserver-7.6.4.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_SKIP_PHPIZE="yes"
 PHP_EXT_SKIP_PATCHES="yes"
 
 USE_PHP="php7-3 php7-4"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 WEBAPP_MANUAL_SLOT=yes
 WEBAPP_OPTIONAL=yes
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /sci-geosciences
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)