gentoo auto-resync : 04:07:2023 - 04:07:19

4 files changed, 84 insertions, 5 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index ba10926eb1dc..e3c514adaaf9 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 05546b574120..e5a8f8d5f4f5 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,4 +1,5 @@
 AUX unixcw-3.6-tinfo.patch 1226 BLAKE2B 139f81ffeec979517523c72ca1724ad280976160f4857640913a0e4a85595ca01e1a08b2043520fe7099974f5b8ca63812c851146b4c447b9325d43c58e9abd8 SHA512 8a4e217118a5bce1b87d7f2ab2a57ba43903da82f03bcc467dcec37a8cb673f576e778ddec1a26ed4a3edd151f75f1728dcfc01565d9c7134e360908e0bcc413
 DIST unixcw-3.6.0.tar.gz 870148 BLAKE2B 4eca3fe63ce7aec43e16ecca8120018e1bda6541f707ac9857db1f9dc6181a53ee24c7328f0a1f97a6aa1993600d68d9313e0567c12dfcf7a061837885aaefcb SHA512 17abdfaeb2b4e7459e1efd93f5f85a8ed89fde06e5b8d23d83c9f1c76888bc9048af1a8adc9c030f560e94e0dd0576b3a30bf040fece4d13e001d01734d6338b
-EBUILD unixcw-3.6.0-r1.ebuild 2070 BLAKE2B f0b41816cc54e30860818589260f735e7d92d4a2d88a090c435c34258bdf72d803af462db7cdbd57afa0f91e1754e5a20b015e62a839889cfb4439d2ed89cf5e SHA512 543c638706e00776b41aae3b2a3a37614b7388ed52172b6c34ba37b668e8b7a2b3f2b98c23fe1945dc4d7b8e1a82d1d9f468a68fe1b8a7e666eb77eb3329783d
+EBUILD unixcw-3.6.0-r1.ebuild 2075 BLAKE2B e528f0e8761e256b071751e50561636cd87f48428bfdfeabe603fbd1d5a8a299dd1ec95aa058f4d2bb1243566a179b19d28372a7174f54114decdd599f6ec9c8 SHA512 40bd317da2e33b211b71a2c4f78af01d893c93a4790e6628da5b343c29dccae30a38409121b34b983ab53b09ef1660e6bc916bbe182a9fcd83919ebad856945c
+EBUILD unixcw-3.6.0-r2.ebuild 2051 BLAKE2B 5d5bb434883eb22be4c238007278c15241873d1bf252f76e55314005cc5bb649841dce1110c80e173f83d5b8d3894b0b5f20dd1d0e351a8aa02b75dd6509ed59 SHA512 74d26609776fd9624d9ecc747f1e4d57011baf7ac4b3310d36e3a012ae7f49797fe4593a0c91bc896cd68b4f70279cd246cf2197a71e103e17a4b5bfae3cc6b1
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/unixcw-3.6.0-r1.ebuild b/media-radio/unixcw/unixcw-3.6.0-r1.ebuild
index 45d6a68f7339..1e0dcd50c5dd 100644
--- a/media-radio/unixcw/unixcw-3.6.0-r1.ebuild
+++ b/media-radio/unixcw/unixcw-3.6.0-r1.ebuild
@@ -5,11 +5,11 @@ EAPI=7
 
 inherit autotools flag-o-matic
 
-DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
-HOMEPAGE="http://unixcw.sourceforge.net"
+DESCRIPTION="Collection of programs that fit together to form a morse code tutor program"
+HOMEPAGE="https://unixcw.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid test qt5"
@@ -28,7 +28,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	append-cflags -std=gnu11
 	append-cxxflags -std=gnu++11
-	eapply -p0 "${FILESDIR}"/$PN-3.6-tinfo.patch
+	eapply -p0 "${FILESDIR}"/${PN}-3.6-tinfo.patch
 	# Bug# 837617 and 858278
 	sed -i -e "s/curses, initscr/ncurses, initscr/" \
 		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
diff --git a/media-radio/unixcw/unixcw-3.6.0-r2.ebuild b/media-radio/unixcw/unixcw-3.6.0-r2.ebuild
new file mode 100644
index 000000000000..031ad834bc32
--- /dev/null
+++ b/media-radio/unixcw/unixcw-3.6.0-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Collection of programs that fit together to form a morse code tutor program"
+HOMEPAGE="https://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-libs/libpulse )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	sys-devel/libtool"
+
+src_prepare() {
+	append-cflags -std=gnu11
+	append-cxxflags -std=gnu++11
+	eapply -p0 "${FILESDIR}"/${PN}-3.6-tinfo.patch
+	# Bug# 837617 and 858278
+	sed -i -e "s/curses, initscr/ncurses, initscr/" \
+		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable pulseaudio ) \
+		$(use_enable alsa ) \
+		$(use_enable ncurses cwcp ) \
+		$(use_enable qt5 xcwcp ) \
+		--disable-static
+}
+
+src_install() {
+	default
+
+	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
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+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
+}