only virtual/libiconv should be as rdep for gettext

7 files changed, 231 insertions, 0 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
new file mode 100644
index 0000000..8fbe2f7
--- /dev/null
+++ b/sys-devel/gettext/Manifest
@@ -0,0 +1,7 @@
+AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
+AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
+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
+DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
+EBUILD gettext-0.17.ebuild 3676 RMD160 2f1abb677e609f885eb15bc3a84185ea29bfcfbf SHA1 6590777a89c834f1cbd022bcf4860c024a24c01d SHA256 c0b3f71244fc2399efd9c634e5f0f8cb50011ee54ec3f32db2f570ba995d7815
diff --git a/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch b/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
new file mode 100644
index 0000000..8a6a695
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
@@ -0,0 +1,17 @@
+The test env manipulates $PATH, executing binaries whose libraries 
+have not yet been installed into the standard library search path.
+Thus we manipulate LD_LIBRARY_PATH so that the current binaries 
+run with the current libraries.
+
+http://bugs.gentoo.org/show_bug.cgi?id=81628
+
+--- gettext-tools/tests/Makefile.in
++++ gettext-tools/tests/Makefile.in
+@@ -122,6 +122,7 @@
+ 
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
+ 		    PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \
++		    LD_LIBRARY_PATH=../lib/.libs:../src/.libs:$$LD_LIBRARY_PATH \
+ 		    GETTEXT="$(CHECKER) tstgettext" \
+ 		    NGETTEXT="$(CHECKER) tstngettext" \
+ 		    XGETTEXT="$(CHECKER) xgettext" \
diff --git a/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
new file mode 100644
index 0000000..57d381d
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/85054
+
+--- gettext-0.14.2/gettext-tools/misc/Makefile.in
++++ gettext-0.14.2/gettext-tools/misc/Makefile.in
+@@ -441,7 +441,7 @@
+ 	  shift; \
+ 	  EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+ 	else : ; fi
+-	@mv -f elc-temp $@
++	@mv -f elc-temp $@ || touch $@
+ $(am__ELCFILES): elc-stamp
+ 	@if test ! -f $@; then \
+ 	  rm -f elc-stamp; \
diff --git a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
new file mode 100644
index 0000000..4630d1d
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
@@ -0,0 +1,36 @@
+Add support for expat-2 to xgettext by linking it at build time rather than
+at runtime using dlopen
+
+http://bugs.gentoo.org/146211
+
+--- gettext-0.15/gettext-tools/configure
++++ gettext-0.15/gettext-tools/configure
+@@ -44267,19 +44266,6 @@
+ 
+ 
+ 
+-case "$host_os" in
+-  linux*)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define DYNLOAD_LIBEXPAT 1
+-_ACEOF
+-
+-    LIBEXPAT="-ldl"
+-    LTLIBEXPAT="-ldl"
+-
+-
+-    ;;
+-  *)
+ 
+ 
+ 
+@@ -44786,8 +44772,6 @@
+ 
+ 
+ 
+-    ;;
+-esac
+ 
+  # If set to t, that means we are running in a shell under Emacs.
+  # If you have an Emacs named "t", then use the full path.
diff --git a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
new file mode 100644
index 0000000..2439166
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
@@ -0,0 +1,16 @@
+Fix broken Info file produced by texinfo 4.11
+http://bugs.gentoo.org/249167
+
+--- gettext-0.17/gettext-tools/doc/gettext.info
++++ gettext-0.17/gettext-tools/doc/gettext.info
+@@ -1,7 +1,8 @@
++This is gettext.info, produced by makeinfo version 4.13 from
++gettext.texi.
++
+ INFO-DIR-SECTION GNU Gettext Utilities
+ START-INFO-DIR-ENTRY
+-This is gettext.info, produced by makeinfo version 4.11 from gettext.texi.
+-
+ * gettext: (gettext).                          GNU gettext utilities.
+ * autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
+ * envsubst: (gettext)envsubst Invocation.      Expand environment variables.
diff --git a/sys-devel/gettext/files/gettext-0.17-open-args.patch b/sys-devel/gettext/files/gettext-0.17-open-args.patch
new file mode 100644
index 0000000..330cbf6
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-open-args.patch
@@ -0,0 +1,25 @@
+2007-11-07  Jim Meyering  <meyering@redhat.com>
+            Bruno Haible  <bruno@clisp.org>
+
+	* write-catalog.c (msgdomain_list_print): Fix open() call.
+
+--- gettext-tools/src/write-catalog.c	7 Oct 2007 19:35:31 -0000	1.4
++++ gettext-tools/src/write-catalog.c	7 Nov 2007 11:43:15 -0000
+@@ -1,5 +1,5 @@
+ /* GNU gettext - internationalization aids
+-   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
++   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -220,7 +220,9 @@
+       /* Open the output file.  */
+       if (!to_stdout)
+ 	{
+-	  fd = open (filename, O_WRONLY | O_CREAT);
++	  fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
++		     /* 0666 in portable POSIX notation: */
++		     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+ 	  if (fd < 0)
+ 	    {
+ 	      const char *errno_description = strerror (errno);
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
new file mode 100644
index 0000000..7ef7bf1
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.14 2008/11/28 22:37:38 ulm 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 ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="acl doc emacs nls nocxx openmp"
+
+RDEPEND="virtual/libiconv"
+DEPEND="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}"
+
+	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
+
+	# 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 8)"
+		# 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)
+}