5 files changed, 9 insertions, 254 deletions
diff --git a/dev-cpp/libherdstat/ChangeLog b/dev-cpp/libherdstat/ChangeLog
index df9a680be9f8..14aa87f2e423 100644
--- a/dev-cpp/libherdstat/ChangeLog
+++ b/dev-cpp/libherdstat/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2008/01/24 20:27:55 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libherdstat/ChangeLog,v 1.17 2008/01/30 14:58:19 armin76 Exp $
+
+  30 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/libherdstat-0.2.0-gcc.patch, -libherdstat-0.2.0.ebuild:
+  old
 
   24 Jan 2008; Christoph Mende <angelos@gentoo.org>
   libherdstat-0.1.1-r1.ebuild:
diff --git a/dev-cpp/libherdstat/Manifest b/dev-cpp/libherdstat/Manifest
index 9c28017ed6b6..8c533c169c9d 100644
--- a/dev-cpp/libherdstat/Manifest
+++ b/dev-cpp/libherdstat/Manifest
@@ -1,30 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libherdstat-0.1.1-fix-locale-longdesc.diff 1411 RMD160 98a15c7a4d79dc86dc778313206c1067c384f098 SHA1 42326947586d00b1842810331ff99a7b68729010 SHA256 42cdbe0a1201b37e403fcf8f2fc9ab121bf7c076ab35ebbbadd57d4c0febea1e
 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
-AUX libherdstat-0.2.0-gcc.patch 4475 RMD160 3c1225256511993d76e9dc11d46b275ca5380464 SHA1 63a4598dfe66d0bb8bf0c84cadd61ce1f2daba70 SHA256 2a3ce02d5530f12fc7e0d5d655243b35a987a25905daf77dd157cac599d0220c
-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
 DIST herdstat-test-data-20051023.tar.bz2 15901 RMD160 5e044e4c494e7a805f09d9286079816a51c5e654 SHA1 9b3b93a1e1361ce444c1cf863a6513c0b66a290b SHA256 f3dee7fa0727899804fa42cad2548a5cb91e94379972d83560453fb55e1f62b3
-DIST herdstat-test-data-20060119.tar.bz2 15549 RMD160 d48b869e00ad03771a4a2fa9fc2ecfead80810da SHA1 737dd1bb32ff093b726afa81e004ef9dfd6661c9 SHA256 0d154483310b59054cfd6ddb9fb5c477ad786cdb7ff11cdfaa74a82c0c0e8633
 DIST libherdstat-0.1.1.tar.bz2 303836 RMD160 fa33048e3c3554324cce812e19e505b7300155f9 SHA1 8fbfe4e77919c23a589cd6a5910560127ac3941b SHA256 b7b35c5e82bdadfe979c2bb2d7954b7a085eacf6bc5e26d70ef9b6a0967bd7e5
-DIST libherdstat-0.2.0.tar.bz2 360556 RMD160 adac363187d0f942fa11be7444d669abf2e919e0 SHA1 0a538548a1b895d569b52ecedd956eebda522bc4 SHA256 7937387d76558c3ced5cf03d5469cb21e9c8096476aceb7d68f33e8fd7861a8c
 EBUILD libherdstat-0.1.1-r1.ebuild 1525 RMD160 b05d39d5b5d36076996fae0a2aea2914780c0bd7 SHA1 1c1afbb006f8650d1c0e451591a0fd7442bcf787 SHA256 eed6fa3c16439ea088ee72ce2d40333ffca20288c9040f351b82a5cdeebc5d56
 MD5 e64b7cf585b8f602b613a8e9acfa54e5 libherdstat-0.1.1-r1.ebuild 1525
 RMD160 b05d39d5b5d36076996fae0a2aea2914780c0bd7 libherdstat-0.1.1-r1.ebuild 1525
 SHA256 eed6fa3c16439ea088ee72ce2d40333ffca20288c9040f351b82a5cdeebc5d56 libherdstat-0.1.1-r1.ebuild 1525
-EBUILD libherdstat-0.2.0.ebuild 1961 RMD160 076ec4af1c161a952b3f4a4326046b7c3daca869 SHA1 55fc37c0ac365aca3d062786f508f8c33eb862a1 SHA256 e231a28d2c410d86c6900fa014bf7098981b544c366019e08ab4260e3ab1d1ec
-MD5 baa94e94dce6af61eeac5b1572f9fb29 libherdstat-0.2.0.ebuild 1961
-RMD160 076ec4af1c161a952b3f4a4326046b7c3daca869 libherdstat-0.2.0.ebuild 1961
-SHA256 e231a28d2c410d86c6900fa014bf7098981b544c366019e08ab4260e3ab1d1ec libherdstat-0.2.0.ebuild 1961
-MISC ChangeLog 2648 RMD160 3dbe7c3dc6017acd6c30301e2c7a49460e47cd42 SHA1 21d5ffe429a6ba519e77a9cd9fd736db42640c07 SHA256 c255ce54ed728a6d5f565c7410fbdd7ed9b6cf535581ad8f5faa75225bec6dc6
-MD5 ec710cc6fb1eca5efe7ffdf6267b34ad ChangeLog 2648
-RMD160 3dbe7c3dc6017acd6c30301e2c7a49460e47cd42 ChangeLog 2648
-SHA256 c255ce54ed728a6d5f565c7410fbdd7ed9b6cf535581ad8f5faa75225bec6dc6 ChangeLog 2648
+MISC ChangeLog 2769 RMD160 b0b16d0af3874759c2da955ce6a4763f12bfd2bc SHA1 283a0be5ca910430033042016b515c801a0a1bb2 SHA256 1c2f0125d9035cf684b3d1f032921a59bb34d26e7440f6a0d4a5637e257d0607
+MD5 5c18c192e66108cd373258149acf77be ChangeLog 2769
+RMD160 b0b16d0af3874759c2da955ce6a4763f12bfd2bc ChangeLog 2769
+SHA256 1c2f0125d9035cf684b3d1f032921a59bb34d26e7440f6a0d4a5637e257d0607 ChangeLog 2769
 MISC metadata.xml 500 RMD160 4c33ed449d412dc4394fc51a398caa0f5da39980 SHA1 cd88bddb88d0d1c6f018eb61ba7fcf3ba1d2923d SHA256 7314d79b8464f63eb798418bde755c14fc5364498ff297c1531db44ffaf4ae3b
 MD5 0d253ec9adec6817804a417410e9f2e8 metadata.xml 500
 RMD160 4c33ed449d412dc4394fc51a398caa0f5da39980 metadata.xml 500
@@ -32,13 +19,3 @@ SHA256 7314d79b8464f63eb798418bde755c14fc5364498ff297c1531db44ffaf4ae3b metadata
 MD5 ca79e5dae3343a461729ae8fc0cb9566 files/digest-libherdstat-0.1.1-r1 539
 RMD160 6f1503909709a01bf6573c55b6ef423b13e20c59 files/digest-libherdstat-0.1.1-r1 539
 SHA256 c21aabdff39ac249c73f46ef086143e21f3a9367ec94400990931dd587ca0b3e files/digest-libherdstat-0.1.1-r1 539
-MD5 5e8880550631bec5c01cc268898ce878 files/digest-libherdstat-0.2.0 539
-RMD160 7d92823b7505f7b9f71a181b7276d741849edc17 files/digest-libherdstat-0.2.0 539
-SHA256 8789927da68a7660d9f5cf3a6005779915735b6115077eac51472466c1ed47bb files/digest-libherdstat-0.2.0 539
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHmPTRKhnDs22gwa8RAlgUAKC56f1v5r7ze7T9FEeWrsKKQHA/pwCeJHt4
-fa1yt+lXhe/zLbp8z9xJQtQ=
-=9TD+
------END PGP SIGNATURE-----
diff --git a/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0 b/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0
deleted file mode 100644
index 9fc4814b4759..000000000000
--- a/dev-cpp/libherdstat/files/digest-libherdstat-0.2.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3a7bff68e6a5818c461ad359291181c0 herdstat-test-data-20060119.tar.bz2 15549
-RMD160 d48b869e00ad03771a4a2fa9fc2ecfead80810da herdstat-test-data-20060119.tar.bz2 15549
-SHA256 0d154483310b59054cfd6ddb9fb5c477ad786cdb7ff11cdfaa74a82c0c0e8633 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
deleted file mode 100644
index 1b341d167b6f..000000000000
--- a/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-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
deleted file mode 100644
index 8891603ddedf..000000000000
--- a/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2007 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.5 2007/02/28 14:58:02 the_paya Exp $
-
-inherit eutils autotools
-
-TEST_DATA_PV="20060119"
-TEST_DATA_P="${PN/lib/}-test-data-${TEST_DATA_PV}"
-
-DESCRIPTION="C++ library offering interfaces for portage-related things such as Gentoo-specific XML files, package searching, and version sorting"
-HOMEPAGE="http://developer.berlios.de/projects/libherdstat/"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2
-	test? ( http://download.berlios.de/${PN}/${TEST_DATA_P}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc curl test"
-
-RDEPEND=">=dev-libs/xmlwrapp-0.5.0
-	>=dev-cpp/libebt-1.1.0
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
-	net-misc/wget"
-
-pkg_setup() {
-	if has test $FEATURES && ! use test ; then
-		die "FEATURES=test is set but USE=test is not; tests will fail without USE=test"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc.patch
-	AT_M4DIR="${WORKDIR}"/${P}/m4 eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-examples \
-		--with-test-data=${WORKDIR}/${TEST_DATA_P} \
-		--enable-static \
-		$(use_enable debug) \
-		$(use_with curl) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-
-	use doc && { emake doxygen || die "failed to build API docs" ; }
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO NEWS
-
-	if use doc ; then
-		dohtml -r doc/html/*
-		doman doc/man/*/*.[0-9]
-
-		# examples
-		cp -R examples ${D}/usr/share/doc/${PF}
-		# remove all Makefile's and .{dep,lib}s directories
-		find ${D}/usr/share/doc/${PF}/examples \
-			\( -name 'Makefile*' -or -name '.*s' \) \
-			-exec rm -fr {} \; 2>/dev/null
-	fi
-}