gentoo resync : 25.08.2020

3 files changed, 2 insertions, 72 deletions

diff --git a/media-radio/tucnak/Manifest b/media-radio/tucnak/Manifest
index ae96b26df143..38db8edd6cf0 100644
--- a/media-radio/tucnak/Manifest
+++ b/media-radio/tucnak/Manifest
@@ -1,5 +1,3 @@
-DIST tucnak-4.20.tar.gz 3542904 BLAKE2B 7fee170215d975abac64c6425ccc7604fb0948f4713fdbdf5e0197268b2e7bca1278b3e0c2e6e3698b6a8e3884eb47016d0fff1bca6e21e94c676a4ed848f223 SHA512 755861c7e1fedd8a3e17179681930a182bf95c19f9ed6a1f5e07d5781ba0c36f5bc8a7066a792e752ce04edebfe055a426bc4757ee137df60950165b2e4a6cb9
 DIST tucnak-4.21.tar.gz 3545924 BLAKE2B dabc9647e4fde5c8c3b3e9b2ee5f072ce6e85138c6a45f635c05dcf47763a39e191a6ac3d97e71b79d3913915126261f565f8e273cd257731e04bc5ab7956aab SHA512 73fe2e92a0db3a8e152cfc25bbaefdeec6fd7f11223d02eae6c1ac5526c02404e89ecd4f2f715e7fda1d72fd872fc240694ce674d57a95c03417cf59dbd6532c
-EBUILD tucnak-4.20.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
-EBUILD tucnak-4.21.ebuild 1968 BLAKE2B a5eab8af37cdd38ea0b0f9b0c4da56a7a137c64e1448d986a5a5078d13674bee0eeb48064d3d415f708a9edb3ae8a97f8a946de4d829d4a6931294c43b806af8 SHA512 8143e9ab2b5abaaa2d31b215fbd9b26bf2d28f848ef707caea24378d08d0799b4cf477bb9a5d15b06e0617bb7a21c5a3d5ba35bde1e58735102d517781a06896
+EBUILD tucnak-4.21.ebuild 1966 BLAKE2B b1572e6f1747fb61b72ddb6902f9a8bb35d348ca3270c9778184de1a39f9f10c1406c02843f5da5a53428fb2aa0e42bf7305fa3062df6e159e8a28fa71e6599b SHA512 c42d8fc7d31bfaf3cc14d1e3ec68e74580fa56b1d26006882c10d4c457ab4f12519954899eccb47cc9d42734dec50f5f5ceb3bcc0db94e36d37276a2be505147
 MISC metadata.xml 408 BLAKE2B 80978177d2257cefae04860fc52e43ea7f0d2221bf4a5b3050fe8057acda81625117b1ba74e7357d40d00cc7fbd44f2dac713494cd8d20679c690cf851e1b678 SHA512 ad015a404c42d5cd0f160907400f545698045bb6c7c3da59816830ec6ed51938a02988c59d4a9ade472a78fd39feeb49ebe6c2a9c625e535a37e44bf19db1b17
diff --git a/media-radio/tucnak/tucnak-4.20.ebuild b/media-radio/tucnak/tucnak-4.20.ebuild
deleted file mode 100644
index 8490a3d7874c..000000000000
--- a/media-radio/tucnak/tucnak-4.20.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw gpm hamlib suid"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/libzia
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eapply_user
-	# fix destop file
-	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak.desktop || die
-	# fix doc install path
-	sed -i -e "s/docsdir/# docsdir/" \
-		-e "s/docs_DATA =/# docs_DATA/" \
-		-e "s/EXTRA_DIST =/# EXTRA_DIST =/" Makefile.am doc/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf $(use_with alsa) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog doc/NAVOD.pdf
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak/tucnak-4.21.ebuild b/media-radio/tucnak/tucnak-4.21.ebuild
index b4c1192a2e40..8490a3d7874c 100644
--- a/media-radio/tucnak/tucnak-4.21.ebuild
+++ b/media-radio/tucnak/tucnak-4.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa fftw gpm hamlib suid"
 
 RDEPEND="dev-libs/glib:2