Fix desktop file (bug #483730). Drop old. Thanks ago

(Portage version: 2.2.3/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)

7 files changed, 11 insertions, 258 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 6f719191b5c2..ce962aafbe83 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/tucnak2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.48 2012/06/18 06:43:12 tomjbe Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/ChangeLog,v 1.49 2013/09/13 18:47:14 tomjbe Exp $
+
+  13 Sep 2013; Thomas Beierlein <tomjbe@gentoo.org> -tucnak2-2.44.ebuild,
+  -tucnak2-2.46.ebuild, tucnak2-2.48.ebuild, -files/tucnak2-2.39-doc.diff,
+  -files/tucnak2-libpng15.patch, -files/tucnak2-soundwrapper.diff:
+  Fix desktop file (bug #483730). Drop old. Thanks ago
 
   18 Jun 2012; Thomas Beierlein <tomjbe@gentoo.org> -tucnak2-2.45.ebuild,
   -tucnak2-2.47.ebuild, -files/tucnak2-2.47-doc.diff:
diff --git a/media-radio/tucnak2/files/tucnak2-2.39-doc.diff b/media-radio/tucnak2/files/tucnak2-2.39-doc.diff
deleted file mode 100644
index 1e53f0b633f2..000000000000
--- a/media-radio/tucnak2/files/tucnak2-2.39-doc.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.am.orig	2011-02-25 18:29:32.000000000 +0100
-+++ Makefile.am	2011-02-25 18:29:52.000000000 +0100
-@@ -1,15 +1,11 @@
- datarootdir = @datarootdir@
- 
--SUBDIRS=data doc intl pkg share src win32
-+SUBDIRS=data intl pkg share src win32
- 
- MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
- 
- EXTRA_DIST = COPYING INSTALL leaks rebuild debian/* eee.sh 
- 
--docsdir = $(datadir)/tucnak2/doc
--	
--docs_DATA = AUTHORS ChangeLog TODO   
--
- stamp = `date +%Y%m%d_%H%M%S`
- 
- distd: dist
diff --git a/media-radio/tucnak2/files/tucnak2-libpng15.patch b/media-radio/tucnak2/files/tucnak2-libpng15.patch
deleted file mode 100644
index 7470765eaae6..000000000000
--- a/media-radio/tucnak2/files/tucnak2-libpng15.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- src/img_png.c.old	2011-09-14 17:20:02.000000000 +0000
-+++ src/img_png.c	2011-09-14 18:17:39.000000000 +0000
-@@ -112,6 +112,8 @@
- 	Uint32 Bmask;
- 	Uint32 Amask;
- 	SDL_Palette *palette;
-+	png_colorp png_palette;
-+	int png_num_palette;
- 	png_bytep *volatile row_pointers;
- 	int row, i;
- 	volatile int ckey = -1;
-@@ -144,7 +146,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		IMG_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -213,9 +215,11 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) 
-+				? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4)
-+				? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -223,7 +227,8 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr),
-+			Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		IMG_SetError("Out of memory");
- 		goto done;
-@@ -264,6 +269,8 @@
- 	*/
- 
- 	/* Load the palette, if any */
-+	png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette);
-+
- 	palette = surface->format->palette;
- 	if ( palette ) {
- 	    if(color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -273,12 +280,12 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else if (png_num_palette > 0 ) {
-+		palette->ncolors = png_num_palette; 
-+		for( i=0; i<png_num_palette; ++i ) {
-+		    palette->colors[i].b = png_palette[i].blue;
-+		    palette->colors[i].g = png_palette[i].green;
-+		    palette->colors[i].r = png_palette[i].red;
- 		}
- 	    }
- 	}
---- src/gfx_png.c.old	2011-09-14 17:09:33.000000000 +0000
-+++ src/gfx_png.c	2011-09-14 17:14:05.000000000 +0000
-@@ -56,12 +56,9 @@
- 	    
-     png_init_io(png_ptr, fi);
- 
--    info_ptr->width = surf->w;
--    info_ptr->height = surf->h;
--    info_ptr->bit_depth = 8;
--    info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--    info_ptr->interlace_type = 1;
--    info_ptr->valid = 0;
-+    png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8,
-+    	PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_DEFAULT, 
-+	PNG_FILTER_TYPE_DEFAULT);
- 
-     /* Set headers */
- 
diff --git a/media-radio/tucnak2/files/tucnak2-soundwrapper.diff b/media-radio/tucnak2/files/tucnak2-soundwrapper.diff
deleted file mode 100644
index f7f056bbd5b2..000000000000
--- a/media-radio/tucnak2/files/tucnak2-soundwrapper.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# fixes segfault in soundwrapper if caleld without arguments
-diff -Nur tucnak2-2.46.orig//src/soundwrapper.c tucnak2-2.46//src/soundwrapper.c
---- tucnak2-2.46.orig//src/soundwrapper.c	2011-05-26 08:47:36.000000000 +0200
-+++ tucnak2-2.46//src/soundwrapper.c	2012-03-10 09:17:56.000000000 +0100
-@@ -39,7 +39,7 @@
-         return 1;
-     }
- 
--    if (argc >= 1){
-+    if (argc > 1){
-         freq = atoi(argv[1]);
-         if (freq){ 
-             arg=1193180/freq;
diff --git a/media-radio/tucnak2/tucnak2-2.44.ebuild b/media-radio/tucnak2/tucnak2-2.44.ebuild
deleted file mode 100644
index 0f9966821b20..000000000000
--- a/media-radio/tucnak2/tucnak2-2.44.ebuild
+++ /dev/null
@@ -1,66 +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/tucnak2/tucnak2-2.44.ebuild,v 1.4 2012/05/03 03:48:56 jdhore Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw ftdi gpm hamlib suid"
-
-RDEPEND=">=dev-libs/glib-2
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	ftdi? ( dev-embedded/libftdi )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.39-doc.diff" \
-		"${FILESDIR}/${PN}-2.42-appname.diff" \
-		"${FILESDIR}/${PN}-libpng15.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with alsa) $(use_with ftdi) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3) --with-sdl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	doman debian/tucnak2.1 || die "doman failed"
-	dodoc AUTHORS ChangeLog TODO doc/NAVOD.pdf || die "dodoc failed"
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper || die "fperms failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak2 add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak2 can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak2/tucnak2-2.46.ebuild b/media-radio/tucnak2/tucnak2-2.46.ebuild
deleted file mode 100644
index e02c38214618..000000000000
--- a/media-radio/tucnak2/tucnak2-2.46.ebuild
+++ /dev/null
@@ -1,66 +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/tucnak2/tucnak2-2.46.ebuild,v 1.5 2012/05/03 03:48:56 jdhore Exp $
-
-EAPI=2
-inherit eutils autotools
-
-DESCRIPTION="Amateur Radio VHF Contest Logbook"
-HOMEPAGE="http://tucnak.nagano.cz"
-SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa fftw ftdi gpm hamlib suid"
-
-RDEPEND=">=dev-libs/glib-2
-	media-libs/libsndfile
-	>=media-libs/libsdl-1.2
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 )
-	ftdi? ( dev-embedded/libftdi )
-	gpm? ( sys-libs/gpm )
-	hamlib? ( media-libs/hamlib )
-	>=media-libs/libpng-1.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.39-doc.diff" \
-		"${FILESDIR}/${PN}-2.42-appname.diff" \
-		"${FILESDIR}/${PN}-soundwrapper.diff"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with alsa) $(use_with ftdi) \
-		$(use_with gpm) $(use_with hamlib) \
-		$(use_with fftw fftw3) --with-sdl
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	doman debian/tucnak2.1 || die "doman failed"
-	dodoc AUTHORS ChangeLog TODO doc/NAVOD.pdf || die "dodoc failed"
-	if use suid ; then
-		fperms 4711 /usr/bin/soundwrapper || die "fperms failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "In order to use sound with tucnak2 add yourself to the 'audio' group"
-	elog "and to key your rig via the parport add yourself to the 'lp' group"
-	elog ""
-	elog "tucnak2 can be used with the following additional packages:"
-	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
-	elog "                             (No need to recompile)"
-	if use suid ; then
-		ewarn "You have choosen to install the little helper program 'soundwrapper'"
-		ewarn "setuid by setting USE=suid. That helper is only needed if you"
-		ewarn "want to use morse sidetone output via the PC speaker."
-		ewarn ""
-		ewarn "While the helper should be safe by design be aware that setting"
-		ewarn "any program setuid is a security risk."
-	fi
-}
diff --git a/media-radio/tucnak2/tucnak2-2.48.ebuild b/media-radio/tucnak2/tucnak2-2.48.ebuild
index f892ff3f3892..832e2ae724a6 100644
--- a/media-radio/tucnak2/tucnak2-2.48.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.48.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.5 2012/06/08 11:54:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tucnak2/tucnak2-2.48.ebuild,v 1.6 2013/09/13 18:47:14 tomjbe Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	# fix destop file bug 483730
+	sed -i -e "s/HamRadio/HamRadio;/" share/applications/tucnak2.desktop || die
 	epatch "${FILESDIR}/${P}-doc.diff" \
 		"${FILESDIR}/${PN}-2.42-appname.diff" \
 		"${FILESDIR}/${P}-hamlib.diff"