gentoo resync : 25.08.2020

3 files changed, 2 insertions, 77 deletions

diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 51839e2a1f81..c930e7398b9c 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,6 +1,5 @@
 AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
 DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
-EBUILD unixcw-3.5.1-r1.ebuild 1979 BLAKE2B 73d17889c2fb846caaafa01d3a40e8f06215c51349c0fb36a0102a1051e7ce01c57afe7d4c71398372e63d4e7d43f4196023ebb46b952588f865ddce60979e9f SHA512 a55ecdc7525df67aea5a078601eacccabee02cf077ce37cd393b5ee18c2f83dac3eea63e1e9c3bf1d08e48657fc59ee5259b6ee752b17c2e47e793dab2f70728
-EBUILD unixcw-3.5.1.ebuild 1954 BLAKE2B 6b41a1926e2a0a955d15eb1909d291eee2f203d9645b9253bc966f06fc91343af0af0be3119d73fd94a64aed9d0b0ba533cedae73b3c6cca6761a335a161760f SHA512 ad245d7f839c531841a2f082d202cb65e568f9a94e9b50d84a67dde5fb1a1482d9a52348f630d7f3a1f40499e716ba1f035938cffe7f1713b253c3e260447f5d
+EBUILD unixcw-3.5.1-r1.ebuild 1976 BLAKE2B b2bb72875a8729c82b8150c2e743c0364845ccbfb0e41adcad49abcab88747dc347825b03693838fa21ff86e36410de4e936749d64564468e6c5ce1b2aef9460 SHA512 222c85a253ec0992ae8ca90c82fd5160dac6586a0bbc2cacb5fc5de3e1178ff2a3c19e98cf7d610ea4827417a794ae8733243bb6e2259c2f82ea94c8fac7c984
 MISC metadata.xml 874 BLAKE2B 3927a605bcb0b3459888fcaa77a528020ed037beeff2b6e750102efc1cad99633cd94f7e6d87093c08133949dc40ea46ad5f1d44a497ef1aeedf2afd77592b29 SHA512 b4040ecf973492b76642e7df2e2fa41b6cf057490a1674e4246479b084e5a3972d109eb203337c0053c2d6924a3b2597ee42684ffb4431c8147e90d5a208247e
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
index a905c627ddf7..7391c5ffa589 100644
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid test qt5"
 RESTRICT="!test? ( test )"
 
diff --git a/media-radio/unixcw/unixcw-3.5.1.ebuild b/media-radio/unixcw/unixcw-3.5.1.ebuild
deleted file mode 100644
index ddf06d31d30d..000000000000
--- a/media-radio/unixcw/unixcw-3.5.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic ltprune multilib
-
-DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
-HOMEPAGE="http://unixcw.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid test qt5"
-RESTRICT="!test? ( test )"
-
-RDEPEND="ncurses? ( sys-libs/ncurses:= )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	!<=app-misc/cw-1.0.16-r1"
-
-src_prepare() {
-	append-cflags -std=gnu11
-	append-cxxflags -std=gnu++11
-	epatch "${FILESDIR}"/$PN-3.5-tinfo.patch \
-	    "${FILESDIR}"/$PN-tests.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable pulseaudio ) \
-		$(use_enable alsa ) \
-		$(use_enable ncurses cwcp ) \
-		$(use_enable qt5 xcwcp )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	dodoc ChangeLog NEWS README
-	if ! use suid ; then
-		fperms 711 /usr/bin/cw
-		if use ncurses ; then
-			fperms 711 /usr/bin/cwcp
-		fi
-		if use qt5 ; then
-			fperms 711 /usr/bin/xcwcp
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use suid ; then
-		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
-		ewarn "by setting USE=suid."
-		ewarn "Be aware that this is a security risk and not recommended."
-		ewarn ""
-		ewarn "These files do only need root access if you want to use the"
-		ewarn "PC speaker for morse sidetone output. You can alternativly"
-		ewarn "drop USE=suid and use sudo."
-	else
-		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
-		elog "you want to use the PC speaker for morse sidetone output."
-		elog "You can call the programs via sudo for that (see 'man sudo')."
-	fi
-}