Fix building with newer gcc versions #202210 by Kevin Lacquement.

Package-Manager: portage-2.1.4_rc11

4 files changed, 48 insertions, 23 deletions

diff --git a/dev-util/webcpp/ChangeLog b/dev-util/webcpp/ChangeLog
index b6a2699bd9e2..1344dda8bee8 100644
--- a/dev-util/webcpp/ChangeLog
+++ b/dev-util/webcpp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/webcpp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/webcpp/ChangeLog,v 1.12 2007/07/15 08:29:15 phreak Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/webcpp/ChangeLog,v 1.13 2007/12/30 18:13:21 vapier Exp $
+
+  30 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/webcpp-0.8.4-gcc.patch, webcpp-0.8.4.ebuild:
+  Fix building with newer gcc versions #202210 by Kevin Lacquement.
 
   15 Jul 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Assigning dev-util/webcpp to m-needed, as beu is being retired (#66608).
diff --git a/dev-util/webcpp/Manifest b/dev-util/webcpp/Manifest
index 321c73ec8d49..73e995b9bd0e 100644
--- a/dev-util/webcpp/Manifest
+++ b/dev-util/webcpp/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX webcpp-0.8.4-gcc.patch 360 RMD160 0c3491e8fa63a0b45bb4a49d2e8378710699ae68 SHA1 ee13665b319f5d5b635dbdfe14e86b782a62b575 SHA256 08d06e01048fdd577eff67f2cc6653eedb0d038e0de68d6555bacd772edc96c2
+MD5 ee6d355f45cb33d8400b2f131e2cd16e files/webcpp-0.8.4-gcc.patch 360
+RMD160 0c3491e8fa63a0b45bb4a49d2e8378710699ae68 files/webcpp-0.8.4-gcc.patch 360
+SHA256 08d06e01048fdd577eff67f2cc6653eedb0d038e0de68d6555bacd772edc96c2 files/webcpp-0.8.4-gcc.patch 360
 DIST webcpp-0.8.2-src.tar.gz 429355 RMD160 cae8b1c9cea8ccb6e07cadd9d70ca09aa878d61b SHA1 5267ff3b6f36c65d52eda2cb72e134b420d28a49 SHA256 d265faa0f02dc0958b438b72f022e11b021df03db5983768ab4f6fc944613406
 DIST webcpp-0.8.4-src.tar.gz 430757 RMD160 b6e854a7344a68937cb17b0deb3b0309cd2d45a4 SHA1 8701a772c0a3005268d9e11bc6c272b572009836 SHA256 f6cdb047d36a24a4d0e2aad8c54f45c78ad5058a756d86a358a00fec24a91275
 EBUILD webcpp-0.8.2.ebuild 742 RMD160 5acd15cb19d0b0f5a27f388a31f69b04590a8783 SHA1 cf6498372573936a4018102dbe69abf000fb9818 SHA256 cd76a51bc7eb3f44eec226720e8f51fc9c9bd5fc5ed95b1bccaa8429cab6be74
 MD5 80dd47fc9fa9ad0898893868e4846a6d webcpp-0.8.2.ebuild 742
 RMD160 5acd15cb19d0b0f5a27f388a31f69b04590a8783 webcpp-0.8.2.ebuild 742
 SHA256 cd76a51bc7eb3f44eec226720e8f51fc9c9bd5fc5ed95b1bccaa8429cab6be74 webcpp-0.8.2.ebuild 742
-EBUILD webcpp-0.8.4.ebuild 752 RMD160 b5a784001af052fba63038d1b298a869d0308bfa SHA1 c9e38d30a4caad657ce62ab8cac7bc8d8e7d2640 SHA256 42043a61b4d7424d353cad22c1f4ad96ac6e2c73613bf35b28de68b8959a5f49
-MD5 27e40921eefcc8352dfda98adb3a5221 webcpp-0.8.4.ebuild 752
-RMD160 b5a784001af052fba63038d1b298a869d0308bfa webcpp-0.8.4.ebuild 752
-SHA256 42043a61b4d7424d353cad22c1f4ad96ac6e2c73613bf35b28de68b8959a5f49 webcpp-0.8.4.ebuild 752
-MISC ChangeLog 2403 RMD160 1b56376d0e5a678ff11bb1ef16dc2e450e6114c3 SHA1 4decacb94a6e540a3e5e956dadfa408644515f0f SHA256 61d6d9136343c7b5e5c6971b47b6225daca3bc35b44badf18b4f199f9769beea
-MD5 a83d669e2010d033245f7ddfeed2a6df ChangeLog 2403
-RMD160 1b56376d0e5a678ff11bb1ef16dc2e450e6114c3 ChangeLog 2403
-SHA256 61d6d9136343c7b5e5c6971b47b6225daca3bc35b44badf18b4f199f9769beea ChangeLog 2403
+EBUILD webcpp-0.8.4.ebuild 787 RMD160 dc0f970ea878927741a1d6d0c0f1eba10682d378 SHA1 9fad328da0c91f8a4212db0b06b1049a98d04227 SHA256 59cd21f12a3f9d51b6dbe6dc814bf79905c0742e2c98bb9b767c5dbb021349a7
+MD5 fab535dc0dc58b89faea185472d18197 webcpp-0.8.4.ebuild 787
+RMD160 dc0f970ea878927741a1d6d0c0f1eba10682d378 webcpp-0.8.4.ebuild 787
+SHA256 59cd21f12a3f9d51b6dbe6dc814bf79905c0742e2c98bb9b767c5dbb021349a7 webcpp-0.8.4.ebuild 787
+MISC ChangeLog 2576 RMD160 8f319f533b0d966f4aa6c698554537bdb28168fe SHA1 38a8845a0e3f3c002e632b056cbf4c9d9f30b01e SHA256 4e5cfe0f0acc12eded61ff22b2d6f8ee613e21e15fc16c53bea422350672a4b0
+MD5 71101fc3f54fc52c8840dd2acc8b5d0b ChangeLog 2576
+RMD160 8f319f533b0d966f4aa6c698554537bdb28168fe ChangeLog 2576
+SHA256 4e5cfe0f0acc12eded61ff22b2d6f8ee613e21e15fc16c53bea422350672a4b0 ChangeLog 2576
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -26,9 +30,9 @@ MD5 f5263d6a972c3fb907d087250fe382b0 files/digest-webcpp-0.8.4 250
 RMD160 b9480ce6c56c4265ad9924ad1863886423a7da39 files/digest-webcpp-0.8.4 250
 SHA256 354343518f692ed3379b375c97b65bfd1900035cc7d570a97eb03c6000ae3e09 files/digest-webcpp-0.8.4 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFGmdrjyuNVb5qfaOYRAv4ZAJwNRsH9jgGdzfWnsFFl2vy2qutyjACfXW7i
-JGcro37sLsim7nIE6d44JCw=
-=36IU
+iEYEARECAAYFAkd338cACgkQj9hvisErhMITgACcC100VYLqjPp09h++S6NkOH0y
+HF0AnAjZvDDIQ+jCRRp3I8r5xUz84SMH
+=wfJu
 -----END PGP SIGNATURE-----
diff --git a/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch b/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch
new file mode 100644
index 000000000000..b7c0cbe4886b
--- /dev/null
+++ b/dev-util/webcpp/files/webcpp-0.8.4-gcc.patch
@@ -0,0 +1,15 @@
+scrub stray \
+
+http://bugs.gentoo.org/202210
+
+--- webcpp/engine.cpp
++++ webcpp/engine.cpp
+@@ -1005,7 +1005,7 @@
+ </tr><tr><td colspan=6>\n\
+ <a href=\"http://webcpp.sf.net\"><center><b>\
+ <font color=#ffffff>web c plus plus</font></b></center>\n\
+-</a></td></tr>\n\</table>\n<br>\n</center>";
++</a></td></tr>\n</table>\n<br>\n</center>";
+ 
+ 		*IO << made;
+ 	}
diff --git a/dev-util/webcpp/webcpp-0.8.4.ebuild b/dev-util/webcpp/webcpp-0.8.4.ebuild
index df31779c758e..15d4128f3294 100644
--- a/dev-util/webcpp/webcpp-0.8.4.ebuild
+++ b/dev-util/webcpp/webcpp-0.8.4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/webcpp/webcpp-0.8.4.ebuild,v 1.5 2006/12/11 07:43:29 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/webcpp/webcpp-0.8.4.ebuild,v 1.6 2007/12/30 18:13:21 vapier Exp $
 
-inherit toolchain-funcs
+inherit eutils
 
-S=${WORKDIR}/${P}-src
 DESCRIPTION="converts source code into HTML file using a customizable syntax highlighting engine and colour schemes"
 HOMEPAGE="http://webcpp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/webcpp/${P}-src.tar.gz"
@@ -14,13 +13,16 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""
 
-pkg_setup() {
-	[ `gcc-major-version` -eq 2 ] \
-		&& die "WebCPP only works with gcc-3.x" \
-		|| return 0
+S=${WORKDIR}/${P}-src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
 }
 
 src_install() {
-	einstall || die
+	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS CREDITS ChangeLog README TODO
+	fperms a+x /usr/bin/webc++ /usr/bin/scs2scs2.pl
 }