Fixed ICU compilation bug

Package-Manager: portage-2.1.5.4

4 files changed, 48 insertions, 4 deletions

diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index cb7396e646f3..dde2f6df431f 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/boost-build
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.24 2008/05/05 17:47:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.25 2008/06/05 20:04:07 dev-zero Exp $
+
+*boost-build-1.35.0-r1 (05 Jun 2008)
+
+  05 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.35.0-fix_broken_icu_build.patch, -boost-build-1.35.0.ebuild,
+  +boost-build-1.35.0-r1.ebuild:
+  Fixed ICU compilation bug
 
   05 May 2008; Jeroen Roovers <jer@gentoo.org> boost-build-1.34.1.ebuild,
   boost-build-1.35.0.ebuild:
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index aed3ff5ae6d7..87327491b9dd 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,6 +1,7 @@
+AUX 1.35.0-fix_broken_icu_build.patch 1752 RMD160 0e7ee05c17d76e29abff915e84181361e4095b89 SHA1 273de1fa957091bf3c0d041f54aec9797810f3cf SHA256 71d858236c47b835947d996d3caf0a1de96ace267140d52dd09594db3a96729d
 DIST boost_1_34_1.tar.bz2 12986931 RMD160 303327ff852bc19dd7a94657fdef3c56f5882e06 SHA1 b771271d5cbd3bdb0f119dd66dfd36bad7a66866 SHA256 0f866c75b025a4f1340117a106595cc0675f48ba1e5a9b5c221ec7f19e96ec4c
 DIST boost_1_35_0.tar.bz2 23416747 RMD160 89dc46b7841cd288b5fb6f4b9a1ac7309786dc14 SHA1 80d1fe7b0c45541e2af7628295b18f2af996de16 SHA256 f8bf7368a22ccf2e2cf77048ab2129744be4c03f8488c76ad31c0aa229b280da
 EBUILD boost-build-1.34.1.ebuild 2407 RMD160 95f501e49627fd5aa3f857e41dfd8ccceaad7022 SHA1 a722321d782bc4c532b6098ea3d736ab89118188 SHA256 ec6b1953a89aeb163ecabb7d084caa5372ab07705f9622857ba486a7f0237ae4
-EBUILD boost-build-1.35.0.ebuild 2673 RMD160 62ca430b1211ffc852850a4785ec21c6e30eecd5 SHA1 94e2bc0e36bce3aa42766454270201695764f3d1 SHA256 ca01330e95d973bbbb604dc2bea702fe3655f83a3ab3ac9ea764be4cd6744000
-MISC ChangeLog 3288 RMD160 03108c7b36cd01e45dd9e51fffc08a04b48d39f6 SHA1 b7db0630a8440e6bf99606462aa355ef97d7f188 SHA256 1cd2b6e9cd4629c79c1f556fecd8e1d03da5a1c1e9f81aef3d36480618f47106
+EBUILD boost-build-1.35.0-r1.ebuild 2748 RMD160 3eb65fe0fcdbd1794bbb464d8044bfa7accfd019 SHA1 9c729aefd9fa1ab7c072481923f2e14acf9bcc09 SHA256 a098c2459d80c710d33513c8b92a30e1bc2b1efe8149c719a304ca6f1c59dd7c
+MISC ChangeLog 3518 RMD160 b643d0ab3057cd9958bcb6cddd64cf84c014f8cc SHA1 4b9580a5d03b12525f3983805c65269476e077b6 SHA256 528f0dd4d8b6401ac3f97f86c22def6f92046132fc421c3da2160394e112ed71
 MISC metadata.xml 261 RMD160 5334f981ef24f0e2d90bbf1fc1acfa0861684476 SHA1 9c795ec41d3c4c6c284fc88f292ae04c23083f56 SHA256 3207c8a2b1789cb857ab68170ddb6d4e9e4f970e4a110119e62e7fac0b9f6ddb
diff --git a/dev-util/boost-build/boost-build-1.35.0.ebuild b/dev-util/boost-build/boost-build-1.35.0-r1.ebuild
index 11cdd32658b8..cca933adb395 100644
--- a/dev-util/boost-build/boost-build-1.35.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.35.0-r1.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-util/boost-build/boost-build-1.35.0.ebuild,v 1.2 2008/05/05 17:47:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.35.0-r1.ebuild,v 1.1 2008/06/05 20:04:07 dev-zero Exp $
 
 inherit flag-o-matic toolchain-funcs versionator
 
@@ -22,6 +22,9 @@ S=${WORKDIR}/boost_${MY_PV}/tools
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PV}-fix_broken_icu_build.patch"
 
 	# Remove stripping option
 	cd "${S}/jam/src"
diff --git a/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch b/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch
new file mode 100644
index 000000000000..b4611054c9b0
--- /dev/null
+++ b/dev-util/boost-build/files/1.35.0-fix_broken_icu_build.patch
@@ -0,0 +1,33 @@
+--- trunk/tools/build/v2/build/targets.jam (revision 45072)
++++ trunk/tools/build/v2/build/targets.jam (revision 45245)
+@@ -1170,5 +1170,5 @@
+             ECHO [ targets.indent ] "Building target '$(fn)'" ;
+             targets.increase-indent ;
+-            ECHO [ targets.indent ] "Build request: " [ $(property-set).raw ] ;
++            ECHO [ targets.indent ] "Build request: " $(property-set) [ $(property-set).raw ] ;
+             local cf = [ build-system.command-line-free-features ] ;
+             ECHO [ targets.indent ] "Command line free features: " [ $(cf).raw ] ;
+@@ -1275,5 +1275,14 @@
+                 # case we don't want any diagnostic. In the former case, we need
+                 # diagnostics. FIXME
+-                self.generated.$(property-set) = $(rproperties) ;
++                
++                # If this target fails to build, add <build>no to properties
++                # to cause any parent target to fail to build.  Except that it
++                # - does not work now, since we check for <build>no only in
++                #   common properties, but not in properties that came from
++                #   dependencies
++                # - it's not clear if that's a good idea anyway.  The alias
++                #   target, for example, should not fail to build if a dependency
++                #   fails.
++                self.generated.$(property-set) = [ property-set.create <build>no ] ;
+             }
+         }
+@@ -1283,4 +1292,7 @@
+             {
+                 ECHO [ targets.indent ] "Already built" ;
++                local ur = $(self.generated.$(property-set)) ;
++                ur = $(ur[0]) ;
++                ECHO [ targets.indent ] "  Usage requirements " [ $(ur).raw ] ;
+             }
+         }