gentoo resync : 05.12.2021

4 files changed, 91 insertions, 4 deletions

diff --git a/sci-geosciences/opencpn-plugin-dr/Manifest b/sci-geosciences/opencpn-plugin-dr/Manifest
index e52913b6c4a8..1f37c4435c31 100644
--- a/sci-geosciences/opencpn-plugin-dr/Manifest
+++ b/sci-geosciences/opencpn-plugin-dr/Manifest
@@ -1,4 +1,7 @@
+AUX cmake.patch 1344 BLAKE2B 1305543ef0feefa9721510b01b80bb356ab537caf7407399c45607ad4badcaba4416d4dd0256a75182307d3060d5c543f9c3c97c74c376c909d0dcc2f32dd147 SHA512 bcc3cea7e3b4b3bb81846cd37af0cdd0e6296e68654a7de9d8a7684fdb2a8fc4c316b0a04ce171d2daac3ab2eade72fad9e9daf6f8061a2d5c83d40a31a1c740
 DIST opencpn-plugin-dr-1.1.tar.gz 133693 BLAKE2B 3d3356d43ca263c117511be4b4b873038f1a0493ab9b9ec4d0811da4360a38a2ec4ee2a31b54ce18741fc9ae0e3daf1a0a24b1c62493087c747b9e8720ee5a07 SHA512 2a953c7a8a491975c2b14e877364cfa736d2c410ea77bb4e0b18cf3bb3b04b19c2fcbc9debd513182f95002b483e689c4e21c30d87474e319bae7d2d840254f1
+DIST opencpn-plugin-dr-4.0.0.tar.gz 2010328 BLAKE2B 7b3d9e93edb52e6c039e759a5a4f8f85145c89c68b6c9d33ecf8fa376e4150bfe34a516bb9f278ef820fb880c2c45b13a446151c46bd9220e303c1b352010601 SHA512 0cbb87b66569451510f813a7766ca7e7e5c120861046c93b0adb0e71b90528ae83b12201635ec0e3a9286c470e0a93015c4a5a99cbc13979c894fa4be36ce71f
 EBUILD opencpn-plugin-dr-1.1.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
-EBUILD opencpn-plugin-dr-9999.ebuild 741 BLAKE2B 85c703ca1a2dfb60e37d94559d8cfa4014395eab98ad392b1853e35bc9370b27291f7b7a5c817f7f6cded79645d6a7abfbc168dd13f0a4d36d60a37936f741bb SHA512 9e45a85bcd54f4fea538078b53c0bde70faff0cd549652408c569de31b5e5177f83fbe920d319dcd8b5e4673466c3c0c1935ee1620b384c12c019f41d367ba4b
+EBUILD opencpn-plugin-dr-4.0.0.ebuild 780 BLAKE2B 338fe00e0c17a1761348ac2bf1ab58d0a31f6cc35ef57034b62f074a4a5668291f35bca4becda0399470a6889dc409231cf73b7a4127b6f138ebd836ec225eae SHA512 5bf5ce4ef691f9d970e924789589d1a1ddd64fffa2885bce013ecc0af81f78ce0396a74825f2d8725a667c460b4705aa3a3c41aca02810cb3122251fdb8d792e
+EBUILD opencpn-plugin-dr-9999.ebuild 780 BLAKE2B 338fe00e0c17a1761348ac2bf1ab58d0a31f6cc35ef57034b62f074a4a5668291f35bca4becda0399470a6889dc409231cf73b7a4127b6f138ebd836ec225eae SHA512 5bf5ce4ef691f9d970e924789589d1a1ddd64fffa2885bce013ecc0af81f78ce0396a74825f2d8725a667c460b4705aa3a3c41aca02810cb3122251fdb8d792e
 MISC metadata.xml 459 BLAKE2B 171be1694f608a308a72b0c1c9a897397552d9737c63300fb0ffd09cbcbd61c20d0a5484f656809d87fe55fc71e623ee6171aa9082a4c20bd015cf4e5e0d2c28 SHA512 72c673e76a77796c715e021a8ad83aa474b3c6d2f2068776ef3c269154617e97efd084f59f5c8b49569c19b4881e61cdb4df2c18e5474bc2929a8424bc3f9567
diff --git a/sci-geosciences/opencpn-plugin-dr/files/cmake.patch b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch
new file mode 100644
index 000000000000..ab0bb813c321
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-dr/files/cmake.patch
@@ -0,0 +1,41 @@
+diff -ur DR_pi-4.0.0.orig/CMakeLists.txt DR_pi-4.0.0/CMakeLists.txt
+--- DR_pi-4.0.0.orig/CMakeLists.txt	2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/CMakeLists.txt	2021-11-29 00:11:03.998266321 -1000
+@@ -61,9 +61,10 @@
+ )
+ include(Targets)
+ create_targets(${FLATPAK_MANIFEST})
+-if ("${BUILD_TYPE}" STREQUAL "")
+-  return ()
+-endif ()
++#if ("${BUILD_TYPE}" STREQUAL "")
++#  return ()
++#endif ()
++include(PluginLibs)
+ 
+ if (NOT ${BUILD_TYPE} STREQUAL "flatpak")
+   # Build package as required (flatpak already dealt with).
+diff -ur DR_pi-4.0.0.orig/cmake/PluginInstall.cmake DR_pi-4.0.0/cmake/PluginInstall.cmake
+--- DR_pi-4.0.0.orig/cmake/PluginInstall.cmake	2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/cmake/PluginInstall.cmake	2021-11-29 00:10:04.241099544 -1000
+@@ -11,7 +11,7 @@
+ # the Free Software Foundation; either version 3 of the License, or
+ # (at your option) any later version.
+ 
+-include(Metadata)
++#include(Metadata)
+ 
+ if (APPLE)
+   install(
+diff -ur DR_pi-4.0.0.orig/cmake/Targets.cmake DR_pi-4.0.0/cmake/Targets.cmake
+--- DR_pi-4.0.0.orig/cmake/Targets.cmake	2021-11-04 00:32:44.000000000 -1000
++++ DR_pi-4.0.0/cmake/Targets.cmake	2021-11-29 00:10:18.954386822 -1000
+@@ -19,7 +19,7 @@
+   return()
+ endif ()
+ 
+-include(Metadata)
++#include(Metadata)
+ 
+ if (UNIX AND NOT APPLE AND NOT QT_ANDROID)
+   set(_LINUX ON)
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild
new file mode 100644
index 000000000000..f8093a00ebdc
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-4.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake wxwidgets
+
+MY_PN="DR_pi"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="Dead Reckoning Positions Plugin for OpenCPN"
+HOMEPAGE="https://github.com/Rasbats/DR_pi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	x11-libs/wxGTK:${WX_GTK_VER}
+	sci-geosciences/opencpn:="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/cmake.patch"
+)
+
+src_configure() {
+	setup-wxwidgets unicode
+	cmake_src_configure
+}
diff --git a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
index 96bb44ad6eeb..f8093a00ebdc 100644
--- a/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
+++ b/sci-geosciences/opencpn-plugin-dr/opencpn-plugin-dr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-WX_GTK_VER="3.0"
+WX_GTK_VER="3.0-gtk3"
 inherit cmake wxwidgets
 
 MY_PN="DR_pi"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Rasbats/${MY_PN}.git"
 else
-	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Rasbats/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
@@ -25,10 +25,14 @@ SLOT="0"
 
 RDEPEND="
 	x11-libs/wxGTK:${WX_GTK_VER}
-	>=sci-geosciences/opencpn-4.2.0"
+	sci-geosciences/opencpn:="
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
 
+PATCHES=(
+	"${FILESDIR}/cmake.patch"
+)
+
 src_configure() {
 	setup-wxwidgets unicode
 	cmake_src_configure