icu: update icu-data with tzdata2015b

* a fix for icu-config was already present in packages repo, but never
committed at Haikuports, hence the bump from 3 to 5.

dev-libs/icu/icu-54.1.recipe

@@ -3,8 +3,12 @@ HOMEPAGE="http://www.icu-project.org"
 LICENSE="ICU"
 COPYRIGHT="1997-2014 IBM Corporation and others."
 SRC_URI="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-54_1-src.tgz"
+SRC_URI_2="http://www.iana.org/time-zones/repository/releases/tzdata2015b.tar.gz#noarchive"
+SRC_URI_3="http://download.icu-project.org/files/icu4c/$portVersion/icu4c-54_1-data.zip#noarchive"
 CHECKSUM_SHA256="d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3"
-REVISION="3"
+CHECKSUM_SHA256_2="556ac1a5b3a371adc1ad4e77138f78ddd7f8ddd7bc2b52545924598c7dc8ad62"
+CHECKSUM_SHA256_3="ad99d024cd06de90f78ea9c3f145c456ab4a021d2110bd110a986a50d3f2b2b7"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -38,6 +42,8 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
+	cmd:unzip
+	cmd:tar
 	"
 
 SOURCE_DIR="icu"
@@ -46,6 +52,9 @@ PATCHES="icu-54.1.patchset"
 BUILD()
 {
 	cd source
+	cp ../../../sources-2/tzdata*.tar.gz tools/tzcode/
+	unzip -oq ../../../sources-3/icu4c-54_1-data.zip
+	rm -f data/in/icudt54l.dat
 	autoconf
 	runConfigure ./configure \
 		--disable-renaming --disable-samples --disable-extras
@@ -66,6 +75,10 @@ INSTALL()
 		libicutu \
 		libicuuc
 	fixPkgconfig
+	
+	# Update icu-config to point to the develop/lib dir
+	fixDevelopLibDirReferences \
+		$binDir/icu-config
 
 	# Rename the data/icu directory when built for the secondary architecture,
 	# so that it doesn't clash with the primary package's.

dev-libs/icu/patches/icu-54.1.patchset

@@ -1,4 +1,4 @@
-From 4ba13d037a73e2c830af1e657c7df94134a3f8ff Mon Sep 17 00:00:00 2001
+From baa6e3bf844c3cf036cb0b080ddd6109e5f9a9fb Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 29 Sep 2014 11:19:28 +0200
 Subject: gcc2 fixes.
@@ -741,7 +741,7 @@ index efad363..5676e6d 100644
 1.8.3.4
 
 
-From a5f3b7368062f04d77119aa9638eb72834bea858 Mon Sep 17 00:00:00 2001
+From 3bb3350e14d91e05c87c01d2707b626d863e3ba0 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Thu, 2 Oct 2014 14:54:39 +0200
 Subject: Force definition of U_DISABLE_RENAMING
@@ -767,7 +767,7 @@ index ed073b6..4950c5e 100644
 1.8.3.4
 
 
-From 6086513b52712a83b29636f1df723416dccab4e6 Mon Sep 17 00:00:00 2001
+From 3343d5fa455ccf69c3db877d3134dd4f32ac9af7 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Fri, 3 Oct 2014 11:07:01 +0200
 Subject: Don't call tzset and tzname on Haiku
@@ -871,7 +871,7 @@ index b30c8d0..89902b4 100644
 1.8.3.4
 
 
-From df3c615d0101774ffdf9bdbd5c2867e4e4609886 Mon Sep 17 00:00:00 2001
+From 675a0667bee53b6d00de939af2ed82282dec7e6d Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Mon, 6 Oct 2014 13:28:09 +0200
 Subject: more gcc2 fixes for ICU 54.
@@ -989,19 +989,16 @@ index 43b2d53..70802e4 100644
 1.8.3.4
 
 
-From 18b95209cbdd8145d4d6b5fd89527b39d55f7012 Mon Sep 17 00:00:00 2001
+From 5c4615966fb385dd000fa9adca7156b4976b1955 Mon Sep 17 00:00:00 2001
 From: Oliver Tappe <zooey@hirschkaefer.de>
 Date: Fri, 14 Nov 2014 23:56:19 +0100
-Subject: [PATCH] Restore missing parts for proper Haiku port.
+Subject: Restore missing parts for proper Haiku port.
 
 * Actually set the platform to U_HAIKU for Haiku target.
 * Use gcc to build icudt54l_dat.o for Haiku target.
----
- source/configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/source/configure.ac b/source/configure.ac
-index b30c8d0..b676bed 100644
+index 89902b4..9f3b893 100644
 --- a/source/configure.ac
 +++ b/source/configure.ac
 @@ -626,7 +626,7 @@ AC_MSG_CHECKING([for genccode assembly])
@@ -1013,7 +1010,7 @@ index b30c8d0..b676bed 100644
      if test "$GCC" = yes; then
          # We're using gcc, and the simple -a gcc command line works for genccode
          GENCCODE_ASSEMBLY="-a gcc"
-@@ -1251,6 +1251,7 @@ case "${host}" in
+@@ -1227,6 +1227,7 @@ case "${host}" in
  	*-*-nto*)	platform=U_QNX ;;
  	*-dec-osf*) 	platform=U_OSF ;;
  	*-*-beos)		platform=U_BEOS ;;
@@ -1022,5 +1019,28 @@ index b30c8d0..b676bed 100644
  	*-ncr-*)		platform=U_MPRAS ;;
  	*) 		platform=U_UNKNOWN_PLATFORM ;;
 -- 
-1.8.1.4
+1.8.3.4
+
+
+From 93cbe09790e65f5c22ae8150a547789a027f6ba8 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 26 Mar 2015 18:39:42 +0000
+Subject: gcc2 fixes for tztools.
+
+
+diff --git a/source/tools/tzcode/private.h b/source/tools/tzcode/private.h
+index 1a85c88..0ee3329 100644
+--- a/source/tools/tzcode/private.h
++++ b/source/tools/tzcode/private.h
+@@ -120,7 +120,7 @@
+ */
+ #ifndef HAVE_STDINT_H
+ #define HAVE_STDINT_H \
+-	(199901 <= __STDC_VERSION__ || \
++	(defined(__HAIKU__) || 199901 <= __STDC_VERSION__ || \
+ 	2 < (__GLIBC__ + (0 < __GLIBC_MINOR__)))
+ #endif /* !defined HAVE_STDINT_H */
+ 
+-- 
+1.8.3.4