From 3ee945ceadf128884ff340e4088879c756136ebd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Mar 2018 19:17:23 +0000 Subject: dev-libs/icu : version bump --- dev-libs/icu-layoutex/Manifest | 2 +- .../icu-layoutex/files/icu-58.2-glibc226.patch | 16 --- dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild | 116 --------------------- dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild | 115 ++++++++++++++++++++ 4 files changed, 116 insertions(+), 133 deletions(-) delete mode 100644 dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch delete mode 100644 dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild create mode 100644 dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild (limited to 'dev-libs/icu-layoutex') diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest index dc6f8971..8cc3e3d4 100644 --- a/dev-libs/icu-layoutex/Manifest +++ b/dev-libs/icu-layoutex/Manifest @@ -1 +1 @@ -DIST icu4c-58_2-src.tgz 23369902 SHA256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c SHA512 5c21af748f48b392e6c0412bd0aee92162ea931820dcbfab4ec6e0299868504b303d88f7586cc95de55c777ac0dca3a29d6c8ca0892c646ebc864c8a5b5a162a WHIRLPOOL 25829f8ee870b703fd604ae5b9b584390a142f5011e2a5db18332453e2f1640d81270086f243318eeb93f187b04ea23dab14901ab81c8d924c8d47b1f77aee5a +DIST icu4c-60_2-src.tgz 23317835 SHA256 f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418 SHA512 8e718e66c13e7f25714404c46b91ed6305efff1df70c328be2ec743023a7719016dae72a5fa0a05d6f5599983590a2044ff72d3453a048d987ab546d0416d694 WHIRLPOOL 1f2d0e1bb5790fa4a3f6e6dc4a8a59c052e01b21f87bbbdc615377a9880889fe37ec40f9f0c16a10e3ef5e7a68a95986143ff9ab82ee97b22e9fbe72e557722b diff --git a/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch b/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch deleted file mode 100644 index 7003173a..00000000 --- a/dev-libs/icu-layoutex/files/icu-58.2-glibc226.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ruN a/i18n/digitlst.cpp b/i18n/digitlst.cpp ---- a/i18n/digitlst.cpp 2016-10-27 01:37:56.000000000 -0000 -+++ b/i18n/digitlst.cpp 2017-09-21 20:39:29.873030393 -0000 -@@ -61,11 +61,7 @@ - #endif - - #if U_USE_STRTOD_L --# if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN --# include --# else --# include --# endif -+# include - #endif - - // *************************************************************************** diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild deleted file mode 100644 index b393329f..00000000 --- a/dev-libs/icu-layoutex/icu-layoutex-58.2-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="External layout part of 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/${PV}" - -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86" -IUSE="debug static-libs" - -RDEPEND=" - ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] - dev-libs/icu-le-hb[${MULTILIB_USEDEP}] -" - -DEPEND=" - virtual/pkgconfig[${MULTILIB_USEDEP}] - ${RDEPEND} -" - -S="${WORKDIR}/${PN/-layoutex}/source" - -PATCHES=( - "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" - "${FILESDIR}/icu-${PV}-glibc226.patch" -) - -src_prepare() { - # apply patches - default - - local variable - - # Disable renaming as it is stupid 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 - - eautoreconf -} - -src_configure() { - # Use C++14 - append-cxxflags -std=c++14 - - 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 - --enable-layoutex - $(use_enable debug) - $(use_enable static-libs static) - ) - - 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_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 - pushd layoutex &>/dev/null || die - emake -j1 VERBOSE="1" check - popd &>/dev/null || die -} - -multilib_src_install() { - pushd layoutex &>/dev/null || die - default - popd &>/dev/null || die -} diff --git a/dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild b/dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild new file mode 100644 index 00000000..df4a632e --- /dev/null +++ b/dev-libs/icu-layoutex/icu-layoutex-60.2-r1.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal + +DESCRIPTION="External layout part of 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/${PV}" + +KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 sparc x86" +IUSE="debug static-libs" + +RDEPEND=" + ~dev-libs/icu-${PV}[${MULTILIB_USEDEP}] + dev-libs/icu-le-hb[${MULTILIB_USEDEP}] +" + +DEPEND=" + virtual/pkgconfig[${MULTILIB_USEDEP}] + ${RDEPEND} +" + +S="${WORKDIR}/${PN/-layoutex}/source" + +PATCHES=( + "${FILESDIR}/${PN}-58.1-remove-bashisms.patch" +) + +src_prepare() { + # apply patches + default + + local variable + + # Disable renaming as it is stupid 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 + + eautoreconf +} + +src_configure() { + # Use C++14 + append-cxxflags -std=c++14 + + 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 + --enable-layoutex + $(use_enable debug) + $(use_enable static-libs static) + ) + + 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_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 + pushd layoutex &>/dev/null || die + emake -j1 VERBOSE="1" check + popd &>/dev/null || die +} + +multilib_src_install() { + pushd layoutex &>/dev/null || die + default + popd &>/dev/null || die +} -- cgit v1.2.3