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

(Portage version: 2.2_rc61/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 166 insertions, 8 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/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
+}