aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-11-02 15:47:53 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-11-02 15:47:53 +0000
commitbf59d191467608efce24e0e065d69ca02e7042f9 (patch)
tree4dbc2e2848a69b68327d841ac3c9e9588c7df8cd
parent9c303b9026c2aa0b0520a08e3f430a8793653db8 (diff)
downloadpaludis-bf59d191467608efce24e0e065d69ca02e7042f9.tar.gz
paludis-bf59d191467608efce24e0e065d69ca02e7042f9.tar.xz
Digests should be in util.
-rw-r--r--paludis/files.m43
-rw-r--r--paludis/repositories/e/check_fetched_files_visitor.cc6
-rw-r--r--paludis/repositories/e/e_repository.cc4
-rw-r--r--paludis/repositories/e/vdb_merger.cc2
-rw-r--r--paludis/repositories/e/vdb_unmerger.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam_merger.cc2
-rw-r--r--paludis/repositories/unpackaged/ndbam_unmerger.cc2
-rw-r--r--paludis/util/files.m45
-rw-r--r--paludis/util/md5.cc (renamed from paludis/md5.cc)2
-rw-r--r--paludis/util/md5.hh (renamed from paludis/md5.hh)4
-rw-r--r--paludis/util/md5_TEST.cc (renamed from paludis/md5_TEST.cc)2
-rw-r--r--paludis/util/rmd160.cc (renamed from paludis/rmd160.cc)0
-rw-r--r--paludis/util/rmd160.hh (renamed from paludis/rmd160.hh)4
-rw-r--r--paludis/util/rmd160_TEST.cc (renamed from paludis/rmd160_TEST.cc)2
-rw-r--r--paludis/util/sha256.cc (renamed from paludis/sha256.cc)0
-rw-r--r--paludis/util/sha256.hh (renamed from paludis/sha256.hh)4
-rw-r--r--paludis/util/sha256_TEST.cc (renamed from paludis/sha256_TEST.cc)2
17 files changed, 23 insertions, 23 deletions
diff --git a/paludis/files.m4 b/paludis/files.m4
index 274df9e..2704b1e 100644
--- a/paludis/files.m4
+++ b/paludis/files.m4
@@ -35,7 +35,6 @@ add(`host_tuple_name', `hh', `cc', `sr', `test')
add(`install_task', `hh', `cc', `se')
add(`mask', `hh', `cc', `fwd', `sr')
add(`match_package', `hh', `cc')
-add(`md5', `hh', `cc', `test')
add(`merger', `hh', `cc', `sr', `test', `testscript')
add(`merger_entry_type', `hh', `cc', `se')
add(`metadata_key', `hh', `cc', `se', `fwd')
@@ -54,9 +53,7 @@ add(`repository', `hh', `fwd', `cc', `sr')
add(`repository_info', `hh', `fwd', `cc')
add(`repository_maker', `hh', `cc')
add(`repository_name_cache', `hh', `cc', `test', `testscript')
-add(`rmd160', `hh', `cc', `test')
add(`set_file', `hh', `cc', `se', `sr', `test', `testscript')
-add(`sha256', `hh', `cc', `test')
add(`show_suggest_visitor', `hh', `cc')
add(`stage_builder_task', `hh', `cc')
add(`stage_options', `sr')
diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc
index ccd728f..e3fa8d5 100644
--- a/paludis/repositories/e/check_fetched_files_visitor.cc
+++ b/paludis/repositories/e/check_fetched_files_visitor.cc
@@ -36,9 +36,9 @@
#include <paludis/util/save.hh>
#include <paludis/util/stringify.hh>
-#include <paludis/rmd160.hh>
-#include <paludis/sha256.hh>
-#include <paludis/md5.hh>
+#include <paludis/util/rmd160.hh>
+#include <paludis/util/sha256.hh>
+#include <paludis/util/md5.hh>
#include <paludis/repositories/e/manifest2_reader.hh>
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 7cb1fd0..683c560 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -72,8 +72,8 @@
#include <paludis/util/dir_iterator.hh>
#include <paludis/util/is_file_with_extension.hh>
-#include <paludis/rmd160.hh>
-#include <paludis/sha256.hh>
+#include <paludis/util/rmd160.hh>
+#include <paludis/util/sha256.hh>
#include <map>
#include <set>
diff --git a/paludis/repositories/e/vdb_merger.cc b/paludis/repositories/e/vdb_merger.cc
index 4e84302..3a714b0 100644
--- a/paludis/repositories/e/vdb_merger.cc
+++ b/paludis/repositories/e/vdb_merger.cc
@@ -29,7 +29,7 @@
#include <paludis/util/strip.hh>
#include <paludis/hook.hh>
#include <paludis/package_id.hh>
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <fstream>
diff --git a/paludis/repositories/e/vdb_unmerger.cc b/paludis/repositories/e/vdb_unmerger.cc
index 66949e0..043f4cc 100644
--- a/paludis/repositories/e/vdb_unmerger.cc
+++ b/paludis/repositories/e/vdb_unmerger.cc
@@ -24,7 +24,7 @@
using namespace paludis;
#include <paludis/util/destringify.hh>
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <paludis/environment.hh>
#include <paludis/hook.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/repositories/unpackaged/ndbam_merger.cc b/paludis/repositories/unpackaged/ndbam_merger.cc
index f1f6138..5674094 100644
--- a/paludis/repositories/unpackaged/ndbam_merger.cc
+++ b/paludis/repositories/unpackaged/ndbam_merger.cc
@@ -29,7 +29,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/hook.hh>
#include <paludis/package_id.hh>
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <fstream>
diff --git a/paludis/repositories/unpackaged/ndbam_unmerger.cc b/paludis/repositories/unpackaged/ndbam_unmerger.cc
index 36e473e..80f5982 100644
--- a/paludis/repositories/unpackaged/ndbam_unmerger.cc
+++ b/paludis/repositories/unpackaged/ndbam_unmerger.cc
@@ -22,7 +22,7 @@
#include <paludis/repositories/unpackaged/ndbam.hh>
#include <paludis/util/destringify.hh>
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <paludis/environment.hh>
#include <paludis/hook.hh>
#include <paludis/package_database.hh>
diff --git a/paludis/util/files.m4 b/paludis/util/files.m4
index c769a30..ab35915 100644
--- a/paludis/util/files.m4
+++ b/paludis/util/files.m4
@@ -33,6 +33,7 @@ add(`log', `hh', `cc', `se', `test')
add(`make_shared_ptr', `hh', `fwd')
add(`map', `hh', `fwd', `impl', `cc')
add(`member_iterator', `hh', `fwd', `impl', `test')
+add(`md5', `hh', `cc', `test')
add(`mutex', `hh', `cc', `test')
add(`no_type', `hh')
add(`operators', `hh')
@@ -43,9 +44,11 @@ add(`pipe', `hh', `cc')
add(`private_implementation_pattern', `hh', `impl')
add(`pstream', `hh', `cc', `test')
add(`random', `hh', `cc', `test')
+add(`rmd160', `hh', `cc', `test')
+add(`save', `hh', `test')
add(`sequence', `hh', `fwd', `impl')
add(`set', `hh', `fwd', `impl')
-add(`save', `hh', `test')
+add(`sha256', `hh', `cc', `test')
add(`sr', `hh', `cc')
add(`stringify', `hh', `test')
add(`strip', `hh', `cc', `test')
diff --git a/paludis/md5.cc b/paludis/util/md5.cc
index 11f1cca..114d4a1 100644
--- a/paludis/md5.cc
+++ b/paludis/util/md5.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <sstream>
#include <istream>
#include <iomanip>
diff --git a/paludis/md5.hh b/paludis/util/md5.hh
index f1cdcf2..329d6c4 100644
--- a/paludis/md5.hh
+++ b/paludis/util/md5.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_MD5_HH
-#define PALUDIS_GUARD_PALUDIS_MD5_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_MD5_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_MD5_HH 1
#include <iosfwd>
#include <string>
diff --git a/paludis/md5_TEST.cc b/paludis/util/md5_TEST.cc
index cfdbb14..61e57ed 100644
--- a/paludis/md5_TEST.cc
+++ b/paludis/util/md5_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/md5.hh>
+#include <paludis/util/md5.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/rmd160.cc b/paludis/util/rmd160.cc
index 024459b..024459b 100644
--- a/paludis/rmd160.cc
+++ b/paludis/util/rmd160.cc
diff --git a/paludis/rmd160.hh b/paludis/util/rmd160.hh
index a805214..86dcd08 100644
--- a/paludis/rmd160.hh
+++ b/paludis/util/rmd160.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_RMD160_HH
-#define PALUDIS_GUARD_PALUDIS_RMD160_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_RMD160_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_RMD160_HH 1
#include <iosfwd>
#include <string>
diff --git a/paludis/rmd160_TEST.cc b/paludis/util/rmd160_TEST.cc
index 115b0a9..5c3d6b2 100644
--- a/paludis/rmd160_TEST.cc
+++ b/paludis/util/rmd160_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/rmd160.hh>
+#include <paludis/util/rmd160.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>
diff --git a/paludis/sha256.cc b/paludis/util/sha256.cc
index d9900f5..d9900f5 100644
--- a/paludis/sha256.cc
+++ b/paludis/util/sha256.cc
diff --git a/paludis/sha256.hh b/paludis/util/sha256.hh
index 7d99786..e802667 100644
--- a/paludis/sha256.hh
+++ b/paludis/util/sha256.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_SHA256_HH
-#define PALUDIS_GUARD_PALUDIS_SHA256_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_UTIL_SHA256_HH
+#define PALUDIS_GUARD_PALUDIS_UTIL_SHA256_HH 1
#include <iosfwd>
#include <string>
diff --git a/paludis/sha256_TEST.cc b/paludis/util/sha256_TEST.cc
index c1d9f28..2a0da59 100644
--- a/paludis/sha256_TEST.cc
+++ b/paludis/util/sha256_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/sha256.hh>
+#include <paludis/util/sha256.hh>
#include <test/test_framework.hh>
#include <test/test_runner.hh>