summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-05-06 03:34:58 +0000
committerSamuli Suominen <drac@gentoo.org>2008-05-06 03:34:58 +0000
commit1a302ad6ee5921b3e1e4e4c49108cf8dac15c156 (patch)
treecf9955fa9a29ad0839d0e59decd18a549177f32f /app-portage
parentversion bump at request of ferringb (diff)
downloadgentoo-2-1a302ad6ee5921b3e1e4e4c49108cf8dac15c156.tar.gz
gentoo-2-1a302ad6ee5921b3e1e4e4c49108cf8dac15c156.tar.bz2
gentoo-2-1a302ad6ee5921b3e1e4e4c49108cf8dac15c156.zip
GCC 4.3 fix by Jan Kundrát wrt #216275.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'app-portage')
-rw-r--r--app-portage/herdstat/ChangeLog6
-rw-r--r--app-portage/herdstat/files/1.1.2-gcc43.patch30
-rw-r--r--app-portage/herdstat/herdstat-1.1.2-r1.ebuild6
3 files changed, 38 insertions, 4 deletions
diff --git a/app-portage/herdstat/ChangeLog b/app-portage/herdstat/ChangeLog
index 9d31c68eaac2..7ef938581b84 100644
--- a/app-portage/herdstat/ChangeLog
+++ b/app-portage/herdstat/ChangeLog
@@ -1,6 +1,10 @@
# 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.83 2008/02/17 18:25:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/ChangeLog,v 1.84 2008/05/06 03:34:58 drac Exp $
+
+ 06 May 2008; Samuli Suominen <drac@gentoo.org> +files/1.1.2-gcc43.patch,
+ herdstat-1.1.2-r1.ebuild:
+ GCC 4.3 fix by Jan Kundrát wrt #216275.
17 Feb 2008; nixnut <nixnut@gentoo.org> herdstat-1.1.2-r1.ebuild:
Stable on ppc wrt bug 191688
diff --git a/app-portage/herdstat/files/1.1.2-gcc43.patch b/app-portage/herdstat/files/1.1.2-gcc43.patch
new file mode 100644
index 000000000000..259baf7c0a71
--- /dev/null
+++ b/app-portage/herdstat/files/1.1.2-gcc43.patch
@@ -0,0 +1,30 @@
+--- src/common.cc.orig 2008-04-05 04:30:44.066828000 +0200
++++ src/common.cc 2008-04-05 04:32:20.760417283 +0200
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include <iostream>
++#include <ctime>
+ #include <herdstat/exceptions.hh>
+ #include <herdstat/fetcher/fetcher.hh>
+ #include <herdstat/util/string.hh>
+--- src/pkgcache.cc.orig 2005-11-02 16:00:02.000000000 +0100
++++ src/pkgcache.cc 2008-04-05 04:33:20.367815011 +0200
+@@ -27,6 +27,7 @@
+ #include <iostream>
+ #include <algorithm>
+ #include <iterator>
++#include <ctime>
+
+ #include <herdstat/util/string.hh>
+ #include <herdstat/util/file.hh>
+--- src/herdstat.cc.orig 2008-04-05 04:30:44.070160000 +0200
++++ src/herdstat.cc 2008-04-05 04:33:49.978079014 +0200
+@@ -28,6 +28,7 @@
+ #include <map>
+ #include <vector>
+ #include <algorithm>
++#include <cstring>
+
+ #ifdef HAVE_GETOPT_H
+ # include <getopt.h>
diff --git a/app-portage/herdstat/herdstat-1.1.2-r1.ebuild b/app-portage/herdstat/herdstat-1.1.2-r1.ebuild
index 278b08676613..1d3b04fa1e99 100644
--- a/app-portage/herdstat/herdstat-1.1.2-r1.ebuild
+++ b/app-portage/herdstat/herdstat-1.1.2-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/app-portage/herdstat/herdstat-1.1.2-r1.ebuild,v 1.4 2008/02/17 18:25:12 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/herdstat/herdstat-1.1.2-r1.ebuild,v 1.5 2008/05/06 03:34:58 drac Exp $
inherit bash-completion eutils
@@ -26,8 +26,8 @@ DEPEND="${RDEPEND}
src_unpack () {
unpack ${A}
cd "${S}"
-
- epatch "${FILESDIR}"/1.1.2-herds-xml-location.patch
+ epatch "${FILESDIR}"/${PV}-gcc43.patch \
+ "${FILESDIR}"/${PV}-herds-xml-location.patch
}
src_compile() {