Version bump (bug #196800). Redigested version 2.7.0-r1 for new tarball (bug #192829).

(Portage version: 2.1.4_rc10)

9 files changed, 239 insertions, 6 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index f633feadc154..7f813ac6f6d2 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.49 2007/10/03 10:59:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.50 2007/12/19 20:31:13 dev-zero Exp $
+
+*xerces-c-2.8.0 (19 Dec 2007)
+
+  19 Dec 2007; Tiziano Müller <dev-zero@gentoo.org>
+  +files/xerces-c-2.8.0-64bit_cast.patch, +files/50xerces-c,
+  +files/xerces-c-2.8.0-icu_ressource_fix.patch, metadata.xml,
+  xerces-c-2.7.0-r1.ebuild, +xerces-c-2.8.0.ebuild:
+  Version bump (bug #196800). Redigested version 2.7.0-r1 for new tarball (bug
+  #192829).
 
   03 Oct 2007; Roy Marples <uberlord@gentoo.org> xerces-c-2.7.0-r1.ebuild:
   Keyworded ~x86-fbsd, #194578 thanks to Andreas Nilsson.
diff --git a/dev-libs/xerces-c/files/50xerces-c b/dev-libs/xerces-c/files/50xerces-c
new file mode 100644
index 000000000000..6fdb7ffbdee9
--- /dev/null
+++ b/dev-libs/xerces-c/files/50xerces-c
@@ -0,0 +1 @@
+XERCESC_NLS_HOME="/usr/share/xerces-c/msg"
diff --git a/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1 b/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1
index 8c3071bbf64a..4ff40a010808 100644
--- a/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1
+++ b/dev-libs/xerces-c/files/digest-xerces-c-2.7.0-r1
@@ -1,3 +1,3 @@
-MD5 d5e7c650797c9e6d025d8868c6211491 xerces-c-src_2_7_0.tar.gz 12368496
-RMD160 d01f10b4c0a9c53bf4bcdba388981c9ca7d6268d xerces-c-src_2_7_0.tar.gz 12368496
-SHA256 79525d283630305fa68169eafe08805d2585273f8344069df5c40ce967fd0e1c xerces-c-src_2_7_0.tar.gz 12368496
+MD5 04169609449a8846bc1e6891c04cadf4 xerces-c-src_2_7_0.tar.gz 7760004
+RMD160 80914da4898c694bf0299d612164483f83857baf xerces-c-src_2_7_0.tar.gz 7760004
+SHA256 77fae8a1e7aa58007115c939aa68fd5028da79c481fc457dfce546b50c9dfda5 xerces-c-src_2_7_0.tar.gz 7760004
diff --git a/dev-libs/xerces-c/files/digest-xerces-c-2.8.0 b/dev-libs/xerces-c/files/digest-xerces-c-2.8.0
new file mode 100644
index 000000000000..c3735bf32869
--- /dev/null
+++ b/dev-libs/xerces-c/files/digest-xerces-c-2.8.0
@@ -0,0 +1,3 @@
+MD5 5daf514b73f3e0de9e3fce704387c0d2 xerces-c-src_2_8_0.tar.gz 7893039
+RMD160 d576df7870b043a338358834a0e1180dca39e838 xerces-c-src_2_8_0.tar.gz 7893039
+SHA256 416eaf74bbe6ff3b3c64a282e886810cad6cbb48478d3c83344661504c09c8d6 xerces-c-src_2_8_0.tar.gz 7893039
diff --git a/dev-libs/xerces-c/files/xerces-c-2.8.0-64bit_cast.patch b/dev-libs/xerces-c/files/xerces-c-2.8.0-64bit_cast.patch
new file mode 100644
index 000000000000..43ef9dc2f4ef
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.8.0-64bit_cast.patch
@@ -0,0 +1,13 @@
+--- ./src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp.orig	2007-12-19 12:11:57.000000000 +0100
++++ ./src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp	2007-12-19 12:30:12.000000000 +0100
+@@ -100,8 +100,8 @@
+     * To open user-specified locale specific cat file
+     * and default cat file if necessary
+     */
+-    if ( ((int)(fCatalogHandle=catopen(catuser, 0)) == -1) &&
+-         ((int)(fCatalogHandle=catopen(catdefault, 0)) == -1)   )
++    if ( ((long)(fCatalogHandle=catopen(catuser, 0)) == -1) &&
++         ((long)(fCatalogHandle=catopen(catdefault, 0)) == -1)   )
+     {
+         // Probably have to call panic here
+         printf("Could not open catalog:\n %s\n or %s\n", catuser, catdefault);
diff --git a/dev-libs/xerces-c/files/xerces-c-2.8.0-icu_ressource_fix.patch b/dev-libs/xerces-c/files/xerces-c-2.8.0-icu_ressource_fix.patch
new file mode 100644
index 000000000000..6c42713f2705
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-2.8.0-icu_ressource_fix.patch
@@ -0,0 +1,44 @@
+diff -Naur src/xercesc/util/MsgLoaders/ICU.orig/resources/Makefile.in src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
+--- src/xercesc/util/MsgLoaders/ICU.orig/resources/Makefile.in	2007-12-19 20:49:52.000000000 +0100
++++ src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in	2007-12-19 20:51:51.000000000 +0100
+@@ -61,7 +61,7 @@
+ INVOKE=$(shell icu-config --invoke)
+ #GENRB=$(shell icu-config --invoke=genrb)
+ GENRB=genrb
+-GENRBOPT=--package-name $(PKGNAME)
++#GENRBOPT=--package-name $(PKGNAME)
+ #PKGDATA=$(shell icu-config --invoke=pkgdata)
+ PKGDATA=pkgdata
+ SO=$(shell icu-config --so)
+@@ -111,7 +111,7 @@
+ 
+ # Resource files.  Add new ones for additional locales here.
+ # keep in sync with the file RESLIST
+-RESFILES=$(RESNAME)_en_US.res
++RESFILES=en_US.res
+ 
+ # list of resource bundles  - keep in sync with RESFILES
+ RESLIST=res-file-list-unix.txt
+@@ -149,7 +149,7 @@
+ 	$(INVOKE) $(CHECK_VARS) ./$(TARGET) $(CHECK_ARGS) | tee $(TARGET).out
+ 
+ ## resources
+-$(RESNAME)_%.res: %.txt
++%.res: %.txt
+ 	@echo "generating $@"
+ 	$(GENRB) $(GENRBOPT) $^
+ 
+diff -Naur src/xercesc/util/MsgLoaders/ICU.orig/resources/res-file-list.txt src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt
+--- src/xercesc/util/MsgLoaders/ICU.orig/resources/res-file-list.txt	2007-12-19 20:49:52.000000000 +0100
++++ src/xercesc/util/MsgLoaders/ICU/resources/res-file-list.txt	2007-12-19 20:52:00.000000000 +0100
+@@ -1 +1 @@
+-XercesMessages2_8_0_en_US.res
+\ No newline at end of file
++en_US.res
+diff -Naur src/xercesc/util/MsgLoaders/ICU.orig/resources/res-file-list-unix.txt src/xercesc/util/MsgLoaders/ICU/resources/res-file-list-unix.txt
+--- src/xercesc/util/MsgLoaders/ICU.orig/resources/res-file-list-unix.txt	2007-12-19 20:49:52.000000000 +0100
++++ src/xercesc/util/MsgLoaders/ICU/resources/res-file-list-unix.txt	2007-12-19 20:52:09.000000000 +0100
+@@ -1 +1 @@
+-XercesMessages2_8_0_en_US.res
+\ No newline at end of file
++en_US.res
diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index df3e0f7e68c4..e67fa2013928 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/metadata.xml
@@ -4,3 +4,18 @@
 	<herd>cpp</herd>
 	<longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
 </pkgmetadata>
+<use>
+	<flag name='iconv'>Use iconv as message loader and transcoder (in general it
+	would be possible to use iconv only as message loader and something else
+	like icu or the native method as transcoder and vice-versa, but this is a
+	less common case and hard to handle)</flag>
+	<flag name='icu'>Use ICU as message loader and transcoder. ICU supports over
+	180 different encodings and/or locale specific message support.</flag>
+	<flag name='libwww'>Use the libwww library for fetching URLs, instead
+	of the builtin method</flag>
+	<flag name='native'>Use the 'native' method to fetch URLs. Please read
+	the documentation for this. This is only available on MacOS X</flag>
+	<flag name='threads'>Enable threading support through pthread (or other
+	libraries on AIX, IRIX, HPUX, Solars). Highly recommended.</flag>
+</use>
+
diff --git a/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
index d0ff4bea27ae..28f6bab3e6ef 100644
--- a/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.7.0-r1.ebuild,v 1.11 2007/10/03 10:59:04 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-2.7.0-r1.ebuild,v 1.12 2007/12/19 20:31:13 dev-zero Exp $
 
 inherit eutils multilib versionator
 
@@ -18,7 +18,7 @@ IUSE="doc elibc_FreeBSD"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	eval unset ${!LC_*} LANG
diff --git a/dev-libs/xerces-c/xerces-c-2.8.0.ebuild b/dev-libs/xerces-c/xerces-c-2.8.0.ebuild
new file mode 100644
index 000000000000..d01b6c5bf9be
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-2.8.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/12/19 20:31:13 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 iconv icu libwww +threads elibc_Darwin elibc_FreeBSD"
+
+RDEPEND="icu? ( dev-libs/icu )
+	libwww? ( net-libs/libwww )
+	iconv? ( 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}"
+
+	sed -i \
+		-e 's|sh ./configure.*|/usr/bin/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"
+}
+
+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 iconv && mloader="iconv"
+	use icu && mloader="icu"
+
+	local transcoder="native"
+	if use iconv ; then
+		transcoder="IconvGNU"
+		use elibc_FreeBSD && transcoder="IconvFBSD"
+	fi
+	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"
+
+	cd "${S}"
+	doenvd "${FILESDIR}/50xerces-c"
+
+	# Upstream seems to have forgotten 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