gentoo auto-resync : 08:08:2022 - 14:14:07

5 files changed, 19 insertions, 29 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index a79809610ff9..f817e3c310e4 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index e94022a4821a..1ae2b5e63cee 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -5,5 +5,5 @@ AUX svxlink.init 782 BLAKE2B 536435d70a3a5afbcf533ce39cc1b8bc0de5320ac57728a4ef7
 AUX svxlink.rc 568 BLAKE2B 7e0fa55b6d7d099778f2b20cf3b85b54a943460ade694bdf75159945f0be671eefefbffdfceaf28b092dcd4078970f88194d63311f3cea9cfb38922d83e9f1de SHA512 96e95116c031e3e5f21d1239362736c093c3e5c32adcb4eef1fa667c89a08d62cdb82640a246cf11b9fddc62544f98a660f626e91c67dd7a0d608904b8ddf6dd
 AUX svxlink.service 690 BLAKE2B 7f62518556c7c0fd0a4e759031520181f5a9a61a4d5ebcf874e60e8cd400327feee0306011ab8c88b17b8a5b666cc0fda90244b7a9e5ad9734ec629e0bf3d2f3 SHA512 2879820eaa64bc574e1a2c57492ba429cb4b5748b56132fac8922727a8924197b719075c39a6ab0ffcb698b3cf4b5eb889f19c2aac0a9d143f0aef6de778b225
 DIST svxlink-19.09.2.tar.gz 1730836 BLAKE2B 7fe8a1b018dba7837486dbed21242d8514a1f546b5eecbd2d2bfdf620d7e093cddbedab17f19d5f2cbd79c9a66825713c45a981335f0b526ba0946e764efc535 SHA512 f3c8b29953da3b2f61eba528a07152f40a2aca2efe511cb98637b1ef77fa676e506a3f4766edb81069f13333ddbae2d39f679874455b05286d3daf96a903e1c1
-EBUILD svxlink-19.09.2.ebuild 1780 BLAKE2B 92351ce21c5153e416e0ae785b225695325a2f758e1672de54fe52584bca7f0b50b1bcb783a031b8a34b5267a1a3c62c954f4e30bff731042a28e18174de4f04 SHA512 aa9d70aba5bda4acb35080aa147b53a482fb100eb403713ca6bc42a83e3b001574ccefa224ca2bd169fa4a7c891c20b69822def5ce7262861d97ec0f138a51ad
+EBUILD svxlink-19.09.2.ebuild 1731 BLAKE2B 0a4a1408eec6df37625d1de078e4f50913e4ebc00d34cb467039b28c5c2c95028af437ddbbc410881e4edd4759732c4e02df52b9046ebff16546fbc8eb25f58d SHA512 940b333e1244c948b8aa3ff9f0556bfbf734d22ba6f5c54b10e1abbd53c6bdc367c3a188aa4d34910c78036a0628449c8aa68cde81e3db2965e2bad8d43ea8f2
 MISC metadata.xml 697 BLAKE2B 069f55a9c5052ba06c5caca06588e3c137a2eea1a81dfee5df102de20f6e7c69e027c8eabddb3458877a035a982f4516cfd898b15bdd6cdeebbb4978147c4c52 SHA512 bf9262e8f4fbd0256705237a7281b211b34588b668093e6288435ffced019a288433f0b9304f67f2b7623c4781c29bfeb563c0af60452e6a3f584a71063f348c
diff --git a/media-radio/svxlink/svxlink-19.09.2.ebuild b/media-radio/svxlink/svxlink-19.09.2.ebuild
index b1673b04c5a5..32d84c58f3d0 100644
--- a/media-radio/svxlink/svxlink-19.09.2.ebuild
+++ b/media-radio/svxlink/svxlink-19.09.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-CDEPEND="dev-lang/tcl:0
+DEPEND="dev-lang/tcl:0
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
@@ -30,10 +30,10 @@ CDEPEND="dev-lang/tcl:0
 	media-libs/opus
 	dev-libs/libsigc++:2
 	dev-libs/popt"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	acct-group/svxlink
 	acct-user/svxlink"
-DEPEND="${CDEPEND}
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
@@ -51,10 +51,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 
diff --git a/media-radio/wsjtx/Manifest b/media-radio/wsjtx/Manifest
index 1b1c0bc94080..9fdb9cbaebe2 100644
--- a/media-radio/wsjtx/Manifest
+++ b/media-radio/wsjtx/Manifest
@@ -4,5 +4,5 @@ AUX wsjtx-2.2.0-werror.patch 434 BLAKE2B c36c445cb7216b2cb2d1a7888aa480f0b6ffbb0
 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.4.tgz 25369854 BLAKE2B 674cb64f8f30114dd4e857181502e39d5a61fdb487ef503fd945d1e91853f8aab4dead7c2e9daf4ed2863b07b9760ceec3b6c79c30b64c0c2e3115efc1e20be6 SHA512 c4092d03af3346f0244d942c3db693f5d2c1ed7a2ec9077ded039b7d162e15abdaf09dcb9997d1833d25c366eb03a0dab6114313d423e7e2c9ff37d965261efc
-EBUILD wsjtx-2.5.4.ebuild 1700 BLAKE2B db34b9f8b3f697cf9e438733402587db988def94ad31b34d7861ec8dead648f033d70446b74fa693ae80d37ebcb7a6b7abbd85a4d050db2a99a3ff86ccda1b1f SHA512 17b2c2eec12d0ce0c192c43722159b848a241db65567b0d453a368bff8985652adaac7e34a7fc522ddf59e7262cc156b2c28fa45e6a58777293a4aec9a290981
+EBUILD wsjtx-2.5.4.ebuild 1633 BLAKE2B 47f3e55191d830ba9092c3714908ac972dfefd12f3571d14ca87d0ea7485e931566bebfbecbd745b5c69e269edc9015ba24b6e5141642a92d6947215c04d7c87 SHA512 7b2373bd7baa9d92dc8fa9bb1976d028284e958f8ac0f6647b67be639cb0c6546345fd6c32b0cdeac8e29cad9aae704916136b4f7c1bbaf0ce80f40850bbaa36
 MISC metadata.xml 412 BLAKE2B a8910c8ec81f720c209c3d9cb6cdfbde76be4c5a96941dfc3b799e9ba6b4d967928508c04bc5805536319a20f0b7cb292a2475f91de27471c11b9fd0f9073bec SHA512 2215cd7cea5ed62ef70bb2823ce85628877e3c204f7a55e582431c2d90ec8f77e6523b3e81c1747b339d58eeaf7c026ea26b6245af86294904e1c34887da943f
diff --git a/media-radio/wsjtx/wsjtx-2.5.4.ebuild b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
index e6faedc87d75..c1d207649d28 100644
--- a/media-radio/wsjtx/wsjtx-2.5.4.ebuild
+++ b/media-radio/wsjtx/wsjtx-2.5.4.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit cmake flag-o-matic
 
-MY_P=${P/_/-}
+inherit cmake flag-o-matic
 
 DESCRIPTION="Weak signal ham radio communication"
-HOMEPAGE="http://physics.princeton.edu/pulsar/K1JT/wsjtx.html"
+HOMEPAGE="https://physics.princeton.edu//pulsar/K1JT/wsjtx.html"
 SRC_URI="https://physics.princeton.edu/pulsar/k1jt/${P}.tgz"
+S=${WORKDIR}/wsjtx
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -34,29 +34,27 @@ RDEPEND="
 	virtual/fortran
 	app-text/asciidoc
 	doc? ( dev-ruby/asciidoctor )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools
-	"
+DEPEND="${RDEPEND}"
+BDEPEND="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" )
+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"
+	unpack "${WORKDIR}/${P/_/-}/src/wsjtx.tgz"
 }
 
 src_prepare() {
 	sed -i -e "s/COMMAND \${GZIP_EXECUTABLE}/#  COMMAND/" \
 								manpages/CMakeLists.txt || die
-	eapply_user
 	cmake_src_prepare
 }
 
@@ -69,10 +67,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_compile() {
-	cmake_src_compile
-}
-
 src_install() {
 	cmake_src_install
 	rm "${D}"/usr/bin/rigctl{,d}-wsjtx || die