Version bump, cleanup, mark stable (resolves #432786)

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 27F4B742)

6 files changed, 85 insertions, 45 deletions

diff --git a/app-admin/drush/ChangeLog b/app-admin/drush/ChangeLog
index dd394c9ac481..5bd7cd26cf59 100644
--- a/app-admin/drush/ChangeLog
+++ b/app-admin/drush/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/drush
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/ChangeLog,v 1.3 2012/05/13 08:01:48 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/ChangeLog,v 1.4 2012/12/25 04:36:13 ramereth Exp $
+
+*drush-5.8 (25 Dec 2012)
+*drush-4.6 (25 Dec 2012)
+
+  25 Dec 2012; Lance Albertson <ramereth@gentoo.org> -drush-4.4.ebuild,
+  -drush-4.5.ebuild, drush-4.5-r1.ebuild, +drush-4.6.ebuild, drush-5.1.ebuild,
+  +drush-5.8.ebuild:
+  Version bump, cleanup, mark stable (resolves #432786)
 
 *drush-5.1 (13 May 2012)
 *drush-4.5-r1 (13 May 2012)
diff --git a/app-admin/drush/drush-4.4.ebuild b/app-admin/drush/drush-4.4.ebuild
deleted file mode 100644
index 6b0a472cd8b0..000000000000
--- a/app-admin/drush/drush-4.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.4.ebuild,v 1.1 2011/05/26 22:22:01 ramereth Exp $
-
-EAPI="4"
-
-DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
-HOMEPAGE="http://drupal.org/project/drush"
-SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="dev-lang/php[cli,simplexml] dev-php/pear"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	local docs="README.txt docs"
-
-	insinto /usr/share/drush
-	doins -r .
-	exeinto /usr/share/drush
-	doexe drush
-	dosym /usr/share/drush/drush /usr/bin/drush
-	dodoc -r ${docs}
-	# cleanup
-	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore ; do
-		rm -rf "${D}/usr/share/drush/${i}"
-	done
-
-	use examples && cp -R examples "${D}"/usr/share/doc/"${PF}"
-}
diff --git a/app-admin/drush/drush-4.5-r1.ebuild b/app-admin/drush/drush-4.5-r1.ebuild
index 40fd579b6d67..bdd3c21aaa73 100644
--- a/app-admin/drush/drush-4.5-r1.ebuild
+++ b/app-admin/drush/drush-4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.5-r1.ebuild,v 1.1 2012/05/13 08:01:48 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.5-r1.ebuild,v 1.2 2012/12/25 04:36:13 ramereth Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 DEPEND="dev-lang/php[cli,simplexml]
diff --git a/app-admin/drush/drush-4.5.ebuild b/app-admin/drush/drush-4.6.ebuild
index 35a84c465e9b..b7d03e9fb104 100644
--- a/app-admin/drush/drush-4.5.ebuild
+++ b/app-admin/drush/drush-4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.5.ebuild,v 1.1 2012/03/09 05:03:41 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-4.6.ebuild,v 1.1 2012/12/25 04:36:13 ramereth Exp $
 
 EAPI="4"
 
@@ -13,13 +13,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
-DEPEND="dev-lang/php[cli,simplexml] dev-php/pear"
+DEPEND="dev-lang/php[cli,simplexml]
+	dev-php/pear
+	dev-php/PEAR-Console_Table"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 
+src_prepare() {
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.txt!\0.bz2!g" \
+		includes/environment.inc || die
+	sed -i -e "s!\.php'!.php.bz2'!" commands/core/docs.drush.inc || die
+}
+
 src_install() {
 	local docs="README.txt docs"
-
+	use examples && docs="${docs} examples"
 	insinto /usr/share/drush
 	doins -r .
 	exeinto /usr/share/drush
@@ -30,6 +40,5 @@ src_install() {
 	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore ; do
 		rm -rf "${D}/usr/share/drush/${i}"
 	done
-
-	use examples && cp -R examples "${D}"/usr/share/doc/"${PF}"
+	keepdir /etc/drush
 }
diff --git a/app-admin/drush/drush-5.1.ebuild b/app-admin/drush/drush-5.1.ebuild
index fb551bbfba85..31d0113a25a6 100644
--- a/app-admin/drush/drush-5.1.ebuild
+++ b/app-admin/drush/drush-5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-5.1.ebuild,v 1.1 2012/05/13 08:01:51 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-5.1.ebuild,v 1.2 2012/12/25 04:36:13 ramereth Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+examples"
 
 DEPEND="dev-lang/php[cli,simplexml]
diff --git a/app-admin/drush/drush-5.8.ebuild b/app-admin/drush/drush-5.8.ebuild
new file mode 100644
index 000000000000..52c92a93b2ab
--- /dev/null
+++ b/app-admin/drush/drush-5.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/drush/drush-5.8.ebuild,v 1.1 2012/12/25 04:36:13 ramereth Exp $
+
+EAPI="4"
+
+inherit bash-completion-r1
+
+DESCRIPTION="Drush is a command line shell and scripting interface for Drupal"
+HOMEPAGE="http://drupal.org/project/drush"
+SRC_URI="http://ftp.drupal.org/files/projects/${PN}-7.x-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+examples"
+
+DEPEND="dev-lang/php[cli,simplexml]
+	dev-php/pear
+	dev-php/PEAR-Console_Table
+	dev-php/PEAR-Console_Getopt"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.txt!\0.bz2!g" \
+		includes/bootstrap.inc || die
+	sed -i \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		commands/core/docs.drush.inc || die
+	sed \
+		-e "1,2d" \
+		-e "5,11d" \
+		drush.complete.sh > drush.bashcomp
+}
+
+src_install() {
+	local docs="README.txt docs"
+	use examples && docs="${docs} examples"
+	insinto /usr/share/drush
+	doins -r .
+	exeinto /usr/share/drush
+	doexe drush
+	dosym /usr/share/drush/drush /usr/bin/drush
+	dodoc -r ${docs}
+	# cleanup
+	for i in ${docs} LICENSE.txt drush.bat examples includes/.gitignore \
+		.gitignore .travis.yml drush.complete.sh ; do
+		rm -rf "${D}/usr/share/drush/${i}"
+	done
+	keepdir /etc/drush
+	newbashcomp drush.bashcomp drush
+}