minor bugfix updates

Package-Manager: portage-2.0.51-r15

11 files changed, 229 insertions, 93 deletions

diff --git a/net-p2p/lopster/ChangeLog b/net-p2p/lopster/ChangeLog
index 82b154dd6761..0e6ef67f119b 100644
--- a/net-p2p/lopster/ChangeLog
+++ b/net-p2p/lopster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/lopster
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/ChangeLog,v 1.16 2004/10/01 05:32:24 squinky86 Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/ChangeLog,v 1.17 2005/02/25 03:09:46 squinky86 Exp $
+
+*lopster-1.2.2-r1 (24 Feb 2005)
+
+  24 Feb 2005; Jon Hood <squinky86@gentoo.org>
+  +files/1.2.2-bugfixes-1.patch, -lopster-1.0.1.20020702.ebuild,
+  -lopster-1.2.1.ebuild, +lopster-1.2.2-r1.ebuild:
+  Minor bugfixes. Thanks Lars <polynomial-C@gmx.de>, #83126. Remove old versions.
 
   01 Oct 2004; Jon Hood <squinky86@gentoo.org> lopster-1.2.2.ebuild:
   Stable on x86.
diff --git a/net-p2p/lopster/Manifest b/net-p2p/lopster/Manifest
index 331a2feb9e46..b1995d6820f9 100644
--- a/net-p2p/lopster/Manifest
+++ b/net-p2p/lopster/Manifest
@@ -1,10 +1,9 @@
-MD5 37858aec20ca21c088ce6aeb58178092 ChangeLog 2975
-MD5 a28cbdce15fb5677081558349a37783f lopster-1.0.1.20020702.ebuild 915
-MD5 61e67786849ff92adda1e17c9912e36b lopster-1.2.0.ebuild 1043
-MD5 453168489fc6e0cf981847eaf56ed389 lopster-1.2.1.ebuild 762
-MD5 ca413e023d57e2f85fa0ba0aa127acfb lopster-1.2.2.ebuild 893
+MD5 48c693d6f7edb2a477cfa226c0f30168 lopster-1.2.2-r1.ebuild 1078
+MD5 674965a9e04841b1a1c43e3435645540 lopster-1.2.0.ebuild 1044
+MD5 ade62f759f798877f1af07576c668d99 lopster-1.2.2.ebuild 894
+MD5 45cb528bae83f9fbe396f1ee09d4ca3e ChangeLog 3254
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 2396ef56fe0e679a9d49c12e329b6bfb files/digest-lopster-1.0.1.20020702 75
+MD5 2ec569a9b7f4db5c8ac15bbfcbd053d2 files/digest-lopster-1.2.2-r1 65
+MD5 058879106049ba1df31773523ef13568 files/1.2.2-bugfixes-1.patch 5661
 MD5 76fd2f6d6e63506f8d4a7c1c4b7b24ef files/digest-lopster-1.2.0 131
-MD5 d3db9c66c67aa53a9a5ea5495dc8e25a files/digest-lopster-1.2.1 65
 MD5 2ec569a9b7f4db5c8ac15bbfcbd053d2 files/digest-lopster-1.2.2 65
diff --git a/net-p2p/lopster/files/1.2.2-bugfixes-1.patch b/net-p2p/lopster/files/1.2.2-bugfixes-1.patch
new file mode 100644
index 000000000000..979c6ac98632
--- /dev/null
+++ b/net-p2p/lopster/files/1.2.2-bugfixes-1.patch
@@ -0,0 +1,160 @@
+diff -Naur lopster-1.2.2/configure.in lopster/configure.in
+--- lopster-1.2.2/configure.in	2004-08-29 17:34:29.000000000 +0200
++++ lopster/configure.in	2005-02-10 19:55:27.000000000 +0100
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(lopster, "1.2.2")
++AM_INIT_AUTOMAKE(lopster, "1.2.2-fix1")
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CC
+diff -Naur lopster-1.2.2/src/browse.c lopster/src/browse.c
+--- lopster-1.2.2/src/browse.c	2004-08-28 23:27:06.000000000 +0200
++++ lopster/src/browse.c	2005-02-10 19:55:39.000000000 +0100
+@@ -1683,9 +1683,9 @@
+ 
+   clist = gtk_clist_new(5);
+   tree->clist = GTK_CLIST(clist);
+-  gtk_clist_set_sort_column(GTK_CLIST(clist), 0);
+-  gtk_clist_set_sort_type(GTK_CLIST(clist), GTK_SORT_ASCENDING); 
+-  gtk_clist_set_auto_sort(GTK_CLIST(clist), 1);
++  //  gtk_clist_set_sort_column(GTK_CLIST(clist), 0);
++  //  gtk_clist_set_sort_type(GTK_CLIST(clist), GTK_SORT_ASCENDING); 
++  //  gtk_clist_set_auto_sort(GTK_CLIST(clist), 1);
+   gtk_widget_show(clist);
+   gtk_widget_set_events(clist,
+ 			GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
+diff -Naur lopster-1.2.2/src/files.c lopster/src/files.c
+--- lopster-1.2.2/src/files.c	2004-08-29 17:33:38.000000000 +0200
++++ lopster/src/files.c	2005-02-10 19:55:40.000000000 +0100
+@@ -195,7 +195,6 @@
+   dest->frequency = file->frequency;
+   dest->duration = file->duration;
+   dest->linespeed = file->linespeed;
+-  dest->media_type = file->media_type;
+   dest->ping = file->ping;
+   dest->vbr = file->vbr;
+ 
+diff -Naur lopster-1.2.2/src/global.c lopster/src/global.c
+--- lopster-1.2.2/src/global.c	2004-08-29 17:33:38.000000000 +0200
++++ lopster/src/global.c	2005-02-10 19:55:40.000000000 +0100
+@@ -434,7 +434,6 @@
+   switch (level) {
+   case L_LEECH: return "Leech";
+   case L_USER: return "User";
+-  case L_CHAT: return "Chatter";
+   case L_MOD: return "Moderator";
+   case L_ADMIN: return "Administrator";
+   case L_ELITE: return "Elite";
+@@ -446,7 +445,6 @@
+   switch (level) {
+   case L_LEECH: return "Leech";
+   case L_USER: return "User";
+-  case L_CHAT: return "Chatter";
+   case L_MOD: return "Mod";
+   case L_ADMIN: return "Admin";
+   case L_ELITE: return "Elite";
+@@ -3398,6 +3396,7 @@
+   global.timer = -1;
+ 
+   global.usermode = ModeMask[N_UNKNOWN];
++  global.linespeed = 0;
+ 
+   global.status.exiting = E_NONE;
+ 
+diff -Naur lopster-1.2.2/src/log.c lopster/src/log.c
+--- lopster-1.2.2/src/log.c	2004-01-11 16:50:30.000000000 +0100
++++ lopster/src/log.c	2005-02-10 19:55:42.000000000 +0100
+@@ -147,8 +147,13 @@
+     g_free(log->description);
+     g_free(log);
+   }
+-  g_list_free(net?net->logs:other_logs);
+-  net?net->logs:other_logs = NULL;
++  if (net) {
++    g_list_free(net->logs);
++    net->logs = NULL;
++  } else {
++    g_list_free(other_logs);
++    other_logs = NULL;
++  }
+ }
+ 
+ void log_file_destroy(log_file_t* lf) {
+diff -Naur lopster-1.2.2/src/lopster.h lopster/src/lopster.h
+--- lopster-1.2.2/src/lopster.h	2004-08-29 17:33:39.000000000 +0200
++++ lopster/src/lopster.h	2005-02-10 19:55:42.000000000 +0100
+@@ -365,7 +365,6 @@
+ typedef enum {
+   L_LEECH,
+   L_USER,
+-  L_CHAT,
+   L_MOD,
+   L_ADMIN,
+   L_ELITE,
+diff -Naur lopster-1.2.2/src/napster_handler.c lopster/src/napster_handler.c
+--- lopster-1.2.2/src/napster_handler.c	2004-08-28 23:27:09.000000000 +0200
++++ lopster/src/napster_handler.c	2005-02-10 19:55:42.000000000 +0100
+@@ -780,9 +780,6 @@
+       pos = strchr(pos+28, '(');
+       if (!pos) return 1;
+       level = atoi(pos+1);
+-      // need to add one level on slavanap (and maybe other non-opennaps)
+-      // because there is no chatter
+-      if (net->subtype != N_OPENNAP && level >= L_CHAT) level++;
+     }
+     if (net->user.level != (unsigned)level)
+       set_user_level(net, level);
+@@ -806,9 +803,6 @@
+       pos = strchr(pos+24, '(');
+       if (!pos) return 1;
+       level = atoi(pos+1);
+-      // need to add one level on slavanap (and maybe other non-opennaps)
+-      // because there is no chatter
+-      if (net->subtype != N_OPENNAP && level >= L_CHAT) level++;
+     }
+     if (net->user.level != (unsigned)level)
+       set_user_level(net, level);
+diff -Naur lopster-1.2.2/src/search.c lopster/src/search.c
+--- lopster-1.2.2/src/search.c	2004-05-03 18:47:03.000000000 +0200
++++ lopster/src/search.c	2005-02-10 19:55:42.000000000 +0100
+@@ -774,14 +774,17 @@
+     }
+   }
+ 
+-  command_send(net, CMD_SEARCH, 
+-	       pattern->include, pattern->exclude,
+-	       pattern->max_results, pattern->media_type,
+-	       pattern->bitrate_lo, pattern->bitrate_hi,
+-	       pattern->freq_lo, pattern->freq_hi,
+-	       pattern->speed_lo, pattern->speed_hi,
+-	       pattern->size_lo, pattern->size_hi,
+-	       pattern->duration_lo, pattern->duration_hi);
++  // send as unimportant command to make sure it comes after
++  // the library is shared.
++  command_send_unimportant
++    (net, CMD_SEARCH, 
++     pattern->include, pattern->exclude,
++     pattern->max_results, pattern->media_type,
++     pattern->bitrate_lo, pattern->bitrate_hi,
++     pattern->freq_lo, pattern->freq_hi,
++     pattern->speed_lo, pattern->speed_hi,
++     pattern->size_lo, pattern->size_hi,
++     pattern->duration_lo, pattern->duration_hi);
+   
+ #ifdef SEARCH_DEBUG
+   printf("[SEARCH] doing (%s) on %s (%d)\n", 
+diff -Naur lopster-1.2.2/src/transfer.c lopster/src/transfer.c
+--- lopster-1.2.2/src/transfer.c	2004-08-29 17:33:39.000000000 +0200
++++ lopster/src/transfer.c	2005-02-10 19:55:43.000000000 +0100
+@@ -918,7 +918,7 @@
+   char buf[MAX_PUSH + 1];
+   int n, sent;
+   long maxpush;
+-  
++
+   if (condition != GDK_INPUT_WRITE) {
+     socket_end(socket, S_INCOMPLETE);
+     return 1;
diff --git a/net-p2p/lopster/files/digest-lopster-1.0.1.20020702 b/net-p2p/lopster/files/digest-lopster-1.0.1.20020702
deleted file mode 100644
index 6da8fedcc080..000000000000
--- a/net-p2p/lopster/files/digest-lopster-1.0.1.20020702
+++ /dev/null
@@ -1 +0,0 @@
-MD5 089d063575c99295b4520d270e075db2 lopster-1.0.1.20020702.tar.bz2 980583
diff --git a/net-p2p/lopster/files/digest-lopster-1.2.1 b/net-p2p/lopster/files/digest-lopster-1.2.1
deleted file mode 100644
index 8938ffd0af7f..000000000000
--- a/net-p2p/lopster/files/digest-lopster-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6b192a4c62b50999fa1117924204156 lopster-1.2.1.tar.gz 632376
diff --git a/net-p2p/lopster/files/digest-lopster-1.2.2-r1 b/net-p2p/lopster/files/digest-lopster-1.2.2-r1
new file mode 100644
index 000000000000..5c115a9615cb
--- /dev/null
+++ b/net-p2p/lopster/files/digest-lopster-1.2.2-r1
@@ -0,0 +1 @@
+MD5 ae857116eddd01f1f7d2769908a142c0 lopster-1.2.2.tar.gz 630325
diff --git a/net-p2p/lopster/lopster-1.0.1.20020702.ebuild b/net-p2p/lopster/lopster-1.0.1.20020702.ebuild
deleted file mode 100644
index 1653754dcb1a..000000000000
--- a/net-p2p/lopster/lopster-1.0.1.20020702.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.0.1.20020702.ebuild,v 1.10 2004/07/15 03:50:41 agriffis Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A Napster Client using GTK"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-HOMEPAGE="http://lopster.sourceforge.net"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-DEPEND="=x11-libs/gtk+-1.2*"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	./autogen.sh
-	autoconf
-	cp configure.in configure.in.orig
-	sed -e "s:^intl/Makefile::" \
-		-e "s:AM_GNU_GETTEXT::" \
-		configure.in.orig > configure.in
-
-	cp Makefile.am Makefile.am.orig
-	sed "s:SUBDIR.*:SUBDIRS = m4 src:" \
-		Makefile.am.orig > Makefile.am
-
-	automake
-
-	econf || die
-
-	emake || die
-
-}
-
-src_install () {
-
-	einstall || die
-	dodoc AUTHORS BUGS README ChangeLog NEWS TODO
-}
diff --git a/net-p2p/lopster/lopster-1.2.0.ebuild b/net-p2p/lopster/lopster-1.2.0.ebuild
index 5bee5644139f..73aa1d8ec64f 100644
--- a/net-p2p/lopster/lopster-1.2.0.ebuild
+++ b/net-p2p/lopster/lopster-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.0.ebuild,v 1.10 2004/10/04 22:00:13 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.0.ebuild,v 1.11 2005/02/25 03:09:46 squinky86 Exp $
 
 IUSE="nls"
 
diff --git a/net-p2p/lopster/lopster-1.2.1.ebuild b/net-p2p/lopster/lopster-1.2.1.ebuild
deleted file mode 100644
index e79eb7f7c5bd..000000000000
--- a/net-p2p/lopster/lopster-1.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.1.ebuild,v 1.4 2004/10/04 22:00:13 pvdabeel Exp $
-
-IUSE="nls"
-
-DESCRIPTION="A Napster Client using GTK"
-HOMEPAGE="http://lopster.sourceforge.net"
-SRC_URI="mirror://sourceforge/lopster/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64"
-
-DEPEND="=x11-libs/gtk+-1.2*"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf \
-		--with-pthread \
-		--with-zlib \
-		${myconf} || die "econf failed"
-
-	emake || die
-}
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS BUGS README ChangeLog NEWS TODO
-}
diff --git a/net-p2p/lopster/lopster-1.2.2-r1.ebuild b/net-p2p/lopster/lopster-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..1b3c7caf049b
--- /dev/null
+++ b/net-p2p/lopster/lopster-1.2.2-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.2-r1.ebuild,v 1.1 2005/02/25 03:09:46 squinky86 Exp $
+
+inherit eutils
+
+IUSE="nls oggvorbis zlib flac"
+
+DESCRIPTION="A Napster Client using GTK"
+HOMEPAGE="http://lopster.sourceforge.net"
+SRC_URI="mirror://sourceforge/lopster/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+RDEPEND="=x11-libs/gtk+-1.2*
+	nls? ( sys-devel/gettext )
+	zlib? ( sys-libs/zlib )
+	flac? ( media-libs/flac )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/automake-1.9"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-bugfixes-1.patch
+	cd ${S}
+}
+
+src_compile() {
+	./autogen.sh
+
+	econf \
+		--with-pthread \
+		--with-zlib \
+		`use_enable nls` \
+		`use_with zlib` \
+		`use_with flac` \
+		`use_with oggvorbis ogg` || die "econf failed"
+
+	emake || die
+}
+
+src_install () {
+	einstall || die
+	dodoc AUTHORS BUGS README ChangeLog NEWS TODO
+}
diff --git a/net-p2p/lopster/lopster-1.2.2.ebuild b/net-p2p/lopster/lopster-1.2.2.ebuild
index 3c25f76c9625..7809fd3a24c5 100644
--- a/net-p2p/lopster/lopster-1.2.2.ebuild
+++ b/net-p2p/lopster/lopster-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.2.ebuild,v 1.3 2004/10/04 22:00:13 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/lopster/lopster-1.2.2.ebuild,v 1.4 2005/02/25 03:09:46 squinky86 Exp $
 
 IUSE="nls oggvorbis zlib flac"