Added patches to fix link (bug #211715) to list of developers and to fix compilation problems with gcc-4.3 (bug #216269), thanks to tove and jkt.

(Portage version: 2.1.5_rc6)

4 files changed, 85 insertions, 6 deletions

diff --git a/dev-cpp/libherdstat/ChangeLog b/dev-cpp/libherdstat/ChangeLog
index 472dd730c561..1e1181555e90 100644
--- a/dev-cpp/libherdstat/ChangeLog
+++ b/dev-cpp/libherdstat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libherdstat
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.18 2008/02/01 03:50:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.19 2008/04/30 23:48:43 dev-zero Exp $
+
+  30 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/libherdstat-0.1.1-gcc-4.3.patch,
+  +files/libherdstat-0.1.1-project_xml.patch, libherdstat-0.1.1-r1.ebuild:
+  Added patches to fix link (bug #211715) to list of developers and to fix
+  compilation problems with gcc-4.3 (bug #216269), thanks to tove and jkt.
 
   01 Feb 2008; Jeroen Roovers <jer@gentoo.org> libherdstat-0.1.1-r1.ebuild:
   Stable for HPPA (bug #191688).
diff --git a/dev-cpp/libherdstat/files/libherdstat-0.1.1-gcc-4.3.patch b/dev-cpp/libherdstat/files/libherdstat-0.1.1-gcc-4.3.patch
new file mode 100644
index 000000000000..7a0d508904d8
--- /dev/null
+++ b/dev-cpp/libherdstat/files/libherdstat-0.1.1-gcc-4.3.patch
@@ -0,0 +1,58 @@
+--- herdstat/util/misc.hh.orig	2005-11-02 15:00:46.000000000 +0100
++++ herdstat/util/misc.hh	2008-04-05 04:15:32.745734668 +0200
+@@ -34,6 +34,8 @@
+ 
+ #include <string>
+ #include <map>
++#include <algorithm>
++#include <ctime>
+ 
+ enum color_name_T
+ {
+--- herdstat/util/string.hh.orig	2005-11-02 15:00:46.000000000 +0100
++++ herdstat/util/string.hh	2008-04-05 04:17:57.303614508 +0200
+@@ -35,9 +35,12 @@
+ #include <string>
+ #include <vector>
+ #include <sstream>
++#include <algorithm>
+ #include <cstdarg>
+ #include <cerrno>
+ #include <cctype>
++#include <cstdlib>
++#include <climits>
+ #include <herdstat/exceptions.hh>
+ 
+ namespace herdstat {
+
+--- herdstat/exceptions.cc.orig	2005-11-02 15:00:46.000000000 +0100
++++ herdstat/exceptions.cc	2008-04-05 04:20:52.322830799 +0200
+@@ -27,6 +27,8 @@
+ #include <string>
+ #include <cerrno>
+ #include <cstdarg>
++#include <cstdlib>
++#include <cstring>
+ #include <herdstat/exceptions.hh>
+ 
+ namespace herdstat {
+--- herdstat/util/misc.cc.orig	2005-11-02 15:00:46.000000000 +0100
++++ herdstat/util/misc.cc	2008-04-05 04:25:26.032397691 +0200
+@@ -29,6 +29,7 @@
+ #include <cstdlib>
+ #include <cstdarg>
+ #include <ctime>
++#include <cstring>
+ #include <unistd.h>
+ 
+ #include <herdstat/exceptions.hh>
+--- herdstat/portage/config.cc.orig	2005-11-02 15:00:46.000000000 +0100
++++ herdstat/portage/config.cc	2008-04-05 04:26:49.103038711 +0200
+@@ -24,6 +24,7 @@
+ # include "config.h"
+ #endif
+ 
++#include <cstring>
+ #include <herdstat/util/string.hh>
+ #include <herdstat/portage/config.hh>
+ 
diff --git a/dev-cpp/libherdstat/files/libherdstat-0.1.1-project_xml.patch b/dev-cpp/libherdstat/files/libherdstat-0.1.1-project_xml.patch
new file mode 100644
index 000000000000..2d668647822b
--- /dev/null
+++ b/dev-cpp/libherdstat/files/libherdstat-0.1.1-project_xml.patch
@@ -0,0 +1,12 @@
+diff -urNa libherdstat-0.1.1_bck/herdstat/portage/project_xml.cc libherdstat-0.1.1/herdstat/portage/project_xml.cc
+--- libherdstat-0.1.1_bck/herdstat/portage/project_xml.cc	2005-11-02 15:00:46.000000000 +0100
++++ libherdstat-0.1.1/herdstat/portage/project_xml.cc	2008-02-28 12:58:19.000000000 +0100
+@@ -34,7 +34,7 @@
+ namespace herdstat {
+ namespace portage {
+ /*** static members *********************************************************/
+-const char * const project_xml::_baseURL = "http://www.gentoo.org/cgi-bin/viewcvs.cgi/*checkout*/xml/htdocs%s?rev=HEAD&root=gentoo&content-type=text/plain";
++const char * const project_xml::_baseURL = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo/xml/htdocs%s?content-type=text/plain";
+ const char * const project_xml::_baseLocal = "%s/gentoo/xml/htdocs/%s";
+ std::set<std::string> project_xml::_parsed;
+ /****************************************************************************/
diff --git a/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild b/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild
index 96b1e1c3f92e..a0da9b5ecbdd 100644
--- a/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild
+++ b/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild,v 1.7 2008/02/01 03:50:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild,v 1.8 2008/04/30 23:48:43 dev-zero Exp $
 
 inherit eutils
 
@@ -27,13 +27,16 @@ RDEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-locale-longdesc.diff
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-fix-locale-longdesc.diff" \
+		"${FILESDIR}/${P}-project_xml.patch" \
+		"${FILESDIR}/${P}-gcc-4.3.patch"
 }
 
 src_compile() {
 	econf \
-		--with-test-data=${WORKDIR}/${TEST_DATA_P} \
+		--with-test-data="${WORKDIR}/${TEST_DATA_P}" \
 		--enable-static \
 		$(use_enable test tests) \
 		$(use_enable debug) \
@@ -48,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README TODO NEWS
 
 	if use doc ; then