gentoo resync : 24.06.2021

3 files changed, 7 insertions, 55 deletions

diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index b9329b49ff19..24fae84294bb 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,3 @@
-DIST qsstv_9.4.4.tar.gz 7716392 BLAKE2B df285cc26c195dce05e54401de4fce70ea91c3af1f774d90d81b62a366c66c3cde4f0cce5c370bad45b81230ca7c2be624542cde10b94d388785d13b49ed646d SHA512 d206c6c108827b607dfe360e7afe31065518f03ab04609ccca9a9bda16207d12966eb49d486d13eebb814716252c50aa5963d090f1e505e508ccb1b6ccc4728c
 DIST qsstv_9.5.3.tar.gz 7466438 BLAKE2B 8d38f106f72e051bf4d100c3c10c6ded15e69dfb33289206cce34bfde9210d5231c4d4ddc695417d5511aa8f33a08866ddb224dd9140863264a7a324cc2ffc2e SHA512 1753bb498163d17c80c3c322eda2725eae3de17c99e07fd99f4223508c3048521547148d69623f16f4192212a754f415e0f12f5fc98527b14bf00afcb3ae7c6d
-EBUILD qsstv-9.4.4-r1.ebuild 1024 BLAKE2B 3e8aff288db025d9195da16829acb6069702e40453c512dd56629d7a490962b148a5b41c4d80782181a13cdb94e415d306dcc26593df2f17271095d95b3f23c9 SHA512 3e7d740eda8e6f26edf59c51dccc3d29906aa76788a2e5a5c774b7dd2201a4670d6c2100de44ec1a189c0a69936a471cb0277173dfad2601fffeefe5e3890918
-EBUILD qsstv-9.5.3.ebuild 1018 BLAKE2B d59249e2992dc6265068ba5f593155461a80cca88fd203867b7b8830f4ae906111ed447d227b707cd2b6760665e7ab19a4aa64fe7ef915fbba974059cb8d6a0c SHA512 a42cf24328830c7f321ed80d312c299fee9ad588518c136d75a6cd2a7524cbc267ea4b04eaae5fe6271c9f6f6e51c5fa9ca58f007538a4f45809ee737f039427
+EBUILD qsstv-9.5.3.ebuild 1209 BLAKE2B 4f428de13d004c0c8fe957bf18389cc8662bc6060411ab587fde01ddc04096433862905b0442dfc9bf75aaac057153b195ace1f36bff98a0e2d67a3600ffdd50 SHA512 1b50c44d59c28b0400e5bdfbe0ff0c3f52f14d3576a3d2c71b1988a48760be1868f50dc2f06c002dd671cb63a334cdf1616aa07f4788f4ee4bcdedc3d35940ad
 MISC metadata.xml 344 BLAKE2B e091d6e9d0f8a59216bf966dae15ff5d0e588e71a53b936b3dbf979603334407a5e6b378f7a756cd0b320eb0c1294573ba0f1dd3ae392318f854d6c7b482db76 SHA512 e3a236b5b670bb921dd8c7ef87153d16a15ab3b10e4e039c2de68253d56d1356e57d1491c16fac6249265d68639a280f592c62f47d906f4b680fa5571ba9ec75
diff --git a/media-radio/qsstv/qsstv-9.4.4-r1.ebuild b/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
deleted file mode 100644
index 8ff1f20da16e..000000000000
--- a/media-radio/qsstv/qsstv-9.4.4-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Amateur radio SSTV software"
-HOMEPAGE="http://users.telenet.be/on4qz/"
-SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/hamlib:=
-	media-libs/openjpeg:2
-	media-libs/alsa-lib
-	media-sound/pulseaudio
-	media-libs/libv4l
-	sci-libs/fftw:3.0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	x11-misc/xdg-utils"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply_user
-	# fix docdirectory, install path and hamlib search path
-	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
-		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
-		qsstv/qsstv.pro || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.txt
-}
diff --git a/media-radio/qsstv/qsstv-9.5.3.ebuild b/media-radio/qsstv/qsstv-9.5.3.ebuild
index 00291f4897a2..36c2667badf1 100644
--- a/media-radio/qsstv/qsstv-9.5.3.ebuild
+++ b/media-radio/qsstv/qsstv-9.5.3.ebuild
@@ -40,6 +40,12 @@ src_prepare() {
 	sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
 		-e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
 		qsstv.pro || die
+
+	# prepare for media-radio/hamlib-4.2 change of API
+	if has_version '>=media-libs/hamlib-4.2' ; then
+		sed -i -e "s/FILPATHLEN/HAMLIB_FILPATHLEN/g" "${S}"/rig/rigcontrol.cpp \
+			|| die
+	fi
 }
 
 src_configure() {