Build with --without-included-gettext (will use that of glibc), as we need

preloadable_libintl.so for new help2man, bug #40162.

4 files changed, 93 insertions, 6 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 31325e00e85a..4478a5fa7d9a 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.35 2004/01/16 22:07:33 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.36 2004/02/08 12:23:42 azarah Exp $
+
+*gettext-0.12.1-r1 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Build with --without-included-gettext (will use that of glibc), as we need
+  preloadable_libintl.so for new help2man, bug #40162.
 
   16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> gettext-0.12.1.ebuild:
   set ppc in keywords
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 5737673480fc..a76727383a0a 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,10 +1,12 @@
-MD5 54d64035692d3cc40e64cb4c9f8454fb ChangeLog 5196
-MD5 ec1c0c0630be132c7084ddde6c196e23 gettext-0.11.5-r1.ebuild 1839
-MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466
 MD5 44483274c42a896c12c033f0aa91ab53 gettext-0.12.1.ebuild 1880
+MD5 796f7deed82705e378c41f3e81f3fcff ChangeLog 5436
+MD5 ec1c0c0630be132c7084ddde6c196e23 gettext-0.11.5-r1.ebuild 1839
+MD5 808ada45767f523c75b9b43b169e7be5 gettext-0.12.1-r1.ebuild 1887
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
-MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
+MD5 763fc1af245f4f84e158d0bda5345db1 gettext-0.11.5.ebuild 1466
 MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67
+MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
+MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
 MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
+MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r1 67
 MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
diff --git a/sys-devel/gettext/files/digest-gettext-0.12.1-r1 b/sys-devel/gettext/files/digest-gettext-0.12.1-r1
new file mode 100644
index 000000000000..3eb790531a17
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.12.1-r1
@@ -0,0 +1 @@
+MD5 5d4bddd300072315e668247e5b7d5bdb gettext-0.12.1.tar.gz 5727037
diff --git a/sys-devel/gettext/gettext-0.12.1-r1.ebuild b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..5fda420b3a66
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.12.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r1.ebuild,v 1.1 2004/02/08 12:23:42 azarah Exp $
+
+inherit eutils
+
+IUSE="nls"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm -amd64 ~ia64"
+
+DEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use bootstrap && epatch ${FILESDIR}/${P}-bootstrap.patch
+}
+
+src_compile() {
+	local myconf=""
+	use nls || myconf="--disable-nls"
+
+	# Compaq Java segfaults trying to build gettext stuff, and there's
+	# no good way to tell gettext to refrain from building the java
+	# stuff, so... remove compaq-jdk/jre from the PATH
+	if use alpha && [[ $JAVAC == *compaq* ]]; then
+		PATH=$(echo ":${PATH}" | sed 's|:/opt/compaq-j[^:]*||g; s/^://')
+		unset JAVA_HOME CLASSPATH JDK_HOME JAVAC
+	fi
+
+	# When updating in sparc with java the jvm segfaults
+	if use sparc; then
+		epatch ${FILESDIR}/${P}-without_java.patch
+		myconf="--without-java"
+	fi
+
+	CXX=${CC} econf \
+		--disable-shared \
+		--without-included-gettext \
+		${myconf} || die
+
+	# Doesn't work with emake
+	make || die
+}
+
+src_install() {
+	einstall \
+		lispdir=${D}/usr/share/emacs/site-lisp \
+		docdir=${D}/usr/share/doc/${PF}/html \
+		|| die
+
+	exeopts -m0755
+	exeinto /usr/bin
+	doexe misc/gettextize
+
+	#glibc includes gettext; this isn't needed anymore
+	rm -rf ${D}/usr/include
+	rm -rf ${D}/usr/lib/*.{a,so}
+
+	#again, installed by glibc
+	rm -rf ${D}/usr/share/locale/locale.alias
+
+	if [ -d ${D}/usr/doc/gettext ]
+	then
+		mv ${D}/usr/doc/gettext ${D}/usr/share/doc/${PF}/html
+		rm -rf ${D}/usr/doc
+	fi
+
+	dodoc AUTHORS BUGS COPYING ChangeLog DISCLAIM NEWS README* THANKS TODO
+}
+