Keyworded ~amd64 and applied avoid-wraps patch - bug #62456

5 files changed, 74 insertions, 2 deletions

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index deb4078b7773..ae03f6c5befc 100644
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/wdiff
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.11 2004/09/03 15:30:29 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.12 2004/09/05 11:50:44 malc Exp $
+
+*wdiff-0.5-r2 (05 Sep 2004)
+
+  05 Sep 2004; Malcolm Lashley <malc@gentoo.org>
+  +files/wdiff-0.5-avoid-wraps.diff, +wdiff-0.5-r2.ebuild:
+  Add avoid-wraps patch and keyworded ~amd64 - closes bug #62456
 
   03 Sep 2004; David Holm <dholm@gentoo.org> :
   Added to ~ppc.
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 342295d0a288..2a2c292b3d3d 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,7 +1,10 @@
-MD5 65380097d6cb1d9db1e2d702d304f972 ChangeLog 1644
+MD5 d612fcbc49d39a9c9e7649f96325d0f5 ChangeLog 1846
 MD5 f8e7a31aced0c9f217d9afa8fb3d2d39 wdiff-0.5.ebuild 956
 MD5 64ed5942489fe8d8672fabf259c4412a metadata.xml 255
 MD5 18c0b6b89fed06daaef39a316889b1f8 wdiff-0.5-r1.ebuild 1023
+MD5 7e8cf795f81edcc5ce4c1a329c394e8c wdiff-0.5-r2.ebuild 1071
 MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5 128
 MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5-r1 128
 MD5 9857b4daaad6db84f5c7dd600a7e7b4c files/wdiff-0.5-segfault-fix.diff 487
+MD5 c0daaa4f7a7f181a9900d082fe2f5a7a files/wdiff-0.5-avoid-wraps.diff 401
+MD5 d6f2ef7713b8a0187fd684b0d8010347 files/digest-wdiff-0.5-r2 128
diff --git a/app-text/wdiff/files/digest-wdiff-0.5-r2 b/app-text/wdiff/files/digest-wdiff-0.5-r2
new file mode 100644
index 000000000000..492c83e04f6c
--- /dev/null
+++ b/app-text/wdiff/files/digest-wdiff-0.5-r2
@@ -0,0 +1,2 @@
+MD5 7f9c78f5dd6fb4f3dabe28fbd4d14319 wdiff-0.5.tar.gz 129267
+MD5 9a919e76ca95db105427d827ed1a4c31 wdiff-0.5-gentoo.diff.bz2 253
diff --git a/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff b/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff
new file mode 100644
index 000000000000..b97100c4a83c
--- /dev/null
+++ b/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff
@@ -0,0 +1,12 @@
+*** wdiff-0.5-orig/wdiff.c	Sun Nov  6 09:57:23 1994
+--- wdiff-0.5/wdiff.c	Thu Sep  2 12:49:07 2004
+***************
+*** 114,119 ****
+--- 114,120 ----
+    {"no-common"   , 0, NULL, '3'},
+    {"help"        , 0, NULL, 'h'},
+    {"ignore-case" , 0, NULL, 'i'},
++   {"avoid-wraps" , 0, NULL, 'n'},
+    {"printer"     , 0, NULL, 'p'},
+    {"statistics"  , 0, NULL, 's'},
+    {"terminal"    , 0, NULL, 't'},
diff --git a/app-text/wdiff/wdiff-0.5-r2.ebuild b/app-text/wdiff/wdiff-0.5-r2.ebuild
new file mode 100644
index 000000000000..1da932c7680e
--- /dev/null
+++ b/app-text/wdiff/wdiff-0.5-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.5-r2.ebuild,v 1.1 2004/09/05 11:50:44 malc Exp $
+
+inherit eutils
+
+IUSE="build"
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="http://www.gnu.org/software/wdiff/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo.diff.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~mips ~ppc ~amd64"
+
+DEPEND="sys-libs/libtermcap-compat
+	sys-apps/diffutils
+	sys-apps/less"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${WORKDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-segfault-fix.diff
+	epatch ${FILESDIR}/${P}-avoid-wraps.diff
+}
+
+src_compile() {
+	# Cannot use econf here because the configure script that
+	# comes with wdiff is too old to understand the standard
+	# options.
+
+	./configure --prefix=/usr || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+
+	if ! use build
+	then
+		dodoc COPYING ChangeLog NEWS README
+		doman wdiff.1
+	else
+		rm -rf ${D}/usr/share/info
+	fi
+}