Maintenance release. Drop old versions.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

5 files changed, 12 insertions, 145 deletions

diff --git a/media-radio/xlog/ChangeLog b/media-radio/xlog/ChangeLog
index 70bbd655a565..732229ab7cb9 100644
--- a/media-radio/xlog/ChangeLog
+++ b/media-radio/xlog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-radio/xlog
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.19 2010/12/09 22:39:24 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/ChangeLog,v 1.20 2011/02/24 05:10:03 tomjbe Exp $
+
+*xlog-2.0.5 (24 Feb 2011)
+
+  24 Feb 2011; Thomas Beierlein <tomjbe@gentoo.org> -xlog-2.0.3.ebuild,
+  -xlog-2.0.3-r1.ebuild, -files/xlog-2.0.3-dxcc.patch,
+  -files/xlog-2.0.3-memmove.patch, +xlog-2.0.5.ebuild:
+  Maintenance release. Drop old versions.
 
   09 Dec 2010; Thomas Kahle <tomka@gentoo.org> xlog-2.0.4.ebuild:
   x86 stable per bug 346937
diff --git a/media-radio/xlog/files/xlog-2.0.3-dxcc.patch b/media-radio/xlog/files/xlog-2.0.3-dxcc.patch
deleted file mode 100644
index dff52d42108c..000000000000
--- a/media-radio/xlog/files/xlog-2.0.3-dxcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# prevent buffer overflow for big cty.dat files
---- src/dxcc.c.orig	2010-10-24 11:47:15.000000000 +0200
-+++ src/dxcc.c	2010-10-24 11:47:59.000000000 +0200
-@@ -364,7 +364,7 @@
- gint
- readctyversion (void)
- {
--	gchar buf[65536], *ver, *ch, *cty_location;
-+	gchar buf[131072], *ver, *ch, *cty_location;
- 	FILE *fp;
- 
- #ifdef G_OS_WIN32
-@@ -378,7 +378,7 @@
- 		return (1);
- 	}
- 	g_free (cty_location);
--	gint n = fread (buf, 1, 65536, fp);
-+	gint n = fread (buf, 1, 131072, fp);
- 	buf[n] = '\0';
- 	ver = strstr (buf, "VER2");
- 	if (ver)
-@@ -400,7 +400,7 @@
- readctydata (void)
- {
- 
--	gchar buf[8192], *cty_location, *pfx, **split, **pfxsplit;
-+	gchar buf[65536], *cty_location, *pfx, **split, **pfxsplit;
- 	gint ichar = 0, dxccitem = 0, ipfx = 0, ch = 0;
- 	gboolean firstcolon = FALSE;
- 	FILE *fp;
diff --git a/media-radio/xlog/files/xlog-2.0.3-memmove.patch b/media-radio/xlog/files/xlog-2.0.3-memmove.patch
deleted file mode 100644
index 8775829e98de..000000000000
--- a/media-radio/xlog/files/xlog-2.0.3-memmove.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur src/logfile.old/oh1aa.c src/logfile/oh1aa.c
---- src/logfile.old/oh1aa.c	2010-10-04 15:03:52.000000000 +0000
-+++ src/logfile/oh1aa.c	2010-10-04 15:05:13.000000000 +0000
-@@ -111,25 +111,25 @@
- //0502201751OK2BMA      59 59  28 MHzSSB pavel                                 0
- 
- 		/* insert a space between date and time */
--		memmove (buffer+7, buffer+6, MAXROWLEN);
-+		memmove (buffer+7, buffer+6, MAXROWLEN-7);
- 		buffer[6] = ' ';
- 		/* insert a space between time and call */
--		memmove (buffer+12, buffer+11, MAXROWLEN);
-+		memmove (buffer+12, buffer+11, MAXROWLEN-12);
- 		buffer[11] = ' ';
- 		/* insert a space between call and myrst */
--		memmove (buffer+24, buffer+23, MAXROWLEN);
-+		memmove (buffer+24, buffer+23, MAXROWLEN-24);
- 		buffer[24] = ' ';
- 		/* insert a space between myrst and rst */
--		memmove (buffer+28, buffer+27, MAXROWLEN);
-+		memmove (buffer+28, buffer+27, MAXROWLEN-28);
- 		buffer[28] = ' ';
- 		/* insert a space between rst and band */
--		memmove (buffer+32, buffer+31, MAXROWLEN);
-+		memmove (buffer+32, buffer+31, MAXROWLEN-32);
- 		buffer[32] = ' ';
- 		/* insert a space between band and mode */
--		memmove (buffer+40, buffer+39, MAXROWLEN);
-+		memmove (buffer+40, buffer+39, MAXROWLEN-40);
- 		buffer[40] = ' ';
- 		/* insert a space between mode and remarks */
--		memmove (buffer+45, buffer+44, MAXROWLEN);
-+		memmove (buffer+45, buffer+44, MAXROWLEN-45);
- 		buffer[45] = ' ';
- 
- 		for (i = 0; i < oh1aa_field_nr; i++)
-diff -Nur src/logfile.old/trlog.c src/logfile/trlog.c
---- src/logfile.old/trlog.c	2010-10-04 15:03:52.000000000 +0000
-+++ src/logfile/trlog.c	2010-10-04 15:04:21.000000000 +0000
-@@ -195,7 +195,7 @@
- 			continue;
- 
- 		/* insert a space between band and mode */
--		memmove (buffer+4, buffer+3, MAXROWLEN);
-+		memmove (buffer+4, buffer+3, MAXROWLEN-4);
- 		buffer[3] = ' ';
- 
- 		for (i = 0; i < trlog_field_nr - 1; i++)
diff --git a/media-radio/xlog/xlog-2.0.3-r1.ebuild b/media-radio/xlog/xlog-2.0.3-r1.ebuild
deleted file mode 100644
index b94e1196931a..000000000000
--- a/media-radio/xlog/xlog-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3-r1.ebuild,v 1.1 2010/10/24 10:51:30 tomjbe Exp $
-
-EAPI=2
-
-inherit autotools eutils fdo-mime
-
-DESCRIPTION="An amateur radio logging program"
-HOMEPAGE="http://www.nongnu.org/xlog"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/hamlib
-	=dev-libs/glib-2*
-	>=x11-libs/gtk+-2.12"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig"
-
-src_prepare() {
-	# Let portage handle updating mime/desktop databases,
-	epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
-	# and patch wrong ADIF export
-	epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \
-	    "${FILESDIR}/${PN}-2.0.2-qsl.patch"
-	# patch buffer overflow for new cty.dat
-	epatch "${FILESDIR}"/${P}-dxcc.patch
-	# fix buffer overflow (bug 339652)
-	epatch "${FILESDIR}/${P}-memmove.patch"
-	eautoreconf
-}
-
-src_configure() {
-	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS data/doc/THANKS NEWS README || die "dodoc failed"
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-radio/xlog/xlog-2.0.3.ebuild b/media-radio/xlog/xlog-2.0.5.ebuild
index c0cae21d9bb7..313901556434 100644
--- a/media-radio/xlog/xlog-2.0.3.ebuild
+++ b/media-radio/xlog/xlog-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.3.ebuild,v 1.6 2010/10/24 10:51:30 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xlog/xlog-2.0.5.ebuild,v 1.1 2011/02/24 05:10:03 tomjbe Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-libs/hamlib
@@ -25,11 +25,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Let portage handle updating mime/desktop databases,
 	epatch "${FILESDIR}/${PN}-1.9-desktop-update.patch"
-	# and patch wrong ADIF export
-	epatch "${FILESDIR}/${PN}-2.0.1-adif.patch" \
-	    "${FILESDIR}/${PN}-2.0.2-qsl.patch"
-	# fix buffer overflow (bug 339652)
-	epatch "${FILESDIR}/${P}-memmove.patch"
 	eautoreconf
 }