Dual revision bumps; fix 2.10.0 patch and added a counterpart patch for 2.8.0 since it suffers from the same bug.

(Portage version: 2.0.51.20-r4)

8 files changed, 51 insertions, 38 deletions

diff --git a/dev-cpp/libxmlpp/ChangeLog b/dev-cpp/libxmlpp/ChangeLog
index 3d07d366b5df..d4481cad54e2 100644
--- a/dev-cpp/libxmlpp/ChangeLog
+++ b/dev-cpp/libxmlpp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-cpp/libxmlpp
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.22 2005/04/23 18:55:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.23 2005/04/27 11:50:46 ka0ttic Exp $
+
+*libxmlpp-2.10.0-r1 (27 Apr 2005)
+*libxmlpp-2.8.0-r1 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/libxmlpp-2.8.0-use-correct-callback.diff,
+  files/libxmlpp-2.10.0-use-correct-callback.diff, -libxmlpp-2.8.0.ebuild,
+  +libxmlpp-2.8.0-r1.ebuild, -libxmlpp-2.10.0.ebuild,
+  +libxmlpp-2.10.0-r1.ebuild:
+  Dual revision bumps; fix 2.10.0 patch and added a counterpart patch for
+  2.8.0 since it suffers from the same bug.
 
 *libxmlpp-2.10.0 (23 Apr 2005)
 
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 9e3aef6a9a7c..96a0af3055e8 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,27 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 c49bb733760bca508cb930fd1ef9774d libxmlpp-1.0.4-r1.ebuild 921
 MD5 9efdd4c9885894848e8dad5b9faf3f3e libxmlpp-0.27.0.ebuild 891
-MD5 f5389c510e10078a182a63a7819ffba5 libxmlpp-2.10.0.ebuild 1336
-MD5 e66e0c2acc4d6b51574e21d54f0990a0 libxmlpp-2.8.0.ebuild 1067
+MD5 42b2caf65e697b85e856964267dff74b libxmlpp-2.8.0-r1.ebuild 1297
 MD5 0c85d8dbc1a8247d95f1a5cf8c1a03ae libxmlpp-1.0.2.ebuild 892
 MD5 0eac3e3a4bc15071dc0bfa30b34ee3d4 libxmlpp-1.0.4.ebuild 931
 MD5 97b0f837657bfdc8a8418843eea9fb3e libxmlpp-1.0.4-r2.ebuild 896
-MD5 b919e8bf23a1153b6fa53ecf82c73891 ChangeLog 3815
+MD5 fb07231f6ae825ad29b160a1d0f5c300 ChangeLog 4261
 MD5 09d3293038c3ef6ba2ff98ef6609680a metadata.xml 252
+MD5 f5389c510e10078a182a63a7819ffba5 libxmlpp-2.10.0-r1.ebuild 1336
 MD5 d8908feca35d34dbd88eab2dc2eaa621 files/digest-libxmlpp-1.0.2 67
 MD5 ddefcfb1e4627340a979fe347b62745e files/digest-libxmlpp-1.0.4 67
-MD5 5ec1396a583e911f6878f55a92c91d91 files/digest-libxmlpp-2.8.0 67
-MD5 d9277d80ab925401345d7435a42bc04c files/libxmlpp-2.10.0-use-correct-callback.diff 1081
+MD5 785183ae0a7196fc94879a9cfaa70d1a files/libxmlpp-2.10.0-use-correct-callback.diff 751
+MD5 125040d4312a3a7ab325bc5ea3b974f0 files/libxmlpp-2.8.0-use-correct-callback.diff 749
+MD5 5ec1396a583e911f6878f55a92c91d91 files/digest-libxmlpp-2.8.0-r1 67
 MD5 ababb33432c4d45282fa2fe2c0a2b0d5 files/digest-libxmlpp-0.27.0 67
-MD5 335a2cd8fe569196d631a0a54d8cac32 files/digest-libxmlpp-2.10.0 68
 MD5 ddefcfb1e4627340a979fe347b62745e files/digest-libxmlpp-1.0.4-r1 67
 MD5 ddefcfb1e4627340a979fe347b62745e files/digest-libxmlpp-1.0.4-r2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCapooEZCkKN40op4RAo9hAJ4ka/bktwdsD5DA9jBXtvuAnatvqgCgwUYD
-QV4pPazr0bRaHNu9ybWcfbU=
-=yjIF
------END PGP SIGNATURE-----
+MD5 335a2cd8fe569196d631a0a54d8cac32 files/digest-libxmlpp-2.10.0-r1 68
diff --git a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0 b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0-r1
index 327819b1aa71..327819b1aa71 100644
--- a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0
+++ b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0-r1
diff --git a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0 b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0-r1
index 3a1250698921..3a1250698921 100644
--- a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0
+++ b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.8.0-r1
diff --git a/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff b/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
index 546074de7787..a6c2f41c06c4 100644
--- a/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
+++ b/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
@@ -1,23 +1,12 @@
-diff --exclude='*~' -ur libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc libxml++-2.10.0/libxml++/parsers/saxparser.cc
---- libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc	2005-04-23 07:54:18.000000000 -0400
-+++ libxml++-2.10.0/libxml++/parsers/saxparser.cc	2005-04-23 11:41:52.000000000 -0400
-@@ -395,10 +395,15 @@
+diff --exclude='*~' -urN libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc libxml++-2.10.0/libxml++/parsers/saxparser.cc
+--- libxml++-2.10.0.orig/libxml++/parsers/saxparser.cc	2005-04-27 03:52:24.000000000 -0400
++++ libxml++-2.10.0/libxml++/parsers/saxparser.cc	2005-04-27 03:53:23.000000000 -0400
+@@ -395,7 +395,7 @@
      // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end )
      // instead of Glib::ustring::ustring( const char*, size_type ) because it
      // expects the length of the string in characters, not in bytes.
 -    parser->on_cdata_block(
--        Glib::ustring(
-+    Glib::ustring s(
++    parser->on_characters(
+         Glib::ustring(
            reinterpret_cast<const char *>(ch),
--          reinterpret_cast<const char *>(ch + len) ) );
-+          reinterpret_cast<const char *>(ch + len) );
-+    
-+    if (s.substr(0, 5) == "Diego")
-+	std::cout << "ch = '" << ch+len << "'" << std::endl
-+		  << "s = '"  << s      << "'" << std::endl;
-+    
-+    parser->on_characters(s);
-   }
-   catch(const exception& e)
-   {
-Only in libxml++-2.10.0/libxml++/parsers: .saxparser.cc.swp
+           reinterpret_cast<const char *>(ch + len) ) );
diff --git a/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff b/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff
new file mode 100644
index 000000000000..4a75ae040c17
--- /dev/null
+++ b/dev-cpp/libxmlpp/files/libxmlpp-2.8.0-use-correct-callback.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' -urN libxml++-2.8.0.orig/libxml++/parsers/saxparser.cc libxml++-2.8.0/libxml++/parsers/saxparser.cc
+--- libxml++-2.8.0.orig/libxml++/parsers/saxparser.cc	2005-04-27 03:57:31.000000000 -0400
++++ libxml++-2.8.0/libxml++/parsers/saxparser.cc	2005-04-27 03:57:52.000000000 -0400
+@@ -390,7 +390,7 @@
+     // Here we force the use of Glib::ustring::ustring( InputIterator begin, InputIterator end )
+     // instead of Glib::ustring::ustring( const char*, size_type ) because it
+     // waits for the length of the string in characters, not in bytes.
+-    parser->on_cdata_block(
++    parser->on_characters(
+         Glib::ustring(
+           reinterpret_cast<const char *>(ch),
+           reinterpret_cast<const char *>(ch + len) ) );
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.10.0-r1.ebuild
index cb12288fe355..423b140d6f99 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.10.0-r1.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/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild,v 1.1 2005/04/23 18:55:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.10.0-r1.ebuild,v 1.1 2005/04/27 11:50:46 ka0ttic Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.8.0-r1.ebuild
index ff971b0f4ecf..6b1ceaa7ec12 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.8.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild,v 1.4 2005/04/23 18:55:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.8.0-r1.ebuild,v 1.1 2005/04/27 11:50:46 ka0ttic Exp $
 
-inherit gnome2 multilib
+inherit gnome2 eutils
 
 MY_PN="${PN/pp/++}"
 MY_P="${MY_PN}-${PV}"
@@ -27,6 +27,16 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 DOCS="AUTHORS ChangeLog NEWS README*"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-use-correct-callback.diff
+
+	# don't waste time building the examples
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || \
+		die "sed Makefile.in failed"
+}
+
 src_compile() {
 	gnome2_src_compile
 	if use doc ; then