5 files changed, 3 insertions, 127 deletions
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 6d4d3aa9820a..05546b574120 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,8 +1,4 @@
-AUX unixcw-3.5-tinfo.patch 1212 BLAKE2B 00afb10b8318957f8c4d10ae9254586aef365674822d23da9fdafcc31956252e77ad754c3389ae535b5d78a8611c0750b5609bfd785b6e111d350cc98411eb00 SHA512 370f2bd601546dd5043dedf1387783c425d15d0c52a8f357c4bb1bb9eb0ebb8b54bb4afd79db14314603bf23838568041c590c830622017bc05bd9bfd97baf6f
 AUX unixcw-3.6-tinfo.patch 1226 BLAKE2B 139f81ffeec979517523c72ca1724ad280976160f4857640913a0e4a85595ca01e1a08b2043520fe7099974f5b8ca63812c851146b4c447b9325d43c58e9abd8 SHA512 8a4e217118a5bce1b87d7f2ab2a57ba43903da82f03bcc467dcec37a8cb673f576e778ddec1a26ed4a3edd151f75f1728dcfc01565d9c7134e360908e0bcc413
-AUX unixcw-tests.patch 533 BLAKE2B 0b2c08f1f2bb9db4ad2c98a4af7d2097f408e873cde8f03b46c994adcbb06ed0a20f95e2951c55810821b92e7a3e529621914308726233a108879e3341e98cf5 SHA512 331a7e71a3f9686b08ce59e06e59d4812dd36c4e2597a0ae57f663c2c0b7f32eca3e70adbc1769886b12856ed2d96bd9f4279f95db70d401e31f477b183fa2b7
-DIST unixcw-3.5.1.tar.gz 740331 BLAKE2B 9b5b4b819cf75ca0b10d773ebdf9869bf835c49f10c54b5bd34441b417d48d9a92abc9390a41870bf1c09fbbfe932554307abba181cad3b8631947adcf9890b1 SHA512 b59499723d810a537a2f5ab2b4b34c83a1c8c815af82a60ba29f4d9cee445525e530136f4e202db6b87305ac7a818fa6e59214a45c6bffce299eb50b58c866e1
 DIST unixcw-3.6.0.tar.gz 870148 BLAKE2B 4eca3fe63ce7aec43e16ecca8120018e1bda6541f707ac9857db1f9dc6181a53ee24c7328f0a1f97a6aa1993600d68d9313e0567c12dfcf7a061837885aaefcb SHA512 17abdfaeb2b4e7459e1efd93f5f85a8ed89fde06e5b8d23d83c9f1c76888bc9048af1a8adc9c030f560e94e0dd0576b3a30bf040fece4d13e001d01734d6338b
-EBUILD unixcw-3.5.1-r1.ebuild 2100 BLAKE2B fdd6a6f0eda7b0dd85d008b5a0985f401eb5fc5cb0f61b34551d20b5268d3b06a8692d331a0fc1f5b70a2d46e833871d0df8880af615e6d9936a0052f3c42a80 SHA512 da0649bc6ff3fbc4ed7529002bcb10e34dca486b9f32b099a81273fdbf5ccac39da81051a7e848176e277b3fd6feeb19d274dbca6bc60a13fba91653c634f1b8
-EBUILD unixcw-3.6.0.ebuild 2073 BLAKE2B f2b429a39bc6956e1b933172779ba6f80f68f70ec78beddf4e46973d5810c8f9528ac9fe49cc3d2a97ff44165feb02c3f7243062d4e65d35e6fa5fa8a7b4db09 SHA512 85f8c39bf35d466e6f72b1176b833f7aecd924fb101f6096cef3116c5e30d7721e14de1a3f52e1a498915ac7eb996574d3f93b7018d658ffcb1d9b2e4824e4aa
+EBUILD unixcw-3.6.0-r1.ebuild 2070 BLAKE2B f0b41816cc54e30860818589260f735e7d92d4a2d88a090c435c34258bdf72d803af462db7cdbd57afa0f91e1754e5a20b015e62a839889cfb4439d2ed89cf5e SHA512 543c638706e00776b41aae3b2a3a37614b7388ed52172b6c34ba37b668e8b7a2b3f2b98c23fe1945dc4d7b8e1a82d1d9f468a68fe1b8a7e666eb77eb3329783d
 MISC metadata.xml 875 BLAKE2B 582b1ba40e9424d308e33d5f2bf430e270a2d4d106aeffec3d03e1736360758776f5aa8a8d0078aa03c0e4ca8ea206b9805be2223db69282bca0cb752c531314 SHA512 07b92861370f28e4723e48d75dac80e3517c7a944f7a4ac07e6afc75f80871b6ca6a4904d042bd79bce1dfcd81b74d3b85a25b0eab3f8c83dac7742f6fb10219
diff --git a/media-radio/unixcw/files/unixcw-3.5-tinfo.patch b/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
deleted file mode 100644
index af85350e7ae3..000000000000
--- a/media-radio/unixcw/files/unixcw-3.5-tinfo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.ac.old	2017-03-07 13:31:46.074580930 +0100
-+++ configure.ac	2017-03-07 13:33:25.640924331 +0100
-@@ -347,7 +347,7 @@
-     AC_DEFINE([LIBCW_WITH_PULSEAUDIO], [1], [Define as 1 if your build machine can support PulseAudio.])
- fi
- 
--
-+PKG_PROG_PKG_CONFIG
- 
- if test "$enable_cwcp" = "no" ; then
-    WITH_CWCP='no'
-@@ -355,6 +355,7 @@
-     AC_CHECK_LIB(curses, initscr)
-     if test $ac_cv_lib_curses_initscr = 'yes' ; then
- 	WITH_CWCP='yes'
-+	PKG_CHECK_MODULES(ncurses, ncurses, [NCURSES_LIB="$ncurses_LIBS"], )
-     else
- 	WITH_CWCP='no'
- 	AC_MSG_WARN([Cannot find libcurses - unable to build cwcp])
---- src/cwcp/Makefile.am.old	2017-03-07 13:30:10.813167002 +0100
-+++ src/cwcp/Makefile.am	2017-03-07 13:30:28.950864931 +0100
-@@ -26,7 +26,7 @@
- # target-specific preprocessor flags (#defs and include dirs)
- #cwcp_CPPFLAGS = -I$(top_srcdir)/src/cwutils/ -I$(top_srcdir)/src/libcw/
- # target-specific linker flags (objects to link)
--cwcp_LDADD = -lcurses -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
-+cwcp_LDADD = $(ncurses_LIBS) -L$(top_builddir)/src/libcw/.libs -lcw $(top_builddir)/src/cwutils/lib_cwcp.a
- 
- 
- # copy man page to proper directory during installation
diff --git a/media-radio/unixcw/files/unixcw-tests.patch b/media-radio/unixcw/files/unixcw-tests.patch
deleted file mode 100644
index 9d2c3d9685c2..000000000000
--- a/media-radio/unixcw/files/unixcw-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# works now without any installed audio system
---- src/libcw/tests/libcw_test_tq_short_space.c.orig	2018-08-01 07:53:33.972577616 +0000
-+++ src/libcw/tests/libcw_test_tq_short_space.c	2018-08-01 07:53:42.877456677 +0000
-@@ -94,7 +94,7 @@
- 	bool success = true;
- 
-         /* Library initialization. */
--        cw_generator_new(CW_AUDIO_SOUNDCARD, NULL);
-+        cw_generator_new(CW_AUDIO_NULL, NULL);
-         cw_generator_start();
- 
- 	cw_register_tone_queue_low_callback(cwdaemon_tone_queue_low_callback, NULL, tq_low_watermark);
diff --git a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild b/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
deleted file mode 100644
index 3124530b8bd4..000000000000
--- a/media-radio/unixcw/unixcw-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-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"
-
-src_prepare() {
-	append-cflags -std=gnu11
-	append-cxxflags -std=gnu++11
-	eapply -p0 "${FILESDIR}"/${PN}-3.5-tinfo.patch \
-		"${FILESDIR}"/${PN}-tests.patch
-	# Bug# 837617
-	sed -i -e "s/curses, initscr/ncurses, initscr/" \
-		-e "s/_curses_initscr/_ncurses_initscr/" configure.ac || die
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable pulseaudio ) \
-		$(use_enable alsa ) \
-		$(use_enable ncurses cwcp ) \
-		$(use_enable qt5 xcwcp ) \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${D}" -name '*.la' -type f -delete || die
-	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
-}
diff --git a/media-radio/unixcw/unixcw-3.6.0.ebuild b/media-radio/unixcw/unixcw-3.6.0-r1.ebuild
index 5a00e1719d21..45d6a68f7339 100644
--- a/media-radio/unixcw/unixcw-3.6.0.ebuild
+++ b/media-radio/unixcw/unixcw-3.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ RDEPEND="ncurses? ( sys-libs/ncurses:= )
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5 )
 	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
+	pulseaudio? ( media-libs/libpulse )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/libtool"