summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-cpp/libherdstat/ChangeLog8
-rw-r--r--dev-cpp/libherdstat/Manifest6
-rw-r--r--dev-cpp/libherdstat/files/libherdstat-0.1.1-gcc-4.3.patch58
-rw-r--r--dev-cpp/libherdstat/files/libherdstat-0.1.1-project_xml.patch12
-rw-r--r--dev-cpp/libherdstat/libherdstat-0.1.1-r1.ebuild13
5 files changed, 89 insertions, 8 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/Manifest b/dev-cpp/libherdstat/Manifest
index f43bcb15b72b..b854a0dc3300 100644
--- a/dev-cpp/libherdstat/Manifest
+++ b/dev-cpp/libherdstat/Manifest
@@ -1,6 +1,8 @@
AUX libherdstat-0.1.1-fix-locale-longdesc.diff 1411 RMD160 98a15c7a4d79dc86dc778313206c1067c384f098 SHA1 42326947586d00b1842810331ff99a7b68729010 SHA256 42cdbe0a1201b37e403fcf8f2fc9ab121bf7c076ab35ebbbadd57d4c0febea1e
+AUX libherdstat-0.1.1-gcc-4.3.patch 1513 RMD160 c86127dee0ea2d2501030b1052c3da284c9d18cd SHA1 6dc6e8d5a5113e6bb850ae29f0e03c8f745d0d1c SHA256 4dad7169d635e073294844896f8334a265fff02ef1cc3523dfb041f7d085a2cd
+AUX libherdstat-0.1.1-project_xml.patch 935 RMD160 5cb59e1f3636756a9339b75d2cafd495da3ff0ce SHA1 deeb5f441e9f176cbf085bafea728aa98db155f0 SHA256 a03b49e8216aedd32d2752bfbe4df09fd5a651c4b262ca1301473cdbf0f8eb63
DIST herdstat-test-data-20051023.tar.bz2 15901 RMD160 5e044e4c494e7a805f09d9286079816a51c5e654 SHA1 9b3b93a1e1361ce444c1cf863a6513c0b66a290b SHA256 f3dee7fa0727899804fa42cad2548a5cb91e94379972d83560453fb55e1f62b3
DIST libherdstat-0.1.1.tar.bz2 303836 RMD160 fa33048e3c3554324cce812e19e505b7300155f9 SHA1 8fbfe4e77919c23a589cd6a5910560127ac3941b SHA256 b7b35c5e82bdadfe979c2bb2d7954b7a085eacf6bc5e26d70ef9b6a0967bd7e5
-EBUILD libherdstat-0.1.1-r1.ebuild 1520 RMD160 68638ccfd160b9f6795b493931f476436da1eae7 SHA1 30f83f589d0b9226314e7e7b7c750f3280480327 SHA256 32b97ed5a63d117eae841ebaf03783c5d4c337e47fc3d6d4d233cf0398cc35da
-MISC ChangeLog 2875 RMD160 fa235455ab99cbcf87fde95819702a0c2db73647 SHA1 686bd04e733426dd405066ace8de8ce580b7b160 SHA256 ea201a85760cceab8d2184bf943ff5dadcdfa5f77f6fe96a8290fd78845ebfc4
+EBUILD libherdstat-0.1.1-r1.ebuild 1612 RMD160 cbabff395347af2ee2ae4e5a233cf272c6455a67 SHA1 7446613645e688dccdc3063f2b102f41f9f8e07b SHA256 1cf41969c140e08f8166fcbfdd4524d7d1d0108c53c2df891861761a42667c3f
+MISC ChangeLog 3201 RMD160 db359a7fcbeca4651ec6e32e70f43fb40ebb6e9a SHA1 aeeb53ced30eea2918253a27aebcc947c039173f SHA256 1a3728bae8f0ac6aad00012eaf036f852710348c1a362f6e9fb7003291ca1b86
MISC metadata.xml 500 RMD160 4c33ed449d412dc4394fc51a398caa0f5da39980 SHA1 cd88bddb88d0d1c6f018eb61ba7fcf3ba1d2923d SHA256 7314d79b8464f63eb798418bde755c14fc5364498ff297c1531db44ffaf4ae3b
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