diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
index 3f464f9..06f6213 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/Manifest
@@ -1,5 +1,5 @@
 DIST opencpn-plugin-ocpn_draw-1.8.17.0.tar.gz 4033932 BLAKE2B 16944e0ae36da21625079d73b6cbaefa3b5a352a1b791a0fd2eacfda965e01a9b8df93e21d8f360329b6c7fd1d8aa4580d33df70dd1f709a119bae1d74032316 SHA512 a6c2ad22478f02fe279b6bdc5b7adebc2a1c6f66b9e3ab9b8bd540a4429ccf5388118226c751aa24958720a225ec113c5d25c97c75bef5258cf4e9a2003ee946
 DIST opencpn-plugin-ocpn_draw-1.8.5.2.tar.gz 2425029 BLAKE2B 48f6a078981031bf0375f4797967ed77627fbc4413e6001b189da93a9a00ecc053ed38ea0059e32f5a55e77598a0657b27f17f34f0641b3e2c311026960910e9 SHA512 dd338c4c39bc4a520a64a539013e8ae30bed09839034451d2dc8275c1af9017846bedbfd1f8638f343b05a98ed2d78e1ac513c1efed963dac9def1f5e474ba99
-EBUILD opencpn-plugin-ocpn_draw-1.8.17.0.ebuild 749 BLAKE2B 3e99a80cbd90d05e41ac043aa5fe4f29f963122eb23b84b26e90af1cd3dc94b9b34380e60ec7cfaa707e8d33763cfe5c169d39c1e2f60ded43733fa4d6fee22a SHA512 81057f99fa5c09314848d15bd1d4b733270455f9bdc3bfd3dce14713d32284a63859cdf5e57e4b13511591bb5ddf7f84d9440fdda47b7c49229f0344fafa6f85
+EBUILD opencpn-plugin-ocpn_draw-1.8.17.0.ebuild 830 BLAKE2B b5bd29b2a0ada853d129fb45b3a44427893a2ce7008bf728aa8c26f357a98222fac3db6e8839a0c042f7ed38a1ec6c81adbd90be02bed84312ee810f22953a21 SHA512 2159eb5a269e3a125a2bd2bacd28185049879ee692c2f3dbe81114e46473cef5d44f5303771108be39dea6256d2f27db6ea1282a142a0af1553e007b4f9a7525
 EBUILD opencpn-plugin-ocpn_draw-1.8.5.2.ebuild 830 BLAKE2B b5bd29b2a0ada853d129fb45b3a44427893a2ce7008bf728aa8c26f357a98222fac3db6e8839a0c042f7ed38a1ec6c81adbd90be02bed84312ee810f22953a21 SHA512 2159eb5a269e3a125a2bd2bacd28185049879ee692c2f3dbe81114e46473cef5d44f5303771108be39dea6256d2f27db6ea1282a142a0af1553e007b4f9a7525
 MISC metadata.xml 467 BLAKE2B 6414af9a8a87442bb669d4e712bda45c673a316044f8722a827b192ebdc6b1cc535d74cdb32461defd10db02a19bfa7812ee8b55b871b6ae44c26f1a156894f9 SHA512 0ab6280168b59c3b87e8cbabbc5115888208a220bd2851f3f907fba2dc560142efe67f6fe66a9da86e3abec3a6b6d19ab4eff2a22efa021a3a112404fabe590b
diff --git a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.8.17.0.ebuild b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.8.17.0.ebuild
index 2c246d7..65b6d38 100644
--- a/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.8.17.0.ebuild
+++ b/sci-geosciences/opencpn-plugin-ocpn_draw/opencpn-plugin-ocpn_draw-1.8.17.0.ebuild
@@ -1,35 +1,43 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2023 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="ocpn_draw_pi"
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
+if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/jongough/${MY_PN}.git"
+	inherit git-r3 cmake wxwidgets
+	KEYWORDS=""
 else
-	SRC_URI="https://github.com/jongough/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
+	SRC_URI="
+		https://github.com/jongough/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	inherit cmake 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-5"
+	>=sci-geosciences/opencpn-5.0.0
+	sys-devel/gettext
+"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	setup-wxwidgets
+	cmake_src_prepare
+}
 
 src_configure() {
-	setup-wxwidgets unicode
+	CMAKE_BUILD_TYPE="Release"
 	cmake_src_configure
 }