Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/wsjtx/
Date: Mon, 08 Aug 2022 09:40:38
Message-Id: 1659951619.eedab163cf3f962eadcba106053e1e2d8aa5667c.asturm@gentoo
1 commit: eedab163cf3f962eadcba106053e1e2d8aa5667c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 25 17:48:28 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 8 09:40:19 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedab163
7
8 media-radio/wsjtx: Move dev-qt/linguist-tools:5 to BDEPEND
9
10 Fix HOMEPAGE to use https
11 Drop superfluous eapply_user, called by default in cmake_src_prepare
12 Drop superfluous src_compile()
13 Drop one-time use of global var
14 Minor ebuild style fixes (empty line after EAPI, PATCHES indentation)
15
16 Bug: https://bugs.gentoo.org/544938
17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
18
19 media-radio/wsjtx/wsjtx-2.5.4.ebuild | 32 +++++++++++++-------------------
20 1 file changed, 13 insertions(+), 19 deletions(-)
21
22 diff --git a/media-radio/wsjtx/wsjtx-2.5.4.ebuild b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
23 index e6faedc87d75..c1d207649d28 100644
24 --- a/media-radio/wsjtx/wsjtx-2.5.4.ebuild
25 +++ b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
26 @@ -2,13 +2,13 @@
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=8
30 -inherit cmake flag-o-matic
31
32 -MY_P=${P/_/-}
33 +inherit cmake flag-o-matic
34
35 DESCRIPTION="Weak signal ham radio communication"
36 -HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
37 +HOMEPAGE="https://physics.princeton.edu//pulsar/K1JT/wsjtx.html"
38 SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
39 +S=${WORKDIR}/wsjtx
40
41 LICENSE="GPL-3"
42 SLOT="0"
43 @@ -34,29 +34,27 @@ RDEPEND="
44 virtual/fortran
45 app-text/asciidoc
46 doc? ( dev-ruby/asciidoctor )"
47 -DEPEND="${RDEPEND}
48 - dev-qt/linguist-tools
49 - "
50 +DEPEND="${RDEPEND}"
51 +BDEPEND="dev-qt/linguist-tools"
52
53 -S=${WORKDIR}/wsjtx
54 -
55 -PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
56 - "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
57 - "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
58 - "${FILESDIR}/${PN}-2.2.0-werror.patch"
59 - "${FILESDIR}/${PN}-clang.patch" )
60 +PATCHES=(
61 + "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
62 + "${FILESDIR}/${PN}-2.3.0-drop-docs.patch"
63 + "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
64 + "${FILESDIR}/${PN}-2.2.0-werror.patch"
65 + "${FILESDIR}/${PN}-clang.patch"
66 +)
67
68 DOCS=( AUTHORS BUGS NEWS README THANKS )
69
70 src_unpack() {
71 unpack ${A}
72 - unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
73 + unpack "${WORKDIR}/${P/_/-}/src/wsjtx.tgz"
74 }
75
76 src_prepare() {
77 sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/# COMMAND/" \
78 manpages/CMakeLists.txt || die
79 - eapply_user
80 cmake_src_prepare
81 }
82
83 @@ -69,10 +67,6 @@ src_configure() {
84 cmake_src_configure
85 }
86
87 -src_compile() {
88 - cmake_src_compile
89 -}
90 -
91 src_install() {
92 cmake_src_install
93 rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die