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

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 40 insertions, 4 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/Manifest b/dev-libs/xerces-c/Manifest
index a9f843560719..835b23b2dfc4 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -5,6 +5,7 @@ AUX xerces-c-2.8.0-64bit_cast.patch 727 RMD160 b0cc302d30c95f324e474a802ad4f14eb
 AUX xerces-c-2.8.0-IconvGNUTransService.cpp.patch 324 RMD160 055a3e565da152b8183284af44a4da8861c851a1 SHA1 47efb106fc25b7a56511aab06462ccd26c9ad246 SHA256 8e37758f88ef3ab2bce31fc9573822b40591250755dcaddf85e53ce9e52b1759
 AUX xerces-c-2.8.0-icu_ressource_fix.patch 1924 RMD160 f994c6003136494672aceaa072ceb7ccc74f7a42 SHA1 fac51469c89c279fed291067ed1d2c1cab660616 SHA256 88b8ee0ec3fd5974c4ccf8d599d91932a1e15ef84927331f42fbce46f7f51046
 AUX xerces-c-3.0.1-CVE-2009-2625.patch 26741 RMD160 926f7b57cf5976696b98835cc48a6a4f42209b2b SHA1 8227519677d0bd58094e0c7645f46b635e931caa SHA256 da95a0890c307ca3998c60dd65db675522570c460d010c8962996193b444f87a
+AUX xerces-c-3.0.1-libicu.patch 1384 RMD160 8d0281cf5514649c34810a3abd5008e4c81c0d13 SHA1 0dbdee819475510eb1271902a3b952f04d37a106 SHA256 7260ac41e43ab775406a6637d2b91d2f15737fa8232e5872ee800d0d25793d4f
 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.tar.gz 4605395 RMD160 92353ec5ec90f292dfc92bf9a9232ddb70977c70 SHA1 3119b26dc749354d645c6f5bae29e1940372a6dc SHA256 ae2ff10d4bb12b120568d781f03056d7b4d1e2742858d3b7bb535a4a791f92a1
@@ -15,7 +16,7 @@ EBUILD xerces-c-2.7.0-r1.ebuild 1501 RMD160 1003b096fcea0bfeb57e9f8069ef56df7807
 EBUILD xerces-c-2.8.0-r1.ebuild 4642 RMD160 d8058817eb9deccd296c28d7ce7ad26df1308358 SHA1 05eefb2a9b3fc1c0546e0b0738e5e4ca41ef43ee SHA256 0f2d68da5eace07a620fe44d122b981b9fb9c41284ea7b37930081970b7ff9ab
 EBUILD xerces-c-3.0.0-r1.ebuild 2368 RMD160 833bc04b122e8653c06924752cf66576cba1d598 SHA1 6c56885d2db92222865c7d5e47b31ed11c6dc172 SHA256 15268ec558c9e9b0bbf34af7633bdd7b45db7328b5c994cabcb174c8b2abde7a
 EBUILD xerces-c-3.0.0.ebuild 2467 RMD160 4e9d9a7cdbbd794c2c72b516d1c6d7a93ede497c SHA1 543c1d76da1fe86b5723722aaaf208810342dd4e SHA256 f8056de840c1ef8cc63deffa2bf8a183e0ec36ddc15090c5a9d4b023d855e7ba
-EBUILD xerces-c-3.0.1-r1.ebuild 2333 RMD160 2fddd50280dd7972e8b132cd4fba2744aa02e166 SHA1 1d41f41e9bc240d3935cfaf674429478b4489d33 SHA256 d0a0ffd00abc9f3f43498db3f2294613aaaccbfab67254ce171a6451b4e5789a
+EBUILD xerces-c-3.0.1-r1.ebuild 2372 RMD160 c0266954d07fe5e5fcae19a43302a6bf53bc8f58 SHA1 ee97a92412150539e54ec8f521409291733e3621 SHA256 e06acac00364be96c1adb64336ca03a56f704cbea0ed66310674b8ba0da166ef
 EBUILD xerces-c-3.0.1.ebuild 2282 RMD160 bf4b92fd1bd6f3f7dafd1f1529539b9e231d4e93 SHA1 ed1c47fa20e1edc0690470e4bf4a888056c3ad41 SHA256 49ee5a37bf7c653a9c29ff01c81887f650b6e349237f86020f8a21728985fd0b
-MISC ChangeLog 12910 RMD160 408a691838fa990e5faad169860c362cbba0e595 SHA1 5b65f6770dec7cc7eae1d26bffbafdaa2b29886b SHA256 bd9070e3c21ec5e6d82fdd0196cae9119f34fab973c3b26d92da3edff62f89b6
+MISC ChangeLog 13141 RMD160 6cadc7d9ec9dc4e16dbf74113e2d7a4be10bf66c SHA1 2e531297a971ae33a35ee199b190907c2b165a5a SHA256 b884c9657de5772851731804d5dbb60cba3d17eff18735b91060adc0300581ba
 MISC metadata.xml 990 RMD160 6d3971925c8a3cc216d6fd906e280bf5191ee6df SHA1 74ca30d03cbdfa15b5c3d9b103acb103ed21973f SHA256 a2260c914227a67006832de9657613f5337edfe071ca47b56f3fc37794563855
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() {