Patch for faulty proxy support, closes bug #83539. Also purged old ebuild and stale patches.

(Portage version: 2.0.51.18)

11 files changed, 114 insertions, 114 deletions

diff --git a/media-sound/grip/ChangeLog b/media-sound/grip/ChangeLog
index 0b8fbe6bf687..09771a556287 100644
--- a/media-sound/grip/ChangeLog
+++ b/media-sound/grip/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-sound/grip
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.49 2004/12/29 01:11:07 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/ChangeLog,v 1.50 2005/03/02 20:27:19 chainsaw Exp $
+
+*grip-3.2.0-r1 (02 Mar 2005)
+
+  02 Mar 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/grip-3.0.6-NPTL-compat.patch, -files/grip-3.1.4-cdda.patch,
+  -files/grip-3.1.8-statuscheck-lp64.patch,
+  -files/grip-3.1.9-statuscheck-lp64.patch, +files/grip-3.2.0-proxy.patch,
+  -grip-3.0.3.ebuild, +grip-3.2.0-r1.ebuild:
+  Patch to fix proxy support for CDDB fetches, closes bug #83539. Also purged
+  one old ebuild and several stale patches.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 2d3db308bfde..fe74c1167998 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,10 +1,8 @@
-MD5 cae67f2a2c182bd02b37eb070808f7ba grip-3.2.0.ebuild 1147
-MD5 d2c595ff8b8993181951da66d67cfb32 ChangeLog 7027
-MD5 0a7905a373e1adbb6e88a5c1e8c0c003 grip-3.0.3.ebuild 1369
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
+MD5 201e9b27cc9997764d960010508b5b53 ChangeLog 7422
+MD5 037fc577c48b5a83c22546bedf39ec75 grip-3.2.0-r1.ebuild 1099
+MD5 cae67f2a2c182bd02b37eb070808f7ba grip-3.2.0.ebuild 1147
+MD5 994c1c45aa0d6d352db1b5dbd94b9248 files/grip-3.2.0-proxy.patch 1291
+MD5 a96f76d77127d40bf0b43ba550a6f441 files/digest-grip-3.2.0-r1 62
 MD5 894e3e78526e61bb0ca317e3c0ee5687 files/grip-3.0.6-NPTL-compat.patch 348
-MD5 31a393d115808b13c2f02527bb894955 files/grip-3.1.9-statuscheck-lp64.patch 345
-MD5 f278e502d9b42a41a2f29773883d1d9a files/digest-grip-3.0.3 62
-MD5 b3e96269e1237cfdd8f02634e55ab7b5 files/grip-3.1.4-cdda.patch 399
-MD5 0503cd1926c4edca6fe25d2f61baa0dc files/grip-3.1.8-statuscheck-lp64.patch 340
 MD5 a96f76d77127d40bf0b43ba550a6f441 files/digest-grip-3.2.0 62
diff --git a/media-sound/grip/files/digest-grip-3.0.3 b/media-sound/grip/files/digest-grip-3.0.3
deleted file mode 100644
index c8ff2c6ca7ab..000000000000
--- a/media-sound/grip/files/digest-grip-3.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b580ca44ed12d478bb6289d09cb7ad38 grip-3.0.3.tar.gz 885333
diff --git a/media-sound/grip/files/digest-grip-3.2.0-r1 b/media-sound/grip/files/digest-grip-3.2.0-r1
new file mode 100644
index 000000000000..3a68edede1db
--- /dev/null
+++ b/media-sound/grip/files/digest-grip-3.2.0-r1
@@ -0,0 +1 @@
+MD5 9b51933a03dd7d7ddfbb3643fc82c2d0 grip-3.2.0.tar.gz 722039
diff --git a/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch b/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch
deleted file mode 100644
index fba9bb32e621..000000000000
--- a/media-sound/grip/files/grip-3.0.6-NPTL-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grip-3.0.6/src/cdplay.c.orig	2003-03-06 22:01:14.000000000 +0200
-+++ grip-3.0.6/src/cdplay.c	2003-03-06 22:01:58.000000000 +0200
-@@ -90,7 +90,7 @@
- #elif defined(__FreeBSD__)
-     pthread_kill(ginfo->discdb_thread,0);
- #else
--    pthread_kill_other_threads_np();
-+    pthread_kill(ginfo->discdb_thread,0);
- #endif
-     Debug(_("Aborted\n"));
- 
diff --git a/media-sound/grip/files/grip-3.1.4-cdda.patch b/media-sound/grip/files/grip-3.1.4-cdda.patch
deleted file mode 100644
index 9f314ffd94cf..000000000000
--- a/media-sound/grip/files/grip-3.1.4-cdda.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cdpar.c.org	2004-01-03 16:16:56.000000000 +0100
-+++ src/cdpar.c	2004-01-03 16:17:03.000000000 +0100
-@@ -44,8 +44,8 @@
- #define size16 short
- #define size32 int
- 
--#include <cdda/cdda_interface.h>
--#include <cdda/cdda_paranoia.h>
-+#include <cdda_interface.h>
-+#include <cdda_paranoia.h>
- 
- static void PutNum(long num,int f,int endianness,int bytes);
- static void WriteWav(int f,long bytes);
diff --git a/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch b/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch
deleted file mode 100644
index 6dfd24914586..000000000000
--- a/media-sound/grip/files/grip-3.1.8-statuscheck-lp64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grip-3.1.4-orig/src/status_window.c	2004-02-14 01:21:01.193001784 -0500
-+++ grip-3.1.4/src/status_window.c	2004-02-14 01:19:32.069550608 -0500
-@@ -83,7 +83,7 @@
- void StatusWindowWrite(StatusWindow *sw,char *msg)
- {
-   char *buf, *locale_msg;
--  int len;
-+  gsize len;
-   int pos=0;
- 
-   /*  gtk_widget_queue_resize(sw->term_widget);*/
diff --git a/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch b/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch
deleted file mode 100644
index 4586408a4f79..000000000000
--- a/media-sound/grip/files/grip-3.1.9-statuscheck-lp64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- grip-3.1.9-orig/src/status_window.c	2004-03-31 04:29:50.000000000 +0200
-+++ grip-3.1.9/src/status_window.c	2004-04-04 00:17:15.664086496 +0200
-@@ -83,7 +83,7 @@
- void StatusWindowWrite(StatusWindow *sw,char *msg)
- {
-   char *buf, *locale_msg=NULL;
--  int len;
-+  gsize len;
-   int pos=0;
- 
-   /*  gtk_widget_queue_resize(sw->term_widget);*/
diff --git a/media-sound/grip/files/grip-3.2.0-proxy.patch b/media-sound/grip/files/grip-3.2.0-proxy.patch
new file mode 100644
index 000000000000..c98f1be8e439
--- /dev/null
+++ b/media-sound/grip/files/grip-3.2.0-proxy.patch
@@ -0,0 +1,44 @@
+diff -Naur grip-3.2.0/src/discdb.c grip-3.2.0-patched/src/discdb.c
+--- grip-3.2.0/src/discdb.c	2004-04-15 12:23:37.000000000 -0600
++++ grip-3.2.0-patched/src/discdb.c	2004-11-09 15:22:15.000000000 -0700
+@@ -187,17 +187,14 @@
+       g_string_sprintf(proxy,"%s:%d",server->proxy->name,
+                        server->proxy->port);
+       
+-      curl_easy_setopt(curl_handle,CURLOPT_PROXY,proxy);
+-      
+-      g_string_free(proxy,TRUE);
++      curl_easy_setopt(curl_handle,CURLOPT_PROXY,proxy->str);
+       
+       if(*server->proxy->username) {
++        user=g_string_new(NULL);
+         g_string_sprintf(user,"%s:%s",server->proxy->username,
+                          server->proxy->pswd);
+         
+-        curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,user);
+-        
+-        g_string_free(user,TRUE);
++        curl_easy_setopt(curl_handle,CURLOPT_PROXYUSERPWD,user->str);
+       }
+     }
+     
+@@ -238,11 +235,17 @@
+       fclose(outfile);
+     }
+     
+-    g_string_free(uri,TRUE);
+-  
+     curl_slist_free_all(headers);
+ 
+     curl_easy_cleanup(curl_handle);
++
++    g_string_free(uri,TRUE);
++    if(server->use_proxy) {
++      g_string_free(proxy,TRUE);
++      if(*server->proxy->username) {
++        g_string_free(user,TRUE);
++      }
++    }
+   }
+ 
+   curl_global_cleanup();
diff --git a/media-sound/grip/grip-3.0.3.ebuild b/media-sound/grip/grip-3.0.3.ebuild
deleted file mode 100644
index c50f55852be9..000000000000
--- a/media-sound/grip/grip-3.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.0.3.ebuild,v 1.10 2004/08/22 05:15:57 obz Exp $
-
-IUSE="nls oggvorbis"
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper."
-HOMEPAGE="http://www.nostatic.org/grip"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	=sys-libs/db-1*
-	media-sound/lame
-	media-sound/cdparanoia
-	media-libs/id3lib
-	gnome-base/gnome-libs
-	=gnome-base/orbit-0*
-	gnome-base/libghttp
-	oggvorbis? ( media-sound/vorbis-tools )
-	nls? ( sys-devel/gettext )"
-
-SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
-
-# Looks like the Makefile.in mangling is no longer required.
-# Arcady Genkin <agenkin@gentoo.org>, Sep 26, 2002.
-#
-#src_unpack() {
-#
-#	unpack ${A}
-#	cd ${S}
-#	 
-#	# apply CFLAGS
-#	mv Makefile.in Makefile.in.old
-#	sed -e "s/CFLAGS = -g -O2/CFLAGS = ${CFLAGS}/" \
-#		Makefile.in.old > Makefile.in
-#
-#	# fix cdparanoia libs not linking
-#	mv src/Makefile.in src/Makefile.in.orig
-#	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
-#		src/Makefile.in.orig > src/Makefile.in
-#}
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install () {
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS CREDITS COPYING ChangeLog README TODO NEWS
-}
diff --git a/media-sound/grip/grip-3.2.0-r1.ebuild b/media-sound/grip/grip-3.2.0-r1.ebuild
new file mode 100644
index 000000000000..fe9a4625035e
--- /dev/null
+++ b/media-sound/grip/grip-3.2.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.2.0-r1.ebuild,v 1.1 2005/03/02 20:27:19 chainsaw Exp $
+
+inherit gnuconfig flag-o-matic eutils
+
+IUSE="nls oggvorbis"
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper."
+HOMEPAGE="http://www.nostatic.org/grip"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~ppc64"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	x11-libs/vte
+	=sys-libs/db-1*
+	media-sound/lame
+	media-sound/cdparanoia
+	>=media-libs/id3lib-3.8.3
+	>=gnome-base/libgnomeui-2.2.0
+	>=gnome-base/orbit-2
+	gnome-base/libghttp
+	net-misc/curl
+	oggvorbis? ( media-sound/vorbis-tools )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-proxy.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	# Bug #69536
+	use x86 && append-flags "-mno-sse"
+
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable nls) || die
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS CREDITS ChangeLog README TODO
+}