Add patch to fix entity encoding, upstream bug ID 3031828

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 90 insertions, 48 deletions

diff --git a/dev-libs/tinyxml/ChangeLog b/dev-libs/tinyxml/ChangeLog
index a71cec64a588..5594bdc13f2a 100644
--- a/dev-libs/tinyxml/ChangeLog
+++ b/dev-libs/tinyxml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/tinyxml
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.8 2011/02/11 18:43:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/ChangeLog,v 1.9 2011/03/28 09:58:18 voyageur Exp $
+
+*tinyxml-2.6.1-r1 (28 Mar 2011)
+
+  28 Mar 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -tinyxml-2.5.3_p20090813-r1.ebuild, +tinyxml-2.6.1-r1.ebuild,
+  +files/tinyxml-2.6.1-entity.patch, -files/Makefile:
+  Add patch to fix entity encoding, upstream bug ID 3031828
 
   11 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> tinyxml-2.6.1.ebuild:
   Marked ~ppc wrt #314833
diff --git a/dev-libs/tinyxml/Manifest b/dev-libs/tinyxml/Manifest
index fa02e6d59ea3..ca8d6c8ebac1 100644
--- a/dev-libs/tinyxml/Manifest
+++ b/dev-libs/tinyxml/Manifest
@@ -1,8 +1,7 @@
-AUX Makefile 718 RMD160 3e137e1cb125672bfb97c218f258a3f648baceec SHA1 b17343ad328f4a3b4784cd0ae7bb2505ae29a221 SHA256 003727c63b53a8d140cf4bf930e05c6e18e3dbe570b7a046c6848d973622fddf
 AUX Makefile-2 732 RMD160 9c39630188f0be3b05b785bd55f24e6b02b73fa3 SHA1 53745f72b49194b0b8f0e677026af26a0594c271 SHA256 2e4afa3b11bc44612a9586c345a21ac19eb04ec877cd1267fbd07dc2f9180880
-DIST tinyxml-2.5.3_p20090813.tar.bz2 208824 RMD160 ffb38f881f22e5db3a902b4fef3946dbdcfca147 SHA1 eddfaf34febd381ef242a2c36a1edc60e5de47ab SHA256 681cf5f6111703f9999acfd1b3641d56162771a230526aba8d9da5dcb4db5e99
+AUX tinyxml-2.6.1-entity.patch 1776 RMD160 495fa342f00616a96c0a5044d652aa94e34c4675 SHA1 402831d1fab0fe7cac7ad761b530a54c0cf9cb58 SHA256 ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b
 DIST tinyxml_2_6_1.tar.gz 212399 RMD160 faff2c67d945dc22a43562324a84213f364e37ae SHA1 2ff9c177a6c0bef10cbd27700b71826801c12987 SHA256 c9b85047fb3f5b86a0e313a4f2a21bdf7bdada32ba2df580cffb170029b27214
-EBUILD tinyxml-2.5.3_p20090813-r1.ebuild 1206 RMD160 2bae6e39be3598249188eb510433f36a3caf45a7 SHA1 14ef0409fb13c7d79a1ffcddfda2377ebbfe1cad SHA256 981c24d051b0c0ee824a4f5a5c9d189936acc3b24e7f229ca3235fcc5b50275d
+EBUILD tinyxml-2.6.1-r1.ebuild 1348 RMD160 cec3c3d74f78319ce8cbd1f368816dadc1465859 SHA1 bfd4ab8d84b04655a4676370abda6885831def03 SHA256 229f7d9f69bf5d07d866402aa27c9e6cd35fee2400bf9b6b27e2f9398a0eed13
 EBUILD tinyxml-2.6.1.ebuild 1307 RMD160 67a92522a649764b6daab268e2e98985ff6a493b SHA1 098ec79902ae4f67584c9e3389e4d5c3c95063e8 SHA256 1c0a0349f0ff0705a7e3b0600bb1c4a1853452792060b8894c64570eaa1dd55a
-MISC ChangeLog 1463 RMD160 19500971d1200e5e8f5ce604e74238a702fdf614 SHA1 23b6ec37568e45e54d2614e590b40dbfb49e6de9 SHA256 be152843e6e4f6489782f9db0ece92348ce7052f46426ffeb7a96c4af8a34dfd
+MISC ChangeLog 1728 RMD160 218a51b5f0e63ed32ad1998ad1b1a030a9e43069 SHA1 b0a830751f5b9ca0db39b2469288b36728685394 SHA256 450149849138f46d17720ca356b2ecfcae0a4d66e0988f63077d2833473ae132
 MISC metadata.xml 345 RMD160 0865f4a9ba345d5c6e8fe3283243ee79e58e11c7 SHA1 ababc96e2c43928dc4ad1dc2fca8fdc53f17749c SHA256 45c04600572d2ed744d6de3f9d8ce142da264912027614ed82da25de0ac92900
diff --git a/dev-libs/tinyxml/files/Makefile b/dev-libs/tinyxml/files/Makefile
deleted file mode 100644
index 1db0244525cb..000000000000
--- a/dev-libs/tinyxml/files/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-AR ?= ar
-CXX ?= g++
-CXXFLAGS += -Wall
-RANLIB ?= ranlib
-
-name = libtinyxml
-major = 0
-minor = 0.0
-version = $(major).$(minor)
-
-src = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp
-lo = $(addsuffix .lo,$(basename ${src}))
-o = $(addsuffix .o,$(basename ${src}))
-
-all: $(name).a $(name).so
-
-%.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $< -o $@
-
-$(name).a: $(o)
-	$(AR) rc $(name).a $(o)
-	$(RANLIB) $(name).a
-
-%.lo: %.cpp
-	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@
-
-$(name).so: $(lo)
-	$(CXX) $(LDFLAGS) -fPIC -shared $(lo) -Wl,-soname,$(name).so.$(major) -o $(name).so.$(version)
-	ln -s $(name).so.$(version) $(name).so.$(major)
-	ln -s $(name).so.$(version) $(name).so
-
-clean:
-	-rm -f *.o *.lo *.so* *.a
diff --git a/dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch b/dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch
new file mode 100644
index 000000000000..66d89a61743d
--- /dev/null
+++ b/dev-libs/tinyxml/files/tinyxml-2.6.1-entity.patch
@@ -0,0 +1,64 @@
+? entity.patch
+Index: tinyxml.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
+retrieving revision 1.105
+diff -u -r1.105 tinyxml.cpp
+--- tinyxml.cpp	5 Jun 2010 19:06:57 -0000	1.105
++++ tinyxml.cpp	19 Jul 2010 21:24:16 -0000
+@@ -57,30 +57,7 @@
+ 	{
+ 		unsigned char c = (unsigned char) str[i];
+ 
+-		if (    c == '&' 
+-		     && i < ( (int)str.length() - 2 )
+-			 && str[i+1] == '#'
+-			 && str[i+2] == 'x' )
+-		{
+-			// Hexadecimal character reference.
+-			// Pass through unchanged.
+-			// &#xA9;	-- copyright symbol, for example.
+-			//
+-			// The -1 is a bug fix from Rob Laveaux. It keeps
+-			// an overflow from happening if there is no ';'.
+-			// There are actually 2 ways to exit this loop -
+-			// while fails (error case) and break (semicolon found).
+-			// However, there is no mechanism (currently) for
+-			// this function to return an error.
+-			while ( i<(int)str.length()-1 )
+-			{
+-				outString->append( str.c_str() + i, 1 );
+-				++i;
+-				if ( str[i] == ';' )
+-					break;
+-			}
+-		}
+-		else if ( c == '&' )
++		if ( c == '&' )
+ 		{
+ 			outString->append( entity[0].str, entity[0].strLength );
+ 			++i;
+Index: xmltest.cpp
+===================================================================
+RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
+retrieving revision 1.89
+diff -u -r1.89 xmltest.cpp
+--- xmltest.cpp	5 Jun 2010 17:41:52 -0000	1.89
++++ xmltest.cpp	19 Jul 2010 21:24:16 -0000
+@@ -1340,6 +1340,16 @@
+ 		}*/
+ 	}
+ 
++	#ifdef TIXML_USE_STL
++	{
++		TiXmlDocument xml;
++		xml.Parse("<foo>foo&amp;#xa+bar</foo>");
++		std::string str;
++		str << xml;
++		XmlTest( "Entity escaping", "<foo>foo&amp;#xa+bar</foo>", str.c_str() );
++	}
++	#endif
++
+ 	/*  1417717 experiment
+ 	{
+ 		TiXmlDocument xml;
diff --git a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild b/dev-libs/tinyxml/tinyxml-2.6.1-r1.ebuild
index d19d65867bee..b0ba1362e30b 100644
--- a/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild
+++ b/dev-libs/tinyxml/tinyxml-2.6.1-r1.ebuild
@@ -1,24 +1,34 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.5.3_p20090813-r1.ebuild,v 1.2 2010/06/05 14:56:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/tinyxml/tinyxml-2.6.1-r1.ebuild,v 1.1 2011/03/28 09:58:18 voyageur Exp $
 
 EAPI=2
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="a simple, small, C++ XML parser that can be easily integrating into other programs"
 HOMEPAGE="http://www.grinninglizard.com/tinyxml/index.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV//./_}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug doc stl"
 
 RDEPEND=""
 DEPEND="doc? ( app-doc/doxygen )"
 
+S="${WORKDIR}/${PN}"
+
 src_prepare() {
-	cp -f "${FILESDIR}"/Makefile . || die
+	local major_v minor_v
+	major_v=$(echo ${PV} | cut -d \. -f 1)
+	minor_v=$(echo ${PV} | cut -d \. -f 2-3)
+
+	sed -e "s:@MAJOR_V@:$major_v:" \
+	    -e "s:@MINOR_V@:$minor_v:" \
+		"${FILESDIR}"/Makefile-2 > Makefile || die
+
+	epatch "${FILESDIR}"/${P}-entity.patch
 }
 
 src_compile() {
@@ -28,10 +38,6 @@ src_compile() {
 	tc-export AR CXX RANLIB
 
 	emake || die "emake failed"
-
-	if use doc; then
-		doxygen dox || die "doxygen failed"
-	fi
 }
 
 src_install() {
@@ -44,7 +50,6 @@ src_install() {
 	dodoc {changes,readme}.txt || die "dodoc failed"
 
 	if use doc; then
-		dodoc tutorial_gettingStarted.txt || die "dodoc failed"
 		dohtml -r docs/* || die "dohtml failed"
 	fi
 }