gentoo resync : 03.11.2021

12 files changed, 83 insertions, 12 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 246d3a7533aa..f48656002f5c 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/josm-bin/Manifest b/sci-geosciences/josm-bin/Manifest
index b94e9b6238d7..1be1fa086c87 100644
--- a/sci-geosciences/josm-bin/Manifest
+++ b/sci-geosciences/josm-bin/Manifest
@@ -1,5 +1,5 @@
-DIST josm-snapshot-18191.jar 16013739 BLAKE2B 69ebf2e44d0b92b928adb3c17e5c99fd74ee305fe7d6888147a95bc62b5f33a0d4a6ff7af13e9781d8ffda36e04e237089439b00de4f329f1500d71cf8de88ff SHA512 1c1d04fe21e379004eb31677887550241365f6bf306286c3cd655044dfadd36d5cea5d54a77c09bc6cb3c648c3fb927f75d800776d9d92b85c1bd318621a4479
 DIST josm-snapshot-18193.jar 16013832 BLAKE2B fba7f88f9833a4ccdd24be1a2554681dc77cd5d810ca9d5b960df350987a138d43804770f5adc61d0ee6a553e5d54753a3b9353ff344dff2a0d4d33b3221a6ed SHA512 13caae201e543468d27e44811ce3a5d774c9942b702c995a3b3cf8b893e925d2b23392537b6338f5835e2014e2e08144015a210b12a553706983ac07e172308d
-EBUILD josm-bin-18191.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+DIST josm-snapshot-18303.jar 16144437 BLAKE2B 95222aafb509af2614a43aedc7b95a466d2ea533a9148c61da4eb547642d8e7509657e680f3402add03fbea73934417a58fe74418c67df312317c4518ebb5cd8 SHA512 1c1de8b4c90445ee139c553bb889a6477065a40d8e4db1516e8f79edeb8bccbd2065789536ec697fbd430970c59584c791e886c7a02c6061fb57089db6946e02
 EBUILD josm-bin-18193.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
+EBUILD josm-bin-18303.ebuild 904 BLAKE2B ec7b93744ca9161baa8099a4404e98337b585de48d8b09d93edcf4100279d9a570599572bb8765cac701ae058214242b225f0c552d502fff00db30752e72e33c SHA512 08912f37e7287a51808ac814207a79af833fa6f851bfb7df2a4e35af37637aed7f28247ad3361589e3c43635ddcd60cdbbd2afe0ee82ff50b271d84c8e0f5e3a
 MISC metadata.xml 544 BLAKE2B 7a1610f8796ea0ea5772fccae64a2a91017c8701f847b03f61624240caca1b655b7865d649790b15b43fc565f5c26dc196c45053207c7caeae2601ec5f290840 SHA512 74c714e664fb2833868093bae98511b5b99955cc862c687bef981280fe86b3663acf8c093d34daa3b30809f1a57910797daf3b2cc79bca50e218213780612e0d
diff --git a/sci-geosciences/josm-bin/josm-bin-18191.ebuild b/sci-geosciences/josm-bin/josm-bin-18303.ebuild
index d042ecaab171..d042ecaab171 100644
--- a/sci-geosciences/josm-bin/josm-bin-18191.ebuild
+++ b/sci-geosciences/josm-bin/josm-bin-18303.ebuild
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 5a2fbc0fc1b6..f73d75809976 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,5 +1,8 @@
 AUX opencpn-5.0.0-cmake.patch 3076 BLAKE2B 09a42b94abf3d8674ba8c82ba0ad2e001c40354646237095d34fd24c712f4ff915e5d5a26bf222fab9a3f8c522dd4b06d4daeaa8fa0adab8a7665d6ae703094f SHA512 c2ceba554e228649529e104df79854873b021d661c8879b2b1c1137750b8c23aa793d3c56840a13fe1e7e73776180f5267af9a5a4c0b1c8d9b4e99804483ac85
+AUX opencpn-5.2.4-cmake.patch 591 BLAKE2B f91412ce753bc8cd1806bb5b0e64a6ef924ea93be42fb15337a4e0d2d723b3329ddfd2c6adc5694b2442a205f1827e2081a087510621e74209b5cfd200c189b6 SHA512 c9b4da53fab5007c06461236bee1952d64d685626d7c81f977f219c8aef85359204e2a396def663c2e58c3fb9ed4e07f2bced141ffe1a4d6e07901b6c8da4183
 DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
+DIST opencpn-5.2.4.tar.gz 81226481 BLAKE2B 7c5bb1157e94d3271bce899740cdf6d9d5dc17c4406b3020fa8a91ae728ca3c0ddab799affa219b833df86e547de91b2e6ccd11fa57fff056550a440d9968fad SHA512 13543272fe4c68b911c42fdc19f0bd7842809edc8e91d73899030f70668e78c448474541a5742ad675d6e2b361240ca1a5d603b163f8b5107539720442ee19a0
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
 EBUILD opencpn-5.0.0.ebuild 1293 BLAKE2B 2a394e596e4bd0be608f3c291ebdf9870a432662903f08b869995ec0277dc05c761ed5f1dc874c4752e9a22074e4c1cfa56981aee4efa6635b47b63804e96f3d SHA512 f5505b80f37846fcf77985b6f8504aa80ae29c516ea243e10b423f0283c1ae9105941432567f8af90b089029450112404626da0b6006e41548db4892664d1e49
+EBUILD opencpn-5.2.4.ebuild 1261 BLAKE2B 79f449cf580fc8957672e50657fd6779dd88d4dfa40cd859c712562ac37d561b89a955eb06acc7e190a92d612da088517d880aed678fc7216ea44cd7177367b1 SHA512 f2f3f897fb34cc4dc52ca65bc31809533fcd3b19299de52365c45acd13ab5f517a8fe65b8a4f5cd86777298ad8fdf8d27e77c0a61f20714e12296996626375e2
 MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72
diff --git a/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch
new file mode 100644
index 000000000000..4c2ea09ae159
--- /dev/null
+++ b/sci-geosciences/opencpn/files/opencpn-5.2.4-cmake.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2021-11-02 01:45:56.488999411 -1000
++++ b/CMakeLists.txt	2021-11-02 01:51:53.343219957 -1000
+@@ -756,9 +756,9 @@
+   # looked for them. This is a nasty fix which might fail miserably. Assumption:
+   # All builds using GTK uses unicode and wxWidgets 3.0
+   if (GTK3_FOUND)
+-    list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0")
++    list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_aui-3.0-gtk3")
+     if (OPENGL_FOUND)
+-      list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0")
++      list(APPEND wxWidgets_LIBRARIES "-lwx_gtk3u_gl-3.0-gtk3")
+     endif ()
+   endif ()
+ 
diff --git a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
new file mode 100644
index 000000000000..6688d1f0e0d3
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit wxwidgets xdg cmake
+
+DOC_VERSION="4.8.2.0"
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="https://opencpn.org/"
+SRC_URI="
+	https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )"
+S="${WORKDIR}/OpenCPN-${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc lzma opengl"
+
+RDEPEND="
+	app-arch/bzip2
+	lzma? ( app-arch/xz-utils )
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	media-libs/portaudio
+	net-misc/curl
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+	x11-libs/gtk+:3
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+	use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. )
+
+	setup-wxwidgets
+	local mycmakeargs=(
+		-DUSE_S57=ON
+		-DUSE_GARMINHOST=ON
+		-DBUNDLE_GSHHS=CRUDE
+		-DBUNDLE_TCDATA=ON
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use doc; then
+		einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
+	fi
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index a6197503aa99..de363711fb96 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -8,9 +8,9 @@ DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a11
 DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
 DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
 EBUILD qgis-3.18.3.ebuild 5334 BLAKE2B d913ed8bc2ebb13f0d3dc61a6a50d1e8895efc557eb4951649591c9e9428f4121136826ea24a017d6c40e154fb21a61de32526309e51a765ddf46774272c7ed0 SHA512 9ab03ed7a1cd3c83392016c0f61ab7f7d38f661a9fbbd3673153dd7ec15e3335b3b0eca98708df3d21bd93a7a7a5602ad12cb8e1901efca0b2c32ce9ac7202f6
-EBUILD qgis-3.20.0-r1.ebuild 5360 BLAKE2B e994dabd1c8cd67cfb0626397c00f383ee5ddab639724a4d9998678e2c73cf07e5065578f8f7b75ceeea777ebf4177e7005a2f092ed9051192736496b55ec825 SHA512 21a5645d6bcf9466f37cf88681d6d75f35b375ae76ec246588a8b206f1fcc4060d43b8988b6eb5c69f92e2ed45a0b7db73ba4e0409b4473befe8a6fdf1c73db2
-EBUILD qgis-3.20.2.ebuild 5406 BLAKE2B 18e5609b1263927d2b1f0f1ed8712dd8ad719267ad595206f95e1774d398f42b09521ae96b69bce0839693eca54777b92f33280c250330a95cd9c7472c1f87c1 SHA512 debe458992dee9469651793e442b1452504fa30442c9e82c2b52cf1c6702e47a0545930a2c97225422ec171695652f665015f26096efc94fd761f188a833a499
-EBUILD qgis-3.20.3.ebuild 5406 BLAKE2B 18e5609b1263927d2b1f0f1ed8712dd8ad719267ad595206f95e1774d398f42b09521ae96b69bce0839693eca54777b92f33280c250330a95cd9c7472c1f87c1 SHA512 debe458992dee9469651793e442b1452504fa30442c9e82c2b52cf1c6702e47a0545930a2c97225422ec171695652f665015f26096efc94fd761f188a833a499
-EBUILD qgis-3.22.0-r3.ebuild 5444 BLAKE2B 265f1afa3102f6e604727cf7f600642cab69aff029f19de09d8d87fff3d925b02c5a15e9582c5f8e7f71d70f31e77ed947e4a734f5dfedfd88f1b710ca9c9ae9 SHA512 d78354293860d8ba06446e9207fe0b1ca9610ddd4025a20e42cc60aa333e544d4e0d0b289b6f4634ec70effa752089aaec8a9f73124990d952db74ca3c89ed38
-EBUILD qgis-9999.ebuild 5444 BLAKE2B 265f1afa3102f6e604727cf7f600642cab69aff029f19de09d8d87fff3d925b02c5a15e9582c5f8e7f71d70f31e77ed947e4a734f5dfedfd88f1b710ca9c9ae9 SHA512 d78354293860d8ba06446e9207fe0b1ca9610ddd4025a20e42cc60aa333e544d4e0d0b289b6f4634ec70effa752089aaec8a9f73124990d952db74ca3c89ed38
+EBUILD qgis-3.20.0-r2.ebuild 5337 BLAKE2B a750abb8978664c2726c145bab595b8a0e2a5437d5321fd1c35384ef5d11a77aa6cd124df4c19abc848d01f09ffefaaaef67bb4ba122376cee4f4e557da616b7 SHA512 f2c3b8650538b3806b4c5c1cd396a285ea11785a544a938d3e542b3620d5ee9476d3298876277a730d66ee4fb4bbf4663387a2d4a913047aeffa6d5dcda72959
+EBUILD qgis-3.20.2-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de
+EBUILD qgis-3.20.3-r1.ebuild 5383 BLAKE2B 8cadb34d9c5701998ba2552b1e53c9a5bb03b56d65004b400964425cd30f81e886e66ad985b2afcff93af40b69e97895a03f5fb0f69cb1f92f0a83093ec97852 SHA512 cc7b8e34986dd40cc8b111edff2547c88743cc6263ef4139e604c49c38482fb6ad5c3f14d2d739b2949548257b407f837f621e2084a3bc62830735dae4b0e9de
+EBUILD qgis-3.22.0-r4.ebuild 5421 BLAKE2B 6f5602d442d9835a423f4be625e0bfcf326697dee5cca65f52ed4b9608e68bdbdc14e1cc041a9d4f4210f42bc26d79e202359c0a4c429b9bc4fa7a051bfcfef8 SHA512 2a97cd87be7107af9ff9dcd33ba4b8186895d976eaaaff0e1ba86dc1f77b1827e96d8d3f84dec339e07f329fc1c65c1b6f5543cb9664667a4399ea12f91f9ac4
+EBUILD qgis-9999.ebuild 5421 BLAKE2B 6f5602d442d9835a423f4be625e0bfcf326697dee5cca65f52ed4b9608e68bdbdc14e1cc041a9d4f4210f42bc26d79e202359c0a4c429b9bc4fa7a051bfcfef8 SHA512 2a97cd87be7107af9ff9dcd33ba4b8186895d976eaaaff0e1ba86dc1f77b1827e96d8d3f84dec339e07f329fc1c65c1b6f5543cb9664667a4399ea12f91f9ac4
 MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
diff --git a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
index 5c5913d97ad0..4cf3bfb45873 100644
--- a/sci-geosciences/qgis/qgis-3.20.0-r1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.0-r2.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	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
diff --git a/sci-geosciences/qgis/qgis-3.20.2.ebuild b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
index c9e0381c5f2e..29d2851b45d4 100644
--- a/sci-geosciences/qgis/qgis-3.20.2.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.2-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	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
diff --git a/sci-geosciences/qgis/qgis-3.20.3.ebuild b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
index c9e0381c5f2e..29d2851b45d4 100644
--- a/sci-geosciences/qgis/qgis-3.20.3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.20.3-r1.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	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
diff --git a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
index bb5286e0d880..c8150cce4fe3 100644
--- a/sci-geosciences/qgis/qgis-3.22.0-r3.ebuild
+++ b/sci-geosciences/qgis/qgis-3.22.0-r4.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	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
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index bb5286e0d880..c8150cce4fe3 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -43,7 +43,6 @@ COMMON_DEPEND="
 	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