Version bump (upstream included our patch)

Package-Manager: portage-2.1.4_rc14

6 files changed, 27 insertions, 492 deletions

diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index 793008ce7106..b19b88cfbe96 100644
--- a/dev-libs/dvutil/ChangeLog
+++ b/dev-libs/dvutil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dvutil
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.27 2007/12/31 11:44:05 dev-zero Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.28 2008/01/03 21:15:02 dev-zero Exp $
+
+*dvutil-0.15.5 (03 Jan 2008)
+
+  03 Jan 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/dvutil-0.15.4-namespace_fix.patch, -dvutil-0.15.4.ebuild,
+  +dvutil-0.15.5.ebuild:
+  Version bump (upstream included our patch)
 
 *dvutil-0.15.4 (31 Dec 2007)
 
diff --git a/dev-libs/dvutil/Manifest b/dev-libs/dvutil/Manifest
index 574ea3357666..5ddce5bfbf22 100644
--- a/dev-libs/dvutil/Manifest
+++ b/dev-libs/dvutil/Manifest
@@ -2,24 +2,20 @@ AUX dvutil-0.13.15-fix-underquoted-m4.diff 599 RMD160 30e7fb0a596b6c3910b95fd129
 MD5 fe20149f0cdfcf848443da51c71bb4f0 files/dvutil-0.13.15-fix-underquoted-m4.diff 599
 RMD160 30e7fb0a596b6c3910b95fd12987247c122377d2 files/dvutil-0.13.15-fix-underquoted-m4.diff 599
 SHA256 d61ae51423bb73b0106645d057111108848ce20a49fee1223c7be6ff4a18556e files/dvutil-0.13.15-fix-underquoted-m4.diff 599
-AUX dvutil-0.15.4-namespace_fix.patch 13648 RMD160 5aab81290704c2d16a4934c6130ab2ae9781c9db SHA1 8ddfa0c400f6614dc932230759645d27ea4bd80e SHA256 29f3dc57af4a43bce62bd54b74c78ca4886e0be63c1ea7c7dccd8f4d5d9d50b3
-MD5 0855d25e85a2f95a9c76df6e75e2666e files/dvutil-0.15.4-namespace_fix.patch 13648
-RMD160 5aab81290704c2d16a4934c6130ab2ae9781c9db files/dvutil-0.15.4-namespace_fix.patch 13648
-SHA256 29f3dc57af4a43bce62bd54b74c78ca4886e0be63c1ea7c7dccd8f4d5d9d50b3 files/dvutil-0.15.4-namespace_fix.patch 13648
 DIST dvutil-0.13.15.tar.gz 958463 RMD160 8fa6fb0099d570fd8b561eed2d14337fc378e177 SHA1 68a73cb77b24f78a246c216f81e3302e97371e82 SHA256 b2fef7921c417b7e77439d4fa3a85505982d5bf1c0bf700b6395990e41bc8459
-DIST dvutil-0.15.4.tar.gz 951220 RMD160 aaad2b01c9697525818b0bf8bce03604d0c7b4e6 SHA1 b80b5ad6362b2e7a295eaeca07f351a71e3aa6b6 SHA256 29e4073d87cf179dec0186fdba352da3cd3fc7c5d04c4943129bed88a9e6be25
+DIST dvutil-0.15.5.tar.gz 956808 RMD160 9b782cae387e441e534a5e42541d1ee0e63d0983 SHA1 9dafc4a2a5e85c10af82bdca3e5eb11732d9f6a4 SHA256 86f4372168d802be33411e3db0658f9c4e0db7f3575a228e27ab571ffb7f27ed
 EBUILD dvutil-0.13.15-r2.ebuild 993 RMD160 15ac990818fa990a2d7271be1e5adb0c654835de SHA1 a086dc48a282429b705ccc8882fca4d1ee17cf9e SHA256 6206a782aff5dc5afd2ea6b1ac67c1295d9e8f5215247a045329816c63896862
 MD5 2a76f7294c0d19f0030cf03dd6da9400 dvutil-0.13.15-r2.ebuild 993
 RMD160 15ac990818fa990a2d7271be1e5adb0c654835de dvutil-0.13.15-r2.ebuild 993
 SHA256 6206a782aff5dc5afd2ea6b1ac67c1295d9e8f5215247a045329816c63896862 dvutil-0.13.15-r2.ebuild 993
-EBUILD dvutil-0.15.4.ebuild 1011 RMD160 77b73a732bc5cf90fcdf118a2b3f61a97be61c46 SHA1 43ea0b8bbe6623c2cbc98310e6463e32d791bce4 SHA256 751dd64927cfe59739bb7777e10afbf28ca1b72d4ef102df2c7c15dd5e01133c
-MD5 21093ce034c0cd33c84341f94beb4234 dvutil-0.15.4.ebuild 1011
-RMD160 77b73a732bc5cf90fcdf118a2b3f61a97be61c46 dvutil-0.15.4.ebuild 1011
-SHA256 751dd64927cfe59739bb7777e10afbf28ca1b72d4ef102df2c7c15dd5e01133c dvutil-0.15.4.ebuild 1011
-MISC ChangeLog 4250 RMD160 abac98e9fb7a3d10bf1aae9f0226bf5514928d1e SHA1 d164e85afd27590309cf8268c9fbe696c35f49cc SHA256 9cd45490a88c0988ea3f3c9bd61c85e642194fa8fbb1c7464a6f8bf906c0d620
-MD5 32c6ea69e7f1fe966b626c6fbe7c792f ChangeLog 4250
-RMD160 abac98e9fb7a3d10bf1aae9f0226bf5514928d1e ChangeLog 4250
-SHA256 9cd45490a88c0988ea3f3c9bd61c85e642194fa8fbb1c7464a6f8bf906c0d620 ChangeLog 4250
+EBUILD dvutil-0.15.5.ebuild 954 RMD160 1ec38d77f09fd255ef178f5805ddf9eb67b0e8cd SHA1 524eda645187b9ec401707aacc591873813f7894 SHA256 e8f7955faf44ff3a1cf9448c4335bd0fcfac256b42d02287dd3b9765032055b7
+MD5 fb439dec741dca0b601dcf88b55a11f4 dvutil-0.15.5.ebuild 954
+RMD160 1ec38d77f09fd255ef178f5805ddf9eb67b0e8cd dvutil-0.15.5.ebuild 954
+SHA256 e8f7955faf44ff3a1cf9448c4335bd0fcfac256b42d02287dd3b9765032055b7 dvutil-0.15.5.ebuild 954
+MISC ChangeLog 4471 RMD160 b597d3d3e76603f4f5daf0bd2e8912f8d4faa442 SHA1 e39c7dbe4def626390b97c3d58c9866eb8a03bf8 SHA256 84b932c2847400dfb6c07bbbc2f8239efa0e796794c587a160c8c16f2dcc8bbc
+MD5 8818edcf6b8b00acbe42c0f39766ef13 ChangeLog 4471
+RMD160 b597d3d3e76603f4f5daf0bd2e8912f8d4faa442 ChangeLog 4471
+SHA256 84b932c2847400dfb6c07bbbc2f8239efa0e796794c587a160c8c16f2dcc8bbc ChangeLog 4471
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
 MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157
 RMD160 1a16d7c8813911ff609857e1d437b678c924114c metadata.xml 157
@@ -27,6 +23,6 @@ SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f metadata
 MD5 eb5cddeb50dc4d762afb37ea39e22973 files/digest-dvutil-0.13.15-r2 244
 RMD160 c0d99c9283ca40d5e201e9786653c633b16d23e1 files/digest-dvutil-0.13.15-r2 244
 SHA256 9e987265f4464a257ebd1e23af5ba573edc0f45deb298b3634acf69fde792fac files/digest-dvutil-0.13.15-r2 244
-MD5 7192be69e39022d83a7c67d58b2f6bcc files/digest-dvutil-0.15.4 241
-RMD160 f018fd64c3bcf2c8352582c1b914e788d513502f files/digest-dvutil-0.15.4 241
-SHA256 a5ed8e9a9412ddf19e4479ac3126f95a46b7b35f589c534fad319096fe14920c files/digest-dvutil-0.15.4 241
+MD5 5101a50bd6d95d5221b1d14f98f81e8c files/digest-dvutil-0.15.5 241
+RMD160 b4aa6a5b2fa1bf8396c6da7dda0394b3b723ea61 files/digest-dvutil-0.15.5 241
+SHA256 1d560103ab2b0590a7ae807af57c3cf7824b94f71fd282132df9a1abbdbbf7b8 files/digest-dvutil-0.15.5 241
diff --git a/dev-libs/dvutil/dvutil-0.15.4.ebuild b/dev-libs/dvutil/dvutil-0.15.5.ebuild
index 37df92bf37fb..1c99383872dc 100644
--- a/dev-libs/dvutil/dvutil-0.15.4.ebuild
+++ b/dev-libs/dvutil/dvutil-0.15.5.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.15.4.ebuild,v 1.1 2007/12/31 11:44:05 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.15.5.ebuild,v 1.1 2008/01/03 21:15:02 dev-zero Exp $
 
 inherit eutils
 
 DESCRIPTION="Provides some general C++ utility classes for files, directories, dates, property lists, reference counted pointers, number conversion etc. "
 HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
-SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/download/dvutil-${PV}.tar.gz"
+SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,8 +20,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${P}-namespace_fix.patch"
-
 	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
 		die "sed Makefile.in failed"
 }
diff --git a/dev-libs/dvutil/files/digest-dvutil-0.15.4 b/dev-libs/dvutil/files/digest-dvutil-0.15.4
deleted file mode 100644
index d674b92ebb65..000000000000
--- a/dev-libs/dvutil/files/digest-dvutil-0.15.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5ac957c819cc4e51c61987a3242d854b dvutil-0.15.4.tar.gz 951220
-RMD160 aaad2b01c9697525818b0bf8bce03604d0c7b4e6 dvutil-0.15.4.tar.gz 951220
-SHA256 29e4073d87cf179dec0186fdba352da3cd3fc7c5d04c4943129bed88a9e6be25 dvutil-0.15.4.tar.gz 951220
diff --git a/dev-libs/dvutil/files/digest-dvutil-0.15.5 b/dev-libs/dvutil/files/digest-dvutil-0.15.5
new file mode 100644
index 000000000000..51b82aa7408d
--- /dev/null
+++ b/dev-libs/dvutil/files/digest-dvutil-0.15.5
@@ -0,0 +1,3 @@
+MD5 bd22f32f9d6e13dafde82d9de48b41d4 dvutil-0.15.5.tar.gz 956808
+RMD160 9b782cae387e441e534a5e42541d1ee0e63d0983 dvutil-0.15.5.tar.gz 956808
+SHA256 86f4372168d802be33411e3db0658f9c4e0db7f3575a228e27ab571ffb7f27ed dvutil-0.15.5.tar.gz 956808
diff --git a/dev-libs/dvutil/files/dvutil-0.15.4-namespace_fix.patch b/dev-libs/dvutil/files/dvutil-0.15.4-namespace_fix.patch
deleted file mode 100644
index c861d828b15e..000000000000
--- a/dev-libs/dvutil/files/dvutil-0.15.4-namespace_fix.patch
+++ /dev/null
@@ -1,466 +0,0 @@
-diff -Naur dvutil-0.15.4.orig/dvutil/file.C dvutil-0.15.4/dvutil/file.C
---- dvutil-0.15.4.orig/dvutil/file.C	2007-12-31 11:43:39.000000000 +0100
-+++ dvutil-0.15.4/dvutil/file.C	2007-12-31 11:49:04.000000000 +0100
-@@ -8,12 +8,12 @@
- #include  <sys/param.h>  // MAXPATHLEN
- #include  <sys/mman.h>  // mmap()
- #include  <fcntl.h>  // O_RDONLY
--#include  <stdio.h>  // open()
-+#include  <cstdio>  // open()
- #include  <unistd.h>  // close(), rmdir(), getcwd()
- #include  <dirent.h>  // opendir()
--#include  <stdlib.h>  // free() mktemp() [ getcwd(0) ]
--#include  <errno.h>  // errno
--#include  <string.h>  // strerror()
-+#include  <cstdlib>  // free() mktemp() [ getcwd(0) ]
-+#include  <cerrno>  // errno
-+#include  <cstring>  // strerror()
- #include  <utime.h>  // strerror()
- 
- 
-@@ -35,20 +35,23 @@
- 
- /////////////////// FileError
- 
--const std::string Dv::Util::FileError::NAME("Dv::Util::FileError");
-+namespace Dv {
-+namespace Util {
-+
-+const std::string FileError::NAME("Dv::Util::FileError");
- 
- /////////////////// File
- 
--Dv::Util::File::File(const std::string& path) throw (Dv::Util::FileError): path_(path), addr_(0) { 
-+File::File(const std::string& path) throw (Dv::Util::FileError): path_(path), addr_(0) { 
-   refresh();
- }
- 
--Dv::Util::File::File(const Dv::Util::File& f) throw (Dv::Util::FileError): path_(f.str()), addr_(0) { 
-+File::File(const Dv::Util::File& f) throw (Dv::Util::FileError): path_(f.str()), addr_(0) { 
-   refresh();
- }
- 
- Dv::Util::File&
--Dv::Util::File::operator=(const Dv::Util::File& f) throw (Dv::Util::FileError) { 
-+File::operator=(const Dv::Util::File& f) throw (Dv::Util::FileError) { 
-   if (this==&f) 
-     return *this;
-   unmap();
-@@ -57,12 +60,12 @@
-   return *this;
- }
- 
--Dv::Util::File::~File() { 
-+File::~File() { 
-   unmap();
- }
- 
- Dv::Util::File&
--Dv::Util::File::expand() throw (Dv::Util::FileError) { 
-+File::expand() throw (Dv::Util::FileError) { 
-   refresh();
-   path_ = realpath();
-   refresh();
-@@ -70,7 +73,7 @@
- }
- 
- void
--Dv::Util::File::refresh() const throw (Dv::Util::FileError) { 
-+File::refresh() const throw (Dv::Util::FileError) { 
-   // set all data members: 
-   // stats_
-   //   exist_
-@@ -114,14 +117,14 @@
- }
- 
- std::string
--Dv::Util::File::absolute_path(const std::string& path) throw (Dv::Util::FileError) { 
-+File::absolute_path(const std::string& path) throw (Dv::Util::FileError) { 
-   std::string resolved_path; 
-   Dv::Util::File::fullpath(path, resolved_path);
-   return resolved_path;
- }
- 
- std::string
--Dv::Util::File::realpath() const throw (Dv::Util::FileError) {
-+File::realpath() const throw (Dv::Util::FileError) {
-   char resolved_name[MAXPATHLEN];
-   std::string cwd(Dv::Util::Directory::pwd());
-   if (::realpath(path(), resolved_name)==NULL) {
-@@ -135,49 +138,49 @@
- 
- 
- time_t
--Dv::Util::File::last_modified() const throw (Dv::Util::FileError) {
-+File::last_modified() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_mtime;
-   return 0;
- }
- 
- time_t
--Dv::Util::File::last_accessed() const throw (Dv::Util::FileError) {
-+File::last_accessed() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_atime;
-   return 0;
- }
- 
- size_t
--Dv::Util::File::size() const throw (Dv::Util::FileError) {
-+File::size() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_size;
-   return 0;
- }
- 
- mode_t
--Dv::Util::File::mode() const throw (Dv::Util::FileError) {
-+File::mode() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_mode & 07777;
-   return 0;
- }
- 
- uid_t
--Dv::Util::File::owner() const throw (Dv::Util::FileError) {
-+File::owner() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_uid;
-   return 0;
- }
- 
- gid_t
--Dv::Util::File::group() const throw (Dv::Util::FileError) {
-+File::group() const throw (Dv::Util::FileError) {
-   if (exists())
-     return stats_.st_gid;
-   return 0;
- }
- 
- Dv::Util::File::Type
--Dv::Util::File::type() const throw (Dv::Util::FileError) {
-+File::type() const throw (Dv::Util::FileError) {
-   if (!exists())
-     return NONEXISTENT;
-   else
-@@ -185,7 +188,7 @@
- }
- 
- bool 
--Dv::Util::operator==(const Dv::Util::File& f1, const Dv::Util::File& f2) {
-+operator==(const Dv::Util::File& f1, const Dv::Util::File& f2) {
-   //  2 Files are identical if they have the same i-node # on the same device.
-   f1.refresh();
-   if (!f1)
-@@ -197,7 +200,7 @@
- }
- 
- bool 
--Dv::Util::operator<(const Dv::Util::File& f1,const Dv::Util::File& f2) {
-+operator<(const Dv::Util::File& f1,const Dv::Util::File& f2) {
-   //  2 Files are identical if they have the same i-node # on the same device.
-   f1.refresh();
-   if (!f1)
-@@ -212,7 +215,7 @@
- }
- 
- const void*
--Dv::Util::File::map() throw (Dv::Util::FileError) {
-+File::map() throw (Dv::Util::FileError) {
-   if (addr_)
-     return addr_;
-   if (!exists())
-@@ -231,7 +234,7 @@
- }
- 
- void
--Dv::Util::File::unmap() throw (Dv::Util::FileError) {
-+File::unmap() throw (Dv::Util::FileError) {
-   if (addr_)
-     if (munmap(static_cast<caddr_t>(addr_), size())<0)
-       throw Dv::Util::FileError(str()+".unmap(): munmap failed.");
-@@ -239,7 +242,7 @@
- }
- 
- std::string&
--Dv::Util::File::content(std::string& s) const throw (Dv::Util::FileError) {
-+File::content(std::string& s) const throw (Dv::Util::FileError) {
-   if (! exists())
-     throw Dv::Util::FileError(str() + ": does not exist");
-   const void* pv(const_cast<Dv::Util::File*>(this)->map());
-@@ -250,7 +253,7 @@
- }
- 
- std::string
--Dv::Util::File::content() const throw (Dv::Util::FileError) {
-+File::content() const throw (Dv::Util::FileError) {
-   std::string s;
-   return content(s);
- }
-@@ -258,7 +261,7 @@
- static unsigned char hexchars[] = "0123456789abcdef";
- 
- std::string
--Dv::Util::File::md5(unsigned char* md5sum) throw (Dv::Util::FileError) { 
-+File::md5(unsigned char* md5sum) throw (Dv::Util::FileError) { 
- #if HAVE_OPENSSL > 0
-   unsigned char* md5; 
-   if(md5sum) 
-@@ -282,7 +285,7 @@
- }
- 
- std::string
--Dv::Util::File::sha1(unsigned char* sha1sum) throw (Dv::Util::FileError) { 
-+File::sha1(unsigned char* sha1sum) throw (Dv::Util::FileError) { 
- #if HAVE_OPENSSL > 0
-   unsigned char* sha1; 
-   if (sha1sum)
-@@ -306,7 +309,7 @@
- }
- 
- bool
--Dv::Util::File::chown(uid_t uid) const throw (Dv::Util::FileError) { 
-+File::chown(uid_t uid) const throw (Dv::Util::FileError) { 
-   if (!exists()) 
-     return false;
-   if (::chown(path(),uid,static_cast<gid_t>(-1))<0)
-@@ -315,7 +318,7 @@
- }
- 
- bool
--Dv::Util::File::chgrp(const char* groupname) const throw (Dv::Util::FileError) {
-+File::chgrp(const char* groupname) const throw (Dv::Util::FileError) {
-   if (!exists())
-     return false;
-   struct group* gr(0);
-@@ -328,7 +331,7 @@
- }
- 
- bool
--Dv::Util::File::rm() throw (Dv::Util::FileError) {
-+File::rm() throw (Dv::Util::FileError) {
-   if (type_==File::DIRECTORY) 
-     rmdir(path());
-   else
-@@ -337,7 +340,7 @@
- }
- 
- void
--Dv::Util::File::rmfr() throw (Dv::Util::FileError) {
-+File::rmfr() throw (Dv::Util::FileError) {
-   if (type_!=Dv::Util::File::DIRECTORY) 
-     rm();
-   else {
-@@ -354,7 +357,7 @@
- }
- 
- bool
--Dv::Util::File::mv(const std::string& newpath) throw (Dv::Util::FileError) {
-+File::mv(const std::string& newpath) throw (Dv::Util::FileError) {
-   if (exists()) {
-     unmap();
-     if (rename(path(),newpath.c_str())<0)
-@@ -369,7 +372,7 @@
- }
- 
- bool
--Dv::Util::File::touch(int mode) throw (Dv::Util::FileError) {
-+File::touch(int mode) throw (Dv::Util::FileError) {
-   int fd; 
-   if (exists()) { 
-     Dv::Util::Date now; 
-@@ -388,7 +391,7 @@
- }
- 
- bool
--Dv::Util::File::mkdir(int mode) throw (Dv::Util::FileError) {
-+File::mkdir(int mode) throw (Dv::Util::FileError) {
-   if (exists())
-     return false;
-   if (::mkdir(path(),mode)<0)
-@@ -397,7 +400,7 @@
- }
- 
- bool
--Dv::Util::File::mklink(const std::string& oldpath) throw (Dv::Util::FileError) {
-+File::mklink(const std::string& oldpath) throw (Dv::Util::FileError) {
-   if (exists())
-     return false;
-   if (::link(oldpath.c_str(),path())<0)
-@@ -406,7 +409,7 @@
- }
- 
- bool
--Dv::Util::File::mksymlink(const std::string& oldpath) throw (Dv::Util::FileError) {
-+File::mksymlink(const std::string& oldpath) throw (Dv::Util::FileError) {
-   if (exists())
-     return false;
-   if (::symlink(oldpath.c_str(),path())<0)
-@@ -415,7 +418,7 @@
- }
- 
- bool
--Dv::Util::File::chmod(int mode) throw (Dv::Util::FileError) {
-+File::chmod(int mode) throw (Dv::Util::FileError) {
-   if (!exists())
-     return false;
-   if (::chmod(path(),mode)<0) 
-@@ -424,7 +427,7 @@
- }
- 
- const std::string&
--Dv::Util::File::typestr(Type t) throw (Dv::Util::FileError) {
-+File::typestr(Type t) throw (Dv::Util::FileError) {
-   static const std::string S_SYMLINK("SYMLINK");
-   static const std::string S_REGULAR("REGULAR");
-   static const std::string S_DIRECTORY("DIRECTORY");
-@@ -459,7 +462,7 @@
- }
- 
- std::string
--Dv::Util::File::relpath(const std::string& from) const throw (Dv::Util::FileError) {
-+File::relpath(const std::string& from) const throw (Dv::Util::FileError) {
-   typedef std::vector<std::string>::const_iterator iter;
-   std::vector<std::string> pfrom;
-   std::vector<std::string> pto;
-@@ -478,50 +481,50 @@
- }
- 
- std::string
--Dv::Util::File::relpath() const throw (Dv::Util::FileError) {
-+File::relpath() const throw (Dv::Util::FileError) {
-   return relpath(Directory::pwd());
- }
- 
- /////////////////// Directory
- 
--Dv::Util::FileOperation::~FileOperation() { 
-+FileOperation::~FileOperation() { 
- }
- 
- void 
--Dv::Util::FileOperation::operator()(const Dv::Util::Directory& parent,
-+FileOperation::operator()(const Dv::Util::Directory& parent,
-     Dv::Util::File& file, const std::string& filename) { 
-   std::cout << "File " << filename << " in directory " << parent.str() << std::endl;
- }
- 
--Dv::Util::DirectoryOperation::~DirectoryOperation() { 
-+DirectoryOperation::~DirectoryOperation() { 
- }
- 
- void 
--Dv::Util::DirectoryOperation::operator()(const Dv::Util::Directory& parent,
-+DirectoryOperation::operator()(const Dv::Util::Directory& parent,
-     Dv::Util::Directory& directory, const std::string& directoryname) { 
-   std::cout << "Directory " << directoryname << " in directory " << parent.str() << std::endl;
- }
- 
--Dv::Util::Directory::Directory(const std::string& path) throw (Dv::Util::FileError): 
-+Directory::Directory(const std::string& path) throw (Dv::Util::FileError): 
-     Dv::Util::File(path), files_() { 
-   refresh();
- }
- 
--Dv::Util::Directory::Directory(const Dv::Util::File& file) throw (Dv::Util::FileError): 
-+Directory::Directory(const Dv::Util::File& file) throw (Dv::Util::FileError): 
-     Dv::Util::File(file.path()), files_() {
-   refresh();
- }
- 
--Dv::Util::Directory::~Directory() {
-+Directory::~Directory() {
- }
- 
- std::string
--Dv::Util::Directory::file(const std::string& filename) const {
-+Directory::file(const std::string& filename) const {
-   return str()+"/"+filename;
- }
- 
- std::string
--Dv::Util::Directory::tempfile(const std::string& prefix) const throw (Dv::Util::FileError) {
-+Directory::tempfile(const std::string& prefix) const throw (Dv::Util::FileError) {
-   std::string tmpname = str() + "/" + prefix + "XXXXXX";
-   char tmp[tmpname.size()+1];
-   std::copy(tmpname.begin(), tmpname.end(), tmp);
-@@ -534,7 +537,7 @@
- }
- 
- std::string
--Dv::Util::Directory::tempdir(const std::string& prefix) const throw (Dv::Util::FileError) {
-+Directory::tempdir(const std::string& prefix) const throw (Dv::Util::FileError) {
-   std::string tmpname = str() + "/" + prefix + "XXXXXX";
-   char tmp[tmpname.size()+1];
-   std::copy(tmpname.begin(), tmpname.end(), tmp);
-@@ -546,7 +549,7 @@
- 
- 
- void
--Dv::Util::Directory::refresh() const throw (Dv::Util::FileError) {
-+Directory::refresh() const throw (Dv::Util::FileError) {
-   Dv::Util::File::refresh();
-   Dv::Util::Directory* it(const_cast<Directory*>(this));
-   it->files_.clear();
-@@ -567,7 +570,7 @@
- }
- 
- std::string
--Dv::Util::Directory::pwd() throw (Dv::Util::FileError) {
-+Directory::pwd() throw (Dv::Util::FileError) {
-   static const std::string error_message(": getcwd failed in Directory::pwd()");
-   char pathname[MAXPATHLEN];
-   char* cwd(getcwd(pathname,MAXPATHLEN));
-@@ -580,14 +583,14 @@
- }
- 
- bool
--Dv::Util::Directory::cd() const throw (Dv::Util::FileError) {
-+Directory::cd() const throw (Dv::Util::FileError) {
-   if (!exists())
-     return false;
-   return (chdir(path())!=-1);
- }
- 
- std::string&
--Dv::Util::File::fullpath(std::string path, std::string& resolved_path) throw (Dv::Util::FileError) {
-+File::fullpath(std::string path, std::string& resolved_path) throw (Dv::Util::FileError) {
-   if (path.size() == 0)
-     throw Dv::Util::FileError(path + " not a legal path");
-   if (path[0] != '/')
-@@ -631,14 +634,14 @@
- }
- 
- std::string
--Dv::Util::File::fullpath() const throw (Dv::Util::FileError) {
-+File::fullpath() const throw (Dv::Util::FileError) {
-   std::string resolved_path;
-   fullpath(path(), resolved_path);
-   return resolved_path;
- }
- 
- void
--Dv::Util::Directory::walk(FileOperation* fileop, DirectoryOperation* dirop) { 
-+Directory::walk(FileOperation* fileop, DirectoryOperation* dirop) { 
-   // stacks used for keeping track of the walk and to avoid recursion
-   std::stack<Dv::Util::Directory> directories; 
-   std::stack<std::vector<std::string> > contents; 
-@@ -711,3 +714,6 @@
-   } 
- }
- 
-+} // namespace Util
-+} // namespace Dv
-+
-diff -Naur dvutil-0.15.4.orig/dvutil/getdate.h dvutil-0.15.4/dvutil/getdate.h
---- dvutil-0.15.4.orig/dvutil/getdate.h	2007-12-31 11:43:39.000000000 +0100
-+++ dvutil-0.15.4/dvutil/getdate.h	2007-12-31 11:57:12.000000000 +0100
-@@ -43,4 +43,7 @@
- # endif
- #endif /* defined (vms) */
- 
-+// For abort()
-+#include <stdlib.h>
-+
- time_t get_date PARAMS ((const char *p, const time_t *now));