Add a patch to work around a gcc-3.3 bug #85780.

Package-Manager: portage-2.0.51.19

6 files changed, 42 insertions, 66 deletions

diff --git a/media-libs/libjsw/ChangeLog b/media-libs/libjsw/ChangeLog
index 4989146cb483..fba9d998a671 100644
--- a/media-libs/libjsw/ChangeLog
+++ b/media-libs/libjsw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libjsw
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.6 2005/03/18 23:27:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/ChangeLog,v 1.7 2005/04/08 03:57:59 vapier Exp $
+
+  08 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/libjsw-1.5.5-gcc33.patch, -libjsw-1.5.4.ebuild,
+  libjsw-1.5.5.ebuild:
+  Add a patch to work around a gcc-3.3 bug #85780.
 
 *libjsw-1.5.5 (18 Mar 2005)
 
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest
index 4c72fb42ef1e..d4cd369fa564 100644
--- a/media-libs/libjsw/Manifest
+++ b/media-libs/libjsw/Manifest
@@ -1,6 +1,5 @@
-MD5 9190492d75ec25e3cb85e908922c9fee ChangeLog 671
+MD5 c8d0a1c9b921e036ef34424f3cab235e ChangeLog 853
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 a2fe9532b71d8c266c17f7c22ccf654b libjsw-1.5.5.ebuild 1382
-MD5 1ad0599c536b63e2ec2aa10a1a7fc77b libjsw-1.5.4.ebuild 1348
+MD5 3381f011902d2beea2a7c883f61a98df libjsw-1.5.5.ebuild 1421
 MD5 31ad1236d527eb6aa9762930554c4239 files/digest-libjsw-1.5.5 65
-MD5 8a17ca47e6e65ae0bf1b82d24c2dd400 files/digest-libjsw-1.5.4 65
+MD5 4ebd989ae2e416ffb4e29e25f0d4e954 files/libjsw-1.5.5-gcc33.patch 889
diff --git a/media-libs/libjsw/files/digest-libjsw-1.5.4 b/media-libs/libjsw/files/digest-libjsw-1.5.4
deleted file mode 100644
index a8bd9c2505b8..000000000000
--- a/media-libs/libjsw/files/digest-libjsw-1.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2728c790bdebd592370725bb362c12a6 libjsw-1.5.4.tar.bz2 310385
diff --git a/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch b/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch
new file mode 100644
index 000000000000..95a4e3e312c1
--- /dev/null
+++ b/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch
@@ -0,0 +1,31 @@
+Work around a gcc-3.3.x bug where redefining prototypes with different 
+__THROW / attribute(nonnull) markings throws an error:
+
+string.cpp:31: error: declaration of `char* strcasestr(const char*, const char*)' throws different exceptions
+../include/string.h:46: error: than previous declaration `char* strcasestr(const char*, const char*) throw ()'
+
+basically we just use the glibc strcasestr() instead of the internal one.
+
+http://bugs.gentoo.org/show_bug.cgi?id=85780
+
+--- libjsw/string.cpp
++++ libjsw/string.cpp
+@@ -28,3 +28,5 @@
+ #endif
++#ifndef _GNU_SOURCE
+ char *strcasestr(const char *haystack, const char *needle);
++#endif
+ int strpfx(const char *s, const char *pfx);
+@@ -217,3 +219,4 @@
+ */
++#ifndef _GNU_SOURCE
+ char *strcasestr(const char *haystack, const char *needle)
+ {
+@@ -274,6 +277,7 @@
+ 
+ 	return(NULL);
+ }
++#endif
+ 
+ /*
+  *	Checks if string pfx is a prefix of string s.
diff --git a/media-libs/libjsw/libjsw-1.5.4.ebuild b/media-libs/libjsw/libjsw-1.5.4.ebuild
deleted file mode 100644
index 9fd9df9415b2..000000000000
--- a/media-libs/libjsw/libjsw-1.5.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.4.ebuild,v 1.1 2004/06/28 03:45:53 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers"
-HOMEPAGE="http://wolfpack.twu.net/libjsw/"
-SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="gtk"
-
-DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed"
-}
-
-src_compile() {
-	cd ${S}/libjsw
-	emake CFLAGS="${CFLAGS}" || die "main build failed"
-	ln -s libjsw.so.${PV} libjsw.so
-
-	if use gtk ; then
-		cd ${S}/jscalibrator
-		ln -s ../include/jsw.h
-		emake \
-			CFLAGS="${CFLAGS}" \
-			INC_DIRS="`gtk-config --cflags` -I." \
-			LIB_DIRS="-L../libjsw" \
-			|| die "jscalibrator failed"
-	fi
-}
-
-src_install() {
-	insinto /usr/include
-	doins include/jsw.h || die "doins jsw.h failed"
-
-	dodoc AUTHORS README
-	docinto jswdemos
-	dodoc jswdemos/*
-
-	cd ${S}/libjsw
-	dolib.so libjsw.so.${PV} || die
-	dosym libjsw.so.${PV} /usr/lib/libjsw.so
-	doman man/*
-
-	if use gtk ; then
-		cd ${S}/jscalibrator
-		dobin jscalibrator || die
-		doman jscalibrator.1
-		dohtml data/help/*
-	fi
-}
diff --git a/media-libs/libjsw/libjsw-1.5.5.ebuild b/media-libs/libjsw/libjsw-1.5.5.ebuild
index 073c64fd77a7..59c6d0f0145d 100644
--- a/media-libs/libjsw/libjsw-1.5.5.ebuild
+++ b/media-libs/libjsw/libjsw-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.1 2005/03/18 23:27:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.2 2005/04/08 03:57:59 vapier Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc33.patch
 	bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed"
 }