diff options
author | 2014-09-12 19:13:33 +0000 | |
---|---|---|
committer | 2014-09-12 19:13:33 +0000 | |
commit | ec3af9ba8b0173390280d6b7208f0dd7b4ac3ff5 (patch) | |
tree | b96adf1d6e82408a41643d55c00f964c6d115774 /dev-libs | |
parent | Fix build with USE=doc. Bug #521340 (diff) | |
download | gentoo-2-ec3af9ba8b0173390280d6b7208f0dd7b4ac3ff5.tar.gz gentoo-2-ec3af9ba8b0173390280d6b7208f0dd7b4ac3ff5.tar.bz2 gentoo-2-ec3af9ba8b0173390280d6b7208f0dd7b4ac3ff5.zip |
Remove old
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/icu/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch | 36 | ||||
-rw-r--r-- | dev-libs/icu/icu-51.2-r1.ebuild | 123 | ||||
-rw-r--r-- | dev-libs/icu/icu-51.2-r2.ebuild | 142 |
4 files changed, 5 insertions, 302 deletions
diff --git a/dev-libs/icu/ChangeLog b/dev-libs/icu/ChangeLog index 51be091808cf..1ecc59ad2f23 100644 --- a/dev-libs/icu/ChangeLog +++ b/dev-libs/icu/ChangeLog @@ -1,6 +1,10 @@ # 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.282 2014/09/12 00:49:11 jmorgan Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/ChangeLog,v 1.283 2014/09/12 19:13:33 dilfridge Exp $ + + 12 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org> -icu-51.2-r1.ebuild, + -icu-51.2-r2.ebuild, -files/icu-51.1-CVE-2013-2924.patch: + Remove old 12 Sep 2014; Jack Morgan <jmorgan@gentoo.org> icu-52.1.ebuild: sparc stable for bz512012 diff --git a/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch b/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch deleted file mode 100644 index 65e734c7b3c1..000000000000 --- a/dev-libs/icu/files/icu-51.1-CVE-2013-2924.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: /icu/trunk/source/i18n/csrucode.cpp
-===================================================================
---- /icu/trunk/source/i18n/csrucode.cpp (revision 34075)
-+++ /icu/trunk/source/i18n/csrucode.cpp (revision 34076)
-@@ -1,5 +1,5 @@
- /*
- **********************************************************************
-- * Copyright (C) 2005-2012, International Business Machines
-+ * Copyright (C) 2005-2013, International Business Machines
- * Corporation and others. All Rights Reserved.
- **********************************************************************
-@@ -34,6 +34,7 @@
- const uint8_t *input = textIn->fRawInput;
- int32_t confidence = 0;
-+ int32_t length = textIn->fRawLength;
-
-- if (input[0] == 0xFE && input[1] == 0xFF) {
-+ if (length >=2 && input[0] == 0xFE && input[1] == 0xFF) {
- confidence = 100;
- }
-@@ -58,6 +59,7 @@
- const uint8_t *input = textIn->fRawInput;
- int32_t confidence = 0;
-+ int32_t length = textIn->fRawLength;
-
-- if (input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
-+ if (length >= 4 && input[0] == 0xFF && input[1] == 0xFE && (input[2] != 0x00 || input[3] != 0x00)) {
- confidence = 100;
- }
-@@ -82,5 +84,5 @@
- int32_t confidence = 0;
-
-- if (getChar(input, 0) == 0x0000FEFFUL) {
-+ if (limit > 0 && getChar(input, 0) == 0x0000FEFFUL) {
- hasBOM = TRUE;
- }
diff --git a/dev-libs/icu/icu-51.2-r1.ebuild b/dev-libs/icu/icu-51.2-r1.ebuild deleted file mode 100644 index 0968b5f6d58e..000000000000 --- a/dev-libs/icu/icu-51.2-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# 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-51.2-r1.ebuild,v 1.12 2014/06/09 23:29:56 vapier Exp $ - -EAPI=5 - -inherit eutils toolchain-funcs base autotools - -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/51.2" -# As far as I can remember, icu consumers reacted rather sensitive to icu upgrades in the past. -# Even if revdep-rebuild did not rebuild (i.e. soname did not change), random crashes and -# other irregularities occured until the consumers were rebuilt. So let's rather err on the side -# of caution and more rebuilds here. See also bug 464876. dilfridge - -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" - -PATCHES=( - "${FILESDIR}/${PN}-51.1-CVE-2013-2924.patch" -) - -src_prepare() { - local variable - - base_src_prepare - - # 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.in || die - eautoreconf -} - -src_configure() { - local cross_opts - - # bootstrap for cross compilation - if tc-is-cross-compiler; then - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - ./configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - mkdir -p "${WORKDIR}/host/" - cp -a {bin,lib,config,tools} "${WORKDIR}/host/" - emake clean - - cross_opts="--with-cross-build=${WORKDIR}/host" - fi - - econf \ - --disable-renaming \ - $(use_enable debug) \ - $(use_enable examples samples) \ - $(use_enable static-libs static) \ - ${cross_opts} -} - -src_compile() { - default - - if use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -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 -} - -src_install() { - default - - dohtml ../readme.html - - use doc && dohtml -p api -r doc/html/ -} diff --git a/dev-libs/icu/icu-51.2-r2.ebuild b/dev-libs/icu/icu-51.2-r2.ebuild deleted file mode 100644 index a9ac7c8453f7..000000000000 --- a/dev-libs/icu/icu-51.2-r2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# 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-51.2-r2.ebuild,v 1.9 2014/09/12 00:39:48 jmorgan 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/51.2" -# As far as I can remember, icu consumers reacted rather sensitive to icu upgrades in the past. -# Even if revdep-rebuild did not rebuild (i.e. soname did not change), random crashes and -# other irregularities occured until the consumers were rebuilt. So let's rather err on the side -# of caution and more rebuilds here. See also bug 464876. dilfridge - -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" - -PATCHES=( - "${FILESDIR}/${PN}-51.1-CVE-2013-2924.patch" -) - -src_prepare() { - local variable - - 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.in || 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 -} |