5 files changed, 185 insertions, 14 deletions
diff --git a/dev-cpp/libherdstat/ChangeLog b/dev-cpp/libherdstat/ChangeLog
index d0789acf66d4..5f54d274c009 100644
--- a/dev-cpp/libherdstat/ChangeLog
+++ b/dev-cpp/libherdstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/libherdstat
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.9 2006/01/19 11:23:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.10 2006/02/09 01:05:07 halcy0n Exp $
+
+  09 Feb 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/libherdstat-0.2.0-gcc.patch, libherdstat-0.2.0.ebuild:
+  Added upstream patch for bug #119592
 
 *libherdstat-0.2.0 (19 Jan 2006)
 
diff --git a/dev-cpp/libherdstat/Manifest b/dev-cpp/libherdstat/Manifest
index 246786e4ac36..1d225c193aed 100644
--- a/dev-cpp/libherdstat/Manifest
+++ b/dev-cpp/libherdstat/Manifest
@@ -1,17 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 31c7b1d9260abd493d6f52f2e37e3594 ChangeLog 1778
+RMD160 fbab63320400a8cf58681bca79896013aeb2f35d ChangeLog 1778
+SHA256 68508755dc25e0a963b323428b3bf727c18b490534044cb7bd7e3621d3c2b610 ChangeLog 1778
 MD5 426d70038fbc094b415cebdcb81c8899 files/digest-libherdstat-0.1.1-r1 149
-MD5 4d5a12ef99b07776a916fa880343c3fe files/digest-libherdstat-0.2.0 149
+RMD160 cacc76402424ad9c9f4efc352d5e6d68a9dd3e61 files/digest-libherdstat-0.1.1-r1 149
+SHA256 67fc7680693dd0c9daa52d519312bd3c195757cfd01e07fc4ece9d6edafbc9e6 files/digest-libherdstat-0.1.1-r1 149
+MD5 11b7dc51813673b952f8b6ec0a04c0dd files/digest-libherdstat-0.2.0 335
+RMD160 af59a24964ee1508219f90b136e12aee59f71bd1 files/digest-libherdstat-0.2.0 335
+SHA256 746b39f7ded98ae462cf69a09a98e857164578f2eee1a979d84b3d784ac68970 files/digest-libherdstat-0.2.0 335
 MD5 80fdc6c488a033e2c621c5204433aabf files/libherdstat-0.1.1-fix-locale-longdesc.diff 1411
+RMD160 98a15c7a4d79dc86dc778313206c1067c384f098 files/libherdstat-0.1.1-fix-locale-longdesc.diff 1411
+SHA256 42cdbe0a1201b37e403fcf8f2fc9ab121bf7c076ab35ebbbadd57d4c0febea1e files/libherdstat-0.1.1-fix-locale-longdesc.diff 1411
+MD5 010e68a96fe6db6f3958c8054b41b35e files/libherdstat-0.2.0-gcc.patch 4475
+RMD160 3c1225256511993d76e9dc11d46b275ca5380464 files/libherdstat-0.2.0-gcc.patch 4475
+SHA256 2a3ce02d5530f12fc7e0d5d655243b35a987a25905daf77dd157cac599d0220c files/libherdstat-0.2.0-gcc.patch 4475
 MD5 2d45431a1cc0fe792350091c06950092 libherdstat-0.1.1-r1.ebuild 1536
-MD5 21825ffd60ed2f403c07f7a006383656 libherdstat-0.2.0.ebuild 1798
+RMD160 9761f75b04bc7ab0c96b3604a7249905a141274f libherdstat-0.1.1-r1.ebuild 1536
+SHA256 45db022f0aa5a286ba115061d7a1c2a09e7dfb81b801fb1daa7097a0bb50db93 libherdstat-0.1.1-r1.ebuild 1536
+MD5 eba0f6f395b558ee323b4d8a82840ac1 libherdstat-0.2.0.ebuild 1947
+RMD160 19e27f8021c8917f1c3080189db46e0d4ba049f5 libherdstat-0.2.0.ebuild 1947
+SHA256 dfdb5b2592b65008290fd8d61b6a11a17109c42f18aa61f3e80593eaccc8a135 libherdstat-0.2.0.ebuild 1947
 MD5 b0b19a2ad7f5b88f52f6698b5b5083bf metadata.xml 593
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDz3bHEZCkKN40op4RAmBeAKDEJ4HYp7rWGPTHiIdf01xz+7WsnQCZAazj
-LTqGKSteU5zquVSR+JdvVsI=
-=jCaJ
------END PGP SIGNATURE-----
+RMD160 9fab6f637523ab255f18de6444af1b8ff008199e metadata.xml 593
+SHA256 b79e36ef21ca7169f14f85b846de79ce3ab6818f935cc058fde07a6077880c9e metadata.xml 593
diff --git a/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0 b/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0
index b3cfcfa20f82..813e50830e38 100644
--- a/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0
+++ b/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0
@@ -1,2 +1,4 @@
 MD5 3a7bff68e6a5818c461ad359291181c0 herdstat-test-data-20060119.tar.bz2 15549
 MD5 8806057274b326a4a63a091bf4f666a1 libherdstat-0.2.0.tar.bz2 360556
+RMD160 adac363187d0f942fa11be7444d669abf2e919e0 libherdstat-0.2.0.tar.bz2 360556
+SHA256 7937387d76558c3ced5cf03d5469cb21e9c8096476aceb7d68f33e8fd7861a8c libherdstat-0.2.0.tar.bz2 360556
diff --git a/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc.patch b/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc.patch
new file mode 100644
index 000000000000..1b341d167b6f
--- /dev/null
+++ b/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc.patch
@@ -0,0 +1,148 @@
+Index: tests/src/binaryio-test.hh
+===================================================================
+--- tests/src/binaryio-test.hh	(revision 223)
++++ tests/src/binaryio-test.hh	(revision 224)
+@@ -115,11 +115,10 @@
+         if (not stream)
+             throw herdstat::FileException("bar");
+ 
+-        herdstat::io::BinaryIStreamIterator<std::string> strEOF;
++        std::vector<std::string> s2;
++        s2.assign(herdstat::io::BinaryIStreamIterator<std::string>(stream),
++                  herdstat::io::BinaryIStreamIterator<std::string>());
+ 
+-        std::vector<std::string> s2(
+-                herdstat::io::BinaryIStreamIterator<std::string>(stream), strEOF);
+-
+         std::cout << "s2 = '";
+         std::copy(s2.begin(), s2.end(),
+             std::ostream_iterator<std::string>(std::cout, " "));
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 223)
++++ configure.ac	(revision 224)
+@@ -10,8 +10,8 @@
+ VERSION_MAJOR=0
+ VERSION_MINOR=2
+ VERSION_MICRO=0
+-VERSION_SUFFIX=
+-VERSION_SUFFIX_VERSION=
++VERSION_SUFFIX=p
++VERSION_SUFFIX_VERSION=1
+ VERSION_FULL="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_MICRO"
+ 
+ if ! test -z "$VERSION_SUFFIX" ; then
+@@ -104,6 +104,41 @@
+     AC_DEFINE_UNQUOTED(HAVE_GCC4, 1, [GCC Version 4])
+ fi
+ 
++AC_MSG_CHECKING([if ${CXX} supports __attribute__ ((unused))])
++AC_COMPILE_IFELSE(AC_LANG_PROGRAM([
++#include <stdio.h>
++void foo(int x __attribute__ ((unused)))
++{ printf("foo\n"); }
++],[
++    int i = 10;
++    foo(i);
++    return 0;
++    ]),
++    [HAS_ATTR_UNUSED="yes"],[HAS_ATTR_UNUSED="no"])
++AC_MSG_RESULT([$HAS_ATTR_UNUSED])
++
++if test "x$HAS_ATTR_UNUSED" = "xyes" ; then
++    AC_DEFINE(HAVE_ATTR_UNUSED, 1, [C compiler supports the unused attribute])
++fi
++
++AC_MSG_CHECKING([if ${CXX} supports __attribute__ ((deprecated))])
++AC_COMPILE_IFELSE(AC_LANG_PROGRAM([
++class __attribute__ ((deprecated)) Foo
++{
++    public:
++	Foo() __attribute__ ((deprecated)) { }
++};
++],[
++    Foo foo;
++    return 0;
++    ]),
++    [HAS_ATTR_DEPRECAED="yes"],[HAS_ATTR_DEPRECAED="no"])
++AC_MSG_RESULT([$HAS_ATTR_DEPRECAED])
++
++if test "x$HAS_ATTR_DEPRECAED" = "xyes" ; then
++    AC_DEFINE(HAVE_ATTR_DEPRECATED, 1, [C compiler supports the deprecated attribute])
++fi
++
+ LHS_CHECK_CXXFLAG([-pedantic])
+ LHS_CHECK_CXXFLAG([-ansi])
+ LHS_CHECK_CXXFLAG([-W])
+Index: herdstat/defs.hh
+===================================================================
+--- herdstat/defs.hh	(revision 223)
++++ herdstat/defs.hh	(revision 224)
+@@ -35,7 +35,7 @@
+ #define NELEMS(x) (sizeof(x) / sizeof(x[0]))
+ 
+ #ifndef LIBHERDSTAT_DEPRECATED
+-# if defined(__GNUC__) || defined(DOXYGEN)
++# if defined(HAVE_ATTR_DEPRECATED) || defined(DOXYGEN)
+ #   define LIBHERDSTAT_DEPRECATED __attribute__ ((deprecated))
+ # else
+ #   define LIBHERDSTAT_DEPRECATED
+@@ -43,7 +43,7 @@
+ #endif
+ 
+ #ifndef LIBHERDSTAT_UNUSED
+-# if defined(__GNUC__) || defined(DOXYGEN)
++# if defined(HAVE_ATTR_UNUSED) || defined(DOXYGEN)
+ #   define LIBHERDSTAT_UNUSED __attribute__ ((unused))
+ # else
+ #   define LIBHERDSTAT_UNUSED
+Index: herdstat/fetcher/impmap.cc
+===================================================================
+--- herdstat/fetcher/impmap.cc	(revision 223)
++++ herdstat/fetcher/impmap.cc	(revision 224)
+@@ -24,6 +24,8 @@
+ # include "config.h"
+ #endif
+ 
++#include <cassert>
++
+ #include <herdstat/fetcher/curlfetcher.hh>
+ #include <herdstat/fetcher/wgetfetcher.hh>
+ #include <herdstat/fetcher/impmap.hh>
+Index: herdstat/portage/exceptions.cc
+===================================================================
+--- herdstat/portage/exceptions.cc	(revision 223)
++++ herdstat/portage/exceptions.cc	(revision 224)
+@@ -24,6 +24,8 @@
+ # include "config.h"
+ #endif
+ 
++#include <cassert>
++
+ #include <herdstat/portage/exceptions.hh>
+ 
+ namespace herdstat {
+Index: herdstat/io/binary_stream.cc
+===================================================================
+--- herdstat/io/binary_stream.cc	(revision 223)
++++ herdstat/io/binary_stream.cc	(revision 224)
+@@ -24,6 +24,7 @@
+ # include "config.h"
+ #endif
+ 
++#include <cassert>
+ #include <herdstat/io/binary_stream.hh>
+ 
+ namespace herdstat {
+Index: herdstat/util/file.hh
+===================================================================
+--- herdstat/util/file.hh	(revision 223)
++++ herdstat/util/file.hh	(revision 224)
+@@ -39,6 +39,7 @@
+ #include <vector>
+ #include <cstdlib>
+ #include <cerrno>
++#include <cassert>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild b/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild
index b14ea185f6e2..8e6fd7c6fd67 100644
--- a/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild
+++ b/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild,v 1.1 2006/01/19 11:23:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild,v 1.2 2006/02/09 01:05:07 halcy0n Exp $
+
+inherit eutils autotools
 
 TEST_DATA_PV="20060119"
 TEST_DATA_P="${PN/lib/}-test-data-${TEST_DATA_PV}"
@@ -30,6 +32,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc.patch
+	AT_M4DIR="${WORKDIR}"/${P}/m4 eautoreconf
+}
+
 src_compile() {
 	econf \
 		--disable-examples \