Fix building with gcc4 (namespace collide with libxml2).

Package-Manager: portage-2.0.51.20-r4

4 files changed, 71 insertions, 6 deletions

diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog
index 33539b4dfd33..4b032b922c1f 100644
--- a/app-text/wv/ChangeLog
+++ b/app-text/wv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/wv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.24 2005/01/01 16:42:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.25 2005/04/26 09:14:49 azarah Exp $
+
+  26 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/wv-1.0.3-gcc4.patch, wv-1.0.3.ebuild:
+  Fix building with gcc4 (namespace collide with libxml2).
 
 *wv-1.0.3 (01 Dec 2004)
 
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 32c3d08f72de..3f72db1a3659 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,7 +1,18 @@
-MD5 83de0fde384a71d8e902e51d1b74ae6f ChangeLog 2560
-MD5 41c6e482d841b82e864fe4d3e5f4b0cf wv-1.0.3.ebuild 1006
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2a1f4f0053f65564cdaaafaf9c71b8d2 ChangeLog 2715
+MD5 4e910ed161d84f6c609edce01a082529 wv-1.0.3.ebuild 1140
 MD5 525c7299058f839eff524bc25c39267e metadata.xml 345
 MD5 6335e6111535a1ebd438e329cee9694e wv-1.0.0-r1.ebuild 1052
-MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
-MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
+MD5 a1897cf5f55250ffef22b746b2b277f7 files/wv-1.0.3-gcc4.patch 1131
 MD5 79e495e6bfc4b192499c4d28f631ea01 files/digest-wv-1.0.3 60
+MD5 97079efa2a5256ad07ada6260b7ec298 files/digest-wv-1.0.0-r1 60
+MD5 29b026d4ff443552a80797b397d37ec6 files/wv-1.0.0-fix_overflow.patch 1693
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbgeV1ZcsMnZjRyIRAofhAKCKR5gJNz9b2+Jke9zleONkqxBYxgCdF3zQ
+AnFnFEmNOFnhMSi1yn+yQw0=
+=DZYn
+-----END PGP SIGNATURE-----
diff --git a/app-text/wv/files/wv-1.0.3-gcc4.patch b/app-text/wv/files/wv-1.0.3-gcc4.patch
new file mode 100644
index 000000000000..829212f971fb
--- /dev/null
+++ b/app-text/wv/files/wv-1.0.3-gcc4.patch
@@ -0,0 +1,40 @@
+--- wv-1.0.3/wvConfig.c
++++ wv-1.0.3.az/wvConfig.c	2005-04-26 08:59:26.000000000 +0000
+@@ -2130,7 +2130,7 @@
+ }
+ 
+ static void
+-startElement (void *userData, const XML_Char *name, const XML_Char **atts)
++_startElement (void *userData, const XML_Char *name, const XML_Char **atts)
+ {
+     unsigned int nAtts = 0;
+     const XML_Char **p;
+@@ -3094,7 +3094,7 @@
+ }
+ 
+ static void
+-endElement (void *userData, const XML_Char *name)
++_endElement (void *userData, const XML_Char *name)
+ {
+     state_data *mydata = (state_data *) userData;
+     unsigned int token_type;
+@@ -3470,8 +3470,8 @@
+ 	memset(&hdl, 0, sizeof(hdl));
+ 
+ 	hdl.getEntity = _getEntity;
+-	hdl.startElement = startElement;
+-	hdl.endElement = endElement;
++	hdl.startElement = _startElement;
++	hdl.endElement = _endElement;
+ 	hdl.characters = charData;
+ 
+ 	if (myhandle->fp)
+@@ -3514,7 +3514,7 @@
+     size_t len;
+ 
+     XML_SetUserData (parser, myhandle);
+-    XML_SetElementHandler (parser, startElement, endElement);
++    XML_SetElementHandler (parser, _startElement, _endElement);
+     XML_SetCharacterDataHandler (parser, charData);
+ 
+     if (myhandle->fp == NULL)
diff --git a/app-text/wv/wv-1.0.3.ebuild b/app-text/wv/wv-1.0.3.ebuild
index 011c87cfa47d..453722cae36d 100644
--- a/app-text/wv/wv-1.0.3.ebuild
+++ b/app-text/wv/wv-1.0.3.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/app-text/wv/wv-1.0.3.ebuild,v 1.2 2005/01/01 16:42:22 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.3.ebuild,v 1.3 2005/04/26 09:14:49 azarah Exp $
 
 inherit eutils
 
@@ -22,6 +22,16 @@ RDEPEND="sys-libs/zlib
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# Fix building with gcc4 (namespace collide with libxml2)
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+}
+
 src_compile() {
 
 	econf \