From 3f66aab95b2514a67e53267e561971226776920a Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 6 Feb 2009 16:51:31 +0000 Subject: We need herdstat! (Portage version: 2.2_rc23/svn/Linux x86_64) svn path=/; revision=156 --- dev-cpp/libherdstat/ChangeLog | 10 + dev-cpp/libherdstat/Manifest | 8 + .../libherdstat/files/libherdstat-0.2.0-gcc.patch | 148 +++++++++ .../files/libherdstat-0.2.0-gcc4.4.patch | 66 ++++ .../files/libherdstat-0.2.0-sort-readdir.patch | 341 +++++++++++++++++++++ dev-cpp/libherdstat/libherdstat-0.2.0.ebuild | 74 +++++ dev-cpp/libherdstat/metadata.xml | 9 + 7 files changed, 656 insertions(+) create mode 100644 dev-cpp/libherdstat/ChangeLog create mode 100644 dev-cpp/libherdstat/Manifest create mode 100644 dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc.patch create mode 100644 dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc4.4.patch create mode 100644 dev-cpp/libherdstat/files/libherdstat-0.2.0-sort-readdir.patch create mode 100644 dev-cpp/libherdstat/libherdstat-0.2.0.ebuild create mode 100644 dev-cpp/libherdstat/metadata.xml diff --git a/dev-cpp/libherdstat/ChangeLog b/dev-cpp/libherdstat/ChangeLog new file mode 100644 index 0000000..552311b --- /dev/null +++ b/dev-cpp/libherdstat/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for dev-cpp/libherdstat +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + + 06 Feb 2009; Timothy Redaelli + +files/libherdstat-0.2.0-gcc.patch, +files/libherdstat-0.2.0-gcc4.4.patch, + +files/libherdstat-0.2.0-sort-readdir.patch, +metadata.xml, + +libherdstat-0.2.0.ebuild: + We need herdstat! + diff --git a/dev-cpp/libherdstat/Manifest b/dev-cpp/libherdstat/Manifest new file mode 100644 index 0000000..01a5081 --- /dev/null +++ b/dev-cpp/libherdstat/Manifest @@ -0,0 +1,8 @@ +AUX libherdstat-0.2.0-gcc.patch 4475 RMD160 3c1225256511993d76e9dc11d46b275ca5380464 SHA1 63a4598dfe66d0bb8bf0c84cadd61ce1f2daba70 SHA256 2a3ce02d5530f12fc7e0d5d655243b35a987a25905daf77dd157cac599d0220c +AUX libherdstat-0.2.0-gcc4.4.patch 2473 RMD160 87c0b421c98e8bd37645e1a05694f128a1d3c266 SHA1 a9e4ee3c0a16519b26f5f917b04f01bfd6f6a3cf SHA256 63e79a0f135fd8a6a33129594a696f9f128887ee1d45767ee86231cfc38cee35 +AUX libherdstat-0.2.0-sort-readdir.patch 14546 RMD160 db8a60d4754b09f58673622112771d4cbdde0f58 SHA1 1838e389e8d052beb97fed42c3e7f51cdf321fd7 SHA256 81d56b67833d03a68f1c8518d099cffbc4fb2144dde7622bf6de8f0a52ed20fb +DIST herdstat-test-data-20060119.tar.bz2 15549 RMD160 d48b869e00ad03771a4a2fa9fc2ecfead80810da SHA1 737dd1bb32ff093b726afa81e004ef9dfd6661c9 SHA256 0d154483310b59054cfd6ddb9fb5c477ad786cdb7ff11cdfaa74a82c0c0e8633 +DIST libherdstat-0.2.0.tar.bz2 360556 RMD160 adac363187d0f942fa11be7444d669abf2e919e0 SHA1 0a538548a1b895d569b52ecedd956eebda522bc4 SHA256 7937387d76558c3ced5cf03d5469cb21e9c8096476aceb7d68f33e8fd7861a8c +EBUILD libherdstat-0.2.0.ebuild 2027 RMD160 b4fc871189b4f1edef22d905638f4307f45e3916 SHA1 4d3f489197d4976b7de4d20cadac4b835eb52ab5 SHA256 c78186bd26ac16d5f1ece9da6e177a0d276f8620269c31336d0512428d159126 +MISC ChangeLog 361 RMD160 26bac633ca4852c26f931759f75ea279f9d10f44 SHA1 f97b55ade58e8d62fde54c10d36878ce063307be SHA256 e1a1f48d6d3dda91996a7eef312ec7e409391f6308e55e6851773b93f1c31a1a +MISC metadata.xml 246 RMD160 7b3a212531bf410456573eaab88dbacb8310ac26 SHA1 51f32cc963d5679809bd574a72cf597d23a7f8be SHA256 d9936672523955a3d01af3d37e99da31780f35cc1433fadcea2c3a9601cb6d9e 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 0000000..1b341d1 --- /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 strEOF; ++ std::vector s2; ++ s2.assign(herdstat::io::BinaryIStreamIterator(stream), ++ herdstat::io::BinaryIStreamIterator()); + +- std::vector s2( +- herdstat::io::BinaryIStreamIterator(stream), strEOF); +- + std::cout << "s2 = '"; + std::copy(s2.begin(), s2.end(), + std::ostream_iterator(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 ++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 ++ + #include + #include + #include +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 ++ + #include + + 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 + #include + + namespace herdstat { +Index: herdstat/util/file.hh +=================================================================== +--- herdstat/util/file.hh (revision 223) ++++ herdstat/util/file.hh (revision 224) +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc4.4.patch b/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc4.4.patch new file mode 100644 index 0000000..0fe7bf9 --- /dev/null +++ b/dev-cpp/libherdstat/files/libherdstat-0.2.0-gcc4.4.patch @@ -0,0 +1,66 @@ +diff -ur libherdstat-0.2.0.orig/herdstat/exceptions.cc libherdstat-0.2.0/herdstat/exceptions.cc +--- libherdstat-0.2.0.orig/herdstat/exceptions.cc 2009-02-02 23:34:47.440005860 +0100 ++++ libherdstat-0.2.0/herdstat/exceptions.cc 2009-02-02 23:39:42.884039379 +0100 +@@ -25,6 +25,7 @@ + #endif + + #include ++#include + #include + #include + #include +diff -ur libherdstat-0.2.0.orig/herdstat/exceptions.hh libherdstat-0.2.0/herdstat/exceptions.hh +--- libherdstat-0.2.0.orig/herdstat/exceptions.hh 2009-02-02 23:34:47.424006130 +0100 ++++ libherdstat-0.2.0/herdstat/exceptions.hh 2009-02-02 23:36:16.781046472 +0100 +@@ -32,6 +32,7 @@ + * @brief Defines exception classes used in libherdstat. + */ + ++#include + #include + #include + #include +diff -ur libherdstat-0.2.0.orig/herdstat/portage/project_xml.cc libherdstat-0.2.0/herdstat/portage/project_xml.cc +--- libherdstat-0.2.0.orig/herdstat/portage/project_xml.cc 2009-02-02 23:34:47.440005860 +0100 ++++ libherdstat-0.2.0/herdstat/portage/project_xml.cc 2009-02-02 23:39:04.448143336 +0100 +@@ -24,6 +24,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include +diff -ur libherdstat-0.2.0.orig/herdstat/util/algorithm.hh libherdstat-0.2.0/herdstat/util/algorithm.hh +--- libherdstat-0.2.0.orig/herdstat/util/algorithm.hh 2009-02-02 23:34:47.432005960 +0100 ++++ libherdstat-0.2.0/herdstat/util/algorithm.hh 2009-02-02 23:38:08.480217667 +0100 +@@ -32,6 +32,7 @@ + * @brief Defines the general purpose algorithms. + */ + ++#include + #include + + namespace herdstat { +diff -ur libherdstat-0.2.0.orig/herdstat/util/misc.hh libherdstat-0.2.0/herdstat/util/misc.hh +--- libherdstat-0.2.0.orig/herdstat/util/misc.hh 2009-02-02 23:34:47.432005960 +0100 ++++ libherdstat-0.2.0/herdstat/util/misc.hh 2009-02-02 23:36:53.952007375 +0100 +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + enum ASCIIColor + { +diff -ur libherdstat-0.2.0.orig/herdstat/util/string.hh libherdstat-0.2.0/herdstat/util/string.hh +--- libherdstat-0.2.0.orig/herdstat/util/string.hh 2009-02-02 23:34:47.432005960 +0100 ++++ libherdstat-0.2.0/herdstat/util/string.hh 2009-02-02 23:35:58.296045935 +0100 +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/dev-cpp/libherdstat/files/libherdstat-0.2.0-sort-readdir.patch b/dev-cpp/libherdstat/files/libherdstat-0.2.0-sort-readdir.patch new file mode 100644 index 0000000..999906e --- /dev/null +++ b/dev-cpp/libherdstat/files/libherdstat-0.2.0-sort-readdir.patch @@ -0,0 +1,341 @@ +diff -ru tests/expected/file tests/expected/file +--- tests/expected/file 2005-12-08 23:21:03.000000000 +0100 ++++ tests/expected/file 2009-02-04 11:56:02.000000000 +0100 +@@ -1,36 +1,38 @@ + Testing util::Directory(app-misc/foo): +- app-misc/foo/foo-1.0b.ebuild + app-misc/foo/files +- app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/foo-1.0a.ebuild ++ app-misc/foo/foo-1.0a_alpha1.ebuild + app-misc/foo/foo-1.0a_beta1.ebuild +- app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.0a_p1.ebuild + app-misc/foo/foo-1.0a_pre1.ebuild ++ app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/foo-1.0b.ebuild ++ app-misc/foo/foo-1.0e.ebuild ++ app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.10.20050629.ebuild +- app-misc/foo/foo-1.0a.ebuild + app-misc/foo/foo-1.10.ebuild +- app-misc/foo/foo-1.0a_alpha1.ebuild +- app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.2.ebuild + app-misc/foo/metadata.xml +- app-misc/foo/foo-1.0e.ebuild +- app-misc/foo/foo-1.0a_p1.ebuild + + Testing util::File for each file in the previous util::Directory: +- File 'app-misc/foo/foo-1.0b.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_rc1.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_beta1.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.20040629.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_pre1.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.20050629.ebuild' is empty. + File 'app-misc/foo/foo-1.0a.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.ebuild' is empty. + File 'app-misc/foo/foo-1.0a_alpha1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_beta1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_p1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_pre1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_rc1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0b.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0e.ebuild' is empty. ++ File 'app-misc/foo/foo-1.10.20040629.ebuild' is empty. + File contents for 'app-misc/foo/foo-1.10.20050629-r1.ebuild'. + HOMEPAGE="http://www.${PN}.org" + FOO="lala" + LALA="${FOO} ${LALA} ${LALA} ${NON_EXISTENT}" + LALA="${LALA}" + LALA="$(echo ${LALA} | sed -n -e 's/foo/bar/')-$(echo ${LALA} | sort -u)" ++ File 'app-misc/foo/foo-1.10.20050629.ebuild' is empty. ++ File 'app-misc/foo/foo-1.10.ebuild' is empty. + File 'app-misc/foo/foo-1.2.ebuild' is empty. + File contents for 'app-misc/foo/metadata.xml'. + +@@ -44,42 +46,42 @@ + + + +- File 'app-misc/foo/foo-1.0e.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_p1.ebuild' is empty. + + Testing util::Directory copy constructor (and re-running tests on it): +- app-misc/foo/foo-1.0b.ebuild + app-misc/foo/files +- app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/foo-1.0a.ebuild ++ app-misc/foo/foo-1.0a_alpha1.ebuild + app-misc/foo/foo-1.0a_beta1.ebuild +- app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.0a_p1.ebuild + app-misc/foo/foo-1.0a_pre1.ebuild ++ app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/foo-1.0b.ebuild ++ app-misc/foo/foo-1.0e.ebuild ++ app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.10.20050629.ebuild +- app-misc/foo/foo-1.0a.ebuild + app-misc/foo/foo-1.10.ebuild +- app-misc/foo/foo-1.0a_alpha1.ebuild +- app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.2.ebuild + app-misc/foo/metadata.xml +- app-misc/foo/foo-1.0e.ebuild +- app-misc/foo/foo-1.0a_p1.ebuild + + Testing util::File for each file in the previous util::Directory: +- File 'app-misc/foo/foo-1.0b.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_rc1.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_beta1.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.20040629.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_pre1.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.20050629.ebuild' is empty. + File 'app-misc/foo/foo-1.0a.ebuild' is empty. +- File 'app-misc/foo/foo-1.10.ebuild' is empty. + File 'app-misc/foo/foo-1.0a_alpha1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_beta1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_p1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_pre1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0a_rc1.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0b.ebuild' is empty. ++ File 'app-misc/foo/foo-1.0e.ebuild' is empty. ++ File 'app-misc/foo/foo-1.10.20040629.ebuild' is empty. + File contents for 'app-misc/foo/foo-1.10.20050629-r1.ebuild'. + HOMEPAGE="http://www.${PN}.org" + FOO="lala" + LALA="${FOO} ${LALA} ${LALA} ${NON_EXISTENT}" + LALA="${LALA}" + LALA="$(echo ${LALA} | sed -n -e 's/foo/bar/')-$(echo ${LALA} | sort -u)" ++ File 'app-misc/foo/foo-1.10.20050629.ebuild' is empty. ++ File 'app-misc/foo/foo-1.10.ebuild' is empty. + File 'app-misc/foo/foo-1.2.ebuild' is empty. + File contents for 'app-misc/foo/metadata.xml'. + +@@ -93,5 +95,3 @@ + + + +- File 'app-misc/foo/foo-1.0e.ebuild' is empty. +- File 'app-misc/foo/foo-1.0a_p1.ebuild' is empty. +diff -ru tests/expected/package_directory tests/expected/package_directory +--- tests/expected/package_directory 2005-11-25 14:57:09.000000000 +0100 ++++ tests/expected/package_directory 2009-02-04 11:51:48.000000000 +0100 +@@ -1,21 +1,21 @@ + Testing portage::PackageDirectory(app-misc/foo): +- app-misc/foo/foo-1.0b.ebuild + app-misc/foo/files +- app-misc/foo/files/foo.patch + app-misc/foo/files/bar.diff +- app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/files/foo.patch ++ app-misc/foo/foo-1.0a.ebuild ++ app-misc/foo/foo-1.0a_alpha1.ebuild + app-misc/foo/foo-1.0a_beta1.ebuild +- app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.0a_p1.ebuild + app-misc/foo/foo-1.0a_pre1.ebuild ++ app-misc/foo/foo-1.0a_rc1.ebuild ++ app-misc/foo/foo-1.0b.ebuild ++ app-misc/foo/foo-1.0e.ebuild ++ app-misc/foo/foo-1.10.20040629.ebuild ++ app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.10.20050629.ebuild +- app-misc/foo/foo-1.0a.ebuild + app-misc/foo/foo-1.10.ebuild +- app-misc/foo/foo-1.0a_alpha1.ebuild +- app-misc/foo/foo-1.10.20050629-r1.ebuild + app-misc/foo/foo-1.2.ebuild + app-misc/foo/metadata.xml +- app-misc/foo/foo-1.0e.ebuild +- app-misc/foo/foo-1.0a_p1.ebuild + + Testing portage::PackageDirectory::ebuild_count(): + Number of ebuilds present in app-misc/foo: 13 +@@ -29,20 +29,20 @@ + Package directory app-misc/foo has a metadata.xml? false + + Testing portage::PackageDirectory::ebuilds(): +-Showing ebuild variables for 'app-misc/foo/foo-1.0b.ebuild'. +- Variable 'P' has a value of 'foo-1.0b'. +- Variable 'PF' has a value of 'foo-1.0b-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0a.ebuild'. ++ Variable 'P' has a value of 'foo-1.0a'. ++ Variable 'PF' has a value of 'foo-1.0a-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0b'. +- Variable 'PVR' has a value of '1.0b-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.0a_rc1.ebuild'. +- Variable 'P' has a value of 'foo-1.0a_rc1'. +- Variable 'PF' has a value of 'foo-1.0a_rc1-r0'. ++ Variable 'PV' has a value of '1.0a'. ++ Variable 'PVR' has a value of '1.0a-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0a_alpha1.ebuild'. ++ Variable 'P' has a value of 'foo-1.0a_alpha1'. ++ Variable 'PF' has a value of 'foo-1.0a_alpha1-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0a_rc1'. +- Variable 'PVR' has a value of '1.0a_rc1-r0'. ++ Variable 'PV' has a value of '1.0a_alpha1'. ++ Variable 'PVR' has a value of '1.0a_alpha1-r0'. + Showing ebuild variables for 'app-misc/foo/foo-1.0a_beta1.ebuild'. + Variable 'P' has a value of 'foo-1.0a_beta1'. + Variable 'PF' has a value of 'foo-1.0a_beta1-r0'. +@@ -50,13 +50,13 @@ + Variable 'PR' has a value of 'r0'. + Variable 'PV' has a value of '1.0a_beta1'. + Variable 'PVR' has a value of '1.0a_beta1-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.10.20040629.ebuild'. +- Variable 'P' has a value of 'foo-1.10.20040629'. +- Variable 'PF' has a value of 'foo-1.10.20040629-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0a_p1.ebuild'. ++ Variable 'P' has a value of 'foo-1.0a_p1'. ++ Variable 'PF' has a value of 'foo-1.0a_p1-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.10.20040629'. +- Variable 'PVR' has a value of '1.10.20040629-r0'. ++ Variable 'PV' has a value of '1.0a_p1'. ++ Variable 'PVR' has a value of '1.0a_p1-r0'. + Showing ebuild variables for 'app-misc/foo/foo-1.0a_pre1.ebuild'. + Variable 'P' has a value of 'foo-1.0a_pre1'. + Variable 'PF' has a value of 'foo-1.0a_pre1-r0'. +@@ -64,34 +64,34 @@ + Variable 'PR' has a value of 'r0'. + Variable 'PV' has a value of '1.0a_pre1'. + Variable 'PVR' has a value of '1.0a_pre1-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.10.20050629.ebuild'. +- Variable 'P' has a value of 'foo-1.10.20050629'. +- Variable 'PF' has a value of 'foo-1.10.20050629-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0a_rc1.ebuild'. ++ Variable 'P' has a value of 'foo-1.0a_rc1'. ++ Variable 'PF' has a value of 'foo-1.0a_rc1-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.10.20050629'. +- Variable 'PVR' has a value of '1.10.20050629-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.0a.ebuild'. +- Variable 'P' has a value of 'foo-1.0a'. +- Variable 'PF' has a value of 'foo-1.0a-r0'. ++ Variable 'PV' has a value of '1.0a_rc1'. ++ Variable 'PVR' has a value of '1.0a_rc1-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0b.ebuild'. ++ Variable 'P' has a value of 'foo-1.0b'. ++ Variable 'PF' has a value of 'foo-1.0b-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0a'. +- Variable 'PVR' has a value of '1.0a-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.10.ebuild'. +- Variable 'P' has a value of 'foo-1.10'. +- Variable 'PF' has a value of 'foo-1.10-r0'. ++ Variable 'PV' has a value of '1.0b'. ++ Variable 'PVR' has a value of '1.0b-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.0e.ebuild'. ++ Variable 'P' has a value of 'foo-1.0e'. ++ Variable 'PF' has a value of 'foo-1.0e-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.10'. +- Variable 'PVR' has a value of '1.10-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.0a_alpha1.ebuild'. +- Variable 'P' has a value of 'foo-1.0a_alpha1'. +- Variable 'PF' has a value of 'foo-1.0a_alpha1-r0'. ++ Variable 'PV' has a value of '1.0e'. ++ Variable 'PVR' has a value of '1.0e-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.10.20040629.ebuild'. ++ Variable 'P' has a value of 'foo-1.10.20040629'. ++ Variable 'PF' has a value of 'foo-1.10.20040629-r0'. + Variable 'PN' has a value of 'foo'. + Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0a_alpha1'. +- Variable 'PVR' has a value of '1.0a_alpha1-r0'. ++ Variable 'PV' has a value of '1.10.20040629'. ++ Variable 'PVR' has a value of '1.10.20040629-r0'. + Showing ebuild variables for 'app-misc/foo/foo-1.10.20050629-r1.ebuild'. + Variable 'FOO' has a value of 'lala'. + Variable 'HOMEPAGE' has a value of 'http://www.foo.org'. +@@ -102,6 +102,20 @@ + Variable 'PR' has a value of 'r1'. + Variable 'PV' has a value of '1.10.20050629'. + Variable 'PVR' has a value of '1.10.20050629-r1'. ++Showing ebuild variables for 'app-misc/foo/foo-1.10.20050629.ebuild'. ++ Variable 'P' has a value of 'foo-1.10.20050629'. ++ Variable 'PF' has a value of 'foo-1.10.20050629-r0'. ++ Variable 'PN' has a value of 'foo'. ++ Variable 'PR' has a value of 'r0'. ++ Variable 'PV' has a value of '1.10.20050629'. ++ Variable 'PVR' has a value of '1.10.20050629-r0'. ++Showing ebuild variables for 'app-misc/foo/foo-1.10.ebuild'. ++ Variable 'P' has a value of 'foo-1.10'. ++ Variable 'PF' has a value of 'foo-1.10-r0'. ++ Variable 'PN' has a value of 'foo'. ++ Variable 'PR' has a value of 'r0'. ++ Variable 'PV' has a value of '1.10'. ++ Variable 'PVR' has a value of '1.10-r0'. + Showing ebuild variables for 'app-misc/foo/foo-1.2.ebuild'. + Variable 'P' has a value of 'foo-1.2'. + Variable 'PF' has a value of 'foo-1.2-r0'. +@@ -109,17 +123,3 @@ + Variable 'PR' has a value of 'r0'. + Variable 'PV' has a value of '1.2'. + Variable 'PVR' has a value of '1.2-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.0e.ebuild'. +- Variable 'P' has a value of 'foo-1.0e'. +- Variable 'PF' has a value of 'foo-1.0e-r0'. +- Variable 'PN' has a value of 'foo'. +- Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0e'. +- Variable 'PVR' has a value of '1.0e-r0'. +-Showing ebuild variables for 'app-misc/foo/foo-1.0a_p1.ebuild'. +- Variable 'P' has a value of 'foo-1.0a_p1'. +- Variable 'PF' has a value of 'foo-1.0a_p1-r0'. +- Variable 'PN' has a value of 'foo'. +- Variable 'PR' has a value of 'r0'. +- Variable 'PV' has a value of '1.0a_p1'. +- Variable 'PVR' has a value of '1.0a_p1-r0'. +diff -ru tests/expected/version tests/expected/version +--- tests/expected/version 2005-11-19 13:52:10.000000000 +0100 ++++ tests/expected/version 2009-02-04 11:46:12.000000000 +0100 +@@ -1,17 +1,17 @@ + Testing VersionString: +- found version '1.0b'. +- found version '1.0a_rc1'. ++ found version '1.0a'. ++ found version '1.0a_alpha1'. + found version '1.0a_beta1'. +- found version '1.10.20040629'. ++ found version '1.0a_p1'. + found version '1.0a_pre1'. ++ found version '1.0a_rc1'. ++ found version '1.0b'. ++ found version '1.0e'. ++ found version '1.10.20040629'. ++ found version '1.10.20050629-r1'. + found version '1.10.20050629'. +- found version '1.0a'. + found version '1.10'. +- found version '1.0a_alpha1'. +- found version '1.10.20050629-r1'. + found version '1.2'. +- found version '1.0e'. +- found version '1.0a_p1'. + + Testing sorted VersionString container: + 1.0a_alpha1 +--- herdstat/util/file.cc 2005-12-23 21:46:43.000000000 +0100 ++++ herdstat/util/file.cc 2009-02-04 11:43:03.000000000 +0100 +@@ -379,6 +379,8 @@ + this->insert(this->end(), dir.begin(), dir.end()); + } + } ++ /* Timothy Redaelli: it's better to sort the directory list (for coherency between systems) */ ++ std::stable_sort(this->begin(), this->end()); + } + /*****************************************************************************/ + Directory::iterator diff --git a/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild b/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild new file mode 100644 index 0000000..da51b26 --- /dev/null +++ b/dev-cpp/libherdstat/libherdstat-0.2.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/dev-cpp/libherdstat/Attic/libherdstat-0.2.0.ebuild,v 1.6 2008/01/30 14:58:19 armin76 dead $ + +inherit eutils autotools + +TEST_DATA_PV="20060119" +TEST_DATA_P="${PN/lib/}-test-data-${TEST_DATA_PV}" + +DESCRIPTION="C++ library for portage-related things such as Gentoo XML, package searching, and version sorting" +HOMEPAGE="http://developer.berlios.de/projects/libherdstat/" +SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2 + test? ( mirror://berlios/${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 + epatch "${FILESDIR}"/${P}-gcc4.4.patch + epatch "${FILESDIR}"/${P}-sort-readdir.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 +} diff --git a/dev-cpp/libherdstat/metadata.xml b/dev-cpp/libherdstat/metadata.xml new file mode 100644 index 0000000..5aec0d2 --- /dev/null +++ b/dev-cpp/libherdstat/metadata.xml @@ -0,0 +1,9 @@ + + + +bsd + +drizzt@gentoo.org +Timothy Redaelli + + -- cgit v1.2.3-65-gdbad