Add patch to fix i18n support #71689 by S.Caglar Onur.

5 files changed, 70 insertions, 9 deletions

diff --git a/sys-apps/diffutils/ChangeLog b/sys-apps/diffutils/ChangeLog
index 9adaf1a24d3a..9efbd828a745 100644
--- a/sys-apps/diffutils/ChangeLog
+++ b/sys-apps/diffutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/diffutils
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.39 2004/12/17 13:14:48 gustavoz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/ChangeLog,v 1.40 2005/01/04 03:43:27 vapier Exp $
+
+*diffutils-2.8.7-r1 (03 Jan 2005)
+
+  03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +diffutils-2.8.7-r1.ebuild:
+  Add patch to fix i18n support #71689 by S.Caglar Onur.
 
   17 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> diffutils-2.8.7.ebuild:
   Stable on sparc
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index f0afcfca8bb6..0b1f5d868c39 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6bc339c00a8b7665619b3033fc5e7783 ChangeLog 5218
-MD5 50a15ef2a056814a920230e5faa51c0b diffutils-2.8.4-r4.ebuild 1933
+MD5 20e600529f44f58d20e0a0655b52d64e ChangeLog 5389
+MD5 2b8888ea3c1b05e81e1bbf61b1f2b945 diffutils-2.8.4-r4.ebuild 1933
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 8368feedcf16cc9bf0e90e5bd14e843d diffutils-2.8.7.ebuild 1406
+MD5 f4c7a071aea75f7d67d614b5ed0b2bcd diffutils-2.8.7-r1.ebuild 1535
 MD5 88eef724512016e5400a58e4057ef235 files/diffutils-2.8.4-Makefile-fix-typeo.patch 1158
 MD5 bb27bd30edca169156e905ebe7dab570 files/diffutils-2.8.4-no-manpage.patch 1168
 MD5 fcb3554acdf9074aad98b90af6cb915d files/diffutils-2.8.4-sdiff-no-waitpid.patch 525
 MD5 a571ebf3fcef3b033e33a4f013521e13 files/diffutils-2.8.4-tabsize-dumps-core.diff 804
 MD5 7abb095c2c2ecdbd465a1953cb443289 files/digest-diffutils-2.8.4-r4 67
+MD5 d639850d7ddca0f4a6eb5be82a1c42a2 files/digest-diffutils-2.8.7-r1 141
 MD5 28aba2261ffb7634265a612938df28f5 files/digest-diffutils-2.8.7 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFB2g5YroRuSHgZdywRAopoAJ9DHWKa6JYO4ozj738cDJAaX5ecWACfYkYQ
-9knrpCe22wcR4Sy9YYD4mpw=
-=ovoM
+iD8DBQFB2hDyroRuSHgZdywRApPMAJ0ZcdBXWdaq8YScQjd9TMkRMPNxCQCeIFiU
+ErpuVdPKoGlr4fyQ6KOFVN0=
+=x00i
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
index 3dd82434e4db..2cdcd7edcb5a 100644
--- a/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
+++ b/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.21 2004/12/09 05:07:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.4-r4.ebuild,v 1.22 2005/01/04 03:43:28 vapier Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild b/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
new file mode 100644
index 000000000000..eec74556f00e
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-2.8.7-r1.ebuild,v 1.1 2005/01/04 03:43:28 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="http://www.gnu.org/software/diffutils/diffutils.html"
+SRC_URI="ftp://alpha.gnu.org/gnu/diffutils/${P}.tar.gz
+	mirror://gentoo/${P}-i18n.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls static"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Removes waitpid() call after pclose() on piped diff stream, closing
+	# bug #11728, thanks to D Wollmann <converter@dalnet-perl.org>
+	epatch ${FILESDIR}/diffutils-2.8.4-sdiff-no-waitpid.patch
+
+	# Fix utf8 support.  Patch from MDK. #71689
+	epatch ${WORKDIR}/${P}-i18n.patch
+
+	# Make sure we don't try generating the manpages ... this requires 
+	# 'help2man' which is a perl app which is not available in a 
+	# stage2 / stage3 ... don't DEPEND on it or we get a DEPEND loop :(
+	# for more info, see #55479
+	touch man/*.1
+}
+
+src_compile() {
+	econf $(use_enable nls) || die "econf"
+	use static && append-ldflags -static
+	emake LDFLAGS="${LDFLAGS}" || die "make"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc ChangeLog NEWS README
+
+	# use the manpage from 'sys-apps/man-pages'
+	rm -f "${D}"/usr/share/man/man1/diff.1*
+}
diff --git a/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1 b/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1
new file mode 100644
index 000000000000..a31132fd3a74
--- /dev/null
+++ b/sys-apps/diffutils/files/digest-diffutils-2.8.7-r1
@@ -0,0 +1,2 @@
+MD5 18d6587cb915e7aa110a5d463d6ed156 diffutils-2.8.7.tar.gz 1057977
+MD5 406c758a923f531f350edb82423aef56 diffutils-2.8.7-i18n.patch.bz2 4388