Gentoo Archives: gentoo-commits

From: Marc Schiffbauer <mschiff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/files/, sci-geosciences/opencpn/
Date: Tue, 05 May 2020 06:13:09
Message-Id: 1588658817.3ce758f1233b3f32337f52e282ae435a511aa2a9.mschiff@gentoo
1 commit: 3ce758f1233b3f32337f52e282ae435a511aa2a9
2 Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 1 18:22:16 2020 +0000
4 Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
5 CommitDate: Tue May 5 06:06:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ce758f1
7
8 sci-geosciences/opencpn: add version 5.0.0
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
12
13 sci-geosciences/opencpn/Manifest | 1 +
14 .../opencpn/files/5.0.0-CMakeLists.txt.patch | 79 ++++++++++++++++++++++
15 sci-geosciences/opencpn/opencpn-5.0.0.ebuild | 67 ++++++++++++++++++
16 3 files changed, 147 insertions(+)
17
18 diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
19 index 798beb6b038..96b2892dfc5 100644
20 --- a/sci-geosciences/opencpn/Manifest
21 +++ b/sci-geosciences/opencpn/Manifest
22 @@ -1,5 +1,6 @@
23 DIST opencpn-4.8.0.tar.gz 53008393 BLAKE2B 79184b678db329e98c704f4f1a132e5d3af4a65b104c6eab1c37738cbbf98d88c21647ce654077a8f4b781221d7e3766c35d7450b81befdad7f269b636263c09 SHA512 1f1ea666566e98ee3af24423985119c1b14e184d4310dbc588b00065878b1dcb8fe73a7331e4ad3f75a905774fff187203fb31253faea7238f3d783a6729ad75
24 DIST opencpn-4.8.2.tar.gz 59164504 BLAKE2B fbfa86051845a922a7c642194cd0672fbccd6a75e3897e8b0b3f9b08c091d0933a146060f83265c9a85d0bacf18f57a0f9ba55aa4f26e035a77d39d73e5e5a7d SHA512 231f8ba29f8a0343cb3807e52e8535bdade221de65a169b57e94816b4b464407ba90b605dcec21a5c45c742de076b644f076fee88616ec2867a8ae182105102d
25 DIST opencpn-4.8.8.tar.gz 59140674 BLAKE2B a03fd28b26bee46d559d16bf061eac409ca9395fdf1595162a51fe4cdfb30c3151c23b30f3396b645c4b177b3fd3b0f2ea03a850d0ea3fe2258f1abc4956a3db SHA512 4fa94655d7b9d389f5f335c15898e7138c792c71b824720fedd762ccd71c01481e5a24598b85211dba0c7d89d0ad0b2ebc2afc38301235829d4aa6f499c6f9b2
26 +DIST opencpn-5.0.0.tar.gz 67164574 BLAKE2B a06520aaf0dc1457208c5c6968d44b0122b89eca632aa3b8471a0efd452d41c155ee05274284d84e5de9f700a9d549b61eae5d2ddfc8e70c4d5cfa7cf1c84f3f SHA512 1b0f0e1a7164bc342a79837b987d8e4f69f164739f0d9c9c6448fab496af0944fe77b9cd3bbb9f2ee874cbb42add2da67df44606c6b8e620d0be2caf6a71eb96
27 DIST opencpn-doc_4.1.1329.1.orig.tar.xz 8739872 BLAKE2B 1d0b1538230488586318212d371669d0dfd6fefb45a49c1405c8749cfc2d5b1ced39c03ad7814954db42644ab5c21a37177e0f315b8d6d49c2200508f27a9899 SHA512 652a932edbf8a6f05fd3c64ddf566f817405cf44697035f58ddbf1a99bf92269b7fd9ee83b7ee065aa60db15b6030d8c5c9a4a4001049ed2def9962bc51746c2
28 DIST opencpn-doc_4.8.2.0.orig.tar.xz 22302480 BLAKE2B 2bcd2ac01340cde0d0be80537321c8c3e829a8e664944c34f3f3112f931c45746059b5c173402982601ccf88926241741c7fb44f251e9fe48b83aa5f3e8d7727 SHA512 678317c77feb3b0bf695e337e7e95083df1d488e0a5ad3bad41bad11dc87271d6fc0ac194a6b63b603d5c1f1184e6c9f91de895a7db01017ef2a7068a62404eb
29
30 diff --git a/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch b/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
31 new file mode 100644
32 index 00000000000..aca98fe9f01
33 --- /dev/null
34 +++ b/sci-geosciences/opencpn/files/5.0.0-CMakeLists.txt.patch
35 @@ -0,0 +1,79 @@
36 +diff --git a/CMakeLists.txt b/CMakeLists.txt
37 +index fcec1191a..8df2a9e21 100644
38 +--- a/CMakeLists.txt
39 ++++ b/CMakeLists.txt
40 +@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7"))
41 + ENDIF()
42 +
43 + IF((_wx_selected_config MATCHES "qt-armv7"))
44 +- SET(wxWidgets_USE_LIBS base core xml html adv aui)
45 ++ SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
46 + ELSE()
47 +- SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
48 ++ SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
49 + ENDIF()
50 +
51 + OPTION (USE_GL "Enable OpenGL support" ON)
52 +@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li
53 + SET(OPENGLES_FOUND "YES")
54 + SET(OPENGL_FOUND "YES")
55 +
56 +- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
57 ++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
58 + add_subdirectory(src/glshim)
59 +
60 + SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm" )
61 +@@ -455,7 +455,7 @@ IF(QT_ANDROID)
62 + SET(OPENGLES_FOUND "YES")
63 + SET(OPENGL_FOUND "YES")
64 +
65 +- SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
66 ++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
67 + add_subdirectory(src/glshim)
68 + ENDIF(QT_ANDROID)
69 +
70 +@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID))
71 + ENDIF(USE_GL)
72 +
73 + IF(OPENGL_FOUND)
74 +- SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
75 ++ SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
76 + INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
77 +
78 + MESSAGE (STATUS "Found OpenGL...." )
79 +@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID)
80 + ENDIF(MSVC)
81 +
82 + IF(WIN32 OR APPLE OR QT_ANDROID)
83 +- FIND_PACKAGE(wxWidgets)
84 ++ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
85 + if (wxWidgets_FOUND)
86 + message(STATUS "Found wxWidgets webview add-on")
87 + add_definitions(-DOCPN_USE_WEBVIEW)
88 + else ()
89 +- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
90 ++ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
91 + message(STATUS "Could not find wxWidgets webview add-on")
92 +- FIND_PACKAGE(wxWidgets REQUIRED)
93 ++ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
94 + endif ()
95 + IF(MSYS)
96 + # this is to convert msys to windows paths, and handle the missing /usr
97 +@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
98 + set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
99 + MESSAGE(STATUS "Building against GTK3...")
100 + ENDIF(GTK2_FOUND)
101 +- FIND_PACKAGE(wxWidgets)
102 ++ FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
103 + if (wxWidgets_FOUND)
104 + message(STATUS "Found wxWidgets webview add-on")
105 + add_definitions(-DOCPN_USE_WEBVIEW)
106 + else ()
107 +- list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
108 ++ list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
109 + message(STATUS "Could not find wxWidgets webview add-on")
110 +- FIND_PACKAGE(wxWidgets REQUIRED)
111 ++ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
112 + endif ()
113 + MESSAGE (STATUS "Found wxWidgets..." )
114 + MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")
115
116 diff --git a/sci-geosciences/opencpn/opencpn-5.0.0.ebuild b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
117 new file mode 100644
118 index 00000000000..4ae2fe2e75a
119 --- /dev/null
120 +++ b/sci-geosciences/opencpn/opencpn-5.0.0.ebuild
121 @@ -0,0 +1,67 @@
122 +# Copyright 1999-2020 Gentoo Authors
123 +# Distributed under the terms of the GNU General Public License v2
124 +
125 +EAPI=6
126 +
127 +WX_GTK_VER="3.0"
128 +inherit cmake-utils wxwidgets
129 +
130 +DOC_VERSION="4.8.2.0"
131 +
132 +DESCRIPTION="a free, open source software for marine navigation"
133 +HOMEPAGE="https://opencpn.org/"
134 +SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
135 +doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${DOC_VERSION}.orig.tar.xz )
136 +"
137 +
138 +LICENSE="GPL-2+"
139 +SLOT="0"
140 +KEYWORDS="~amd64 ~x86"
141 +IUSE="doc lzma opengl"
142 +
143 +RDEPEND="
144 + app-arch/bzip2
145 + lzma? ( app-arch/xz-utils )
146 + dev-libs/tinyxml
147 + media-libs/freetype:2
148 + media-libs/portaudio
149 + net-misc/curl
150 + sys-libs/zlib
151 + opengl? ( virtual/opengl )
152 + x11-libs/gtk+:2
153 + x11-libs/wxGTK:${WX_GTK_VER}[X]
154 + !sci-geosciences/opencpn-plugin-wmm
155 +"
156 +DEPEND="${RDEPEND}
157 + sys-devel/gettext"
158 +
159 +S="${WORKDIR}/OpenCPN-${PV}"
160 +
161 +PATCHES=(
162 + "${FILESDIR}/${PV}-CMakeLists.txt.patch"
163 +)
164 +
165 +src_configure() {
166 + setup-wxwidgets
167 + local mycmakeargs=(
168 + -DUSE_S57=ON
169 + -DUSE_GARMINHOST=ON
170 + -DBUNDLE_GSHHS=CRUDE
171 + -DBUNDLE_TCDATA=ON
172 + )
173 +
174 + cmake-utils_src_configure
175 +}
176 +
177 +src_install() {
178 + if use doc; then
179 + dohtml -r "${S}"/../${PN}/doc/*
180 + fi
181 + cmake-utils_src_install
182 +}
183 +
184 +pkg_postinst() {
185 + if use doc; then
186 + einfo "Documentation is available at file:///usr/share/doc/${PF}/html/help_en_US.html"
187 + fi
188 +}