Version bump. Force C++98 to avoid implicitly switching to C++11. Multilib-wrap icu-config.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 158 insertions, 5 deletions

diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog
index ec69e8147958..4dd487cea1ac 100644
--- a/dev-libs/icu/ChangeLog
+++ b/dev-libs/icu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/icu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.291 2015/01/09 21:56:23 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.292 2015/02/01 17:00:52 mgorny Exp $
+
+*icu-54.1 (01 Feb 2015)
+
+  01 Feb 2015; Michał Górny <mgorny@gentoo.org> +icu-54.1.ebuild:
+  Version bump. Force C++98 to avoid implicitly switching to C++11. Multilib-
+  wrap icu-config.
 
 *icu-53.1-r2 (09 Jan 2015)
 
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index cc0ba52dd388..1e3c61cc904f 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -5,16 +5,30 @@ AUX icu-fix-tests-depending-on-date.patch 558 SHA256 1c9891d7d3ad4e498e46bf4cece
 AUX icu-remove-bashisms.patch 5982 SHA256 432e49d3e75465324e80db29f27f4d8864d12ba644878d5287e7a942e3671858 SHA512 a984aba10d7fb92e8d7cb0d9c5d8c0c2193a817ce05113168110a89adf7df754dc82dbe8d134ea5c8d44650badaebd5f60303232d7f2a8e246144dc70639f049 WHIRLPOOL 80df1f9c572f6b4d99c73809d839117a7a3849968f67ac5f58928d2fa44974ccad17c6eb95e5ce880002f72cc0131cf2f7664f66e53a1b2fde541b2b6f943015
 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
+DIST icu4c-54_1-src.tgz 25485678 SHA256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 SHA512 d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c WHIRLPOOL 1ae01eb26824ca591ff76ea040f703023f24975ad4177d49b1dd60f7e7f96f60884745d6c6e5e2bdf17fc8e104e97ed814f6c0ca051d1807814e324eb24e94dd
 EBUILD icu-52.1.ebuild 3129 SHA256 cf990bf7fdecf33dc3d2481acd694c712f9e7356d4f2684c42a73c63bc132ee2 SHA512 009af7ea758a39d29c51924372ccc71b48c380e6c349f20910f1ea140f8642700897f6cb318c6c9cc7faaff052f612e0698c6c3f7bc0728c339d10a8d53144a2 WHIRLPOOL 2723d3ff372373d0733c9c3e5c627db4b461e16d58bead0f8ec9aaf88607fcee80d85d438dd1094ac5239b482fba29319e056a31a369506fb50401e2617653b3
 EBUILD icu-53.1-r1.ebuild 3191 SHA256 1fa7a96e6a6160c2c38c07c3e08cfc55ad6f1e37ef0bd005aacaa7491dd377a5 SHA512 74773f86be2a59562eac1e15c8ebf66097a9d140b760bd5ed107ad7dca84197ae1b17059b6711150054b48f66c9168199742584df42416766c80d4e9fcc18b37 WHIRLPOOL 6283e8f934c1deb1d9c53a01b6406cb975f91886671514f20423ddcfd3a5e5f26add4d0e765b17b64ac0e31d762753fbd2d0bdda21ed96f235d8045d69106dd8
 EBUILD icu-53.1-r2.ebuild 3191 SHA256 d85e29ca6ed9b46102fcce531cff7aaa22ebca32540a167a3c166ff8794dd29a SHA512 16b56f39ca48024cf33c65c803c66e3a9aa5a4731c64c9cd45e580fd0e1d14631eb2636c30e21d3c9afa91056cd94f516bb5226841bf6b0d51d1809d3a1edee7 WHIRLPOOL 0813ad4a1c5c78713c5a7a7ba3e19c97b738579f35a5a69da4f5ae589f58d200f38b7dd9dbca67e0252f607fd0a7b94c3b0de3d8ee367986f734cb51384e9ee7
 EBUILD icu-53.1.ebuild 3132 SHA256 4403839fee702aafa7d934ab3824282497d4b659625028637e562c51af1a3eeb SHA512 6fbfdffc515c8a8f30cbc77d15ef385b2f12b82e7c0fc9787273b3a8ce10e0b0789e5f48b98c0ba33c3c844e329ac0cd3b59041c6b8b684da3eed2e950f0c5be WHIRLPOOL 7dba17c0e738f329f7288a2bebdbc297e668b0f248502bea28114acb0d12ef9f7356d9390121fa87f86a4c5d9224b926c66e9f0bdbdd485e6ca60073b6260cbe
-MISC ChangeLog 37979 SHA256 00309bc1a18dcb9ffb8286bc2929a253519f7c701bb0f739590ebaa22e82394b SHA512 bbffbd7862aad01e022cc941df89484e6edfd0f2e610b817b991db9f660f72e20a4b1ecc88a8462f64de4e20d0e74d4660c0caa863ce048b852bb8178459b740 WHIRLPOOL e602106b6c21bbca97f26d9f3125ad7b986d2b44801d15aac9325c313cd311a2c4e83bc20ec3d5e49eb8dfc9bdfdd882b2f41192aac45910a1af43e2c59521eb
+EBUILD icu-54.1.ebuild 2983 SHA256 f9f93ecb7072e3c75123bc57101a4f289fba80313a857b8822191e63b42598c8 SHA512 1b2894c2007ba9a61162c6c4fa66f857a08efef09b1383725412b4e291ae6d8943ded681bee135fba3691bb5c4b2373fdcb8b6fe744bcecc8dae6ed57c91a213 WHIRLPOOL ec50751e4e341a4e67eae7cf209263141727bc0a5e2777e383665fef042aafb7a7501bf58089261f453b053dd9a83b24f06fc77c8991fa509055d71d2d576039
+MISC ChangeLog 38172 SHA256 b8badaf07a6882fe5bcf977ade4e992e777592d92dba02ffb2a8fd429779f64b SHA512 3c1373c416328a08b928c69d8a8c76bef52604b36f9eb71937054fd84b133de58c77874fccd5b1ca95a8714b230132b5f9f34bfc0eb234c68f7651823e179f68 WHIRLPOOL 871a3caa5b590ef190c2a24b74e4c45a6a45df17b78b9d7dfef608aa84ead48ba3b2b594284babbb9ee93a295ff2f5612f9c64f31fea426059c5aa60d78e9e21
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSwTr4ACgkQfUU/I5AasIpR5wCgopre6qCgg4HKMRhi1NEXt1B2
-C5oAnA5eGdBokEuQ0hvKbfyle4IwVY+G
-=96ko
+iQJ8BAEBCABmBQJUzlvKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOPzIQAIFfTYKSNQrFMEM+HOxjHiFe
+TFhMlOVDIKjoxUqnPAHnglIEm+3vW1h/PYLWc73H5wEvG4Vgq6hv+HIJj97fAhzq
+7ukxcRPH8hqtzzMq7xjKBltsH9HCrlufUo3cLe08+Wqa43kRd3UDpfU+FC4wdZfp
++arj15mlLx4uG2qYA67Es0tWiGjNIvELo09/o6DgujUe4l8YOtyrv04RzLXa7AEp
+LLkjd2U2W7aQuIszaaOn7Zk3s2OA4EMyxhB7LeDkASqs3NcAhFiC5zxiut+t+0H1
+I7nqNyDr50PtmIgZOmiuVMX4gf49I+MbmORN8/SAbzoGjLK228OucWfoamgPeZL+
+CkFNvDdXEaP/hp/ZpDwJLnkJ4gduwgS14BZ0CqgsqNMqmQLgxlHcuSjMRN0Qe+0g
+QOWzCzyhWKzYyeXEE5LKdk2jrKiM/1x4n3C4XVVHaQFPFE987lZ2ky2+JNcpvxSa
+lHzxZWol0+gu/2wKAY5fYZ98SWv7M3H+FAySo3K/UI+/w0it6BDFq0zTxBZCL/05
+u1LkZvrGoKp6YZoTX3Y9oipe79EoVaI8sa88a6grhyssTxfIHsF3FnQINpqzYSp2
+Xwf8wLiOLnC/zfgxKvqDSfk2utblj2PfT5UmBZRhVeQDxbDP1fwt6fX8mQ03bkIc
+y3MjGy1dEDsXCJx1mnT7
+=gOeI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/icu/icu-54.1.ebuild b/dev-libs/icu/icu-54.1.ebuild
new file mode 100644
index 000000000000..6d50651fbf68
--- /dev/null
+++ b/dev-libs/icu/icu-54.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-54.1.ebuild,v 1.1 2015/02/01 17:00:52 mgorny Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic 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/54"
+
+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"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+src_prepare() {
+	local variable
+
+	epatch "${FILESDIR}/${PN}-remove-bashisms.patch"
+	epatch_user
+
+	# 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() {
+	# Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
+	append-cxxflags -std=gnu++98
+
+	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
+}