Added beta version for testing

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64

4 files changed, 151 insertions, 2 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index 9e19a4cae8e5..f108f270f22e 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.58 2008/06/07 19:53:10 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.59 2008/06/28 06:34:06 dev-zero Exp $
+
+*xerces-c-3.0.0_beta1 (28 Jun 2008)
+
+  28 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch,
+  +xerces-c-3.0.0_beta1.ebuild:
+  Added beta version for testing
 
   07 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
   +files/xerces-c-2.8.0-IconvGNUTransService.cpp.patch,
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 5b1b3683ea18..bf61e2a6b2d6 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -4,11 +4,14 @@ AUX xerces-c-2.7.0-multilib.patch 3267 RMD160 2fbd2a9400ff4bf962c04667b825945eca
 AUX xerces-c-2.8.0-64bit_cast.patch 727 RMD160 b0cc302d30c95f324e474a802ad4f14eba57e1c9 SHA1 218b982f7b9c6cf086bd17a392b2c036769677a4 SHA256 74cc58e469980c32a1161941b69a9e18362e983687a5979ee4ab1fd1d83699d8
 AUX xerces-c-2.8.0-IconvGNUTransService.cpp.patch 381 RMD160 0c7795b47869d1b37d9332903721612f267fb096 SHA1 c058f789343406e5c870f2ca44d184a4a2e99e67 SHA256 bc6dcda04bd804aed20bee6cbe342759c9f4b642665580f4b17bb5e530522f70
 AUX xerces-c-2.8.0-icu_ressource_fix.patch 1924 RMD160 f994c6003136494672aceaa072ceb7ccc74f7a42 SHA1 fac51469c89c279fed291067ed1d2c1cab660616 SHA256 88b8ee0ec3fd5974c4ccf8d599d91932a1e15ef84927331f42fbce46f7f51046
+AUX xerces-c-3.0.0_beta1-fix-tests-and-samples.patch 1707 RMD160 f7db8b25ea64d33d789011fcf2d6499a5ba9e902 SHA1 e903e3fbcbe9ea778315207cefee9155eb732170 SHA256 6ba01431d65538d0d77a2add12155353e8e5ada9b130dc446f6355e435b398fe
 AUX xqilla-xercesc_content_type.patch 65395 RMD160 8335d58163b813d4e7ba94b406039e1f6d51e164 SHA1 0a30ee2b6d1192aaeb7c1b7159cec3a1a9588b12 SHA256 60978dd2db53197c8166c92918045c33fe395e440948219e8db11e8e98b0149e
 AUX xqilla-xercesc_regex.patch 46363 RMD160 152e646713a6cc9a75033d94b749d84ad319e143 SHA1 30bc755ebff51e069f9b7a3778e96549859708f7 SHA256 3c2ad2a107ff8b27ab719571b60cb786c4967c2796343928d9ecd3adb3e87d24
+DIST xerces-c-3.0.0.b1.tar.gz 4831886 RMD160 5de93b82a381218bdc15f93ca25e1cfbe6c081a2 SHA1 a4186be7fdd97f92c7c2046a34fab9b6a75b3961 SHA256 94e46a19df35a83e4aa6c1c056e2f12c2239eb8bb56763ffaa61f5d0a4e09f49
 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.ebuild 4893 RMD160 86adf7e68823d86cfdb5bdacedfd6f19caeb9627 SHA1 886a13b7d3c3a85a03eeb670d31bb957da82f642 SHA256 32076aa87167c90ed42a77011a7ea345c53e228a04bcbb5db162ea4d281d46c6
-MISC ChangeLog 9259 RMD160 51216ccf174da8d421612b2e153f6bacd4d9d28d SHA1 a70a29e8808562fc0d37102251c0f2c530a10dc5 SHA256 21e2fd0d4fb956c8f7b9153089b4043dc43b2f09fc32f313dd2b010ca10d4ab0
+EBUILD xerces-c-3.0.0_beta1.ebuild 2609 RMD160 cb20fc6483aaacdf93fe4b6e5bf243b955ee702f SHA1 f26923de0bf748aa9b5ba39c102630147b3c39f7 SHA256 a697a60fa550bae02ed8c4a9cf98e89cc55098d5357596fab9d51bdbf6a98bad
+MISC ChangeLog 9474 RMD160 7118a6528738f6f88991ef65d49ecc6fbb86b20c SHA1 6a157cdce07e030ee167fb0b554598629b416ec9 SHA256 b7ca9c81a5ff4a40ec4f26d4fb539fd108aff8f9398b7bc46ea5159297ce247a
 MISC metadata.xml 964 RMD160 4f84e3f119473a1d383dbb7a0dee32720ac1dbca SHA1 6d2371cf7164435b472a9e403ceccab016478e20 SHA256 f06bfb193802e9385300bd9b8cab0203a5c44d43eb87d6d9465e34f1d503c75d
diff --git a/dev-libs/xerces-c/files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch b/dev-libs/xerces-c/files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch
new file mode 100644
index 000000000000..9e135c4ff15f
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch
@@ -0,0 +1,36 @@
+diff -Naur xerces-c-3.0.0.b1.orig/samples/src/CreateDOMDocument/CreateDOMDocument.cpp xerces-c-3.0.0.b1/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
+--- xerces-c-3.0.0.b1.orig/samples/src/CreateDOMDocument/CreateDOMDocument.cpp	2008-06-27 22:33:03.000000000 +0200
++++ xerces-c-3.0.0.b1/samples/src/CreateDOMDocument/CreateDOMDocument.cpp	2008-06-27 22:37:21.000000000 +0200
+@@ -89,7 +89,7 @@
+ //  main
+ // ---------------------------------------------------------------------------
+ 
+-int main(int argC, char* /* argV[] */)
++int main(int argC, char** /* argV[] */)
+ {
+     // Initialize the XML4C2 system.
+     try
+diff -Naur xerces-c-3.0.0.b1.orig/tests/src/UtilTests/CoreTestsMain.cpp xerces-c-3.0.0.b1/tests/src/UtilTests/CoreTestsMain.cpp
+--- xerces-c-3.0.0.b1.orig/tests/src/UtilTests/CoreTestsMain.cpp	2008-06-27 22:33:01.000000000 +0200
++++ xerces-c-3.0.0.b1/tests/src/UtilTests/CoreTestsMain.cpp	2008-06-27 22:37:35.000000000 +0200
+@@ -46,7 +46,7 @@
+ extern bool testValueVector();
+ 
+ 
+-int main()
++int main(int, char**)
+ {
+     // Do the platform initialization
+     try
+diff -Naur xerces-c-3.0.0.b1.orig/tests/src/XSValueTest/XSValueTest.cpp xerces-c-3.0.0.b1/tests/src/XSValueTest/XSValueTest.cpp
+--- xerces-c-3.0.0.b1.orig/tests/src/XSValueTest/XSValueTest.cpp	2008-06-27 22:33:00.000000000 +0200
++++ xerces-c-3.0.0.b1/tests/src/XSValueTest/XSValueTest.cpp	2008-06-27 22:37:56.000000000 +0200
+@@ -6693,7 +6693,7 @@
+ // ---------------------------------------------------------------------------
+ //  Program entry point
+ // ---------------------------------------------------------------------------
+-int main(int, char* )
++int main(int, char** )
+ {
+ 
+     // Initialize the XML4C system
diff --git a/dev-libs/xerces-c/xerces-c-3.0.0_beta1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.0_beta1.ebuild
new file mode 100644
index 000000000000..1961ee7fd2ff
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.0.0_beta1.ebuild
@@ -0,0 +1,103 @@
+# 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_beta1.ebuild,v 1.1 2008/06/28 06:34:06 dev-zero Exp $
+
+EAPI="1"
+
+inherit eutils
+
+MY_P=${PN}-${PV/_beta/.b}
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++."
+HOMEPAGE="http://xerces.apache.org/xerces-c/"
+SRC_URI="http://people.apache.org/builds/xerces/c/${MY_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-3.8 )
+	curl? ( net-misc/curl )
+	libwww? ( net-libs/libwww )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+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}"
+
+	# disable building broken samples
+	sed -i \
+		-e 's|src tests samples|src tests|' \
+		Makefile.in || die "sed failed"
+
+	sed -i \
+		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
+		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-fix-tests-and-samples.patch"
+}
+
+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*
+		doins -r samples
+		dohtml -r doc/html/*
+	fi
+
+	dodoc STATUS credits.txt version.incl
+	dohtml Readme.html
+
+}