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

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index 82f7cd8ab6386d90911b5c049a10e41b7b8ddf7e..6796d64d8bdf9ebb34f157db585ebeae959629d3 100644 (file)
--- 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/Manifest b/app-text/wdiff/Manifest
index 677e605b83d94cb471960d2da1273a33bf03c8d5..292f5a725a13ec01e9c6f70398b4874760eb4c7b 100644 (file)
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,9 +1,20 @@
-AUX wdiff-0.5-avoid-wraps.diff 401 RMD160 7e25aa8c44a131d3dd1631ca76142c6ec52ea57a SHA1 a05a777d9d413727fdc96366024f4265195a0958 SHA256 0d601e06b266617b752ab649a983a2b8c4a165917f329e40690397b9a8073372
-AUX wdiff-0.5-headers.patch 257 RMD160 8588e8435bd7349422385a4f7148de7313568af5 SHA1 f1cec0e0c0787cb38f1c16ec4848e9dec0867c24 SHA256 7ad877eb9817dc56868e8c531cd624d788376a6b1e914d6315107e347d13b58c
-AUX wdiff-0.5-ignore-case.patch 375 RMD160 5b7e588f8919d3fe16b4731dc35574af8b9f57a9 SHA1 bfbd23901d268915a41e191fcf7af3e2fb8d46ea SHA256 eeae6aad2df52d81450ab05fbb11f318ecb51d636892c3b79bbd58b573c6f2d0
-AUX wdiff-0.5-segfault-fix.diff 487 RMD160 0462bb29901c439307bc80338b4c2759aa6fa84f SHA1 6a83a6c412b63996d4a6b35cab8a733374fcb1ff SHA256 6ad068f5f0a7c7f8c96cd03b4a5ab24f6065fc09ba9abe3b0e22c2d2f89edcd9
-AUX wdiff-0.6.0-info.patch 436 RMD160 8ec854cbd9f1bba7c8ae7d3c97827126c7419cef SHA1 fd86154873fa9e0db108e8303f669fbf4f09577b SHA256 b2fba8b402aaa2c4aa8e3a2a4a347bc41b2bf1e2772fdcd577b80b885b0dc72c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST wdiff-0.6.5.tar.gz 1232434 RMD160 aead43659c8d8368318f1b1145826078aeec36da SHA1 8a1d5d76f7faa999a5573619b9f3f0a7711e1d08 SHA256 55875696f5f548103b8318cf82bdd79aa518f2443a1677e30fb19268213932ba
+DIST wdiff-1.0.1.tar.gz 1294317 RMD160 53a8d1a640bd6943030aa01557e52adc759b3975 SHA1 7d82dd082a8df9510ab029e89bcf3676b4d21c52 SHA256 94e4f43edfcb2bfc5307bec8cdd2a593750dd86a2d28142367f72bdaea46cfcb
 EBUILD wdiff-0.6.5.ebuild 688 RMD160 e48e07804922b497f24100f75d89234ed8b1482a SHA1 03a016d46938116219c9d7f2e2717a71bf799d1a SHA256 e7a022b5cda6d19f2b32c1def3e457f3b8e58dda8c043addaf3f5381be873384
-MISC ChangeLog 6919 RMD160 be424f283a523fd02e822578a8b9959f86d98547 SHA1 cfff7bde6ac51c686417d2a9fcb3009dd8ecc312 SHA256 184b18b01b076abd03dd564262baad9884725e4c0c547f598c64b7c1d9592963
-MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd
+EBUILD wdiff-1.0.1.ebuild 681 RMD160 5d8ba635c17318bc3950edd5465dbb93f655afe0 SHA1 a8c128d318764c90355f7c594c1f1e2513718ca7 SHA256 f5c3633182368c93c6ec6b78b22e51f6bcb83f8953d8719776e91e9aedd2d11e
+MISC ChangeLog 7276 RMD160 dfc79d5cc5da84c4639adb3d8ecc3883337e0d1a SHA1 7f910c81640e21754cafb04bfa709527c91e2b08 SHA256 ceabd5e3a7ae9c228df1529d70898b7851e8c755ff1deb081d4d8e612fd67029
+MISC metadata.xml 267 RMD160 c73405ea2970003d96d2889f6ac4d8e0361ae0c6 SHA1 3b9055b4f064f9c7291eebb7c31688271cce44e7 SHA256 b495ccfbcbc9a1005daadd09383d078ec1bda926483e49317153527e536f4151
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOd27PAAoJEEqz6FtPBkyjmcEH/2fINWJmaYTi65Bct8prdtNg
+MjzSxizZP9RuVH1AJBkQigsOCfZ8wDnhx7icvrp0Fge9gA8OAsAkpwL/F6n60uQi
+F0qbmz1h5WI2xJRIAEo2Fk89J4u95YcGA3xIuMee4JVGcMtcHfAHhad67phyInXB
+zbqbxN/M0Vue43+qNpV238516z4yUsDiXqrK3uVif/UswdPyDBKo14QuFc99Mvkv
+FB8MLx9W11mhfsyLMASn+oZVmYFKfFdDOjajtJw0ulv45rQyPz2PJpGX52iFSFUj
+RISa3MxRIUB/dysNACUoA9KiuZeAy0CfzyxxvMLfxRfCkVhHWAgTKDgiUhEnp1w=
+=Md3F
+-----END PGP SIGNATURE-----

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 (file)
index b97100c..0000000
--- 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 (file)
index a91b1d4..0000000
--- 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 (file)
index 25d2e07..0000000
--- 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 (file)
index d0e8379..0000000
--- 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 (file)
index 08d3f1c..0000000
--- 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 40149c995561da9589875eafe054f2f8110e2f06..5f24ddf70690dbb7b8dda6e5c751c2697c6f8b77 100644 (file)
--- 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 (file)
index 0000000..a2694e7
--- /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)
+}