From a0618d7b646c76d1fc416467acf454964ef1be40 Mon Sep 17 00:00:00 2001 From: Ingo Krabbe Date: Mon, 5 Apr 2010 20:55:27 +0200 Subject: new gettext --- sys-devel/gettext/Manifest | 5 + .../gettext/files/gettext-0.17-x-python.patch | 28 +++++ sys-devel/gettext/gettext-0.17-r1.ebuild | 119 +++++++++++++++++++++ 3 files changed, 152 insertions(+) create mode 100644 sys-devel/gettext/files/gettext-0.17-x-python.patch create mode 100644 sys-devel/gettext/gettext-0.17-r1.ebuild diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 367bfef..619942d 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -3,7 +3,12 @@ AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcff AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade SHA1 941da91b9e83eb137a222546e9d83777926ed46f SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539 AUX gettext-0.17-gnuinfo.patch 634 RMD160 09ee57c6b9426bf0781fcd424a00b0ad389b7d89 SHA1 b0ad8cfe31752db56d8eaa82f2c55e6a81994677 SHA256 f38fb566eb1398a46ed93994d6576cd98d025d02e2ecde1f778d26956fe098a1 AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638 +AUX gettext-0.17-x-python.patch 1054 RMD160 5de4646fe872d6cea8ec843fa6e2c519cde20cc7 SHA1 7b374fbd566a78265d1d930bf29d1da9782e9dc3 SHA256 d0b959a7d094f2d51fcd5a2472db5b657d5feeb7e0fdec1f33db728e2d82d38b DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba +EBUILD gettext-0.17-r1.ebuild 3732 RMD160 fbb2f9c94d94f9594507521462369ab94fed21c0 SHA1 4186d43979d481d9f11b14ab377078d734fafa6a SHA256 5a82d6c0cfc7d131cc71acbac797bbb4f7137bf6e039731865942fb18e16f375 EBUILD gettext-0.17.ebuild 3680 RMD160 6eab82e59be318a3e02ec2c430871d13b8dfa239 SHA1 1030612b52ec94d651d4b0c07aab438c0d8f38a4 SHA256 757a64aae98bd2a7e8453afa06eb5f4aa97dbe0c6ec2c389c0ed8ff2c45bc390 MISC ChangeLog 21462 RMD160 294e867ed703a9e69e8f842fb5e3c4f466d22118 SHA1 34ad73313e2c42d725a0c3d0aa64f3ad338d9e68 SHA256 ee61920dc9d0b35f6531b4fb65ca602aafdc5cb0fa9a346875b023cc45cbbfc3 +MISC g.patch 722 RMD160 9ce5a8edaac9a0b489107cab8c96a25549cf691b SHA1 959b1b72deba3e3368a04b30338dd5d36f14062e SHA256 97737402dc5bfbe0cbbbc4aab6c9883cc245aae18997ce82193322d7a9302212 +MISC gettext-0.17-r1.ebuild.orig 3712 RMD160 69374518b21fcb93d9b6dc3a78024d6f81637e0a SHA1 13459af8f378ac5dda812e96024a8002191669c8 SHA256 9dce6782dbc8922f28ddaed6240a1c2f713e57b757fd970e34ab5d68a4d59720 +MISC gettext-0.17-r1.ebuild.rej 1016 RMD160 c279de41545d3f4a1cc46fdacf57a9f628214fb3 SHA1 797b0e7f3a760ba744ac770b5ea5dded92d288ae SHA256 023c353263544a17be080f5dce89ed31ee341de012257838a8be282af786b57d MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 diff --git a/sys-devel/gettext/files/gettext-0.17-x-python.patch b/sys-devel/gettext/files/gettext-0.17-x-python.patch new file mode 100644 index 0000000..20d55f8 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.17-x-python.patch @@ -0,0 +1,28 @@ +From a6fed64abcc079877b33804420c666b867b50987 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 03 Aug 2008 20:00:25 +0000 +Subject: Handle lone high surrogates gracefully. + +2008-08-03 Bruno Haible + + * x-python.c (mixed_string_buffer_append): Replace a lone high + surrogate with U+FFFD. + Reported by Yann + via Santiago Vila . + +diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c +index e6dcc31..e05aca4 100644 +--- a/gettext-tools/src/x-python.c ++++ b/gettext-tools/src/x-python.c +@@ -930,6 +930,11 @@ mixed_string_buffer_append (struct mixed_string_buffer *bp, int c) + + if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00)) + bp->utf16_surr = UNICODE_VALUE (c); ++ else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000)) ++ { ++ /* A half surrogate is invalid, therefore use U+FFFD instead. */ ++ mixed_string_buffer_append_unicode (bp, 0xfffd); ++ } + else + mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c)); + } diff --git a/sys-devel/gettext/gettext-0.17-r1.ebuild b/sys-devel/gettext/gettext-0.17-r1.ebuild new file mode 100644 index 0000000..3a5583a --- /dev/null +++ b/sys-devel/gettext/gettext-0.17-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17-r1.ebuild,v 1.8 2010/03/30 23:22:10 solar Exp $ + +inherit flag-o-matic eutils multilib toolchain-funcs mono libtool + +DESCRIPTION="GNU locale utilities" +HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3 LGPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="acl doc emacs nls nocxx openmp" + +DEPEND="virtual/libiconv + dev-libs/libxml2 + sys-libs/ncurses + dev-libs/expat + acl? ( kernel_linux? ( sys-apps/acl ) )" +PDEPEND="emacs? ( app-emacs/po-mode )" + +src_unpack() { + unpack ${A} + cd "${S}" + + elibtoolize + epunt_cxx + + epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628 + epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch #85054 + epatch "${FILESDIR}"/${PN}-0.15-expat-no-dlopen.patch #146211 + epatch "${FILESDIR}"/${PN}-0.17-open-args.patch #232081 + epatch "${FILESDIR}"/${P}-gnuinfo.patch #249167 + epatch "${FILESDIR}"/${P}-x-python.patch #299658 + + # bundled libtool seems to be broken so skip certain rpath tests + # http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html + sed -i \ + -e '2iexit 77' \ + autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests" + + # until upstream pulls a new gnulib/acl, we have to hack around it + if ! use acl ; then + eval export ac_cv_func_acl{,delete_def_file,extended_file,free,from_{mode,text},{g,s}et_{fd,file}}=no + export ac_cv_header_acl_libacl_h=no + export ac_cv_header_sys_acl_h=no + export ac_cv_search_acl_get_file=no + export gl_cv_func_working_acl_get_file=no + sed -i -e 's:use_acl=1:use_acl=0:' gettext-tools/configure + fi +} + +src_compile() { + local myconf="" + # Build with --without-included-gettext (on glibc systems) + if use elibc_glibc ; then + myconf="${myconf} --without-included-gettext $(use_enable nls)" + else + myconf="${myconf} --with-included-gettext --enable-nls" + fi + use nocxx && export CXX=$(tc-getCC) + + # --without-emacs: Emacs support is now in a separate package + # --with-included-glib: glib depends on us so avoid circular deps + # --with-included-libcroco: libcroco depends on glib which ... ^^^ + econf \ + --docdir="/usr/share/doc/${PF}" \ + --without-emacs \ + --disable-java \ + --with-included-glib \ + --with-included-libcroco \ + $(use_enable openmp) \ + ${myconf} \ + || die + emake || die +} + +src_install() { + emake install DESTDIR="${D}" || die "install failed" + use nls || rm -r "${D}"/usr/share/locale + dosym msgfmt /usr/bin/gmsgfmt #43435 + dobin gettext-tools/misc/gettextize || die "gettextize" + + # remove stuff that glibc handles + if use elibc_glibc ; then + rm -f "${D}"/usr/include/libintl.h + rm -f "${D}"/usr/$(get_libdir)/libintl.* + fi + rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias + + if [[ ${USERLAND} == "BSD" ]] ; then + libname="libintl$(get_libname)" + # Move dynamic libs and creates ldscripts into /usr/lib + dodir /$(get_libdir) + mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/ + gen_usr_ldscript ${libname} + fi + + if use doc ; then + dohtml "${D}"/usr/share/doc/${PF}/*.html + else + rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1} + fi + rm -f "${D}"/usr/share/doc/${PF}/*.html + + dodoc AUTHORS ChangeLog NEWS README THANKS +} + +pkg_preinst() { + # older gettext's sometimes installed libintl ... + # need to keep the linked version or the system + # could die (things like sed link against it :/) + preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7) +} + +pkg_postinst() { + preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7) +} -- cgit v1.2.3-65-gdbad