gentoo resync : 03.03.2021

3 files changed, 61 insertions, 17 deletions

diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 6b4433ebc36d..18334936dc3f 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,11 +1,12 @@
 AUX wsjtx-2.0.1-hamlib.patch 479 BLAKE2B 6c77f178ab0aab9519c8e356d14f1d6050545e10d2bb2c25686afa1844107c5ddd86c9696ca1a9d8812e0c8a2194e23649ae02322555b7b9fc67f7e12a9fd623 SHA512 753b4c832f0cb442cbde73597ed5b9305e68328cb0fa69972d43be3bca480de6dab9e04906fad07abc431292bca4b0081ab65406e27e5bb688418a147e27afee
 AUX wsjtx-2.1.2-qt_helpers.patch 625 BLAKE2B 50a45636ed9ed410002866235d3d6feca21835e7619dd26012188df90156b087c463205c35e777d485c365862d5ff567da206b4e472217d8e57e3a906fd4b14f SHA512 09ac1dda4818656d7431ab453e7042630fe077a02668597f6b75ced0e3b3072eee56970a096e511eab51490765c4beaa619c308c8991e135e10d9c5c88c1281d
 AUX wsjtx-2.2.0-werror.patch 434 BLAKE2B c36c445cb7216b2cb2d1a7888aa480f0b6ffbb05389070159c2763ff979ea5faaf342d4b0a121ad616e4e2a9e2c10d1979c1fd9df8be7dc44a2df16290f43d45 SHA512 497cf4602e0e4b8eec04010822c05d3e195ff408133dff64d6c9c926bbfab06a31fbd92798f2b46e3aa8c61287399db13d4da462861782b4f3a84409f9090cdc
+AUX wsjtx-2.3.0-drop-docs.patch 676 BLAKE2B b5d6edb900dd9f26026ba3752ad14bd4b944b7829a00c9cc10194e95ac623c7f0bd1b9deee869360cf763e16966dd9a9a974cf80c12173d3346b767e6f3f47ac SHA512 193577a652fa90f23b43a052c1efb085c2ed244b318c34dab972ae6ec16c05ad290c2bd76a40502765d5964b82ceac6326f33a6d434f292e4830983be57c2ce4
 AUX wsjtx-clang.patch 619 BLAKE2B 8019381b563bfede3977e37c96c0c664089458f0be7704a5267eece14a48b8cbd4a6348803d4a4e4ef0023006363e26f89f03788ac20f01d227126952f8d2375 SHA512 cf40f9ad542ca07f70ae507a74625663541c05968e1cac78eff7ec1fc0668b683b62ed35effc03b7028a317694e1056b70b862169900f3dc9655ae1ba057210d
 AUX wsjtx-drop-docs.patch 425 BLAKE2B facdb48f573ef35d74b27b03abd9983a8df162d8843ca846285e2525fe86e4eef2892f0203c64939a9ca5478e27795415487d14eee8ca6cb0a79d0c15f9c0d6a SHA512 2c5000551313b6ee81e50841d286478bb0dba8b8df31e97cbd09ee84ae479ada8ee7fb84fb464c1524245d7b8a24a00f70fb8429a2c67e41842410d939e1800a
 AUX wsjtx-fix-unicode.patch 565 BLAKE2B 02d26dc1b1b51e9ac38feb866ecbf38e58b861c74b3a7dfb1f210d41945a8fa11ee62844416f3a6b0cccb847d393986ccd74a7db2d920382ce7c53e997d3a612 SHA512 ed3cf5972325aaccdffea7d99bd9ae4f32ecf80cf2ded57a738c491bbe0e75e538663342d3efbe7a35811d206652ae5939e2c7b2a65a4a22451b593ffa504dbf
-DIST wsjtx-2.1.2.tgz 44928980 BLAKE2B de4e4e892893e5087199385aaee8753c0f71eb36cd23734ae430f50d8a09520bf2bf3df7038bcf03ba4e9ca24534c98a1b6cb5dc444d68d3183279231cf18974 SHA512 037f0604b0a22f6d02f0979b94dd054157c96ee7a8c07284d072f87f6586901346bef1a3c7e19d367a82764dafc9f00b7d1a0929d163a46f1b249aaa3929b1a8
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
-EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
+DIST wsjtx-2.3.0.tgz 17245200 BLAKE2B b6fc4c080008ae32ef823ecb397ed4e5c2d47b878ee37ceaf23dbc36e9b894b7d167c9b8deb92d02a5714ec46383aa34755432063da8b1ecd5554c9cb8b00ce9 SHA512 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
 EBUILD wsjtx-2.2.2.ebuild 1669 BLAKE2B 487b94915ee24bd0352ff5194e6d7b4f87292a8dcf3e0cad6078e55e8bdf99d7cedd6c77b389cb5c6fe6f1bfad1a285832e1a5d62faee575ad3b386605f6c22d SHA512 866eee1a472616fd6149d6e63dc278d91cbcdee3f475f535f1ef34e2e287ade2de974a7c59cc969d56a029fcc35a08144ab38c4969e9f654588684facba3f5dd
+EBUILD wsjtx-2.3.0.ebuild 1681 BLAKE2B 1448b789435746c78bf25a90dac8dc9b8bca4e4132fe89e9a2eff397bec7e1aaf49942edd36eb33b186a36ae3dcba9ec78155ab3aea9b9cb75cfd4f07fb93558 SHA512 3838813511895cc39b3334e7be67f5d3faa8deb4c406a0c1a33b93b2f704434ef0299f130e6620239ae92a657c518b65566307ff0dd0fc7d09370e097e4e5e59
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
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
new file mode 100644
index 000000000000..3654fda2f8f1
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-2.3.0-drop-docs.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f92d3a6..c5fb9b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1497,10 +1497,6 @@ if (UNIX)
+     add_subdirectory (manpages)
+     add_dependencies (wsjtx manpages)
+   endif (NOT WSJT_SKIP_MANPAGES)
+-  if (NOT APPLE)
+-    add_subdirectory (debian)
+-    add_dependencies (wsjtx debian)
+-  endif (NOT APPLE)
+ endif (UNIX)
+ 
+ #
+@@ -1567,17 +1563,6 @@ install (PROGRAMS
+   RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+   )
+ 
+-install (FILES
+-  README
+-  COPYING
+-  AUTHORS
+-  THANKS
+-  NEWS
+-  BUGS
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
+-
+ install (FILES
+   cty.dat
+   cty.dat_copyright.txt
diff --git a/media-radio/wsjtx/wsjtx-2.1.2.ebuild b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
index 92b441112d0b..65a0022c8f68 100644
--- a/media-radio/wsjtx/wsjtx-2.1.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit cmake-utils
+EAPI=7
+inherit cmake flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -12,10 +12,12 @@ SRC_URI="mirror://sourceforge/wsjt/${MY_P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+	dev-libs/boost[python]
+	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -23,9 +25,10 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtserialport:5
 	dev-qt/qtsql:5
+	dev-qt/qttest:5
 	dev-qt/qtprintsupport:5
 	virtual/libusb:1
-	media-libs/hamlib
+	>=media-libs/hamlib-4.0
 	media-libs/portaudio
 	sci-libs/fftw:3.0[threads,fortran]
 	virtual/fortran
@@ -38,9 +41,10 @@ DEPEND="${RDEPEND}
 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.3.0-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 )
 
@@ -49,22 +53,28 @@ src_unpack() {
 	unpack "${WORKDIR}/${MY_P}/src/wsjtx.tgz"
 }
 
-src_configure() {
-	cmake_comment_add_subdirectory debian
+src_prepare() {
+	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
+								manpages/CMakeLists.txt || die
+	eapply_user
+	cmake_src_prepare
+}
 
+src_configure() {
 	local mycmakeargs=(
 		-DWSJT_GENERATE_DOCS="$(usex doc)"
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 	)
-	cmake-utils_src_configure
+	append-ldflags -no-pie
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die
-	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1.gz || die
+	rm "${D}"/usr/share/man/man1/rigctl{,d,com}-wsjtx.1 || die
 }