gentoo resync : 05.12.2021

4 files changed, 4 insertions, 151 deletions

diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
index f73d75809976..5162cda3eb58 100644
--- a/sci-geosciences/opencpn/Manifest
+++ b/sci-geosciences/opencpn/Manifest
@@ -1,8 +1,5 @@
-AUX opencpn-5.0.0-cmake.patch 3076 BLAKE2B 09a42b94abf3d8674ba8c82ba0ad2e001c40354646237095d34fd24c712f4ff915e5d5a26bf222fab9a3f8c522dd4b06d4daeaa8fa0adab8a7665d6ae703094f SHA512 c2ceba554e228649529e104df79854873b021d661c8879b2b1c1137750b8c23aa793d3c56840a13fe1e7e73776180f5267af9a5a4c0b1c8d9b4e99804483ac85
 AUX opencpn-5.2.4-cmake.patch 591 BLAKE2B f91412ce753bc8cd1806bb5b0e64a6ef924ea93be42fb15337a4e0d2d723b3329ddfd2c6adc5694b2442a205f1827e2081a087510621e74209b5cfd200c189b6 SHA512 c9b4da53fab5007c06461236bee1952d64d685626d7c81f977f219c8aef85359204e2a396def663c2e58c3fb9ed4e07f2bced141ffe1a4d6e07901b6c8da4183
-DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
 DIST opencpn-5.2.4.tar.gz 81226481 BLAKE2B 7c5bb1157e94d3271bce899740cdf6d9d5dc17c4406b3020fa8a91ae728ca3c0ddab799affa219b833df86e547de91b2e6ccd11fa57fff056550a440d9968fad SHA512 13543272fe4c68b911c42fdc19f0bd7842809edc8e91d73899030f70668e78c448474541a5742ad675d6e2b361240ca1a5d603b163f8b5107539720442ee19a0
 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
-EBUILD opencpn-5.0.0.ebuild 1293 BLAKE2B 2a394e596e4bd0be608f3c291ebdf9870a432662903f08b869995ec0277dc05c761ed5f1dc874c4752e9a22074e4c1cfa56981aee4efa6635b47b63804e96f3d SHA512 f5505b80f37846fcf77985b6f8504aa80ae29c516ea243e10b423f0283c1ae9105941432567f8af90b089029450112404626da0b6006e41548db4892664d1e49
-EBUILD opencpn-5.2.4.ebuild 1261 BLAKE2B 79f449cf580fc8957672e50657fd6779dd88d4dfa40cd859c712562ac37d561b89a955eb06acc7e190a92d612da088517d880aed678fc7216ea44cd7177367b1 SHA512 f2f3f897fb34cc4dc52ca65bc31809533fcd3b19299de52365c45acd13ab5f517a8fe65b8a4f5cd86777298ad8fdf8d27e77c0a61f20714e12296996626375e2
+EBUILD opencpn-5.2.4.ebuild 1285 BLAKE2B f2d056230fd908e8ce816fd7a11c24640a29399258d642d645c670ad11b27b463258a1f531ea3d0c0040f7311ebd69a9c8a9e8a35f333bfed6f677640355495d SHA512 c683ab1e8ddc1a61c21260e6378ce0655465e733fed7057889edcbb1b8e63e986511cb8e36d7e99277cb28df55329598300436ea68c5e1ea49dfe92d7bd7487a
 MISC metadata.xml 532 BLAKE2B f58755354fa6e133c3d948f9b57165ddc5dceed8548a599665f093500ea3451b83331324eda72bc3654b5ec49e2c0032421b4f6a20f270c2e7a14715fea5e0b0 SHA512 38390912b33d945d24fe81ab0bd23d09a1207e0eaaf68d4101748a41cd8237251e5451df277a98b65a16d6acfad8adb27c20b842e90decba25dbf98bfb580e72
diff --git a/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch b/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
deleted file mode 100644
index ebd354bd826b..000000000000
--- a/sci-geosciences/opencpn/files/opencpn-5.0.0-cmake.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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)
- ELSE()
--  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 @@
-     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 @@
-   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 @@
-   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 @@
-   ENDIF(MSVC)
- 
-   IF(WIN32 OR APPLE OR QT_ANDROID)
--    FIND_PACKAGE(wxWidgets)
-+    FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
-     if (wxWidgets_FOUND)
-       message(STATUS "Found wxWidgets webview add-on")
-       add_definitions(-DOCPN_USE_WEBVIEW)
-     else ()
--      list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
-+      list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
-       message(STATUS "Could not find wxWidgets webview add-on")
--      FIND_PACKAGE(wxWidgets REQUIRED)
-+      FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
-     endif ()
-     IF(MSYS)
-       # this is to convert msys to windows paths, and handle the missing /usr
-@@ -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)
--  FIND_PACKAGE(wxWidgets)
-+  FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
-   if (wxWidgets_FOUND)
-     message(STATUS "Found wxWidgets webview add-on")
-     add_definitions(-DOCPN_USE_WEBVIEW)
-   else ()
--    list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
-+    list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
-     message(STATUS "Could not find wxWidgets webview add-on")
--    FIND_PACKAGE(wxWidgets REQUIRED)
-+    FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
-   endif ()
-   MESSAGE (STATUS "Found wxWidgets..." )
-   MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")
diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
deleted file mode 100644
index 84e09c9f1e65..000000000000
--- a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0"
-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 )"
-S="${WORKDIR}/OpenCPN-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc lzma opengl"
-
-RDEPEND="
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )
-	dev-libs/tinyxml
-	media-libs/freetype:2
-	media-libs/portaudio
-	net-misc/curl
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-	x11-libs/gtk+:2
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	!sci-geosciences/opencpn-plugin-wmm"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-src_configure() {
-	use doc && HTML_DOCS=( "${S}"/../${PN}/doc/. )
-
-	setup-wxwidgets
-	local mycmakeargs=(
-		-DUSE_S57=ON
-		-DUSE_GARMINHOST=ON
-		-DBUNDLE_GSHHS=CRUDE
-		-DBUNDLE_TCDATA=ON
-	)
-
-	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
-}
diff --git a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
index 6688d1f0e0d3..f4be4868019e 100644
--- a/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
+++ b/sci-geosciences/opencpn/opencpn-5.2.4.ebuild
@@ -32,7 +32,9 @@ RDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+	sys-devel/gettext
+	sys-apps/lsb-release"
 
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )