From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 18 Mar 2018 04:54:42 +0000
Subject: gentoo resync : 18.03.2018

---
 sci-geosciences/Manifest.gz                        | Bin 11261 -> 11082 bytes
 sci-geosciences/opencpn-plugin-br24radar/Manifest  |   4 -
 .../opencpn-plugin-br24radar-1.1-r1.ebuild         |  36 ----
 .../opencpn-plugin-br24radar-1.31.ebuild           |  37 ----
 .../opencpn-plugin-climatology/Manifest            |   6 +-
 .../opencpn-plugin-climatology-1.0-r1.ebuild       |  42 ----
 .../opencpn-plugin-climatology-1.0.20180316.ebuild |  47 +++++
 .../opencpn-plugin-climatology-9999.ebuild         |   9 +-
 sci-geosciences/opencpn-plugin-iacfleet/Manifest   |   2 -
 .../opencpn-plugin-iacfleet-0.8.ebuild             |  37 ----
 sci-geosciences/opencpn-plugin-launcher/Manifest   |   2 -
 .../opencpn-plugin-launcher-1.0-r1.ebuild          |  33 ----
 .../opencpn-plugin-logbookkonni/Manifest           |   3 -
 .../opencpn-plugin-logbookkonni-1.2018-r1.ebuild   |  57 ------
 sci-geosciences/opencpn-plugin-objsearch/Manifest  |   2 -
 .../opencpn-plugin-objsearch-0.5.1-r1.ebuild       |  33 ----
 sci-geosciences/opencpn-plugin-ocpn_draw/Manifest  |   2 -
 .../opencpn-plugin-ocpn_draw-1.0.12.ebuild         |  37 ----
 .../opencpn-plugin-ocpndebugger/Manifest           |   4 -
 .../opencpn-plugin-ocpndebugger-1.0-r1.ebuild      |  33 ----
 .../opencpn-plugin-ocpndebugger-1.2.ebuild         |  37 ----
 sci-geosciences/opencpn-plugin-statusbar/Manifest  |   6 +-
 .../opencpn-plugin-statusbar-0.5-r1.ebuild         |  35 ----
 .../opencpn-plugin-statusbar-0.5.20180316.ebuild   |  37 ++++
 .../opencpn-plugin-statusbar-9999.ebuild           |   4 +-
 sci-geosciences/opencpn-plugin-weatherfax/Manifest |   6 +-
 .../opencpn-plugin-weatherfax-1.3-r1.ebuild        |  35 ----
 .../opencpn-plugin-weatherfax-1.3.20180316.ebuild  |  37 ++++
 .../opencpn-plugin-weatherfax-9999.ebuild          |   4 +-
 sci-geosciences/opencpn-plugin-wmm/Manifest        |   3 -
 sci-geosciences/opencpn-plugin-wmm/metadata.xml    |  15 --
 .../opencpn-plugin-wmm-1.0-r1.ebuild               |  33 ----
 sci-geosciences/opencpn-plugins-meta/Manifest      |   3 +-
 .../opencpn-plugins-meta-4.0.0.ebuild              |  25 ---
 .../opencpn-plugins-meta-4.2.0-r2.ebuild           |  37 ----
 .../opencpn-plugins-meta-4.2.0-r3.ebuild           |  37 ++++
 sci-geosciences/opencpn/Manifest                   |  11 +-
 sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild    |  67 -------
 sci-geosciences/opencpn/opencpn-4.2.0.ebuild       |  59 ------
 sci-geosciences/opencpn/opencpn-4.4.0.ebuild       |  59 ------
 sci-geosciences/opencpn/opencpn-4.6.1.ebuild       |  61 ------
 sci-geosciences/opencpn/opencpn-4.8.2.ebuild       |  63 ++++++
 sci-geosciences/qgis/Manifest                      |   4 +-
 sci-geosciences/qgis/qgis-3.0.0-r1.ebuild          | 219 ---------------------
 sci-geosciences/qgis/qgis-3.0.0-r2.ebuild          | 219 +++++++++++++++++++++
 sci-geosciences/qgis/qgis-9999.ebuild              |   4 +-
 46 files changed, 466 insertions(+), 1080 deletions(-)
 delete mode 100644 sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.31.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
 create mode 100644 sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.8.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.0.12.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.2.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild
 create mode 100644 sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild
 create mode 100644 sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugin-wmm/Manifest
 delete mode 100644 sci-geosciences/opencpn-plugin-wmm/metadata.xml
 delete mode 100644 sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.0.0.ebuild
 delete mode 100644 sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r2.ebuild
 create mode 100644 sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
 delete mode 100644 sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild
 delete mode 100644 sci-geosciences/opencpn/opencpn-4.2.0.ebuild
 delete mode 100644 sci-geosciences/opencpn/opencpn-4.4.0.ebuild
 delete mode 100644 sci-geosciences/opencpn/opencpn-4.6.1.ebuild
 create mode 100644 sci-geosciences/opencpn/opencpn-4.8.2.ebuild
 delete mode 100644 sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
 create mode 100644 sci-geosciences/qgis/qgis-3.0.0-r2.ebuild

(limited to 'sci-geosciences')

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 3c6f40e0666c..ea934a125fef 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest
index 6bec2d9c2c53..45b74fd752a9 100644
--- a/sci-geosciences/opencpn-plugin-br24radar/Manifest
+++ b/sci-geosciences/opencpn-plugin-br24radar/Manifest
@@ -1,8 +1,4 @@
-DIST opencpn-plugin-br24radar-1.1.tar.gz 172257 BLAKE2B 5547ca36b94606ad3213905ceee6153677a78f4f64f6d0bf2a15cdf63bad0db89a381d5bcd7bdcda5c427d81ab3a62c736496d5b2cf732ba46e85fa82e3c2755 SHA512 94202b69fc276614c828c0266a3d7ade375f4bd4b26d4acbf92dc9b35c60ac45d7050b1af08667207e856fe9778796dec1786a11e16eba840ed80b140b78e78a
-DIST opencpn-plugin-br24radar-1.31.tar.gz 253695 BLAKE2B 6752839a5ddb907715fb2b1a50f1798da041c48b0f687986eb2c15efbd82fd70d68637dc58a485c4894491ca04595faf11d982d9794508bd204289dd757c488a SHA512 30a5aa33e9f40625561477607de93ea77c9096b46c292ea4dcfc9cbec589b5c3e2650dc82ea646d7d353f587f3104493c55aa454cbf91884bf62a6b15e39e2fa
 DIST opencpn-plugin-br24radar-2.1.tar.gz 3947426 BLAKE2B a850973caa64ba4855d97e9374a5e40e292fd0df47a783a711453c49a07f3d945e33247a6199c5c1378dcc1ae29c2e4707675a12b02d3abbd8a115eaf107470c SHA512 357553396fd020e192dbbd5a05af1cd9e06c99244b426239a1d0aac4688affc1702bc16b62010236fc3af1ec7356f1dfb49e3afe3a94cb4dd7b1e0a2ef007af3
-EBUILD opencpn-plugin-br24radar-1.1-r1.ebuild 714 BLAKE2B 79a1f11f4d1de0011a74b403b3a42d7ee7cca481a9476d4f86731daa3f9413f865a1b892ab4e9ece8f7e4ef0629319c678573789abacdd1fa445d260eb0f86ea SHA512 68ce3f00848a945edc6476878aacc589eb1764386ce990fcb7250fdfadb178d1ed65e7e25dbff2fc18f8f6ec58a8ba2e9f3d6d865aaed945f7bdb35d4f18ea10
-EBUILD opencpn-plugin-br24radar-1.31.ebuild 832 BLAKE2B 819a5b28ac45e302388da587dc73037126f6f22a4bb1616bf5e989f8b65a7fea475242aeacc3f3e92d31a388e2ac567868a36e06425a46c7cd3e5a2b260f3104 SHA512 6dad3b3395618799648ba018b50583e67e62fb0b3c1200fc30c1ce36ed9d72e47d97997ebe94d5e8125dd2349e2c40af2253b9098999101a85cf4a3cf5c25a2f
 EBUILD opencpn-plugin-br24radar-2.1.ebuild 832 BLAKE2B 819a5b28ac45e302388da587dc73037126f6f22a4bb1616bf5e989f8b65a7fea475242aeacc3f3e92d31a388e2ac567868a36e06425a46c7cd3e5a2b260f3104 SHA512 6dad3b3395618799648ba018b50583e67e62fb0b3c1200fc30c1ce36ed9d72e47d97997ebe94d5e8125dd2349e2c40af2253b9098999101a85cf4a3cf5c25a2f
 EBUILD opencpn-plugin-br24radar-9999.ebuild 832 BLAKE2B 819a5b28ac45e302388da587dc73037126f6f22a4bb1616bf5e989f8b65a7fea475242aeacc3f3e92d31a388e2ac567868a36e06425a46c7cd3e5a2b260f3104 SHA512 6dad3b3395618799648ba018b50583e67e62fb0b3c1200fc30c1ce36ed9d72e47d97997ebe94d5e8125dd2349e2c40af2253b9098999101a85cf4a3cf5c25a2f
 MISC metadata.xml 465 BLAKE2B 3e0c72f423aaecd1092b831028dc7a728047a32a2297283d0877b082b1bd8adf51abed24710cc42222e3ba516b87f62c6bb5ba9c1da4a8d4e16b078d64ab5653 SHA512 42172f62749df96fbef1cf5bea2c1b07375ae435e2151ce086c461956311143658fc7dab4cb78f8e8f1ac4eda27c3bd175513874fc9a998e4b9a13d0ad470ae5
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild
deleted file mode 100644
index 0ccd8455a613..000000000000
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="BR24radar_pi"
-
-DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN"
-HOMEPAGE="https://github.com/canboat/BR24radar_pi"
-SRC_URI="
-	https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.31.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.31.ebuild
deleted file mode 100644
index d11cea941791..000000000000
--- a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-MY_PN="BR24radar_pi"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/canboat/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
-	KEYWORDS=""
-else
-	SRC_URI="
-		https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
-	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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest
index 5fbc149ae0aa..53afd2bb219c 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.tar.gz 298279 BLAKE2B beca26e2f6af956f4e834e23329f5e44cbeaa7202c03f72043af2d379946b0b6c061f866723666661fcdb15ea43eda2eebf308bdee3048386daba9ea7bae41c2 SHA512 6ace4fd2fb1625cbbff9305ca0b25fc275ed4b153473786b8f70cf31451f17010d0c59ec59dd22c2eed49833bf1d1785945e752b59169ecd89434ed049a33baf
-EBUILD opencpn-plugin-climatology-1.0-r1.ebuild 917 BLAKE2B 49ffb2a6278fa454a24eb69cf4c83d42f4c4c32dae690cc229837f71c54367a8330058e2e51ecd6415ba11c41f981f9f88c955a2124322b65b53d52fdf46eab4 SHA512 2dec26dfef80c064ddedb0907e460a5508513479d32d6e6736c4b0071ef00f8dd07f11a221ccb7e84b692ce5ec39f9866e6a17ffcaf860bd41ccf237a8ba8a7d
-EBUILD opencpn-plugin-climatology-9999.ebuild 1051 BLAKE2B 6824fc95ffaaa45a773f2064b9c32f7c51c66b840c21f4998c2ae602e537d12a567c41a6115253e9c4c666911f221a867b3113ade73a0b9c08a4e7a83a0ca6f7 SHA512 5d5c006dd860a963c5b06b9282d2a73165604782bfc82b74e693aaecff36651209d41af6dde255e2685d9eed603a4555f779577582acd7a4469bc0f24dc836a5
+DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505 SHA512 cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f
+EBUILD opencpn-plugin-climatology-1.0.20180316.ebuild 1071 BLAKE2B b3cfe710fb23c66b48110475a3e8e99d3282bc3e6582674c699e71014b1213ed780e52913d6f29e73e28e4d18afaecc16b24bcdd039034a5b6e8419db654d246 SHA512 142efa11d58d0e39cfd85d145a0fc01c80bc26e1a9802bacdbfea4c285add28c2f781c988c054c180fd11728d5c9f4a742a71388c45a63b145986f02c2ab3150
+EBUILD opencpn-plugin-climatology-9999.ebuild 1071 BLAKE2B b3cfe710fb23c66b48110475a3e8e99d3282bc3e6582674c699e71014b1213ed780e52913d6f29e73e28e4d18afaecc16b24bcdd039034a5b6e8419db654d246 SHA512 142efa11d58d0e39cfd85d145a0fc01c80bc26e1a9802bacdbfea4c285add28c2f781c988c054c180fd11728d5c9f4a742a71388c45a63b145986f02c2ab3150
 MISC metadata.xml 532 BLAKE2B 3916a4f03c5b5f8237a5715f1d0f9e4d665f0fdbe6e8c68005a2f73d6aaf094cb153b263f102e5c3b08f78722fcc075e58ce9873a5aceae61c3672459e15bd4d SHA512 12135b8d8c1d890b7462e1defff7573b7da01949d7cbf4b687b18de40ad46c4cb6dd5b494c5e1aaa49549cba2841d7c6a8b2129f03c5ea25c5dd176054c3dd7a
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
deleted file mode 100644
index 2937b98dc980..000000000000
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="climatology_pi"
-
-DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="
-	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${P}-CL-DATA.tar.xz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
-	doins "${S}"/{,../}data/*
-}
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.0.20180316.ebuild
new file mode 100644
index 000000000000..0f1404e579cd
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+MY_PN="climatology_pi"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
+	inherit git-r3 cmake-utils wxwidgets
+	KEYWORDS=""
+else
+	SRC_URI="
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	inherit cmake-utils wxwidgets
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+SRC_URI="
+	$SRC_URI
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
+"
+
+DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
+HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=sci-geosciences/opencpn-4.2.0
+	sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
+src_install() {
+	cmake-utils_src_install
+	insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
+	doins "${S}"/{,../}data/*
+}
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 769cbc41f929..0f1404e579cd 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,13 +11,16 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${P}-CL-DATA.tar.xz
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	"
 	inherit cmake-utils wxwidgets
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
+SRC_URI="
+	$SRC_URI
+	mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${PN}-1.0-CL-DATA.tar.xz
+"
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
 HOMEPAGE="https://github.com/seandepagnier/climatology_pi"
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/Manifest b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
index a45e59f13fac..1e2dc491dafb 100644
--- a/sci-geosciences/opencpn-plugin-iacfleet/Manifest
+++ b/sci-geosciences/opencpn-plugin-iacfleet/Manifest
@@ -1,6 +1,4 @@
-DIST opencpn-plugin-iacfleet-0.8.tar.gz 216763 BLAKE2B 70957f1d012d3752537cc05498b05204c09312832ac9b4394cc9abece43086dbc6ebfe8bfb44e18bd4cf42b5453f30a5b90ae7a41804088c8d160e5b1aa27c55 SHA512 34df1f5bcd22e87a99cdcfc34fc3054d1f23d8dcaaf3ad23df3536f333943bad8403a70f3ab09e49431393c7d41b3ed05df8539ba86ec4f3ba39f3ae48de182b
 DIST opencpn-plugin-iacfleet-0.9.tar.gz 218686 BLAKE2B 6c27fd57e7dc75d0a203a823ec75cacaf6fc351d58176f536542242b20e887ff58596bf114693d740258fd2c1a6af244f53825d0561ae9c396c5f556c0e1217a SHA512 f1e54fb17517dac2442de3bca85042add4a05f0b1caf144901581694403a9d9be9732a66f236f16014522b05108877b0dc530850bdf66b530e71c1b3cc010baf
-EBUILD opencpn-plugin-iacfleet-0.8.ebuild 785 BLAKE2B 9163e7250c843fffeb8090da1b4d8c88f45df5005dcfa5ad7a563b664db977fe578556be1d860a4b20abdc4f0cc71da38fd664d0cf304d36ac41baa94d712074 SHA512 193d9a7f4215606f1d3a0c6dfa4aa031bb83c818b6c9aa9ecf9e2e7f6052bceac8b9f82f990f94b0f77b073f659a0b056412876f813f53dec8ee4dc7263e52a3
 EBUILD opencpn-plugin-iacfleet-0.9.ebuild 785 BLAKE2B 9163e7250c843fffeb8090da1b4d8c88f45df5005dcfa5ad7a563b664db977fe578556be1d860a4b20abdc4f0cc71da38fd664d0cf304d36ac41baa94d712074 SHA512 193d9a7f4215606f1d3a0c6dfa4aa031bb83c818b6c9aa9ecf9e2e7f6052bceac8b9f82f990f94b0f77b073f659a0b056412876f813f53dec8ee4dc7263e52a3
 EBUILD opencpn-plugin-iacfleet-9999.ebuild 785 BLAKE2B 9163e7250c843fffeb8090da1b4d8c88f45df5005dcfa5ad7a563b664db977fe578556be1d860a4b20abdc4f0cc71da38fd664d0cf304d36ac41baa94d712074 SHA512 193d9a7f4215606f1d3a0c6dfa4aa031bb83c818b6c9aa9ecf9e2e7f6052bceac8b9f82f990f94b0f77b073f659a0b056412876f813f53dec8ee4dc7263e52a3
 MISC metadata.xml 462 BLAKE2B d7660fa1ea43df109e760588c9b2c4d439280a2d9682c100c97cb56f80baa4227f9ad74e694ab0afd313f55c3e5eda1fcee929f0976883b962352177426fc0c0 SHA512 54d4824a2cb4d73bfa15402951526b636ff942ebbab71abbe5e30e724c0af9b75f1403c13dc8b2538f4fbb9be692eed6f62d6ec340256fbfa7d849b1fb9bf8c9
diff --git a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.8.ebuild b/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.8.ebuild
deleted file mode 100644
index 6e2c14f2c4b4..000000000000
--- a/sci-geosciences/opencpn-plugin-iacfleet/opencpn-plugin-iacfleet-0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-MY_PN="iacfleet_pi"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
-	KEYWORDS=""
-else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="IAC Fleetcode Plugin for OpenCPN"
-HOMEPAGE="https://github.com/nohal/iacfleet_pi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-launcher/Manifest b/sci-geosciences/opencpn-plugin-launcher/Manifest
index 2ce8b3e460e6..aa174719d326 100644
--- a/sci-geosciences/opencpn-plugin-launcher/Manifest
+++ b/sci-geosciences/opencpn-plugin-launcher/Manifest
@@ -1,6 +1,4 @@
-DIST opencpn-plugin-launcher-1.0.tar.gz 126153 BLAKE2B c7e0437963f2533290d2c96b31c9d32cef38f53bd5c7338b1ed1534febccabb8861287d1894712668c1efa50e436d0e4ee471333058f6d18936c31944e1bfa0a SHA512 efaae3f9f8f1ecb4f4d1094714b7994cbbbb6bf69638a130db43f62a8852f9972003fd1b9ec20139e58a031c8b7c4ebdf1593a4044415a7f8c8417d1fcb7ac90
 DIST opencpn-plugin-launcher-1.1.tar.gz 136301 BLAKE2B 4f353fdba9cd1ed15c59bb7becb95245add0ab9b21332524f6916ba08f519933a116bec9997406328bb6088db783d76d8e81d3970716dc986f7ef5f4a8980099 SHA512 67d36849b592d27af34aacb0016bddf961a2a94f7f6e5e0ec404c698bec9bdc2771671ec0772476188f6fd6733327e5e566bcff388583dc2cae578e39e279a16
-EBUILD opencpn-plugin-launcher-1.0-r1.ebuild 663 BLAKE2B a691366bbdaa994a8ac3d2c546a2e908920971ea3a2a41f14cb1155ad36100255f6c4bb478db384db3d67e7b6490733026814e4a21570e2249cea5aab8cd09e7 SHA512 4ba92a2bcb517db77a0bd19bd63154185ca330b90aef919626da87d83dd5143b950e42c8a575498343cf50f7dc2b59bac5ee08374f367b768d88b71b4cb19604
 EBUILD opencpn-plugin-launcher-1.1.ebuild 780 BLAKE2B f1bdc78ca2366424a5a084794bdbeee60e8104c896cd81f18f7a7a2904d9663356fe5d6e03af9b8aecd936a0b787036eccc0197e962342f6dade47f583febe2f SHA512 bd382d8a99722c8805771a73702469d909b9c547a970b80b50f87e3e3ced040a84d60564ff2afa5b5cb3b3469f9b3731a2d77070ea9e7977b91e63f361dde861
 EBUILD opencpn-plugin-launcher-9999.ebuild 780 BLAKE2B f1bdc78ca2366424a5a084794bdbeee60e8104c896cd81f18f7a7a2904d9663356fe5d6e03af9b8aecd936a0b787036eccc0197e962342f6dade47f583febe2f SHA512 bd382d8a99722c8805771a73702469d909b9c547a970b80b50f87e3e3ced040a84d60564ff2afa5b5cb3b3469f9b3731a2d77070ea9e7977b91e63f361dde861
 MISC metadata.xml 462 BLAKE2B 56ec8a180b1462912025f7b88d91ea713278b2b56a0bb96b889c2393b9de8edf9cf083bb8a4b97dd4092e00fec6e5ae9716ee0b95a26a9cb439719833438657d SHA512 06769469f1a722a93d9a1037ca9653dcd413317e734b2cb8ac764d471b26bbb55873eabcc095afc4cac4c0178900f2982e5983bb3bb0d1b4cbe15a9da053d51a
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild
deleted file mode 100644
index 78bb49e50d43..000000000000
--- a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="launcher_pi"
-
-DESCRIPTION="Launcher Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
index 0b489c4ccb45..290c9a323e92 100644
--- a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -1,8 +1,5 @@
-DIST opencpn-plugin-logbookkonni-1.2018.tar.gz 3768720 BLAKE2B cc4ac80fc790b069b5a085953a9dffd0462f0814f4ac6b7420237b6b46a75d3de6bdf07212b53123b8b409d2b957b58597889fab5d5f05e0b9ff4d6fa5fd93b9 SHA512 5435b639bc635b5bbe87c92306d93dee7897ce3e5c6bb383aa228ad90127d2ab1f2a5e871a68abfec30ff2a327c4c21c023a61ccdad445a25bbb8a44fec19d41
-DIST opencpn-plugin-logbookkonni-1.2018_Layouts.zip 1722887 BLAKE2B c8447205c245212ee0371fce61bc98c203514aa9c88f0ccd11e35b26f05af07f077a147dc60a58a1bc4af7042e002be4b4466bf9fdbfe3cd8ac83980c200d07c SHA512 5ce35b3f4c14a432b472db496e8a5dc46fbcd5b0b404c085d6d024f2f383ae9e3767ccdf750177f102ec19a7a0d61a1ab331fef701bf29f8c851305a73923296
 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.2018-r1.ebuild 1416 BLAKE2B 7785a875e3e663ed73ae470946e4607cda9febc2a7e73eba5b187dfb75a0f54b8025200fcab44f8e74d6e7e496ac64aef42710b2fdd32039a687613c998631b8 SHA512 a10c938faa7a2bfdeb2a4d13652e17fe82f24bf82e949be94bf7d55c5bd2dea976273c267388849a8365420507275e6ed5e5ea01697ec988b66e78f7e0419e3d
 EBUILD opencpn-plugin-logbookkonni-1.3002.ebuild 1549 BLAKE2B 8b28719d06979b3d0b96c8da332b778300b74c6e688bcad6712a19460369ad29e3d0d386c529f6ce34ee6c80c89fb537c17a3ff04934d741e33fc3c831d7ff17 SHA512 9e8d1d9a98a9e3af0dd6ae741e1e5fe7a9ed3c59f33e73e3af5aa480a9ce9672088592e542c9072c95fd91fba86b7db1ea3bba9eb12cfe7812f6ada0c9359ef0
 EBUILD opencpn-plugin-logbookkonni-9999.ebuild 1549 BLAKE2B 8b28719d06979b3d0b96c8da332b778300b74c6e688bcad6712a19460369ad29e3d0d386c529f6ce34ee6c80c89fb537c17a3ff04934d741e33fc3c831d7ff17 SHA512 9e8d1d9a98a9e3af0dd6ae741e1e5fe7a9ed3c59f33e73e3af5aa480a9ce9672088592e542c9072c95fd91fba86b7db1ea3bba9eb12cfe7812f6ada0c9359ef0
 MISC metadata.xml 472 BLAKE2B b79d5d4322925eadb22f29139af36e610836888e745a64ebf7005d1ca06e54f9ca4b119162a902d5a3301ce0751e06fde1cdc3fb3b7b6ce363b327bc3e53c17f SHA512 6a2770dd9706b34e4615e3f87b1f393bd0a8ce1be5aa2060e0c5718c11238368320d872418452545591cb0d2464d6b49f27750381e9e30001588948e32e1cddd
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild
deleted file mode 100644
index c454a85cefed..000000000000
--- a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2018-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="LogbookKonni-1.2"
-
-DESCRIPTION="Logbook Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-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
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="
-	app-arch/zip
-	${RDEPEND}
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
-
-src_install() {
-	# install layouts as zip
-	cmake-utils_src_install
-	cd "$WORKDIR"
-	zip -r "$D"/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_Layouts.zip Clouds HTMLLayouts ODTLayouts
-}
-
-pkg_postinst() {
-	elog "Installation of logbook layouts"
-	elog "*******************************"
-	elog ""
-	elog "The default layouts zip file has been installed to:"
-	elog "/usr/share/opencpn/plugins/logbookkonni_pi/data/LogbookKonni_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"
-	elog ""
-}
diff --git a/sci-geosciences/opencpn-plugin-objsearch/Manifest b/sci-geosciences/opencpn-plugin-objsearch/Manifest
index 5c6673a0a5cb..7c7764f9a52c 100644
--- a/sci-geosciences/opencpn-plugin-objsearch/Manifest
+++ b/sci-geosciences/opencpn-plugin-objsearch/Manifest
@@ -1,6 +1,4 @@
-DIST opencpn-plugin-objsearch-0.5.1.tar.gz 1954813 BLAKE2B 04ef4c0927995c012db67ec62f3aa8a29decb3219471e4f1f4d284bc0389310f9d7bdf2d3166d1501489bc9853bbb4ff8bbc428480943fe7cdacdea4c2e1a7a9 SHA512 dd83352eab307b991d3d296b9bbab2a972a2ce4f33c1ddc55c048c3414c11d5b7a8429a32f2d9c96017fb16c841dc3c6fee8522dea690eaa17b3c7e5ac1fbfd0
 DIST opencpn-plugin-objsearch-0.7.tar.gz 2047642 BLAKE2B f7e07c93bab6929a9d096b4c39e14842b8069f134e5cb4ba7ff69d79371c1d04754e11592d440832abee8b41eb6de1f6ad9abe3f21ecc892ea3b2f9bf0a7a093 SHA512 9c371bf3a5ef551a68ea7e2569536df37d7ec1241be011c6a313229f3c34697332c967c91855d9ccdd4f0a3412ade130fe241ea22c803f7c37543539602f71b3
-EBUILD opencpn-plugin-objsearch-0.5.1-r1.ebuild 675 BLAKE2B a643db4daa8681a9d18dcc852553f96544ed743d571fdf80b319933c60406447da6589f3c9a849d595557ea95e41c9c1c5b33f66a3715696eac8c251aca53523 SHA512 82253c277ab0b6157b2ae859c6e6f2af82533a3b1ea1370a075d8bae6628f47c396a2c8e63a8ad48167c2ca9a6ac0fb40817d6fc3d417bef5d0be16d99cd25ee
 EBUILD opencpn-plugin-objsearch-0.7.ebuild 793 BLAKE2B 891df08e82d362aad26c1a06d1e8ec1183b1f4319d2f5dc02211657e9ffd5aa0264fd9130576240353e602060a8eb7044f38137799bd03ac281c350a50cb1747 SHA512 b7bb220e1c3665b2a3644fd4278e7152f4db22eae4734cdfeb2334891fc235e4e39171c130770f680047c18e18cb9a8eb3ca82e34fde9cccd8e97272ee3436e5
 EBUILD opencpn-plugin-objsearch-9999.ebuild 793 BLAKE2B 891df08e82d362aad26c1a06d1e8ec1183b1f4319d2f5dc02211657e9ffd5aa0264fd9130576240353e602060a8eb7044f38137799bd03ac281c350a50cb1747 SHA512 b7bb220e1c3665b2a3644fd4278e7152f4db22eae4734cdfeb2334891fc235e4e39171c130770f680047c18e18cb9a8eb3ca82e34fde9cccd8e97272ee3436e5
 MISC metadata.xml 463 BLAKE2B 7ae48ec6bc3192b3e6d522e9a8d4e8c09051f9fc453491c3c9e2f2508a6b95b572e3c34daa5dd714cba180df7dce6625351281c39f6aa6d06e68c660e9fcc7e4 SHA512 8a075b8eebde4adb85d11893601a3cc6c620653f63853aff0b2b65c0e887f11434e01fb99599a7312ab40b0ec3ddb2ecdfc0bbe1dc1f3f13ef237f4070a3007c
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild
deleted file mode 100644
index 939eb7d41650..000000000000
--- a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="objsearch_pi"
-
-DESCRIPTION="Chart Object Search Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
index 58ebdd533edc..e812c0ab6658 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
@@ -1,6 +1,4 @@
-DIST opencpn-plugin-ocpn_draw-1.0.12.tar.gz 1122888 BLAKE2B 124fe1721582a81bb4f81e993e2ccc6f83c0e81bbbb126edb13cf9dd6816cbaaa9562fd6d13d2e54229c66e0151c7e53429360438ae75c20995380652815991d SHA512 d9c6afe17efbc3fa668958b55a67ba7160670ef1c3c16c1db11d360dcd8dc2c27894b89cb724443c96b6d30152ee01e651a120dfe003a3d3a951872c7900850c
 DIST opencpn-plugin-ocpn_draw-1.3.14.tar.gz 1341500 BLAKE2B 9324a05d4c7772808be9b90e4b9451724eb8b4ed5439e0dcb40eda13d9583246f9ee47e627e09c219c0fb7e8173079e85c2a0f7be2da2f1cc0f7d7d0548ef974 SHA512 8102eda5edc1b198db639a662f3533423e67ee6a3633c1a74b727a56e3176737deb930d77fb9dbbf38b8c8f678fb31c8087ae5636bc3f9ed156dbec77bdbe6cf
-EBUILD opencpn-plugin-ocpn_draw-1.0.12.ebuild 786 BLAKE2B c3e91f0c681fb2bbeaf3b9568ccb6f2d68ca9bbfd6b6d6b289d6eb419104228d381d8a12a893ec1cea3bb952e23aa7ad727791b258277782a4952ee5e5c55bff SHA512 0d60b0b60c776ca6f0bb369c786e86683ff16d68a8023312ef66a0d2700a76e592c05e6803dee01b8819458fbdc92aaf9c0deea4a027c82fe82371d263d6fffb
 EBUILD opencpn-plugin-ocpn_draw-1.3.14.ebuild 787 BLAKE2B d7db91d421fe3ffa3bbc8617b0e83269f30cb7b580eef0207538e3d06068a2501845c36a142196b19f9db6579f2498e870ffe16dcff9307112ac36f817b15bdc SHA512 2d41e35e4be0d9dbc244b8c10ff84504b017fb4022f0d8fbc699c11dd626c0e263f2ee52e585e1bb5e79417059bf3aab9247316ab05774ba69c7f6e18da18aaf
 EBUILD opencpn-plugin-ocpn_draw-9999.ebuild 786 BLAKE2B c3e91f0c681fb2bbeaf3b9568ccb6f2d68ca9bbfd6b6d6b289d6eb419104228d381d8a12a893ec1cea3bb952e23aa7ad727791b258277782a4952ee5e5c55bff SHA512 0d60b0b60c776ca6f0bb369c786e86683ff16d68a8023312ef66a0d2700a76e592c05e6803dee01b8819458fbdc92aaf9c0deea4a027c82fe82371d263d6fffb
 MISC metadata.xml 466 BLAKE2B 56c6ce77a0496bbc1c8fbfa8abcf37487bfba38f448cfe139fee70cbf60e64001da61e5bccd59f69074dd28799c077d7882c013495b582aaf508b78a1d90c642 SHA512 018ebc234b7cd3fad579532636a57d8649b20ddafc25a43af81fe79189ce1cdbc6b5c227fa5b2591e114739ae9d48e1943213065ebdad779ea1209f7516c7dcf
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.0.12.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.0.12.ebuild
deleted file mode 100644
index 6799ad2bc798..000000000000
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.0.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-MY_PN="ocpn_draw_pi"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
-	KEYWORDS=""
-else
-	SRC_URI="
-		https://github.com/jongough/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Draw Plugin for OpenCPN"
-HOMEPAGE="https://github.com/jongough/ocpn_draw_pi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
index d68afb9be7d3..2a43b07a5da6 100644
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
@@ -1,8 +1,4 @@
-DIST opencpn-plugin-ocpndebugger-1.0.tar.gz 109976 BLAKE2B 5fb8e60821d30ea55ae43869712e45d4ce30ec5f26c791e3e4e4731fb68102bf29d5a84ecfd5d935cc25a7d5b7d2836c064f872af99bc212b7aebe039910883c SHA512 0230d123a706b136269d81a509bb64262c3b007d0d7b944089bb4bd113a56217cf0321ea82b170ce1ca8d3b4b08b996d09a088137c4d1817bb795ed4de50f6dd
-DIST opencpn-plugin-ocpndebugger-1.2.tar.gz 122773 BLAKE2B 6d8495cf9b235807a4efe1e3e7903cbef3e8ebe3ecbb11afcda64f192f2d650762f958e8af74cc67033cc65271dc21b56900f7e2d5e8623ce7a8c92238059d6d SHA512 f14b831a2ba65c16b95e829b70a39f17751c6f6b6c3d4d6899d8b02ae82deaecd9bc1a097f2583c412170e5f7bc6f08f4fbc10c08b37e1cd1d6698e38229d41c
 DIST opencpn-plugin-ocpndebugger-1.3.tar.gz 127623 BLAKE2B 8c09e80916f7e7435ea54b5d0aba82e703ebbffd0fbc3d75282f21fec73c74f39d07ce73aa2f9e4d6f0185935a003c33256c2a1580ae7c36ecdd30a53b90aec6 SHA512 30caf922cc5a5255741b780c8f09ea4de9d7bbbe0b6ff65fe32a7484da4c75e53fd03e6a83966dc70ef4f7f6483dacce7f74392e4b3556b984f90b2eb5f9e01e
-EBUILD opencpn-plugin-ocpndebugger-1.0-r1.ebuild 692 BLAKE2B 08750a978f43214d2af8fd770b857399bea55e323ea600ab3842551c1b4204e69af078d1b8681919586919cff3213d19a2ca08610e6e2dbfaaf7ca9a2c00f71b SHA512 2279ddef44e45f1b280f4d46ef4d78adad334b6fe0d5499a326e0accf22377cba5611e3f75eab8c10401a0c173d4f32f0675852bdc8cfe73a28b1ecb5e793f06
-EBUILD opencpn-plugin-ocpndebugger-1.2.ebuild 813 BLAKE2B 10ab101639c1e253e2e66be826a3a119dc73606091b53aa881cdb1f90947a4269d0606af15f8d7084724cc588c8fa877cafa87ce4640f12c9d61f06740e1df27 SHA512 9e3a080a9894a25829e6536e2003eb6b9a9d2570978d091a9f9dad15f23dcb4743ed9e7380c001b387aba82bb1c956c9059aab4658501ce68df9d05541203f64
 EBUILD opencpn-plugin-ocpndebugger-1.3.ebuild 813 BLAKE2B 10ab101639c1e253e2e66be826a3a119dc73606091b53aa881cdb1f90947a4269d0606af15f8d7084724cc588c8fa877cafa87ce4640f12c9d61f06740e1df27 SHA512 9e3a080a9894a25829e6536e2003eb6b9a9d2570978d091a9f9dad15f23dcb4743ed9e7380c001b387aba82bb1c956c9059aab4658501ce68df9d05541203f64
 EBUILD opencpn-plugin-ocpndebugger-9999.ebuild 813 BLAKE2B 10ab101639c1e253e2e66be826a3a119dc73606091b53aa881cdb1f90947a4269d0606af15f8d7084724cc588c8fa877cafa87ce4640f12c9d61f06740e1df27 SHA512 9e3a080a9894a25829e6536e2003eb6b9a9d2570978d091a9f9dad15f23dcb4743ed9e7380c001b387aba82bb1c956c9059aab4658501ce68df9d05541203f64
 MISC metadata.xml 466 BLAKE2B af98096d5c2c128da1ba6074747879d99d10a35732d19a108653d8f616d7da5da942a0aecfaef14e68d3140b83d446c1530106494cd2c2bcd326dd06e89572b3 SHA512 17a5a5e747b2b9c014249d95219ee6dbd634cc2e3bca64578d5fd94e7c054549e59141b541e3d509aea2083b288805e131f28ae244143be3d25f62dcb55e50bc
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild
deleted file mode 100644
index 6b5bd13947c2..000000000000
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="ocpndebugger_pi"
-
-DESCRIPTION="NMEA-data and plugin-API Debugger Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.2.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.2.ebuild
deleted file mode 100644
index 3ceeca86881d..000000000000
--- a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-MY_PN="ocpndebugger_pi"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/nohal/${MY_PN}.git"
-	inherit git-r3 cmake-utils wxwidgets
-	KEYWORDS=""
-else
-	SRC_URI="
-		https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	"
-	inherit cmake-utils wxwidgets
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="NMEA-data and plugin-API Debugger Plugin for OpenCPN"
-HOMEPAGE="https://github.com/nohal/ocpndebugger_pi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-"
-DEPEND="${RDEPEND}"
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-statusbar/Manifest b/sci-geosciences/opencpn-plugin-statusbar/Manifest
index 772722458de4..b637873e2f07 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/Manifest
+++ b/sci-geosciences/opencpn-plugin-statusbar/Manifest
@@ -1,4 +1,4 @@
-DIST opencpn-plugin-statusbar-0.5.tar.gz 86323 BLAKE2B 1023563fabba859a9528381a00b1ecf607d20fe65fdfb9d1e6839fa82a8c613b125e59d6009d530d5f4196efbbc2a5cd1f9c6eb606c4ee8303983f974d13f22c SHA512 cf723717f41c87b3e7dd40c1d485f873d336f598fe022adf418290443333fd19d874d294bd4b36bea10e026fdf0e27b76d098196ba0aace360ae86c103c6e1b4
-EBUILD opencpn-plugin-statusbar-0.5-r1.ebuild 676 BLAKE2B e2a43cd8e05330515481a848037dd0a4ada74de7fcf0ab3f8430664740fbdf85cf6ec8b1669a303f668ea83a6d831d0bd297efecaece2782bb1ca4777d84e23e SHA512 9c3cdcefb5e92034423ba4325f8344ce5511ade82879ef49f8376279839a26718ca10a0b49bd9e768d10908cc09c95786155d93e08eb91c12b86c2b545d35007
-EBUILD opencpn-plugin-statusbar-9999.ebuild 807 BLAKE2B d0ebe6b63e0b147e3915d4d675021ba7a5ecc9e467a5aeac85fdfa265b60d4c9b7fba4e8ed4435380d84c49fb6c8664b6e5034d1ec99e1d3cc2d1ddb165cb1c1 SHA512 fe7fc58cd391409c88aab601a6c1dfbcd0c0a7aef6c68755a01235ea25c17dff81f0752d6af77aa5da55600015bb324148293b1df332c352fd8a4b295e04cdef
+DIST opencpn-plugin-statusbar-0.5.20180316.tar.gz 218364 BLAKE2B d1da43ec085e1d180fca524c44ae2f6410b0f74a1f65dc5d586087a46b6f2735a60e3e5332f072d181e0a23a9d2f254a9b0f5872e81a749a3af4fa65c3a997c3 SHA512 9ea70258367d5370fd70d894c098fe781141505a18365d197b58f30e65df57f7b0fd9c5e4bc95603d89f5dd49cc7ef5bcc921f6cd2d12d407686446551ce4eca
+EBUILD opencpn-plugin-statusbar-0.5.20180316.ebuild 801 BLAKE2B 4e66891a2ab8657448534cde251aa6d9a6720bba1972193f20258663a3b321f95c6e117937308f72b39f4cb13fe3bfb93323c1331203e9c700bcf9784666d488 SHA512 7c86f016e4f6796afc0a098b7ecd3cbbc0947c126ee4a36d5fe2624bb852a7267c3facb1e83506dfe7202a36b061950dab9bc9e893c56d4627da8f1f385f1a16
+EBUILD opencpn-plugin-statusbar-9999.ebuild 801 BLAKE2B 4e66891a2ab8657448534cde251aa6d9a6720bba1972193f20258663a3b321f95c6e117937308f72b39f4cb13fe3bfb93323c1331203e9c700bcf9784666d488 SHA512 7c86f016e4f6796afc0a098b7ecd3cbbc0947c126ee4a36d5fe2624bb852a7267c3facb1e83506dfe7202a36b061950dab9bc9e893c56d4627da8f1f385f1a16
 MISC metadata.xml 471 BLAKE2B 2902dcf0f9c69ae77b825128b128a9abc2df0e460b8d7ab2bfadfbe74577e73256508e3ef43e7680b7f4e81bc7d91af66ab6a3c8b161b9afbb2efa48a65b05cf SHA512 dda5fc5256bdf396ef20026f048570ee711382993d900aba3080c2032743229594a98f994673b44905f72756fc04a1232d8e3768b793f98199aac450067def88
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild
deleted file mode 100644
index ae5dd468d7ff..000000000000
--- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="statusbar_pi"
-
-DESCRIPTION="Statusbar Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="
-	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
new file mode 100644
index 000000000000..307e60fb53a3
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.20180316.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+MY_PN="statusbar_pi"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
+	inherit git-r3 cmake-utils wxwidgets
+	KEYWORDS=""
+else
+	SRC_URI="
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	inherit cmake-utils wxwidgets
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Statusbar Plugin for OpenCPN"
+HOMEPAGE="https://github.com/seandepagnier/statusbar_pi"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=sci-geosciences/opencpn-4.2.0
+	sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
index ad141e70ffc6..307e60fb53a3 100644
--- a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	"
 	inherit cmake-utils wxwidgets
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/Manifest b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
index b077ccac4bd1..95fdccfd6b36 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/Manifest
+++ b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
@@ -1,4 +1,4 @@
-DIST opencpn-plugin-weatherfax-1.3.tar.gz 505937 BLAKE2B be7ba09bcda55e9806239553c6e0f99ddee7cc5848de9a3203fb061543babfb15624961775e7b702348980f3523865b863526739703b7b32122b272add23f627 SHA512 54fe8f25a21d373ab00bcd5d77950532bb06c5324cdd1082e4109cad8a33b714ed0d7cd8ebe7e9540e5e10039b2a0fe23b4b88df0244f1e84b852111807ad6e4
-EBUILD opencpn-plugin-weatherfax-1.3-r1.ebuild 678 BLAKE2B 96d99ccea0c08d0fcf9c1cb7a11dbee3003616f3f23891adfa0c6a55d0583c834851bff64e9193fda0a7a82c6ef2a51a454302d27c97b4b181666d801ba49fb6 SHA512 6ddfccbc2abdfa1be0d811a124a1942dbe722b38e400c557da41534eec82d2fde92aacea7847c15a878ccc1a7aa5b402bb6172e21d9444a94c625f77af19b49a
-EBUILD opencpn-plugin-weatherfax-9999.ebuild 810 BLAKE2B 9489ac2470cfe47def33e89877ff3d34a555e959faa5626ecc2319d90cf734c0b3fe04bf1c050fed3539a9b7c9478f6454435125a0db797b99de33f61381c645 SHA512 1ebeec9d9532505b0be845389ec4941182e87218d63b0e6eeadccd3a73c7786e4e85e28890463991df180aab77a65e4b82b2e9064d4c030a16939ee1e45de157
+DIST opencpn-plugin-weatherfax-1.3.20180316.tar.gz 585747 BLAKE2B f81de2da49cd16be62b4fc64e025626a3b7470563db32293803275c0a682b1eff5c85dead9d846e6b69362aa6faaf370f707ab7dab0db981a431bf8872a66430 SHA512 effa3fc2c348bf5a0d70dcfee8a4643f8cba51e5177e40affc50e2d85bffcb2c89c067a57eadb18834900691214b2b1ee17760a8b525cf12da4c7a3e6970daf0
+EBUILD opencpn-plugin-weatherfax-1.3.20180316.ebuild 804 BLAKE2B 0e8aab3a988904441b39409bffe139eff8d42bdad69c533e9492486622ed82af7003a6fbe26baefa7887a1e71e0a14ce1e7dfe96975640d7d80128ce48bda101 SHA512 271083938897560ddc6d7bc60b260ec1c32cdaec133fa1b1c863ce9419d0bff17b96884b2053d99a4ed07cf9e5a261c348c3b559d4a547a8e28c997a7ddef9e9
+EBUILD opencpn-plugin-weatherfax-9999.ebuild 804 BLAKE2B 0e8aab3a988904441b39409bffe139eff8d42bdad69c533e9492486622ed82af7003a6fbe26baefa7887a1e71e0a14ce1e7dfe96975640d7d80128ce48bda101 SHA512 271083938897560ddc6d7bc60b260ec1c32cdaec133fa1b1c863ce9419d0bff17b96884b2053d99a4ed07cf9e5a261c348c3b559d4a547a8e28c997a7ddef9e9
 MISC metadata.xml 472 BLAKE2B ab4fea250816bd907dae37e19a85072902dca8dca6a3a5ea20627fce422a54047813f282efd3c5449ac4a2d0a58fe0233fa94ce6c1a3c707d92aad0bad46f61a SHA512 24db5d6bf03a85cf0b7b246bb2e8472486bf457d284e1f5fa716e09d376e72836bacd0fe9041b93889e2f98af6865ed15481973874e1f93386b6fa71eeef8ff5
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild
deleted file mode 100644
index 551c95334f6d..000000000000
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="weatherfax_pi"
-
-DESCRIPTION="Weatherfax Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="
-	https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
new file mode 100644
index 000000000000..a9bec2036741
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.20180316.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+MY_PN="weatherfax_pi"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git"
+	inherit git-r3 cmake-utils wxwidgets
+	KEYWORDS=""
+else
+	SRC_URI="
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	inherit cmake-utils wxwidgets
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Weatherfax Plugin for OpenCPN"
+HOMEPAGE="https://github.com/seandepagnier/weatherfax_pi"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	>=sci-geosciences/opencpn-4.2.0
+	sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+src_prepare() {
+	need-wxwidgets unicode
+	cmake-utils_src_prepare
+}
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
index 2551edd07cf2..a9bec2036741 100644
--- a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="
-		https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	"
 	inherit cmake-utils wxwidgets
 	KEYWORDS="~amd64 ~x86"
diff --git a/sci-geosciences/opencpn-plugin-wmm/Manifest b/sci-geosciences/opencpn-plugin-wmm/Manifest
deleted file mode 100644
index 0f2085e74b88..000000000000
--- a/sci-geosciences/opencpn-plugin-wmm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST opencpn-plugin-wmm-1.0.tar.gz 3532763 BLAKE2B 8080bf5773ae504709858b457189481b4eada05adf55a4f3ec43da68c77ea064bd69206e9862946eedcecf55b38d7600ce814665ffbe2a4b5fbd262c757f6305 SHA512 97c577c02dcbb913be45a1438d3d9a974a81720594cc3a6f7757c1e7518d04051c02274acdad0bd8eee08fac94e1923390440f515dacb3b213547d9e93cb0a4f
-EBUILD opencpn-plugin-wmm-1.0-r1.ebuild 670 BLAKE2B 96046ea3a3bcbd09be4b80a1fb4013aa4b95f169a2a4dc91cd9f81e58b1af2bb4838551898d937e2628b7b4a10b1526e346932ba772b0d7da8e1979d51d54cad SHA512 c726ebceee7e9c97dd2d95374f3b3d8c46c407305d32c1437ce81711d63d6c39487d6b197362767e268d9b243cb6e5cac81f10127bfe52a90604dbb4f044b18a
-MISC metadata.xml 457 BLAKE2B 244e92aaca17867cf0357ad22fe421e19c22542eb7fe8f27752dd8749f05eb9ab93fd63ab343738d66cd539d81125e1d9faf2a437b4b08fc869ff0fac794f4d3 SHA512 2278dbdab235a287567c7d1819029cf8f79e1c31aa76fa5604d470dfce619d52b1b7d09a42bce8dc3d91a043508df07660fe08e2b245961858c1d76fc86c981a
diff --git a/sci-geosciences/opencpn-plugin-wmm/metadata.xml b/sci-geosciences/opencpn-plugin-wmm/metadata.xml
deleted file mode 100644
index bcbd16abcb2d..000000000000
--- a/sci-geosciences/opencpn-plugin-wmm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci-geosciences@gentoo.org</email>
-		<name>Gentoo Geosciences Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">nohal/wmm_pi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild
deleted file mode 100644
index 96e066bb8b69..000000000000
--- a/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-MY_PN="wmm_pi"
-
-DESCRIPTION="World Magnetic Model Plugin for OpenCPN"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
-SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.0
-	sys-devel/gettext
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	cmake-utils_src_prepare
-}
diff --git a/sci-geosciences/opencpn-plugins-meta/Manifest b/sci-geosciences/opencpn-plugins-meta/Manifest
index 907c920f0e9b..f08f5de0d8ab 100644
--- a/sci-geosciences/opencpn-plugins-meta/Manifest
+++ b/sci-geosciences/opencpn-plugins-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD opencpn-plugins-meta-4.0.0.ebuild 741 BLAKE2B ccdb85b958408faf0c69d1996fe7897a4935631d0c4f2f9364377e267166da10c3ef7aa609a8af661fbbf69a1f258e42b6f5c93582ee7138c3b616f0f88319bb SHA512 c21ee14259e3ce06f51acfc36a120f26f2e51283d8e06c2c10c77128fb99a4067b29a6282697c40d3308c558bdaa9e2c51d2e69e94cc3d3628b665254f6d02b9
-EBUILD opencpn-plugins-meta-4.2.0-r2.ebuild 1327 BLAKE2B dd8df755440bf88d585457aa6139642c0067d830142b1bdc4f0923e6d020b9956a968268e67a229fffb8d53724e814217e87c1c7eaa6438fd0c2461b84c57572 SHA512 75ec1be55464442f92b79c0a9aefb995dc5d09b5c5adadfe800b64c902fbd2e9fd837fe04b73553941db1e77d82e0eac491ca64d2a4700903f7760d60c12e2c7
+EBUILD opencpn-plugins-meta-4.2.0-r3.ebuild 1354 BLAKE2B d46b48f16b553279ca65fc17848f2cb918cc5d079bfce47d30a347324f25c13a6d18887fe3f175ee15afa232ca245f5f5127b0c611c6e15f5f57d021e47556ad SHA512 06959e4ae448d57e5d8f28f1deffb73a1bd2597a001b8b71a30a3a92e7ec60e9ecd4de33c4ae446085e3841d7cd0702bae2b6efc9c5b0f9d574ea6b0819c5abe
 MISC metadata.xml 380 BLAKE2B e36e71274105ca4ccc90d1956dbd050ef82af00c0342c17b6d98e7b1d2e7fb9096ab4a2aea3763d054ffb9165d6d8b20122908c6b4ab651f18b722aeec66672a SHA512 8e6413ba8a2f51d21bd883f097825a3e86a410d222496242fc2b6da34ee8d759c473e1c1c58ee93c90b0d88db2cfd6e1f8c00fa29bd8a1637a2026142b9b18ab
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.0.0.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.0.0.ebuild
deleted file mode 100644
index ce300f5720fa..000000000000
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta ebuild to pull in opencpn plugins"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	~sci-geosciences/opencpn-${PV}
-	~sci-geosciences/opencpn-plugin-br24radar-1.1
-	~sci-geosciences/opencpn-plugin-climatology-1.0
-	~sci-geosciences/opencpn-plugin-launcher-1.0
-	~sci-geosciences/opencpn-plugin-logbookkonni-1.2018
-	~sci-geosciences/opencpn-plugin-objsearch-0.5.1
-	~sci-geosciences/opencpn-plugin-ocpndebugger-1.0
-	~sci-geosciences/opencpn-plugin-statusbar-0.5
-	~sci-geosciences/opencpn-plugin-weatherfax-1.3
-	~sci-geosciences/opencpn-plugin-wmm-1.0
-"
diff --git a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r2.ebuild b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r2.ebuild
deleted file mode 100644
index 7d099d9af53a..000000000000
--- a/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta ebuild to pull in opencpn plugins"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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-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-objsearch-0.7
-	>=sci-geosciences/opencpn-plugin-ocpn_draw-1.0.12
-	>=sci-geosciences/opencpn-plugin-ocpndebugger-1.2
-	>=sci-geosciences/opencpn-plugin-oesenc-1.6.0
-	>=sci-geosciences/opencpn-plugin-otcurrent-1.2
-	>=sci-geosciences/opencpn-plugin-polar-1.1007
-	>=sci-geosciences/opencpn-plugin-radar-0.98
-	>=sci-geosciences/opencpn-plugin-route-1.2
-	>=sci-geosciences/opencpn-plugin-squiddio-0.7
-	>=sci-geosciences/opencpn-plugin-watchdog-1.9.051
-	>=sci-geosciences/opencpn-plugin-weather_routing-1.10.1
-	!~sci-geosciences/opencpn-plugin-climatology-1.0
-	!~sci-geosciences/opencpn-plugin-statusbar-0.5
-	!~sci-geosciences/opencpn-plugin-weatherfax-1.3
-"
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-r3.ebuild
new file mode 100644
index 000000000000..08856b3f00c9
--- /dev/null
+++ b/sci-geosciences/opencpn-plugins-meta/opencpn-plugins-meta-4.2.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Meta ebuild to pull in opencpn plugins"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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-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-objsearch-0.7
+	>=sci-geosciences/opencpn-plugin-ocpn_draw-1.0.12
+	>=sci-geosciences/opencpn-plugin-ocpndebugger-1.2
+	>=sci-geosciences/opencpn-plugin-oesenc-1.6.0
+	>=sci-geosciences/opencpn-plugin-otcurrent-1.2
+	>=sci-geosciences/opencpn-plugin-polar-1.1007
+	>=sci-geosciences/opencpn-plugin-radar-0.98
+	>=sci-geosciences/opencpn-plugin-route-1.2
+	>=sci-geosciences/opencpn-plugin-squiddio-0.7
+	>=sci-geosciences/opencpn-plugin-watchdog-1.9.051
+	>=sci-geosciences/opencpn-plugin-weather_routing-1.10.1
+	>=sci-geosciences/opencpn-plugin-climatology-1.0.20180316
+	>=sci-geosciences/opencpn-plugin-statusbar-0.5.20180316
+	>=sci-geosciences/opencpn-plugin-weatherfax-1.3.20180316
+"
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index 7bbfbc7b4d41..bfe88c04dd14 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,13 +1,6 @@
-DIST opencpn-4.0.0.tar.gz 40095375 BLAKE2B bf23aa083f0d6a5f3428b014f3c99dba01289166adf4b7f4a50f93f3291d26610429c8ab3f4521921a5dd7ece6c6f065996acc34b46cab83536343c3eef4b667 SHA512 84e20d5a5496778096f9cbce3507475ae6c11619eb5cc19e928647e360980e2ac868d1f45712bfc8da3607d4fa3822b6672b8844a914b387aeeda7bf645668f0
-DIST opencpn-4.2.0.tar.gz 40621320 BLAKE2B 3b7fbb89d2d23bd8fb0ac0b70d0b1357b87663caa79138a493ce7ccf40827cdbf62a3f169e47d07c275e51d7c069a68e6ca0618e402e4e250962977826769964 SHA512 86bc1b29482b41ff615a8904017279a0e42785c7b74aa4f2b6195a388943408fb85802253dead1144218900cf7aa163bfe928ca3aaa86ca32d04979a377a80bf
-DIST opencpn-4.4.0.tar.gz 40840928 BLAKE2B 53ba4aa9fc499532bcbefa8cb6423eef342202e5aa786e8482ef23385f3e56465498209d8aa1863923cd9576756b6861b8e6e3c604df126a079327eecbee3047 SHA512 ebe4c3518d2addbbba36cec78719cb1c853969923e7ade4f6df78a8520224fef9f421b809f573cfa770acc9b9d31a90341d6114edc02a307682d0fca5c62b26b
-DIST opencpn-4.6.1.tar.gz 52852694 BLAKE2B 71780ebea25a6c2b952470eaad477d3d392fbba3a465e1731400c1dce06fad5cab5c8bb15e58504a05b9be0dbc69401379615b7302cf59b192cb123f90f766a2 SHA512 493c4ba35011b0d69633a6c0653b23d02e50d1ca694d820b0bcaf4a96a8b7e69364ee7412a0a7c13cc1c2f1fd9bcc4f2b1b13a0b3c04e438918c77ccea78e7ab
 DIST opencpn-4.8.0.tar.gz 53008393 BLAKE2B 79184b678db329e98c704f4f1a132e5d3af4a65b104c6eab1c37738cbbf98d88c21647ce654077a8f4b781221d7e3766c35d7450b81befdad7f269b636263c09 SHA512 1f1ea666566e98ee3af24423985119c1b14e184d4310dbc588b00065878b1dcb8fe73a7331e4ad3f75a905774fff187203fb31253faea7238f3d783a6729ad75
-DIST opencpn-doc_4.0.0.orig.tar.xz 14732480 BLAKE2B 32ecb7096eb795d969f42c0b2ffe87d2d74bf20502ac93233b2953f9e26b834498fb9876d88c9fb0e4a792509b8fb971f661aadeeaed2eda289fc633c67e0fe8 SHA512 fb80e4afb759c99cf24b498c454bc492aa0b3c02443424b0f39910e1a494670093ac5ee19cd40a8a0abb345e18b7496b8a70c160bed5215af6bcee07e145ee36
+DIST opencpn-4.8.2.tar.gz 59164504 BLAKE2B fbfa86051845a922a7c642194cd0672fbccd6a75e3897e8b0b3f9b08c091d0933a146060f83265c9a85d0bacf18f57a0f9ba55aa4f26e035a77d39d73e5e5a7d SHA512 231f8ba29f8a0343cb3807e52e8535bdade221de65a169b57e94816b4b464407ba90b605dcec21a5c45c742de076b644f076fee88616ec2867a8ae182105102d
 DIST opencpn-doc_4.1.1329.1.orig.tar.xz 8739872 BLAKE2B 1d0b1538230488586318212d371669d0dfd6fefb45a49c1405c8749cfc2d5b1ced39c03ad7814954db42644ab5c21a37177e0f315b8d6d49c2200508f27a9899 SHA512 652a932edbf8a6f05fd3c64ddf566f817405cf44697035f58ddbf1a99bf92269b7fd9ee83b7ee065aa60db15b6030d8c5c9a4a4001049ed2def9962bc51746c2
-EBUILD opencpn-4.0.0-r1.ebuild 1559 BLAKE2B 33a083e7e98ec9a95bbf12cc6c33cc3d886115f11e4ddd94819eccbeecc4a8ba31752c08cd473cfd84215cf992f762c44d559fd1e736d2e7d0f8a9efd5fcb4b5 SHA512 40f92d777ef87f47266c927496d702893797565fc4e99f277c2d869e688bf97c5c7fec6b89312e89e51c1597374fcfcdc59b7a6e98d31afa3b6dc82080c7b78e
-EBUILD opencpn-4.2.0.ebuild 1232 BLAKE2B 500df5102d365f427bc47da204a320124a4ce102cd27365776a6d538fb9bff55808a4d706ee44a2830826848db6c5e6d5b6b4752ff1da592657de8d45d75aebe SHA512 8622725f142b2702217687e2c2426800fdb2a2f1a064747e4be7da19cdd948baf5bd3c03d0d2b15cec3f9584050ebb86b6df584671a2794e505ca938623d620f
-EBUILD opencpn-4.4.0.ebuild 1232 BLAKE2B 500df5102d365f427bc47da204a320124a4ce102cd27365776a6d538fb9bff55808a4d706ee44a2830826848db6c5e6d5b6b4752ff1da592657de8d45d75aebe SHA512 8622725f142b2702217687e2c2426800fdb2a2f1a064747e4be7da19cdd948baf5bd3c03d0d2b15cec3f9584050ebb86b6df584671a2794e505ca938623d620f
-EBUILD opencpn-4.6.1.ebuild 1276 BLAKE2B 7968802cf51e3637f056416059902781ece4cf8a60f21fff98f85b96a2a892e21fc4ea815ebf1b44d7405eefbb199b09b233f46a77a884a6a5b345f4e3cf526b SHA512 316875d06bfbe730ecb881d1147cd975a35cf39d82e479b27e3591ed69e796fe5b75b32bb050f09ee43fc8a85de312f53186f732c344216aa77d141ee35d3d31
 EBUILD opencpn-4.8.0-r1.ebuild 1312 BLAKE2B 1b4df8e1353be74cb344367526bb11abd89c2253d387b4fc7c4b4f45b50ffee4519790c9f2b61b00ea93d932355d3944249275e9f9ea64e3e3e5f4763167b412 SHA512 6eb3a4c7d3679c2aa77c0652f4a88aeea42d60873ad3d64270770a3480adc1657a4f8f4ce24b85d5bba7398958775b68607bfa44b93fcf22455036c4d769e016
+EBUILD opencpn-4.8.2.ebuild 1305 BLAKE2B c9ca9b05b6183dc940e86a19f00249eefa088f714b377e77822b9502cb24999190a87872beac943117b341df40fb2d5e7be64f781e85aad1fc2e1d0bf8aa8fd2 SHA512 088a95fa702c6ea296dc28b705f72d4f0f0f7df19038585b30748e16a6ee82850c4cacf56b582efd97df4e5ca2392a1ab252ca561e9e234721a1bcd76cf447d8
 MISC metadata.xml 531 BLAKE2B 4c2d7950160138cc8a789d259beb3050af12f9406d376afb70465af18f1a9e979f45e4d6b2bbdb14a9670a936b087b772f29e2dc60289f4ef9e47911e3753e8d SHA512 4315299e7a239d5bdc7edfb6c377217908372e59fe187fe071948fb594100b29bc85116fa458a00233411f47d22780d9c1efeec07cbda6bc3b404a94cab35e3f
diff --git a/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild b/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild
deleted file mode 100644
index c8839f8c8459..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# TODO: add plugins
-
-## wmm_pi, World Magnetic Model (https://github.com/nohal/wmm_pi, GPL-2+)
-#WMM_PLUGIN_PV="1.0"
-#WMM_PLUGIN_PN="wmm_pi"
-#WMM_PLUGIN_P="${WMM_PLUGIN_PN}-${WMM_PLUGIN_PV}"
-#WMM_PLUGIN_URI="https://github.com/nohal/${WMM_PLUGIN_PN}/archive/${WMM_PLUGIN_PN}-v${WMM_PLUGIN_PV}.tar.gz"
-#WMM_PLUGIN_WD="${WORKDIR}/plugins/${WMM_PLUGIN_PN}"
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="http://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_${PV}.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( >=sci-geosciences/gpsd-2.96-r1 )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	need-wxwidgets unicode
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.2.0.ebuild b/sci-geosciences/opencpn/opencpn-4.2.0.ebuild
deleted file mode 100644
index 5af2cb3a720e..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="http://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_4.0.0.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( sci-geosciences/gpsd )
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	need-wxwidgets unicode
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.4.0.ebuild b/sci-geosciences/opencpn/opencpn-4.4.0.ebuild
deleted file mode 100644
index 5af2cb3a720e..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.4.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="http://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_4.0.0.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( sci-geosciences/gpsd )
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	need-wxwidgets unicode
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.6.1.ebuild b/sci-geosciences/opencpn/opencpn-4.6.1.ebuild
deleted file mode 100644
index 7532a7b6cc5c..000000000000
--- a/sci-geosciences/opencpn/opencpn-4.6.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
-
-DESCRIPTION="a free, open source software for marine navigation"
-HOMEPAGE="http://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_4.0.0.orig.tar.xz )
-"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gps opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	gps? ( sci-geosciences/gpsd )
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
-
-src_configure() {
-	need-wxwidgets unicode
-	local mycmakeargs=(
-		$(cmake-utils_use_use gps GPSD)
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use doc; then
-		einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
-	fi
-}
diff --git a/sci-geosciences/opencpn/opencpn-4.8.2.ebuild b/sci-geosciences/opencpn/opencpn-4.8.2.ebuild
new file mode 100644
index 000000000000..026a03b2964e
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-4.8.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets
+
+DOC_VERSION="4.1.1329.1"
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://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 )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gps opengl"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	media-libs/portaudio
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+	x11-libs/gtk+:2
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	gps? ( sci-geosciences/gpsd )
+	!sci-geosciences/opencpn-plugin-wmm
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+S="${WORKDIR}/OpenCPN-${PV}"
+
+src_configure() {
+	setup-wxwidgets
+	local mycmakeargs=(
+		$(cmake-utils_use_use gps GPSD)
+		-DUSE_S57=ON
+		-DUSE_GARMINHOST=ON
+		-DBUNDLE_GSHHS=CRUDE
+		-DBUNDLE_TCDATA=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	if use doc; then
+		dohtml -r "${S}"/../${PN}/doc/*
+	fi
+	cmake-utils_src_install
+}
+
+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 61e839acb87d..aacb1886d18f 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -11,6 +11,6 @@ DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c
 EBUILD qgis-2.18.12.ebuild 5238 BLAKE2B db6c6fa1262605f1595cf0f7ee63c8126e80b0f5fbee6676a52729a1f09ca6b40e00502ee67490807302549ecff490b1c0ed6b5c8d7381695875cb2fa5dfdb5b SHA512 2c4bb08747a740f7fb9e3405245163e2b628c40fd1d95123afd2f364dd35e77dbf7bcec52fa77069d89d4a37f0d62fd36000d3e1d77c635171ae8d8c5336b901
 EBUILD qgis-2.18.14.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6
 EBUILD qgis-2.18.16.ebuild 5230 BLAKE2B 4d54d00b4ac1f8af236c8136069e61d396f4a84ec27f9e41a487eec4f02de75ce8bf27f0d5fdd6cba3aa967880f0233dbd1fc7786a1b43fc32ca4cae10e75ec7 SHA512 f8b5ad44a9ee52a16368d8144aa8c24601876a0cf06ae647a1d538ea9867930c1dc6a7784d60d4488da4e62ac613faca5b714b1522873b95c642d64272a5edf6
-EBUILD qgis-3.0.0-r1.ebuild 6141 BLAKE2B 3b6fe020bf25cc345e9d345e819d76961ad5db2b0bd164c05938ffba9d10a05afdd9a58a1abc2191a0a7b2a0aa7c15703277617b0b1d57406e7197e57d4d60bd SHA512 1a1ba0ac0d1d502aff097e5ef1db9b96e5f6b3078977a1a56162e6d94886638a579e1f042b8ad2d0649baec3656862bd721d78498fe3ed2730b4cecede615a07
-EBUILD qgis-9999.ebuild 6148 BLAKE2B faa4704920b164b825c81356d905a88dd5b092931e6eaa8ab98bd703393df763b5b496d1da033661d1bb1fd2cb8804971501cf589c55b102a1abf0c1ab771c2f SHA512 fc934044fc00c46878be2cfb62fdcc24fbe412e5a8b12da6b211a2e24766fc2e0569929990cfe639b26803df23ff3e1963783724a5b78859eb633993ef3e984f
+EBUILD qgis-3.0.0-r2.ebuild 6154 BLAKE2B ba39cf1c5451b78157559d35b68360d59e7a75859e8eec3c6c27e19f9115875717ca88d3f2271dfbb8e864f11813dfa07591e596c6c7a32b8b610b90c227c851 SHA512 a41a7eabfea960c915745ec52310c277162e4c1f9677fc5f5abb0426847bba3ffb3a729a9386d4ade3737ae91051ea93ba4b4c9855782b0707a7fe85909f881c
+EBUILD qgis-9999.ebuild 6161 BLAKE2B 1e55aece92a60ce8cfd7b4d5265f7824c8a8a54b1d996fd83852a78cf34e9cce4458a7e7d4f2f8c096c49df75d3daf4ef54fac4ffd992c84621a4ed5f5f08abf SHA512 fab722837d024b644096643096c7549453bf95b71fa17bc5f8afdedc85db425a47967e32591aaded01c22108652dfc5464cd6a28d76153f0bfc5675345469de7
 MISC metadata.xml 1114 BLAKE2B eb9f40495ad88a2e5b6d07b4eb2bfd6eb4be9f992bb631cc0bb0826959a54db372253dbdc4ed79f16755b43041f81fa66a584af798dbb5b974fdcaf08046fcea SHA512 89554d9c97f843c63f5cf96f9cbb67aa8f14f26ff3956e25d7c6951a8dbbb859383df2ceee555d5e542624042377d2fee0c9f77683f184e98911df8bc0bd6700
diff --git a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
deleted file mode 100644
index 84a8a75f10bc..000000000000
--- a/sci-geosciences/qgis/qgis-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-PYTHON_REQ_USE="sqlite"
-QT_MIN_VER="5.9.1"
-
-if [[ ${PV} != *9999 ]]; then
-	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"
-else
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
-fi
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
-unset GIT_ECLASS
-
-DESCRIPTION="User friendly Geographic Information System"
-HOMEPAGE="https://www.qgis.org/"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="0"
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
-
-REQUIRED_USE="
-	mapserver? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-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/qtkeychain[qt5(+)]
-	>=dev-qt/designer-${QT_MIN_VER}:5
-	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
-	>=dev-qt/qtcore-${QT_MIN_VER}:5
-	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
-	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
-	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
-	>=dev-qt/qtsvg-${QT_MIN_VER}:5
-	>=dev-qt/qtsql-${QT_MIN_VER}:5
-	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
-	>=dev-qt/qtxml-${QT_MIN_VER}:5
-	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
-	sci-libs/geos
-	sci-libs/libspatialindex:=
-	sci-libs/proj
-	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
-	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
-	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
-	georeferencer? ( sci-libs/gsl:= )
-	grass? ( >=sci-geosciences/grass-7.0.0:= )
-	mapserver? ( dev-libs/fcgi )
-	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}
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/markupsafe[${PYTHON_USEDEP}]
-		dev-python/owslib[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,sql,svg,webkit?,${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:=[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	)
-	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
-	>=dev-qt/qttest-${QT_MIN_VER}:5
-	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
-	sys-devel/bison
-	sys-devel/flex
-"
-RDEPEND="${COMMON_DEPEND}
-	sci-geosciences/gpsbabel
-"
-
-# Disabling test suite because upstream disallow running from install path
-RESTRICT="test"
-
-PATCHES=(
-	# git master
-	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
-	# TODO upstream
-	"${FILESDIR}/${P}-featuresummary.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
-		-i CMakeLists.txt || die "Failed to fix lrelease path"
-
-	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
-		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
-		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
-		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
-
-	cd src/plugins || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQGIS_MANUAL_SUBDIR=/share/man/
-		-DBUILD_SHARED_LIBS=ON
-		-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
-		-DPEDANTIC=OFF
-		-DWITH_APIDOC=OFF
-		-DWITH_QSPATIALITE=ON
-		-DENABLE_TESTS=OFF
-		-DWITH_3D=$(usex 3d)
-		-DWITH_GEOREFERENCER=$(usex georeferencer)
-		-DWITH_GRASS=$(usex grass)
-		-DWITH_SERVER=$(usex mapserver)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_QWTPOLAR=$(usex polar)
-		-DWITH_POSTGRESQL=$(usex postgres)
-		-DWITH_BINDINGS=$(usex python)
-		-DWITH_CUSTOM_WIDGETS=$(usex python)
-		-DWITH_QTWEBKIT=$(usex webkit)
-	)
-
-	if use grass; then
-		mycmakeargs+=(
-			-DWITH_GRASS7=ON
-			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
-		)
-	fi
-
-	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
-
-	# bugs 612956, 648726
-	addpredict /dev/dri/renderD128
-	addpredict /dev/dri/renderD129
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	domenu debian/qgis.desktop
-
-	local size type
-	for size in 16 22 24 32 48 64 96 128 256; do
-		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
-		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
-		for type in qgs qml qlr qpt; do
-			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
-		done
-	done
-	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
-
-	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
-
-	python_optimize "${ED%/}"/usr/share/qgis/python
-
-	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
-	if has_version "<sci-geosciences/qgis-3"; then
-		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
-	fi
-
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild b/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..e0aa6bdd7b93
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-3.0.0-r2.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 )
+PYTHON_REQ_USE="sqlite"
+QT_MIN_VER="5.9.1"
+
+if [[ ${PV} != *9999 ]]; then
+	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"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
+fi
+inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils
+unset GIT_ECLASS
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="https://www.qgis.org/"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit"
+
+REQUIRED_USE="
+	mapserver? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+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/qtkeychain[qt5(+)]
+	>=dev-qt/designer-${QT_MIN_VER}:5
+	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
+	>=dev-qt/qtcore-${QT_MIN_VER}:5
+	>=dev-qt/qtgui-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
+	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
+	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
+	>=dev-qt/qtsvg-${QT_MIN_VER}:5
+	>=dev-qt/qtsql-${QT_MIN_VER}:5
+	>=dev-qt/qtwidgets-${QT_MIN_VER}:5
+	>=dev-qt/qtxml-${QT_MIN_VER}:5
+	>=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}]
+	sci-libs/geos
+	sci-libs/libspatialindex:=
+	sci-libs/proj
+	>=x11-libs/qscintilla-2.10.1:=[qt5(+)]
+	>=x11-libs/qwt-6.1.2:6=[qt5(+),svg]
+	3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 )
+	georeferencer? ( sci-libs/gsl:= )
+	grass? ( >=sci-geosciences/grass-7.0.0:= )
+	mapserver? ( dev-libs/fcgi )
+	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}
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${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:=[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	)
+	webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/linguist-tools-${QT_MIN_VER}:5
+	>=dev-qt/qttest-${QT_MIN_VER}:5
+	>=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="${COMMON_DEPEND}
+	sci-geosciences/gpsbabel
+"
+
+# Disabling test suite because upstream disallow running from install path
+RESTRICT="test"
+
+PATCHES=(
+	# git master
+	"${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch"
+	# TODO upstream
+	"${FILESDIR}/${P}-featuresummary.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \
+		-i CMakeLists.txt || die "Failed to fix lrelease path"
+
+	sed -e "/QT_LRELEASE_EXECUTABLE/d" \
+		-e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \
+		-e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \
+		-i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake"
+
+	cd src/plugins || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQGIS_MANUAL_SUBDIR=/share/man/
+		-DBUILD_SHARED_LIBS=ON
+		-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
+		-DPEDANTIC=OFF
+		-DWITH_APIDOC=OFF
+		-DWITH_QSPATIALITE=ON
+		-DENABLE_TESTS=OFF
+		-DWITH_3D=$(usex 3d)
+		-DWITH_GEOREFERENCER=$(usex georeferencer)
+		-DWITH_GRASS=$(usex grass)
+		-DWITH_SERVER=$(usex mapserver)
+		-DWITH_ORACLE=$(usex oracle)
+		-DWITH_QWTPOLAR=$(usex polar)
+		-DWITH_POSTGRESQL=$(usex postgres)
+		-DWITH_BINDINGS=$(usex python)
+		-DWITH_CUSTOM_WIDGETS=$(usex python)
+		-DWITH_QTWEBKIT=$(usex webkit)
+	)
+
+	if use grass; then
+		mycmakeargs+=(
+			-DWITH_GRASS7=ON
+			-DGRASS_PREFIX7=/usr/$(get_libdir)/grass70
+		)
+	fi
+
+	use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
+
+	# bugs 612956, 648726
+	addpredict /dev/dri/renderD128
+	addpredict /dev/dri/renderD129
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	domenu debian/qgis.desktop
+
+	local size type
+	for size in 16 22 24 32 48 64 96 128 256; do
+		newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png
+		newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png
+		for type in qgs qml qlr qpt; do
+			newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png
+		done
+	done
+	newicon -s scalable images/icons/qgis_icon.svg qgis.svg
+
+	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
+
+	python_optimize "${ED%/}"/usr/share/qgis/python
+
+	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
+	if has_version "<sci-geosciences/qgis-3"; then
+		elog "QGIS is now based on PyQt5. Old scripts may not work anymore."
+	fi
+
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index e1f95949f665..a76181e1f87a 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QT_MIN_VER}:5
 	>=dev-qt/qtcore-${QT_MIN_VER}:5
 	>=dev-qt/qtgui-${QT_MIN_VER}:5
-	>=dev-qt/qtnetwork-${QT_MIN_VER}:5
+	>=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl]
 	>=dev-qt/qtpositioning-${QT_MIN_VER}:5
 	>=dev-qt/qtprintsupport-${QT_MIN_VER}:5
 	>=dev-qt/qtsvg-${QT_MIN_VER}:5
@@ -70,7 +70,7 @@ COMMON_DEPEND="
 		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-python/PyQt5[designer,sql,svg,webkit?,${PYTHON_USEDEP}]
+		dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-- 
cgit v1.2.3