gentoo resync : 16.09.2020

8 files changed, 48 insertions, 76 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index a69c220f26b9..fc56ab9cb459 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index f90baed31c09..52e452c0eeeb 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,3 +1,4 @@
+AUX tlf-1.4.1-zone_nr.patch 468 BLAKE2B b9dc26ba4f2775dbdf2f2aacb763a70acbe4c6331a862f9db43774d0bbdeef9214c48f4cf30b0f52de5ab65b9ac157d160b52a19777a640f3a6d53c22187e74d SHA512 e415d62ed1bbb50bf6eedbe5bc93e06c02152bbb7f4a096f9229b3314a21125eec765255a7ddfbd07a478088a5097daaab5f8702d27c04babd5a29a5db7b4e29
 DIST tlf-1.4.1.tar.gz 708105 BLAKE2B 18cd617a8780293bbfec87875491935d16022e104eed128ab69cbc3824aa5f8ab77dd07728d952e9b932ea74ee1c258522c26b5458b715320d452d58a65cfd3c SHA512 89076ba3b870f65b1469d64a223a9d35f1afd3edc6801446990d7ce197b04dacf141efc40382c69c78935a16f386385df0c7b48a040072cecc311cda56d479b5
-EBUILD tlf-1.4.1.ebuild 631 BLAKE2B 0164a96547dff1b494eeb3793787025eaa52acbc91582d26beb2e361ac3eebde8959eb3811ad9b59cdf304e132a680d3ae39efe8a8976c3bf1f45fec60e193e2 SHA512 740d86aa0ea795321fc9c3c987cf0c9959d8f046ddbc492a32e9b2450e7350a2656df8fb6fe53d8d7df46db7d855c84b2b218f977f52ad00ada9b30624b5bbf7
+EBUILD tlf-1.4.1.ebuild 677 BLAKE2B 8f970b1886111ace7ca4d8ba2582b602a2239c60f64cf423ef1f9f54935bbd4e4bc994927d37615ef2d89a9cc2b97d0e55bef79cd7f99a1cfc6fc81fa073eaa8 SHA512 92662a2c44cb6bb7c74e76bb791bc4d1901e406b0fcb316c4eaf8e376bd7db96f979ceea0b94981170f3d844587999c0ce5a4450da80a23963f6460d8d7f8d59
 MISC metadata.xml 249 BLAKE2B d6fa8a349066f9684c68c3086f53e41ebf30b6e313e8e8e752a953c0eaa0853448fe17e5ed46836bc5e149a282a33c7408c675d3b39eb3d59ddc1c1ad86bf716 SHA512 965ae00fa198dd8f5869c4c14ff3e28c7d76be7182be6ba4bedbb68d7138da5be3c8bb993689db2c73ac328456015ebdf018ee1b308d6988067810d1156bd179
diff --git a/media-radio/tlf/files/tlf-1.4.1-zone_nr.patch b/media-radio/tlf/files/tlf-1.4.1-zone_nr.patch
new file mode 100644
index 000000000000..cc5cf3775920
--- /dev/null
+++ b/media-radio/tlf/files/tlf-1.4.1-zone_nr.patch
@@ -0,0 +1,20 @@
+diff --git a/src/zone_nr.c b/src/zone_nr.c
+index c7e2a33..805bd4e 100644
+--- a/src/zone_nr.c
++++ b/src/zone_nr.c
+@@ -20,11 +20,14 @@
+  *   get zone number
+  *
+  *--------------------------------------------------------------*/
+-
++#include "string.h"
+ 
+ int zone_nr(char *comment) {
+     int z = 0;
+ 
++    if (strlen(comment) < 2)
++	return z;
++
+     if (comment[0] <= 57 && comment[0] >= 48)
+ 	z = (comment[0] - 48) * 10;
+     if (comment[1] <= 57 && comment[1] >= 48)
diff --git a/media-radio/tlf/tlf-1.4.1.ebuild b/media-radio/tlf/tlf-1.4.1.ebuild
index 23bc6b749b8e..8da29357b285 100644
--- a/media-radio/tlf/tlf-1.4.1.ebuild
+++ b/media-radio/tlf/tlf-1.4.1.ebuild
@@ -25,6 +25,8 @@ DEPEND="
 	${RDEPEND}
 	test? ( dev-util/cmocka )"
 
+PATCHES=( "${FILESDIR}"/${P}-zone_nr.patch )
+
 src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/hamlib
 	econf --enable-fldigi-xmlrpc
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 896d772a7d02..6bb7d73542d2 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -1,12 +1,11 @@
 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-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.0.tgz 23158263 BLAKE2B e605447ffe0f7e4af4df3f15fced342aa61d40100778df731b1c419ac03fd569dde3547a7082fc41a6b07080b11305517a8cdca3a1b8404548ecffdb5b7b616d SHA512 7df7c80047b34097fc26b0d8c21de8b3ca27bae15602b1bb1ad117fe13f14931145bd55fcdceb86f2ee931d51285c6175f7b7cd89891b7e88c4baf7c17ed82cd
 DIST wsjtx-2.2.2.tgz 23213092 BLAKE2B ce558180208ad33ddf2089f1747630cd07975547ba93bb693698ce599caec8d3d3367128581dfd110c6fe240bce9a0e6b8351ef178e6b53f3490a29a96367460 SHA512 923df18f5cbbd3e40294ccc4d3730f40c13c7777345723b9e66063ff0dd7db65caa9a64323711201a73b8c455dc1c29f67e4645dfbf98e0fc2c60a1630ce6cd1
 EBUILD wsjtx-2.1.2.ebuild 1470 BLAKE2B 7ce4185d8be8dd273f5ca2dd4221e29f97b0903478db6eca3f11041ca8d6ca895c1b598c9a8e3cd4bc9a4850d6b6f4447997b4b868a96db1c4183b48c5b28b4f SHA512 07456e1c31711466dce9f611f8d6ce34f9c09172fd4128f876c070add742dcc923ca8988728435aa3f3f6822308fd5a0cf1d949562401aedff788b05210039cf
-EBUILD wsjtx-2.2.0.ebuild 1491 BLAKE2B 952664335601511113cacd14c404500d29502479dea950d929d4d333e7853346c5ca874765c92ed22ea28b84f9301f017d1b0ab6bba4d337fbb51248dd3ed527 SHA512 c00d076f535638ccc2beda4a10101cf02f8cfbfdc2dec3bc8e19ae60720014fb567ac9eb7fe2c7122d22d5284dd3a98073265fdf4033a69d078291b3fb066c3e
-EBUILD wsjtx-2.2.2.ebuild 1635 BLAKE2B d29bc7e272ffabf101358bb816460309e4f2680572acffbbd3855f790d6993bc702d5f698b361e6c7d6e055a2bae210e99a549b30bf6d2da4e8931a9736269bc SHA512 498bc32bfc180d7f1808d6fff66559053ef3e35c75bdd67587329413fe61366a83488f97b07424c1a54fca06e9316d164bd2f99a9483175970ed5a5fe94be24a
+EBUILD wsjtx-2.2.2.ebuild 1671 BLAKE2B eebd50797fac7eafd74e3f2cfaa4260c1df8479f4454dda9d621ea363767dd98da6ca169ce292da2f5276e80551a8bac377422aacd34e07618e1dff2992d8fd9 SHA512 f620482536a141fad9716ba18c72efbabe57896d987c8aaa38767cbf680d60450c31ea327d4b802c15cf3bd8cb7e3ce24eceb8d1d3451c407e0a3832bdfc5b87
 MISC metadata.xml 411 BLAKE2B b18268ad951aaeb11cb490e4b02fa063915d2862f81e1a9f4ef69bf391c0628e75258d4bc66ce942a51d88369033b4e9dc8f5b8fff1c26bd33a4560ca493d70e SHA512 1b11819a29e25cf3ce3932bfb200ce65fd69c0872149acb54d3c67fb35d9977feee5d87e7412d75751cbc6a9b76010a2bcbc8b3a47a50d11a0c011abc5a83efc
diff --git a/media-radio/wsjtx/files/wsjtx-clang.patch b/media-radio/wsjtx/files/wsjtx-clang.patch
new file mode 100644
index 000000000000..bb6c97a538f6
--- /dev/null
+++ b/media-radio/wsjtx/files/wsjtx-clang.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2020-09-08 10:36:55.770304108 +0200
++++ b/CMakeLists.txt	2020-09-08 10:37:28.346406308 +0200
+@@ -1193,7 +1193,7 @@
+   if (OpenMP_C_FLAGS)
+     set_target_properties (wsjt_fort_omp
+       PROPERTIES
+-      COMPILE_FLAGS "${OpenMP_C_FLAGS}"
++      COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}"
+       )
+   endif ()
+   set_target_properties (wsjt_fort_omp
+@@ -1260,7 +1260,7 @@
+     if (OpenMP_C_FLAGS)
+       set_target_properties (jt9
+         PROPERTIES
+-        COMPILE_FLAGS "${OpenMP_C_FLAGS}"
++	COMPILE_FLAGS "${OpenMP_Fortran_FLAGS}"
+         LINK_FLAGS "${OpenMP_C_FLAGS}"
+         )
+     endif ()
diff --git a/media-radio/wsjtx/wsjtx-2.2.0.ebuild b/media-radio/wsjtx/wsjtx-2.2.0.ebuild
deleted file mode 100644
index dca5c4436768..000000000000
--- a/media-radio/wsjtx/wsjtx-2.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 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" )
-
-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_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.gz || die
-}
diff --git a/media-radio/wsjtx/wsjtx-2.2.2.ebuild b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
index 01c2452f0a84..923305c594b1 100644
--- a/media-radio/wsjtx/wsjtx-2.2.2.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.2.2.ebuild
@@ -41,7 +41,8 @@ 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}-2.2.0-werror.patch"
+		  "${FILESDIR}/${PN}-clang.patch" )
 
 DOCS=( AUTHORS BUGS NEWS README THANKS )