Patch to fix compilation with gcc-4.1, thanks to Patrizio Bassi <hetfield666 AT gmail DOT com> for reporting the problem; bug #125010

(Portage version: 2.1_pre5-r4)

5 files changed, 53 insertions, 10 deletions

diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog
index 5c3ceba60daa..c50af1e6f796 100644
--- a/app-misc/endeavour/ChangeLog
+++ b/app-misc/endeavour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/endeavour
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.19 2005/01/01 15:00:36 eradicator Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/ChangeLog,v 1.20 2006/03/10 05:19:56 halcy0n Exp $
+
+  10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/endeavour-2.4.6-gcc41.patch, endeavour-2.4.6.ebuild:
+  Patch to fix compilation with gcc-4.1, thanks to Patrizio Bassi <hetfield666
+  AT gmail DOT com> for reporting the problem; bug #125010
 
 *endeavour-2.4.6 (23 Dec 2004)
 
diff --git a/app-misc/endeavour/Manifest b/app-misc/endeavour/Manifest
index 7d99fba5362f..03bcb06f6395 100644
--- a/app-misc/endeavour/Manifest
+++ b/app-misc/endeavour/Manifest
@@ -1,7 +1,24 @@
 MD5 d13bd02ebdf6a534043d85a2bb9573b0 ChangeLog 3066
+RMD160 8e77039c7dee8da3f834184310294e94f4ab0013 ChangeLog 3066
+SHA256 cea32cd0831cde2c12316e9d6b6bc278a3ebc9d24133d2de377173999457530b ChangeLog 3066
 MD5 40e76c87eefb26dab5341ea9dd3eb913 endeavour-2.3.6.ebuild 1320
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 8f680f37b3440e871fa464b3a3aae648 endeavour-2.4.6.ebuild 1401
+RMD160 75681b3374616de43d6ca069f5a940d5daacadb1 endeavour-2.3.6.ebuild 1320
+SHA256 103b2428126896d2d490f60114425c750a39d6a4f862f8f0b24f540a36d3a92a endeavour-2.3.6.ebuild 1320
+MD5 be5227f79b3a7b5d52e6b36352f09562 endeavour-2.4.6.ebuild 1446
+RMD160 4c1a0fa2475e1aa2ad6cff3058473a25cc75b5c9 endeavour-2.4.6.ebuild 1446
+SHA256 94353f4b2f2491568c5e9aa39b9754fa72cdc275327c4c88de52c9abf1e6a558 endeavour-2.4.6.ebuild 1446
 MD5 8bad28a83ee1a70fcbc5bf58e1aefc18 files/digest-endeavour-2.3.6 136
-MD5 a2f4fc1ce0559ff8c155d69ae4e5b8f7 files/digest-endeavour-2.4.6 136
+RMD160 b67dc0f38790543b3621e139447fd1fd89b29fbd files/digest-endeavour-2.3.6 136
+SHA256 842f5053fa63b857b8ad5c623c8dfc996e3f170f230296bab43f9b2f76d2b1df files/digest-endeavour-2.3.6 136
+MD5 ba54711f825043d46ed1178aae122d04 files/digest-endeavour-2.4.6 500
+RMD160 4c54d4223a7ee9a77f9ddcd38c2e78288c128633 files/digest-endeavour-2.4.6 500
+SHA256 4bb9e2fa39b02402d41b57cec78f3e2fea0f69972e5b54fba0bbfe09f430b766 files/digest-endeavour-2.4.6 500
 MD5 78d7303ccc10e5d6c76b68047c56e03e files/endeavour-2.4.6-gcc33.patch 897
+RMD160 0d45998f14af8e14648fbcd39b59e46ff076b393 files/endeavour-2.4.6-gcc33.patch 897
+SHA256 870648f231ad16c34c5f6acae7381721986f8c9ba4baa51a2dac9a3fe7a0ac51 files/endeavour-2.4.6-gcc33.patch 897
+MD5 ac3378a093527e3f987a690b9cb412c2 files/endeavour-2.4.6-gcc41.patch 528
+RMD160 e582861d24c9d0d17ae27b5983dbc4998e2c9574 files/endeavour-2.4.6-gcc41.patch 528
+SHA256 24268f7da303337be51732baca1aff22f3aa89061de8e8353f68951bac87214a files/endeavour-2.4.6-gcc41.patch 528
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+RMD160 5b59fc85d3bafae0872cf691e5f032bac39ba539 metadata.xml 310
+SHA256 39e1273dd60bd3ceb460e9366a648c8fa21db1c292df4573e69f41cf6c84f6fc metadata.xml 310
diff --git a/app-misc/endeavour/endeavour-2.4.6.ebuild b/app-misc/endeavour/endeavour-2.4.6.ebuild
index 4d0beb780c70..93a51e2e2b7d 100644
--- a/app-misc/endeavour/endeavour-2.4.6.ebuild
+++ b/app-misc/endeavour/endeavour-2.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.4 2005/04/08 04:08:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.4.6.ebuild,v 1.5 2006/03/10 05:19:56 halcy0n Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	unpack ${M}.tgz
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc33.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
@@ -40,9 +41,9 @@ src_install() {
 	doman endeavour2.1
 
 	dodir /usr/share/endeavour2
-	cp -R data/* ${D}/usr/share/endeavour2 || die
+	cp -R data/* "${D}"/usr/share/endeavour2 || die
 	dodir /usr/share/endeavour2/icons/
-	cp -R images/* ${D}/usr/share/endeavour2/icons/
+	cp -R images/* "${D}"/usr/share/endeavour2/icons/
 
 	cd images
 	insinto /usr/share/icons
@@ -50,7 +51,7 @@ src_install() {
 		icon_trash_empty_48x48.xpm
 
 	# install mimetypes
-	cd ${WORKDIR}/${M}
+	cd "${WORKDIR}"/${M}
 	mv README README.mimetypes
 	dodoc README.mimetypes
 	insinto /usr/share/endeavour2/
diff --git a/app-misc/endeavour/files/digest-endeavour-2.4.6 b/app-misc/endeavour/files/digest-endeavour-2.4.6
index c8b539991683..7da370b53bc9 100644
--- a/app-misc/endeavour/files/digest-endeavour-2.4.6
+++ b/app-misc/endeavour/files/digest-endeavour-2.4.6
@@ -1,2 +1,6 @@
 MD5 6fc3ab7275bcbd395291b8cfc807af72 endeavour-2.4.6.tar.bz2 2215534
+RMD160 2448fc5e6d507ae4e8ce4ac3c15bea1249f53729 endeavour-2.4.6.tar.bz2 2215534
+SHA256 96e71ffc7789bef75fbac2ddb3bbfbdc0586bc97572fb691de405ef2c6396ed2 endeavour-2.4.6.tar.bz2 2215534
 MD5 dbbb7f4aa5e330be063c1b2b24495cf2 endeavour2-mimetypes.tgz 1423
+RMD160 45a8c0a04a6b58c377605ee1446c792d32d69939 endeavour2-mimetypes.tgz 1423
+SHA256 5b341f23635c35fa50758b216e8e8d86f39a05c82da7d152b3f916e995f49a8c endeavour2-mimetypes.tgz 1423
diff --git a/app-misc/endeavour/files/endeavour-2.4.6-gcc41.patch b/app-misc/endeavour/files/endeavour-2.4.6-gcc41.patch
new file mode 100644
index 000000000000..cf8557d968f7
--- /dev/null
+++ b/app-misc/endeavour/files/endeavour-2.4.6-gcc41.patch
@@ -0,0 +1,16 @@
+diff -ur endeavour-2.4.6-orig/endeavour2/disk.cpp endeavour-2.4.6/endeavour2/disk.cpp
+--- endeavour-2.4.6-orig/endeavour2/disk.cpp	2006-03-10 00:08:03.000000000 -0500
++++ endeavour-2.4.6/endeavour2/disk.cpp	2006-03-10 00:12:37.000000000 -0500
+@@ -130,12 +130,7 @@
+ 	if(path == NULL)
+ 	    return(0);
+ 
+-	// Dan S: typecast is due to const.
+-#if defined(__cplusplus) || defined(c_plusplus)
+-	while(ISBLANK(reinterpret_cast<char>(*path)))
+-#else
+ 	while(ISBLANK(*path))
+-#endif
+ 	    path++;
+ 
+ 	return(*path == DIR_DELIMINATOR);