Version bump (bug #328643), readded dropped disable-thread-tests patchs (bug #307303).

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

4 files changed, 183 insertions, 12 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index 48229b6a0dc1..6b043fbb95a9 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.87 2010/06/18 18:54:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.88 2010/08/28 06:25:10 dev-zero Exp $
+
+*xerces-c-3.1.1 (28 Aug 2010)
+
+  28 Aug 2010; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.1.1-disable-thread-tests.patch, +xerces-c-3.1.1.ebuild:
+  Version bump (bug #328643), readded dropped disable-thread-tests patchs
+  (bug #307303).
 
   18 Jun 2010; Pacho Ramos <pacho@gentoo.org> xerces-c-3.0.1-r1.ebuild:
   stable amd64, security bug 280613
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index f636b5e61ce8..c21dbb222b73 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,24 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3.0.1-disable-thread-tests.patch 2170 RMD160 fc80748bb3f931ae5e414dcbe6ce14e25bb67697 SHA1 7bd0b6e0774e1d5db8402709711dc1902076976b SHA256 6ef9a714420f64b2b7674623d435377608092f9d2b5da149f3c89514ecd5009e
+AUX 3.1.1-disable-thread-tests.patch 3401 RMD160 4665d4f9c24a6d53fef11944b29a3177b76dd7b6 SHA1 0d6be8eb9684c28e18f0e477b8cb9fd41ac87c56 SHA256 28a795b83a156934197518730281c75aa3308e4f08fb91127cd8451312f754f7
 AUX 50xerces-c 43 RMD160 b69c19f1ee7be74447f08ad633c0dd4bc0ce4954 SHA1 bf05f4e5123f663c885da586f8f45fbaa97bdb73 SHA256 0961dfe5add9ef7159e58569e3512ebf7fdba18dd7c14a0b3b7d898458b408e9
 AUX xerces-c-3.0.1-CVE-2009-2625.patch 26741 RMD160 926f7b57cf5976696b98835cc48a6a4f42209b2b SHA1 8227519677d0bd58094e0c7645f46b635e931caa SHA256 da95a0890c307ca3998c60dd65db675522570c460d010c8962996193b444f87a
 AUX xerces-c-3.0.1-libicu.patch 1384 RMD160 8d0281cf5514649c34810a3abd5008e4c81c0d13 SHA1 0dbdee819475510eb1271902a3b952f04d37a106 SHA256 7260ac41e43ab775406a6637d2b91d2f15737fa8232e5872ee800d0d25793d4f
 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-3.1.1.tar.gz 5051308 RMD160 bbb7ceac470db901d77926cdf21a254df0d8d1db SHA1 177ec838c5119df57ec77eddec9a29f7e754c8b2 SHA256 a42785f71e0b91d5fd273831c87410ce60a73ccfdd207de1b805d26d44968736
 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 2609 RMD160 62ccda32c7198f2805d2b0a9bb948402bd82096a SHA1 22a63bc314ae02b4be549fe6044940c291ea1d75 SHA256 6ac6dfbb893b69a7419d4761f3efd89b5d5524e6fd04924de348e19fd14a4bba
 EBUILD xerces-c-3.0.1.ebuild 2282 RMD160 bf4b92fd1bd6f3f7dafd1f1529539b9e231d4e93 SHA1 ed1c47fa20e1edc0690470e4bf4a888056c3ad41 SHA256 49ee5a37bf7c653a9c29ff01c81887f650b6e349237f86020f8a21728985fd0b
 EBUILD xerces-c-3.1.0.ebuild 2595 RMD160 c56c0936ab58714926019949e916bb0eec4871f6 SHA1 bd5d801758af3cd4dcacd00a1668ad61b8110079 SHA256 90da5e92b5e7e62985d825d539779cd5f13f7c6a3f212b4e704f19432c3cc50e
-MISC ChangeLog 14333 RMD160 38b24e529f3c4e7d534f53e35eb567fb207fc266 SHA1 312b69cf3d69e023df763c118f211ef12844a498 SHA256 12b9990708f8fc1af79e51af0ab95df6e8c80967a5f4e512623f0831352dcec7
+EBUILD xerces-c-3.1.1.ebuild 2666 RMD160 cc680d72b3991147a084170e52368187a4be54c6 SHA1 47ef2c44e89e91c0689ae2790afbff94bf08ffb9 SHA256 5b286151841563d2e1cbfb3ad4f3284886d23e7551b0cc73e772c4e3c59b1799
+MISC ChangeLog 14579 RMD160 737006e433efd6977c9eee87162e966c495c0fce SHA1 95deb398a76f12ff4348af556237b2bfbadb0491 SHA256 ad7dbbdf51d1796a567a7d504d9a3948758b3b3fa52c229557d84cf66438cd7e
 MISC metadata.xml 883 RMD160 a34f9e7e9e29e711518eeda9b4d50f47a49e0739 SHA1 4570e3a640c7ad50c5d70af9f3a0602e4c31b8ad SHA256 5e1828cf6120621a00a9a251ea1156f0379568ca5d129c3793638cc024c7823e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwbwQgACgkQCaWpQKGI+9SmwgCfdeyPJDzcwfjicSBKJ6l/VLMS
-EuAAnAy9pmjSs9xdMSJM8RL1XcQPBsSx
-=mtgO
------END PGP SIGNATURE-----
diff --git a/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch b/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch
new file mode 100644
index 000000000000..bb94299af238
--- /dev/null
+++ b/dev-libs/xerces-c/files/3.1.1-disable-thread-tests.patch
@@ -0,0 +1,74 @@
+diff --git a/scripts/sanityTest_ExpectedResult.log b/scripts/sanityTest_ExpectedResult.log
+index 3588d84..9a45457 100644
+--- a/scripts/sanityTest_ExpectedResult.log
++++ b/scripts/sanityTest_ExpectedResult.log
+@@ -1146,42 +1146,7 @@ Options:
+ 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/tests/Makefile.am b/tests/Makefile.am
+index 177c1c8..f333700 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -84,8 +84,6 @@ NetAccessorTest_SOURCES =                       src/NetAccessorTest/NetAccessorT
+ #                                               src/ParserTest/ParserTest_Parser.cpp \
+ #                                               src/ParserTest/ParserTest_Parser.hpp
+ 
+-testprogs +=                                    ThreadTest
+-ThreadTest_SOURCES =                            src/ThreadTest/ThreadTest.cpp
+ 
+ # Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
+ # dcargill says this is obsolete and we can delete it.
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index d1df240..c4749fd 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -92,7 +92,7 @@ am__EXEEXT_1 = DOMTest$(EXEEXT) DOMMemTest$(EXEEXT) \
+ 	DOMTraversalTest$(EXEEXT) DOMTypeInfoTest$(EXEEXT) \
+ 	EncodingTest$(EXEEXT) InitTermTest$(EXEEXT) \
+ 	MemHandlerTest$(EXEEXT) NetAccessorTest$(EXEEXT) \
+-	ThreadTest$(EXEEXT) XSerializerTest$(EXEEXT) \
++	XSerializerTest$(EXEEXT) \
+ 	XSTSHarness$(EXEEXT) XSValueTest$(EXEEXT)
+ am__dirstamp = $(am__leading_dot)dirstamp
+ am_DOMMemTest_OBJECTS = src/DOM/DOMMemTest/DOMMemTest.$(OBJEXT)
diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.ebuild b/dev-libs/xerces-c/xerces-c-3.1.1.ebuild
new file mode 100644
index 000000000000..c81bcd88cd03
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.1.1.ebuild
@@ -0,0 +1,97 @@
+# 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.1.ebuild,v 1.1 2010/08/28 06:25:10 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() {
+	use threads || epatch "${FILESDIR}/${PV}-disable-thread-tests.patch"
+
+	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
+}