Version bump and remove old patches (bug #383533 by Petr Pisar).

(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)

8 files changed, 36 insertions, 72 deletions

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index 82f7cd8ab638..6796d64d8bdf 100644
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/wdiff
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.61 2011/03/27 21:57:37 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.62 2011/09/19 16:33:06 radhermit Exp $
+
+*wdiff-1.0.1 (19 Sep 2011)
+
+  19 Sep 2011; Tim Harder <radhermit@gentoo.org>
+  -files/wdiff-0.5-avoid-wraps.diff, -files/wdiff-0.5-headers.patch,
+  -files/wdiff-0.5-ignore-case.patch, -files/wdiff-0.5-segfault-fix.diff,
+  -files/wdiff-0.6.0-info.patch, +wdiff-1.0.1.ebuild, metadata.xml:
+  Version bump and remove old patches (bug #383533 by Petr Pisar).
 
   27 Mar 2011; Jeremy Olexa <darkside@gentoo.org> -wdiff-0.6.4.ebuild:
   remove old ebuilds
diff --git a/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff b/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff
deleted file mode 100644
index b97100c4a83c..000000000000
--- a/app-text/wdiff/files/wdiff-0.5-avoid-wraps.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-*** 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/files/wdiff-0.5-headers.patch b/app-text/wdiff/files/wdiff-0.5-headers.patch
deleted file mode 100644
index a91b1d4c1735..000000000000
--- a/app-text/wdiff/files/wdiff-0.5-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-wdiff.c: In function ‘complete_input_program’:
-wdiff.c:916: warning: implicit declaration of function ‘wait’
-
---- wdiff.c
-+++ wdiff.c
-@@ -45,6 +45,7 @@
- # include <stdlib.h>
- #endif
- 
-+#include <sys/wait.h>
- #include <ctype.h>
- #include <stdio.h>
- 
diff --git a/app-text/wdiff/files/wdiff-0.5-ignore-case.patch b/app-text/wdiff/files/wdiff-0.5-ignore-case.patch
deleted file mode 100644
index 25d2e07d9624..000000000000
--- a/app-text/wdiff/files/wdiff-0.5-ignore-case.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wdiff-0.5-orig/wdiff.c
-+++ wdiff-0.5/wdiff.c
-@@ -895,7 +895,7 @@
-   /* Launch the diff program.  */
- 
-   if (ignore_case)
--    input_file = readpipe (DIFF_PROGRAM, "-c", left_side->temp_name,
-+    input_file = readpipe (DIFF_PROGRAM, "-i", left_side->temp_name,
- 			   right_side->temp_name, NULL);
-   else
-     input_file = readpipe (DIFF_PROGRAM, left_side->temp_name,
diff --git a/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff b/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff
deleted file mode 100644
index d0e837993b10..000000000000
--- a/app-text/wdiff/files/wdiff-0.5-segfault-fix.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- wdiff.c	2004-08-16 14:21:05.000000000 +0300
-+++ wdiff.c.fixed	2004-08-16 14:22:06.000000000 +0300
-@@ -910,7 +910,8 @@
- static void
- complete_input_program (void)
- {
--  fclose (input_file);
-+  if (input_file != NULL)
-+    fclose (input_file);
-   wait (NULL);
- }
- 
-@@ -1303,6 +1304,7 @@
-       initialize_strings ();
-       reformat_diff_output ();
-       fclose (input_file);
-+      input_file = NULL;
-     }
- 
-   /* Clean up.  Beware that input_file and output_file might not exist,
diff --git a/app-text/wdiff/files/wdiff-0.6.0-info.patch b/app-text/wdiff/files/wdiff-0.6.0-info.patch
deleted file mode 100644
index 08d3f1c83fce..000000000000
--- a/app-text/wdiff/files/wdiff-0.6.0-info.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug #312319
-
-
---- a/doc/wdiff.texi
-+++ b/doc/wdiff.texi
-@@ -20,7 +20,7 @@
- 
- @dircategory Individual utilities
- @direntry
--* wdiff: (wdiff)wdiff invocation.               Word difference finder. @c
-+* wdiff: (wdiff)wdiff invocation.               Word difference finder.
- @ifset EXPERIMENTAL
- * wdiff2: (wdiff)wdiff invocation.              Word difference finder.
- * mdiff: (wdiff)mdiff invocation.               Line cluster finder.
-
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index 40149c995561..5f24ddf70690 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>
+	<use>
+		<flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/wdiff/wdiff-1.0.1.ebuild b/app-text/wdiff/wdiff-1.0.1.ebuild
new file mode 100644
index 000000000000..a2694e7a7907
--- /dev/null
+++ b/app-text/wdiff/wdiff-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.0.1.ebuild,v 1.1 2011/09/19 16:33:06 radhermit Exp $
+
+EAPI="4"
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="http://www.gnu.org/software/wdiff/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="experimental"
+
+DEPEND="
+	sys-apps/diffutils
+	sys-apps/less"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		$(use_enable experimental)
+}