Added beta version for testing

(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64)

3 files changed, 147 insertions, 1 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/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
+
+}