Version bump. Dropped old versions.

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 27 insertions, 64 deletions

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index 7acf7e5f793e..38a1cd85311e 100644
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xqilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.4 2009/03/01 13:23:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.5 2009/03/03 09:00:34 dev-zero Exp $
+
+*xqilla-2.2.0 (03 Mar 2009)
+
+  03 Mar 2009; Tiziano Müller <dev-zero@gentoo.org> -xqilla-2.1.2.ebuild,
+  -xqilla-2.1.3.ebuild, +xqilla-2.2.0.ebuild:
+  Version bump. Dropped old versions.
 
 *xqilla-2.1.3-r1 (01 Mar 2009)
 
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index b5b822219615..7a11f90e2953 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,8 +1,7 @@
-DIST XQilla-2.1.2.tar.gz 3193075 RMD160 a66e04c7cb696daae152e47f434d7f42ab8af053 SHA1 d7733d8fe64269e279189d8f8e584755a9df5177 SHA256 095da7b287faa670e74560b10fb63e9546ce84867f350f2169e2a003588ada17
 DIST XQilla-2.1.3.tar.gz 3197370 RMD160 c6bf589c4cffba3d59ac3819872836bde2ddd682 SHA1 9e484c67c10692da6c9ab7134d8df4829e212e8d SHA256 4a61f9c25578a40a356f49e358c874df577c6bf75b03848050e7726d3e6164ad
-EBUILD xqilla-2.1.2.ebuild 1118 RMD160 8208069b8b3aea002aaff94ade2c18dd4ee756b4 SHA1 f8ecd79186516fe6008b69c3e33061cd6a7d2526 SHA256 4722b78854bf92dd9b6e20ef7f54de6a1c175e9e5023ede76671f5de695fb685
+DIST XQilla-2.2.0.tar.gz 4907127 RMD160 39598a7a8fbae30a392fe38d3bffa62b59fcdc8a SHA1 22b680afcb1fdc954ce9c34aec71f3add321dfbf SHA256 8d7e2916a922ecf75bf21069a18706cacdbbd413c49f6561537d00f592377c9d
 EBUILD xqilla-2.1.3-r1.ebuild 1182 RMD160 2e008a601677d51dc17465a622fb3a8396e1266b SHA1 ae7b134ec50bc1605e614edf069419cc82bdfcb8 SHA256 7783c49f9f6f1688c8b6a100c64912d35f837c19763a3348043fb46cff83610f
-EBUILD xqilla-2.1.3.ebuild 1344 RMD160 3f97b8fbb6133774cda81f7d688d81b4e1a1e3b8 SHA1 b99bc06779b93e780b49bf4efae6818a3262eb87 SHA256 702e8ee84926f1bba202b523921f66840a587c0cbe994e825fdd8f77d413648c
+EBUILD xqilla-2.2.0.ebuild 1364 RMD160 41ae8ae00af9c4bd1ae08579eca77094210c31d5 SHA1 822e28ec4cffb030a891e90a2a3ae41b110db2d4 SHA256 78ed82fdb2b41763ce2e7668a83350431e199ffc3f29d3f07a3249a7aee77a9b
 EBUILD xqilla-9999.ebuild 1230 RMD160 7a401b22690e85278d27f9d4bf916d075e63978f SHA1 f27abc7d6ddc0f1a49a354e2f62af78f6ca3fdf5 SHA256 df3bee03c55e68ef39b1c8fbc144b581266a8071b6889db3a613dfcfc389b94d
-MISC ChangeLog 1586 RMD160 1c38c7bd41c5151ac87922215980628914755bbd SHA1 cac01262c98274ccae988c62a886ab7d2eac70d9 SHA256 c1d42a60a656819cee43fd083cc57115cb655945f28f6ed2fc445e53b14c7b64
+MISC ChangeLog 1776 RMD160 fba9c5a0faf744b334b2af6b6a92e5bcf15fa907 SHA1 6c6bfe1bb55e56afd8f518fb68af8d219bd092b6 SHA256 6188b61792b81319e42a7886a65107cfc03b58dab865ec0f77c48ea3f41c2f59
 MISC metadata.xml 356 RMD160 87fa3f6ed33803039bdb19ecb566ba91858de68a SHA1 2f5ed3e9d93dc8af9e3d11aafd1eee11f23e202a SHA256 9e6928e22e3a021b76957f9787dcd10dbecfe2af936fca3b24efbc5122a0959b
diff --git a/dev-libs/xqilla/xqilla-2.1.2.ebuild b/dev-libs/xqilla/xqilla-2.1.2.ebuild
deleted file mode 100644
index 85b140b404e7..000000000000
--- a/dev-libs/xqilla/xqilla-2.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.1.2.ebuild,v 1.1 2008/05/23 06:09:55 dev-zero Exp $
-
-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="Sleepycat BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="~dev-libs/xerces-c-2.8.0"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! built_with_use dev-libs/xerces-c xqilla ; then
-		eerror "dev-libs/xerces-c has to be built with the xqilla USE-flag"
-		die "missing xqilla USE-flag for dev-libs/xerces-c"
-	fi
-}
-
-src_compile() {
-	econf --with-xerces="/usr" || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake docs failed"
-
-	if use doc; then
-		cd docs
-		dohtml -r dom3-api simple-api
-	fi
-}
diff --git a/dev-libs/xqilla/xqilla-2.1.3.ebuild b/dev-libs/xqilla/xqilla-2.2.0.ebuild
index 25500d7102fc..f888c0df54d2 100644
--- a/dev-libs/xqilla/xqilla-2.1.3.ebuild
+++ b/dev-libs/xqilla/xqilla-2.2.0.ebuild
@@ -1,42 +1,46 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.1.3.ebuild,v 1.1 2008/08/15 08:59:50 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.0.ebuild,v 1.1 2009/03/03 09:00:34 dev-zero Exp $
 
-inherit eutils
+EAPI="2"
 
 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="Sleepycat BSD"
+LICENSE="Apache-2.0 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc faxpp htmltidy"
 
-RDEPEND="faxpp? ( dev-libs/faxpp )
-	~dev-libs/xerces-c-2.8.0
+# XQilla bundles two libraries:
+# - mapm, heavily patched
+# - yajl, moderately patched
+# There's currently no way to unbundle those
+
+RDEPEND=">=dev-libs/xerces-c-3.0.1
+	faxpp? ( dev-libs/faxpp )
 	htmltidy? ( app-text/htmltidy )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if ! built_with_use dev-libs/xerces-c xqilla ; then
-		eerror "dev-libs/xerces-c has to be built with the xqilla USE-flag"
-		die "missing xqilla USE-flag for dev-libs/xerces-c"
-	fi
+src_prepare() {
+	sed -i -e 's|^LDFLAGS =|LDFLAGS +=|' Makefile.in || die "sed failed"
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		--with-xerces=/usr \
 		$(use_enable debug) \
 		$(use_with htmltidy tidy) \
 		$(use_with faxpp faxpp /usr)
+}
 
-	emake || die "emake failed"
+src_compile() {
+	default
 
 	if use doc; then
 		emake docs || die "emake docs failed"