Version bump to fix bug #526222, take over as maintainer.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x6F48D3DA05C2DADB!

5 files changed, 141 insertions, 28 deletions

diff --git a/app-admin/drush/ChangeLog b/app-admin/drush/ChangeLog
index 6586e6fd696d..31f101aa9e85 100644
--- a/app-admin/drush/ChangeLog
+++ b/app-admin/drush/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/drush
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/ChangeLog,v 1.9 2014/03/20 17:19:31 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/ChangeLog,v 1.10 2014/10/24 16:34:31 mjo Exp $
+
+*drush-6.4.0 (24 Oct 2014)
+
+  24 Oct 2014; Michael Orlitzky <mjo@gentoo.org> +drush-6.4.0.ebuild,
+  +files/update-bash-completion-script-for-2.1.patch, metadata.xml:
+  Version bump to fix bug #526222, take over as maintainer.
 
 *drush-6.2.0 (20 Mar 2014)
 
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 53823fc299a1..463abacef84f 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,26 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX update-bash-completion-script-for-2.1.patch 1332 SHA256 9bab3ce5bbe7611bc7483cfd2c7926c6d443d3af772c5b241fd94a438fb1316a SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0 WHIRLPOOL cddf67a8834ed4d01fd5215f2044388628360e7613cfb54c45a3cbbea7c36659f0bd5a8399008e971d2fca48560ed16115dc3b55d0f707776a5c569efe41d901
 DIST drush-5.8.tar.gz 409642 SHA256 15dd85f04c49b4a896b02dd6960d3140f3ae680bab3eea5d3aba27be0481e480 SHA512 85f7572aece8590d23164dc938e00b740718a5b9bf20ca866083f9e8ce2025ec07f57e06234bf50bfe2351f407f5bad21789103c1e04d18d2fd202fa735637e6 WHIRLPOOL 68f4a8ca09fc61c36de3d6cc6e3aeaab2021b677ba9d732a65f4d5a9940ebbee3cd63dc84f165e119770168547b1997aff6c23497dc50dbe548df348c296188c
 DIST drush-6.2.0.tar.gz 504498 SHA256 a56f598bcdd2117bca03db12cd5ad8c1670c01d4980c7e9dfcd343c22b5a14bc SHA512 9d51ca48cb1c70309b27e522340eacc60fc88229178285344570a641de49e0bd6a3b3de34c3977c66dae6647e2fa127873a0a41c00850167f4a1311979c7e0cb WHIRLPOOL 92ad1b0a91c105be205fb263ebd62372ea356329df5555748f520a12728f3a2c0ed995e4faf3277adb37a7373f94cf1f63aa0b6d98c950b38739c277b4ae1051
+DIST drush-6.4.0.tar.gz 508592 SHA256 2a434961265eebe316aec9af3618f92fa43efbb79bd99372fe12b22a94de0187 SHA512 65b08c16c2658c90caff5d483687c67be4d733dabb015e12fe3f2b5571e50185d2f73d66f098d5eddf800c6d63473cc25a9c8b083b11e7cf96a05c3fca7eadcb WHIRLPOOL a10c2366d2efea839083d87700b95b47b277e2834835a8c7cf099e86e406410f38fbbf481260f00da9bd730d3faba5071879a8070b070931ca5b93797935bb54
 EBUILD drush-5.8.ebuild 1518 SHA256 e1575bede9476ede699035cb3c83e644dbc9bb5b81bf01a85c0383281d09458f SHA512 5451823c28c373c2170feca3ea4fd0811c8a4f7b5abb82ba9da213cb63b7a7130379f4acca2a8111595dae9a43ef0214def9785568ce2128656b6505728f129a WHIRLPOOL ede2956a3b7dff4eee976dcdd884506c6c8f1b4d774456625273fa5f0c86c31b8fc6bf9108df77b19002ea6c556fa1c88bfad329c31eb0eba06be571ec93f8a5
 EBUILD drush-6.2.0.ebuild 1580 SHA256 2147f6e9e96aa296234c6afd7abf3d12919dd5b66e74e434b7c7957c26bf7bea SHA512 2e906074132b4c8c0c52dd332c254c8af64b1435a80dea729b20a3c38199ed3ded56d2da58198cc661b1b6342483416cc58e08833d09016b9dc7b90bdec3556d WHIRLPOOL 7877005377870c4b0006b1e0ec7e549ffe850f996f32170b97837bb85a94d61ee759d0b3149f43d30460436d603a5cb2d3df52682d1f42a781bc20338794153f
-MISC ChangeLog 1647 SHA256 19b7e88cc93a3f1e37b44ca1242be2fd8f21443d592f93860d2678a7faa8a21b SHA512 24383ef0b7d8df6f85e7fa7d8ddf6b4f63e570d62777618a7a25c2a133b66ba182211a669d53087b0a7ccd3d3e35c4128ce85f51e8d0577fd71c37b202f85508 WHIRLPOOL ef9f8d91cbb699c26cc68e7719ea06ab162e979a4f339f9720898b65e30af9e6332c91aba2cac8637291e5abfe7ec1f7ee574b3371f4d9b7fde197c8335333ef
-MISC metadata.xml 593 SHA256 5c4502e126daf4ad5b76633ea104ee9ea5cd3dd0247aa35e846f14f70ce48563 SHA512 82a46bb336e1501c9293938ab4f6a3f777496dba7c80093ba689c891a0e219146ff8481bd7cc2011657693ab55986f3cbaa8a9820aea2dc57d7df84e9fc8a3e9 WHIRLPOOL 24d6297b124e08397369c01403a41bb5d9647b41e7643d3158f5a750cdc31c331471e1ba3db3dc0fd8d1a0768933d299f99b1b64978d5ede08fdc0336e64c577
+EBUILD drush-6.4.0.ebuild 1815 SHA256 58bef19805e412a2bdfa916ab34fb7265a006ecd11f0ddcfeb6f75420a93a912 SHA512 36d4180cf187b19e8975c98e60a04380f6b2829a1acb92adb61cda88d8ba9df0c2586a8ae681242bb3fe8b8618e0e3b4490a2942a5055daf121d3ef266f8af05 WHIRLPOOL 0f68a7bc5a6e458433c1e6856efc6a3e9e772b7f38194a7f2d94902e277203b558be012e9eda84ac8622fb3fa2a2a804c5f3bae8c301de1bb91c68591fe74b31
+MISC ChangeLog 1875 SHA256 e98389afa4344a0488f8c604159715abf0e69dcd9724bd24b9f598ac9eebb188 SHA512 892498e1c6b59cf420a20c7fe488631c88bf36aeba6615e1ce72e07afcadf165045dee9d8cc564a2bd05db28ceea0fdccead785f9b65a7e8503f690dd12d786d WHIRLPOOL 525fa914ba100fa9601084dfd94ff0d6e14a2f8a042dfb6b22df5efa53b3c3e0dd223ad13c11bdb20e19d3d3e5f9a35045ff35da88e241bb42f16ab5c2709769
+MISC metadata.xml 518 SHA256 c5af9fd480ff9e22d8533e7a4d832961d87962715ddc72a9211d8560e5678044 SHA512 c54c09dccb17ca859ec86331642273aab0c40ad47e30705c71f006f8c32d2003d3a3a72f9450c10f3fad55a93edb7beef082f86b496e0b7b9bffddb89e2ed133 WHIRLPOOL ea3c7afa1318d6fc05c36dfc73ebbc10fae0267ec339193c7011ff60fe51aa0597629cde26c542db9e7749ad8067a65a7ff56f0414efa1b356d483c08584138a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTKyMrAAoJEG9I09oFwtrbKogP/0gj7AZ1RwhDo66inmyvtJX2
-6WArHS1vOtNM4zZ3xHfhgZSbZ6LZvdQtD9TR1Mj5ngpgIIjzG4/vcODqSvEwr8lP
-+0dczyIUO4MEWfgl5nzwoubeTeD7FJpJ8aehLP116Xwy77q9rrDm+7ZGbCDNO/L0
-aSP+j/uOscx2e7CcFEv2+PeLwg0m/x5B4RU1cS/AE1+RDQIDqaK5+TRs49DmsurM
-j42NaMGO+8G4TyjxOy8IhtTmjss8AFheGHiXSyYhnbXoZ7BSQ2iqVx6juV/fewCW
-AXLgnIfY24kieRq/GYtCyrrneLqkyMPXVDqJqLrir+uXU18XOWmaHgrNEG30VhMD
-9mAx/aoe7Oyd1Eakl9TSTFxYhwztuREErRsGbwavXfz74sfB0SFVC7x+7bBZ2JIE
-zrfMgo7d4w0Am2SA4u6j3CkZPMFeII1t8ZqJUYQ6G895tPEomqcQzoYzdpfEjAFY
-3GkQ/D2IrFNQqtyqs34oTSFv4m+39gw99324TasI8Lu5TpyirF3WGdGTpeg2yJhI
-STUiDXU+x0pwfhrOl8fV10uPjzqj5BwuvfNV/ncvEyNN+nk5HltsxEvb+KLoljdp
-O7DCsTK44WH924FYhDfKm+p+vEfHPMDUlbh5nWiGzbrJMKH/+JpX2761VirKHrzJ
-zg4+KxMaCnunIWnTJzd0
-=7SnV
+iQJ8BAEBCABmBQJUSn+cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbzaMP/0v2TyBtqM25ltTplsP52mCG
+TiNO0dvaQDK2AlGAr8iTWM9/BFDs/JpGHR2lnRDdJjPWx9En8BUDlk4GqB4fek1G
+JjoG9TptWCgYdqPlBjH6H+zHgXujMOQbt4iYSrVgX9J2egFXkhDFB+eEoi9evBFH
+3lRnVB9cb2W7SDOQawCYCkUk5SteLTq7RXKGzKOjL5CXHaMmkeVqabKhpFo3SE6k
+qgecU9/vP+oGz43WH5HHWUnrowSy/nxYF9fnAk8FvbxbvT5kdexRhiRM1hMrc2LU
+Az6b9LUJecrz7YeAlsg9N2nQuhQbz/xHnaErOpS6bdSwjcfD25eWRC5VUNHUGpFK
+h1608HC27weXBBmuQKZ/8T6qYRpsqW7BVirIimnD2nmfSWNu9Ve2NtjvIlhsen8Y
+pZnJIFM4F2ysqp4jh7NpYks4MIfFcbF1hnHsFPwb1zNP9t5fUB86S2UVXdZ8J85K
+A7VVRRcguJQH43rEbKdlEpbvujILdBbE44+kNbHhiQGV6EdIhtxqhO0qSazIptze
+dWeuo0ARIFqXXHQ3ejJivlvqkQReeUba1s5oOeS0hu4w0fN0lEDtn+F2GqzTE3pv
+PqFHvyAYKS0WsPRK5/Cxrojlb19jIG6qt3s8ZpZeW6Kqxjg0X2VYqYPyPV2WDNvO
+HQKSEHwTY+PD23GwKrmP
+=whDv
 -----END PGP SIGNATURE-----
diff --git a/app-admin/drush/drush-6.4.0.ebuild b/app-admin/drush/drush-6.4.0.ebuild
new file mode 100644
index 000000000000..43a7068e4971
--- /dev/null
+++ b/app-admin/drush/drush-6.4.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-6.4.0.ebuild,v 1.1 2014/10/24 16:34:31 mjo Exp $
+
+EAPI=5
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/${PN}"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
+	dev-php/PEAR-Console_Table"
+
+src_prepare() {
+	# Fix the bash completion script, check the patch for Gentoo/upstream
+	# bug numbers.
+	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym /usr/share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/update-bash-completion-script-for-2.1.patch b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
new file mode 100644
index 000000000000..a6a9b6a0ff43
--- /dev/null
+++ b/app-admin/drush/files/update-bash-completion-script-for-2.1.patch
@@ -0,0 +1,39 @@
+From e0f53949d35f32d251ab003d6e9e70a7f8c0e69a Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <mjo@gentoo.org>
+Date: Tue, 21 Oct 2014 19:48:37 -0400
+Subject: [PATCH 1/1] Update bash completion script for new
+ bash-completion-2.1 (Gentoo bug #526222).
+
+* Don't use `which drush ...` to detect the presence of drush in the
+  bash-completion script (https://github.com/drush-ops/drush/issues/521).
+
+* Don't install completions for commands that we don't "own"
+  (https://github.com/drush-ops/drush/issues/915).
+
+---
+ drush.complete.sh | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/drush.complete.sh b/drush.complete.sh
+index 067a67c..2f97317 100644
+--- a/drush.complete.sh
++++ b/drush.complete.sh
+@@ -5,9 +5,6 @@
+ # examples/example.bashrc instead, as it will automatically find and source
+ # this file.
+ 
+-# Ensure drush is available.
+-which drush > /dev/null || alias drush &> /dev/null || return
+-
+ __drush_ps1() {
+   f="${TMPDIR:-/tmp/}/drush-env/drush-drupal-site-$$"
+   if [ -f $f ]
+@@ -31,4 +28,4 @@ _drush_completion() {
+ }
+ 
+ # Register our completion function. We include common short aliases for Drush.
+-complete -o bashdefault -o default -o nospace -F _drush_completion d dr drush drush5 drush6 drush7 drush.php
++complete -o bashdefault -o default -o nospace -F _drush_completion drush
+-- 
+2.0.4
+
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
index d6c2c870fda9..b87c1117f1b8 100644
--- a/app-admin/drush/metadata.xml
+++ b/app-admin/drush/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-	Drush is a command line shell and scripting interface for Drupal, a
-	veritable Swiss Army knife designed to make life easier for those of us who
-	spend some of our working hours hacking away at the command prompt.
-
-	See http://drush.ws, the homepage for the drush project. It contains many
-	important resources for drush users.
-	</longdescription>
+  <maintainer>
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+  <longdescription lang="en">
+    Drush is a command line shell and scripting interface for Drupal,
+    a veritable Swiss Army knife designed to make life easier for
+    those of us who spend some of our working hours hacking away at
+    the command prompt.
+  </longdescription>
 </pkgmetadata>