icu-32: 58.2 -> 60.1

4 files changed, 32 insertions, 37 deletions

diff --git a/icu-32/.footprint b/icu-32/.footprint
index 593dc909..1cb3677a 100644
--- a/icu-32/.footprint
+++ b/icu-32/.footprint
@@ -2,30 +2,30 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/icu/
-drwxr-xr-x	root/root	usr/lib32/icu/58.2/
--rw-r--r--	root/root	usr/lib32/icu/58.2/Makefile.inc
--rw-r--r--	root/root	usr/lib32/icu/58.2/pkgdata.inc
+drwxr-xr-x	root/root	usr/lib32/icu/60.1/
+-rw-r--r--	root/root	usr/lib32/icu/60.1/Makefile.inc
+-rw-r--r--	root/root	usr/lib32/icu/60.1/pkgdata.inc
 lrwxrwxrwx	root/root	usr/lib32/icu/Makefile.inc -> current/Makefile.inc
-lrwxrwxrwx	root/root	usr/lib32/icu/current -> 58.2
+lrwxrwxrwx	root/root	usr/lib32/icu/current -> 60.1
 lrwxrwxrwx	root/root	usr/lib32/icu/pkgdata.inc -> current/pkgdata.inc
-lrwxrwxrwx	root/root	usr/lib32/libicudata.so -> libicudata.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicudata.so.58 -> libicudata.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicudata.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicui18n.so -> libicui18n.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicui18n.so.58 -> libicui18n.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicui18n.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicuio.so -> libicuio.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicuio.so.58 -> libicuio.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicuio.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicutest.so -> libicutest.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicutest.so.58 -> libicutest.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicutest.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicutu.so -> libicutu.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicutu.so.58 -> libicutu.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicutu.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicuuc.so -> libicuuc.so.58.2
-lrwxrwxrwx	root/root	usr/lib32/libicuuc.so.58 -> libicuuc.so.58.2
--rwxr-xr-x	root/root	usr/lib32/libicuuc.so.58.2
+lrwxrwxrwx	root/root	usr/lib32/libicudata.so -> libicudata.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicudata.so.60 -> libicudata.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicudata.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicui18n.so -> libicui18n.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicui18n.so.60 -> libicui18n.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicui18n.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicuio.so -> libicuio.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicuio.so.60 -> libicuio.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicuio.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicutest.so -> libicutest.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicutest.so.60 -> libicutest.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicutest.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicutu.so -> libicutu.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicutu.so.60 -> libicutu.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicutu.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicuuc.so -> libicuuc.so.60.1
+lrwxrwxrwx	root/root	usr/lib32/libicuuc.so.60 -> libicuuc.so.60.1
+-rwxr-xr-x	root/root	usr/lib32/libicuuc.so.60.1
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/icu-i18n.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/icu-io.pc
diff --git a/icu-32/.md5sum b/icu-32/.md5sum
index 3b6fc6bb..8254a330 100644
--- a/icu-32/.md5sum
+++ b/icu-32/.md5sum
@@ -1,3 +1 @@
-dd2f8f55d76584edaeb975f7dd7f47f9  icu-58.1-iterator.patch
-f39223f2dcbfe36fb758e59195dc651d  icu-58.1-remove-bashisms.patch
-fac212b32b7ec7ab007a12dff1f3aea1  icu4c-58_2-src.tgz
+3d164a2d1bcebd1464c6160ebb8315ef  icu4c-60_1-src.tgz
diff --git a/icu-32/.signature b/icu-32/.signature
index 090cfa7f..cac2d71a 100644
--- a/icu-32/.signature
+++ b/icu-32/.signature
@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXUaiXLvDmPS/iyXiCH5SoPbnAdTwsZj/cxT3k1OwbOR+EHWd2+6ALuxtY1x0v2tx3kuJpjONZMEcdfv2VIHJQws=
-SHA256 (Pkgfile) = c7f7de215ede2abc8baf176da71accee78666295b901d23f935140df2b93c4aa
-SHA256 (.footprint) = dd0dded1e7f4d3ee5d96d467cd28f4a54871993d39793e5da243b4ad0f0e448d
-SHA256 (icu4c-58_2-src.tgz) = 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c
-SHA256 (icu-58.1-remove-bashisms.patch) = 8a2177d5f549168d5680d6477381a9f6f5ca0bd8f6bd23cc30d7f953e10907bc
-SHA256 (icu-58.1-iterator.patch) = 468bba2185584c30a5b096d7c85d0afa739067594f0883b6f8f448b1bf996801
+RWSwxGo/zH7eXRe2sNBgD1JNEuc+/J6gixxvnVU3P5L5Np3sqGcT5yGd1qbP4huQk/0Pw7bby1w/AQS8ZtnN3UX1KKZWE9yfEww=
+SHA256 (Pkgfile) = 8b23954533ae3ebd2e9fc4db9e62a27aa807be463a692af22828fa8ebc78fdc4
+SHA256 (.footprint) = 428d69d3ccebfaa60e9f1ca1cb67fe7e7735510c41763283cfb57e933275789b
+SHA256 (icu4c-60_1-src.tgz) = f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
diff --git a/icu-32/Pkgfile b/icu-32/Pkgfile
index a3903804..73279081 100644
--- a/icu-32/Pkgfile
+++ b/icu-32/Pkgfile
@@ -4,17 +4,16 @@
 # Depends on: icu
 
 name=icu-32
-version=58.2
+version=60.1
 release=1
-source=(http://download.icu-project.org/files/icu4c/$version/icu4c-${version//./_}-src.tgz
-	icu-58.1-remove-bashisms.patch
-	icu-58.1-iterator.patch)
+source=(http://download.icu-project.org/files/icu4c/$version/icu4c-${version//./_}-src.tgz)
 
 build() {
 	cd icu/source
 
-	patch -p1 -i $SRC/icu-58.1-remove-bashisms.patch
-	patch -p1 -i $SRC/icu-58.1-iterator.patch
+	# icu tries to use clang by default
+	[ "$CC" ] || export CC=gcc
+	[ "$CXX" ] || export CXX=g++
 
 	./configure \
 		--prefix=/usr \