diff options
| author |   Thomas Beierlein <tomjbe@gentoo.org> | 2015-07-04 16:01:10 +0000 |
|---|---|---|
| committer | Thomas Beierlein <tomjbe@gentoo.org> | 2015-07-04 16:01:10 +0000 |
| commit | 3e01dd6fce1f00708fe83c2c5f0cb21c2a73dc4a (patch) | |
| tree | b3571012a2710fe38bbf9d92f27a172301f449a7 /media-radio | |
| parent | Version bump (diff) | |
| download | gentoo-2-3e01dd6fce1f00708fe83c2c5f0cb21c2a73dc4a.tar.gz gentoo-2-3e01dd6fce1f00708fe83c2c5f0cb21c2a73dc4a.tar.bz2 gentoo-2-3e01dd6fce1f00708fe83c2c5f0cb21c2a73dc4a.zip | |
Cleanup old
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x24083D3E28343508)
Diffstat (limited to 'media-radio')
17 files changed, 12 insertions, 930 deletions
diff --git a/media-radio/unixcw/ChangeLog b/media-radio/unixcw/ChangeLog index bb7aa8e6bd58..3e7019a4cd30 100644 --- a/media-radio/unixcw/ChangeLog +++ b/media-radio/unixcw/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-radio/unixcw # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/ChangeLog,v 1.30 2015/07/04 15:55:31 tomjbe Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/ChangeLog,v 1.31 2015/07/04 16:01:10 tomjbe Exp $ + + 04 Jul 2015; Thomas Beierlein <tomjbe@gentoo.org> -unixcw-3.3.1.ebuild, + -files/unixcw-2.3--as-needed.patch, -files/unixcw-2.3-audio.patch, + -files/unixcw-2.3-config.patch, -files/unixcw-2.3-destdir.patch, + -files/unixcw-2.3-fPIC.patch, -files/unixcw-2.3-gcc43.patch, + -files/unixcw-2.3-ldflags.patch, -files/unixcw-2.3-parallel-make.patch, + -files/unixcw-3.0.2-config.patch, -files/unixcw-3.0.2-destdir.patch, + -files/unixcw-3.0.2-parallel-make.patch, -files/unixcw-3.0.2-qt4.patch, + -files/unixcw-3.1.1-config.patch, -files/unixcw-3.2.0-console.patch, + -files/unixcw-3.2.0-pulseaudio.patch: + Cleanup old *unixcw-3.4.2 (04 Jul 2015) diff --git a/media-radio/unixcw/files/unixcw-2.3--as-needed.patch b/media-radio/unixcw/files/unixcw-2.3--as-needed.patch deleted file mode 100644 index ae96329b85e3..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3--as-needed.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/cwlib/Makefile.orig 2009-07-21 06:34:13.000000000 +0000 -+++ src/cwlib/Makefile 2009-07-21 06:34:39.000000000 +0000 -@@ -43,11 +43,11 @@ - libcw.so.0.0.0: cwlib.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ - $(CC) -shared -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o; \ -+ -o libcw.so.0.0.0 cwlib.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ - $(LD) -G -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o; \ -+ -o libcw.so.0.0.0 cwlib.o -lm; \ - fi \ - fi - diff --git a/media-radio/unixcw/files/unixcw-2.3-audio.patch b/media-radio/unixcw/files/unixcw-2.3-audio.patch deleted file mode 100644 index 944cd91ccdc6..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-audio.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff -ur unixcw-2.3.orig/src/cw/cw.c unixcw-2.3/src/cw/cw.c ---- unixcw-2.3.orig/src/cw/cw.c 2006-06-18 23:58:46.000000000 +0200 -+++ unixcw-2.3/src/cw/cw.c 2010-02-03 14:46:58.000000000 +0100 -@@ -922,5 +922,9 @@ - - /* Await final tone completion before exiting. */ - cw_wait_for_tone_queue (); -+ -+ /* Reset to ensure that the mixer volume gets restored. */ -+ cw_complete_reset(); -+ - return EXIT_SUCCESS; - } -Only in unixcw-2.3/src/cw: cw.o -Only in unixcw-2.3/src/cwcp: cwcp -diff -ur unixcw-2.3.orig/src/cwcp/cwcp.c unixcw-2.3/src/cwcp/cwcp.c ---- unixcw-2.3.orig/src/cwcp/cwcp.c 2006-06-22 05:50:05.000000000 +0200 -+++ unixcw-2.3/src/cwcp/cwcp.c 2010-02-03 14:48:31.000000000 +0100 -@@ -1625,6 +1625,9 @@ - /* Attempt to wrestle the screen back from curses. */ - interface_destroy (); - -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - /* Show the signal caught, and exit. */ - fprintf (stderr, _("\nCaught signal %d, exiting...\n"), signal_number); - exit (EXIT_SUCCESS); -@@ -1685,5 +1688,9 @@ - /* Clean up and return. */ - interface_destroy (); - cw_wait_for_tone_queue (); -+ -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - return EXIT_SUCCESS; - } -diff -ur unixcw-2.3.orig/src/cwlib/cwlib.c unixcw-2.3/src/cwlib/cwlib.c ---- unixcw-2.3.orig/src/cwlib/cwlib.c 2006-06-23 03:54:01.000000000 +0200 -+++ unixcw-2.3/src/cwlib/cwlib.c 2010-02-04 19:36:32.000000000 +0100 -@@ -2138,12 +2138,33 @@ - { - int read_volume, mixer, device_mask; - -- /* Try to use the main /dev/audio device for ioctls first. */ -- if (ioctl (cw_sound_descriptor, -- MIXER_READ (SOUND_MIXER_PCM), &read_volume) == 0) -+ /* Try to use the main /dev/audio device for ioctls first. -+ * Check the available mixer channels for the audio file. -+ */ -+ if (ioctl (cw_sound_descriptor, SOUND_MIXER_READ_DEVMASK, &device_mask) != -1) - { -- *volume = read_volume; -- return RC_SUCCESS; -+ /* Could read device_mask, so check availabel channels */ -+ if (device_mask & SOUND_MASK_PCM) -+ /* First try PCM channel, ... */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_READ (SOUND_MIXER_PCM), &read_volume) == 0) -+ { -+ *volume = read_volume; -+ return RC_SUCCESS; -+ } -+ } -+ -+ if (device_mask & SOUND_MASK_VOLUME) -+ /* then master volume */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_READ (SOUND_MIXER_VOLUME), &read_volume) == 0) -+ { -+ *volume = read_volume; -+ return RC_SUCCESS; -+ } -+ } - } - - /* Volume not found; try the mixer PCM channel volume instead. */ -@@ -2215,13 +2236,35 @@ - cw_set_sound_pcm_volume_internal (int volume) - { - int mixer, device_mask; -+ /* Try the mixer PCM channel volume instead. */ -+ /* Try to use the main /dev/audio device for ioctls first. -+ * Check the available mixer channels for the audio file. -+ */ -+ if (ioctl (cw_sound_descriptor, SOUND_MIXER_READ_DEVMASK, &device_mask) != -1) -+ { -+ /* Could read device_mask, so check availabel channels */ -+ if (device_mask & SOUND_MASK_PCM) -+ /* First try PCM channel, ... */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_WRITE (SOUND_MIXER_PCM), &volume) == 0) -+ { -+ return RC_SUCCESS; -+ } -+ } -+ -+ if (device_mask & SOUND_MASK_VOLUME) -+ /* then master volume */ -+ { -+ if (ioctl (cw_sound_descriptor, -+ MIXER_WRITE (SOUND_MIXER_VOLUME), &volume) == 0) -+ { -+ return RC_SUCCESS; -+ } -+ } -+ } - -- /* Try to use the main /dev/audio device for ioctls first. */ -- if (ioctl (cw_sound_descriptor, -- MIXER_WRITE (SOUND_MIXER_PCM), &volume) == 0) -- return RC_SUCCESS; - -- /* Try the mixer PCM channel volume instead. */ - mixer = open (cw_mixer_device, O_RDWR | O_NONBLOCK); - if (mixer == -1) - { -diff -ur unixcw-2.3.orig/src/xcwcp/application.cc unixcw-2.3/src/xcwcp/application.cc ---- unixcw-2.3.orig/src/xcwcp/application.cc 2006-06-22 08:22:36.000000000 +0200 -+++ unixcw-2.3/src/xcwcp/application.cc 2010-02-09 14:12:24.000000000 +0100 -@@ -498,6 +498,9 @@ - - // Done with the CW library sender for now. - cwlib_user_application_instance = NULL; -+ -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); - - file_menu_->setItemEnabled (file_start_id_, true); - file_menu_->setItemEnabled (file_stop_id_, false); -diff -ur unixcw-2.3.orig/src/xcwcp/main.cc unixcw-2.3/src/xcwcp/main.cc ---- unixcw-2.3.orig/src/xcwcp/main.cc 2006-06-18 23:39:34.000000000 +0200 -+++ unixcw-2.3/src/xcwcp/main.cc 2010-02-09 14:06:17.000000000 +0100 -@@ -370,6 +370,9 @@ - void - signal_handler (int signal_number) - { -+ /* Reset to ensure that the mixer volumes gets restored */ -+ cw_complete_reset(); -+ - std::clog << _("Caught signal ") << signal_number - << _(", exiting...") << std::endl; - exit (EXIT_SUCCESS); diff --git a/media-radio/unixcw/files/unixcw-2.3-config.patch b/media-radio/unixcw/files/unixcw-2.3-config.patch deleted file mode 100644 index 81dce4f082c7..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-config.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- configure.ac.orig 2010-01-27 20:00:28.000000000 +0100 -+++ configure.ac 2010-01-27 20:05:41.000000000 +0100 -@@ -46,8 +46,24 @@ - AC_SUBST(GZIP) - AC_SUBST(LDCONFIG) - -+AC_MSG_CHECKING(--enable-ncurses argument) -+AC_ARG_ENABLE(ncurses, -+ [ --enable-ncurses Include curses based Morse code Tutor], -+ [enable_ncurses=$enableval], -+ [enable_ncurses="no"]) -+AC_MSG_RESULT($enable_ncurses) -+ -+AC_MSG_CHECKING(--enable-qt4 argument) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 Include QT based Morse code Tutor], -+ [enable_qt=$enableval], -+ [enable_qt="no"]) -+AC_MSG_RESULT($enable_qt) -+ -+if test "$enable_ncurses" = 'yes'; then - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+fi - - # Checks for header files, and refuse to go on if no KIOCSOUND is available. - AC_HEADER_STDC -@@ -92,49 +108,40 @@ - # Decide on which subdirectories to build; substitute into SUBDIRS. Build - # cwcp if curses is available, and xcwcp if Qt is available. - SUBDIRS="cwlib cwutils cw cwgen" -+ -+if test "$enable_ncurses" = 'yes'; then - # Simple test for curses based on prior library check. - if test $ac_cv_lib_curses_initscr = 'yes' ; then - SUBDIRS="$SUBDIRS cwcp" - else - AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) - fi -+fi - --# Look for $QTDIR. If found, then look for moc, either on $PATH, or --# in $QTDIR/bin. --MOC_EARLIEST=3 --if test -n "$QTDIR" ; then -- AC_PATH_PROG(QTMOC, moc, , $QTDIR/bin:$PATH) -- if test -n "$QTMOC" ; then -- MOC_VERSION="`$QTMOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" -- if test -n "$MOC_VERSION" ; then -- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" -- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null -- status=$? -- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then -- if test "$MOC_MAJOR" -ge $MOC_EARLIEST ; then -- SUBDIRS="$SUBDIRS xcwcp" -- AC_SUBST(QTDIR) -- AC_SUBST(QTMOC) -- else -- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) -- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_EARLIEST]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH]) -- fi -+if test "$enable_qt4" = 'yes'; then -+ dnl Look for Qt4 libs -+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ -+ AC_SUBST(QT4_CFLAGS) -+ AC_SUBST(QT4_LIBS) -+ ], [ -+ AC_MSG_ERROR([Qt4 libs not found]) -+ ]) -+ dnl Look for moc, either on $PATH or in $QTDIR/bin -+ AC_PATH_PROG(QTMOC, moc, , $PATH:$QTDIR/bin) -+ if test -n "$QTMOC" ; then -+ dnl if libs and moc found -+ SUBDIRS="$SUBDIRS xcwcp" -+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) -+ echo "enabling Qt4 support" -+ else -+ AC_MSG_ERROR([Cannot find 'moc']) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ fi - else -- AC_MSG_WARN([Cannot find libqt - unable to build xcwcp]) -- AC_MSG_WARN([Hint: try setting a value for the QTDIR variable]) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ echo "disabling Qt4 support" - fi -+ - AC_SUBST(SUBDIRS) - - # Add -Wall, -W, -pedantic, and other paranoia to gcc command flags, and -Wall ---- Makefile.inc.in.orig 2010-01-27 20:11:31.000000000 +0100 -+++ Makefile.inc.in 2010-01-27 20:10:28.000000000 +0100 -@@ -37,7 +37,8 @@ - AC_LD_LINKS_SO = @LD_LINKS_SO@ - AC_LD = @LD@ - AC_LN_S = @LN_S@ -- -+AC_QT4_LIBS = @QT4_LIBS@ -+AC_QT4_CFLAGS = @QT4_CFLAGS@ - # Portability values. - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/media-radio/unixcw/files/unixcw-2.3-destdir.patch b/media-radio/unixcw/files/unixcw-2.3-destdir.patch deleted file mode 100644 index 195b66505fe5..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-destdir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.inc.in.org 2008-05-01 09:49:18.000000000 +0200 -+++ Makefile.inc.in 2008-05-01 09:49:40.000000000 +0200 -@@ -42,9 +42,10 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --prefix = @prefix@ -+prefix = $(DESTDIR)@prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ - bindir = @bindir@ --mandir = @mandir@ -+mandir = $(DESTDIR)@mandir@ --libdir = @libdir@ -+libdir = $(DESTDIR)@libdir@ -+datarootdir = @datarootdir@ diff --git a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch b/media-radio/unixcw/files/unixcw-2.3-fPIC.patch deleted file mode 100644 index 67e68bfec590..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-fPIC.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- configure.ac.orig 2009-09-08 22:27:33.000000000 +0200 -+++ configure.ac 2009-09-08 22:28:14.000000000 +0200 -@@ -212,7 +212,7 @@ - cat >conftest.c <<-EOF - int so_test() { return 0; } - EOF -- $CC -c conftest.c >/dev/null 2>/dev/null -+ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null - $CC -shared -o conftest.so conftest.o >/dev/null 2>/dev/null - rm -f conftest.c conftest.o - if test -f conftest.so ; then -@@ -239,7 +239,7 @@ - cat >conftest.c <<-EOF - int so_test() { return 0; } - EOF -- $CC -c conftest.c >/dev/null 2>/dev/null -+ $CC $CFLAG_PIC -c conftest.c >/dev/null 2>/dev/null - $LD -G -o conftest.so conftest.o >/dev/null 2>/dev/null - rm -f conftest.c conftest.o - if test -f conftest.so ; then ---- src/cwlib/Makefile.orig 2009-09-08 22:53:31.000000000 +0200 -+++ src/cwlib/Makefile 2009-09-08 22:59:31.000000000 +0200 -@@ -19,7 +19,8 @@ - - include ../../Makefile.inc - CC = $(AC_CC) --CFLAGS = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) -+CFLAGS = $(AC_CFLAGS) $(AC_DEFS) -+CFLAGS_SL = $(AC_CFLAGS) $(AC_CFLAG_PIC) $(AC_DEFS) - AWK = $(AC_AWK) - RANLIB = $(AC_RANLIB) - LD = $(AC_LD) -@@ -40,14 +41,14 @@ - rm -f libcw.a; ar -cr libcw.a cwlib.o - $(RANLIB) libcw.a - --libcw.so.0.0.0: cwlib.o -+libcw.so.0.0.0: cwlib_sl.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ - $(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o -lm; \ -+ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ - $(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0 \ -- -o libcw.so.0.0.0 cwlib.o -lm; \ -+ -o libcw.so.0.0.0 cwlib_sl.o -lm; \ - fi \ - fi - -@@ -78,6 +79,9 @@ - # Define dependencies related to header/include files. - cwlib.o: Makefile cwlib.h - -+cwlib_sl.o: Makefile cwlib.h -+ $(CC) $(CFLAGS_SL) -c -o cwlib_sl.o cwlib.c -+ - cwlibtest.o: Makefile cwlib.h - - # Install targets. diff --git a/media-radio/unixcw/files/unixcw-2.3-gcc43.patch b/media-radio/unixcw/files/unixcw-2.3-gcc43.patch deleted file mode 100644 index 85c31e08f4e9..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-gcc43.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u src/xcwcp.orig/receiver.cc src/xcwcp/receiver.cc ---- src/xcwcp.orig/receiver.cc 2010-08-30 19:35:45.000000000 +0200 -+++ src/xcwcp/receiver.cc 2010-08-30 19:36:05.000000000 +0200 -@@ -19,6 +19,7 @@ - - #include "../config.h" - -+#include <cstdio> - #include <cstdlib> - #include <cerrno> - #include <string> -diff -u src/xcwcp.orig/sender.cc src/xcwcp/sender.cc ---- src/xcwcp.orig/sender.cc 2010-08-30 19:35:45.000000000 +0200 -+++ src/xcwcp/sender.cc 2010-08-30 19:36:22.000000000 +0200 -@@ -19,6 +19,7 @@ - - #include "../config.h" - -+#include <cstdio> - #include <cstdlib> - #include <string> - #include <deque> diff --git a/media-radio/unixcw/files/unixcw-2.3-ldflags.patch b/media-radio/unixcw/files/unixcw-2.3-ldflags.patch deleted file mode 100644 index bbd1c7402dbb..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-ldflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -u -r src.orig/cw/Makefile src/cw/Makefile ---- src.orig/cw/Makefile 2009-07-21 15:08:34.000000000 +0200 -+++ src/cw/Makefile 2009-07-21 15:09:16.000000000 +0200 -@@ -34,7 +34,7 @@ - cw.o: cw.c ../cwlib/cwlib.h - - cw: cw.o -- $(CC) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o \ -+ $(CC) $(LDFLAGS) -o $@ cw.o ../cwutils/i18n.o ../cwutils/cmdline.o \ - ../cwutils/memory.o $(LIBS) -lm - - # Install targets. -diff -u -r src.orig/cwgen/Makefile src/cwgen/Makefile ---- src.orig/cwgen/Makefile 2009-07-21 15:08:34.000000000 +0200 -+++ src/cwgen/Makefile 2009-07-21 15:09:34.000000000 +0200 -@@ -32,7 +32,7 @@ - cwgen.o: cwgen.c - - cwgen: cwgen.o -- $(CC) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \ -+ $(CC) $(LDFLAGS) -o $@ cwgen.o ../cwutils/i18n.o ../cwutils/cmdline.o \ - ../cwutils/memory.o - - # Install targets. -diff -u -r src.orig/cwlib/Makefile src/cwlib/Makefile ---- src.orig/cwlib/Makefile 2009-07-21 15:14:58.000000000 +0200 -+++ src/cwlib/Makefile 2009-07-21 15:15:25.000000000 +0200 -@@ -42,11 +42,11 @@ - - libcw.so.0.0.0: cwlib.o - if [ "$(CC_LINKS_SO)" = "yes" ]; then \ -- $(CC) -shared -Wl,-soname,libcw.so.0 \ -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libcw.so.0 \ - -o libcw.so.0.0.0 cwlib.o -lm; \ - else \ - if [ "$(LD_LINKS_SO)" = "yes" ]; then \ -- $(LD) -G -Wl,-soname,libcw.so.0 \ -+ $(LD) $(LDFLAGS) -G -Wl,-soname,libcw.so.0 \ - -o libcw.so.0.0.0 cwlib.o -lm; \ - fi \ - fi diff --git a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch b/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch deleted file mode 100644 index 555c85406d58..000000000000 --- a/media-radio/unixcw/files/unixcw-2.3-parallel-make.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- Makefile.orig 2009-07-20 19:35:23.000000000 +0200 -+++ Makefile 2009-07-20 19:35:31.000000000 +0200 -@@ -35,11 +35,11 @@ - - # Targets that do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - # Targets that do just a little more than this. - distclean mostlyclean: -- $(DESCEND) -+ +$(DESCEND) - rm -f $(DIST).tar $(DIST).tar.gz $(DIST).tgz - rm -f Makefile.inc src/config.h src/config.h.in~ - rm -f config.status config.cache config.log ---- src/Makefile.orig 2009-07-20 19:34:45.000000000 +0200 -+++ src/Makefile 2009-07-20 19:34:56.000000000 +0200 -@@ -33,7 +33,7 @@ - - # All targets do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - distclean mostlyclean maintainer-clean: -- $(DESCEND) -+ +$(DESCEND) ---- src/cwlib/Makefile.orig 2009-09-08 14:07:37.000000000 +0200 -+++ src/cwlib/Makefile 2009-09-08 14:10:05.000000000 +0200 -@@ -65,7 +65,7 @@ - rm -f signatures functions - - # Build the unit test. --cwlibtest: cwlibtest.o -+cwlibtest: cwlibtest.o libcw.a libcw.so.0.0.0 - $(CC) -o cwlibtest cwlibtest.o -L. -lcw -lm - - # Build the pkgconfig metadata file. diff --git a/media-radio/unixcw/files/unixcw-3.0.2-config.patch b/media-radio/unixcw/files/unixcw-3.0.2-config.patch deleted file mode 100644 index 403b3d351299..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-config.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- configure.ac.orig 2012-06-21 07:34:18.000000000 +0200 -+++ configure.ac 2012-06-21 07:34:42.000000000 +0200 -@@ -45,8 +45,24 @@ - AC_SUBST(GZIP) - AC_SUBST(LDCONFIG) - -+AC_MSG_CHECKING(--enable-ncurses argument) -+AC_ARG_ENABLE(ncurses, -+ [ --enable-ncurses Include curses based Morse code Tutor], -+ [enable_ncurses=$enableval], -+ [enable_ncurses="no"]) -+AC_MSG_RESULT($enable_ncurses) -+ -+AC_MSG_CHECKING(--enable-qt4 argument) -+AC_ARG_ENABLE(qt4, -+ [ --enable-qt4 Include QT based Morse code Tutor], -+ [enable_qt=$enableval], -+ [enable_qt="no"]) -+AC_MSG_RESULT($enable_qt) -+ -+if test "$enable_ncurses" = 'yes'; then - # Checks for libraries. - AC_CHECK_LIB(curses, initscr) -+fi - AC_CHECK_LIB(asound, snd_pcm_open) - AC_CHECK_LIB(pthread, pthread_create) - AC_CHECK_LIB(m, floor) -@@ -102,121 +118,40 @@ - # Decide on which subdirectories to build; substitute into SUBDIRS. Build - # cwcp if curses is available, and xcwcp if Qt is available. - SUBDIRS="libcw cwutils cw cwgen" -+ -+if test "$enable_ncurses" = 'yes'; then - # Simple test for curses based on prior library check. - if test $ac_cv_lib_curses_initscr = 'yes' ; then - SUBDIRS="$SUBDIRS cwcp" - else - AC_MSG_WARN([Cannot find libcurses - unable to build cwcp]) - fi -+fi - -- -- -- --# autodetection of QT4 dependencies -- --MOC_MAJOR_EARLIEST=4 -- --# possible locations of Qt4 headers --QT4HEADER_DIRS="/usr/include/qt4 \ # Debian -- /usr/include" # Arch (?) -- --# possible locations of Qt4 moc (a.k.a. moc-qt4) --QT4BIN_DIRS=$PATH # pretty standard -- --# QT4DIR="" # for testing purposes --QT4INC="" # full path to directory with QT4 QtCore + QtGui subdirs and include files, e.g. /usr/include/qt4/ --QT4MOC="" # full path to QT4 moc executable -- --if [[[ $QT4DIR = "" ]]] ; then -- -- # look for QT4 include directories -- for dir in $QT4HEADER_DIRS; do -- if test -d "$dir/QtGui" && test -d "$dir/QtCore" ; then -- QT4INC=$dir; -- fi -- done -- -- # look for QT4 moc binary -- AC_PATH_PROG(QT4MOC, moc-qt4, , $PATH) -- if test -n "$QT4MOC" ; then -- MOC_MAJOR="`$QT4MOC -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR != $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC="" -- fi -- fi -- -- if [[[ "$QT4MOC" = "" ]]] ; then -- QT4MOC_2="" -- AC_PATH_PROG(QT4MOC_2, moc, , $PATH) -- if test -n "$QT4MOC_2" ; then -- MOC_MAJOR="`$QT4MOC_2 -v 2>&1 | sed -e 's;.\+ (Qt \([[0-9]]\).\+;\1;g'`" -- if [[[ $MOC_MAJOR = $MOC_MAJOR_EARLIEST ]]] ; then -- QT4MOC=$QT4MOC_2 -- fi -- fi -- fi -- -- -- if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then -- -- # we have moc4 and path to QT4 include files, -- # so we can build xcwcp -- SUBDIRS="$SUBDIRS xcwcp" -- -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- if [[[ $QT4INC = "" ]]] ; then -- AC_MSG_WARN([Can't find directory with QT4 header files - unable to build xcwcp]) -- fi -- -- if [[[ $QT4MOC = "" ]]] ; then -- AC_MSG_WARN([Can't find QT moc version == $MOC_MAJOR_EARLIEST - unable to build xcwcp]) -+if test "$enable_qt4" = 'yes'; then -+ dnl Look for Qt4 libs -+ PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [ -+ AC_SUBST(QT4INC,$QT4_CFLAGS) -+ AC_SUBST(QT4LIBS) -+ ], [ -+ AC_MSG_ERROR([Qt4 libs not found]) -+ ]) -+ dnl Look for moc, either on $PATH or in $QTDIR/bin -+ AC_PATH_PROG(QT4MOC, moc, , $PATH:$QTDIR/bin) -+ if test -n "$QT4MOC" ; then -+ dnl if libs and moc found -+ SUBDIRS="$SUBDIRS xcwcp" -+ AC_DEFINE([WANT_QT4], 1, [Want Qt4]) -+ echo "enabling Qt4 support" -+ else -+ AC_MSG_ERROR([Cannot find 'moc']) -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) - fi -- -- AC_MSG_WARN([Hint: try setting QT4DIR env variable per instructions in unixcw/INSTALLATION]) -- -- QT4INC="" -- QT4MOC="" -- fi -- -- - else -- -- --# Look for $QT4DIR. If found, then look for moc, either on $PATH, or --# in $QT4DIR/bin. -- -- AC_PATH_PROG(QT4MOC, moc, , $QT4DIR/bin:$PATH) -- if test -n "$QT4MOC" ; then -- MOC_VERSION="`$QT4MOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`" -- if test -n "$MOC_VERSION" ; then -- MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`" -- expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null -- status=$? -- if test -n "$MOC_MAJOR" -a $status -eq 0 ; then -- if test "$MOC_MAJOR" -ge $MOC_MAJOR_EARLIEST ; then -- SUBDIRS="$SUBDIRS xcwcp" -- QT4INC="$QT4DIR/include" -- AC_SUBST(QT4INC) -- AC_SUBST(QT4MOC) -- else -- AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp]) -- AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_MAJOR_EARLIEST]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -- else -- AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp]) -- AC_MSG_WARN([Hint: ensure 'moc' is in QT4DIR/bin on your PATH]) -- fi -+ AC_DEFINE([WANT_QT4], 0, [No Qt4]) -+ echo "disabling Qt4 support" - fi -+ - AC_SUBST(SUBDIRS) - - if [[[ $QT4INC != "" && $QT4MOC != "" ]]] ; then ---- Makefile.inc.in.orig 2012-06-21 07:59:31.000000000 +0200 -+++ Makefile.inc.in 2012-06-21 08:00:01.000000000 +0200 -@@ -31,6 +31,7 @@ - # AC_QTMOC = @QTMOC@ - AC_QT4INC = @QT4INC@ - AC_QT4MOC = @QT4MOC@ -+AC_QT4LIBS = @QT4_LIBS@ - AC_CFLAG_PIC = @CFLAG_PIC@ - AC_SUBDIRS = @SUBDIRS@ - AC_CC_LINKS_SO = @CC_LINKS_SO@ diff --git a/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch b/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch deleted file mode 100644 index b7c9971af992..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-destdir.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.inc.in.orig 2012-06-20 09:08:48.000000000 +0200 -+++ Makefile.inc.in 2012-06-20 09:10:23.000000000 +0200 -@@ -42,12 +42,12 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --prefix = @prefix@ -+prefix = $(DESTDIR)@prefix@ - exec_prefix = @exec_prefix@ - includedir = @includedir@ - bindir = @bindir@ --mandir = @mandir@ --libdir = @libdir@ -+mandir = $(DESTDIR)@mandir@ -+libdir = $(DESTDIR)@libdir@ - - # http://www.gnu.org/s/hello/manual/autoconf/Changed-Directory-Variables.html - datarootdir = @datarootdir@ diff --git a/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch b/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch deleted file mode 100644 index d59798aecbca..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-parallel-make.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- Makefile.orig 2012-06-20 09:32:17.000000000 +0200 -+++ Makefile 2012-06-20 09:32:32.000000000 +0200 -@@ -34,15 +34,15 @@ - - # Targets that do nothing other than descend. - all install install-strip uninstall TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - clean: -- $(DESCEND) -+ +$(DESCEND) - rm -f Makefile.inc - - # Targets that do just a little more than this. - distclean mostlyclean: -- $(DESCEND) -+ +$(DESCEND) - rm -f $(DIST).tar $(DIST).tar.gz $(DIST).tgz - rm -f Makefile.inc src/config.h src/config.h.in~ - rm -f config.status config.cache config.log ---- src/Makefile.orig 2012-06-20 09:32:49.000000000 +0200 -+++ src/Makefile 2012-06-20 09:33:17.000000000 +0200 -@@ -31,7 +31,7 @@ - - # All targets do nothing other than descend. - all install install-strip uninstall clean TAGS info dvi check: -- $(DESCEND) -+ +$(DESCEND) - - distclean mostlyclean maintainer-clean: -- $(DESCEND) -+ +$(DESCEND) ---- src/libcw/Makefile.orig 2012-06-20 09:33:30.000000000 +0200 -+++ src/libcw/Makefile 2012-06-20 09:34:24.000000000 +0200 -@@ -62,11 +62,11 @@ - libcw.3: libcw.3.m4 libcw.c - $(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libsigs.awk >signatures - $(AWK) -f libdoc.awk <libcw.c | $(AWK) -f libfuncs.awk >functions -- $(AWK) -f include.awk <libcw.3.m4 >libcw.3 -+ $(AWK) -f include.awk <libcw.3.m4 >libcw.3 - rm -f signatures functions - - # Build the unit test. --libcwtest: libcwtest.o -+libcwtest: libcwtest.o libcw.a libcw.so.3.0.1 - $(CC) -o libcwtest libcwtest.o -L. -lcw - - # Build the pkgconfig metadata file. diff --git a/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch b/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch deleted file mode 100644 index e54bd54f0674..000000000000 --- a/media-radio/unixcw/files/unixcw-3.0.2-qt4.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/xcwcp/Makefile.orig 2012-06-21 07:49:59.000000000 +0200 -+++ src/xcwcp/Makefile 2012-06-21 07:56:51.000000000 +0200 -@@ -18,7 +18,7 @@ - - include ../../Makefile.inc - CXX = $(AC_CXX) --CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) -I$(AC_QT4INC)/QtCore -I$(AC_QT4INC)/QtGui -+CXXFLAGS= $(AC_CXXFLAGS) $(AC_DEFS) -I../libcw -I../cwutils -I$(AC_QT4INC) - GZIP = $(AC_GZIP) - - SHELL = /bin/sh -@@ -28,7 +28,7 @@ - moc_application.o - - # Link to the shared libcw. --LIBS = -L../libcw -lcw -lQtGui -lQtCore -+LIBS = $(AC_QT4LIBS) -L../libcw -lcw -lQtGui -lQtCore - - default: all - diff --git a/media-radio/unixcw/files/unixcw-3.1.1-config.patch b/media-radio/unixcw/files/unixcw-3.1.1-config.patch deleted file mode 100644 index 4e81e3ac75cd..000000000000 --- a/media-radio/unixcw/files/unixcw-3.1.1-config.patch +++ /dev/null @@ -1,103 +0,0 @@ -# Fix wrong conditional logic ---- configure.ac.orig 2012-08-05 18:19:57.000000000 +0200 -+++ configure.ac 2012-08-06 17:20:50.000000000 +0200 -@@ -101,11 +101,11 @@ - - # disable_alsa - 'no' by default - AC_ARG_ENABLE(alsa, -- AS_HELP_STRING([--disable-alsa], [disable support for ALSA audio output]), -- [disable_alsa=yes], -- [disable_alsa=no]) -+ AS_HELP_STRING([--enable-alsa], [enable support for ALSA audio output]), -+ [enable_alsa=$enableval], -+ [enable_alsa=yes]) - AC_MSG_CHECKING([whether to include ALSA audio support]) --if test "$disable_alsa" = "no" ; then -+if test "$enable_alsa" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -114,11 +114,11 @@ - - # disable_pulseaudio - 'no' by default - AC_ARG_ENABLE(pulseaudio, -- AS_HELP_STRING([--disable-pulseaudio], [disable support for PulseAudio audio output]), -- [disable_pulseaudio=yes], -- [disable_pulseaudio=no]) -+ AS_HELP_STRING([--enable-pulseaudio], [enable support for PulseAudio audio output]), -+ [enable_pulseaudio=$enableval], -+ [enable_pulseaudio=yes]) - AC_MSG_CHECKING([whether to include PulseAudio audio support]) --if test "$disable_pulseaudio" = "no" ; then -+if test "$enable_pulseaudio" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -127,11 +127,11 @@ - - # disable_cwcp - 'no' by default - AC_ARG_ENABLE(cwcp, -- AS_HELP_STRING([--disable-cwcp], [do not build cwcp (application with curses user interface)]), -- [disable_cwcp=yes], -- [disable_cwcp=no]) -+ AS_HELP_STRING([--enable-cwcp], [build cwcp (application with curses user interface)]), -+ [enable_cwcp=$enableval], -+ [enable_cwcp=yes]) - AC_MSG_CHECKING([whether to build cwcp]) --if test "$disable_cwcp" = "no" ; then -+if test "$enable_cwcp" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -140,11 +140,11 @@ - - # disable_xcwcp - 'no' by default - AC_ARG_ENABLE(xcwcp, -- AS_HELP_STRING([--disable-xcwcp], [do not build xcwcp (application with Qt4 user interface)]), -- [disable_xcwcp=yes], -- [disable_xcwcp=no]) -+ AS_HELP_STRING([--enable-xcwcp], [build xcwcp (application with Qt4 user interface)]), -+ [disable_xcwcp=$enableval], -+ [disable_xcwcp=yes]) - AC_MSG_CHECKING([whether to build xcwcp]) --if test "$disable_xcwcp" = "no" ; then -+if test "$disable_xcwcp" = "yes" ; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -219,7 +219,7 @@ - - - --if test "$disable_alsa" = "yes" ; then -+if test "$enable_alsa" = "no" ; then - WITH_ALSA='no' - else - AC_CHECK_LIB(asound, snd_pcm_open) -@@ -246,7 +246,7 @@ - - - --if test "$disable_pulseaudio" = "yes" ; then -+if test "$enable_pulseaudio" = "no" ; then - WITH_PULSEAUDIO='no' - else - AC_CHECK_LIB(pulse-simple, pa_simple_new) -@@ -265,7 +265,7 @@ - - - --if test "$disable_cwcp" = "yes" ; then -+if test "$enable_cwcp" = "no" ; then - WITH_CWCP='no' - else - AC_CHECK_LIB(curses, initscr) -@@ -279,7 +279,7 @@ - - - --if test "$disable_xcwcp" = "yes" ; then -+if test "$enable_xcwcp" = "no" ; then - WITH_XCWCP='no' - else - # autodetection of Qt4 dependencies diff --git a/media-radio/unixcw/files/unixcw-3.2.0-console.patch b/media-radio/unixcw/files/unixcw-3.2.0-console.patch deleted file mode 100644 index 723e39223709..000000000000 --- a/media-radio/unixcw/files/unixcw-3.2.0-console.patch +++ /dev/null @@ -1,17 +0,0 @@ -# add missing headeers ---- src/libcw/libcw_console.c.orig 2013-02-09 17:20:01.000000000 +0000 -+++ src/libcw/libcw_console.c 2013-02-09 17:24:10.000000000 +0000 -@@ -29,6 +29,13 @@ - #include <sys/ioctl.h> - #include <stdio.h> - #include <stdbool.h> -+#include <string.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <errno.h> -+#include <assert.h> -+#include <unistd.h> - - - #if defined(HAVE_SYS_KD_H) diff --git a/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch b/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch deleted file mode 100644 index a0dffd67de34..000000000000 --- a/media-radio/unixcw/files/unixcw-3.2.0-pulseaudio.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/libcw/libcw_pa.c.orig 2013-01-03 22:09:38.000000000 +0000 -+++ src/libcw/libcw_pa.c 2013-02-10 14:29:51.000000000 +0000 -@@ -30,7 +30,8 @@ - #include <stdlib.h> - #include <stdbool.h> - #include <dlfcn.h> /* dlopen() and related symbols */ -- -+#include <string.h> -+#include <assert.h> - - #include "libcw.h" - #include "libcw_pa.h" diff --git a/media-radio/unixcw/unixcw-3.3.1.ebuild b/media-radio/unixcw/unixcw-3.3.1.ebuild deleted file mode 100644 index 75a85f6e7018..000000000000 --- a/media-radio/unixcw/unixcw-3.3.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/unixcw-3.3.1.ebuild,v 1.6 2014/11/02 09:07:59 ago Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic 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 qt4" - -RDEPEND="ncurses? ( sys-libs/ncurses ) - qt4? ( dev-qt/qtgui:4[qt3support] ) - 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=gnu99 - # add path to qt4 libs - sed -i -e "s#LDADD = -L#LDADD = -L/usr/$(get_libdir)/qt4 -L#g" \ - src/xcwcp/Makefile.am - eautoreconf -} - -src_configure() { - econf --libdir=/usr/$(get_libdir) \ - $(use_enable pulseaudio ) \ - $(use_enable alsa ) \ - $(use_enable ncurses cwcp ) \ - $(use_enable qt4 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 qt4 ; 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 -} |