diff options
author | Thomas Beierlein <tomjbe@gentoo.org> | 2015-03-07 18:30:44 +0000 |
---|---|---|
committer | Thomas Beierlein <tomjbe@gentoo.org> | 2015-03-07 18:30:44 +0000 |
commit | af5c09901c8e73bc7e2884c5134b409730b0a435 (patch) | |
tree | 48a8e2fd5bdc10e87d7efc20b01f7354a847921a /media-radio/cwdaemon | |
parent | Version bump. (diff) | |
download | gentoo-2-af5c09901c8e73bc7e2884c5134b409730b0a435.tar.gz gentoo-2-af5c09901c8e73bc7e2884c5134b409730b0a435.tar.bz2 gentoo-2-af5c09901c8e73bc7e2884c5134b409730b0a435.zip |
Drop old
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'media-radio/cwdaemon')
-rw-r--r-- | media-radio/cwdaemon/ChangeLog | 7 | ||||
-rw-r--r-- | media-radio/cwdaemon/cwdaemon-0.10.0.ebuild | 18 | ||||
-rw-r--r-- | media-radio/cwdaemon/cwdaemon-0.9.2.ebuild | 19 | ||||
-rw-r--r-- | media-radio/cwdaemon/cwdaemon-0.9.4.ebuild | 24 | ||||
-rw-r--r-- | media-radio/cwdaemon/cwdaemon-0.9.6.ebuild | 18 | ||||
-rw-r--r-- | media-radio/cwdaemon/cwdaemon-0.9.7.ebuild | 18 | ||||
-rw-r--r-- | media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch | 134 |
7 files changed, 6 insertions, 232 deletions
diff --git a/media-radio/cwdaemon/ChangeLog b/media-radio/cwdaemon/ChangeLog index d0f7e33719bc..715b3d1b247d 100644 --- a/media-radio/cwdaemon/ChangeLog +++ b/media-radio/cwdaemon/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-radio/cwdaemon # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/ChangeLog,v 1.28 2015/02/24 08:42:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/ChangeLog,v 1.29 2015/03/07 18:30:44 tomjbe Exp $ + + 07 Mar 2015; Thomas Beierlein <tomjbe@gentoo.org> -cwdaemon-0.9.2.ebuild, + -cwdaemon-0.9.4.ebuild, -cwdaemon-0.9.6.ebuild, -cwdaemon-0.9.7.ebuild, + -cwdaemon-0.10.0.ebuild, -files/cwdaemon-0.9.4-unixcw3.patch: + Drop old 24 Feb 2015; Agostino Sarubbo <ago@gentoo.org> cwdaemon-0.10.1.ebuild: Stable for alpha, wrt bug #531962 diff --git a/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild deleted file mode 100644 index 6bddadea5022..000000000000 --- a/media-radio/cwdaemon/cwdaemon-0.10.0.ebuild +++ /dev/null @@ -1,18 +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/cwdaemon/cwdaemon-0.10.0.ebuild,v 1.1 2014/02/02 13:32:21 tomjbe Exp $ - -EAPI=4 - -DESCRIPTION="A morse daemon for the parallel or serial port" -HOMEPAGE="http://cwdaemon.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=media-radio/unixcw-3.1.1" -DEPEND="$RDEPEND - virtual/pkgconfig" diff --git a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild deleted file mode 100644 index 9b825bfc403f..000000000000 --- a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild,v 1.8 2013/02/07 08:57:38 tomjbe Exp $ - -DESCRIPTION="A morse daemon for the parallel or serial port" -HOMEPAGE="http://www.qsl.net/pg4i/linux/cwdaemon.html" -SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~ppc x86" -IUSE="" - -RDEPEND="" -DEPEND="" - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild deleted file mode 100644 index f7cda092c20c..000000000000 --- a/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.4.ebuild,v 1.5 2012/06/25 18:37:35 tomjbe Exp $ - -EAPI=4 -inherit eutils - -DESCRIPTION="A morse daemon for the parallel or serial port" -HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/ham/morse" -SRC_URI="mirror://gentoo/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=media-radio/unixcw-3.0.2" -DEPEND="$RDEPEND - virtual/pkgconfig" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-unixcw3.patch -} diff --git a/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild deleted file mode 100644 index d322f26488d3..000000000000 --- a/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.6.ebuild,v 1.2 2012/08/13 18:33:45 tomjbe Exp $ - -EAPI=4 - -DESCRIPTION="A morse daemon for the parallel or serial port" -HOMEPAGE="http://cwdaemon.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=media-radio/unixcw-3.1.1" -DEPEND="$RDEPEND - virtual/pkgconfig" diff --git a/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild deleted file mode 100644 index 5aa2ec4dc2bd..000000000000 --- a/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.7.ebuild,v 1.1 2013/08/26 14:18:10 patrick Exp $ - -EAPI=4 - -DESCRIPTION="A morse daemon for the parallel or serial port" -HOMEPAGE="http://cwdaemon.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=">=media-radio/unixcw-3.1.1" -DEPEND="$RDEPEND - virtual/pkgconfig" diff --git a/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch b/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch deleted file mode 100644 index c9b7acc8d9e0..000000000000 --- a/media-radio/cwdaemon/files/cwdaemon-0.9.4-unixcw3.patch +++ /dev/null @@ -1,134 +0,0 @@ -# Changes to adapt to new unixcw-3 package thanks to AAPI changes in libcw -# Taken from debians patches from Kamil Ignacak, the maintainer of unixcw ---- cwdaemon.c.orig 2012-06-25 20:00:23.000000000 +0200 -+++ cwdaemon.c 2012-06-25 20:00:30.000000000 +0200 -@@ -89,7 +89,7 @@ - #endif - #include <limits.h> - --#include <cwlib.h> -+#include <libcw.h> - #include "cwdaemon.h" - - /* network vars */ -@@ -165,6 +165,9 @@ - cwdevice *cwdev; - static void playmorsestring (char *x); - -+static int set_libcw_output (void); -+static void close_libcw (void); -+ - /* catch ^C when running in foreground */ - static RETSIGTYPE - catchint (int signal) -@@ -299,17 +302,59 @@ - } - } - --/* initialize unixcw */ -+/* (re)set initial parameters of libcw */ - static void --initmorse (void) -+reset_libcw (void) - { -+ /* just in case if an old generator exists */ -+ close_libcw (); -+ -+ set_libcw_output (); -+ - cw_set_frequency (morse_tone); - cw_set_send_speed (morse_speed); -- cw_set_soundcard_sound (soundcard_sound); -- cw_set_console_sound (console_sound); - cw_set_volume (morse_volume); - cw_set_gap (0); - } -+ -+static void -+close_libcw (void) -+{ -+ cw_generator_stop (); -+ cw_generator_delete (); -+} -+ -+/* set up output of libcw */ -+static int -+set_libcw_output (void) -+{ -+ int rv = 0; -+ if (soundcard_sound && !console_sound) -+ { -+ rv = cw_generator_new (CW_AUDIO_ALSA, NULL); -+ if (rv != CW_FAILURE) -+ { -+ rv = cw_generator_start(); -+ } -+ } -+ else if (!soundcard_sound && console_sound) -+ { -+ rv = cw_generator_new (CW_AUDIO_CONSOLE, NULL); -+ if (rv != CW_FAILURE) -+ { -+ rv = cw_generator_start(); -+ } -+ } -+ else -+ { -+ /* libcw can't do both soundcard and console, -+ and it has to have one and only one sound -+ system specified */ -+ errmsg ("Sound output specified incorrectly"); -+ rv = CW_FAILURE; -+ } -+ return rv == CW_FAILURE ? -1 : 0; -+} - - /* properly parse a 'long' integer */ - static int -@@ -320,7 +365,7 @@ - - errno = 0; - lv = strtol(buf, &ep, 10); -- if (buf[0] == '\0' || *ep != '\0') -+ if (buf[0] == '\0' || (*ep != '\0' && *ep != '\n')) - return (-1); - if (errno == ERANGE && (lv == LONG_MAX || lv == LONG_MIN)) - return (-1); -@@ -371,7 +416,7 @@ - morse_volume = 70; - console_sound = 1; - soundcard_sound = 0; -- initmorse (); -+ reset_libcw (); - wordmode = 0; - async_abort = 0; - cwdev->reset (cwdev); -@@ -559,8 +604,7 @@ - if (valid_sdevice == 1) - { - debug ("Sound device: %s", message + 2); -- cw_set_soundcard_sound (soundcard_sound); -- cw_set_console_sound (console_sound); -+ set_libcw_output (); - } - break; - case 'g': /* volume */ -@@ -640,6 +684,7 @@ - debug ("Morse = %c", c); - cw_send_character (c); - if (cw_get_gap () == 2) cw_set_gap (0); -+ cw_wait_for_tone_queue(); - } - x++; - i++; -@@ -858,7 +903,9 @@ - } - cwdev->desc = keydev; - -- initmorse (); -+ reset_libcw (); -+ atexit (close_libcw); -+ - cw_register_keying_callback (keyingevent, NULL); - - debug ("Device used: %s", cwdev->desc); |