Add patch to fix time-based test. Add icu 53, should work with lo 4.2.6. bug#520322 and bug#506916

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 180 insertions, 18 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index d0be4d262ae1..86ca66acf5f7 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.277 2014/08/21 10:38:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.278 2014/08/23 10:17:39 scarabeus Exp $
+
+*icu-53.1 (23 Aug 2014)
+
+  23 Aug 2014; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/icu-fix-tests-depending-on-date.patch, +icu-53.1.ebuild,
+  icu-52.1.ebuild:
+  Add patch to fix time-based test. Add icu 53, should work with lo 4.2.6.
+  bug#520322 and bug#506916
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org> icu-52.1.ebuild:
   Stable for ppc64, wrt bug #512012
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index a41f3a41d9b5..caf16946ec3c 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -2,27 +2,30 @@
 Hash: SHA256
 
 AUX icu-51.1-CVE-2013-2924.patch 1443 SHA256 465798c50079c16e2c6b467f83c5ca227436beb272594a5345eb2787efcdc83b SHA512 167b8bca4e0027cd8eef9354ad8682087cc71b2ff1f910d4245003cf94f8b75be663791741d82a439a7db6e7ade9a0ef800a32d69f3b2c683150c773009d2b59 WHIRLPOOL c1c96d831a760dab21f3ea04bf5b875642e95a11fc46b403e88cd64be0094fa56abcc5f9e41f969baaec2a4d2cdb25f556ce37b8a2322cbe1eeaccc201a56795
+AUX icu-fix-tests-depending-on-date.patch 558 SHA256 1c9891d7d3ad4e498e46bf4cece5d98ea9128678a3e5c26b306d0ac600ffcbe0 SHA512 f5e6dde3c6850682a9b66ad2929fc4137b7fc9101a979e5eecb6e0fc60afacd0e3b4fcc96f91dcf558f41f17a0647a0fd167839f9c116149cce0c356f8ced633 WHIRLPOOL f732bb97764b1384025a3b98f0f1fbd05165cdec02fd448b9626c7aaa2f5d9ba07b2e2057a569f4ce2e947f4d8867265956818fef1a5373931de54ec5fc99d13
 DIST icu4c-51_2-src.tgz 21841928 SHA256 deb027a05f1b3bec03298b96fb93b28c84e9683c22e6f94effa67fdc7bd704cc SHA512 74e22b792d6812c1bf2192f2572f75ec8a14fac5e9b00850f9225279fc09da913082001bef20595f6634a5c3f3335e92906568023544516da69a775bcf5e2a1a WHIRLPOOL 098d6c77543cd6b30cc39dd79776b7dc3b0c4111af289b43dab1dc6ca1fd056bdb99363f8e0af7a2f800b95fe7a50024fa395764c9e14582a0b3c54266b25946
 DIST icu4c-52_1-src.tgz 23875368 SHA256 2f4d5e68d4698e87759dbdc1a586d053d96935787f79961d192c477b029d8092 SHA512 5300b1d97340850d3d72af220ff5cbc2ae2820aff4367b60e52f17ead9831011dcda3d4c5af57c899d47b6fc964b23c9c8922954b32d314d669eb1a479a2efb0 WHIRLPOOL fd9d0ed8f55b93349164595c79544f41791774eff5e82b043be333732104b19c4036f6a6c53784bfe4494c005b950a4e96433646be24f310a681a18db0d19bfd
+DIST icu4c-53_1-src.tgz 23218952 SHA256 6fa74fb5aac070c23eaba1711a7178fe582c59867484c5ec07c49002787a9a28 SHA512 2172bfa7d61172b62380762f180336cf86264faed247e57f9143a5dcc84c286b96baa100302c0d54fe6f51af2d7e286cc5176db8f99c58157a5a750270e770df WHIRLPOOL 760b0e2315b7e097d296442cb33c7e9d154bd52dee649e8c85f85c6c9cbd96e26843f0b176c9afcb33a47987ffd1ed7355e67c92d5c4cbcf01a222a3f3eabdee
 EBUILD icu-51.2-r1.ebuild 3126 SHA256 71a9bcafdbd528298a6e9af0ddcea5f601f77d9d355d594dcaf959adb847f821 SHA512 1c36fa6a4d4bb08870a70b75ea5354c2eefbcb8382a7baa335ee7fd5a723ee90c6f06f0a4a77b0cb1caaca70a13dbee319b8d4b2c4696adc1a624eb6f4799a42 WHIRLPOOL 2d26b2c59e3f68d5c83e033cc51bf2710074301d0c0d31d4c1f8a24095227e35d8ef8f3be793b9a28004fe2c9515246f9c7721d21eb0959da93f95ef94f79182
 EBUILD icu-51.2-r2.ebuild 3488 SHA256 a39c733f30dc97ddafd7444cb5804740bba97aa0d80f96cf894ed0edb30cf206 SHA512 a25d975aab6d219cb429396914859793a3b21443d010bae55eec4dcf59b344884f0f8170aa4de2e463195067b88f86b17fc172068f6f8f7d672789973f16a00e WHIRLPOOL 555515136560840c6261bfdd1ef56136e182699de896b9521cb1e1cae4ed8a2d4457dfdf27a96bc43cf643fb5df434980e4bf5cc878d0739da153e7a116e9911
-EBUILD icu-52.1.ebuild 3066 SHA256 681d752e50291f2b0a4c2e3216372049bb237634ebc67b2d05d4d2c03151267e SHA512 b9d9410c00f711c048145dd9d59f73f1bacbad333338646fec8c1f52067af27b81cea7fe0a9f4c0bc9e925f92b108f47a70e818ba84fb8c9517bf81e2becc0e7 WHIRLPOOL ad4c20a63ea0dbe87563b7b364a8f2bf085a75c66c6d25de89b6d418b6667e2324400f16fe95b170ecb207bfb5018cd63d941a0ceb2b8996a5c79f5a433c867f
-MISC ChangeLog 36178 SHA256 b808f5517a2716ed9c657a626106c2322334c2003f41f7373f85ab031f59e986 SHA512 bbce336295a20c74da0b8e5ac64ad0b4c20a86dffc83979a72e5df07ebd8749e5072ebbd042b3e9f7d674a8530e1b0b0f564bdfa511286d7f6d6529f24c0e4a2 WHIRLPOOL 0d30fda703eec1ff4118d793ec8c033ac90502adf9328cc1b28d0cbe4341e34341528825ad705513d3306a72f62939d147fcf8e23ff5867fcb332842a1672ad2
+EBUILD icu-52.1.ebuild 3133 SHA256 e9ec16330dc8448227cfef90e7893a7aec4b6b80048cfef80decc510b6f341ff SHA512 de25b9629e2636a7ae9943e557ea9037e557e00b018cffb38cef1e246ca5c591a83a4f09eb6a90754b944224c35cd39175093c122a3a27bbc2e96e7048c71452 WHIRLPOOL 0bccc33cf9525af3d76fef51caf901371d93fc93aa1a067ef6ae274de66a67fd37cd08e74af12dbcf332f2594cbfc8fdf7e2d865599e5e71939ef450865a73e9
+EBUILD icu-53.1.ebuild 3143 SHA256 753569839f16adf4d0003151dbd7877af2d7c79ae3813535c2fe8e074e7e11ca SHA512 2a4022592de9497a61a7a76c33a1c260a526a2e12d32e3f1e02c01ba9ec4b27cb1d12aba1a2660017d5606f5beff5420a054c9241b787db6ee25e0be9c60ad12 WHIRLPOOL 3c854e494a68c1e560e7f9e6d7e5b57816508f0d026e815b37fee628b7827716425386df1c4bd44980d8c5bd6cdfd2438a647f28188e33251d74e74f9f05087f
+MISC ChangeLog 36453 SHA256 aef4b2d6c021709bd0b02cf1b78032027b13db24be5421418101b179fea8132d SHA512 873b91bbb994d1e215d6445b29247b833eb69f8076e9896a3e24e62abc5c5696c6fd4606a1573cf4c0036d99080646a9121ef82902551a7c9b04a199d01eb9b3 WHIRLPOOL 4ddcea00ba53abffe34cc6c11d04c0643c38252e7b87eb2fcb8b3040b6bc9ba2533f5e7f28355efee743fbdc20516435790c5a32180f0199b6c1df46b0f2f5f5
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9cxDAAoJELp701BxlEWfcVIQAIL/RFzisGRT0XnFHBhyh27E
-3kNwB+Mk3QUMjT62PL2zfDkRNIMQZcd5sBPEgpkheZavtZuzTsaJcp6/SOjLn8f1
-Nal1j4e4Ia585oAkQhGgcovsIp9Hv3MwS4XJyrW6/NPy8hWoBlccPyn1bbGABXqk
-pLHFkV1gQECoPcKLsmTnF1IGOQyNwyZs3oC6lm7tkpw6jkQvE+z2oy1pBmje8Lm/
-3JfHB47z4pQUPZIDmBeH8Q/tCIa+04EelBMQihc5yJvpTviphE1YWap4m510pcMp
-IWc7TEN5QeG0rYG1d4CcT9ZpFMwWc21IThxTE197YecELUkeEwQGoGHwd2wCsEV+
-7MiIQKBCdBznHWxTsb3XPv11wTm3PZtb69MNxjoEfs8BZNygx39vfx8LXGb+06ii
-kTeVpaC1c3DGYDJxbxFLI/Ek8Fd6yWEYiWfOjlSszW/tuvtrFbvUQ3ruLp0VJuZ4
-0tSekyz1o83pF+csaDyS2w94t5gtIzcQvh4Z0TsNLTB2Za6ZfO4AQNZjomnav95d
-c2T1fMhx8niP2CdRkAuND3RGg8FfmnN+2IfwK3rpzNHYpPjVFmiq9BM4dgbp0AH6
-moseXvR7Eg9mNnvEyyhHlGtKK1Z1bI3WME5etyZH1QTmZC8QfpCHsUaFUTMep1WY
-E+GPJuu97DCIaSXeUiN4
-=4+7y
+iQIcBAEBCAAGBQJT+Go4AAoJEOSiRoyO7jvoZIcQAKOs3v8B5X/abSRg9o6Ev/HN
+ShXfcWqtLq9VUXagfv489Uk/07Exc4dqGPmIWLFQjViq/34rHFInAo0Hkh/C8O+D
+6HKh/wgL3+w4b1Yco8yrxmA41N6/dHwjtoJnxSEO8xiG3F9HzdDJfXNVaURmdWmn
+Tpb6vIHXv+O/H8ZMFDyWzS6Yo+APRz6x3CdQ5vm6iJJnygTWXNZTjM5FErzp4/mI
+iV5A0ZhpAq63THRnaeGmXk7CZHGDsj37ktKQDzQ13nPEWvkEoz3bVBd9mTSIW9jJ
+mumSaymYTIqm3luFDxfejQGqLbNwMlzbHag9PRQFVjz92dL+jv3ox804IcftzgU0
+zFi6+6UvpnJoGqOJI9N7swDuWM1Vynqb+S09YhLkKn+J8Rwpu0cBavyx5fIFiGLZ
+RATdfXtUttMQU/XDr6QbGsCms0U1oYetn0uwTEeCqc+ibZPLLFg4mbXhY4gCdWaI
+mQ1Fbp5J2//G4jODrjH7QET8vjcqFfmqhtWkFyZ/ieCDqYzwn5d6lZj+SbOD3Iy6
+v65PmG03Dk/w6Olr3lGPyufKpulSALJ4vCLPvGA2K11JFW9QD/e1WDQABcgVSbtu
+fTXZA4s2K+IAYuJNUuuDMG/SD22mqgKqXrCr6hxuRd9WPxOJ1gk2SriasahfP6Ov
+Trp12CyzFudO0r7lflU2
+=w6Oe
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/files/icu-fix-tests-depending-on-date.patch b/dev-libs/icu/files/icu-fix-tests-depending-on-date.patch
new file mode 100644
index 000000000000..61c286a54c10
--- /dev/null
+++ b/dev-libs/icu/files/icu-fix-tests-depending-on-date.patch
@@ -0,0 +1,15 @@
+See icu-fix-tests-depending-on-date.patch
+
+Index: icu/source/test/intltest/dtfmttst.cpp
+===================================================================
+--- icu.orig/source/test/intltest/dtfmttst.cpp
++++ icu/source/test/intltest/dtfmttst.cpp
+@@ -1132,7 +1132,7 @@ DateFormatTest::TestTwoDigitYear()
+         return;
+     }
+     parse2DigitYear(fmt, "5/6/17", date(117, UCAL_JUNE, 5));
+-    parse2DigitYear(fmt, "4/6/34", date(34, UCAL_JUNE, 4));
++    parse2DigitYear(fmt, "4/6/34", date(134, UCAL_JUNE, 4));
+ }
+ 
+ // -------------------------------------
diff --git a/dev-libs/icu/icu-52.1.ebuild b/dev-libs/icu/icu-52.1.ebuild
index 3f72c407fe02..e24cbe985a0f 100644
--- a/dev-libs/icu/icu-52.1.ebuild
+++ b/dev-libs/icu/icu-52.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-52.1.ebuild,v 1.11 2014/08/21 10:38:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-52.1.ebuild,v 1.12 2014/08/23 10:17:39 scarabeus Exp $
 
 EAPI=5
 
@@ -27,7 +27,8 @@ S="${WORKDIR}/${PN}/source"
 
 src_prepare() {
 	local variable
-
+	
+	epatch "${FILESDIR}/icu-fix-tests-depending-on-date.patch"
 	epatch_user
 
 	# Do not hardcode flags in icu-config and icu-*.pc files.
diff --git a/dev-libs/icu/icu-53.1.ebuild b/dev-libs/icu/icu-53.1.ebuild
new file mode 100644
index 000000000000..482f2018353f
--- /dev/null
+++ b/dev-libs/icu/icu-53.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-53.1.ebuild,v 1.1 2014/08/23 10:17:39 scarabeus Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/52"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+	)
+"
+
+S="${WORKDIR}/${PN}/source"
+
+src_prepare() {
+	local variable
+
+	epatch "${FILESDIR}/icu-fix-tests-depending-on-date.patch"
+	epatch_user
+
+	# Do not hardcode flags in icu-config and icu-*.pc files.
+	# https://ssl.icu-project.org/trac/ticket/6102
+	for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do
+		sed \
+			-e "/^${variable} =.*/s: *@${variable}@\( *$\)\?::" \
+			-i config/icu.pc.in \
+			-i config/Makefile.inc.in \
+			|| die
+	done
+
+	# Disable renaming as it is stupind thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		$(use_enable debug)
+		$(use_enable static-libs static)
+	)
+
+	multilib_is_native_abi && myeconfargs+=(
+		$(use_enable examples samples)
+	)
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE=${S} \
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		dohtml -p api -r doc/html/
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dohtml ../readme.html
+}