Version bump. Fixes compilation with xerces-c-3.1.0.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 98 insertions, 16 deletions

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index 748600662df0..b3f290a338aa 100644
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xqilla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.9 2010/02/26 05:41:34 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.10 2010/02/26 07:56:47 dev-zero Exp $
+
+*xqilla-2.2.3 (26 Feb 2010)
+
+  26 Feb 2010; Tiziano Müller <dev-zero@gentoo.org> xqilla-2.2.0.ebuild,
+  +xqilla-2.2.3.ebuild, +files/2.2.3-xerces-c-3.1.0.patch:
+  Version bump. Fixes compilation with xerces-c-3.1.0.
 
   26 Feb 2010; Mark Loeser <halcy0n@gentoo.org> -xqilla-2.1.3-r1.ebuild:
   Drop old versions that depend on <xerces-c-3
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index bd8f897fd49a..a1517167a09a 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 2.2.3-xerces-c-3.1.0.patch 979 RMD160 c810b86e8fb0154f237b9704d390067c649960df SHA1 6f60fed2ba5ba12f55c2033d6a004d4e53b72681 SHA256 7c7d9b1928d0b7ca8d5600ef6838dbd8e84e92858fdaa8d34342f8497b37f71e
 AUX xqilla-2.2.0-gcc44.patch 786 RMD160 4004b116bbf65b42f12b2d84153b632c87678ff5 SHA1 e47c4d147db7a8f7de8ec0b61a6070b09dc67c97 SHA256 5d798a2344adfab0501549eeec849ba0169a96c40b2616dca12bc1df0d9b64bd
 DIST XQilla-2.2.0.tar.gz 4907127 RMD160 39598a7a8fbae30a392fe38d3bffa62b59fcdc8a SHA1 22b680afcb1fdc954ce9c34aec71f3add321dfbf SHA256 8d7e2916a922ecf75bf21069a18706cacdbbd413c49f6561537d00f592377c9d
-EBUILD xqilla-2.2.0.ebuild 1417 RMD160 e3804f0ff73656b2b77dd7d11152732b593b9dd1 SHA1 67040f5368830873df74ee6baa48f3e79f1ae954 SHA256 795c0a02c2395ce33d3ccbbd935ef9254637499fada2daf1cf230c80f9769b84
-MISC ChangeLog 2305 RMD160 c746a1c7c20f3994cfed5687a252e35de5046655 SHA1 691926993d15f98481cd7c42097b42bd6d100075 SHA256 d594c37e3452bc3363ccdac305f9ed8900f120c7579069d3ee173c9fca0c9dbc
+DIST XQilla-2.2.3.tar.gz 15642828 RMD160 62a190ff36d5157ef527717eaf8d47feedd4a7d9 SHA1 d859fe88efbec5c448621045d31112ba52a2c641 SHA256 6e25475111ab1ea5ec77e55dc8dedbdb77116cab7bf4fb9e4610cf0508d4af43
+EBUILD xqilla-2.2.0.ebuild 1414 RMD160 0a62db7fa0700273d7df87685b677132fd9b415f SHA1 8f622a198e3e39aa4ef31f6cdaac54b70d230661 SHA256 afb852be5d25fa5b9a494bfbb592e20c3a3ffd7d4ae6cea8218aa3b034291f89
+EBUILD xqilla-2.2.3.ebuild 1428 RMD160 442975c44f57ac5f9c4001fa1d4a49bce439bc4b SHA1 98b9712e3c610428ddeedeabb4e10a94903dc9dc SHA256 3cc3280f4c036f3f8f332be6289729ffb1fc6cf6642f63fff6799eb9ccd397a2
+MISC ChangeLog 2525 RMD160 05e41cdbda9157cb0d0bff74ed2d9ce23e174fc5 SHA1 f4b5cbe1eae6fef0dacbbf9f71016a4446d813c2 SHA256 4287ccb417abb3a6a859f7590590a150da11197155cf8b9bd2d3d717dd9679a2
 MISC metadata.xml 356 RMD160 87fa3f6ed33803039bdb19ecb566ba91858de68a SHA1 2f5ed3e9d93dc8af9e3d11aafd1eee11f23e202a SHA256 9e6928e22e3a021b76957f9787dcd10dbecfe2af936fca3b24efbc5122a0959b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkuHXxMACgkQCRZPokWLroSxuACfefQvWPIy+I7vnVc3ZKuxb2ne
-RuQAn1LJOeAG1In7NXmfo1fai+37vbOy
-=feWV
------END PGP SIGNATURE-----
diff --git a/dev-libs/xqilla/files/2.2.3-xerces-c-3.1.0.patch b/dev-libs/xqilla/files/2.2.3-xerces-c-3.1.0.patch
new file mode 100644
index 000000000000..cd5d73529f7b
--- /dev/null
+++ b/dev-libs/xqilla/files/2.2.3-xerces-c-3.1.0.patch
@@ -0,0 +1,21 @@
+diff -Naur XQilla-2.2.3.orig/src/schema/SchemaValidatorFilter.cpp XQilla-2.2.3/src/schema/SchemaValidatorFilter.cpp
+--- XQilla-2.2.3.orig/src/schema/SchemaValidatorFilter.cpp	2010-02-26 08:11:53.899266592 +0100
++++ XQilla-2.2.3/src/schema/SchemaValidatorFilter.cpp	2010-02-26 08:43:08.309105237 +0100
+@@ -710,7 +710,7 @@
+ 
+   if(prefixColonPos == -1) {
+     bool unknown = false;
+-    return fElemStack.mapPrefixToURI(XMLUni::fgZeroLenString, (ElemStack::MapModes) mode, unknown);
++    return fElemStack.mapPrefixToURI(XMLUni::fgZeroLenString, unknown);
+   }
+   else {
+     prefixBuf.set(qName, prefixColonPos);
+@@ -726,7 +726,7 @@
+     }
+     else {
+       bool unknown = false;
+-      unsigned int uriId = fElemStack.mapPrefixToURI(prefixBuf.getRawBuffer(), (ElemStack::MapModes) mode, unknown);
++      unsigned int uriId = fElemStack.mapPrefixToURI(prefixBuf.getRawBuffer(), unknown);
+ 
+       if(unknown)
+         emitError(XMLErrs::UnknownPrefix, prefixBuf.getRawBuffer());
diff --git a/dev-libs/xqilla/xqilla-2.2.0.ebuild b/dev-libs/xqilla/xqilla-2.2.0.ebuild
index 1e2b71f21f1e..5bead0cf55c8 100644
--- a/dev-libs/xqilla/xqilla-2.2.0.ebuild
+++ b/dev-libs/xqilla/xqilla-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.0.ebuild,v 1.2 2009/08/10 12:40:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.0.ebuild,v 1.3 2010/02/26 07:56:47 dev-zero Exp $
 
 EAPI="2"
 inherit eutils
@@ -20,7 +20,7 @@ IUSE="debug doc faxpp htmltidy"
 # - yajl, moderately patched
 # There's currently no way to unbundle those
 
-RDEPEND=">=dev-libs/xerces-c-3.0.1
+RDEPEND="=dev-libs/xerces-c-3.0*
 	faxpp? ( dev-libs/faxpp )
 	htmltidy? ( app-text/htmltidy )"
 DEPEND="${RDEPEND}
diff --git a/dev-libs/xqilla/xqilla-2.2.3.ebuild b/dev-libs/xqilla/xqilla-2.2.3.ebuild
new file mode 100644
index 000000000000..8eecce8533a2
--- /dev/null
+++ b/dev-libs/xqilla/xqilla-2.2.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.3.ebuild,v 1.1 2010/02/26 07:56:47 dev-zero Exp $
+
+EAPI="2"
+inherit eutils
+
+MY_P="XQilla-${PV}"
+
+DESCRIPTION="An XQuery and XPath 2 library and command line utility written in C++."
+HOMEPAGE="http://xqilla.sourceforge.net/HomePage"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc faxpp htmltidy"
+
+# XQilla bundles two libraries:
+# - mapm, heavily patched
+# - yajl, moderately patched
+# There's currently no way to unbundle those
+
+RDEPEND=">=dev-libs/xerces-c-3.1.0
+	faxpp? ( dev-libs/faxpp )
+	htmltidy? ( app-text/htmltidy )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-xerces-c-3.1.0.patch"
+	sed -i -e 's|^LDFLAGS =|LDFLAGS +=|' Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	econf \
+		--with-xerces=/usr \
+		$(use_enable debug) \
+		$(use_with htmltidy tidy) \
+		$(use_with faxpp faxpp /usr)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake docs || die "emake docs failed"
+		emake devdocs || die "emake devdocs failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake docs failed"
+
+	dodoc ChangeLog TODO
+
+	if use doc; then
+		cd docs
+		dohtml -r dev-api dom3-api simple-api
+	fi
+}