Version bump for bug 89694; added dosed to all src_installs correcting cflags in pkgconfig file for bug 83794.

(Portage version: 2.0.51.20)

12 files changed, 137 insertions, 57 deletions

diff --git a/dev-cpp/libxmlpp/ChangeLog b/dev-cpp/libxmlpp/ChangeLog
index 5bf0a50a0bda..3d07d366b5df 100644
--- a/dev-cpp/libxmlpp/ChangeLog
+++ b/dev-cpp/libxmlpp/ChangeLog
@@ -1,6 +1,16 @@
 # 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.21 2005/04/01 17:15:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/ChangeLog,v 1.22 2005/04/23 18:55:09 ka0ttic Exp $
+
+*libxmlpp-2.10.0 (23 Apr 2005)
+
+  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/libxmlpp-1.0.4-pc.patch,
+  +files/libxmlpp-2.10.0-use-correct-callback.diff, metadata.xml,
+  libxmlpp-1.0.2.ebuild, libxmlpp-1.0.4.ebuild, libxmlpp-1.0.4-r1.ebuild,
+  libxmlpp-1.0.4-r2.ebuild, libxmlpp-2.8.0.ebuild, +libxmlpp-2.10.0.ebuild:
+  Version bump for bug 89694; added dosed to all src_installs correcting
+  cflags in pkgconfig file for bug 83794.
 
   01 Apr 2005; Simon Stelling <blubb@gentoo.org> libxmlpp-1.0.4-r2.ebuild:
   stable on amd64
diff --git a/dev-cpp/libxmlpp/Manifest b/dev-cpp/libxmlpp/Manifest
index 99acef22ace5..77f3129e87f7 100644
--- a/dev-cpp/libxmlpp/Manifest
+++ b/dev-cpp/libxmlpp/Manifest
@@ -1,15 +1,17 @@
-MD5 80639963a89fd3388ea240d813261be7 ChangeLog 3366
+MD5 80eb9caa9b019384bc70deeb9258c230 libxmlpp-1.0.4-r1.ebuild 917
 MD5 9efdd4c9885894848e8dad5b9faf3f3e libxmlpp-0.27.0.ebuild 891
-MD5 36d14f254de09f7793e51b0e7cd0c106 libxmlpp-1.0.2.ebuild 793
-MD5 3a34b08ae9efb1eb05e9e8cd7f44a13a libxmlpp-1.0.4-r1.ebuild 819
-MD5 fc3ec40507c595075023995fb81c02e6 libxmlpp-1.0.4-r2.ebuild 1090
-MD5 f70948b98f74dfaccd385cbb233e6976 libxmlpp-1.0.4.ebuild 834
-MD5 a2eb0b7f9203d156b9be90d1d76006dd libxmlpp-2.8.0.ebuild 934
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ababb33432c4d45282fa2fe2c0a2b0d5 files/digest-libxmlpp-0.27.0 67
+MD5 8d794d8d712da19494459c905c584997 libxmlpp-2.10.0.ebuild 1332
+MD5 c4567440a37aaa8573d4d0f3c80cb6e5 libxmlpp-2.8.0.ebuild 1064
+MD5 d6c97d8acd3a60f4ebbac72fe8d378e5 libxmlpp-1.0.2.ebuild 895
+MD5 d377a7d1d31a179ff2090fad47ead668 libxmlpp-1.0.4.ebuild 932
+MD5 576cfe2684c11b07bf3697c22043817f libxmlpp-1.0.4-r2.ebuild 894
+MD5 96ae89861e136615aa8a2810206ebdb1 ChangeLog 3813
+MD5 09d3293038c3ef6ba2ff98ef6609680a metadata.xml 252
 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 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
-MD5 5ec1396a583e911f6878f55a92c91d91 files/digest-libxmlpp-2.8.0 67
-MD5 3613654253f7d7d7c754425e25a51f65 files/libxmlpp-1.0.4-pc.patch 324
diff --git a/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0 b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0
new file mode 100644
index 000000000000..327819b1aa71
--- /dev/null
+++ b/dev-cpp/libxmlpp/files/digest-libxmlpp-2.10.0
@@ -0,0 +1 @@
+MD5 1494b12a2cf5e337d7717af4557a7711 libxml++-2.10.0.tar.bz2 658315
diff --git a/dev-cpp/libxmlpp/files/libxmlpp-1.0.4-pc.patch b/dev-cpp/libxmlpp/files/libxmlpp-1.0.4-pc.patch
deleted file mode 100644
index 6314ba088448..000000000000
--- a/dev-cpp/libxmlpp/files/libxmlpp-1.0.4-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libxml++-1.0.pc.in.orig	2005-03-07 00:44:23.000000000 -0500
-+++ libxml++-1.0.pc.in	2005-03-07 00:44:37.000000000 -0500
-@@ -8,5 +8,5 @@
- Requires: libxml-2.0
- Version: @VERSION@
- Libs: -L${libdir} -lxml++-1.0
--Cflags: -I${includedir}/libxml++-1.0 -I${libdir}/libxml++-1.0/include
-+Cflags: -I${includedir}/libxml++-1.0
- 
-
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
new file mode 100644
index 000000000000..546074de7787
--- /dev/null
+++ b/dev-cpp/libxmlpp/files/libxmlpp-2.10.0-use-correct-callback.diff
@@ -0,0 +1,23 @@
+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 @@
+     // 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(
+           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
diff --git a/dev-cpp/libxmlpp/libxmlpp-1.0.2.ebuild b/dev-cpp/libxmlpp/libxmlpp-1.0.2.ebuild
index 245274f616f5..440d9ed4c281 100644
--- a/dev-cpp/libxmlpp/libxmlpp-1.0.2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-1.0.2.ebuild
@@ -1,12 +1,12 @@
 # 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-1.0.2.ebuild,v 1.6 2005/01/01 17:29:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-1.0.2.ebuild,v 1.7 2005/04/23 18:55:09 ka0ttic Exp $
 
 IUSE=""
 
-inherit libtool
+inherit libtool multilib
 
-MY_P=${P/pp/++}
+MY_P="${P/pp/++}"
 
 DESCRIPTION="C++ wrapper for the libxml XML parser library"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~ppc sparc x86"
 
 DEPEND=">=dev-libs/libxml2-2.5.8"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_compile() {
@@ -29,5 +29,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "Install failed"
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_P%.*}.pc
 	dodoc AUTHORS ChangeLog NEWS README*
 }
diff --git a/dev-cpp/libxmlpp/libxmlpp-1.0.4-r1.ebuild b/dev-cpp/libxmlpp/libxmlpp-1.0.4-r1.ebuild
index 29f5906b292e..6c34a27219cd 100644
--- a/dev-cpp/libxmlpp/libxmlpp-1.0.4-r1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-1.0.4-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-1.0.4-r1.ebuild,v 1.1 2005/03/08 04:52:40 jnc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-1.0.4-r1.ebuild,v 1.2 2005/04/23 18:55:09 ka0ttic Exp $
 
 IUSE=""
 
-inherit libtool
+inherit libtool multilib
 
 MY_P=${P/pp/++}
 
@@ -31,5 +31,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "Install failed"
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_P%.*}.pc
 	dodoc AUTHORS ChangeLog NEWS README*
 }
diff --git a/dev-cpp/libxmlpp/libxmlpp-1.0.4-r2.ebuild b/dev-cpp/libxmlpp/libxmlpp-1.0.4-r2.ebuild
index 12fd0bc69e1b..fa8793efb224 100644
--- a/dev-cpp/libxmlpp/libxmlpp-1.0.4-r2.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-1.0.4-r2.ebuild
@@ -1,13 +1,10 @@
 # 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-1.0.4-r2.ebuild,v 1.2 2005/04/01 17:15:54 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-1.0.4-r2.ebuild,v 1.3 2005/04/23 18:55:09 ka0ttic Exp $
 
-IUSE=""
-
-inherit libtool eutils
-
-MY_P=${P/pp/++}
+inherit libtool multilib
 
+MY_P="${P/pp/++}"
 DESCRIPTION="C++ wrapper for the libxml XML parser library"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
 SRC_URI="mirror://gnome/sources/libxml++/${PV%.*}/${MY_P}.tar.bz2"
@@ -15,6 +12,7 @@ SRC_URI="mirror://gnome/sources/libxml++/${PV%.*}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.5.8
 		>=sys-devel/automake-1.7
@@ -23,22 +21,12 @@ RDEPEND=">=dev-libs/libxml2-2.5.8
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 MAKEOPTS="${MAKEOPTS} -j1"
 
-src_unpack() {
-	export WANT_AUTOCONF=2.5
-	export WANT_AUTOMAKE=1.7
-	unpack "${A}"
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-pc.patch		# closes Bug 83794
-	aclocal && autoconf && automake -a && \
-		libtoolize --force --copy || die
-	econf || die "Configure failed."
-	emake || die "Make failed."
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die "Install failed"
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_P%.*}.pc
 	dodoc AUTHORS ChangeLog NEWS README*
 }
diff --git a/dev-cpp/libxmlpp/libxmlpp-1.0.4.ebuild b/dev-cpp/libxmlpp/libxmlpp-1.0.4.ebuild
index 478ec64d51b0..381c25cbf019 100644
--- a/dev-cpp/libxmlpp/libxmlpp-1.0.4.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-1.0.4.ebuild
@@ -1,10 +1,10 @@
 # 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-1.0.4.ebuild,v 1.4 2005/03/05 17:28:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-1.0.4.ebuild,v 1.5 2005/04/23 18:55:09 ka0ttic Exp $
 
 IUSE=""
 
-inherit libtool
+inherit libtool multilib
 
 MY_P=${P/pp/++}
 
@@ -32,5 +32,7 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "Install failed"
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_P%.*}.pc
 	dodoc AUTHORS ChangeLog NEWS README*
 }
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild
new file mode 100644
index 000000000000..cb12288fe355
--- /dev/null
+++ b/dev-cpp/libxmlpp/libxmlpp-2.10.0.ebuild
@@ -0,0 +1,55 @@
+# 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 $
+
+inherit gnome2 eutils
+
+MY_PN="${PN/pp/++}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="C++ wrapper for the libxml XML parser library"
+HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
+SRC_URI="mirror://gnome/sources/libxml++/${PV%.*}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="2.6"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/libxml2-2.6.1
+	>=dev-cpp/glibmm-2.4"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+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
+		cd ${S}/docs/reference
+		emake || die "failed to build docs"
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_PN}-${SLOT}.pc
+
+	rm -fr ${D}/usr/share/doc/libxml++*
+	use doc && dohtml docs/reference/${PV%.*}/html/*
+}
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild
index 1b6678993bcf..ff971b0f4ecf 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild
@@ -1,13 +1,12 @@
 # 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.3 2005/02/25 02:12:29 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxmlpp/libxmlpp-2.8.0.ebuild,v 1.4 2005/04/23 18:55:09 ka0ttic Exp $
 
-IUSE="doc"
-
-inherit gnome2
+inherit gnome2 multilib
 
-MY_P=${P/pp/++}
-S=${WORKDIR}/${MY_P}
+MY_PN="${PN/pp/++}"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="C++ wrapper for the libxml XML parser library"
 HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
@@ -16,6 +15,7 @@ SRC_URI="mirror://gnome/sources/libxml++/${PV%.*}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="2.6"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="doc"
 
 RDEPEND=">=dev-libs/libxml2-2.6.1
 	>=dev-cpp/glibmm-2.4"
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="AUTHORS ChangeLog NEWS README*"
 
 src_compile() {
 	gnome2_src_compile
@@ -36,7 +37,7 @@ src_compile() {
 
 src_install() {
 	gnome2_src_install
+	dosed -i 's|^\(Cflags.*-I.* \)-I.*$|\1|' \
+		/usr/$(get_libdir)/pkgconfig/${MY_PN}-${SLOT}.pc
 	use doc && dohtml docs/reference/${PV%.*}/html/*
 }
-
-DOCS="AUTHORS ChangeLog NEWS README*"
diff --git a/dev-cpp/libxmlpp/metadata.xml b/dev-cpp/libxmlpp/metadata.xml
index da6fd63d0085..540ff7f83d30 100644
--- a/dev-cpp/libxmlpp/metadata.xml
+++ b/dev-cpp/libxmlpp/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>