alpha/sparc/x86 stable, add -r1 to fix bug #191688

(Portage version: 2.1.4, RepoMan options: --force)

4 files changed, 47 insertions, 9 deletions

diff --git a/app-portage/herdstat/ChangeLog b/app-portage/herdstat/ChangeLog
index 5f8da43ec7b8..6887e48be355 100644
--- a/app-portage/herdstat/ChangeLog
+++ b/app-portage/herdstat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/herdstat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.79 2008/01/20 02:00:58 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.80 2008/01/20 15:02:38 armin76 Exp $
+
+*herdstat-1.1.2-r1 (20 Jan 2008)
+
+  20 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  +files/1.1.2-herds-xml-location.patch, -herdstat-1.1.2.ebuild,
+  +herdstat-1.1.2-r1.ebuild:
+  alpha/sparc/x86 stable, add -r1 to fix bug #191688
 
   20 Jan 2008; Mark Loeser <halcy0n@gentoo.org>
   -files/herdstat-1.1.91-undefined-lhp.patch,
diff --git a/app-portage/herdstat/files/1.1.2-herds-xml-location.patch b/app-portage/herdstat/files/1.1.2-herds-xml-location.patch
new file mode 100644
index 000000000000..ff45660f080d
--- /dev/null
+++ b/app-portage/herdstat/files/1.1.2-herds-xml-location.patch
@@ -0,0 +1,24 @@
+diff -ur herdstat-1.1.2.orig/src/common.cc herdstat-1.1.2/src/common.cc
+--- herdstat-1.1.2.orig/src/common.cc	2008-01-20 15:51:01.000000000 +0100
++++ herdstat-1.1.2/src/common.cc	2008-01-20 15:51:53.000000000 +0100
+@@ -33,7 +33,7 @@
+ #include "options.hh"
+ #include "common.hh"
+ 
+-#define HERDSXML_REMOTE "http://www.gentoo.org/cgi-bin/viewcvs.cgi/misc/herds.xml?rev=HEAD;cvsroot=gentoo;content-type=text/plain"
++#define HERDSXML_REMOTE "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml?content-type=text/plain"
+ #define HERDSXML_LOCAL  LOCALSTATEDIR"/herds.xml"
+ #define DEVAWAYXML_REMOTE "http://dev.gentoo.org/devaway/xml/index.php"
+ #define DEVAWAYXML_LOCAL  LOCALSTATEDIR"/devaway.xml"
+diff -ur herdstat-1.1.2.orig/src/herdstat.cc herdstat-1.1.2/src/herdstat.cc
+--- herdstat-1.1.2.orig/src/herdstat.cc	2008-01-20 15:51:01.000000000 +0100
++++ herdstat-1.1.2/src/herdstat.cc	2008-01-20 15:52:40.000000000 +0100
+@@ -556,7 +556,7 @@
+ 
+ 	    /* only set if it wasnt specified on the command line */
+ 	    if (options::herdsxml().empty())
+-		options::set_herdsxml(gentoocvs+"/gentoo/misc/herds.xml");
++		options::set_herdsxml(gentoocvs+"/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml");
+ 	    if (options::userinfoxml().empty())
+ 		options::set_userinfoxml(gentoocvs+"/gentoo/xml/htdocs/proj/en/devrel/roll-call/userinfo.xml");
+ 	}
diff --git a/app-portage/herdstat/files/digest-herdstat-1.1.2 b/app-portage/herdstat/files/digest-herdstat-1.1.2-r1
index 15a92d1911fa..15a92d1911fa 100644
--- a/app-portage/herdstat/files/digest-herdstat-1.1.2
+++ b/app-portage/herdstat/files/digest-herdstat-1.1.2-r1
diff --git a/app-portage/herdstat/herdstat-1.1.2.ebuild b/app-portage/herdstat/herdstat-1.1.2-r1.ebuild
index 293fabb7cc2f..689ad364372d 100644
--- a/app-portage/herdstat/herdstat-1.1.2.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.2-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.2.ebuild,v 1.4 2007/03/10 14:49:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.2-r1.ebuild,v 1.1 2008/01/20 15:02:38 armin76 Exp $
 
-inherit bash-completion
+inherit bash-completion eutils
 
 TEST_DATA_PV="20051023"
 TEST_DATA_P="${PN}-test-data-${TEST_DATA_PV}"
 
-DESCRIPTION="A multi-purpose query tool capable of things such as displaying herd/developer information and displaying category/package metadata"
+DESCRIPTION="Query tool capable of displaying herd/developer information category/package metadata"
 HOMEPAGE="http://developer.berlios.de/projects/herdstat/"
 SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2
 	test? ( http://download.berlios.de/lib${PN}/${TEST_DATA_P}.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~mips ~ppc sparc x86"
 IUSE="debug doc ncurses test"
 
 RDEPEND="~dev-cpp/libherdstat-0.1.1"
@@ -23,9 +23,16 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( dev-python/docutils )"
 
+src_unpack () {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/1.1.2-herds-xml-location.patch
+}
+
 src_compile() {
 	econf \
-		--with-test-data=${WORKDIR}/${TEST_DATA_P} \
+		--with-test-data="${WORKDIR}"/${TEST_DATA_P} \
 		$(use_enable debug) \
 		$(use_with ncurses) \
 		|| die "econf failed"
@@ -49,13 +56,13 @@ src_install() {
 }
 
 pkg_preinst() {
-	chgrp portage ${D}/var/lib/herdstat
+	chgrp portage "${D}"/var/lib/herdstat
 }
 
 pkg_postinst() {
 	# remove any previous caches, as it's possible that the internal
 	# format has changed, and may cause bugs.
-	rm -f ${ROOT}/var/lib/herdstat/*cache*
+	rm -f "${ROOT}"/var/lib/herdstat/*cache*
 
 	elog
 	elog "You must be in the portage group to use herdstat."