Add gettext with hacky patch to use libexpat.so.1 rather than .0.

7 files changed, 206 insertions, 0 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
new file mode 100644
index 0000000..581398a
--- /dev/null
+++ b/sys-devel/gettext/Manifest
@@ -0,0 +1,24 @@
+AUX 0.15-dynload-expat-1.patch 577 RMD160 2c973344600a70fd2881f887e4af54ae25bdcff2 SHA1 0643e944373de185e85b97ea7face42bfa1a4642 SHA256 4684fbed3a12db22465a968f60c312d28ceeb82d6d9582b1ce775fea5434550b
+MD5 035fdf6b404f60e50439ec0777399c21 files/0.15-dynload-expat-1.patch 577
+RMD160 2c973344600a70fd2881f887e4af54ae25bdcff2 files/0.15-dynload-expat-1.patch 577
+SHA256 4684fbed3a12db22465a968f60c312d28ceeb82d6d9582b1ce775fea5434550b files/0.15-dynload-expat-1.patch 577
+AUX 50po-mode-gentoo.el 322 RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 SHA1 b4017776f7abfc1267b8c0799ee512eef60f69ac SHA256 96e59f3fffb71699946e4b930dec98bce68a8234f598f4f85024ee61713991c0
+MD5 26632b2c8167333a89f1818c6cd5002d files/50po-mode-gentoo.el 322
+RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 files/50po-mode-gentoo.el 322
+SHA256 96e59f3fffb71699946e4b930dec98bce68a8234f598f4f85024ee61713991c0 files/50po-mode-gentoo.el 322
+AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
+MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
+RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 files/gettext-0.14.1-lib-path-tests.patch 707
+SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097 files/gettext-0.14.1-lib-path-tests.patch 707
+AUX gettext-0.14.2-fix-race.patch 417 RMD160 df2087f9972697c76e6468fffce7484b9a0cc02b SHA1 e7c097c69d95501278fdfb751a3d943880a0a0a1 SHA256 b3fd8ada4d6cb75824d7bf7437d309b5a23a2aca6819b5e592a24654203c2c0e
+MD5 dfcc1d12d05c42f262de0dada08ed90d files/gettext-0.14.2-fix-race.patch 417
+RMD160 df2087f9972697c76e6468fffce7484b9a0cc02b files/gettext-0.14.2-fix-race.patch 417
+SHA256 b3fd8ada4d6cb75824d7bf7437d309b5a23a2aca6819b5e592a24654203c2c0e files/gettext-0.14.2-fix-race.patch 417
+DIST gettext-0.15.tar.gz 8081941 RMD160 e485b60965cf74808801e674c570c7ccd63bd61e SHA1 84f9cb6a043d4a85acf06f8c89f2a34202efa210 SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08
+EBUILD gettext-0.15.ebuild 3912 RMD160 17f60ef2d6a575cd9290721f307be8dea18e18f5 SHA1 f0821a995aa76104141175ee1c0ad035cca54acb SHA256 b3d71642d0b5e40cc9e453bc48840a89d5837961adf4153279bfcfdec6d420a0
+MD5 3f49fd7c831be926a78a30c743728581 gettext-0.15.ebuild 3912
+RMD160 17f60ef2d6a575cd9290721f307be8dea18e18f5 gettext-0.15.ebuild 3912
+SHA256 b3d71642d0b5e40cc9e453bc48840a89d5837961adf4153279bfcfdec6d420a0 gettext-0.15.ebuild 3912
+MD5 17d746c8efa5e4286c26bf52fddc47d7 files/digest-gettext-0.15 241
+RMD160 a0eac6fb612cbd682123137994a7183beea6aab0 files/digest-gettext-0.15 241
+SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/digest-gettext-0.15 241
diff --git a/sys-devel/gettext/files/0.15-dynload-expat-1.patch b/sys-devel/gettext/files/0.15-dynload-expat-1.patch
new file mode 100644
index 0000000..29e74d1
--- /dev/null
+++ b/sys-devel/gettext/files/0.15-dynload-expat-1.patch
@@ -0,0 +1,12 @@
+diff -urN gettext-0.15.orig/gettext-tools/src/x-glade.c gettext-0.15/gettext-tools/src/x-glade.c
+--- gettext-0.15.orig/gettext-tools/src/x-glade.c	2006-09-03 22:38:01.000000000 -0700
++++ gettext-0.15/gettext-tools/src/x-glade.c	2006-09-03 22:38:14.000000000 -0700
+@@ -157,7 +157,7 @@
+       void *handle;
+       /* Be careful to use exactly the version of libexpat that matches the
+ 	 binary interface declared in <expat.h>.  */
+-#if XML_MAJOR_VERSION >= 2
++#if 1
+       handle = dlopen ("libexpat.so.1", RTLD_LAZY);
+ #else
+       handle = dlopen ("libexpat.so.0", RTLD_LAZY);
diff --git a/sys-devel/gettext/files/50po-mode-gentoo.el b/sys-devel/gettext/files/50po-mode-gentoo.el
new file mode 100644
index 0000000..bb82784
--- /dev/null
+++ b/sys-devel/gettext/files/50po-mode-gentoo.el
@@ -0,0 +1,8 @@
+
+;; site-file configuration for po-mode
+
+(autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+(autoload 'po-find-file-coding-system "po-compat")
+
+(add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
+(modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\." 'po-find-file-coding-system)
diff --git a/sys-devel/gettext/files/digest-gettext-0.15 b/sys-devel/gettext/files/digest-gettext-0.15
new file mode 100644
index 0000000..ab028c6
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.15
@@ -0,0 +1,3 @@
+MD5 16bc6e4d37ac3d07495f737a2349a22b gettext-0.15.tar.gz 8081941
+RMD160 e485b60965cf74808801e674c570c7ccd63bd61e gettext-0.15.tar.gz 8081941
+SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08 gettext-0.15.tar.gz 8081941
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..dd0bf96
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
@@ -0,0 +1,11 @@
+--- gettext-0.14.2/gettext-tools/misc/Makefile.in.az	2005-03-14 00:40:56.000000000 +0200
++++ gettext-0.14.2/gettext-tools/misc/Makefile.in	2005-03-14 00:41:26.000000000 +0200
+@@ -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/gettext-0.15.ebuild b/sys-devel/gettext/gettext-0.15.ebuild
new file mode 100644
index 0000000..4b0d2d2
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.15.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15.ebuild,v 1.5 2006/08/02 09:34:27 flameeyes Exp $
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs nls doc nocxx"
+
+DEPEND="virtual/libiconv"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx
+
+	epatch "${FILESDIR}"/${PV}-dynload-expat-1.patch
+
+	epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628
+	# Fix race, bug #85054
+	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch
+
+	# 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"
+
+	# use Gentoo std docdir
+	sed -i \
+		-e "/^docdir=/s:=.*:=/usr/share/doc/${PF}:" \
+		gettext-runtime/configure \
+		gettext-tools/configure \
+		gettext-tools/examples/installpaths.in \
+		|| die "sed docdir"
+
+	# sanity check for Bug 105304
+	if [[ -z ${USERLAND} ]] ; then
+		eerror "You just hit Bug 105304, please post your 'emerge info' here:"
+		eerror "http://bugs.gentoo.org/105304"
+		die "Aborting to prevent screwing your system"
+	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 emacs || export EMACS=no #93823
+	use nocxx && export CXX=$(tc-getCC)
+	econf \
+		--disable-java \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+src_install() {
+	make 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
+
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	local libname="libintl$(get_libname 7)"
+	if [[ -e ${ROOT}/usr/$(get_libdir)/${libname} ]] ; then
+		cp -pPR ${ROOT}/usr/$(get_libdir)/${libname}* "${D}"/usr/$(get_libdir)/
+		touch "${D}"/usr/$(get_libdir)/${libname}*
+	fi
+	if [[ -e ${ROOT}/$(get_libdir)/${libname} ]] ; then
+		dodir /$(get_libdir)
+		cp -pPR ${ROOT}/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+		touch "${D}"/$(get_libdir)/${libname}*
+	fi
+
+	if ! use elibc_glibc; 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
+		rm -rf "${D}"/usr/share/doc/${PF}/html
+		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	dohtml "${D}"/usr/share/doc/${PF}/*.html
+	rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+	# Remove emacs site-lisp stuff if 'emacs' is not in USE
+	if use emacs ; then
+		elisp-site-file-install "${FILESDIR}"/50po-mode-gentoo.el
+	else
+		rm -rf "${D}"/usr/share/emacs
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	ewarn "Any package that linked against the previous version"
+	ewarn "of gettext will have to be rebuilt."
+	ewarn "Please 'emerge gentoolkit' and run:"
+	ewarn "revdep-rebuild --library libintl.so.7"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}