Revision bump; apply patch against trunk to fix max label unhandled exception when '-d all' is specified.

(Portage version: 2.0.51.19)

7 files changed, 37 insertions, 60 deletions

diff --git a/app-portage/herdstat/ChangeLog b/app-portage/herdstat/ChangeLog
index f3b517994980..1d7ae9e31153 100644
--- a/app-portage/herdstat/ChangeLog
+++ b/app-portage/herdstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/herdstat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.7 2005/03/18 11:53:55 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.8 2005/03/20 17:11:06 ka0ttic Exp $
+
+*herdstat-0.6-r1 (20 Mar 2005)
+
+  20 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/herdstat-0.6-fix-dev-all.diff, -herdstat-0.5.ebuild,
+  -herdstat-0.6.ebuild, +herdstat-0.6-r1.ebuild:
+  Revision bump; apply patch against trunk to fix max label unhandled
+  exception when '-d all' is specified.
 
 *herdstat-0.6 (18 Mar 2005)
 
diff --git a/app-portage/herdstat/Manifest b/app-portage/herdstat/Manifest
index 536fbbd913ad..754a7cbc596b 100644
--- a/app-portage/herdstat/Manifest
+++ b/app-portage/herdstat/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41305c0eb11a7ae32de854b1d933fc2f herdstat-0.6.ebuild 1157
-MD5 ec31b86039d7e3e39cabfec3a7d3e8fa herdstat-0.5.ebuild 1157
-MD5 0b41954df8e55b59fb5489b67c1bf560 ChangeLog 1182
+MD5 a3af781f3bbb629c07f989baa8614e49 herdstat-0.6-r1.ebuild 1246
+MD5 e40df828f3b18300dbf6598ec1cdb2ee ChangeLog 1485
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 f9ad37df74ce17815e0b1745b9159930 files/digest-herdstat-0.5 65
-MD5 7c2b7e4f965005f9fe94728c434072a2 files/digest-herdstat-0.6 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCOsFrEZCkKN40op4RAuiHAJwMg/BCRJQypnyjUwu3iI9LjBb3DwCeKUC0
-95Dhp1EC6IQouoXe+DzpysM=
-=HEyE
------END PGP SIGNATURE-----
+MD5 7c2b7e4f965005f9fe94728c434072a2 files/digest-herdstat-0.6-r1 65
+MD5 4325434be2093988b4b5c6ec7e14cb59 files/herdstat-0.6-fix-dev-all.diff 475
diff --git a/app-portage/herdstat/files/digest-herdstat-0.5 b/app-portage/herdstat/files/digest-herdstat-0.5
deleted file mode 100644
index 3602c2bea800..000000000000
--- a/app-portage/herdstat/files/digest-herdstat-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ef15b59c26aa978c54af968e2d76fe8 herdstat-0.5.tar.bz2 140175
diff --git a/app-portage/herdstat/files/digest-herdstat-0.6 b/app-portage/herdstat/files/digest-herdstat-0.6-r1
index 07efd838d866..07efd838d866 100644
--- a/app-portage/herdstat/files/digest-herdstat-0.6
+++ b/app-portage/herdstat/files/digest-herdstat-0.6-r1
diff --git a/app-portage/herdstat/files/herdstat-0.6-fix-dev-all.diff b/app-portage/herdstat/files/herdstat-0.6-fix-dev-all.diff
new file mode 100644
index 000000000000..d06f33ef5ed1
--- /dev/null
+++ b/app-portage/herdstat/files/herdstat-0.6-fix-dev-all.diff
@@ -0,0 +1,16 @@
+--- tags/release-0.6/src/action_dev_handler.cc	2005-03-18 06:34:53.000000000 -0500
++++ trunk/src/action_dev_handler.cc	2005-03-20 10:14:38.000000000 -0500
+@@ -52,7 +52,12 @@
+     
+     /* set format attributes */
+     formatter_T output;
+-    output.set_maxlabel(12);
++
++    if (devs[0] == "all")
++        output.set_maxlabel(16);
++    else
++        output.set_maxlabel(12);
++
+     output.set_maxdata(optget("maxcol", size_t) - output.maxlabel());
+     output.set_attrs();
+ 
diff --git a/app-portage/herdstat/herdstat-0.5.ebuild b/app-portage/herdstat/herdstat-0.6-r1.ebuild
index 495219073b09..e4ce7cb4b262 100644
--- a/app-portage/herdstat/herdstat-0.5.ebuild
+++ b/app-portage/herdstat/herdstat-0.6-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-0.5.ebuild,v 1.1 2005/03/15 10:47:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-0.6-r1.ebuild,v 1.1 2005/03/20 17:11:06 ka0ttic Exp $
 
-inherit bash-completion
+inherit bash-completion eutils
 
 DESCRIPTION="Utility that parses Gentoo's herds.xml and allows queries based on herd or developer"
 HOMEPAGE="http://developer.berlios.de/projects/herdstat/"
@@ -18,6 +18,12 @@ RDEPEND="dev-libs/xmlwrapp
 DEPEND="dev-libs/xmlwrapp
 	>=sys-apps/sed-4"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-dev-all.diff
+}
+
 src_compile() {
 	econf $(use_enable debug) || die "econf failed"
 	emake || die "emake failed"
diff --git a/app-portage/herdstat/herdstat-0.6.ebuild b/app-portage/herdstat/herdstat-0.6.ebuild
deleted file mode 100644
index 50fd49554cd5..000000000000
--- a/app-portage/herdstat/herdstat-0.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-0.6.ebuild,v 1.1 2005/03/18 11:53:55 ka0ttic Exp $
-
-inherit bash-completion
-
-DESCRIPTION="Utility that parses Gentoo's herds.xml and allows queries based on herd or developer"
-HOMEPAGE="http://developer.berlios.de/projects/herdstat/"
-SRC_URI="http://download.berlios.de/herdstat/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="debug"
-
-RDEPEND="dev-libs/xmlwrapp
-	net-misc/wget"
-DEPEND="dev-libs/xmlwrapp
-	>=sys-apps/sed-4"
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/lib/herdstat
-	make DESTDIR="${D}" install || die "make install failed"
-	dobashcompletion bashcomp
-	dodoc AUTHORS ChangeLog README TODO NEWS
-}
-
-pkg_postinst() {
-	chown root:portage /var/lib/herdstat
-	chmod 0775 /var/lib/herdstat
-
-	echo
-	einfo "Unless you plan on using your own local copy of herds.xml, you"
-	einfo "must be in the portage group in order to automatically fetch it."
-	bash-completion_pkg_postinst
-}