gentoo resync : 06.04.2022

6 files changed, 2 insertions, 330 deletions

diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index eb20c83147f5..1b1c0bc94080 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -3,14 +3,6 @@ AUX wsjtx-2.1.2-qt_helpers.patch 625 BLAKE2B 50a45636ed9ed410002866235d3d6feca21
 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
-DIST wsjtx-2.5.0.tgz 25180010 BLAKE2B 09a50f8bbaca4fa6883ad335a6eb3e0d60d3e20382140ab69e3165ba4a38c9e96b059831db9a28452b15f5a0b98118e1269f3484ac8f375525135236b9d7ce02 SHA512 d5f801c9ec038a84d5b12a3843de9af7bbd6d628bd5eb8d3dd1e1621f04b319f9cc2ed01c882bf09ad3801800ee1b1fbeb49c8a9f991a2c03f3170ac192a6017
-DIST wsjtx-2.5.1.tgz 25249461 BLAKE2B fe858e4a21434c7357aa5baab8f4aff206a22bec7305b2d7c6a3860a389ca19779f4775a5618c046b25a71006a882f7a33b30baebe6e848182bd434ff82bb9aa SHA512 bce84766ea1eb13e899ccfc252ee3bcdb6f1d50afa6b312b0509d1eea8e5dcfc958c772fee2a2c40d43058e06ecda798fa9136252e3de0c4a40df27217a4b362
-DIST wsjtx-2.5.2.tgz 25246974 BLAKE2B ada5fc73a600477fa7f1f68c9c8c53e26c56d60aea1c28edc8c35e4ff67a309bf61e82f58c93c05a24c08ed7e77419c2a6ef6862b7cac059cccbebe66512afaf SHA512 cdccbb824614d391aa8f750e3c7e47d1fe8a9704f50d8a361e8741fadea971683383d9dfe0456c674b4584a47eb9a0fdce9c36a608d164de5ae98538e9b83705
-DIST wsjtx-2.5.3.tgz 25599071 BLAKE2B c62fc1f4ce23ce99ddea475039b99d40b23d2a42f7d9995395ea0f2655b3b01595539ae40f78dc29bc5c97ba1f165dcd8a5daef6d4f9b55c2260667a09d47e30 SHA512 ed6664223069c7b44dac8c995b4beaa96e2a839a9049e5805d93b1f0ffe03d310b7a301150d693fcc22f96a97ed86c4948059f1e18b23cd2c9a5e44665100862
 DIST wsjtx-2.5.4.tgz 25369854 BLAKE2B 674cb64f8f30114dd4e857181502e39d5a61fdb487ef503fd945d1e91853f8aab4dead7c2e9daf4ed2863b07b9760ceec3b6c79c30b64c0c2e3115efc1e20be6 SHA512 c4092d03af3346f0244d942c3db693f5d2c1ed7a2ec9077ded039b7d162e15abdaf09dcb9997d1833d25c366eb03a0dab6114313d423e7e2c9ff37d965261efc
-EBUILD wsjtx-2.5.0.ebuild 1687 BLAKE2B 77b160d46cb92cbf63c72feb553ba06ebf4f1c06f41479da89f1cd4f959850a476385698f4c934b5a675a2d3f023f254d4d224515a515988d0c0f98a2dc18dfa SHA512 497807b138ef74825294b571d0ab9a4b33ef6a68f5ebb80171461772847878cd62d62090ab8de9bf69cf5065672faad173a464270ecc64427f82a5b63dad0922
-EBUILD wsjtx-2.5.1.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
-EBUILD wsjtx-2.5.2.ebuild 1689 BLAKE2B dd6a09e69b77941ace5d69e756359d3f321d982831160b05eaba1a7ed4befba470d18c684a0776a2efa78b6f64c2c1a5eeec527118cbf180b582643c7f2c9463 SHA512 d407ea31a2c61f46f98f21b2736b76e25e212a87a047f6c506ce336ed561ee7aa554d0bb1b4b7b632902ddbcb6968ea2af7943a174cf62e774c1665cc6e7b3f1
-EBUILD wsjtx-2.5.3.ebuild 1702 BLAKE2B 6c4738e241760bdaf1f46040327ba08b707cfad7d7a67cde147680e816087a2a76228ca292246ccd10f854807f18a11a9e41237a4958b2320dd1e803e925ebbf SHA512 16945c4965d11d522595330bfac689ac1a4c8504ce43850db0c8a4ee26f8949e4fa406dfd29e82d581df1247d356d2cb8c114de3afd8ad5a35176bd8cd113e6d
-EBUILD wsjtx-2.5.4.ebuild 1702 BLAKE2B a5ebf298f5e46f4b8d8314cf6153e47ecd8cfb090d876ef3a24952236979cd7515878747631d4cf4c0a400e79e2764bbb4dbf93d0c944cade44f50be917e9ea2 SHA512 a532ecd0a79613578a27aaf31a419d1bd1a3048500b7b68d37dd030c94621d63c29b611aa7fe10d8a13e84f48029a4d0c4aeccb48c7240834ab8fe0e066f04ee
+EBUILD wsjtx-2.5.4.ebuild 1700 BLAKE2B db34b9f8b3f697cf9e438733402587db988def94ad31b34d7861ec8dead648f033d70446b74fa693ae80d37ebcb7a6b7abbd85a4d050db2a99a3ff86ccda1b1f SHA512 17b2c2eec12d0ce0c192c43722159b848a241db65567b0d453a368bff8985652adaac7e34a7fc522ddf59e7262cc156b2c28fa45e6a58777293a4aec9a290981
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.5.0.ebuild b/media-radio/wsjtx/wsjtx-2.5.0.ebuild
deleted file mode 100644
index f7879402eaec..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-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-libs/boost:=[nls,python]
-	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/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	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}-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 )
-
-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() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	append-ldflags -no-pie
-	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
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.1.ebuild b/media-radio/wsjtx/wsjtx-2.5.1.ebuild
deleted file mode 100644
index aef0bd374750..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-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-libs/boost:=[nls,python]
-	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/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	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}-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 )
-
-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() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	append-ldflags -no-pie
-	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
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.2.ebuild b/media-radio/wsjtx/wsjtx-2.5.2.ebuild
deleted file mode 100644
index aef0bd374750..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-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-libs/boost:=[nls,python]
-	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/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	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}-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 )
-
-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() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	append-ldflags -no-pie
-	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
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.3.ebuild b/media-radio/wsjtx/wsjtx-2.5.3.ebuild
deleted file mode 100644
index 5eb5dda86065..000000000000
--- a/media-radio/wsjtx/wsjtx-2.5.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
-SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/boost:=[nls,python]
-	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/qttest:5
-	dev-qt/qtprintsupport:5
-	virtual/libusb:1
-	>=media-libs/hamlib-4.0:=
-	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}-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 )
-
-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() {
-	local mycmakeargs=(
-		-DWSJT_GENERATE_DOCS="$(usex doc)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	append-ldflags -no-pie
-	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
-}
diff --git a/media-radio/wsjtx/wsjtx-2.5.4.ebuild b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
index 88d2e49b406f..e6faedc87d75 100644
--- a/media-radio/wsjtx/wsjtx-2.5.4.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="