Gentoo Archives: gentoo-commits

From: Thomas Beierlein <tomjbe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/, media-radio/wsjtx/files/
Date: Mon, 01 Mar 2021 16:41:34
Message-Id: 1614616836.1355df3aebfceb0222c9e7b5b4e562f9914bbe1a.tomjbe@gentoo
1 commit: 1355df3aebfceb0222c9e7b5b4e562f9914bbe1a
2 Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 1 16:40:36 2021 +0000
4 Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 1 16:40:36 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1355df3a
7
8 media-radio/wsjtx: Add missing dependencies
9
10 Closes: https://bugs.gentoo.org/771204
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
13
14 .../wsjtx/files/wsjtx-2.3.0-drop-docs.patch | 33 ++++++++++++++++++++++
15 media-radio/wsjtx/wsjtx-2.3.0.ebuild | 11 ++++++--
16 2 files changed, 41 insertions(+), 3 deletions(-)
17
18 diff --git a/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
19 new file mode 100644
20 index 00000000000..3654fda2f8f
21 --- /dev/null
22 +++ b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
23 @@ -0,0 +1,33 @@
24 +diff --git a/CMakeLists.txt b/CMakeLists.txt
25 +index f92d3a6..c5fb9b4 100644
26 +--- a/CMakeLists.txt
27 ++++ b/CMakeLists.txt
28 +@@ -1497,10 +1497,6 @@ if (UNIX)
29 + add_subdirectory (manpages)
30 + add_dependencies (wsjtx manpages)
31 + endif (NOT WSJT_SKIP_MANPAGES)
32 +- if (NOT APPLE)
33 +- add_subdirectory (debian)
34 +- add_dependencies (wsjtx debian)
35 +- endif (NOT APPLE)
36 + endif (UNIX)
37 +
38 + #
39 +@@ -1567,17 +1563,6 @@ install (PROGRAMS
40 + RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
41 + )
42 +
43 +-install (FILES
44 +- README
45 +- COPYING
46 +- AUTHORS
47 +- THANKS
48 +- NEWS
49 +- BUGS
50 +- DESTINATION ${CMAKE_INSTALL_DOCDIR}
51 +- #COMPONENT runtime
52 +- )
53 +-
54 + install (FILES
55 + cty.dat
56 + cty.dat_copyright.txt
57
58 diff --git a/media-radio/wsjtx/wsjtx-2.3.0.ebuild b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
59 index a76c66850fd..65a0022c8f6 100644
60 --- a/media-radio/wsjtx/wsjtx-2.3.0.ebuild
61 +++ b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
62 @@ -2,7 +2,7 @@
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=7
66 -inherit cmake
67 +inherit cmake flag-o-matic
68
69 MY_P=${P/_/-}
70
71 @@ -15,7 +15,9 @@ SLOT="0"
72 KEYWORDS="~amd64 ~x86"
73 IUSE="doc"
74
75 -RDEPEND="dev-qt/qtcore:5
76 +RDEPEND="
77 + dev-libs/boost[python]
78 + dev-qt/qtcore:5
79 dev-qt/qtgui:5
80 dev-qt/qtmultimedia:5
81 dev-qt/qtnetwork:5
82 @@ -23,9 +25,10 @@ RDEPEND="dev-qt/qtcore:5
83 dev-qt/qtconcurrent:5
84 dev-qt/qtserialport:5
85 dev-qt/qtsql:5
86 + dev-qt/qttest:5
87 dev-qt/qtprintsupport:5
88 virtual/libusb:1
89 - media-libs/hamlib
90 + >=media-libs/hamlib-4.0
91 media-libs/portaudio
92 sci-libs/fftw:3.0[threads,fortran]
93 virtual/fortran
94 @@ -38,6 +41,7 @@ DEPEND="${RDEPEND}
95 S=${WORKDIR}/wsjtx
96
97 PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
98 + "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
99 "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
100 "${FILESDIR}/${PN}-2.2.0-werror.patch"
101 "${FILESDIR}/${PN}-clang.patch" )
102 @@ -61,6 +65,7 @@ src_configure() {
103 -DWSJT_GENERATE_DOCS="$(usex doc)"
104 -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
105 )
106 + append-ldflags -no-pie
107 cmake_src_configure
108 }