From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 33E951381F3 for ; Sat, 6 Apr 2013 15:49:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C4723E0D49; Sat, 6 Apr 2013 15:49:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E6EAE0D49 for ; Sat, 6 Apr 2013 15:49:52 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05A4933DC9C for ; Sat, 6 Apr 2013 15:49:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 354C5E4073 for ; Sat, 6 Apr 2013 15:49:49 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1365263358.71943be103f7480df9a1344b9b1ea9f5e174c9be.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: dev-libs/icu/, dev-libs/icu/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch dev-libs/icu/files/icu-49.1.2-fix_uclibc_timezone.patch dev-libs/icu/files/icu-49.1.2-platforms.patch dev-libs/icu/icu-49.1.2-r99.ebuild dev-libs/icu/icu-51.1.ebuild dev-libs/icu/metadata.xml X-VCS-Directories: dev-libs/icu/ dev-libs/icu/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 71943be103f7480df9a1344b9b1ea9f5e174c9be X-VCS-Branch: uclibc Date: Sat, 6 Apr 2013 15:49:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 202f1578-0f0c-4b47-a224-0e9c22bf1762 X-Archives-Hash: 05c6ae630c22d840049193ad8658f6da commit: 71943be103f7480df9a1344b9b1ea9f5e174c9be Author: Anthony G. Basile gentoo org> AuthorDate: Sat Apr 6 15:49:18 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Apr 6 15:49:18 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=71943be1 dev-libs/icu: moved to tree, fixed bug #436364 Package-Manager: portage-2.1.11.55 Manifest-Sign-Key: 0xF52D4BBA --- .../icu/files/icu-4.8.1-fix_binformat_fonts.patch | 14 --- dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch | 61 ---------- .../icu/files/icu-49.1.2-fix_uclibc_timezone.patch | 12 -- dev-libs/icu/files/icu-49.1.2-platforms.patch | 59 ---------- dev-libs/icu/icu-49.1.2-r99.ebuild | 92 --------------- dev-libs/icu/icu-51.1.ebuild | 118 -------------------- dev-libs/icu/metadata.xml | 9 -- 7 files changed, 0 insertions(+), 365 deletions(-) diff --git a/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch b/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch deleted file mode 100644 index 6e1a687..0000000 --- a/dev-libs/icu/files/icu-4.8.1-fix_binformat_fonts.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/8800 ---- layout/LookupProcessor.cpp -+++ layout/LookupProcessor.cpp -@@ -201,7 +201,9 @@ - - if (requiredFeatureIndex != 0xFFFF) { - requiredFeatureTable = featureListTable->getFeatureTable(requiredFeatureIndex, &requiredFeatureTag); -- featureReferences += SWAPW(featureTable->lookupCount); -+ if (requiredFeatureTable) { -+ featureReferences += SWAPW(requiredFeatureTable->lookupCount); -+ } - } - - lookupOrderArray = LE_NEW_ARRAY(le_uint16, featureReferences); diff --git a/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch b/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch deleted file mode 100644 index 15df6e2..0000000 --- a/dev-libs/icu/files/icu-4.8.1.1-fix_ltr.patch +++ /dev/null @@ -1,61 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/8764 ---- layout/LESwaps.h -+++ layout/LESwaps.h -@@ -45,8 +45,8 @@ - public: - - /** -- * Reads a big-endian 16-bit word and returns a native-endian value. -- * No-op on a big-endian platform, byte-swaps on a little-endian platform. -+ * This method does the byte swap required on little endian platforms -+ * to correctly access a (16-bit) word. - * - * @param value - the word to be byte swapped - * -@@ -56,21 +56,12 @@ - */ - static le_uint16 swapWord(le_uint16 value) - { --#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \ -- (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \ -- defined(__BIG_ENDIAN__) -- // Fastpath when we know that the platform is big-endian. -- return value; --#else -- // Reads a big-endian value on any platform. -- const le_uint8 *p = reinterpret_cast(&value); -- return (le_uint16)((p[0] << 8) | p[1]); --#endif -+ return (le_uint16)((value << 8) | (value >> 8)); - }; - - /** -- * Reads a big-endian 32-bit word and returns a native-endian value. -- * No-op on a big-endian platform, byte-swaps on a little-endian platform. -+ * This method does the byte swapping required on little endian platforms -+ * to correctly access a (32-bit) long. - * - * @param value - the long to be byte swapped - * -@@ -80,16 +71,11 @@ - */ - static le_uint32 swapLong(le_uint32 value) - { --#if (defined(U_IS_BIG_ENDIAN) && U_IS_BIG_ENDIAN) || \ -- (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && (BYTE_ORDER == BIG_ENDIAN)) || \ -- defined(__BIG_ENDIAN__) -- // Fastpath when we know that the platform is big-endian. -- return value; --#else -- // Reads a big-endian value on any platform. -- const le_uint8 *p = reinterpret_cast(&value); -- return (le_uint32)((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); --#endif -+ return (le_uint32)( -+ (value << 24) | -+ ((value << 8) & 0xff0000) | -+ ((value >> 8) & 0xff00) | -+ (value >> 24)); - }; - - private: diff --git a/dev-libs/icu/files/icu-49.1.2-fix_uclibc_timezone.patch b/dev-libs/icu/files/icu-49.1.2-fix_uclibc_timezone.patch deleted file mode 100644 index f92bdac..0000000 --- a/dev-libs/icu/files/icu-49.1.2-fix_uclibc_timezone.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur icu.orig/source/common/putil.cpp icu/source/common/putil.cpp ---- icu.orig/source/common/putil.cpp 2012-06-01 10:52:46.000000000 -0400 -+++ icu/source/common/putil.cpp 2012-09-26 18:22:04.074820300 -0400 -@@ -633,7 +633,7 @@ - U_CAPI int32_t U_EXPORT2 - uprv_timezone() - { --#ifdef U_TIMEZONE -+#if defined(U_TIMEZONE) && !defined(__UCLIBC__) - return U_TIMEZONE; - #else - time_t t, t1, t2; diff --git a/dev-libs/icu/files/icu-49.1.2-platforms.patch b/dev-libs/icu/files/icu-49.1.2-platforms.patch deleted file mode 100644 index 1aaf580..0000000 --- a/dev-libs/icu/files/icu-49.1.2-platforms.patch +++ /dev/null @@ -1,59 +0,0 @@ -https://ssl.icu-project.org/trac/ticket/9286 -https://ssl.icu-project.org/trac/ticket/9365 -https://ssl.icu-project.org/trac/changeset/31780 -https://ssl.icu-project.org/trac/changeset/31971 -https://ssl.icu-project.org/trac/changeset/32020 -https://ssl.icu-project.org/trac/changeset/32023 - ---- common/putilimp.h -+++ common/putilimp.h -@@ -117,6 +117,8 @@ - # define U_TIMEZONE __timezone - #elif U_PLATFORM_USES_ONLY_WIN32_API - # define U_TIMEZONE _timezone -+#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__) -+ /* not defined */ - #elif U_PLATFORM == U_PF_OS400 - /* not defined */ - #else ---- common/unicode/platform.h -+++ common/unicode/platform.h -@@ -131,7 +131,7 @@ - # include - #elif defined(linux) || defined(__linux__) || defined(__linux) - # define U_PLATFORM U_PF_LINUX --#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -+#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) - # define U_PLATFORM U_PF_BSD - #elif defined(sun) || defined(__sun) - /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */ -@@ -268,6 +268,9 @@ - #elif U_PLATFORM == U_PF_SOLARIS - /* Solaris has inttypes.h but not stdint.h. */ - # define U_HAVE_STDINT_H 0 -+#elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER) -+ /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */ -+# define U_HAVE_STDINT_H 0 - #else - # define U_HAVE_STDINT_H 1 - #endif -@@ -283,6 +286,9 @@ - #elif U_PLATFORM == U_PF_SOLARIS - /* Solaris has inttypes.h but not stdint.h. */ - # define U_HAVE_INTTYPES_H 1 -+#elif U_PLATFORM == U_PF_AIX && !defined(_AIX51) && defined(_POWER) -+ /* PPC AIX <= 4.3 has inttypes.h but not stdint.h. */ -+# define U_HAVE_INTTYPES_H 1 - #else - /* Most platforms have both inttypes.h and stdint.h, or neither. */ - # define U_HAVE_INTTYPES_H U_HAVE_STDINT_H -@@ -352,6 +358,9 @@ - #elif defined(_PA_RISC1_0) || defined(_PA_RISC1_1) || defined(_PA_RISC2_0) - /* HPPA do not appear to predefine any endianness macros. */ - # define U_IS_BIG_ENDIAN 1 -+#elif defined(sparc) || defined(__sparc) || defined(__sparc__) -+ /* Some sparc based systems (e.g. Linux) do not predefine any endianness macros. */ -+# define U_IS_BIG_ENDIAN 1 - #else - # define U_IS_BIG_ENDIAN 0 - #endif diff --git a/dev-libs/icu/icu-49.1.2-r99.ebuild b/dev-libs/icu/icu-49.1.2-r99.ebuild deleted file mode 100644 index 761a723..0000000 --- a/dev-libs/icu/icu-49.1.2-r99.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-49.1.2.ebuild,v 1.7 2012/08/04 13:39:56 ago Exp $ - -EAPI="4" - -inherit eutils versionator - -MAJOR_VERSION="$(get_version_component_range 1)" -if [[ "${PV}" =~ ^[[:digit:]]+_rc[[:digit:]]*$ ]]; then - MINOR_VERSION="0" -else - MINOR_VERSION="$(get_version_component_range 2)" -fi - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" - -BASE_URI="http://download.icu-project.org/files/icu4c/${PV/_/}" -SRC_ARCHIVE="icu4c-${PV//./_}-src.tgz" -DOCS_ARCHIVE="icu4c-${PV//./_}-docs.zip" - -SRC_URI="${BASE_URI}/${SRC_ARCHIVE} - doc? ( ${BASE_URI}/${DOCS_ARCHIVE} )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc ppc64 x86" -IUSE="debug doc examples static-libs" - -DEPEND="doc? ( app-arch/unzip )" -RDEPEND="" - -S="${WORKDIR}/${PN}/source" - -QA_DT_NEEDED="/usr/lib.*/libicudata\.so\.${MAJOR_VERSION}\.${MINOR_VERSION}.*" - -src_unpack() { - unpack "${SRC_ARCHIVE}" - if use doc; then - mkdir docs - pushd docs > /dev/null - unpack "${DOCS_ARCHIVE}" - popd > /dev/null - fi -} - -src_prepare() { - # Do not hardcode flags into icu-config. - # https://ssl.icu-project.org/trac/ticket/6102 - local variable - for variable in CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS; do - sed -i -e "/^${variable} =.*/s:@${variable}@::" config/Makefile.inc.in || die "sed failed" - done - - epatch "${FILESDIR}/${PN}-4.8.1-fix_binformat_fonts.patch" - epatch "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.patch" - epatch "${FILESDIR}/${P}-platforms.patch" - epatch "${FILESDIR}/${P}-fix_uclibc_timezone.patch" -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable examples samples) \ - $(use_enable static-libs static) -} - -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 check -} - -src_install() { - emake DESTDIR="${D}" install - - dohtml ../readme.html - dodoc ../unicode-license.txt - if use doc; then - insinto /usr/share/doc/${PF}/html/api - doins -r "${WORKDIR}/docs/"* - fi -} diff --git a/dev-libs/icu/icu-51.1.ebuild b/dev-libs/icu/icu-51.1.ebuild deleted file mode 100644 index 13ec208..0000000 --- a/dev-libs/icu/icu-51.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-50.1-r2.ebuild,v 1.6 2013/03/06 21:41:31 scarabeus 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/50.1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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}-4.8.1-fix_binformat_fonts.patch" - "${FILESDIR}/${PN}-4.8.1.1-fix_ltr.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/metadata.xml b/dev-libs/icu/metadata.xml deleted file mode 100644 index af64c71..0000000 --- a/dev-libs/icu/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - proxy-maintainers - - arfrever.fta@gmail.com - Arfrever Frehtes Taifersar Arahesis - -