patch to work around a gcc-3.3 bug #85780

Package-Manager: portage-2.0.51.19

4 files changed, 51 insertions, 22 deletions

diff --git a/app-misc/endeavour/Manifest b/app-misc/endeavour/Manifest
index bc63e017b251..7d99fba5362f 100644
--- a/app-misc/endeavour/Manifest
+++ b/app-misc/endeavour/Manifest
@@ -1,14 +1,7 @@
 MD5 d13bd02ebdf6a534043d85a2bb9573b0 ChangeLog 3066
-MD5 94725ab58e44706a373b2f21dcad97a0 endeavour-2.1.20-r1.ebuild 1659
-MD5 ffb852a2ba80d827c9c9f42bf5bc8797 endeavour-2.3.0.ebuild 1501
-MD5 c76e8e23e3135d498eb478f3d85a3d0d endeavour-2.3.3.ebuild 1295
-MD5 a425db80929b643353228153190c4e2d endeavour-2.3.6.ebuild 1239
+MD5 40e76c87eefb26dab5341ea9dd3eb913 endeavour-2.3.6.ebuild 1320
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 b87fa2a1e8b5821f220f84bfe1a050e4 endeavour-2.4.6.ebuild 1326
-MD5 2a4f2c0cfe25080ae5f655174ecd5dc1 files/digest-endeavour-2.1.20-r1 137
-MD5 a284a73aa807b07952301caacc420679 files/digest-endeavour-2.3.0 136
-MD5 a696e8d6526b5d1804e72df6822bbdae files/digest-endeavour-2.3.3 136
+MD5 8f680f37b3440e871fa464b3a3aae648 endeavour-2.4.6.ebuild 1401
 MD5 8bad28a83ee1a70fcbc5bf58e1aefc18 files/digest-endeavour-2.3.6 136
-MD5 0d48c27ed5f288b4d840f5a582345d17 files/endeavour-2.1.20-bigendian.diff 888
-MD5 bd2dd1dce9552ef7afda353ea293044e files/endeavour_gcc33_fix 4553
 MD5 a2f4fc1ce0559ff8c155d69ae4e5b8f7 files/digest-endeavour-2.4.6 136
+MD5 78d7303ccc10e5d6c76b68047c56e03e files/endeavour-2.4.6-gcc33.patch 897
diff --git a/app-misc/endeavour/endeavour-2.3.6.ebuild b/app-misc/endeavour/endeavour-2.3.6.ebuild
index 7809d04631c5..9f9c3082d51e 100644
--- a/app-misc/endeavour/endeavour-2.3.6.ebuild
+++ b/app-misc/endeavour/endeavour-2.3.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.3.6.ebuild,v 1.6 2005/01/01 15:00:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.3.6.ebuild,v 1.7 2005/04/08 04:08:37 vapier Exp $
 
-IUSE=""
+inherit eutils
 
 M=endeavour2-mimetypes
 DESCRIPTION="Powerful file and image browser"
@@ -10,9 +10,10 @@ HOMEPAGE="http://wolfpack.twu.net/Endeavour2/"
 SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2
 	ftp://wolfpack.twu.net/users/wolfpack/${M}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc amd64"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
 
 DEPEND="app-arch/bzip2
 	=x11-libs/gtk+-1.2*
@@ -21,6 +22,8 @@ DEPEND="app-arch/bzip2
 src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack ${M}.tgz
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-2.4.6-gcc33.patch
 }
 
 src_compile() {
@@ -32,13 +35,12 @@ src_install() {
 	dodoc AUTHORS HACKING INSTALL README TODO
 
 	cd endeavour2
-
-	dobin endeavour2
+	dobin endeavour2 || die
 	bunzip2 endeavour2.1.bz2
 	doman endeavour2.1
 
 	dodir /usr/share/endeavour2
-	cp -R data/* ${D}/usr/share/endeavour2
+	cp -R data/* ${D}/usr/share/endeavour2 || die
 
 	cd images
 	insinto /usr/share/icons
diff --git a/app-misc/endeavour/endeavour-2.4.6.ebuild b/app-misc/endeavour/endeavour-2.4.6.ebuild
index d2266958ada3..4d0beb780c70 100644
--- a/app-misc/endeavour/endeavour-2.4.6.ebuild
+++ b/app-misc/endeavour/endeavour-2.4.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.4.6.ebuild,v 1.3 2005/01/01 15:00:36 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.4.6.ebuild,v 1.4 2005/04/08 04:08:37 vapier Exp $
+
+inherit eutils
 
 M=endeavour2-mimetypes
 DESCRIPTION="Powerful file and image browser"
@@ -10,7 +12,7 @@ SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="app-arch/bzip2
@@ -20,6 +22,8 @@ DEPEND="app-arch/bzip2
 src_unpack() {
 	unpack ${P}.tar.bz2
 	unpack ${M}.tgz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc33.patch
 }
 
 src_compile() {
@@ -31,13 +35,12 @@ src_install() {
 	dodoc AUTHORS HACKING INSTALL README TODO
 
 	cd endeavour2
-
-	dobin endeavour2
+	dobin endeavour2 || die
 	bunzip2 endeavour2.1.bz2
 	doman endeavour2.1
 
 	dodir /usr/share/endeavour2
-	cp -R data/* ${D}/usr/share/endeavour2
+	cp -R data/* ${D}/usr/share/endeavour2 || die
 	dodir /usr/share/endeavour2/icons/
 	cp -R images/* ${D}/usr/share/endeavour2/icons/
 
diff --git a/app-misc/endeavour/files/endeavour-2.4.6-gcc33.patch b/app-misc/endeavour/files/endeavour-2.4.6-gcc33.patch
new file mode 100644
index 000000000000..33a3e4594f4a
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour-2.4.6-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
+
+--- endeavour2/string.cpp
++++ endeavour2/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.