# ChangeLog for sys-devel/gettext
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.59 2004/10/06 23:52:05 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.60 2004/10/07 23:51:46 vapier Exp $
- 06 Oct 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
- also back to unstable for amd64 until the linking bugs are fixed
+*gettext-0.12.1-r2 (07 Oct 2004)
- 06 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.14.1.ebuild:
- Stable on sparc wrt #66355
-
- 06 Oct 2004; <SeJo@gentoo.org> gettext-0.14.1.ebuild:
- back to unstable untill the linking error is fixed
-
- 06 Oct 2004; <SeJo@gentoo.org> gettext-0.14.1.ebuild:
- stable masked ppc gsla: 66355
-
- 05 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.14.1.ebuild:
- Stable on alpha, bug 66355.
-
- 05 Oct 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
- stable on amd64 for security fix
+ 07 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+ +files/gettext-0.12.1-tempfile.patch, +gettext-0.12.1-r2.ebuild:
+ Version bump for security #66355.
*gettext-0.14.1 (05 Oct 2004)
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4b0d19f36807270a25ec572eea182707 ChangeLog 7758
MD5 54aaa466a9fed5f1f9103270af61fa73 gettext-0.11.5-r1.ebuild 1925
MD5 345fe0045c5a575f829ddbe2c47b931c gettext-0.11.5.ebuild 1500
-MD5 8cb2f3670388833120f81b3b0be21cf9 gettext-0.12.1-r1.ebuild 2473
MD5 9d8f0304cd9b63ad7b9567b60bad8e20 gettext-0.12.1.ebuild 2070
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 4cdef3a351daffd0d2dfc6c74acce605 gettext-0.14.1.ebuild 2749
-MD5 7173fbd91bdaba9bfb4ae84d16eff70b ChangeLog 8218
+MD5 8cb2f3670388833120f81b3b0be21cf9 gettext-0.12.1-r1.ebuild 2473
+MD5 79969e86f0f8cd666f546bb92ea9d4ff gettext-0.14.1.ebuild 2685
+MD5 76668cd1cf526a142e4cd2cd24233ba7 gettext-0.12.1-r2.ebuild 2520
MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5 67
MD5 e99872d90f08d5a5ce57121d10f0e07f files/digest-gettext-0.11.5-r1 67
MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1 67
-MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r1 67
MD5 e846923f9b90ce853b73bfd6756a7cab files/gettext-0.12.1-bootstrap.patch 51612
MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
+MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r1 67
MD5 2ef09d5a934ab111e8c3a9623d8e1549 files/digest-gettext-0.14.1 144
+MD5 83b80576c27ac3a75d70802eb9c92790 files/digest-gettext-0.12.1-r2 67
MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.14.1-without_java.patch 2743
MD5 2a60a632eb22d99acfa09d16828fe073 files/gettext-0.14.1-no-java-tests.patch 2885
+MD5 fada337fd753f2580b6849dc560498ff files/gettext-0.12.1-tempfile.patch 2226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBZdahHTu7gpaalycRAlxsAJ9lovy0EsIRrqoAiwgBSQ36LRz7XQCdFVx6
+69WjGYYBiiD5R4E4hjFin0k=
+=1Ez4
+-----END PGP SIGNATURE-----
--- /dev/null
+MD5 5d4bddd300072315e668247e5b7d5bdb gettext-0.12.1.tar.gz 5727037
--- /dev/null
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/autopoint.in gettext-0.14.1/gettext-tools/misc/autopoint.in
+--- gettext-0.14.1.orig/gettext-tools/misc/autopoint.in 2004-01-29 20:17:27.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/autopoint.in 2004-09-20 10:26:14.000000000 +0200
+@@ -39,14 +39,7 @@
+ */* | *\\*) ;;
+ *) # Need to look in the PATH.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+- chmod +x /tmp/conf$$.sh
+- if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f /tmp/conf$$.sh
++ PATH_SEPARATOR=:
+ fi
+ save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+ for dir in $PATH; do
+@@ -318,7 +311,15 @@
+ cvs_dir=tmpcvs$$
+ work_dir=tmpwrk$$
+ mkdir "$cvs_dir"
++if [ $? -ne 0 ]; then
++ echo "ERROR making $cvs_dir"
++ exit 1
++fi
+ mkdir "$work_dir"
++if [ $? -ne 0 ]; then
++ echo "ERROR making $work_dir"
++ exit 1
++fi
+ CVSROOT="$srcdir/$cvs_dir"
+ export CVSROOT
+ unset CVS_CLIENT_LOG
+@@ -417,6 +417,10 @@
+ # Recompute base. It was clobbered by the recursive call.
+ base=`echo "$1" | sed -e 's,/[^/]*$,,'`
+ test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
++ if [ $? -ne 0 ]; then
++ echo "ERROR making directory $base"
++ exit 1
++ fi
+ fi
+ }
+
+diff -ur gettext-0.14.1.orig/gettext-tools/misc/gettextize.in gettext-0.14.1/gettext-tools/misc/gettextize.in
+--- gettext-0.14.1.orig/gettext-tools/misc/gettextize.in 2004-01-20 12:30:06.000000000 +0100
++++ gettext-0.14.1/gettext-tools/misc/gettextize.in 2004-09-20 10:22:39.000000000 +0200
+@@ -39,14 +39,7 @@
+ */* | *\\*) ;;
+ *) # Need to look in the PATH.
+ if test "${PATH_SEPARATOR+set}" != set; then
+- { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
+- chmod +x /tmp/conf$$.sh
+- if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
+- PATH_SEPARATOR=';'
+- else
+- PATH_SEPARATOR=:
+- fi
+- rm -f /tmp/conf$$.sh
++ PATH_SEPARATOR=:
+ fi
+ save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+ for dir in $PATH; do
--- /dev/null
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.12.1-r2.ebuild,v 1.1 2004/10/07 23:51:46 vapier Exp $
+
+inherit eutils gnuconfig
+
+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 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="bootstrap emacs nls"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ use bootstrap && epatch ${FILESDIR}/${P}-bootstrap.patch
+ epatch ${FILESDIR}/${P}-tempfile.patch #66355
+ gnuconfig_update
+}
+
+src_compile() {
+ local myconf=""
+ ( use macos || use ppc-macos ) && myconf="--enable-nls" || myconf="`use_enable 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
+
+ # Build with --without-included-gettext (will use that of glibc), as we
+ # need preloadable_libintl.so for new help2man, bug #40162.
+ # Also note that it only gets build with USE=nls ...
+ # Lastly, we need to build without --disable-shared ...
+ CXX=${CC} econf \
+ --without-included-gettext \
+ ${myconf} || die
+
+ emake || die
+}
+
+src_install() {
+ einstall \
+ lispdir=${D}/usr/share/emacs/site-lisp \
+ docdir=${D}/usr/share/doc/${PF}/html \
+ || die
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+
+ exeopts -m0755
+ exeinto /usr/bin
+ doexe gettext-tools/misc/gettextize || die "doexe"
+
+ # Glibc includes gettext; this isn't needed anymore
+# rm -rf ${D}/usr/include
+# rm -rf ${D}/usr/lib/lib*.{a,so}
+
+ # Again, installed by glibc
+ rm -rf ${D}/usr/share/locale/locale.alias
+
+ # /usr/lib/charset.alias is provided by Mac OS X
+ ( use macos || use ppc-macos ) && rm -f ${D}/usr/lib/charset.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
+
+ # Remove emacs site-lisp stuff if 'emacs' is not in USE
+ if ! use emacs
+ then
+ rm -rf ${D}/usr/share/emacs
+ fi
+
+ dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
+}
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.9 2004/10/06 23:52:05 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.14.1.ebuild,v 1.10 2004/10/07 23:51:46 vapier Exp $
inherit eutils gnuconfig gcc mono
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~ppc-macos s390 sparc ~x86"
+KEYWORDS="-*"
IUSE="bootstrap emacs nls"
DEPEND="virtual/libc"