Version bump. Dropped iconv USE-flag for 2.8.x since the iconv message loader/memory manager is broken (xalan-c and others).

(Portage version: 2.2_rc3/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 166 insertions, 40 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index f108f270f22e..5046d3761a39 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,16 @@
 # 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.59 2008/06/28 06:34:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.60 2008/07/26 19:08:28 dev-zero Exp $
+
+*xerces-c-3.0.0_beta2 (26 Jul 2008)
+*xerces-c-2.8.0-r1 (26 Jul 2008)
+
+  26 Jul 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch,
+  +xerces-c-2.8.0-r1.ebuild, -xerces-c-3.0.0_beta1.ebuild,
+  +xerces-c-3.0.0_beta2.ebuild:
+  Version bump. Dropped iconv USE-flag for 2.8.x since the iconv message
+  loader/memory manager is broken (xalan-c and others).
 
 *xerces-c-3.0.0_beta1 (28 Jun 2008)
 
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
deleted file mode 100644
index 9e135c4ff15f..000000000000
--- a/dev-libs/xerces-c/files/xerces-c-3.0.0_beta1-fix-tests-and-samples.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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-2.8.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..49d49e0fb39c
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-2.8.0-r1.ebuild
@@ -0,0 +1,154 @@
+# 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-2.8.0-r1.ebuild,v 1.1 2008/07/26 19:08:28 dev-zero Exp $
+
+EAPI="1"
+
+inherit eutils multilib versionator flag-o-matic toolchain-funcs
+
+MY_PN="xerces-c-src"
+MY_P=${MY_PN}_$(replace_all_version_separators _)
+
+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/sources/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc icu libwww +threads elibc_Darwin elibc_FreeBSD xqilla"
+
+RDEPEND="icu? ( <dev-libs/icu-3.8 )
+	libwww? ( net-libs/libwww )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	export ICUROOT="/usr"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e 's|sh ./configure.*|true|' \
+		src/xercesc/runConfigure || die "sed failed"
+
+	sed -i \
+		-e 's|-L/usr/lib64 -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib|-L${XERCESCROOT}/lib|g' \
+		-e 's|-L/usr/lib -L/usr/local/lib -L/usr/ccs/lib|-L${XERCESCROOT}/lib|g' \
+		{samples,src/xercesc,tests}/Makefile.incl || die "sed for fixing library include path failed"
+
+	sed -i \
+		-e 's|${PREFIX}/lib|${PREFIX}/${MLIBDIR}|g' \
+		-e 's|$(PREFIX)/lib|$(PREFIX)/${MLIBDIR}|g' \
+		obj/Makefile.in src/xercesc/Makefile.incl || die "sed for fixing install lib dir failed"
+
+	sed -i \
+		-e 's|$(PREFIX)/msg|$(PREFIX)/share/xerces-c/msg|g' \
+		-e 's|${PREFIX}/msg|${PREFIX}/share/xerces-c/msg|g' \
+		src/xercesc/util/Makefile.in || die "sed for changing message catalogue directory failed"
+
+	epatch \
+		"${FILESDIR}/${P}-64bit_cast.patch" \
+		"${FILESDIR}/${P}-icu_ressource_fix.patch" \
+		"${FILESDIR}/${P}-IconvGNUTransService.cpp.patch"
+
+	use xqilla && epatch \
+		"${FILESDIR}/xqilla-xercesc_content_type.patch" \
+		"${FILESDIR}/xqilla-xercesc_regex.patch"
+
+}
+
+src_compile() {
+	export XERCESCROOT="${S}"
+	cd src/xercesc
+
+	local myconf
+	use debug && myconf="-d"
+
+	local bitstobuild="32"
+	$(has_m64) && bitstobuild="64"
+
+	# We need a case-switch here for other platforms,
+	# but we wait until there's a real use case
+	local target="linux"
+	use elibc_FreeBSD && target="freebsd"
+	use elibc_Darwin && target="macosx"
+
+	local mloader="inmem"
+	use icu && mloader="icu"
+
+	local transcoder="native"
+	use icu && transcoder="icu"
+
+	# Other options are available for AIX, HP-11, IRIX or Solaris
+	local thread="none"
+	use threads && thread="pthread"
+
+	# 'native' is only available on OSX (see use.mask) 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="native"
+	use libwww && netaccessor="libwww"
+
+	./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
+		${myconf} -m ${mloader} -n ${netaccessor} -t ${transcoder} \
+		-r ${thread} -b ${bitstobuild} > configure.vars || die "runConfigure failed"
+
+	# This should be safe since runConfigure includes our C[XX]FLAGS
+	eval $(grep export configure.vars)
+	econf || die "econf failed"
+	# Parallel building is horribly broken when not using --as-needed
+	emake -j1 || die "emake failed"
+
+	if use doc ; then
+		cd "${S}/doc"
+		doxygen || die "making docs failed"
+	fi
+}
+
+src_install () {
+	export XERCESCROOT="${S}"
+	cd src/xercesc
+	emake DESTDIR="${D}" MLIBDIR=$(get_libdir) install || die "emake failed"
+
+	if use xqilla; then
+		insinto /usr/include/xercesc/dom/impl
+		cd dom/impl
+		doins \
+			DOMAttrImpl.hpp DOMAttrMapImpl.hpp DOMCasts.hpp DOMCharacterDataImpl.hpp \
+			DOMChildNode.hpp DOMDeepNodeListPool.hpp DOMDocumentImpl.hpp \
+			DOMDocumentTypeImpl.hpp DOMElementImpl.hpp DOMElementNSImpl.hpp \
+			DOMNodeIDMap.hpp DOMNodeImpl.hpp DOMNodeListImpl.hpp DOMParentNode.hpp \
+			DOMRangeImpl.hpp DOMTextImpl.hpp DOMTypeInfoImpl.hpp DOMWriterImpl.hpp
+	fi
+
+	cd "${S}"
+	doenvd "${FILESDIR}/50xerces-c"
+
+	# Upstream forgot this
+	if use icu ; then
+		dolib.so lib/libXercesMessages.so.28.0
+		dosym libXercesMessages.so.28.0 /usr/$(get_libdir)/libXercesMessages.so.28
+		dosym libXercesMessages.so.28.0 /usr/$(get_libdir)/libXercesMessages.so
+	fi
+
+	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
+
+	unset XERCESCROOT
+}
+
+# There are tests available, but without a script to run them
diff --git a/dev-libs/xerces-c/xerces-c-3.0.0_beta1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.0_beta2.ebuild
index 1961ee7fd2ff..092f20662223 100644
--- a/dev-libs/xerces-c/xerces-c-3.0.0_beta1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.0.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.0_beta2.ebuild,v 1.1 2008/07/26 19:08:28 dev-zero Exp $
 
 EAPI="1"
 
@@ -47,8 +47,6 @@ src_unpack() {
 	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() {