From ef662e4877743f26980492ddb20f389b6724a85e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 20 Apr 2005 04:35:02 +0000
Subject: Add tempfile patch to resolve #85766. Package-Manager:
 portage-2.0.51.19

---
 sys-devel/gettext/ChangeLog                        |   9 +-
 sys-devel/gettext/Manifest                         |   7 +-
 sys-devel/gettext/files/digest-gettext-0.14.1      |   1 -
 sys-devel/gettext/files/digest-gettext-0.14.1-r1   |   1 +
 .../gettext/files/gettext-0.14.1-tempfile.patch    |  75 +++++++++++++++
 sys-devel/gettext/gettext-0.14.1-r1.ebuild         | 104 +++++++++++++++++++++
 sys-devel/gettext/gettext-0.14.1.ebuild            | 103 --------------------
 7 files changed, 192 insertions(+), 108 deletions(-)
 delete mode 100644 sys-devel/gettext/files/digest-gettext-0.14.1
 create mode 100644 sys-devel/gettext/files/digest-gettext-0.14.1-r1
 create mode 100644 sys-devel/gettext/files/gettext-0.14.1-tempfile.patch
 create mode 100644 sys-devel/gettext/gettext-0.14.1-r1.ebuild
 delete mode 100644 sys-devel/gettext/gettext-0.14.1.ebuild

(limited to 'sys-devel')

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index e14c110730d8..54b6b5167b03 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.86 2005/04/19 22:19:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.87 2005/04/20 04:35:02 vapier Exp $
+
+*gettext-0.14.1-r1 (20 Apr 2005)
+
+  20 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.14.1-tempfile.patch, -gettext-0.14.1.ebuild,
+  +gettext-0.14.1-r1.ebuild:
+  Add tempfile patch to resolve #85766.
 
 *gettext-0.14.4 (19 Apr 2005)
 
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 5470037562fd..0b37cce137e3 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,18 +1,19 @@
-MD5 dc2113542ca87eb0211dfa2490024c33 ChangeLog 11011
-MD5 4ceb106b6c349b85832f62cc41471849 gettext-0.14.1.ebuild 2835
+MD5 53d07ac1a79084b28803fc79f2a5ac49 ChangeLog 11229
 MD5 0890c612ec51d74a5cefbb0ca3ab8ae7 gettext-0.12.1-r2.ebuild 2543
 MD5 d967d965a46639c1bac52e6695bb854e gettext-0.14.2.ebuild 3506
 MD5 d3020868e243d7ddc4a0f97312275ca8 gettext-0.14.4.ebuild 3480
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 98a326fa7a00d28eeceddb4771e7343c gettext-0.14.1-r1.ebuild 2885
 MD5 3077319e6090fcd6262e2d8fd463441f files/gettext-0.14.1-lib-path-tests.patch 707
 MD5 44ad3082200305087e6244f5a2665892 files/digest-gettext-0.14.2 67
 MD5 b56837fdd725fc00c173b57b951b90cc files/gettext-0.14.2-no-java-tests.patch 2524
 MD5 3b9aefbb552545fdf0836f56121c9ae5 files/gettext-0.12.1-without_java.patch 2743
 MD5 bc7e7f683a64a5f805af77b1ed851b65 files/digest-gettext-0.14.4 67
-MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1 67
 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
 MD5 dfcc1d12d05c42f262de0dada08ed90d files/gettext-0.14.2-fix-race.patch 417
 MD5 38756cea2e4f8e36c2e45b890f1a7463 files/50po-mode-gentoo.el 183
+MD5 095399be17e9cf19b7b02ffcd1fb95a5 files/gettext-0.14.1-tempfile.patch 2636
+MD5 0e4a00cc30a91523c838cd17b5841399 files/digest-gettext-0.14.1-r1 67
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.1 b/sys-devel/gettext/files/digest-gettext-0.14.1
deleted file mode 100644
index 4eae2cc7c785..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz 6550874
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.1-r1 b/sys-devel/gettext/files/digest-gettext-0.14.1-r1
new file mode 100644
index 000000000000..4eae2cc7c785
--- /dev/null
+++ b/sys-devel/gettext/files/digest-gettext-0.14.1-r1
@@ -0,0 +1 @@
+MD5 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz 6550874
diff --git a/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch b/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch
new file mode 100644
index 000000000000..78de04610918
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch
@@ -0,0 +1,75 @@
+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
+@@ -384,8 +385,7 @@
+ # original - too great risk of version mismatch.
+ if test -z "$force"; then
+   mismatch=
+-  mismatchfile="${TMPDIR-/tmp}"/autopoint$$.diff
+-  rm -f "$mismatchfile"
++  mismatchfile="`mktemp -t autopoint.diff.XXXXXX`"
+   for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
+     func_destfile "$file"
+     if test -n "$destfile"; then
+@@ -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
diff --git a/sys-devel/gettext/gettext-0.14.1-r1.ebuild b/sys-devel/gettext/gettext-0.14.1-r1.ebuild
new file mode 100644
index 000000000000..bc5b643b35c4
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.14.1-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/04/20 04:35:02 vapier Exp $
+
+inherit eutils gnuconfig 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-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc-macos ppc64 s390 sh sparc x86"
+IUSE="emacs nls"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx
+
+	epatch "${FILESDIR}"/${P}-lib-path-tests.patch #81628
+	epatch "${FILESDIR}"/${P}-tempfile.patch #66355
+	# java sucks
+	epatch "${FILESDIR}"/${P}-without_java.patch
+	epatch "${FILESDIR}"/${P}-no-java-tests.patch
+
+	if use ppc-macos ; then
+		elibtoolize
+	else
+		elibtoolize --reverse-deps
+	fi
+	gnuconfig_update
+}
+
+src_compile() {
+	# 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=$(tc-getCC) \
+	econf \
+		--without-java \
+		--without-included-gettext \
+		$(use_enable nls) \
+		|| 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"
+
+	# remove stuff that glibc handles
+	if ! use ppc-macos; then
+		# Mac OS X does not provide these files.
+		rm -f ${D}/usr/include/libintl.h
+		rm -f ${D}/usr/$(get_libdir)/libintl.*
+	fi
+	rm -rf ${D}/usr/share/locale/locale.alias
+
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	if use ppc-macos; then
+		rm -f ${D}/usr/lib/charset.alias
+		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
+			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
+			touch ${D}/usr/$(get_libdir)/libintl.2.dylib
+		fi
+	else
+		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then
+			cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
+			touch ${D}/usr/$(get_libdir)/libintl.so.2*
+		fi
+	fi
+
+	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
+	use emacs || rm -rf ${D}/usr/share/emacs
+
+	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+	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 --soname libintl.so.2"
+}
diff --git a/sys-devel/gettext/gettext-0.14.1.ebuild b/sys-devel/gettext/gettext-0.14.1.ebuild
deleted file mode 100644
index ed7700667eb3..000000000000
--- a/sys-devel/gettext/gettext-0.14.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2005 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.32 2005/04/09 13:13:09 corsair Exp $
-
-inherit eutils gnuconfig 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-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="emacs nls"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epunt_cxx
-
-	epatch "${FILESDIR}"/${P}-lib-path-tests.patch #81628
-	# java sucks
-	epatch "${FILESDIR}"/${P}-without_java.patch
-	epatch "${FILESDIR}"/${P}-no-java-tests.patch
-
-	if use ppc-macos ; then
-		elibtoolize
-	else
-		elibtoolize --reverse-deps
-	fi
-	gnuconfig_update
-}
-
-src_compile() {
-	# 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=$(tc-getCC) \
-	econf \
-		--without-java \
-		--without-included-gettext \
-		$(use_enable nls) \
-		|| 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"
-
-	# remove stuff that glibc handles
-	if ! use ppc-macos; then
-		# Mac OS X does not provide these files.
-		rm -f ${D}/usr/include/libintl.h
-		rm -f ${D}/usr/$(get_libdir)/libintl.*
-	fi
-	rm -rf ${D}/usr/share/locale/locale.alias
-
-	# older gettext's sometimes installed libintl ...
-	# need to keep the linked version or the system
-	# could die (things like sed link against it :/)
-	if use ppc-macos; then
-		rm -f ${D}/usr/lib/charset.alias
-		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.2.dylib ] ; then
-			cp -pPR ${ROOT}/usr/$(get_libdir)/libintl.2.dylib ${D}/usr/$(get_libdir)/
-			touch ${D}/usr/$(get_libdir)/libintl.2.dylib
-		fi
-	else
-		if [ -e "${ROOT}"/usr/$(get_libdir)/libintl.so.2 ] ; then
-			cp -a ${ROOT}/usr/$(get_libdir)/libintl.so.2* ${D}/usr/$(get_libdir)/
-			touch ${D}/usr/$(get_libdir)/libintl.so.2*
-		fi
-	fi
-
-	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
-	use emacs || rm -rf ${D}/usr/share/emacs
-
-	dodoc AUTHORS BUGS ChangeLog DISCLAIM NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	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 --soname libintl.so.2"
-}
-- 
cgit v1.2.3-65-gdbad