sci-geosciences/opencpn: Port to EAPI 7

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 40 insertions, 40 deletions

diff --git a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
index aca98fe9f01b..ebd354bd826b 100644
--- a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
+++ b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
@@ -1,10 +1,8 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcec1191a..8df2a9e21 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7"))
+@@ -408,9 +408,9 @@
  ENDIF()
-
+ 
  IF((_wx_selected_config MATCHES "qt-armv7"))
 -  SET(wxWidgets_USE_LIBS base core xml html adv aui)
 +  SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
@@ -12,38 +10,38 @@ index fcec1191a..8df2a9e21 100644
 -  SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
 +  SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
  ENDIF()
-
+ 
  OPTION (USE_GL "Enable OpenGL support" ON)
-@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li
+@@ -436,7 +436,7 @@
      SET(OPENGLES_FOUND "YES")
      SET(OPENGL_FOUND "YES")
-
+ 
 -    SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
 +    SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
      add_subdirectory(src/glshim)
-
+ 
      SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm"  )
-@@ -455,7 +455,7 @@ IF(QT_ANDROID)
+@@ -455,7 +455,7 @@
    SET(OPENGLES_FOUND "YES")
    SET(OPENGL_FOUND "YES")
-
+ 
 -  SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
 +  SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
    add_subdirectory(src/glshim)
  ENDIF(QT_ANDROID)
-
-@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID))
+ 
+@@ -468,7 +468,7 @@
    ENDIF(USE_GL)
-
+ 
    IF(OPENGL_FOUND)
 -    SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
 +    SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
      INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-
+ 
      MESSAGE (STATUS "Found OpenGL...." )
-@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID)
+@@ -529,14 +529,14 @@
    ENDIF(MSVC)
-
+ 
    IF(WIN32 OR APPLE OR QT_ANDROID)
 -    FIND_PACKAGE(wxWidgets)
 +    FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
@@ -59,7 +57,16 @@ index fcec1191a..8df2a9e21 100644
      endif ()
      IF(MSYS)
        # this is to convert msys to windows paths, and handle the missing /usr
-@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+@@ -725,7 +725,7 @@
+   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/serial/include)
+ 
+   ## Add serial library
+-  add_library(SERIAL ${serial_SRCS})
++  add_library(SERIAL STATIC ${serial_SRCS})
+   if(APPLE)
+     target_link_libraries(SERIAL ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
+   elseif(UNIX)
+@@ -1053,14 +1053,14 @@
      set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
      MESSAGE(STATUS "Building against GTK3...")
    ENDIF(GTK2_FOUND)
diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
index 4ae2fe2e75a1..84e09c9f1e65 100644
--- a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets
+inherit wxwidgets xdg cmake
 
 DOC_VERSION="4.8.2.0"
 
 DESCRIPTION="a free, open source software for marine navigation"
 HOMEPAGE="https://opencpn.org/"
-SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
-doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )
-"
+SRC_URI="
+	https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )"
+S="${WORKDIR}/OpenCPN-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -30,18 +31,15 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	x11-libs/gtk+:2
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	!sci-geosciences/opencpn-plugin-wmm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S="${WORKDIR}/OpenCPN-${PV}"
+	!sci-geosciences/opencpn-plugin-wmm"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}/${PV}-CMakeLists.txt.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 src_configure() {
+	use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. )
+
 	setup-wxwidgets
 	local mycmakeargs=(
 		-DUSE_S57=ON
@@ -50,17 +48,12 @@ src_configure() {
 		-DBUNDLE_TCDATA=ON
 	)
 
-	cmake-utils_src_configure
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r "${S}"/../${PN}/doc/*
-	fi
-	cmake-utils_src_install
+	cmake_src_configure
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	if use doc; then
 		einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
 	fi