[gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn-plugin-climatology/

[Marc Schiffbauer]

commit:     b74cb9e1e704beff262dfd2bc2a31f4662ba7939
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 01:29:08 2021 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 06:00:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74cb9e1

sci-geosciences/opencpn-plugin-climatology: bump version

Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>

 sci-geosciences/opencpn-plugin-climatology/Manifest     |  2 +-
 ...build => opencpn-plugin-climatology-1.4.32.0.ebuild} | 17 ++++++++++++-----
 .../opencpn-plugin-climatology-9999.ebuild              | 17 ++++++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest 
b/sci-geosciences/opencpn-plugin-climatology/Manifest
index 36303242171c..b60a8d6a90f4 100644
--- a/sci-geosciences/opencpn-plugin-climatology/Manifest
+++ b/sci-geosciences/opencpn-plugin-climatology/Manifest
@@ -1,2 +1,2 @@
 DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 BLAKE2B 
57e781f4d86ec17456e786629ec5b82c9aba872c2f8c26ec628e4ab5314b0a3c6933cc0c7a36616830038add1f95a52b8acd7c6f03cb702c611be255a3b91f1a
 SHA512 
5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3
-DIST opencpn-plugin-climatology-1.0.20180316.tar.gz 428431 BLAKE2B 
ec6c2493c23eab5d08a2fc1490ea1ab112eb55743d767f7b667a8752d965269cc920459bc63458942912381400af94dc94244ce744aaf83fe4a46c0c3bc3d505
 SHA512 
cb65916c743729b1d51b1f39aeb62f55f4260a98117234671abeaddb8f9789e1166adc838259efb9da3002ed3143440b4a236f6d14837e0fc709472ed8c9fe3f
+DIST opencpn-plugin-climatology-1.4.32.0.tar.gz 7070623 BLAKE2B 
fe710287cae08a511baa504af89b9ae7a5b0f23b2c6071803c7b7627917fd48353caef977c27b1f6d35febc2ab20a8df364c5c939b8702d9256ae3a8d5ed0b13
 SHA512 
11158e73658bd7ffa0d3726fab69afb5cedab5594507a36b3836b2806ac3e120b27c4e2669819db63e6991fae89534b6cee4dd04964c3310c4afe3901fe21f1b

diff --git 
a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
 
b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild
similarity index 69%
rename from 
sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
rename to 
sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild
index 521e36f33927..eb548ae7d832 100644
--- 
a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.20180316.ebuild
+++ 
b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.4.32.0.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 inherit cmake wxwidgets
 
 MY_PN="climatology_pi"
 if [[ ${PV} == *9999 ]] ; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git";
+       EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git";
 else
-       SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
        KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="https://github.com/seandepagnier/climatology_pi";
+HOMEPAGE="https://github.com/rgleason/climatology_pi";
 SRC_URI="
        ${SRC_URI}
        mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz 
-> ${PN}-1.0-CL-DATA.tar.xz"
@@ -28,10 +28,17 @@ SLOT="0"
 
 RDEPEND="
        x11-libs/wxGTK:${WX_GTK_VER}
-       >=sci-geosciences/opencpn-4.2.0"
+       sci-geosciences/opencpn:="
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
 
+src_unpack() {
+       unpack ${A}
+       if [[ ${PV} == *9999 ]] ; then
+               git-r3_checkout
+       fi
+}
+
 src_configure() {
        setup-wxwidgets unicode
        cmake_src_configure

diff --git 
a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
 
b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
index 521e36f33927..eb548ae7d832 100644
--- 
a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
+++ 
b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-9999.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 inherit cmake wxwidgets
 
 MY_PN="climatology_pi"
 if [[ ${PV} == *9999 ]] ; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/seandepagnier/${MY_PN}.git";
+       EGIT_REPO_URI="https://github.com/rgleason/${MY_PN}.git";
 else
-       SRC_URI="https://github.com/mschiff/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+       SRC_URI="https://github.com/rgleason/${MY_PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
        KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${MY_PN}-${PV}"
 fi
 
 DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
-HOMEPAGE="https://github.com/seandepagnier/climatology_pi";
+HOMEPAGE="https://github.com/rgleason/climatology_pi";
 SRC_URI="
        ${SRC_URI}
        mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz 
-> ${PN}-1.0-CL-DATA.tar.xz"
@@ -28,10 +28,17 @@ SLOT="0"
 
 RDEPEND="
        x11-libs/wxGTK:${WX_GTK_VER}
-       >=sci-geosciences/opencpn-4.2.0"
+       sci-geosciences/opencpn:="
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
 
+src_unpack() {
+       unpack ${A}
+       if [[ ${PV} == *9999 ]] ; then
+               git-r3_checkout
+       fi
+}
+
 src_configure() {
        setup-wxwidgets unicode
        cmake_src_configure