Fix the SRC_URI for 2.7.0 so it points to our mirrors, add an EAPI=0 version of 3.0.0, and fix the tests; bug #240496, bug #242478, bug #242264

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.1 x86_64

5 files changed, 108 insertions, 11 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index c4a2c4917f1d..1e787787d2f8 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.67 2008/10/18 09:30:53 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.68 2008/10/25 17:48:58 halcy0n Exp $
+
+*xerces-c-3.0.0-r1 (25 Oct 2008)
+
+  25 Oct 2008; Mark Loeser <halcy0n@gentoo.org> xerces-c-2.7.0-r1.ebuild,
+  xerces-c-2.8.0-r1.ebuild, +xerces-c-3.0.0-r1.ebuild:
+  Fix the SRC_URI for 2.7.0 so it points to our mirrors, add an EAPI=0
+  version of 3.0.0, and fix the tests; bug #240496, bug #242478, bug #242264
 
   18 Oct 2008; Maurice van der Pot <griffon26@gentoo.org>
   xerces-c-3.0.0.ebuild:
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index a6b7bb5bd8f1..5bbff808356e 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -12,15 +12,16 @@ AUX xqilla-xercesc_regex.patch 46363 RMD160 152e646713a6cc9a75033d94b749d84ad319
 DIST xerces-c-3.0.0.tar.gz 4605395 RMD160 92353ec5ec90f292dfc92bf9a9232ddb70977c70 SHA1 3119b26dc749354d645c6f5bae29e1940372a6dc SHA256 ae2ff10d4bb12b120568d781f03056d7b4d1e2742858d3b7bb535a4a791f92a1
 DIST xerces-c-src_2_7_0.tar.gz 7760004 RMD160 80914da4898c694bf0299d612164483f83857baf SHA1 56f9587f33fca0a573a45f07762e3262a255d73f SHA256 77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5
 DIST xerces-c-src_2_8_0.tar.gz 7893039 RMD160 d576df7870b043a338358834a0e1180dca39e838 SHA1 f0803b1330daec3f44b17dee64c3c99de6b3cd3e SHA256 416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6
-EBUILD xerces-c-2.7.0-r1.ebuild 1522 RMD160 c0e82972a2aec92f2f02b07b46f8b0b5d813f285 SHA1 3901b46df422c1bc4505596a6ef7dadcd64f9cdd SHA256 89ff6c8601cf1bc4885e836d62f0d1bef9bcd6318c19f22e17a52e502b1e8776
-EBUILD xerces-c-2.8.0-r1.ebuild 4639 RMD160 1b844a862cec501b5dc34803ed10e06f6eb14ada SHA1 5b7ad49374e8feab8a8b5007059974a28bf9b4e4 SHA256 3dc26272dabfaaa025e94d039bd524140cea042c33598707c03c302b62bfed78
+EBUILD xerces-c-2.7.0-r1.ebuild 1501 RMD160 1003b096fcea0bfeb57e9f8069ef56df78076158 SHA1 b5f10093b555036b4c511f78575c83dbdd1a5f6a SHA256 25bed97cd691bee49a4a0a4db7918589aaf5bda9d5bdef09462c98ec9955679e
+EBUILD xerces-c-2.8.0-r1.ebuild 4642 RMD160 d8058817eb9deccd296c28d7ce7ad26df1308358 SHA1 05eefb2a9b3fc1c0546e0b0738e5e4ca41ef43ee SHA256 0f2d68da5eace07a620fe44d122b981b9fb9c41284ea7b37930081970b7ff9ab
+EBUILD xerces-c-3.0.0-r1.ebuild 2357 RMD160 6c74efa5ea6d41d5ae92ed476c25d1b0675672c0 SHA1 e403269de5a496554ae8b0fc384b8891d08e71d3 SHA256 fc49a541643af18d2f4abb462db75daaced3375eb747c24715aa554e1a3afb6b
 EBUILD xerces-c-3.0.0.ebuild 2467 RMD160 4e9d9a7cdbbd794c2c72b516d1c6d7a93ede497c SHA1 543c1d76da1fe86b5723722aaaf208810342dd4e SHA256 f8056de840c1ef8cc63deffa2bf8a183e0ec36ddc15090c5a9d4b023d855e7ba
-MISC ChangeLog 10893 RMD160 a3289c0d7ca0030a93f03eccbe96d0c4d8ce082b SHA1 bd4244cee45d36871131d0ae6df06bcdb11a30f5 SHA256 c5c9800e1663af9ff30c90ca50c65ca453ceed40ef067a4883dbf214c868f9ed
+MISC ChangeLog 11203 RMD160 01dab59c4f7a117801dba11578c90ac025414f30 SHA1 e4ce13ec427b0e71a0ce3ebe32c7bdaeb42388e3 SHA256 e87b6e7f78d08a342d438d1064ba083ae3c2aefa1bae7521e642ad311b7953c7
 MISC metadata.xml 1173 RMD160 317db6297b07ac3af637073f9b2558fbe990dd65 SHA1 c8b4ab6cf9d6fa18e2f878984b08fc8036ecf31a SHA256 ba37836d691cd20ad6aa4506dde803e736a0a220c0072d4a3222d05b63da56b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj5rNUACgkQMGnpIbeahxyeEwCfer1pSUBjVZBUjxxPHHdSs9Kr
-GkMAn2DMcTa8oLBmPMZQGlXuLtDkXb8q
-=MkQM
+iEYEARECAAYFAkkDXB0ACgkQCRZPokWLroTtxgCgk93GulpqoCiTY5TSy1HU3X+3
+E7YAoMvKhE1u+YdSC17WxRuAHPkrDfSB
+=bpDA
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
index 745e66b98a5e..a976bf84c76e 100644
--- a/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild,v 1.14 2008/06/07 14:35:25 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild,v 1.15 2008/10/25 17:48:58 halcy0n Exp $
 
 inherit eutils multilib versionator
 
@@ -9,7 +9,7 @@ MY_P=${MY_PN}_$(replace_all_version_separators _)
 
 DESCRIPTION="Xerces-C++ is a validating XML parser written in a portable subset of C++."
 HOMEPAGE="http://xml.apache.org/xerces-c/index.html"
-SRC_URI="mirror://apache/xml/xerces-c/source/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild
index cc7e9d2f59a6..10591346a94e 100644
--- a/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild,v 1.3 2008/10/12 14:19:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild,v 1.4 2008/10/25 17:48:58 halcy0n Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ MY_P=${MY_PN}_$(replace_all_version_separators _)
 
 DESCRIPTION="A validating XML parser written in a portable subset of C++."
 HOMEPAGE="http://xerces.apache.org/xerces-c/"
-SRC_URI="mirror://apache/xerces/c/sources/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/xerces/c/2/sources/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-libs/xerces-c/xerces-c-3.0.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..89e578d0d72a
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.0.0-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.0-r1.ebuild,v 1.1 2008/10/25 17:48:58 halcy0n Exp $
+
+inherit eutils
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++."
+HOMEPAGE="http://xerces.apache.org/xerces-c/"
+SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="curl debug doc iconv icu libwww threads elibc_Darwin elibc_FreeBSD"
+
+RDEPEND="icu? ( dev-libs/icu )
+	curl? ( net-misc/curl )
+	libwww? ( net-libs/libwww )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	export ICUROOT="/usr"
+
+	if use iconv && use icu ; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU will precede."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
+		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
+}
+
+src_compile() {
+	local mloader="inmemory"
+	use iconv && mloader="iconv"
+	use icu && mloader="icu"
+
+	local transcoder="gnuiconv"
+	use elibc_FreeBSD && transcoder="iconv"
+	use elibc_Darwin && transcoder="macosunicodeconverter"
+	use icu && transcoder="icu"
+
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor="socket"
+	use elibc_Darwin && netaccessor="cfurl"
+	use libwww && netaccessor="libwww"
+	use curl && netaccessor="curl"
+
+	econf \
+		$(use_enable debug) \
+		$(use_enable threads) \
+		--enable-msgloader-${mloader} \
+		--enable-netaccessor-${netaccessor} \
+		--enable-transcoder-${transcoder} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+
+	if use doc ; then
+		cd "${S}/doc"
+		doxygen || die "making docs failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake failed"
+
+	cd "${S}"
+	doenvd "${FILESDIR}/50xerces-c"
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm -rf samples/config* samples/Makefile* samples/runConfigure samples/install-sh samples/*/Makefile*
+		rm samples/*
+		doins -r samples
+		dohtml -r doc/html/*
+	fi
+
+	dodoc CREDITS KEYS NOTICE README version.incl
+}