Patching bash completion. Fixes bug #171001

5 files changed, 42 insertions, 23 deletions

diff --git a/dev-util/darcs/ChangeLog b/dev-util/darcs/ChangeLog
index 20f79dbad749..882e37ac4d2d 100644
--- a/dev-util/darcs/ChangeLog
+++ b/dev-util/darcs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/darcs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.67 2007/04/30 10:32:18 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/ChangeLog,v 1.68 2007/06/07 20:48:46 kolmodin Exp $
+
+*darcs-1.0.8-r2 (07 Jun 2007)
+
+  07 Jun 2007; Lennart Kolmodin <kolmodin@gentoo.org>
+  +files/darcs-1.0.9-bashcomp.patch, +darcs-1.0.8-r2.ebuild:
+  Patching to not use have() in the bash completion. Fixes bug #171001
 
   30 Apr 2007; Duncan Coutts <dcoutts@gentoo.org> darcs-1.0.7.ebuild,
   darcs-1.0.8-r1.ebuild:
diff --git a/dev-util/darcs/Manifest b/dev-util/darcs/Manifest
index bf2e861d16fe..a8d403c60a5f 100644
--- a/dev-util/darcs/Manifest
+++ b/dev-util/darcs/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX darcs-1.0.8-ghc66.patch 3057 RMD160 0eb34da97317b5ae24800ae6b026d3a8acc990b1 SHA1 57d192aa7347dbea460de5bd7aea7c7ff160c7ed SHA256 18ff1042e522d9dc09c1f81b716c22370decfa9b02841c8e765f9e30ce682ea1
 MD5 23a159dd96c69e34673700f43e04f3f0 files/darcs-1.0.8-ghc66.patch 3057
 RMD160 0eb34da97317b5ae24800ae6b026d3a8acc990b1 files/darcs-1.0.8-ghc66.patch 3057
 SHA256 18ff1042e522d9dc09c1f81b716c22370decfa9b02841c8e765f9e30ce682ea1 files/darcs-1.0.8-ghc66.patch 3057
+AUX darcs-1.0.9-bashcomp.patch 510 RMD160 73888c758f4a2ac93b83229115d23599162c0b15 SHA1 1abf5c0477169eb0109a0dd7ecfb2c38dfee15ff SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6
+MD5 4f8642df13c4e3d08370075d46b8dafb files/darcs-1.0.9-bashcomp.patch 510
+RMD160 73888c758f4a2ac93b83229115d23599162c0b15 files/darcs-1.0.9-bashcomp.patch 510
+SHA256 39a7e531f68ee4b71958d52557e6c6ace0c7717d546dcddccc4a5e7fb5daeff6 files/darcs-1.0.9-bashcomp.patch 510
 DIST darcs-1.0.4.tar.gz 950528 RMD160 5b8e4b2396c1cd7a373e103aa90d8a47802a43de SHA1 71ab71a9fa94db74ba3b79fa65b797a129a652f2 SHA256 a75d9a4eaf4a4993d733b742238ab0a2b4e79359ba9a9e695c8c7de6c9d8a9df
 DIST darcs-1.0.5.tar.gz 944888 RMD160 453dc7282d2751c0b862cf74bd095b63b927e5d7 SHA1 49512ba28c1724adba9eef4a9e3f7e104b7634f9 SHA256 9e71bfdab2be413b43219bdd10f8e79a3b496d542eb447d910b2708f8a6663a9
 DIST darcs-1.0.6.tar.gz 963609 RMD160 271f5f965a1ccd7428877a06349c8d9d39d74658 SHA1 d45bb51718225525b92b0efc57000ce4c50f49ce SHA256 8296f91934cfff4721356549db0d2f403fcc796ae424307c76afd33101090752
@@ -26,14 +27,14 @@ EBUILD darcs-1.0.7.ebuild 2042 RMD160 0c2faac398a01ef163bd3117e35376e2d8e6678a S
 MD5 9b6ef27a741e83058b26763f76057229 darcs-1.0.7.ebuild 2042
 RMD160 0c2faac398a01ef163bd3117e35376e2d8e6678a darcs-1.0.7.ebuild 2042
 SHA256 3e613a3166c83aad1f7bb4e4f7abb268ab8ccf7bb98e2e93418ddb6784adbf12 darcs-1.0.7.ebuild 2042
-EBUILD darcs-1.0.8-r1.ebuild 2434 RMD160 6780aa113f2466e8a49bcbe46daee0c76835a659 SHA1 0265881ac8fdca1da78c6bac9eee289d0e338e8b SHA256 f4b574f5ec89a3a7c0bc23bae2fd39407698a3d3eb94d403161539f1876f1c3f
-MD5 26c4887eb1cdfbd20e61f0462db07640 darcs-1.0.8-r1.ebuild 2434
-RMD160 6780aa113f2466e8a49bcbe46daee0c76835a659 darcs-1.0.8-r1.ebuild 2434
-SHA256 f4b574f5ec89a3a7c0bc23bae2fd39407698a3d3eb94d403161539f1876f1c3f darcs-1.0.8-r1.ebuild 2434
-MISC ChangeLog 9671 RMD160 84759ed6f572b725cca8c2e9c20ab6d6e7ad2631 SHA1 2013b20db065fe6879ba2be8ac9607c90d274c9f SHA256 5fe19da6c3c2e7410b79361c2408a7b9d894c9c63e212d22a89ddd3817e898f9
-MD5 5b3e2696d6a94038be631e5c00079f32 ChangeLog 9671
-RMD160 84759ed6f572b725cca8c2e9c20ab6d6e7ad2631 ChangeLog 9671
-SHA256 5fe19da6c3c2e7410b79361c2408a7b9d894c9c63e212d22a89ddd3817e898f9 ChangeLog 9671
+EBUILD darcs-1.0.8-r2.ebuild 2483 RMD160 342fc5fd12479f74d1a18263cf9c30fa3f665f5a SHA1 10e55fc10b1ff64df07663469e5ba2a1413d05ad SHA256 e8957e7f3c46f88f365adc522021d6a027b62b1678719fad0f798913192ef3b3
+MD5 bf6851c65f4f4e6e7d5d19c36086c4b0 darcs-1.0.8-r2.ebuild 2483
+RMD160 342fc5fd12479f74d1a18263cf9c30fa3f665f5a darcs-1.0.8-r2.ebuild 2483
+SHA256 e8957e7f3c46f88f365adc522021d6a027b62b1678719fad0f798913192ef3b3 darcs-1.0.8-r2.ebuild 2483
+MISC ChangeLog 9889 RMD160 c0d22255a53bab68bfcbf0ec9634635ae04e73c3 SHA1 3c3f704f4b8408d35e8f5a00ee54b01e73307776 SHA256 532d70a23ed71d8b2382c2754fb26c91772a12a1662f387b53584ead714b7fad
+MD5 61e2114525b207f9be657034aa648f80 ChangeLog 9889
+RMD160 c0d22255a53bab68bfcbf0ec9634635ae04e73c3 ChangeLog 9889
+SHA256 532d70a23ed71d8b2382c2754fb26c91772a12a1662f387b53584ead714b7fad ChangeLog 9889
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -50,13 +51,6 @@ SHA256 eada088f6174c90239d3df11a18728a2a5924c8244365600c6ebc43454d2ea13 files/di
 MD5 09aa6cf36df74b25968244a6248e4501 files/digest-darcs-1.0.7 238
 RMD160 af6d866f974191db72db2235e2b1195a05fc3e55 files/digest-darcs-1.0.7 238
 SHA256 f60ab21abc29fb110593b246c79dfc211e38c9bfa02f0e0d2b9f78f43fc389b4 files/digest-darcs-1.0.7 238
-MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8-r1 238
-RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8-r1 238
-SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGNcLUnUVyUObPUL4RAvD6AKCcZNbGltBC/iACsXAubvr2JTdyGQCeIQs2
-KOQOnyriQIQhAMtA+rFH1Ug=
-=xigw
------END PGP SIGNATURE-----
+MD5 83f45e19da5d23604c31048791a460e5 files/digest-darcs-1.0.8-r2 238
+RMD160 1f85d2e7120631f84465e1aca08b5b71a38df228 files/digest-darcs-1.0.8-r2 238
+SHA256 89551bc6771ab740ee0edfa2a2648e105bc5b20cb61386a46d20e15b38a62b0e files/digest-darcs-1.0.8-r2 238
diff --git a/dev-util/darcs/darcs-1.0.8-r1.ebuild b/dev-util/darcs/darcs-1.0.8-r2.ebuild
index 4e4a5779508e..a1312b856f07 100644
--- a/dev-util/darcs/darcs-1.0.8-r1.ebuild
+++ b/dev-util/darcs/darcs-1.0.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r1.ebuild,v 1.8 2007/04/30 10:32:18 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/darcs/darcs-1.0.8-r2.ebuild,v 1.1 2007/06/07 20:48:46 kolmodin Exp $
 
 inherit base autotools eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-ghc66.patch"
+	epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
 
 	# If we're going to use the CFLAGS with GHC's -optc flag then we'd better
 	# use it with -opta too or it'll break with some CFLAGS, eg -mcpu on sparc
diff --git a/dev-util/darcs/files/darcs-1.0.9-bashcomp.patch b/dev-util/darcs/files/darcs-1.0.9-bashcomp.patch
new file mode 100644
index 000000000000..2c5e34521e45
--- /dev/null
+++ b/dev-util/darcs/files/darcs-1.0.9-bashcomp.patch
@@ -0,0 +1,18 @@
+diff -urwpN darcs-1.0.9-orig/darcs_completion darcs-1.0.9/darcs_completion
+--- darcs-1.0.9-orig/darcs_completion	2007-06-07 21:42:57.000000000 +0200
++++ darcs-1.0.9/darcs_completion	2007-06-07 21:43:12.000000000 +0200
+@@ -3,7 +3,6 @@
+ # darcs command line completion.
+ # Copyright 2002 "David Roundy" <droundy@abridgegame.org>
+ #
+-have darcs &&
+ _darcs()
+ {
+     local cur
+@@ -48,5 +47,5 @@ _darcs()
+     return 0
+ 
+ }
+-[ "$have" ] && complete -F _darcs -o default darcs
++complete -F _darcs -o default darcs
+ 
diff --git a/dev-util/darcs/files/digest-darcs-1.0.8-r1 b/dev-util/darcs/files/digest-darcs-1.0.8-r2
index fda527dde45e..fda527dde45e 100644
--- a/dev-util/darcs/files/digest-darcs-1.0.8-r1
+++ b/dev-util/darcs/files/digest-darcs-1.0.8-r2