Fix for compilation with ICU 4.2. Fixes #269659. Thanks to the half dozen people who wrote and tested the patch.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 37 insertions, 2 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index 4f7d06ddcd85..94fcb94e6004 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.80 2009/08/07 05:37:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.81 2009/09/10 10:51:38 patrick Exp $
+
+  10 Sep 2009; Patrick Lauer <patrick@gentoo.org> xerces-c-3.0.1-r1.ebuild,
+  +files/xerces-c-3.0.1-libicu.patch:
+  Fix for compilation with ICU 4.2. Fixes #269659. Thanks to the half dozen
+  people who wrote and tested the patch.
 
 *xerces-c-3.0.1-r1 (07 Aug 2009)
 
diff --git a/dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch b/dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch
new file mode 100644
index 000000000000..263c5f8f12e3
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.0.1-libicu.patch
@@ -0,0 +1,29 @@
+--- src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in.orig	2009-09-01 20:29:37.000000000 +0200
++++ src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in	2009-09-01 20:30:21.000000000 +0200
+@@ -50,8 +50,8 @@ PKGDATA=$(ICU_PREFIX)/bin/pkgdata
+ 
+ # Add -v if you want to see more verbose output.
+ #
+-PKGDATAOPTS=-d . -M '"CC=$(CC)" "CXX=$(CXX)" "AR=$(AR)" "RANLIB=$(RANLIB)" \
+-"CPPFLAGS=$(CPPFLAGS)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "LDFLAGS=$(LDFLAGS)"'
++PKGDATAOPTSSHARED=-d . -r 3.0.1
++PKGDATAOPTSSTATIC=-d .
+ 
+ # Resource shortname
+ PKGNAME=xercesc_messages_$(INTERFACE_VER_U)
+@@ -78,13 +78,13 @@ all: xercesc_messages.lo
+ xercesc_messages.lo: $(RESFILES)
+ ifeq ($(BUILD_SHARED),yes)
+ 	@rm -f $(PKGNAME)_dat.o root_res.o
+-	$(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTS) $(RESLIST)
++	$(PKGDATA) --name $(PKGNAME) --mode dll $(PKGDATAOPTSSHARED) $(RESLIST)
+ 	mv $(PKGNAME)_dat.o $(PKGNAME)_dat-pic.o
+ 	@if test -f root_res.o; then mv root_res.o root_res-pic.o; fi
+ endif
+ ifeq ($(BUILD_STATIC),yes)
+ 	@rm -f $(PKGNAME)_dat.o $(PKGNAME)_dat.ao root_res.o root_res.ao
+-	$(PKGDATA) --name $(PKGNAME) --mode static $(PKGDATAOPTS) $(RESLIST)
++	$(PKGDATA) --name $(PKGNAME) --mode static $(PKGDATAOPTSSTATIC) $(RESLIST)
+ 	@if test -f $(PKGNAME)_dat.ao; then mv $(PKGNAME)_dat.ao $(PKGNAME)_dat.o; fi
+ 	@if test -f root_res.ao; then mv root_res.ao root_res.o; fi
+ endif
diff --git a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
index a86075d07565..ab7ab7ce055c 100644
--- a/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.1-r1.ebuild,v 1.1 2009/08/07 05:37:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.0.1-r1.ebuild,v 1.2 2009/09/10 10:51:38 patrick Exp $
 
 EAPI="2"
 
@@ -36,6 +36,7 @@ src_prepare() {
 		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die "sed failed"
 
 	epatch "${FILESDIR}/${P}-CVE-2009-2625.patch"
+	epatch "${FILESDIR}/${P}-libicu.patch"
 }
 
 src_configure() {