From 641bf6ff02fd95ad9a318a7e8a52eab3eba65b0b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 14 Mar 2011 16:27:02 +0100
Subject: [PATCH] icu: update to 4.6.1, bump abi_depends.

--HG--
branch : gnome3
---
 srcpkgs/icu/depends                      |  2 +-
 srcpkgs/icu/icu-devel.template           | 11 ++++++++---
 srcpkgs/icu/icu-libs.template            |  2 --
 srcpkgs/icu/template                     |  7 +++----
 xbps-src/common/mapping_shlib_binpkg.txt | 14 +++++++-------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/icu/depends b/srcpkgs/icu/depends
index a73444d733..86a5d572ca 100644
--- a/srcpkgs/icu/depends
+++ b/srcpkgs/icu/depends
@@ -1,2 +1,2 @@
-abi_depends=">=4.2"
+abi_depends=">=4.6.1"
 api_depends="${abi_depends}"
diff --git a/srcpkgs/icu/icu-devel.template b/srcpkgs/icu/icu-devel.template
index dffd6d233c..d0a2215084 100644
--- a/srcpkgs/icu/icu-devel.template
+++ b/srcpkgs/icu/icu-devel.template
@@ -1,16 +1,21 @@
 # Template file for 'icu-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+Add_dependency run libstdc++-devel
 Add_dependency run icu
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
+	mkdir -p ${DESTDIR}/usr/{lib,share} ${DESTDIR}/usr/bin \
+		${DESTDIR}/usr/share/man/man1
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/icu ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/{icu,pkgconfig} ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/icu ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/bin/icu-config ${DESTDIR}/usr/bin
+	mv ${SRCPKGDESTDIR}/usr/share/man/man1/icu-config* \
+		${DESTDIR}/usr/share/man/man1
 }
diff --git a/srcpkgs/icu/icu-libs.template b/srcpkgs/icu/icu-libs.template
index e5d67d0fb4..ee9676196d 100644
--- a/srcpkgs/icu/icu-libs.template
+++ b/srcpkgs/icu/icu-libs.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=2
-
 Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 2451e89e34..1697068b40 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -1,13 +1,12 @@
 # Template build file for 'icu'.
 pkgname=icu
-version=4.2
-revision=1
+version=4.6.1
 wrksrc="icu/source"
-distfiles="http://download.icu-project.org/files/icu4c/4.2/icu4c-4_2-src.tgz"
+distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-4_6_1-src.tgz"
 build_style=gnu_configure
 short_desc="Robust and full-featured Unicode services"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=65ab82b70614adf759b1e94324178597f703ad17878513e4802ccc4f061408a5
+checksum=6846b5e67bea5cb7f5c4b0208489498a9b14bc34f2d556cc5a99209038644874
 long_desc="
  The International Components for Unicode(ICU) is a C and C++ library that
  provides robust and full-featured Unicode support on a wide variety of
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index d6b1e7e2bb..5316ec9295 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -469,13 +469,13 @@ libxlutil.so.1			xen			xen-devel
 libvhd.so.1			xen			xen-devel
 libbabl-0.1.so			babl			babl-devel
 libgegl-0.1.so			gegl			gegl-devel
-libiculx.so.42			icu-libs		icu-devel
-libicule.so.42			icu-libs		icu-devel
-libicuio.so.42			icu-libs		icu-devel
-libicui18n.so.42		icu-libs		icu-devel
-libicudata.so.42		icu-libs		icu-devel
-libicutu.so.42			icu-libs		icu-devel
-libicuuc.so.42			icu-libs		icu-devel
+libiculx.so.46			icu-libs		icu-devel
+libicule.so.46			icu-libs		icu-devel
+libicuio.so.46			icu-libs		icu-devel
+libicui18n.so.46		icu-libs		icu-devel
+libicudata.so.46		icu-libs		icu-devel
+libicutu.so.46			icu-libs		icu-devel
+libicuuc.so.46			icu-libs		icu-devel
 libaspell.so.15			aspell			aspell-devel
 libhunspell-1.2.so		hunspell		hunspell-devel
 libenchant.so			enchant			enchant-devel