Fix building with GCC 4.5+ wrt #317815 byy Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 28 insertions, 26 deletions

diff --git a/www-client/w3mmee/ChangeLog b/www-client/w3mmee/ChangeLog
index c5746ddd03f9..81bcb3f36802 100644
--- a/www-client/w3mmee/ChangeLog
+++ b/www-client/w3mmee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/w3mmee
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.11 2010/01/26 15:48:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/ChangeLog,v 1.12 2010/06/23 19:46:02 ssuominen Exp $
+
+  23 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/w3mmee-gcc45.patch, w3mmee-0.3.2_p24-r6.ebuild:
+  Fix building with GCC 4.5+ wrt #317815 byy Kacper Kowalik.
 
   26 Jan 2010; MATSUU Takuto <matsuu@gentoo.org>
   -w3mmee-0.3.2_p24-r4.ebuild, -w3mmee-0.3.2_p24-r5.ebuild:
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest
index f2c0156a38d5..d4653b2799f4 100644
--- a/www-client/w3mmee/Manifest
+++ b/www-client/w3mmee/Manifest
@@ -1,26 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX w3mmee-gcc44.patch 377 RMD160 aea8f3af554e899a4e14c4b00bf866e987ce407a SHA1 f5994a483c24a7ea136d4f78d9f4d26859218d26 SHA256 0673e512ab07b8cd2d2034a73cea48f440ab3b92423432d9684b9a5167b581fd
+AUX w3mmee-gcc45.patch 406 RMD160 901fe542e3ac5ed1903f8cb20f908ebe70b23d4a SHA1 fc3950f4ab50d1d465c746cc6550d054dc54d68b SHA256 67b57db72ba9d69e02e86521495c5550b4e1bd14c18ebfc5e42e5e7797435406
 AUX w3mmee-w3mman-gentoo.diff 1037 RMD160 4393faa68061e1aace2472e3930c0e9fafdd5684 SHA1 8ff4f4eee818428198a27970c232763173d4b678 SHA256 fbba900cebcca79a7f7e2323e104a1d411bdc19cab80c273b98c3906a1053295
 DIST w3mmee-p24-22.tar.gz 690094 RMD160 a93c2e5a8f55a4defadc5ea669e584e4a8a16b98 SHA1 98efee2d4b18293873723f10b84eb5cd7f9d1086 SHA256 1a905a30786568a2c607fd296ea7c13a03c6930d4b9fcb3d0e084c71e30aa665
-EBUILD w3mmee-0.3.2_p24-r6.ebuild 3596 RMD160 930c296b2582b2f7ded8402fa9b0db97e2007303 SHA1 c4b17be836fa7a723bfe0c338cf436ad68917ca3 SHA256 87049f92c24d1026699ca34f78d87f81111a605cf5c218f936e2eb4efd29e603
-MISC ChangeLog 3945 RMD160 5debe4d53d386fa5bb504da12596aac7d43bc29f SHA1 cf69c97da0dc090576dd8f473bac77486fbd8181 SHA256 e45115c2309d5d3f3fc3a4baf11de19c75f6f8a5ba54063adc5b3a45877757de
+EBUILD w3mmee-0.3.2_p24-r6.ebuild 3600 RMD160 387edb051b28b6126ea37d60b6d233284f99cb70 SHA1 61648714cb66b0e0d0f602aaacc5337e99f9b09c SHA256 8cedf98ef4363090f5f19a023cf6c86a2c971cab4438c4cc23b5954ffce4f4b7
+MISC ChangeLog 4121 RMD160 37e9c84bd0523643f2cada200ef056b3ee37fee5 SHA1 4f3b76bd1e9aaa4e091caa07adb09caa12dc1594 SHA256 af1b2d2744b19af55f01830a730c13de70671969f992c6bb8e192b97ea528e4a
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAEBAgAGBQJLXw7QAAoJECaGw+YFKA1p/ZUQAJFOc9gWnOKGKhdMXuLWrRH5
-/900Y9Ih5dT+tJbodTDOAhTPW13e6zIZj5GVbbkR5lvHLH2idDai11HE9Xk1t3LA
-8l2sqiBCA/6AQ35fdTTfwdnWSYRitC653MYlRqzmt9Kee54y4J8XMVXhvR4ottI7
-3rbuwmn4PBjKlfCcq6R8zT7UC+Ak4IXtjfreIDRg+EJg1gVZQPup6jnW9a2EzdkS
-yecSy+mb7BKRD4AQFopwun5iASFIoIEoeQforVCfej3EGrVIqqXZbmmkITUoF1E5
-GnJG/qD91NdYur//lwwmJAtBPEMdyXlApULwYW59xxjdKF7tNUwRG0l0hwC5gPcw
-3TP7dGOmvnd905koKgKePI4RbkQ8WJTB4DJJPvz9/CXByXKaAUdbcmUmPCMbOE+l
-/qmV5vEhj+sfHJuARkhI7OjQp5LJw04mhmG0sqFw10fHNBypneuzzrZ77g/hr6Yu
-DNEiyMHNMG4bqRVuBJkdCRQ5JcxoU7egCW5C5i7tJ2ZL6ZRzZ8BmrPBgWqN0lRzD
-aaiAVaAvWlzKi1yabHoOKWubUmj6EsQ8JWGO9XyYshXEbKDMcDsH332AqXZ/pIs8
-iXx0uLDo8z39x3c7S9quCY7pxlKESV0nD4mXM1vO2sHyG/i/15wg2jKPCcxEmFew
-zit9luxxkL/QL99wwVgt
-=QcFQ
------END PGP SIGNATURE-----
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc45.patch
new file mode 100644
index 000000000000..db6f86e4deee
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-gcc45.patch
@@ -0,0 +1,17 @@
+Fixing build with gcc-4.5
+
+https://bugs.gentoo.org/show_bug.cgi?id=317815
+
+Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
+
+--- configure
++++ configure
+@@ -2636,7 +2636,7 @@
+ fi
+ 
+ cat >do_mk_btri.sh <<END_OF_DO_MK_BTRI
+-$dcpp "\$1" | sed -n "/^[ 	]*[\\"'%]/p" | $mk_btri_cmd
++$dcpp -P "\$1" | sed -n "/^[ 	]*[\\"'%]/p" | $mk_btri_cmd
+ END_OF_DO_MK_BTRI
+ 
+ cat >TABMakefile <<END_OF_TABMAKEFILE1
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
index 9b8c876eeb2c..7fe9ca3f8646 100644
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.7 2009/07/25 20:09:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3mmee/w3mmee-0.3.2_p24-r6.ebuild,v 1.8 2010/06/23 19:46:02 ssuominen Exp $
 
 inherit alternatives eutils
 
@@ -36,7 +36,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \
-		"${FILESDIR}"/${PN}-gcc44.patch
+		"${FILESDIR}"/${PN}-gcc4{4,5}.patch
 }
 
 src_compile() {