Fix info file thanks to Martin von Gagern (bug #312319).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/app-text/wdiff/ChangeLog b/app-text/wdiff/ChangeLog
index f0f79c6646f4d7c8fe52d1c365391577194ce992..f9a9a79af0e14e0b8be7ad7187254a1d5c5ec3ac 100644 (file)
--- a/app-text/wdiff/ChangeLog
+++ b/app-text/wdiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/wdiff
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.34 2010/03/29 11:48:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/ChangeLog,v 1.35 2010/03/31 13:16:32 jer Exp $
+
+*wdiff-0.6.0-r1 (31 Mar 2010)
+
+  31 Mar 2010; Jeroen Roovers <jer@gentoo.org> -wdiff-0.6.0.ebuild,
+  +wdiff-0.6.0-r1.ebuild, +files/wdiff-0.6.0-info.patch:
+  Fix info file thanks to Martin von Gagern (bug #312319).
 
 *wdiff-0.6.0 (29 Mar 2010)
 

diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index a931eff801767c82095e65e7c391042ff4977b2a..fbf42f350bf5a4298782189e753216f3c4af14dc 100644 (file)
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -2,11 +2,12 @@ AUX wdiff-0.5-avoid-wraps.diff 401 RMD160 7e25aa8c44a131d3dd1631ca76142c6ec52ea5
 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
 DIST wdiff-0.5-gentoo.diff.bz2 253 RMD160 99cd2ba6fdeda177e380a7cf2cfd95c0df941426 SHA1 1745f579d8144f33dbb177db890b97032940b5ec SHA256 edc00a72975cd680a32bb6afec7b0c4747c1745fd70a033152caf56796de3f0e
 DIST wdiff-0.5.tar.gz 129267 RMD160 7b313cfaca2ec3759048888bbdba0be1cd88a5e1 SHA1 44e18850e16518633139cf24a83165e62e3baa95 SHA256 ecfda74a17d12c84873a17943b0f3a509ac012cc35708864462a5380a8d2b428
 DIST wdiff-0.6.0.tar.gz 1166777 RMD160 5bf2c70e1cc975d9da1340e319357a683009fa11 SHA1 65829d1376a08dc1f77828338e2ed00cd6d2b066 SHA256 1e003ef1ea12920a11553514e1535df57812571bafd212d0d6d4111cf52ef290
 EBUILD wdiff-0.5-r2.ebuild 1172 RMD160 957d73db16d2813332d5af83388217801fe190de SHA1 ad0b20ae172161596e89d3f182c89cfa4f7ec932 SHA256 4cb166b89d2ab5bcf515b6992d289e42ffb4bce597ec2d8df57ca805856979ea
 EBUILD wdiff-0.5-r3.ebuild 1224 RMD160 e77f95ae9e58536f1cd84eb4ef5893308edbe140 SHA1 c1a8f32e0b670a8d21690fc343de071f1e47940b SHA256 cc38c18518f8abae923b1741690a3f1bc2ef677364b9af7f5d66372cd66addef
-EBUILD wdiff-0.6.0.ebuild 649 RMD160 b5bbe77ac17e856452a294f6672268652810bbdd SHA1 d3cc3c4d6f17847fb9fec1df2872c1314876739f SHA256 50a8de352a6221e2ff5b2d758bacdf0cc950976ec699c8b6e0769e3f0b7ca13e
-MISC ChangeLog 4034 RMD160 df893a3f72c2211bb11664a39a01d0af90ea4d29 SHA1 23c3b2d7e720ea26ea8c6c5ce65ea18d15058329 SHA256 e47e6eab2a492495daeb0991e80c8588a13d292a305798421ef1728d03d06949
+EBUILD wdiff-0.6.0-r1.ebuild 709 RMD160 14bf053542ab0a68913256e3785c500d6025fba7 SHA1 1a37ce582dfe4353969e07912e98b3bd38ff5049 SHA256 7e3b43df0a292452f6a84e8b6ff21d00b5fe893dc86bbf303f0c67c33c87ea77
+MISC ChangeLog 4250 RMD160 8cd41dba71ff257ba434f0afaa8aafd0991fc38c SHA1 c0b5045b574e64bf5a893c0789fad450b723dea9 SHA256 42b9977a0004b0fd16fcac677c07bb9225f4e619ec04a7e91a792675b6bb34f0
 MISC metadata.xml 165 RMD160 c4557a3518a065b077539be5a0f20e4735fc2141 SHA1 1831705b1eb97b63968fc9eef31aa904a69a854a SHA256 75ca85c472d4181ae0de529c83826baaebe75d9e750ee6621758b5096bceffcd

diff --git a/app-text/wdiff/files/wdiff-0.6.0-info.patch b/app-text/wdiff/files/wdiff-0.6.0-info.patch
new file mode 100644 (file)
index 0000000..08d3f1c
--- /dev/null
+++ b/app-text/wdiff/files/wdiff-0.6.0-info.patch
@@ -0,0 +1,15 @@
+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/wdiff-0.6.0.ebuild b/app-text/wdiff/wdiff-0.6.0-r1.ebuild
similarity index 76%
rename from app-text/wdiff/wdiff-0.6.0.ebuild
rename to app-text/wdiff/wdiff-0.6.0-r1.ebuild
index 18ca7f944493c79907cdbeaa61aaf2f9b40ebd6a..7f9cf548923b52de0581829cc2e28ca0c8abb3e9 100644 (file)
--- a/app-text/wdiff/wdiff-0.6.0.ebuild
+++ b/app-text/wdiff/wdiff-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.6.0.ebuild,v 1.1 2010/03/29 11:48:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-0.6.0-r1.ebuild,v 1.1 2010/03/31 13:16:32 jer Exp $
 
 EAPI="2"
 
@@ -18,6 +18,10 @@ IUSE=""
 DEPEND="sys-apps/diffutils
        sys-apps/less"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-info.patch
+}
+
 src_install() {
        emake DESTDIR="${D}" install || die
        dodoc ChangeLog NEWS README