gentoo resync : 18.03.2018

3 files changed, 28 insertions, 20 deletions

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.20180316.ebuild
index 2937b98dc980..0f1404e579cd 100644
--- a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0-r1.ebuild
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
@@ -1,40 +1,45 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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
-
 MY_PN="climatology_pi"
-
-DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+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="
-	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
+	$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"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.0.0
-	<sci-geosciences/opencpn-4.2.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/"
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"