Added thread-test-disabling patch (thanks to Andreas Schürch, bug #280613). Version bump (which solves bug #277703 as well).

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 171 insertions, 10 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index bf968e13e999..dc20f6ef92c5 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/xerces-c
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.82 2009/09/27 14:45:43 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.83 2010/02/07 11:21:08 dev-zero Exp $
+
+*xerces-c-3.1.0 (07 Feb 2010)
+
+  07 Feb 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.0.1-disable-thread-tests.patch, xerces-c-3.0.1-r1.ebuild,
+  +xerces-c-3.1.0.ebuild:
+  Added thread-test-disabling patch (thanks to Andreas Schürch, bug
+  #280613). Version bump (which solves bug #277703 as well).
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> xerces-c-3.0.1-r1.ebuild:
   ppc stable #280613
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index ee34feb000ba..aaf444724fb4 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,3 +1,4 @@
+AUX 3.0.1-disable-thread-tests.patch 2170 RMD160 fc80748bb3f931ae5e414dcbe6ce14e25bb67697 SHA1 7bd0b6e0774e1d5db8402709711dc1902076976b SHA256 6ef9a714420f64b2b7674623d435377608092f9d2b5da149f3c89514ecd5009e
 AUX 50xerces-c 43 RMD160 b69c19f1ee7be74447f08ad633c0dd4bc0ce4954 SHA1 bf05f4e5123f663c885da586f8f45fbaa97bdb73 SHA256 0961dfe5add9ef7159e58569e3512ebf7fdba18dd7c14a0b3b7d898458b408e9
 AUX xerces-c-2.7.0-libpath.patch 1586 RMD160 44df40b77aefb2d446e84940f06420bb5dce8e21 SHA1 defaad81f4044b03aedc2d38da6e83725f5d0f61 SHA256 c981098908bb4acdb4f3d893983bed113e0d8fc2be717bcff4458261017b26cd
 AUX xerces-c-2.7.0-multilib.patch 3267 RMD160 2fbd2a9400ff4bf962c04667b825945eca2e6c8d SHA1 6a9760ab87c309e401574b5bd6652a87b568f253 SHA256 5b070554239570f31c1fe6736a69b45305e03bf34166ba3ca813c8e92aee47ca
@@ -10,13 +11,15 @@ AUX xqilla-xercesc_content_type.patch 65395 RMD160 8335d58163b813d4e7ba94b406039
 AUX xqilla-xercesc_regex.patch 46363 RMD160 152e646713a6cc9a75033d94b749d84ad319e143 SHA1 30bc755ebff51e069f9b7a3778e96549859708f7 SHA256 3c2ad2a107ff8b27ab719571b60cb786c4967c2796343928d9ecd3adb3e87d24
 DIST xerces-c-3.0.0.tar.gz 4605395 RMD160 92353ec5ec90f292dfc92bf9a9232ddb70977c70 SHA1 3119b26dc749354d645c6f5bae29e1940372a6dc SHA256 ae2ff10d4bb12b120568d781f03056d7b4d1e2742858d3b7bb535a4a791f92a1
 DIST xerces-c-3.0.1.tar.gz 4605970 RMD160 51fb09688a950e728757a555f9fca1cf98b8404a SHA1 71e4efee5397dd45d6bafad34bf3bc766bc2a085 SHA256 f7d28e0859ef7697a4ec19328ff5105ddd78ae3069d6a014d64efb298f996640
+DIST xerces-c-3.1.0.tar.gz 4979277 RMD160 8e2a07a83fa1f9f10cbf7e68f3d63cc1ffb6854d SHA1 15e45ae354980d6aa58e8c14eb6bc9fd84e51929 SHA256 e04572727f6669474d315b61d805d8f38941f4a7b63560d43d2f5ca61596a5ad
 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 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 2368 RMD160 833bc04b122e8653c06924752cf66576cba1d598 SHA1 6c56885d2db92222865c7d5e47b31ed11c6dc172 SHA256 15268ec558c9e9b0bbf34af7633bdd7b45db7328b5c994cabcb174c8b2abde7a
 EBUILD xerces-c-3.0.0.ebuild 2467 RMD160 4e9d9a7cdbbd794c2c72b516d1c6d7a93ede497c SHA1 543c1d76da1fe86b5723722aaaf208810342dd4e SHA256 f8056de840c1ef8cc63deffa2bf8a183e0ec36ddc15090c5a9d4b023d855e7ba
-EBUILD xerces-c-3.0.1-r1.ebuild 2366 RMD160 c8e116a3ee600bab9a4ef72ca7aae9f9b518e134 SHA1 6d5414821f138a8a4354474d4b7b34d354657f46 SHA256 4d56e5fa6532a21fb673785223ccdb8a6ef7ca26cf90e59d3c2c94d5cff1aac3
+EBUILD xerces-c-3.0.1-r1.ebuild 2616 RMD160 33f6238a228f1da43b2489bb93c0b23141742e63 SHA1 c8c3c1b65e83be377f19dbd056c165abadbafb85 SHA256 1d8271a4262dd26baa8a3e8d5517b60435a87aa15fb0b554624ea74f02eaa1d5
 EBUILD xerces-c-3.0.1.ebuild 2282 RMD160 bf4b92fd1bd6f3f7dafd1f1529539b9e231d4e93 SHA1 ed1c47fa20e1edc0690470e4bf4a888056c3ad41 SHA256 49ee5a37bf7c653a9c29ff01c81887f650b6e349237f86020f8a21728985fd0b
-MISC ChangeLog 13230 RMD160 41c871684faaa734c61dcab9e4dc3f791257be6c SHA1 bdf3ada104d18498f4568210980432f3602a0a1c SHA256 667d4fd7b90c7ead9d5458d4ca180892e85c1b98d6652c0d28b744fd4ef0e1fe
+EBUILD xerces-c-3.1.0.ebuild 2595 RMD160 c56c0936ab58714926019949e916bb0eec4871f6 SHA1 bd5d801758af3cd4dcacd00a1668ad61b8110079 SHA256 90da5e92b5e7e62985d825d539779cd5f13f7c6a3f212b4e704f19432c3cc50e
+MISC ChangeLog 13542 RMD160 725dcb94ad03b29a02c1de3c6c4e0849750faf01 SHA1 7330e8735f8a55cd43ba4c76c1e60dddb2841983 SHA256 aec235e34a393e701bd294edeb1b20615c9cc4e5fa2f96f0aaf24d60ecf10ab8
 MISC metadata.xml 990 RMD160 6d3971925c8a3cc216d6fd906e280bf5191ee6df SHA1 74ca30d03cbdfa15b5c3d9b103acb103ed21973f SHA256 a2260c914227a67006832de9657613f5337edfe071ca47b56f3fc37794563855
diff --git a/dev-libs/xerces-c/files/3.0.1-disable-thread-tests.patch b/dev-libs/xerces-c/files/3.0.1-disable-thread-tests.patch
new file mode 100644
index 000000000000..68144cc10694
--- /dev/null
+++ b/dev-libs/xerces-c/files/3.0.1-disable-thread-tests.patch
@@ -0,0 +1,47 @@
+diff -ru origscripts/sanityTest_ExpectedResult.log scripts/sanityTest_ExpectedResult.log
+--- origscripts/sanityTest_ExpectedResult.log	2008-09-17 05:06:33.000000000 +0200
++++ scripts/sanityTest_ExpectedResult.log	2010-01-18 19:45:39.000000000 +0100
+@@ -1146,42 +1146,7 @@
+ 1Test Run Successfully
+ 2Test Run Successfully
+ 3Test Run Successfully
+-No input XML file specified on command line.
+-usage:  ThreadTest [-v] [-threads nnn] [-time nnn] [-quiet] [-verbose] xmlfile...
+-     -v=xxx         Validation scheme [always | never | auto].  Default is AUTO.
+-     -n             Enable namespace processing. Defaults to off.
+-     -s             Enable schema processing. Defaults to off.
+-     -f             Enable full schema constraint checking. Defaults to off.
+-     -parser=xxx    Parser Type [dom | sax | sax2].  Default is SAX (SAX1).
+-     -p             Enable namespace prefixes. Defaults to off.
+-                    (Only used with -parser=sax2, ignored otherwise.)
+-     -quiet         Suppress periodic status display.
+-     -verbose       Display extra messages.
+-     -reuse         Retain and reuse parser.  Default creates new for each parse.
+-     -threads nnn   Number of threads.  Default is 2.
+-     -time nnn      Total time to run, in seconds.  Default is forever.
+-     -parses nnn    Run for nnn parses instead of time.  Default is to use time
+-     -dump          Dump DOM tree on error.
+-     -mem           Read files into memory once only, and parse them from there.
+-     -gc            Enable grammar caching (i.e. grammar cached and used in subsequent parses). Defaults to off.
+-     -init          Perform an initial parse of the file(s) before starting up the individual threads.
+-
+-1Test Run Successfully
+-2Test Run Successfully
+-3Test Run Successfully
+-4Test Run Successfully
+-5Test Run Successfully
+-6Test Run Successfully
+-7Test Run Successfully
+-8Test Run Successfully
+-9Test Run Successfully
+-10Test Run Successfully
+-11Test Run Successfully
+-12Test Run Successfully
+-13Test Run Successfully
+-14Test Run Successfully
+-15Test Run Successfully
+-
++123456789101112131415
+ Usage:
+     MemHandlerTest [options] <XML file | List file>
+ 
diff --git a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
index e8a9b700fe73..4b70d9987333 100644
--- a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.0.1-r1.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/xerces-c/xerces-c-3.0.1-r1.ebuild,v 1.4 2009/12/07 18:20:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild,v 1.5 2010/02/07 11:21:08 dev-zero Exp $
 
 EAPI="2"
 
@@ -12,9 +12,9 @@ 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"
+IUSE="curl debug doc iconv icu libwww test threads elibc_Darwin elibc_FreeBSD"
 
-RDEPEND="icu? ( dev-libs/icu )
+RDEPEND="icu? ( >=dev-libs/icu-4.2 )
 	curl? ( net-misc/curl )
 	libwww? ( net-libs/libwww )
 	virtual/libiconv"
@@ -35,8 +35,16 @@ src_prepare() {
 		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
 		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
 
-	epatch "${FILESDIR}/${P}-CVE-2009-2625.patch"
-	epatch "${FILESDIR}/${P}-libicu.patch"
+	epatch \
+		"${FILESDIR}/${P}-CVE-2009-2625.patch" \
+		"${FILESDIR}/${P}-libicu.patch"
+
+	if use test && ! use threads ; then
+		epatch "${FILESDIR}/${PV}-disable-thread-tests.patch"
+		sed -i \
+			-e 's|ThreadTest$(EXEEXT) XSerializerTest$(EXEEXT)|XSerializerTest$(EXEEXT)|g' \
+			tests/Makefile.in || die "sed failed"
+	fi
 }
 
 src_configure() {
diff --git a/dev-libs/xerces-c/xerces-c-3.1.0.ebuild b/dev-libs/xerces-c/xerces-c-3.1.0.ebuild
new file mode 100644
index 000000000000..b70b492ad2bc
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.1.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2010 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.1.0.ebuild,v 1.1 2010/02/07 11:21:08 dev-zero Exp $
+
+EAPI="2"
+
+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 doc iconv icu libwww sse2 static-libs threads elibc_Darwin elibc_FreeBSD"
+
+RDEPEND="icu? ( >=dev-libs/icu-4.2 )
+	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_prepare() {
+	sed -i \
+		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
+		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
+}
+
+src_configure() {
+	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"
+	# for interix maybe: transcoder="windows"
+
+	# '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 \
+		--disable-pretty-make \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		--enable-msgloader-${mloader} \
+		--enable-netaccessor-${netaccessor} \
+		--enable-transcoder-${transcoder} \
+		$(use_enable sse2)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		doxygen || die "making docs failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake failed"
+
+	use static-libs || rm "${D}"/lib*/*.la
+
+	# To make sure an appropriate NLS msg file is around when using the iconv msgloader
+	# ICU has the messages compiled in.
+	if use iconv && ! use icu ; then
+		doenvd "${FILESDIR}/50xerces-c"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm -rf samples/Makefile* samples/runConfigure samples/src/*/Makefile* samples/.libs
+		doins -r samples
+		dohtml -r doc/html/*
+	fi
+
+	dodoc CREDITS KEYS NOTICE README version.incl
+}