From fefed26cfdf281587a880bdb39d9f1841f23576a Mon Sep 17 00:00:00 2001
From: Rick Farina <zerochaos@gentoo.org>
Date: Wed, 17 Feb 2021 21:40:03 -0500
Subject: media-radio/wsjtx: bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos@gentoo.org>
---
 media-radio/wsjtx/Manifest           |  2 +-
 media-radio/wsjtx/wsjtx-2.1.2.ebuild | 70 --------------------------------
 media-radio/wsjtx/wsjtx-2.3.0.ebuild | 79 ++++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 71 deletions(-)
 delete mode 100644 media-radio/wsjtx/wsjtx-2.1.2.ebuild
 create mode 100644 media-radio/wsjtx/wsjtx-2.3.0.ebuild

(limited to 'media-radio/wsjtx')

diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index f15325836fce..56aff1b60d1e 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,2 +1,2 @@
-DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
+DIST wsjtx-2.3.0.tgz 17245200 BLAKE2B b6fc4c080008ae32ef823ecb397ed4e5c2d47b878ee37ceaf23dbc36e9b894b7d167c9b8deb92d02a5714ec46383aa34755432063da8b1ecd5554c9cb8b00ce9 SHA512 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.1.2.ebuild
deleted file mode 100644
index 92b441112d0b..000000000000
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtserialport:5
-	dev-qt/qtsql:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	media-libs/hamlib
-	media-libs/portaudio
-	sci-libs/fftw:3.0[threads,fortran]
-	virtual/fortran
-	app-text/asciidoc
-	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
-
-S=${WORKDIR}/wsjtx
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
-		  "${FILESDIR}/${PN}-fix-unicode.patch"
-		  "${FILESDIR}/${PN}-drop-docs.patch"
-		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch" )
-
-DOCS=( AUTHORS BUGS NEWS README THANKS )
-
-src_unpack() {
-	unpack ${A}
-	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
-}
-
-src_configure() {
-	cmake_comment_add_subdirectory debian
-
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.3.0.ebuild b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
new file mode 100644
index 000000000000..5d3696d2a266
--- /dev/null
+++ b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Weak signal ham radio communication"
+HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtserialport:5
+	dev-qt/qtsql:5
+	dev-qt/qtprintsupport:5
+	virtual/libusb:1
+	media-libs/hamlib
+	media-libs/portaudio
+	sci-libs/fftw:3.0[threads,fortran]
+	virtual/fortran
+	app-text/asciidoc
+	doc? ( dev-ruby/asciidoctor )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools
+	"
+
+S=${WORKDIR}/wsjtx
+
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-hamlib.patch"
+		  "${FILESDIR}/${PN}-fix-unicode.patch"
+		  "${FILESDIR}/${PN}-drop-docs.patch"
+		  "${FILESDIR}/${PN}-2.1.2-qt_helpers.patch"
+		  "${FILESDIR}/${PN}-2.2.0-werror.patch"
+		  "${FILESDIR}/${PN}-clang.patch" )
+
+DOCS=( AUTHORS BUGS NEWS README THANKS )
+
+src_unpack() {
+	unpack ${A}
+	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
+}
+
+src_prepare() {
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	cmake_comment_add_subdirectory debian
+
+	local mycmakeargs=(
+		-DWSJT_GENERATE_DOCS="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
+}
-- 
cgit v1.2.3-65-gdbad