summaryrefslogtreecommitdiff
path: root/sci-geosciences
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
committerV3n3RiX <venerix@koprulu.sector>2021-12-05 02:47:11 +0000
commit2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch)
treec8af0fd04194aed03cf067d44e53c7edd3e9ab84 /sci-geosciences
parente9d044d4b9b71200a96adfa280848858c0f468c9 (diff)
gentoo resync : 05.12.2021
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/Manifest.gzbin11581 -> 11246 bytes
-rw-r--r--sci-geosciences/gpxsee/Manifest2
-rw-r--r--sci-geosciences/gpxsee/gpxsee-9.12.ebuild55
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/Manifest3
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild23
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml5
-rw-r--r--sci-geosciences/opencpn-plugin-aisradar/Manifest4
-rw-r--r--sci-geosciences/opencpn-plugin-aisradar/metadata.xml (renamed from sci-geosciences/opencpn-plugin-br24radar/metadata.xml)2
-rw-r--r--sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild (renamed from sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild)16
-rw-r--r--sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild35
-rw-r--r--sci-geosciences/opencpn-plugin-br24radar/Manifest4
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/Manifest6
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild (renamed from sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild)17
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild17
-rw-r--r--sci-geosciences/opencpn-plugin-dr/Manifest5
-rw-r--r--sci-geosciences/opencpn-plugin-dr/files/cmake.patch41
-rw-r--r--sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild (renamed from sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild)20
-rw-r--r--sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild10
-rw-r--r--sci-geosciences/opencpn-plugin-findit/Manifest6
-rw-r--r--sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild (renamed from sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild)10
-rw-r--r--sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild10
-rw-r--r--sci-geosciences/opencpn-plugin-iacfleet/Manifest6
-rw-r--r--sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1.ebuild (renamed from sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild)4
-rw-r--r--sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild4
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/Manifest6
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild (renamed from sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild)4
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild4
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/Manifest8
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch57
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild (renamed from sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild)28
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild28
-rw-r--r--sci-geosciences/opencpn-plugins-meta/Manifest2
-rw-r--r--sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r6.ebuild (renamed from sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild)5
-rw-r--r--sci-geosciences/opencpn/Manifest5
-rw-r--r--sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch86
-rw-r--r--sci-geosciences/opencpn/opencpn-5.0.0.ebuild60
-rw-r--r--sci-geosciences/opencpn/opencpn-5.2.4.ebuild4
-rw-r--r--sci-geosciences/qgis/Manifest4
-rw-r--r--sci-geosciences/qgis/qgis-3.22.1.ebuild205
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild4
-rw-r--r--sci-geosciences/swmm/Manifest4
-rw-r--r--sci-geosciences/swmm/files/swmm-5.0.022-QA.patch14
-rw-r--r--sci-geosciences/swmm/metadata.xml5
-rw-r--r--sci-geosciences/swmm/swmm-5.0.022.ebuild52
-rw-r--r--sci-geosciences/viking/Manifest5
-rw-r--r--sci-geosciences/viking/files/viking-1.9-geocache.patch88
-rw-r--r--sci-geosciences/viking/viking-1.10.ebuild100
-rw-r--r--sci-geosciences/viking/viking-1.9.ebuild100
48 files changed, 816 insertions, 367 deletions
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 0ce3b85433f9..a81b9c2f581a 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
Binary files differ
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 50a9805cee78..4f1ed9cd393e 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -2,7 +2,9 @@ AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434a
DIST gpxsee-9.0.tar.gz 8538085 BLAKE2B 4c8cdabba6082689e98561eccb399bd2e8c4fdce6f229dae2c4a5576e0adbd05380538c906654d7400f5537d370d368193efdb380100cdb79a3805fa9e80f12c SHA512 3eeaaadd48e838dfa56a499ff44cee681f02c6e3e34ec500c70024926af854966f0ddb81b5b88c3f1741350eed3207d864a83daff93009f3f6a72b9fb69357d8
DIST gpxsee-9.10.tar.gz 4837219 BLAKE2B 529a47cafc02d563abf3cc8b80a06ec2b850c935a0e4e0e6933028c6e7d630e25b78db453130efe7e062b6d8bfa288bb22f58aff3f27b7d51025132894a6db27 SHA512 ab7c47e6ba583ca008867d9586320204a2d862ad1d6c91ad0b6e8dfde5854c0c6956be597938aa9077183a48d9c00ce1b232ff87f36b9a4cd58ad096b1fd1342
DIST gpxsee-9.11.tar.gz 4835356 BLAKE2B a1306471e5fe71db76f67a80a22fc7dc8b52b3fb72f108cd3bb7babfb144228be469c0612d320aabbc39dc559c055eae5d0c54912df1d4798ebfc300505ed7cb SHA512 f6cc924b448932aa17c817d909320355f0f8b4b97c86b2ecafc3854f7d2d11541885e3b1402efe473f99b7d5da1909c9c26b3238a4815c325acd57059b100d3e
+DIST gpxsee-9.12.tar.gz 4977257 BLAKE2B 30060478cef417f8d9fe87878ecc1338336e48906eaa3eb7735d086b47fa8a7cc2154e8719e0f92109d4e4f881d90f6ebe1f6088a9684fdde42672c4eef9d664 SHA512 47c414f5a6fd61b93119820b24f49a73575a260c986e3403776322f15ff514de82a23444369ef4803fa82c512f9af49f5acc28e719633173c7961f2d34b7cd4b
EBUILD gpxsee-9.0.ebuild 1120 BLAKE2B a08d58f04255fd34faa739551b640756018ca8ad9f9036192d373c64b34020790a441550142d13fbc4bd682eaa8ec24098c82dfe6c8c8fd6a9f826f519038e71 SHA512 1b9f155067f8d47fdd6d450147f1ae760146ee0aa65acd12a37e86958ff8c620ac5c0c226c24e3b9170a54c401e2ca47e87cd6b17de24e63da0c77afe274ffff
EBUILD gpxsee-9.10.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
EBUILD gpxsee-9.11.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
+EBUILD gpxsee-9.12.ebuild 1122 BLAKE2B 955e43ef2360e4b9e7beb5bb0a9fd2ba8b3f6d602b9f61bb9e25ccf321077012c4f202aa35980a3215015d3589846c89b1d0976c9100099fcea7fa59b8941f7c SHA512 d3f1381937115969adb6d1eede760b0bbc518da84b6b777a6aa57f66b5333d1dccbd7fd2bb5c2dba991286c5cbc95dd2dfd7a19bafa7361644bf55f74f5cebcf
MISC metadata.xml 453 BLAKE2B e7f32299798b2f8b3d91dcdf0c4c024e8296a3cfa0f0a35acfc52475b4b2df0f276b6a9e9718a2f3593dde7fd9ee11afc06c601235db7e272ec552b072bd139c SHA512 c66111588383b1363eb07d3f1d9efd2adad37ee6bac9d159847f642b2ed864e1bb26db8f67fc94e9a5ca4d28623e8dc8d15395132e46d1e4fca17cbf6986dc35
diff --git a/sci-geosciences/gpxsee/gpxsee-9.12.ebuild b/sci-geosciences/gpxsee/gpxsee-9.12.ebuild
new file mode 100644
index 000000000000..01738be156d9
--- /dev/null
+++ b/sci-geosciences/gpxsee/gpxsee-9.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 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 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/qtwidgets:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore: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/harmonics-dwf-free-noncomm/Manifest b/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
deleted file mode 100644
index c9bb8f578eee..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST harmonics-dwf-20111230-nonfree.tar.bz2 308689 BLAKE2B f268116cb49b3fe4bcdf7f714a0e4f8af17021e05c028abe2b94c3ac483c9cc1a309bd07e3b38d4e4ad186d9bd19e66e6b1c94526601fbbedb285a9bcdab0780 SHA512 53da55c37dfa1e5f9be1c46cd53d80208c2bf5a2af6e53e26c0dfe097d85399f503c8bed389d368e9183ba1b5506a9debdc3f2a633c6bfc6b5b188f5800ca36a
-EBUILD harmonics-dwf-free-noncomm-20111230-r1.ebuild 572 BLAKE2B 2b5b4c68ef38ef9a52b43366bf9390d5ab8553ec45ca39687d9c3069dd9d69175730d6a243ace58e77edec852dd7923463622a86e29ce32217d1b20c60bc8305 SHA512 9abae69c9468db4250d05c210e03a1c7cf76f1cc75777a9a63471620254565ce7bc7d34857d043289c549bdf11e161fbeae59393b70e63fc5e813544ae1d6f8e
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
deleted file mode 100644
index 4a08e6e7970e..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/-free-noncomm-/-}"
-DESCRIPTION="Tidal harmonics database for libtcd"
-HOMEPAGE="http://www.flaterco.com/xtide/"
-# Even though the SRC_URI is labeled nonfree, the data is actually available for
-# any non-commercial use.
-SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-nonfree.tar.bz2"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
- insinto /usr/share/harmonics
- doins "${WORKDIR}/${MY_P}"-nonfree.tcd
-}
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-aisradar/Manifest b/sci-geosciences/opencpn-plugin-aisradar/Manifest
new file mode 100644
index 000000000000..d0a9f924f54a
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-aisradar/Manifest
@@ -0,0 +1,4 @@
+DIST opencpn-plugin-aisradar-1.2.17.0.tar.gz 1487007 BLAKE2B 0acdee13a7557e27b0d4832da18622ac2be77056b3a84e3825d77357928e190a6161e7358b9701510b910a2549336a8499fec4b5f17547223579faaa1e5984e5 SHA512 8142607f0bd0211c7e519761521205ecf426b2300f2798e60c3d97e691849603fa6fffddcd33255da03796a3d9b43858bed649854dffaa180dbc2338a2328bf1
+EBUILD opencpn-plugin-aisradar-1.2.17.0.ebuild 745 BLAKE2B 4d85bb6dc5376bf440b574bbde549860a6326f90373435f9ecd687428aa132d932656bd88997ed98d0087f386e1337d37c026cedcbb8c7b5a0c7cf4998a5bf27 SHA512 60600e33904d6d1f81701a6a53510b261bc9bf801fb8ad788f2c0e3a17ffc34c3768e8e9c11d8f2fc3a1578b370c22c666fa0caf91e70dc96ee91a855bfed38d
+EBUILD opencpn-plugin-aisradar-9999.ebuild 745 BLAKE2B 4d85bb6dc5376bf440b574bbde549860a6326f90373435f9ecd687428aa132d932656bd88997ed98d0087f386e1337d37c026cedcbb8c7b5a0c7cf4998a5bf27 SHA512 60600e33904d6d1f81701a6a53510b261bc9bf801fb8ad788f2c0e3a17ffc34c3768e8e9c11d8f2fc3a1578b370c22c666fa0caf91e70dc96ee91a855bfed38d
+MISC metadata.xml 463 BLAKE2B 2f3c850e0ff00d2f749b0625ddcbe24a1d18c30e79534520bd1e2a048f38a607014c2f879519190f48a85d947e41f257c09ee65136e7eb5de73fca4267dd134a SHA512 0827adefd6cfedf9e5b8c22223353721e03e85a42cb824e9bce3ebb0e4844d12b3cfb4ba0e3d53961386fe54bd30eea59de4f5c0188dbd7baf03963a8aaa587c
diff --git a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml b/sci-geosciences/opencpn-plugin-aisradar/metadata.xml
index f3804ddd191b..ea23384e621c 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
+++ b/sci-geosciences/opencpn-plugin-aisradar/metadata.xml
@@ -10,6 +10,6 @@
<name>Gentoo Geosciences Project</name>
</maintainer>
<upstream>
- <remote-id type="github">canboat/BR24radar_pi</remote-id>
+ <remote-id type="github">Verezano/radar_pi</remote-id>
</upstream>
</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild
index 72253384403b..0a5718ad0535 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-1.2.17.0.ebuild
@@ -3,29 +3,29 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="BR24radar_pi"
+MY_PN="AISradar_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
-DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN"
-HOMEPAGE="https://github.com/canboat/BR24radar_pi"
+DESCRIPTION="AIS Radar View Plugin for OpenCPN"
+HOMEPAGE="https://github.com/rgleason/AISradar_pi"
-LICENSE="GPL-3+"
+LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild
new file mode 100644
index 000000000000..0a5718ad0535
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-aisradar/opencpn-plugin-aisradar-9999.ebuild
@@ -0,0 +1,35 @@
+# 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 cmake wxwidgets
+
+MY_PN="AISradar_pi"
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
+else
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="AIS Radar View Plugin for OpenCPN"
+HOMEPAGE="https://github.com/rgleason/AISradar_pi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+ x11-libs/wxGTK:${WX_GTK_VER}
+ sci-geosciences/opencpn:="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_configure() {
+ setup-wxwidgets unicode
+ cmake_src_configure
+}
diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest
deleted file mode 100644
index 50afc9947f86..000000000000
--- a/sci-geosciences/opencpn-plugin-br24radar/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST opencpn-plugin-br24radar-2.1.tar.gz 3947426 BLAKE2B a850973caa64ba4855d97e9374a5e40e292fd0df47a783a711453c49a07f3d945e33247a6199c5c1378dcc1ae29c2e4707675a12b02d3abbd8a115eaf107470c SHA512 357553396fd020e192dbbd5a05af1cd9e06c99244b426239a1d0aac4688affc1702bc16b62010236fc3af1ec7356f1dfb49e3afe3a94cb4dd7b1e0a2ef007af3
-EBUILD opencpn-plugin-br24radar-2.1.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
-EBUILD opencpn-plugin-br24radar-9999.ebuild 783 BLAKE2B 3f722f99b7e761000046574474a2b7c870569d04cf8958140c7ca162eab08b975d297dfafa28cc8325a04e85e2eb5d9c5614d03d6e45c3fad71b3c30f72eb364 SHA512 195f630914ac8f351d1932fe6be0ecd25cefcb1f65d856d6ef34142ec992b53ee8126f2cc02cf6956a3be6b8cc6cbbff4adaf18c7afaf1472514a64fff636ef9
-MISC metadata.xml 466 BLAKE2B 151db9af6dc9dce97cb4f4d4bcbbf3f675617047613483c82c6b0b842edfeaffdb0057fdc34056d902c5264c4ca34e2322deb04cfe0c776c11ecc6ace644efbe SHA512 957474eb25cadb10211c5a9f7c5c3e3d37db4e13f79f4f2d385e0b3d80c02528ec0ca82f05e4865de11523136444cbbf0ed686fa0b7271a766702790dc6cd0ac
diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest
index 19e7f1287f09..fed4d29916a4 100644
--- a/sci-geosciences/opencpn-plugin-climatology/Manifest
+++ b/sci-geosciences/opencpn-plugin-climatology/Manifest
@@ -1,5 +1,5 @@
DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 BLAKE2B 57e781f4d86ec17456e786629ec5b82c9aba872c2f8c26ec628e4ab5314b0a3c6933cc0c7a36616830038add1f95a52b8acd7c6f03cb702c611be255a3b91f1a SHA512 5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3
-DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505 SHA512 cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f
-EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
-EBUILD opencpn-plugin-climatology-9999.ebuild 1012 BLAKE2B 3094c7f7096eda85ef204ae1e1a064427f17abe8a6583e0a768c3afcf4630dbd826511947c56375b2a5b85cc6f16c3e95e0e63b985d28904767ad8f6c0c54092 SHA512 1cb379b65cb10ea43af43edf7c95aa88a916b26813b619c0688899d9569bfa30db203577f0702a542c1d816b301f4859a16a7e51403bc3bf2c4ff7b94b79ba20
+DIST opencpn-plugin-climatology-1.4.32.0.tar.gz 7070623 BLAKE2B fe710287cae08a511baa504af89b9ae7a5b0f23b2c6071803c7b7627917fd48353caef977c27b1f6d35febc2ab20a8df364c5c939b8702d9256ae3a8d5ed0b13 SHA512 11158e73658bd7ffa0d3726fab69afb5cedab5594507a36b3836b2806ac3e120b27c4e2669819db63e6991fae89534b6cee4dd04964c3310c4afe3901fe21f1b
+EBUILD opencpn-plugin-climatology-1.4.32.0.ebuild 1087 BLAKE2B 2f84ea780d3d0b6b28e717cb416a014ef63cae3aa8b2ba42cf2a72426d6121ce8fcdce594ca0bf11951d64776146995804016f92201cfe9c77b2055a86ffdd9e SHA512 7d5b326576d28035461dd27f78ba014ea1a6be69fbf797b2f0ce005df730eaf6b4c4f28e5af6a1f944082bc4eae56b9e8af2485799d8c73857418d78f81b67cb
+EBUILD opencpn-plugin-climatology-9999.ebuild 1087 BLAKE2B 2f84ea780d3d0b6b28e717cb416a014ef63cae3aa8b2ba42cf2a72426d6121ce8fcdce594ca0bf11951d64776146995804016f92201cfe9c77b2055a86ffdd9e SHA512 7d5b326576d28035461dd27f78ba014ea1a6be69fbf797b2f0ce005df730eaf6b4c4f28e5af6a1f944082bc4eae56b9e8af2485799d8c73857418d78f81b67cb
MISC metadata.xml 533 BLAKE2B bd5203682474609c528475d8f09404b2bb3350ce4d525cb1c67d218b3c6dbeece8d912b394518aa63bd264bf759a30cc4e13af1835ed8bb330f7082d930af2d0 SHA512 52b627008372387277dfbb66eb2a6e64c5d2e88538e7ba710329879695cccd690ad2e8d6283d0e868891718e1332a4e27702fb8d79712b06f8ce91597c0a8a60
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild
index 521e36f33927..eb548ae7d832 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild
@@ -3,22 +3,22 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="climatology_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+HOMEPAGE="https://github.com/rgleason/climatology_pi"
SRC_URI="
${SRC_URI}
mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
@@ -28,10 +28,17 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
+src_unpack() {
+ unpack ${A}
+ if [[ ${PV} == *9999 ]] ; then
+ git-r3_checkout
+ fi
+}
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
index 521e36f33927..eb548ae7d832 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
@@ -3,22 +3,22 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="climatology_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+HOMEPAGE="https://github.com/rgleason/climatology_pi"
SRC_URI="
${SRC_URI}
mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz"
@@ -28,10 +28,17 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
+src_unpack() {
+ unpack ${A}
+ if [[ ${PV} == *9999 ]] ; then
+ git-r3_checkout
+ fi
+}
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest
index e52913b6c4a8..1f37c4435c31 100644
--- a/sci-geosciences/opencpn-plugin-dr/Manifest
+++ b/sci-geosciences/opencpn-plugin-dr/Manifest
@@ -1,4 +1,7 @@
+AUX cmake.patch 1344 BLAKE2B 1305543ef0feefa9721510b01b80bb356ab537caf7407399c45607ad4badcaba4416d4dd0256a75182307d3060d5c543f9c3c97c74c376c909d0dcc2f32dd147 SHA512 bcc3cea7e3b4b3bb81846cd37af0cdd0e6296e68654a7de9d8a7684fdb2a8fc4c316b0a04ce171d2daac3ab2eade72fad9e9daf6f8061a2d5c83d40a31a1c740
DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1
+DIST opencpn-plugin-dr-4.0.0.tar.gz 2010328 BLAKE2B 7b3d9e93edb52e6c039e759a5a4f8f85145c89c68b6c9d33ecf8fa376e4150bfe34a516bb9f278ef820fb880c2c45b13a446151c46bd9220e303c1b352010601 SHA512 0cbb87b66569451510f813a7766ca7e7e5c120861046c93b0adb0e71b90528ae83b12201635ec0e3a9286c470e0a93015c4a5a99cbc13979c894fa4be36ce71f
EBUILD opencpn-plugin-dr-1.1.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
-EBUILD opencpn-plugin-dr-9999.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
+EBUILD opencpn-plugin-dr-4.0.0.ebuild 780 BLAKE2B 338fe00e0c17a1761348ac2bf1ab58d0a31f6cc35ef57034b62f074a4a5668291f35bca4becda0399470a6889dc409231cf73b7a4127b6f138ebd836ec225eae SHA512 5bf5ce4ef691f9d970e924789589d1a1ddd64fffa2885bce013ecc0af81f78ce0396a74825f2d8725a667c460b4705aa3a3c41aca02810cb3122251fdb8d792e
+EBUILD opencpn-plugin-dr-9999.ebuild 780 BLAKE2B 338fe00e0c17a1761348ac2bf1ab58d0a31f6cc35ef57034b62f074a4a5668291f35bca4becda0399470a6889dc409231cf73b7a4127b6f138ebd836ec225eae SHA512 5bf5ce4ef691f9d970e924789589d1a1ddd64fffa2885bce013ecc0af81f78ce0396a74825f2d8725a667c460b4705aa3a3c41aca02810cb3122251fdb8d792e
MISC metadata.xml 459 BLAKE2B 171be1694f608a308a72b0c1c9a897397552d9737c63300fb0ffd09cbcbd61c20d0a5484f656809d87fe55fc71e623ee6171aa9082a4c20bd015cf4e5e0d2c28 SHA512 72c673e76a77796c715e021a8ad83aa474b3c6d2f2068776ef3c269154617e97efd084f59f5c8b49569c19b4881e61cdb4df2c18e5474bc2929a8424bc3f9567
diff --git a/sci-geosciences/opencpn-plugin-dr/files/cmake.patch b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch
new file mode 100644
index 000000000000..ab0bb813c321
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch
@@ -0,0 +1,41 @@
+diff -ur DR_pi-4.0.0.orig/CMakeLists.txt DR_pi-4.0.0/CMakeLists.txt
+--- DR_pi-4.0.0.orig/CMakeLists.txt 2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/CMakeLists.txt 2021-11-29 00:11:03.998266321 -1000
+@@ -61,9 +61,10 @@
+ )
+ include(Targets)
+ create_targets(${FLATPAK_MANIFEST})
+-if ("${BUILD_TYPE}" STREQUAL "")
+- return ()
+-endif ()
++#if ("${BUILD_TYPE}" STREQUAL "")
++# return ()
++#endif ()
++include(PluginLibs)
+
+ if (NOT ${BUILD_TYPE} STREQUAL "flatpak")
+ # Build package as required (flatpak already dealt with).
+diff -ur DR_pi-4.0.0.orig/cmake/PluginInstall.cmake DR_pi-4.0.0/cmake/PluginInstall.cmake
+--- DR_pi-4.0.0.orig/cmake/PluginInstall.cmake 2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/cmake/PluginInstall.cmake 2021-11-29 00:10:04.241099544 -1000
+@@ -11,7 +11,7 @@
+ # the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+
+-include(Metadata)
++#include(Metadata)
+
+ if (APPLE)
+ install(
+diff -ur DR_pi-4.0.0.orig/cmake/Targets.cmake DR_pi-4.0.0/cmake/Targets.cmake
+--- DR_pi-4.0.0.orig/cmake/Targets.cmake 2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/cmake/Targets.cmake 2021-11-29 00:10:18.954386822 -1000
+@@ -19,7 +19,7 @@
+ return()
+ endif ()
+
+-include(Metadata)
++#include(Metadata)
+
+ if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
+ set(_LINUX ON)
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild
index 72253384403b..f8093a00ebdc 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-2.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild
@@ -3,32 +3,36 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="BR24radar_pi"
+MY_PN="DR_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
else
- SRC_URI="https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
-DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN"
-HOMEPAGE="https://github.com/canboat/BR24radar_pi"
+DESCRIPTION="Dead Reckoning Positions Plugin for OpenCPN"
+HOMEPAGE="https://github.com/Rasbats/DR_pi"
-LICENSE="GPL-3+"
+LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
index 96bb44ad6eeb..f8093a00ebdc 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="DR_pi"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
else
- SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
@@ -25,10 +25,14 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
diff --git a/sci-geosciences/opencpn-plugin-findit/Manifest b/sci-geosciences/opencpn-plugin-findit/Manifest
index 38745dd4ea6b..5d807e4fb32f 100644
--- a/sci-geosciences/opencpn-plugin-findit/Manifest
+++ b/sci-geosciences/opencpn-plugin-findit/Manifest
@@ -1,4 +1,4 @@
-DIST opencpn-plugin-findit-1.1007.tar.gz 254806 BLAKE2B e76c96f67010d12ba58fa9746d2e1ca0470b6ec94d1c59615436bacfb1eca2c4cb29b3e295ffd90183a86d5717f8901b48916e0f1cd70ea098c00ba19edf1526 SHA512 d22de2541cbfb17b6dc2c88b77f9b90566b5e48638e072a2f376fff7cbc7d849548bd0fba919c0b6d11ab4b12961c79af3c136a124e6543fb4c97d088478cc42
-EBUILD opencpn-plugin-findit-1.1007.ebuild 725 BLAKE2B 51cd368614bfd0dc38fdfe0942cf16a929bd86c643a9acc0c69797dfbd001fffa6e328bfc831ddcf001bc82bfc2dbbc63287e3f05ff27026fc133e69ce0c5686 SHA512 e281a7703f2cf666d253a42baba95168c99162cfd7b28f30f08d41f29c2ad20b81c96cf32f324acd55989e907c3670499048c128a7882f451087f9112bb1b802
-EBUILD opencpn-plugin-findit-9999.ebuild 725 BLAKE2B 51cd368614bfd0dc38fdfe0942cf16a929bd86c643a9acc0c69797dfbd001fffa6e328bfc831ddcf001bc82bfc2dbbc63287e3f05ff27026fc133e69ce0c5686 SHA512 e281a7703f2cf666d253a42baba95168c99162cfd7b28f30f08d41f29c2ad20b81c96cf32f324acd55989e907c3670499048c128a7882f451087f9112bb1b802
+DIST opencpn-plugin-findit-1.2.12.0.tar.gz 860413 BLAKE2B ff116fb6c543b8a94d3b16e443d7bd015fa1acd2f668103b77efaec693588813200fe08b1357f4460cca46b1dcdfd7d0fc6c5298f290ade5776773513667d3a9 SHA512 d47a5d0b575164a1708924931e7aa7c9151a0a25bc3647b86a662b20177f434bc690b534b0255d348f64124a7affff45654bb42934c2b0ceb2086eaae213f9ec
+EBUILD opencpn-plugin-findit-1.2.12.0.ebuild 733 BLAKE2B 880eb20e7485b5c48b01052ad54ca2da996bf56aeb8c573d8eca37a1d6e093366dcbbbed9a94f50a18c7fde170a50945b6e79b42ec19802abb22a23ddb94412c SHA512 3e4aa8128d9c55eac8c23f2dbfe8426ce899af6145adbb9473f84ce597361928b47975d3207203dd075e9f1eccd7a98e9f4eb527408dfc8ea18156861ec2ee74
+EBUILD opencpn-plugin-findit-9999.ebuild 733 BLAKE2B 880eb20e7485b5c48b01052ad54ca2da996bf56aeb8c573d8eca37a1d6e093366dcbbbed9a94f50a18c7fde170a50945b6e79b42ec19802abb22a23ddb94412c SHA512 3e4aa8128d9c55eac8c23f2dbfe8426ce899af6145adbb9473f84ce597361928b47975d3207203dd075e9f1eccd7a98e9f4eb527408dfc8ea18156861ec2ee74
MISC metadata.xml 461 BLAKE2B 44da4e8cea438c94ece7c6650b67c243ce73d0e1a6fe787d2eb09fb3fe1cbfd357e4c087572658145c6f5efa3fd250c60955cd769ada3bc0cfde61eee90cfb04 SHA512 71d4d49317bffe5be4ef0b17efdcf8fb26497b10e99d95386c665c9b8ec138a5c460c63e3db6b4a8f6e4b0783d7f9ec7bda3fa6e891b1276db06e4eb9851f9af
diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild
index eadcfc34d04b..4ea63062e2ca 100644
--- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.1007.ebuild
+++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-1.2.12.0.ebuild
@@ -3,29 +3,29 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="FindIt_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="FindIt Plugin for OpenCPN"
-HOMEPAGE="https://github.com/ptulp/FindIt_pi"
+HOMEPAGE="https://github.com/rgleason/FindIt_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
index eadcfc34d04b..4ea63062e2ca 100644
--- a/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-findit/opencpn-plugin-findit-9999.ebuild
@@ -3,29 +3,29 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="FindIt_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/ptulp/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="https://github.com/ptulp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="FindIt Plugin for OpenCPN"
-HOMEPAGE="https://github.com/ptulp/FindIt_pi"
+HOMEPAGE="https://github.com/rgleason/FindIt_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/Manifest b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
index 002cb688ae21..39dcd98cf40c 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/Manifest
+++ b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
@@ -1,4 +1,4 @@
-DIST opencpn-plugin-iacfleet-0.9.tar.gz 218686 BLAKE2B 6c27fd57e7dc75d0a203a823ec75cacaf6fc351d58176f536542242b20e887ff58596bf114693d740258fd2c1a6af244f53825d0561ae9c396c5f556c0e1217a SHA512 f1e54fb17517dac2442de3bca85042add4a05f0b1caf144901581694403a9d9be9732a66f236f16014522b05108877b0dc530850bdf66b530e71c1b3cc010baf
-EBUILD opencpn-plugin-iacfleet-0.9.ebuild 736 BLAKE2B ef6c430b7e2066918594fea0d0d08cb53192b2e015c5575e20879b9a2695668cfb74d60155a54cbc9dce05ea8b9f8bbc4a92ecb2d2a361dec2c23c44b8ecc6f1 SHA512 b7d9b6d8088868c2ea0457026e2d7af24cfce4a4bc11990f4bf0585c1017d6417a0c305c61c9d0d323934ea1ea80445f65fbf8c34b9cf80aa67b09a0789259b9
-EBUILD opencpn-plugin-iacfleet-9999.ebuild 736 BLAKE2B ef6c430b7e2066918594fea0d0d08cb53192b2e015c5575e20879b9a2695668cfb74d60155a54cbc9dce05ea8b9f8bbc4a92ecb2d2a361dec2c23c44b8ecc6f1 SHA512 b7d9b6d8088868c2ea0457026e2d7af24cfce4a4bc11990f4bf0585c1017d6417a0c305c61c9d0d323934ea1ea80445f65fbf8c34b9cf80aa67b09a0789259b9
+DIST opencpn-plugin-iacfleet-0.21.1.tar.gz 228102 BLAKE2B eedb536e954f4534c7e256800e8888ff9f7d9eac5b26e21013f7ff519dfa9826253fef9d1f09af265fc448662551a16fbf5e5ab1a21bf3aa75234a8e5d170ee4 SHA512 86e26ca2291d36bdf8090ff03a9d1a79c263549ba7f5db34ed3e47be14f73eec35319567b76e66e6e87a21a1486b71c77964545da6ceab896bb42965c484c78d
+EBUILD opencpn-plugin-iacfleet-0.21.1.ebuild 735 BLAKE2B 8aa16ff1e6cf587e8e91a53cd29141d668ce9ceb0319865835efd7fc4890dd22bb23ca39a84429b209a72c8322e79520a9ccfb493250c38d87a6f1b72ee5e065 SHA512 c1785805a8d2bc7ce14145d0c682f28d3133b032e7e555693d7f7c131fcea1683e16cde8126dbbcc9d7ce25a0b305eb13d545db450500e13d6cd5b7a60d3096c
+EBUILD opencpn-plugin-iacfleet-9999.ebuild 735 BLAKE2B 8aa16ff1e6cf587e8e91a53cd29141d668ce9ceb0319865835efd7fc4890dd22bb23ca39a84429b209a72c8322e79520a9ccfb493250c38d87a6f1b72ee5e065 SHA512 c1785805a8d2bc7ce14145d0c682f28d3133b032e7e555693d7f7c131fcea1683e16cde8126dbbcc9d7ce25a0b305eb13d545db450500e13d6cd5b7a60d3096c
MISC metadata.xml 463 BLAKE2B 1eacc99405dc9ae1ac741ccb6733adff124bbdf0940e30eba6ca3a366e2829a4b3f777eb5f506d5b9061fce61655dd4884d1582e4eeaf897a415d57ef41630ee SHA512 6abbb77e4cee353a40f363bdb680017237ac52d0d7a96f0fab31827d6e8a7f833eae7d1f4b34e43680d4b29006da731c0f210d968edbf1b017d2a94868a9467c
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1.ebuild
index d95a70a471e2..dc971f1e4d94 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.9.ebuild
+++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.21.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="iacfleet_pi"
@@ -25,7 +25,7 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
index d95a70a471e2..dc971f1e4d94 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="iacfleet_pi"
@@ -25,7 +25,7 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-launcher/Manifest b/sci-geosciences/opencpn-plugin-launcher/Manifest
index b95f4d903e90..e779b2468d06 100644
--- a/sci-geosciences/opencpn-plugin-launcher/Manifest
+++ b/sci-geosciences/opencpn-plugin-launcher/Manifest
@@ -1,4 +1,4 @@
-DIST opencpn-plugin-launcher-1.1.tar.gz 136301 BLAKE2B 4f353fdba9cd1ed15c59bb7becb95245add0ab9b21332524f6916ba08f519933a116bec9997406328bb6088db783d76d8e81d3970716dc986f7ef5f4a8980099 SHA512 67d36849b592d27af34aacb0016bddf961a2a94f7f6e5e0ec404c698bec9bdc2771671ec0772476188f6fd6733327e5e566bcff388583dc2cae578e39e279a16
-EBUILD opencpn-plugin-launcher-1.1.ebuild 731 BLAKE2B fd70d0ae9712b7617f42ceed3bfabc64f88472de8a2b15d5f8d0cb05fc8ef6990ad56449d162612ee100093779378669aca802eae0c423b5a947a56608d976f1 SHA512 5b91b9ed8f1e1b59865494d72f42c0b8dde18f335162dbaf6fd029abbe99aa834e6bee501cb2c3faa32814e72367193418cff10250289acd8e7f5c0b45c63040
-EBUILD opencpn-plugin-launcher-9999.ebuild 731 BLAKE2B fd70d0ae9712b7617f42ceed3bfabc64f88472de8a2b15d5f8d0cb05fc8ef6990ad56449d162612ee100093779378669aca802eae0c423b5a947a56608d976f1 SHA512 5b91b9ed8f1e1b59865494d72f42c0b8dde18f335162dbaf6fd029abbe99aa834e6bee501cb2c3faa32814e72367193418cff10250289acd8e7f5c0b45c63040
+DIST opencpn-plugin-launcher-1.3.tar.gz 128022 BLAKE2B 56adbd348ea13cf28d0cb3abd3b86c36449852227515d9bdcf1e758b385b4eba339f3774f321ac62b691f5ddbf8487d78b3093c0e46cbcbf668e222b0281e821 SHA512 dae46cf310bd8ce913ea62a8e1519aa60a9f17866393fb46b50a3f3ff256bfaca80fa595acc32612ca0ee4a75af2c1ed6259c57881d702e47ed6ac8c57027ab6
+EBUILD opencpn-plugin-launcher-1.3.ebuild 730 BLAKE2B d77c80f8e73f1e0985972a00bcd14cd622d94b055ada1d0a12cc075edfed7030272c448b783f9f8c1062f57b46f68d4bbbe8a901a4c1e54d14442e20ebefa90b SHA512 af84bc57f478ea641f6e30a23a83c9a029ed95916d95410eead802513a614f8d6b43287e904b9910781c12b99299327ec8070c36f6866afb3376c497a0163c78
+EBUILD opencpn-plugin-launcher-9999.ebuild 730 BLAKE2B d77c80f8e73f1e0985972a00bcd14cd622d94b055ada1d0a12cc075edfed7030272c448b783f9f8c1062f57b46f68d4bbbe8a901a4c1e54d14442e20ebefa90b SHA512 af84bc57f478ea641f6e30a23a83c9a029ed95916d95410eead802513a614f8d6b43287e904b9910781c12b99299327ec8070c36f6866afb3376c497a0163c78
MISC metadata.xml 463 BLAKE2B eb4cdeaffb38b4fe7f59fa30978a40cb30f254eff9ec75de609905b3a5fc1ebf92ec36c33acdff7b756da90908b92279b2d1230ec157b2ab6beb68cdfa12e102 SHA512 b0d4430b6e89baaf5e2ca54d776c71bbc35acdf49067c976ede0db6deb6a2f00d32210cbdbdfb8032ccc8eda36ed89abfd0f7a28f464fec46bf798d9986cde0c
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild
index 642568c3b3df..7576bdb8e653 100644
--- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.1.ebuild
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="launcher_pi"
@@ -25,7 +25,7 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
index 642568c3b3df..7576bdb8e653 100644
--- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
MY_PN="launcher_pi"
@@ -25,7 +25,7 @@ SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0"
+ sci-geosciences/opencpn:="
DEPEND="${RDEPEND}"
BDEPEND="sys-devel/gettext"
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
index a484cc7cb26c..bb6d22d39195 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -1,5 +1,5 @@
-DIST opencpn-plugin-logbookkonni-1.3002.tar.gz 3810133 BLAKE2B e22d4fe15e54ce914d97bfb0c660210dddec26ba7e6867708489f042e18b04f2e4832275a7a96a31e5a4f1bc25faca1f8343ce66114751d1c37b525e749f8d15 SHA512 a539e8d01f9e81f859826477c1abbdafeacc1bd0a1e734777698eb471ddf0a1356bcd321b4b3aa27f9593e0d412e52fb8791248a0dfbc20daa7c9214152e8030
-DIST opencpn-plugin-logbookkonni-1.3002_Layouts.zip 1722887 BLAKE2B ba2b966def65930f544aabe1a617c5cc3aac69f578ffb3360388724c78d4c793719d50e577b0571933168f7f5cc55a27dcbb2e5616b90c17d0257052fd052d9f SHA512 f493d9af822a960f3b9a5d557d46b73e89c8179bfbc4d260d133c972e22d4ce5753e64b2d8ced321589a11a0a32efe1c34b574ed850af0673768896cdbb3d9c5
-EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
-EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1533 BLAKE2B bea56e1a08e73642e67bca5899583b8c59b187efad24206000e028ee099f06859d306e5adbc18ccf56721774a4139543dd0acaa9bbfce7997fd7ff3c7c5e91f6 SHA512 4a76f9094f41425991bc6d7b44113c5ba958e7481ced076a7f75d202cae99c56ff3a0b1390aa67a4829d1a06658aad5a2c8be254e25910bf2a6da86b9e91654d
+AUX cmake.patch 1742 BLAKE2B c20810c649f7cd65bf035530c9066582bbd8f41f1b4af6bae78ae8f1d444e5f3c987d16ca788dcac8698cb4c8ed926029e53f15054d1db315b479e478cf077b5 SHA512 ca875d26c9bb42b77684e18be71002a6ba0d168fb0c17c0ff50734a9765a41c506af7973a84e6f84ed1814279ce0131fd74959ce1550171338771f007a946c03
+DIST opencpn-plugin-logbookkonni-1.4.22.0.tar.gz 8595300 BLAKE2B ce4f1d87613ca4e5f4e4b6ea336b642ec780912395e855af5a88db0b8290b3aed796b54207c5a7776643dfa63dcdf93db711b63e5e9f95a4903c1e7e6874fbf3 SHA512 f3f50e8a7b24aca049b9495d1f3a5a303447df2fa1dc2e3c79a86a1d2be4a8b4f71e4b2ee596e721d3c2a0c9bb7138d9aed6bd28198cc91223233fa9440b827e
+EBUILD opencpn-plugin-logbookkonni-1.4.22.0.ebuild 1223 BLAKE2B 3c26ee0084fce65ee65776920d4def66773c4a5ca099cdcb1782c0f49946b712bf9b776ddaaf9451bcf50ed321e8706212fa521cc3b042493e7e422b3d92aede SHA512 caf04d7978be48930875108289acb6858998d9b66e7ce11aed39531850cac893054918b6d216c71e794ad286ce84194da77e1b72b8235fe49dfec8d0c0f51406
+EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1223 BLAKE2B 3c26ee0084fce65ee65776920d4def66773c4a5ca099cdcb1782c0f49946b712bf9b776ddaaf9451bcf50ed321e8706212fa521cc3b042493e7e422b3d92aede SHA512 caf04d7978be48930875108289acb6858998d9b66e7ce11aed39531850cac893054918b6d216c71e794ad286ce84194da77e1b72b8235fe49dfec8d0c0f51406
MISC metadata.xml 473 BLAKE2B b6e8e9c836c0380ba26e480125e61085bc812d18d21b130559bf856ea90c271c6f62826ae4bec77557523be70c76f9019e99fdaa546402cf90320a33116ffa42 SHA512 320d668c560b2e4abc2f1747355c8b5263b51af5bd8cd19ecee7a2d8995cae6502bce58221bc1ade840db156bbce8e343e960185ef2205d195da044089f31b57
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
new file mode 100644
index 000000000000..4221ce9f82cd
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/files/cmake.patch
@@ -0,0 +1,57 @@
+diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake
+--- LogbookKonni_pi-1.4.22.0.orig/cmake/PluginInstall.cmake 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/cmake/PluginInstall.cmake 2021-11-29 22:31:48.755156001 -1000
+@@ -6,7 +6,7 @@
+ # Installation items and layout.
+ # ~~~
+
+-include(Metadata)
++#include(Metadata)
+
+ if (APPLE)
+ install(
+diff -urN LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake
+--- LogbookKonni_pi-1.4.22.0.orig/cmake/Targets.cmake 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/cmake/Targets.cmake 2021-11-29 22:31:48.756156018 -1000
+@@ -8,7 +8,7 @@
+ return()
+ endif ()
+
+-include(Metadata)
++#include(Metadata)
+
+ if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
+ set(_LINUX ON)
+diff -urN LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt LogbookKonni_pi-1.4.22.0/CMakeLists.txt
+--- LogbookKonni_pi-1.4.22.0.orig/CMakeLists.txt 2021-10-30 07:35:43.000000000 -1000
++++ LogbookKonni_pi-1.4.22.0/CMakeLists.txt 2021-11-29 22:42:03.398496368 -1000
+@@ -27,6 +27,7 @@
+ endif ()
+ message(STATUS "Cmake version: ${CMAKE_VERSION}.")
+
++set(BUILD_TYPE "tarball")
+
+ # -------- Build setup (mostly in PluginCompiler) --------
+ #
+@@ -57,6 +58,7 @@
+
+ option(PLUGIN_USE_SVG "Use SVG graphics" ON)
+
++
+ include(PluginOptions)
+
+ #
+@@ -135,9 +137,10 @@
+ create_targets(
+ ${PROJECT_SOURCE_DIR}/flatpak/org.opencpn.OpenCPN.Plugin.logbook.yaml
+ )
+-if ("${BUILD_TYPE}" STREQUAL "")
+- return ()
+-endif ()
++#if ("${BUILD_TYPE}" STREQUAL "")
++# return ()
++#endif ()
++include(PluginLibs)
+
+ if (NOT ${BUILD_TYPE} STREQUAL "flatpak")
+ # Build package as required (flatpak already dealt with).
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild
index 88643bb432bf..37b7e7554be5 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.3002.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.4.22.0.ebuild
@@ -3,56 +3,50 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="LogbookKonni-1.2"
+MY_PN="LogbookKonni_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="
- https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Logbook Plugin for OpenCPN"
-HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
+HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0
+ sci-geosciences/opencpn:=
sys-devel/gettext"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/zip
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
}
-src_install() {
- # install layouts as zip
- cmake_src_install
-
- cd "${WORKDIR}" || die
- zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
-}
-
pkg_postinst() {
elog "Installation of logbook layouts"
elog "*******************************"
elog
elog "The default layouts zip file has been installed to:"
- elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+ elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip"
elog
elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
elog "click the install button and choose the above mentioned zip file"
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
index 88643bb432bf..37b7e7554be5 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-9999.ebuild
@@ -3,56 +3,50 @@
EAPI=7
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
inherit cmake wxwidgets
-MY_PN="LogbookKonni-1.2"
+MY_PN="LogbookKonni_pi"
if [[ ${PV} == *9999 ]] ; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/delatbabel/${MY_PN}.git"
+ EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git"
else
- SRC_URI="
- https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/delatbabel/${MY_PN}/releases/download/v${PV}/LogbookKonni_Layouts.zip -> ${P}_Layouts.zip"
+ SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="Logbook Plugin for OpenCPN"
-HOMEPAGE="https://github.com/delatbabel/LogbookKonni-1.2"
+HOMEPAGE="https://github.com/rgleason/LogbookKonni_pi"
LICENSE="GPL-2+"
SLOT="0"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}
- >=sci-geosciences/opencpn-4.2.0
+ sci-geosciences/opencpn:=
sys-devel/gettext"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/zip
sys-devel/gettext"
+PATCHES=(
+ "${FILESDIR}/cmake.patch"
+)
+
src_configure() {
setup-wxwidgets unicode
cmake_src_configure
}
-src_install() {
- # install layouts as zip
- cmake_src_install
-
- cd "${WORKDIR}" || die
- zip -r "${ED}"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts || die
-}
-
pkg_postinst() {
elog "Installation of logbook layouts"
elog "*******************************"
elog
elog "The default layouts zip file has been installed to:"
- elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip"
+ elog "${EROOT}/usr/share/opencpn/plugins/logbookkonni_pi/data/Layouts.zip"
elog
elog "After starting OpenCPN, go to Options->Plugins->Logbook->Settings,"
elog "click the install button and choose the above mentioned zip file"
diff --git a/sci-geosciences/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest
index 90d7c13b877a..17120aab37ca 100644
--- a/sci-geosciences/opencpn-plugins-meta/Manifest
+++ b/sci-geosciences/opencpn-plugins-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1361 BLAKE2B 87b168f410a8c4dd0dcda19d25c2ab9656cd25eaff3aafa33601eebc4179d5a7378eb96b9f0417671d9575758bf35da42f7fb179813efb36d2cd7aae7abc9260 SHA512 c8d38d5dd7c39a04f2df4f48e33a680e680ef87aa5d28aedb110555ee915ad4238a5f8ce901469a6d86a696c0ca3d72fa18f32cfef8fe2db1239353f5d651d9d
+EBUILD opencpn-plugins-meta-4.2.0-r6.ebuild 1316 BLAKE2B 9365b60586d6201db6eca1c43a2c31feb66650b1050ba0250d57099a77df90225d9089dd3ad6041774b379a010004e1a15e74c41070b93c1bcb3915273317ab1 SHA512 132f8e88aa503bfcd2a5bc66b002e3e60db0a3670044efabf10cabc82ac4050463866b3242fe0299258eef41fa9454278492f1daa73a5697a290fb93b19ca181
MISC metadata.xml 381 BLAKE2B ca0b3feaf874b1af5b0bb11dd27431b3c622825d643003608e5d96a84fbee0828b57e8b270f85e50cfcaa13fafd2c4fa8bf914e975dc24c0694e7c28d0b1bc8c SHA512 d7c71793ebc7e2e63c0309c12095daa068753f4beab3bab06910ee7fe94d4f05ea1e4c3710bb12469c509a49477c45117d8fd904f7a387ad16db5bfee1ffa766
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r6.ebuild
index e4b5070063f5..0272118e164f 100644
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
+++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r6.ebuild
@@ -12,13 +12,12 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
>=sci-geosciences/opencpn-${PV}
- >=sci-geosciences/opencpn-plugin-br24radar-1.31
>=sci-geosciences/opencpn-plugin-dr-1.1
- >=sci-geosciences/opencpn-plugin-findit-1.1007
+ >=sci-geosciences/opencpn-plugin-findit-1.2.12.0
>=sci-geosciences/opencpn-plugin-gxradar-1.1
>=sci-geosciences/opencpn-plugin-iacfleet-0.8
>=sci-geosciences/opencpn-plugin-launcher-1.1
- >=sci-geosciences/opencpn-plugin-logbookkonni-1.3002
+ >=sci-geosciences/opencpn-plugin-logbookkonni-1.4.22.0
>=sci-geosciences/opencpn-plugin-objsearch-0.7
>=sci-geosciences/opencpn-plugin-ocpn_draw-1.0.12
>=sci-geosciences/opencpn-plugin-ocpndebugger-1.2
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index f73d75809976..5162cda3eb58 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,8 +1,5 @@
-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
+EBUILD opencpn-5.2.4.ebuild 1285 BLAKE2B f2d056230fd908e8ce816fd7a11c24640a29399258d642d645c670ad11b27b463258a1f531ea3d0c0040f7311ebd69a9c8a9e8a35f333bfed6f677640355495d SHA512 c683ab1e8ddc1a61c21260e6378ce0655465e733fed7057889edcbb1b8e63e986511cb8e36d7e99277cb28df55329598300436ea68c5e1ea49dfe92d7bd7487a
MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72
diff --git a/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
deleted file mode 100644
index ebd354bd826b..000000000000
--- a/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -408,9 +408,9 @@
- ENDIF()
-
- IF((_wx_selected_config MATCHES "qt-armv7"))
-- SET(wxWidgets_USE_LIBS base core xml html adv aui)
-+ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
- ELSE()
-- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
-+ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
- ENDIF()
-
- OPTION (USE_GL "Enable OpenGL support" ON)
-@@ -436,7 +436,7 @@
- SET(OPENGLES_FOUND "YES")
- SET(OPENGL_FOUND "YES")
-
-- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
-+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
- add_subdirectory(src/glshim)
-
- SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" )
-@@ -455,7 +455,7 @@
- SET(OPENGLES_FOUND "YES")
- SET(OPENGL_FOUND "YES")
-
-- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
-+ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
- add_subdirectory(src/glshim)
- ENDIF(QT_ANDROID)
-
-@@ -468,7 +468,7 @@
- ENDIF(USE_GL)
-
- IF(OPENGL_FOUND)
-- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
-+ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
- INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-
- MESSAGE (STATUS "Found OpenGL...." )
-@@ -529,14 +529,14 @@
- ENDIF(MSVC)
-
- IF(WIN32 OR APPLE OR QT_ANDROID)
-- FIND_PACKAGE(wxWidgets)
-+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
- if (wxWidgets_FOUND)
- message(STATUS "Found wxWidgets webview add-on")
- add_definitions(-DOCPN_USE_WEBVIEW)
- else ()
-- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
-+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
- message(STATUS "Could not find wxWidgets webview add-on")
-- FIND_PACKAGE(wxWidgets REQUIRED)
-+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
- endif ()
- IF(MSYS)
- # this is to convert msys to windows paths, and handle the missing /usr
-@@ -725,7 +725,7 @@
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/serial/include)
-
- ## Add serial library
-- add_library(SERIAL ${serial_SRCS})
-+ add_library(SERIAL STATIC ${serial_SRCS})
- if(APPLE)
- target_link_libraries(SERIAL ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
- elseif(UNIX)
-@@ -1053,14 +1053,14 @@
- set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
- MESSAGE(STATUS "Building against GTK3...")
- ENDIF(GTK2_FOUND)
-- FIND_PACKAGE(wxWidgets)
-+ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
- if (wxWidgets_FOUND)
- message(STATUS "Found wxWidgets webview add-on")
- add_definitions(-DOCPN_USE_WEBVIEW)
- else ()
-- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
-+ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
- message(STATUS "Could not find wxWidgets webview add-on")
-- FIND_PACKAGE(wxWidgets REQUIRED)
-+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
- endif ()
- MESSAGE (STATUS "Found wxWidgets..." )
- MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")
diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
deleted file mode 100644
index 84e09c9f1e65..000000000000
--- a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-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+:2
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- !sci-geosciences/opencpn-plugin-wmm"
-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/opencpn/opencpn-5.2.4.ebuild b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
index 6688d1f0e0d3..f4be4868019e 100644
--- a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
@@ -32,7 +32,9 @@ RDEPEND="
x11-libs/gtk+:3
x11-libs/wxGTK:${WX_GTK_VER}[X]"
DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+ sys-devel/gettext
+ sys-apps/lsb-release"
PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 8ecf7c7d6489..7cf70cf38357 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -4,9 +4,11 @@ AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc
DIST qgis-3.18.3.tar.bz2 121178524 BLAKE2B 9f4c5bb4b4bf980c81b91a38716b280f48bf28d894550563607e202a7764f72c78b9520f060319c219e484254eaa31315fc232b459bec8cc6a1bc07b587babc6 SHA512 d2c08f1f0bdb2ba56a108dc9626122dfe90caae4f300ceb7be2d40112ee9bcc7f286f092f7f207812428aca926c7fe0dabe49039bba0f32f2f371d290536f0ef
DIST qgis-3.20.3.tar.bz2 133775542 BLAKE2B f92273d208d7948bcd1642c994d7dac6b3a1115aaee5738e1974ff0ac38e42432abb18a64e982d46be10dd2dcb9da809b9065bb66c3f353e587a5b7f5544ec91 SHA512 abad3eb9774bbe2eaa86d554256a46eb179016f2df849d0c27c96db1bad6b73116c4456b81b176107a459bbf52714ccaf11a79bb9b39641192cd46f188420df0
DIST qgis-3.22.0.tar.bz2 135469417 BLAKE2B 54fdd8517e37931dcdc81ef1006859d58d9e60a994a60588109a8337ade68e48710f0f50fe41e6e73c0e095187f00f15209258eb940ea3c80bba4f249d081cd5 SHA512 dc214d90c465cc7b8a82196d666b94971d60e64a28e38742aba5cdd86058e27fdf7cc3564bca3b330cf1820c7594d9226576145461db399c458a26ee569e299b
+DIST qgis-3.22.1.tar.bz2 136772144 BLAKE2B ba3a5d9db2a487ff10800da0ab12de4b6d3c1dab72e286d0cafef1804429f59e6c80fd05d662e8abadb7216811f3cbe36bb50d54b077a5c4db7cabcb1002a826 SHA512 b49fdab97c707a3bd29c2ad288733373d406fe024e07873e6ba28653a9a8882f58115ae346523b2f07011be312e18bf2643c8f0b7979d4ba8ed07dce4579cba9
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.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
+EBUILD qgis-3.22.1.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
+EBUILD qgis-9999.ebuild 5404 BLAKE2B d622f705f87f5caed99be281c1799b3e486b930aba1116c813c8598c317af059280e4d8f2357b684b759501c4c6665957f1f8830acf3f130ce7688081759c3f6 SHA512 ec6eb7592c0b51d3e3e48d9ccb2ad2c25ef6e07c30d571a4efdc867be0105c721a82a7998d3d16405e174430d323010bcc56a784f50a5d6da8a47ae47e088fcb
MISC metadata.xml 1483 BLAKE2B 7e376bf280c7004be4e1122616586c105c0eef696e787586736f19565e8df31d994d3b4fddde3344432adf1ffb99afaac2acfe1f70cd5cd8ee5344fe1f65dc48 SHA512 cbc63fa480c07625e1e6317fcc98dababb209ee65a9aa461ab1897aab861df7d5db0cad9f4a20e8787c11ea6300f90f73706bf7ca7dc65965681731ac23cff1c
diff --git a/sci-geosciences/qgis/qgis-3.22.1.ebuild b/sci-geosciences/qgis/qgis-3.22.1.ebuild
new file mode 100644
index 000000000000..af65e82db8df
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.22.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+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 python-single-r1 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/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,gui,network,positioning,printsupport,sql,svg,widgets,${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 c8150cce4fe3..af65e82db8df 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
PYTHON_REQ_USE="sqlite"
if [[ ${PV} = *9999* ]]; then
@@ -14,7 +14,7 @@ else
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
+inherit cmake python-single-r1 xdg
DESCRIPTION="User friendly Geographic Information System"
HOMEPAGE="https://www.qgis.org/"
diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest
deleted file mode 100644
index d1f0e1b0c30c..000000000000
--- a/sci-geosciences/swmm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX swmm-5.0.022-QA.patch 449 BLAKE2B ac7036240677b1c0a088400f205497e48124f799b3754351787e4748c59bbf5105f6b8290a06acd527ee523ffca4a416d7f9e693c1896c1bc5119964f12208c1 SHA512 b9d68d3273a1f43a34a568aa4a9b334834bfff4abf239d16350916326cad7d6d440f1778b9f75dbf8b2b8b8f6ff12f74cf103b03db6ed8868461c41845aec34d
-DIST swmm50022_engine.zip 338011 BLAKE2B a3fba4a480130903fe576ed1521cb94f54dbf350ec4200d96def10bca6842d55a1de2d17911d35b59acff70d13a31012554ca09b0cb7ac7e60f0f4ebc2e0ea98 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006
-EBUILD swmm-5.0.022.ebuild 1066 BLAKE2B 2bc4ffeb3f06d195ed952873b56f4fdb625d093e9a8515b388b545477d0c09fef851e68a75135ba6f0d8aa5988ca701be45c757947abf1e7653f8115ac94511a SHA512 14eef32aa5e7c1160c826a70319627ab8f0415b99f32fc66177b725a6483c31cc0e6f9e5f63024ffaf7004c2a688196469114c6d97cc05dffc5eb3c25cb4ed4f
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch b/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
deleted file mode 100644
index c84d50f5f6b3..000000000000
--- a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -7,9 +7,10 @@
- rain.o rdii.o report.o routing.o runoff.o shape.o snow.o stats.o \
- statsrpt.o subcatch.o table.o toposort.o transect.o treatmnt.o xsect.o
-
-+LIBS += -lm
-
- swmm5 : $(objs)
-- cc -o swmm5 -lm $(objs)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o swmm5 $(objs) $(LIBS)
-
- swmm5.o : consts.h macros.h enums.h error.h datetime.h objects.h funcs.h text.h globals.h swmm5.h
- climate.o : headers.h
diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
deleted file mode 100644
index 85e4ed814fa2..000000000000
--- a/sci-geosciences/swmm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild
deleted file mode 100644
index ae8ad8060a90..000000000000
--- a/sci-geosciences/swmm/swmm-5.0.022.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch versionator toolchain-funcs
-
-MY_PV=$(delete_all_version_separators)
-MY_SRC="swmm${MY_PV}_engine.zip"
-DESCRIPTION="Storm Water Management Model-SWMM, hydrology, hydraulics, water quality model"
-HOMEPAGE="http://www.epa.gov/ednnrmrl/models/swmm/index.htm"
-SRC_URI="http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/${MY_SRC}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_setup() {
- tc-export CC
-}
-
-src_unpack() {
- unpack ${MY_SRC}
- # Need to delete Readme.txt, because it is in makefiles.zip
- rm Readme.txt || die
- unpack ./makefiles.zip
- unpack ./GNU_CON.zip
- unpack ./source*.ZIP
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-QA.patch
-}
-
-src_compile() {
- # 'sed' command has to accomodate DOS formatted file.
- sed -i \
- -e 's;^#define DLL;//#define DLL;' \
- -e 's;^//#define CLE;#define CLE;' \
- swmm5.c || die
- emake
-}
-
-src_install() {
- newbin swmm5 swmm
- dodoc Roadmap.txt
-}
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
index 9dcceb2d1401..57b5d2bb557d 100644
--- a/sci-geosciences/viking/Manifest
+++ b/sci-geosciences/viking/Manifest
@@ -1,7 +1,12 @@
AUX viking-1.7-no-common.patch 453 BLAKE2B 1d2117f44ea8f99fad79702b350b9c622501b2e02d5b688f835e89cf4868f992f315bdbcd90897f00f8c0fef4721473c5c1a30797fa6b636e3a4204a3abdca96 SHA512 8e4908697109bb00e39ec1c8b07c81167aa6bf4bd3572cf14e1e0a5175ed01ea89ddfa4373f2cee072e9e65a3ecb90fbb9da5a7655d2cee352f62272f34c88a4
AUX viking-1.8-libexif.patch 868 BLAKE2B 247e44a710566e0c4c21272ed61a8037e053de4e8560f88fa5202c2babd60a59b0d62fd8ae4da0af8c8de81f529131ac4a646d21e722c6ea2202de92bec825f2 SHA512 0e6dddd86d12e8ea229b1e7430993fdadadc303860af762f3d2aaca62b0b509ce437a44701e9be9ca503df50e5aef5c8e041bd26339a9a0b0d364b2464c8f8c4
+AUX viking-1.9-geocache.patch 4237 BLAKE2B 77475bc738d9cd244031a1141d5a47e7a849a530ee68899784421d17a0c895b4160e85ccb35903cd548b59fac678ccb6b645b5c27a95c92953fa3808d39216ed SHA512 854e07a119eb85881b6b086efc2c3aeb3304e72b8e3a98481acac4721b8284fec038a744656a8f8083298a2528ff65d8a03ed21acd4ba8788f7213e485898923
+DIST viking-1.10.tar.gz 6014926 BLAKE2B 667a5cd854449f54c6f5969118a445903cafae4e8f046f14b6802f53a76c217cf960dd11876ed237112026f96da2906bb68b2474ba4e72696bd8b8a082cf7189 SHA512 8d0b3b46e139b8c03730140d89e8eaf6f1dbcde504011710d122e5239d11d1115464b087edd531228be199286605df0deb3f4b75fae0222128b0f5098344527e
DIST viking-1.8.tar.gz 5207444 BLAKE2B 6a9b786dd23e643a68c25d68e2e14c5a38d2fe6a4a57f6266e13d9208f8c3b49c122921ecf4c54c2630bf9a11e5288346643b4bf92aad67824e8c928de270f84 SHA512 c401e69a6038e4b20c5a2fdecb8b028156e7e8829dd9d48596b0501b6e0a364dc6cc0ab0a8c4bcc731b5c6721835d3cfb605b76ec3b266dab2426df12c321e62
+DIST viking-1.9.tar.gz 5962048 BLAKE2B 7997286619d55687c5f2a394c8e068432c025f4210e579eae68e344495690e08e609352af3a71f3dc10161bd3cbb1126241abd928a13555466c37d164aa1fa5c SHA512 44be8e008db369e8700f91a67f4e4fb7aaab67fa498e71da98502b2893e8efd85502caca23ce9ccba4cf0d167328c4b87b5e422e15b3f8611acf814053646697
DIST viking.pdf 383200 BLAKE2B 388129023e62008de2d2c402a72aa1e4a1834f99e6666bb9deedb5f5c32e8b94edeadf5a40e7b1f941aacc0057d4dcfbaf13c3098eb4efa02e3a1a8e00288201 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee
+EBUILD viking-1.10.ebuild 2050 BLAKE2B 450d23da27475268e4947119c09a4fc876b0941f3fd1c97004a758b299d699bfbe19e4eb1d283511ef38e0a3663003be4bf75b10bec47955bd62a132bd833212 SHA512 b07422252242a9f2a030f6e9ad61eea50abfd9647bd08d89358c48a234c97e7bd27b91374f801f1932d2b242f4a585a656b483b6e73552b5808fb2ad08765fd6
EBUILD viking-1.8-r1.ebuild 2038 BLAKE2B ca81e1e700c548cb438a685eb8c3cfc8a09df2707f443ebc6a50ecf53e59c3aa03cb6fd777d30cacdf2c552a7e9be0e4b7be137c0ab65941b4c93096f3515974 SHA512 35ebff592596be22150ee391662fceeedf03c543fb29e868c55a9460363ba6354972b620ed35abf31a5cad6ad3062e6af39417079960cc0cb08c38bab4a99c54
EBUILD viking-1.8.ebuild 2037 BLAKE2B 8ee371b30a9b77d0672e5ab974d6ad7c0e692cc168640c6647163467d1cba2585c81c5ce9217e36e23b7122963da0ef7b866c9889c3095924589686da321703e SHA512 e059b1f1fce251fdb29df957a687ef16acaad7376b305c1ec84ec1323b3b2779c57920c65db1f8d50aec533294a201330854f6c50bb987a46e5a682b2c5674f0
+EBUILD viking-1.9.ebuild 2025 BLAKE2B 6bd0424b4abdcb58665c33cd15fd55895923fe74f7a5ebb9fc4adfd0d53776753484ba105fc924bc368062bfdae0c58be4c28c5edfaace4b9fdbef8a685fe79c SHA512 081c4d2b50c6e88ae18a992b9628564f07b3ce4051c7c2554b4d18fd488742c1ebdc1c5b329b30b16db907652c2a37622b8c6b3b836fa07fcd69e02086aed8fa
MISC metadata.xml 834 BLAKE2B 8aebda67240a9cb9d9d6d3fd6db6a25edbcf0794ef23cf5f39265db779b733005b0f29db16f123f0137efff2b1378b764a7793d8ee18d3f970f5a1f4e08e6b37 SHA512 82588f9d9b684923ff112c37c68468413fdcc91e10e5d3e00ec48f6c67d62d0f36462077878d6deffff658c49e7ab09b5e635839f989e1d5534dd9189eb40ae0
diff --git a/sci-geosciences/viking/files/viking-1.9-geocache.patch b/sci-geosciences/viking/files/viking-1.9-geocache.patch
new file mode 100644
index 000000000000..4779c10dcd4c
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.9-geocache.patch
@@ -0,0 +1,88 @@
+From bdfa84467787138b8a180938006b864a39d0dec0 Mon Sep 17 00:00:00 2001
+From: Rob Norris <rw_norris@hotmail.com>
+Date: Thu, 3 Jun 2021 21:30:02 +0100
+Subject: [PATCH] Github #128: Maintain datasource_gc.c such that it at least
+ compiles
+
+---
+ src/datasource_gc.c | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/datasource_gc.c b/src/datasource_gc.c
+index 37fa425a..22292b2c 100644
+--- a/src/datasource_gc.c
++++ b/src/datasource_gc.c
+@@ -128,9 +128,9 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
+ gdouble lat, lon;
+ if ( widgets->circle_onscreen ) {
+ vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
+- widgets->circle_x - widgets->circle_width/2,
+- widgets->circle_y - widgets->circle_width/2,
+- widgets->circle_width, widgets->circle_width, 0, 360*64 );
++ widgets->circle_x - widgets->circle_width/2,
++ widgets->circle_y - widgets->circle_width/2,
++ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
+ }
+ /* calculate widgets circle_x and circle_y */
+ /* split up lat,lon into lat and lon */
+@@ -157,13 +157,13 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
+ pixels_per_meter = ((gdouble)vik_viewport_get_width(widgets->vvp)) / vik_coord_diff(&c1, &c2);
+
+ /* this is approximate */
+- widgets->circle_width = gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) )
++ widgets->circle_width = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) )
+ * METERSPERMILE * pixels_per_meter * 2;
+
+ vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
+- widgets->circle_x - widgets->circle_width/2,
+- widgets->circle_y - widgets->circle_width/2,
+- widgets->circle_width, widgets->circle_width, 0, 360*64 );
++ widgets->circle_x - widgets->circle_width/2,
++ widgets->circle_y - widgets->circle_width/2,
++ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
+
+ widgets->circle_onscreen = TRUE;
+ } else
+@@ -172,7 +172,7 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets )
+
+ /* see if onscreen */
+ /* okay */
+- vik_viewport_sync ( widgets->vvp );
++ vik_viewport_sync ( widgets->vvp, NULL );
+ }
+
+ static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data )
+@@ -197,7 +197,9 @@ static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vv
+
+ widgets->vvp = vvp;
+ widgets->circle_gc = vik_viewport_new_gc ( vvp, "#000000", 3 );
++#if !GTK_CHECK_VERSION (3,0,0)
+ gdk_gc_set_function ( widgets->circle_gc, GDK_INVERT );
++#endif
+ widgets->circle_onscreen = TRUE;
+ datasource_gc_draw_circle ( widgets );
+
+@@ -240,7 +242,7 @@ static void datasource_gc_get_process_options ( datasource_gc_widgets_t *widgets
+ po->shell_command = g_strdup_printf( "rm -f ~/.geo/caches/*.html ; %s -H ~/.geo/caches -P -n%d -r%.1fM -u %s -p %s %s %s ; %s -z ~/.geo/caches/*.html ",
+ GC_PROGRAM1,
+ gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->num_spin) ),
+- gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ),
++ gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ),
+ safe_user,
+ safe_pass,
+ slat, slon,
+@@ -256,10 +258,10 @@ static void datasource_gc_cleanup ( datasource_gc_widgets_t *widgets )
+ {
+ if ( widgets->circle_onscreen ) {
+ vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE,
+- widgets->circle_x - widgets->circle_width/2,
+- widgets->circle_y - widgets->circle_width/2,
+- widgets->circle_width, widgets->circle_width, 0, 360*64 );
+- vik_viewport_sync( widgets->vvp );
++ widgets->circle_x - widgets->circle_width/2,
++ widgets->circle_y - widgets->circle_width/2,
++ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL );
++ vik_viewport_sync( widgets->vvp, NULL );
+ }
+ g_free ( widgets );
+ }
diff --git a/sci-geosciences/viking/viking-1.10.ebuild b/sci-geosciences/viking/viking-1.10.ebuild
new file mode 100644
index 000000000000..131abba15633
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://github.com/viking-gps/viking/"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
+SRC_URI="
+ https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
+ doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+ app-arch/bzip2
+ >=dev-tcltk/expect-5.45.4
+ dev-db/sqlite:3
+ dev-libs/expat
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-0.16
+ dev-libs/nettle
+ net-misc/curl
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.26:2
+ >=x11-libs/gtk+-3.22:3
+ geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
+ gps? ( >=sci-geosciences/gpsd-3.20 )
+ exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+ magic? ( sys-apps/file )
+ oauth? ( net-libs/liboauth )
+"
+RDEPEND="${COMMONDEPEND}
+ sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+ app-text/yelp-tools
+ dev-util/intltool
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ dev-libs/libxslt
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare()
+{
+ default
+ eautoreconf
+
+ sed -i -e '/Avoid creator line/isrcdir=test' test/check_gpx.sh || die
+}
+
+src_configure() {
+ econf \
+ --disable-deprecations \
+ --with-libcurl \
+ --with-expat \
+ --enable-google \
+ --enable-nettle \
+ --enable-terraserver \
+ --enable-expedia \
+ --enable-openstreetmap \
+ --enable-bluemarble \
+ --enable-geonames \
+ --enable-geocaches \
+ --disable-dem24k \
+ --disable-mapnik \
+ --enable-mbtiles \
+ $(use_enable exif geotag) \
+ $(use_with libexif ) \
+ $(use_enable geoclue) \
+ $(use_enable gps realtime-gps-tracking) \
+ $(use_enable magic) \
+ $(use_enable nls) \
+ $(use_enable oauth)
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc "${DISTDIR}"/${PN}.pdf
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/sci-geosciences/viking/viking-1.9.ebuild b/sci-geosciences/viking/viking-1.9.ebuild
new file mode 100644
index 000000000000..3a74ac41d23c
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.9.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="https://github.com/viking-gps/viking/"
+IUSE="doc +exif libexif geoclue gps +magic nls oauth"
+SRC_URI="
+ https://github.com/viking-gps/${PN}/archive/${P}.tar.gz
+ doc? ( https://github.com/viking-gps/${PN}/releases/download/${P}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMONDEPEND="
+ app-arch/bzip2
+ >=dev-tcltk/expect-5.45.4
+ dev-db/sqlite:3
+ dev-libs/expat
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-0.16
+ dev-libs/nettle
+ net-misc/curl
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.26:2
+ >=x11-libs/gtk+-3.22:3
+ geoclue? ( >=app-misc/geoclue-2.4.4:2.0 )
+ gps? ( >=sci-geosciences/gpsd-3.20 )
+ exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+ magic? ( sys-apps/file )
+ oauth? ( net-libs/liboauth )
+"
+RDEPEND="${COMMONDEPEND}
+ sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+ app-text/yelp-tools
+ dev-util/intltool
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ dev-libs/libxslt
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+PATCHES=( "${FILESDIR}/${P}-geocache.patch" )
+
+src_prepare()
+{
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-deprecations \
+ --with-libcurl \
+ --with-expat \
+ --enable-google \
+ --enable-nettle \
+ --enable-terraserver \
+ --enable-expedia \
+ --enable-openstreetmap \
+ --enable-bluemarble \
+ --enable-geonames \
+ --enable-geocaches \
+ --disable-dem24k \
+ --disable-mapnik \
+ --enable-mbtiles \
+ $(use_enable exif geotag) \
+ $(use_with libexif ) \
+ $(use_enable geoclue) \
+ $(use_enable gps realtime-gps-tracking) \
+ $(use_enable magic) \
+ $(use_enable nls) \
+ $(use_enable oauth)
+}
+
+src_install() {
+ default
+ if use doc; then
+ dodoc "${DISTDIR}"/${PN}.pdf
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}