gentoo resync : 18.03.2018

4 files changed, 42 insertions, 40 deletions

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"