192 files changed, 192 insertions, 298 deletions

diff --git a/Makefile.am b/Makefile.am
index bb4127c5c..ac380a9e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
 			config.h config.h.in INSTALL COPYING
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options
 EXTRA_DIST = autogen.bash automake-deps-dist-hack.tmp
-SUBDIRS = misc tr1 test paludis cran ebuild ruby src doc hooks eselect bash-completion zsh-completion
+SUBDIRS = misc tr1 test paludis cran ruby src doc hooks eselect bash-completion zsh-completion
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-glsa \
 	--with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir' \
diff --git a/configure.ac b/configure.ac
index f68e78c8f..e705d7f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -695,21 +695,20 @@ AM_CONDITIONAL([ENABLE_RUBY], test "x$enable_ruby" = "xyes")
 dnl }}}
 
 dnl {{{ repositories
-ALL_REPOSITORIES="cran fake nothing portage vdb gems virtuals"
-DEFAULT_REPOSITORIES="fake nothing portage vdb virtuals"
+ALL_REPOSITORIES="cran fake nothing gentoo gems virtuals"
+DEFAULT_REPOSITORIES="fake nothing gentoo virtuals"
 AC_MSG_CHECKING([which repositories to build...])
 AC_ARG_WITH([repositories],
 			[  --with-repositories=foo,bar,...
 			  Build the specified repositories:
-			  default         Equivalent to fake,nothing,portage,vdb,virtuals
+			  default         Equivalent to fake,nothing,gentoo,vdb,virtuals
 
 			  cran            The Comprehensive R Archive Network
-			  fake            A fake repository for test cases
+			  fake            A fake repository for test cases and adjutrix
 			  gems            Ruby Gems (requires libyaml) (UNUSABLE)
 			  nothing         A repository with no content
-			  portage         Gentoo Portage
-			  vdb             Gentoo installed packages
-			  virtuals        Old style Portage virtuals],
+			  gentoo          Gentoo packages (ebuilds, vdb)
+			  virtuals        Old style Gentoo virtuals],
 			[repositories="`echo $with_repositories | tr ',' ' '`"],
 			[repositories="$DEFAULT_REPOSITORIES"])
 repositories=`echo $repositories | tr ' ' '\n' | sed -e "s,^default\$,$DEFAULT_REPOSITORIES," | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
@@ -885,13 +884,6 @@ AC_OUTPUT(
 	doc/Makefile
 	doc/doxygen.conf
 	doc/examples/Makefile
-	ebuild/Makefile
-	ebuild/digests/Makefile
-	ebuild/fetchers/Makefile
-	ebuild/syncers/Makefile
-	ebuild/utils/Makefile
-	ebuild/echo_functions.bash
-	ebuild/work_around_broken_utilities.bash
 	eselect/Makefile
 	hooks/Makefile
 	hooks/demos/Makefile
@@ -906,6 +898,7 @@ AC_OUTPUT(
 	paludis/environment/default/Makefile
 	paludis/environment/no_config/Makefile
 	paludis/environment/test/Makefile
+	paludis/fetchers/Makefile
 	paludis/hashed_containers.hh
 	paludis/qa/Makefile
 	paludis/repositories/Makefile
@@ -913,10 +906,15 @@ AC_OUTPUT(
 	paludis/repositories/fake/Makefile
 	paludis/repositories/gems/Makefile
 	paludis/repositories/nothing/Makefile
-	paludis/repositories/portage/Makefile
-	paludis/repositories/vdb/Makefile
+	paludis/repositories/gentoo/Makefile
+	paludis/repositories/gentoo/ebuild/Makefile
+	paludis/repositories/gentoo/ebuild/digests/Makefile
+	paludis/repositories/gentoo/ebuild/utils/Makefile
+	paludis/repositories/gentoo/ebuild/echo_functions.bash
+	paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash
 	paludis/repositories/virtuals/Makefile
 	paludis/selinux/Makefile
+	paludis/syncers/Makefile
 	paludis/tasks/Makefile
 	paludis/util/Makefile
 	paludis/util/attributes.hh
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index e777aa646..34a100452 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -64,7 +64,7 @@ DEFS= \
 	-DLIBDIR=\"$(libdir)\"
 EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
 	hashed_containers.hh.in testscriptlist srlist srcleanlist
-SUBDIRS = digests util . dep_list repositories environment args qa selinux tasks
+SUBDIRS = digests fetchers syncers util selinux . dep_list repositories environment args qa tasks
 BUILT_SOURCES = srcleanlist
 
 libpaludis_la_SOURCES = filelist
diff --git a/paludis/environment/no_config/Makefile.am b/paludis/environment/no_config/Makefile.am
index 48aed38dc..24ed4bcc8 100644
--- a/paludis/environment/no_config/Makefile.am
+++ b/paludis/environment/no_config/Makefile.am
@@ -16,8 +16,7 @@ libpaludisnoconfigenvironment_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@
 if ! MONOLITHIC
 
 libpaludisnoconfigenvironment_la_LIBADD = \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
-	$(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
+	$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/libpaludis.la
diff --git a/paludis/environment/no_config/no_config_environment.cc b/paludis/environment/no_config/no_config_environment.cc
index cbd47332a..a98c0d0af 100644
--- a/paludis/environment/no_config/no_config_environment.cc
+++ b/paludis/environment/no_config/no_config_environment.cc
@@ -22,7 +22,7 @@
 #include <paludis/util/tokeniser.hh>
 #include <paludis/util/log.hh>
 #include <paludis/util/dir_iterator.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/repositories/repository_maker.hh>
 #include <paludis/config_file.hh>
 #include <set>
diff --git a/ebuild/fetchers/Makefile.am b/paludis/fetchers/Makefile.am
index 37e646344..37e646344 100644
--- a/ebuild/fetchers/Makefile.am
+++ b/paludis/fetchers/Makefile.am
diff --git a/ebuild/fetchers/dofile b/paludis/fetchers/dofile
index fd3e54bf5..fd3e54bf5 100755
--- a/ebuild/fetchers/dofile
+++ b/paludis/fetchers/dofile
diff --git a/ebuild/fetchers/dowget.in b/paludis/fetchers/dowget.in
index 41e645ab1..41e645ab1 100755
--- a/ebuild/fetchers/dowget.in
+++ b/paludis/fetchers/dowget.in
diff --git a/paludis/qa/Makefile.am.m4 b/paludis/qa/Makefile.am.m4
index 81ba4ec0b..7aca87f48 100644
--- a/paludis/qa/Makefile.am.m4
+++ b/paludis/qa/Makefile.am.m4
@@ -67,7 +67,7 @@ libpaludisqa_la_LIBADD = \
 	$(top_builddir)/paludis/libpaludis.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+	$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
 	@LIBXML2DEPS_LIBS@ \
 	@PCREPLUSPLUS_LIBS@
@@ -77,7 +77,7 @@ endif
 TESTS = testlist
 
 TESTS_ENVIRONMENT = env \
-	PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+	PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
 	PALUDIS_SKIP_CONFIG="yes" \
 	PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/qa/create_metadata_check.cc b/paludis/qa/create_metadata_check.cc
index c99ce017f..12f847775 100644
--- a/paludis/qa/create_metadata_check.cc
+++ b/paludis/qa/create_metadata_check.cc
@@ -21,7 +21,7 @@
 #include <paludis/portage_dep_parser.hh>
 #include <paludis/package_database_entry.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/dep_any_check.cc b/paludis/qa/dep_any_check.cc
index 03801b588..2ebe0056e 100644
--- a/paludis/qa/dep_any_check.cc
+++ b/paludis/qa/dep_any_check.cc
@@ -26,7 +26,7 @@
 #include <paludis/util/iterator.hh>
 #include <paludis/util/save.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/dep_flags_check.cc b/paludis/qa/dep_flags_check.cc
index e721a9705..a784cec0b 100644
--- a/paludis/qa/dep_flags_check.cc
+++ b/paludis/qa/dep_flags_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/qa/dep_flags_check.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/dep_packages_check.cc b/paludis/qa/dep_packages_check.cc
index 4398a0643..521e5db1b 100644
--- a/paludis/qa/dep_packages_check.cc
+++ b/paludis/qa/dep_packages_check.cc
@@ -26,7 +26,7 @@
 #include <paludis/util/log.hh>
 #include <paludis/util/system.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/deps_exist_check.cc b/paludis/qa/deps_exist_check.cc
index eb0eb908d..987dc303f 100644
--- a/paludis/qa/deps_exist_check.cc
+++ b/paludis/qa/deps_exist_check.cc
@@ -25,7 +25,7 @@
 #include <paludis/util/save.hh>
 #include <paludis/query.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/deps_visible_check.cc b/paludis/qa/deps_visible_check.cc
index c8aceaf3d..bdd60c58b 100644
--- a/paludis/qa/deps_visible_check.cc
+++ b/paludis/qa/deps_visible_check.cc
@@ -20,7 +20,7 @@
 #include <paludis/qa/deps_visible_check.hh>
 #include <paludis/qa/qa_environment.hh>
 #include <paludis/package_database_entry.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/environment.hh>
 #include <paludis/portage_dep_parser.hh>
 #include <paludis/dep_atom.hh>
diff --git a/paludis/qa/description_check.cc b/paludis/qa/description_check.cc
index 75ece5c89..747882935 100644
--- a/paludis/qa/description_check.cc
+++ b/paludis/qa/description_check.cc
@@ -21,7 +21,7 @@
 #include <paludis/package_database_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <strings.h>
 
 using namespace paludis;
diff --git a/paludis/qa/extract_check.cc b/paludis/qa/extract_check.cc
index 3d8505c34..6b360d13d 100644
--- a/paludis/qa/extract_check.cc
+++ b/paludis/qa/extract_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/qa/extract_check.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/homepage_check.cc b/paludis/qa/homepage_check.cc
index 84e0ef6b3..eb9b5bccb 100644
--- a/paludis/qa/homepage_check.cc
+++ b/paludis/qa/homepage_check.cc
@@ -21,7 +21,7 @@
 #include <paludis/package_database_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/inherits_check.cc b/paludis/qa/inherits_check.cc
index 5be8f64b8..88ba37294 100644
--- a/paludis/qa/inherits_check.cc
+++ b/paludis/qa/inherits_check.cc
@@ -28,7 +28,7 @@
 #include <paludis/util/log.hh>
 #include <paludis/util/system.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/iuse_check.cc b/paludis/qa/iuse_check.cc
index ae5ddfafc..37b9ccee9 100644
--- a/paludis/qa/iuse_check.cc
+++ b/paludis/qa/iuse_check.cc
@@ -28,7 +28,7 @@
 #include <paludis/util/log.hh>
 #include <paludis/util/system.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/keywords_check.cc b/paludis/qa/keywords_check.cc
index 4574c849d..a81a47148 100644
--- a/paludis/qa/keywords_check.cc
+++ b/paludis/qa/keywords_check.cc
@@ -22,7 +22,7 @@
 #include <paludis/package_database_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/license_check.cc b/paludis/qa/license_check.cc
index a77588abf..409401a67 100644
--- a/paludis/qa/license_check.cc
+++ b/paludis/qa/license_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/qa/license_check.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/parse_deps_check.cc b/paludis/qa/parse_deps_check.cc
index f9bcf055e..31c91f034 100644
--- a/paludis/qa/parse_deps_check.cc
+++ b/paludis/qa/parse_deps_check.cc
@@ -22,7 +22,7 @@
 #include <paludis/environment.hh>
 #include <paludis/qa/parse_deps_check.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/pdepend_overlap_check.cc b/paludis/qa/pdepend_overlap_check.cc
index fc58e006c..e9169df45 100644
--- a/paludis/qa/pdepend_overlap_check.cc
+++ b/paludis/qa/pdepend_overlap_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/qa/pdepend_overlap_check.hh>
 #include <paludis/util/join.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/profile_check.hh b/paludis/qa/profile_check.hh
index b1eb67f5e..1aa8f2746 100644
--- a/paludis/qa/profile_check.hh
+++ b/paludis/qa/profile_check.hh
@@ -22,7 +22,7 @@
 
 #include <paludis/qa/check.hh>
 #include <paludis/qa/check_result.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/util/exception.hh>
 #include <paludis/util/fs_entry.hh>
 #include <paludis/util/virtual_constructor.hh>
diff --git a/paludis/qa/restrict_check.cc b/paludis/qa/restrict_check.cc
index 58eb7aa36..28d6207a6 100644
--- a/paludis/qa/restrict_check.cc
+++ b/paludis/qa/restrict_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/package_database_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/qa/slot_check.cc b/paludis/qa/slot_check.cc
index 9968d3bbe..fe2c74eba 100644
--- a/paludis/qa/slot_check.cc
+++ b/paludis/qa/slot_check.cc
@@ -21,7 +21,7 @@
 #include <paludis/package_database_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 using namespace paludis;
 using namespace paludis::qa;
diff --git a/paludis/qa/src_uri_check.cc b/paludis/qa/src_uri_check.cc
index 8b9c49ec5..f1ad2a5a7 100644
--- a/paludis/qa/src_uri_check.cc
+++ b/paludis/qa/src_uri_check.cc
@@ -24,7 +24,7 @@
 #include <paludis/qa/src_uri_check.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/qa/qa_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <set>
 
 using namespace paludis;
diff --git a/paludis/repositories/portage/Makefile.am b/paludis/repositories/gentoo/Makefile.am
index 225039cc3..7d8f1662d 100644
--- a/paludis/repositories/portage/Makefile.am
+++ b/paludis/repositories/gentoo/Makefile.am
@@ -1,8 +1,10 @@
+SUBDIRS = ebuild .
 CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
 DISTCLEANFILES = \
 	portage_repository-sr.hh portage_repository-sr.cc \
 	glsa-sr.hh glsa-sr.cc \
-	portage_repository_params-sr.hh portage_repository_params-sr.cc
+	portage_repository_params-sr.hh portage_repository_params-sr.cc \
+	vdb_repository-sr.hh vdb_repository-sr.cc
 MAINTAINERCLEANFILES = Makefile.in
 
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -19,32 +21,32 @@ if MONOLITHIC
 if ENABLE_GLSA
 
 noinst_LTLIBRARIES = \
-	libpaludisportagerepository.la \
-	libpaludisportagerepositoryxmlthings.la
+	libpaludisgentoorepository.la \
+	libpaludisgentoorepositoryxmlthings.la
 
 else
 
 noinst_LTLIBRARIES = \
-	libpaludisportagerepository.la
+	libpaludisgentoorepository.la
 
 endif
 
 else
 
-paludis_repositories_lib_LTLIBRARIES = libpaludisportagerepository.la
+paludis_repositories_lib_LTLIBRARIES = libpaludisgentoorepository.la
 
 if ENABLE_GLSA
 
-lib_LTLIBRARIES = libpaludisportagerepositoryxmlthings.la
+lib_LTLIBRARIES = libpaludisgentoorepositoryxmlthings.la
 
 endif
 
 endif
 
-paludis_repositories_portage_includedir = $(includedir)/paludis/repositories/portage/
-libpaludisportagerepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+paludis_repositories_gentoo_includedir = $(includedir)/paludis/repositories/gentoo/
+libpaludisgentoorepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
 
-paludis_repositories_portage_include_HEADERS = \
+paludis_repositories_gentoo_include_HEADERS = \
 	glsa.hh \
 	glsa-sr.hh \
 	portage_repository-sr.hh \
@@ -62,9 +64,12 @@ paludis_repositories_portage_include_HEADERS = \
 	eclass_mtimes.hh \
 	make_ebuild_repository.hh \
 	use_desc.hh \
-	portage_virtual_version_metadata.hh
+	portage_virtual_version_metadata.hh \
+	vdb_repository.hh \
+	vdb_version_metadata.hh \
+	vdb_repository-sr.hh
 
-libpaludisportagerepository_la_SOURCES = \
+libpaludisgentoorepository_la_SOURCES = \
 	glsa.cc \
 	portage_repository.cc \
 	portage_repository_profile_file.cc \
@@ -81,17 +86,19 @@ libpaludisportagerepository_la_SOURCES = \
 	use_desc.cc \
 	portage_virtual_version_metadata.cc \
 	registration.cc \
-	$(paludis_repositories_portage_include_HEADERS)
+	vdb_repository.cc \
+	vdb_version_metadata.cc
+	$(paludis_repositories_gentoo_include_HEADERS)
 
 if MONOLITHIC
 
-libpaludisportagerepository_la_LIBADD = \
-	libpaludisportagerepositoryxmlthings.la \
+libpaludisgentoorepository_la_LIBADD = \
+	libpaludisgentoorepositoryxmlthings.la \
 	$(DYNAMIC_LD_LIBS)
 
 else
 
-libpaludisportagerepository_la_LIBADD = \
+libpaludisgentoorepository_la_LIBADD = \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/libpaludis.la \
 	$(DYNAMIC_LD_LIBS)
@@ -103,7 +110,7 @@ portage_repository_TEST_SOURCES = portage_repository_TEST.cc
 if MONOLITHIC
 
 portage_repository_TEST_LDADD = \
-	libpaludisportagerepository.la \
+	libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/util/test_extras.o \
 	$(top_builddir)/paludis/libpaludis.la \
@@ -114,7 +121,7 @@ portage_repository_TEST_LDADD = \
 else
 
 portage_repository_TEST_LDADD = \
-	libpaludisportagerepository.la \
+	libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/util/test_extras.o \
 	$(top_builddir)/paludis/libpaludis.la \
@@ -139,7 +146,13 @@ EXTRA_DIST = \
 	portage_repository.sr \
 	xml_things_TEST.cc \
 	xml_things_TEST_setup.sh \
-	xml_things_TEST_cleanup.sh
+	xml_things_TEST_cleanup.sh \
+	vdb_repository_TEST.cc \
+	vdb_repository_TEST_setup.sh \
+	vdb_repository_TEST_cleanup.sh \
+	vdb_repository-sr.hh \
+	vdb_repository-sr.cc \
+	vdb_repository.sr
 
 BUILT_SOURCES = \
 	portage_repository_params-sr.hh \
@@ -147,18 +160,22 @@ BUILT_SOURCES = \
 	portage_repository-sr.hh \
 	portage_repository-sr.cc \
 	glsa-sr.hh \
-	glsa-sr.cc
+	glsa-sr.cc \
+	vdb_repository-sr.hh \
+	vdb_repository-sr.cc
 
 check_SCRIPTS = \
 	portage_repository_TEST_setup.sh portage_repository_TEST_cleanup.sh \
-	xml_things_TEST_setup.sh xml_things_TEST_cleanup.sh
+	xml_things_TEST_setup.sh xml_things_TEST_cleanup.sh \
+	vdb_repository_TEST_setup.sh vdb_repository_TEST_cleanup.sh
 
 TESTS_ENVIRONMENT = env \
-	PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+	PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
 	PALUDIS_SKIP_CONFIG="yes" \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
 	PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
-	LD_LIBRARY_PATH="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/portage/`" \
+	LD_LIBRARY_PATH="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/`:` \
+		$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs/`" \
 	bash $(top_srcdir)/test/run_test.sh
 
 portage_repository-sr.hh : portage_repository.sr $(top_srcdir)/misc/make_sr.bash
@@ -179,23 +196,30 @@ glsa-sr.hh : glsa.sr $(top_srcdir)/misc/make_sr.bash
 glsa-sr.cc : glsa.sr $(top_srcdir)/misc/make_sr.bash
 	$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/glsa.sr > $@
 
-libpaludisportagerepositoryxmlthings_la_SOURCES = xml_things.cc xml_things.hh
-libpaludisportagerepositoryxmlthings_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
+vdb_repository-sr.hh : vdb_repository.sr $(top_srcdir)/misc/make_sr.bash
+	$(top_srcdir)/misc/make_sr.bash --header $(srcdir)/vdb_repository.sr > $@
+
+vdb_repository-sr.cc : vdb_repository.sr $(top_srcdir)/misc/make_sr.bash
+	$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/vdb_repository.sr > $@
+
+
+libpaludisgentoorepositoryxmlthings_la_SOURCES = xml_things.cc xml_things.hh
+libpaludisgentoorepositoryxmlthings_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
 
 if MONOLITHIC
 
-libpaludisportagerepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
+libpaludisgentoorepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
 	$(DYNAMIC_LD_LIBS)
 
 else
 
-libpaludisportagerepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
+libpaludisgentoorepositoryxmlthings_la_LIBADD = @LIBXML2DEPS_LIBS@ \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/libpaludis.la
 
 endif
 
-libpaludisportagerepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
+libpaludisgentoorepositoryxmlthings_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
 
 if ENABLE_GLSA
 
@@ -207,11 +231,11 @@ if MONOLITHIC
 xml_things_TEST_LDADD = \
 	$(top_builddir)/paludis/util/test_extras.o \
 	$(top_builddir)/test/libtest.a \
-	libpaludisportagerepository.la \
+	libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/libpaludis.la \
 	$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
 	$(top_builddir)/test/libtest.a \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepositoryxmlthings.la \
+	libpaludisgentoorepositoryxmlthings.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(DYNAMIC_LD_LIBS)
 
@@ -220,7 +244,7 @@ else
 xml_things_TEST_LDADD = \
 	$(top_builddir)/paludis/util/test_extras.o \
 	$(top_builddir)/test/libtest.a \
-	libpaludisportagerepository.la \
+	libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/libpaludis.la \
 	$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
diff --git a/ebuild/Makefile.am b/paludis/repositories/gentoo/ebuild/Makefile.am
index e7b2dd961..431ebc87b 100644
--- a/ebuild/Makefile.am
+++ b/paludis/repositories/gentoo/ebuild/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = *~
-SUBDIRS = . digests fetchers syncers utils
+SUBDIRS = . digests utils
 
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
 
@@ -40,11 +40,11 @@ libexecprog_SCRIPTS = \
 	work_around_broken_utilities.bash
 
 TESTS_ENVIRONMENT = env \
-	PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
+	PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
 	PALUDIS_EBUILD_LOG_LEVEL="warning" \
-	TOP_BUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/`" \
+	TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/`" \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
-	bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/ebuild/run_test.bash
+	bash $(top_srcdir)/test/run_test.sh $(top_srcdir)/paludis/repositories/gentoo/ebuild/run_test.bash
 
 TESTS = echo_functions_TEST.bash list_functions_TEST.bash kernel_functions_TEST.bash \
 	merge_TEST.bash unmerge_TEST.bash
diff --git a/ebuild/build_functions.bash b/paludis/repositories/gentoo/ebuild/build_functions.bash
index 6e7aa11be..6e7aa11be 100644
--- a/ebuild/build_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/build_functions.bash
diff --git a/ebuild/builtin_fetch.bash b/paludis/repositories/gentoo/ebuild/builtin_fetch.bash
index c3f6402d0..c3f6402d0 100644
--- a/ebuild/builtin_fetch.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_fetch.bash
diff --git a/ebuild/builtin_init.bash b/paludis/repositories/gentoo/ebuild/builtin_init.bash
index d7c5042be..d7c5042be 100644
--- a/ebuild/builtin_init.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_init.bash
diff --git a/ebuild/builtin_merge.bash b/paludis/repositories/gentoo/ebuild/builtin_merge.bash
index 452468e65..452468e65 100644
--- a/ebuild/builtin_merge.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_merge.bash
diff --git a/ebuild/builtin_metadata.bash b/paludis/repositories/gentoo/ebuild/builtin_metadata.bash
index dbc951fdd..dbc951fdd 100644
--- a/ebuild/builtin_metadata.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_metadata.bash
diff --git a/ebuild/builtin_strip.bash b/paludis/repositories/gentoo/ebuild/builtin_strip.bash
index 9a4168e7c..9a4168e7c 100644
--- a/ebuild/builtin_strip.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_strip.bash
diff --git a/ebuild/builtin_tidyup.bash b/paludis/repositories/gentoo/ebuild/builtin_tidyup.bash
index 8927d23b8..8927d23b8 100644
--- a/ebuild/builtin_tidyup.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_tidyup.bash
diff --git a/ebuild/builtin_unmerge.bash b/paludis/repositories/gentoo/ebuild/builtin_unmerge.bash
index e358d8a3a..e358d8a3a 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_unmerge.bash
diff --git a/ebuild/builtin_variable.bash b/paludis/repositories/gentoo/ebuild/builtin_variable.bash
index e140188d7..e140188d7 100644
--- a/ebuild/builtin_variable.bash
+++ b/paludis/repositories/gentoo/ebuild/builtin_variable.bash
diff --git a/ebuild/digests/Makefile.am b/paludis/repositories/gentoo/ebuild/digests/Makefile.am
index d4ad64597..d4ad64597 100644
--- a/ebuild/digests/Makefile.am
+++ b/paludis/repositories/gentoo/ebuild/digests/Makefile.am
diff --git a/ebuild/digests/domd5.cc b/paludis/repositories/gentoo/ebuild/digests/domd5.cc
index d139f472e..d139f472e 100644
--- a/ebuild/digests/domd5.cc
+++ b/paludis/repositories/gentoo/ebuild/digests/domd5.cc
diff --git a/ebuild/digests/dormd160.cc b/paludis/repositories/gentoo/ebuild/digests/dormd160.cc
index 47fcd7f00..47fcd7f00 100644
--- a/ebuild/digests/dormd160.cc
+++ b/paludis/repositories/gentoo/ebuild/digests/dormd160.cc
diff --git a/ebuild/digests/dosha256.cc b/paludis/repositories/gentoo/ebuild/digests/dosha256.cc
index 056ce5a2a..056ce5a2a 100644
--- a/ebuild/digests/dosha256.cc
+++ b/paludis/repositories/gentoo/ebuild/digests/dosha256.cc
diff --git a/ebuild/ebuild.bash b/paludis/repositories/gentoo/ebuild/ebuild.bash
index ec3b1795f..ec3b1795f 100755
--- a/ebuild/ebuild.bash
+++ b/paludis/repositories/gentoo/ebuild/ebuild.bash
diff --git a/ebuild/echo_functions.bash.in b/paludis/repositories/gentoo/ebuild/echo_functions.bash.in
index 279121c82..279121c82 100644
--- a/ebuild/echo_functions.bash.in
+++ b/paludis/repositories/gentoo/ebuild/echo_functions.bash.in
diff --git a/ebuild/echo_functions_TEST.bash b/paludis/repositories/gentoo/ebuild/echo_functions_TEST.bash
index 6e4ad2786..6e4ad2786 100644
--- a/ebuild/echo_functions_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/echo_functions_TEST.bash
diff --git a/ebuild/eclass_functions.bash b/paludis/repositories/gentoo/ebuild/eclass_functions.bash
index 9c6334dfb..9c6334dfb 100644
--- a/ebuild/eclass_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/eclass_functions.bash
diff --git a/ebuild/install_functions.bash b/paludis/repositories/gentoo/ebuild/install_functions.bash
index e23628c7b..e23628c7b 100644
--- a/ebuild/install_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/install_functions.bash
diff --git a/ebuild/kernel_functions.bash b/paludis/repositories/gentoo/ebuild/kernel_functions.bash
index 9126376e6..9126376e6 100644
--- a/ebuild/kernel_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/kernel_functions.bash
diff --git a/ebuild/kernel_functions_TEST.bash b/paludis/repositories/gentoo/ebuild/kernel_functions_TEST.bash
index 4b3271df3..4b3271df3 100644
--- a/ebuild/kernel_functions_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/kernel_functions_TEST.bash
diff --git a/ebuild/list_functions.bash b/paludis/repositories/gentoo/ebuild/list_functions.bash
index d34ba64eb..d34ba64eb 100644
--- a/ebuild/list_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/list_functions.bash
diff --git a/ebuild/list_functions_TEST.bash b/paludis/repositories/gentoo/ebuild/list_functions_TEST.bash
index c3ba14fbb..c3ba14fbb 100644
--- a/ebuild/list_functions_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/list_functions_TEST.bash
diff --git a/ebuild/merge.cc b/paludis/repositories/gentoo/ebuild/merge.cc
index 1b1781e17..1b1781e17 100644
--- a/ebuild/merge.cc
+++ b/paludis/repositories/gentoo/ebuild/merge.cc
diff --git a/ebuild/merge_TEST.bash b/paludis/repositories/gentoo/ebuild/merge_TEST.bash
index 940b7fad1..c4f525331 100644
--- a/ebuild/merge_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/merge_TEST.bash
@@ -1,7 +1,7 @@
 #!/bin/bash
 # vim: set sw=4 sts=4 et :
 
-# Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+# Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
 #
 # This file is part of the Paludis package manager. Paludis is free software;
 # you can redistribute it and/or modify it under the terms of the GNU General
@@ -18,7 +18,7 @@
 
 merge_empty_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/empty_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/empty_src" \
         "merge_TEST_dir/empty_dst" \
         "merge_TEST_dir/empty_contents" 1>/dev/null
     test_return_code
@@ -26,7 +26,7 @@ merge_empty_TEST()
 
 merge_files_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/files_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/files_src" \
         "merge_TEST_dir/files_dst" \
         "merge_TEST_dir/files_contents" 1>/dev/null
     test_return_code
@@ -40,7 +40,7 @@ merge_files_TEST()
 
 merge_dirs_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/dirs_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/dirs_src" \
         "merge_TEST_dir/dirs_dst" \
         "merge_TEST_dir/dirs_contents" 1>/dev/null
     test_return_code
@@ -61,7 +61,7 @@ merge_dirs_TEST()
 
 merge_dirs_over_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/dirs_over_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/dirs_over_src" \
         "merge_TEST_dir/dirs_over_dst" \
         "merge_TEST_dir/dirs_over_contents" 1>/dev/null
     test_return_code
@@ -82,7 +82,7 @@ merge_dirs_over_TEST()
 
 merge_links_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/links_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_src" \
         "merge_TEST_dir/links_dst" \
         "merge_TEST_dir/links_contents" 1>/dev/null
     test_return_code
@@ -100,7 +100,7 @@ merge_links_TEST()
 
 merge_links_over_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/links_over_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_over_src" \
         "merge_TEST_dir/links_over_dst" \
         "merge_TEST_dir/links_over_contents" 1>/dev/null
     test_return_code
@@ -122,7 +122,7 @@ merge_links_over_TEST()
 
 merge_links_over_dir_TEST()
 {
-    ! ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/links_over_dir_src" \
+    ! ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/links_over_dir_src" \
         "merge_TEST_dir/links_over_dir_dst" \
         "merge_TEST_dir/links_over_dir_contents" &>/dev/null
     test_return_code
@@ -132,7 +132,7 @@ merge_config_protect_TEST()
 {
     export CONFIG_PROTECT=/dir
 
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/config_pro_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/config_pro_src" \
         "merge_TEST_dir/config_pro_dst" \
         "merge_TEST_dir/config_pro_contents" 1>/dev/null
     test_return_code
@@ -178,7 +178,7 @@ merge_config_protect_noroot_TEST()
 {
     export CONFIG_PROTECT=$(${PALUDIS_EBUILD_DIR}/utils/canonicalise `pwd` )/merge_TEST_dir/noroot_dst/dir
 
-    ${TOP_BUILD_DIR}/ebuild/merge "merge_TEST_dir/config_pro_noroot_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "merge_TEST_dir/config_pro_noroot_src" \
         "/" \
         "merge_TEST_dir/config_pro_slash_root_contents" 1>/dev/null
     test_return_code
diff --git a/ebuild/merge_TEST_cleanup.sh b/paludis/repositories/gentoo/ebuild/merge_TEST_cleanup.sh
index 4b40b8f65..4b40b8f65 100755
--- a/ebuild/merge_TEST_cleanup.sh
+++ b/paludis/repositories/gentoo/ebuild/merge_TEST_cleanup.sh
diff --git a/ebuild/merge_TEST_setup.sh b/paludis/repositories/gentoo/ebuild/merge_TEST_setup.sh
index 4af857d16..4af857d16 100755
--- a/ebuild/merge_TEST_setup.sh
+++ b/paludis/repositories/gentoo/ebuild/merge_TEST_setup.sh
diff --git a/ebuild/merge_common.cc b/paludis/repositories/gentoo/ebuild/merge_common.cc
index 27b9e11ef..27b9e11ef 100644
--- a/ebuild/merge_common.cc
+++ b/paludis/repositories/gentoo/ebuild/merge_common.cc
diff --git a/ebuild/merge_common.hh b/paludis/repositories/gentoo/ebuild/merge_common.hh
index 6f066489a..6f066489a 100644
--- a/ebuild/merge_common.hh
+++ b/paludis/repositories/gentoo/ebuild/merge_common.hh
diff --git a/ebuild/multilib_functions.bash b/paludis/repositories/gentoo/ebuild/multilib_functions.bash
index f6569334e..f6569334e 100644
--- a/ebuild/multilib_functions.bash
+++ b/paludis/repositories/gentoo/ebuild/multilib_functions.bash
diff --git a/ebuild/pkg_config.bash b/paludis/repositories/gentoo/ebuild/pkg_config.bash
index f0bb49ab4..f0bb49ab4 100644
--- a/ebuild/pkg_config.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_config.bash
diff --git a/ebuild/pkg_nofetch.bash b/paludis/repositories/gentoo/ebuild/pkg_nofetch.bash
index 09c179125..09c179125 100644
--- a/ebuild/pkg_nofetch.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_nofetch.bash
diff --git a/ebuild/pkg_postinst.bash b/paludis/repositories/gentoo/ebuild/pkg_postinst.bash
index 9eb7c6c8f..9eb7c6c8f 100644
--- a/ebuild/pkg_postinst.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_postinst.bash
diff --git a/ebuild/pkg_postrm.bash b/paludis/repositories/gentoo/ebuild/pkg_postrm.bash
index 9fc7855ac..9fc7855ac 100644
--- a/ebuild/pkg_postrm.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_postrm.bash
diff --git a/ebuild/pkg_preinst.bash b/paludis/repositories/gentoo/ebuild/pkg_preinst.bash
index 70a346154..70a346154 100644
--- a/ebuild/pkg_preinst.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_preinst.bash
diff --git a/ebuild/pkg_prerm.bash b/paludis/repositories/gentoo/ebuild/pkg_prerm.bash
index ca28d79f1..ca28d79f1 100644
--- a/ebuild/pkg_prerm.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_prerm.bash
diff --git a/ebuild/pkg_setup.bash b/paludis/repositories/gentoo/ebuild/pkg_setup.bash
index 51b83a492..51b83a492 100644
--- a/ebuild/pkg_setup.bash
+++ b/paludis/repositories/gentoo/ebuild/pkg_setup.bash
diff --git a/ebuild/portage_stubs.bash b/paludis/repositories/gentoo/ebuild/portage_stubs.bash
index 5fc68401a..5fc68401a 100644
--- a/ebuild/portage_stubs.bash
+++ b/paludis/repositories/gentoo/ebuild/portage_stubs.bash
diff --git a/ebuild/run_test.bash b/paludis/repositories/gentoo/ebuild/run_test.bash
index b5587b9d1..b5587b9d1 100755
--- a/ebuild/run_test.bash
+++ b/paludis/repositories/gentoo/ebuild/run_test.bash
diff --git a/ebuild/sandbox.bash b/paludis/repositories/gentoo/ebuild/sandbox.bash
index cd504ae08..cd504ae08 100644
--- a/ebuild/sandbox.bash
+++ b/paludis/repositories/gentoo/ebuild/sandbox.bash
diff --git a/ebuild/src_compile.bash b/paludis/repositories/gentoo/ebuild/src_compile.bash
index 42c8de1a1..42c8de1a1 100644
--- a/ebuild/src_compile.bash
+++ b/paludis/repositories/gentoo/ebuild/src_compile.bash
diff --git a/ebuild/src_install.bash b/paludis/repositories/gentoo/ebuild/src_install.bash
index d7a67cd4f..d7a67cd4f 100644
--- a/ebuild/src_install.bash
+++ b/paludis/repositories/gentoo/ebuild/src_install.bash
diff --git a/ebuild/src_test.bash b/paludis/repositories/gentoo/ebuild/src_test.bash
index 24ff3d6c5..24ff3d6c5 100644
--- a/ebuild/src_test.bash
+++ b/paludis/repositories/gentoo/ebuild/src_test.bash
diff --git a/ebuild/src_unpack.bash b/paludis/repositories/gentoo/ebuild/src_unpack.bash
index 02ce83eee..02ce83eee 100644
--- a/ebuild/src_unpack.bash
+++ b/paludis/repositories/gentoo/ebuild/src_unpack.bash
diff --git a/ebuild/unmerge.cc b/paludis/repositories/gentoo/ebuild/unmerge.cc
index 367b42c65..367b42c65 100644
--- a/ebuild/unmerge.cc
+++ b/paludis/repositories/gentoo/ebuild/unmerge.cc
diff --git a/ebuild/unmerge_TEST.bash b/paludis/repositories/gentoo/ebuild/unmerge_TEST.bash
index ace2de5cf..bd59a914e 100644
--- a/ebuild/unmerge_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/unmerge_TEST.bash
@@ -18,12 +18,12 @@
 
 unmerge_empty_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "unmerge_TEST_dir/empty_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/empty_src" \
         "unmerge_TEST_dir/empty_dst" \
         "unmerge_TEST_dir/empty_contents" 1>/dev/null
     test_return_code
 
-    ${TOP_BUILD_DIR}/ebuild/unmerge "unmerge_TEST_dir/empty_dst" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/empty_dst" \
         "unmerge_TEST_dir/empty_contents" 1>/dev/null
     test_return_code
 
@@ -38,7 +38,7 @@ unmerge_empty_TEST()
 
 unmerge_files_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "unmerge_TEST_dir/files_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/files_src" \
         "unmerge_TEST_dir/files_dst" \
         "unmerge_TEST_dir/files_contents" 1>/dev/null
     test_return_code
@@ -51,7 +51,7 @@ unmerge_files_TEST()
     done
     test_equality "$ok" "yes"
 
-    ${TOP_BUILD_DIR}/ebuild/unmerge "unmerge_TEST_dir/files_dst" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/files_dst" \
         "unmerge_TEST_dir/files_contents" 1>/dev/null
     test_return_code
 
@@ -66,7 +66,7 @@ unmerge_files_TEST()
 
 unmerge_spaces_TEST()
 {
-    ${TOP_BUILD_DIR}/ebuild/merge "unmerge_TEST_dir/spaces_src" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/merge "unmerge_TEST_dir/spaces_src" \
         "unmerge_TEST_dir/spaces_dst" \
         "unmerge_TEST_dir/spaces_contents"
     test_return_code
@@ -79,7 +79,7 @@ unmerge_spaces_TEST()
     done
     test_equality "$ok" "yes"
 
-    ${TOP_BUILD_DIR}/ebuild/unmerge "unmerge_TEST_dir/spaces_dst" \
+    ${TOP_BUILD_DIR}/paludis/repositories/gentoo/ebuild/unmerge "unmerge_TEST_dir/spaces_dst" \
         "unmerge_TEST_dir/spaces_contents"
     test_return_code
 
diff --git a/ebuild/unmerge_TEST_cleanup.sh b/paludis/repositories/gentoo/ebuild/unmerge_TEST_cleanup.sh
index e0f01b607..e0f01b607 100755
--- a/ebuild/unmerge_TEST_cleanup.sh
+++ b/paludis/repositories/gentoo/ebuild/unmerge_TEST_cleanup.sh
diff --git a/ebuild/unmerge_TEST_setup.sh b/paludis/repositories/gentoo/ebuild/unmerge_TEST_setup.sh
index 33643aa89..33643aa89 100755
--- a/ebuild/unmerge_TEST_setup.sh
+++ b/paludis/repositories/gentoo/ebuild/unmerge_TEST_setup.sh
diff --git a/ebuild/usage_error.bash b/paludis/repositories/gentoo/ebuild/usage_error.bash
index 0af5b2d47..0af5b2d47 100644
--- a/ebuild/usage_error.bash
+++ b/paludis/repositories/gentoo/ebuild/usage_error.bash
diff --git a/ebuild/utils/Makefile.am b/paludis/repositories/gentoo/ebuild/utils/Makefile.am
index dcd28ba0f..c0f244730 100644
--- a/ebuild/utils/Makefile.am
+++ b/paludis/repositories/gentoo/ebuild/utils/Makefile.am
@@ -54,11 +54,12 @@ libexecprog_SCRIPTS = \
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
 
 TESTS_ENVIRONMENT = env \
-	PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
-	TOP_BUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/`" \
+	PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise \
+			   $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+	TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/`" \
 	PALUDIS_EBUILD_LOG_LEVEL="silent" \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
-	bash $(top_srcdir)/ebuild/utils/run_test.bash
+	bash $(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/run_test.bash
 
 TESTS = dobin_TEST.bash getfsize_TEST.bash
 
diff --git a/ebuild/utils/canonicalise b/paludis/repositories/gentoo/ebuild/utils/canonicalise
index b186eba65..b186eba65 100755
--- a/ebuild/utils/canonicalise
+++ b/paludis/repositories/gentoo/ebuild/utils/canonicalise
diff --git a/ebuild/utils/dobin b/paludis/repositories/gentoo/ebuild/utils/dobin
index 506f50f0f..506f50f0f 100755
--- a/ebuild/utils/dobin
+++ b/paludis/repositories/gentoo/ebuild/utils/dobin
diff --git a/ebuild/utils/dobin_TEST.bash b/paludis/repositories/gentoo/ebuild/utils/dobin_TEST.bash
index 1af77004f..1af77004f 100644
--- a/ebuild/utils/dobin_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/utils/dobin_TEST.bash
diff --git a/ebuild/utils/doconfd b/paludis/repositories/gentoo/ebuild/utils/doconfd
index 37c453cc9..37c453cc9 100644
--- a/ebuild/utils/doconfd
+++ b/paludis/repositories/gentoo/ebuild/utils/doconfd
diff --git a/ebuild/utils/dodir b/paludis/repositories/gentoo/ebuild/utils/dodir
index 52b7c2090..52b7c2090 100644
--- a/ebuild/utils/dodir
+++ b/paludis/repositories/gentoo/ebuild/utils/dodir
diff --git a/ebuild/utils/dodoc b/paludis/repositories/gentoo/ebuild/utils/dodoc
index bfff299dd..bfff299dd 100644
--- a/ebuild/utils/dodoc
+++ b/paludis/repositories/gentoo/ebuild/utils/dodoc
diff --git a/ebuild/utils/doenvd b/paludis/repositories/gentoo/ebuild/utils/doenvd
index 7299776f9..7299776f9 100644
--- a/ebuild/utils/doenvd
+++ b/paludis/repositories/gentoo/ebuild/utils/doenvd
diff --git a/ebuild/utils/doexe b/paludis/repositories/gentoo/ebuild/utils/doexe
index a67166b09..a67166b09 100644
--- a/ebuild/utils/doexe
+++ b/paludis/repositories/gentoo/ebuild/utils/doexe
diff --git a/ebuild/utils/dohard b/paludis/repositories/gentoo/ebuild/utils/dohard
index b0758e5ae..b0758e5ae 100644
--- a/ebuild/utils/dohard
+++ b/paludis/repositories/gentoo/ebuild/utils/dohard
diff --git a/ebuild/utils/dohtml b/paludis/repositories/gentoo/ebuild/utils/dohtml
index 09743c9ce..09743c9ce 100644
--- a/ebuild/utils/dohtml
+++ b/paludis/repositories/gentoo/ebuild/utils/dohtml
diff --git a/ebuild/utils/doinfo b/paludis/repositories/gentoo/ebuild/utils/doinfo
index 746812c9c..746812c9c 100644
--- a/ebuild/utils/doinfo
+++ b/paludis/repositories/gentoo/ebuild/utils/doinfo
diff --git a/ebuild/utils/doinitd b/paludis/repositories/gentoo/ebuild/utils/doinitd
index 8fc7080da..8fc7080da 100644
--- a/ebuild/utils/doinitd
+++ b/paludis/repositories/gentoo/ebuild/utils/doinitd
diff --git a/ebuild/utils/doins b/paludis/repositories/gentoo/ebuild/utils/doins
index 2d70f5acf..2d70f5acf 100644
--- a/ebuild/utils/doins
+++ b/paludis/repositories/gentoo/ebuild/utils/doins
diff --git a/ebuild/utils/dolib b/paludis/repositories/gentoo/ebuild/utils/dolib
index c35b20245..c35b20245 100644
--- a/ebuild/utils/dolib
+++ b/paludis/repositories/gentoo/ebuild/utils/dolib
diff --git a/ebuild/utils/dolib.a.in b/paludis/repositories/gentoo/ebuild/utils/dolib.a.in
index e766554dd..e766554dd 100644
--- a/ebuild/utils/dolib.a.in
+++ b/paludis/repositories/gentoo/ebuild/utils/dolib.a.in
diff --git a/ebuild/utils/dolib.so.in b/paludis/repositories/gentoo/ebuild/utils/dolib.so.in
index d4dcb4a46..d4dcb4a46 100644
--- a/ebuild/utils/dolib.so.in
+++ b/paludis/repositories/gentoo/ebuild/utils/dolib.so.in
diff --git a/ebuild/utils/doman b/paludis/repositories/gentoo/ebuild/utils/doman
index 3a246892a..3a246892a 100644
--- a/ebuild/utils/doman
+++ b/paludis/repositories/gentoo/ebuild/utils/doman
diff --git a/ebuild/utils/domo b/paludis/repositories/gentoo/ebuild/utils/domo
index b7a0dd413..b7a0dd413 100644
--- a/ebuild/utils/domo
+++ b/paludis/repositories/gentoo/ebuild/utils/domo
diff --git a/ebuild/utils/donewins b/paludis/repositories/gentoo/ebuild/utils/donewins
index 90f037799..90f037799 100644
--- a/ebuild/utils/donewins
+++ b/paludis/repositories/gentoo/ebuild/utils/donewins
diff --git a/ebuild/utils/dosbin b/paludis/repositories/gentoo/ebuild/utils/dosbin
index 25c625801..25c625801 100644
--- a/ebuild/utils/dosbin
+++ b/paludis/repositories/gentoo/ebuild/utils/dosbin
diff --git a/ebuild/utils/dosed b/paludis/repositories/gentoo/ebuild/utils/dosed
index ca9dc0429..ca9dc0429 100644
--- a/ebuild/utils/dosed
+++ b/paludis/repositories/gentoo/ebuild/utils/dosed
diff --git a/ebuild/utils/dosym b/paludis/repositories/gentoo/ebuild/utils/dosym
index 818ef1aaa..818ef1aaa 100644
--- a/ebuild/utils/dosym
+++ b/paludis/repositories/gentoo/ebuild/utils/dosym
diff --git a/ebuild/utils/dounpack b/paludis/repositories/gentoo/ebuild/utils/dounpack
index 2af875f0a..2af875f0a 100755
--- a/ebuild/utils/dounpack
+++ b/paludis/repositories/gentoo/ebuild/utils/dounpack
diff --git a/ebuild/utils/emake b/paludis/repositories/gentoo/ebuild/utils/emake
index 57ffa4ca4..57ffa4ca4 100755
--- a/ebuild/utils/emake
+++ b/paludis/repositories/gentoo/ebuild/utils/emake
diff --git a/ebuild/utils/fowners b/paludis/repositories/gentoo/ebuild/utils/fowners
index 4eb208c6e..4eb208c6e 100644
--- a/ebuild/utils/fowners
+++ b/paludis/repositories/gentoo/ebuild/utils/fowners
diff --git a/ebuild/utils/fperms b/paludis/repositories/gentoo/ebuild/utils/fperms
index 04c5db7eb..04c5db7eb 100644
--- a/ebuild/utils/fperms
+++ b/paludis/repositories/gentoo/ebuild/utils/fperms
diff --git a/ebuild/utils/getfsize b/paludis/repositories/gentoo/ebuild/utils/getfsize
index 38a271b00..38a271b00 100755
--- a/ebuild/utils/getfsize
+++ b/paludis/repositories/gentoo/ebuild/utils/getfsize
diff --git a/ebuild/utils/getfsize_TEST.bash b/paludis/repositories/gentoo/ebuild/utils/getfsize_TEST.bash
index 3688bdf4c..3688bdf4c 100755
--- a/ebuild/utils/getfsize_TEST.bash
+++ b/paludis/repositories/gentoo/ebuild/utils/getfsize_TEST.bash
diff --git a/ebuild/utils/getmtime b/paludis/repositories/gentoo/ebuild/utils/getmtime
index 88a74b21f..88a74b21f 100755
--- a/ebuild/utils/getmtime
+++ b/paludis/repositories/gentoo/ebuild/utils/getmtime
diff --git a/ebuild/utils/newbin b/paludis/repositories/gentoo/ebuild/utils/newbin
index 21792c697..21792c697 100644
--- a/ebuild/utils/newbin
+++ b/paludis/repositories/gentoo/ebuild/utils/newbin
diff --git a/ebuild/utils/newconfd b/paludis/repositories/gentoo/ebuild/utils/newconfd
index 77838656c..77838656c 100644
--- a/ebuild/utils/newconfd
+++ b/paludis/repositories/gentoo/ebuild/utils/newconfd
diff --git a/ebuild/utils/newdoc b/paludis/repositories/gentoo/ebuild/utils/newdoc
index b4cb50700..b4cb50700 100644
--- a/ebuild/utils/newdoc
+++ b/paludis/repositories/gentoo/ebuild/utils/newdoc
diff --git a/ebuild/utils/newenvd b/paludis/repositories/gentoo/ebuild/utils/newenvd
index 76f0a7f5e..76f0a7f5e 100644
--- a/ebuild/utils/newenvd
+++ b/paludis/repositories/gentoo/ebuild/utils/newenvd
diff --git a/ebuild/utils/newexe b/paludis/repositories/gentoo/ebuild/utils/newexe
index 9a5cb35df..9a5cb35df 100644
--- a/ebuild/utils/newexe
+++ b/paludis/repositories/gentoo/ebuild/utils/newexe
diff --git a/ebuild/utils/newinitd b/paludis/repositories/gentoo/ebuild/utils/newinitd
index 01ca12b2d..01ca12b2d 100644
--- a/ebuild/utils/newinitd
+++ b/paludis/repositories/gentoo/ebuild/utils/newinitd
diff --git a/ebuild/utils/newins b/paludis/repositories/gentoo/ebuild/utils/newins
index 2b692adb6..2b692adb6 100644
--- a/ebuild/utils/newins
+++ b/paludis/repositories/gentoo/ebuild/utils/newins
diff --git a/ebuild/utils/newlib.a.in b/paludis/repositories/gentoo/ebuild/utils/newlib.a.in
index 415a0571c..415a0571c 100644
--- a/ebuild/utils/newlib.a.in
+++ b/paludis/repositories/gentoo/ebuild/utils/newlib.a.in
diff --git a/ebuild/utils/newlib.so.in b/paludis/repositories/gentoo/ebuild/utils/newlib.so.in
index 0701351d8..0701351d8 100644
--- a/ebuild/utils/newlib.so.in
+++ b/paludis/repositories/gentoo/ebuild/utils/newlib.so.in
diff --git a/ebuild/utils/newman b/paludis/repositories/gentoo/ebuild/utils/newman
index 0dab5fc16..0dab5fc16 100644
--- a/ebuild/utils/newman
+++ b/paludis/repositories/gentoo/ebuild/utils/newman
diff --git a/ebuild/utils/newsbin b/paludis/repositories/gentoo/ebuild/utils/newsbin
index da94577f7..da94577f7 100644
--- a/ebuild/utils/newsbin
+++ b/paludis/repositories/gentoo/ebuild/utils/newsbin
diff --git a/ebuild/utils/prep.in b/paludis/repositories/gentoo/ebuild/utils/prep.in
index fcb64959d..fcb64959d 100644
--- a/ebuild/utils/prep.in
+++ b/paludis/repositories/gentoo/ebuild/utils/prep.in
diff --git a/ebuild/utils/run_test.bash b/paludis/repositories/gentoo/ebuild/utils/run_test.bash
index 1f9db4e38..1f9db4e38 100644
--- a/ebuild/utils/run_test.bash
+++ b/paludis/repositories/gentoo/ebuild/utils/run_test.bash
diff --git a/ebuild/work_around_broken_utilities.bash.in b/paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash.in
index cb97656b6..cb97656b6 100644
--- a/ebuild/work_around_broken_utilities.bash.in
+++ b/paludis/repositories/gentoo/ebuild/work_around_broken_utilities.bash.in
diff --git a/paludis/repositories/portage/ebuild_entries.cc b/paludis/repositories/gentoo/ebuild_entries.cc
index c0240fea2..122f72b2b 100644
--- a/paludis/repositories/portage/ebuild_entries.cc
+++ b/paludis/repositories/gentoo/ebuild_entries.cc
@@ -17,9 +17,9 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/ebuild_entries.hh>
-#include <paludis/repositories/portage/ebuild_flat_metadata_cache.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/ebuild_entries.hh>
+#include <paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 #include <paludis/dep_atom_flattener.hh>
 #include <paludis/ebuild.hh>
diff --git a/paludis/repositories/portage/ebuild_entries.hh b/paludis/repositories/gentoo/ebuild_entries.hh
index 711640598..7755081d4 100644
--- a/paludis/repositories/portage/ebuild_entries.hh
+++ b/paludis/repositories/gentoo/ebuild_entries.hh
@@ -20,8 +20,8 @@
 #ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH
 #define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH 1
 
-#include <paludis/repositories/portage/portage_repository_entries.hh>
-#include <paludis/repositories/portage/portage_repository_params.hh>
+#include <paludis/repositories/gentoo/portage_repository_entries.hh>
+#include <paludis/repositories/gentoo/portage_repository_params.hh>
 #include <paludis/util/private_implementation_pattern.hh>
 
 /** \file
diff --git a/paludis/repositories/portage/ebuild_flat_metadata_cache.cc b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
index e5873e4ed..e5873e4ed 100644
--- a/paludis/repositories/portage/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.cc
diff --git a/paludis/repositories/portage/ebuild_flat_metadata_cache.hh b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
index 34abf6e2c..3310eed89 100644
--- a/paludis/repositories/portage/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/gentoo/ebuild_flat_metadata_cache.hh
@@ -23,7 +23,7 @@
 #include <paludis/ebuild.hh>
 #include <paludis/util/fs_entry.hh>
 #include <paludis/version_metadata.hh>
-#include <paludis/repositories/portage/eclass_mtimes.hh>
+#include <paludis/repositories/gentoo/eclass_mtimes.hh>
 
 namespace paludis
 {
diff --git a/paludis/repositories/portage/eclass_mtimes.cc b/paludis/repositories/gentoo/eclass_mtimes.cc
index abc7e2018..abc7e2018 100644
--- a/paludis/repositories/portage/eclass_mtimes.cc
+++ b/paludis/repositories/gentoo/eclass_mtimes.cc
diff --git a/paludis/repositories/portage/eclass_mtimes.hh b/paludis/repositories/gentoo/eclass_mtimes.hh
index 1bfdc4630..1bfdc4630 100644
--- a/paludis/repositories/portage/eclass_mtimes.hh
+++ b/paludis/repositories/gentoo/eclass_mtimes.hh
diff --git a/paludis/repositories/portage/glsa.cc b/paludis/repositories/gentoo/glsa.cc
index 4bdcb0960..28ddd51a1 100644
--- a/paludis/repositories/portage/glsa.cc
+++ b/paludis/repositories/gentoo/glsa.cc
@@ -214,18 +214,18 @@ GLSA::create_from_xml_file(const std::string & filename)
 
 #  else
     if (0 == libxmlhandle.handle)
-        libxmlhandle.handle = dlopen("libpaludisportagerepositoryxmlthings.so",
+        libxmlhandle.handle = dlopen("libpaludisgentoorepositoryxmlthings.so",
                 RTLD_NOW | RTLD_GLOBAL);
     if (0 == libxmlhandle.handle)
         throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
-                + stringify(dlerror()) + "' when dlopen(libpaludisportagerepositoryxmlthings.so)");
+                + stringify(dlerror()) + "' when dlopen(libpaludisgentoorepositoryxmlthings.so)");
 
     if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
         libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(std::tr1::shared_ptr<GLSA> (*)(const std::string &),
                 dlsym(libxmlhandle.handle, "create_glsa_from_xml_file"));
     if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
         throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
-                + stringify(dlerror()) + "' when dlsym(libpaludisportagerepositoryxmlthings.so, create_glsa_from_xml_file)");
+                + stringify(dlerror()) + "' when dlsym(libpaludisgentoorepositoryxmlthings.so, create_glsa_from_xml_file)");
 
 #  endif
 #else
diff --git a/paludis/repositories/portage/glsa.hh b/paludis/repositories/gentoo/glsa.hh
index f85507895..69e7a57d5 100644
--- a/paludis/repositories/portage/glsa.hh
+++ b/paludis/repositories/gentoo/glsa.hh
@@ -31,7 +31,7 @@
 namespace paludis
 {
 
-#include <paludis/repositories/portage/glsa-sr.hh>
+#include <paludis/repositories/gentoo/glsa-sr.hh>
 
     /**
      * Thrown if a bad GLSA is found.
diff --git a/paludis/repositories/portage/glsa.sr b/paludis/repositories/gentoo/glsa.sr
index 359ffeeff..359ffeeff 100644
--- a/paludis/repositories/portage/glsa.sr
+++ b/paludis/repositories/gentoo/glsa.sr
diff --git a/paludis/repositories/portage/make_ebuild_repository.cc b/paludis/repositories/gentoo/make_ebuild_repository.cc
index 976c6b5df..97e37d646 100644
--- a/paludis/repositories/portage/make_ebuild_repository.cc
+++ b/paludis/repositories/gentoo/make_ebuild_repository.cc
@@ -21,7 +21,7 @@
 #include <paludis/util/log.hh>
 #include <paludis/util/collection_concrete.hh>
 #include <paludis/util/tokeniser.hh>
-#include <paludis/repositories/portage/portage_repository_exceptions.hh>
+#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
 #include <paludis/environment.hh>
 
 using namespace paludis;
diff --git a/paludis/repositories/portage/make_ebuild_repository.hh b/paludis/repositories/gentoo/make_ebuild_repository.hh
index 3fb748411..d3c771326 100644
--- a/paludis/repositories/portage/make_ebuild_repository.hh
+++ b/paludis/repositories/gentoo/make_ebuild_repository.hh
@@ -20,7 +20,7 @@
 #ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH
 #define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH 1
 
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 
 namespace paludis
 {
diff --git a/paludis/repositories/portage/portage_repository.cc b/paludis/repositories/gentoo/portage_repository.cc
index ed09904a7..850a66a50 100644
--- a/paludis/repositories/portage/portage_repository.cc
+++ b/paludis/repositories/gentoo/portage_repository.cc
@@ -20,14 +20,14 @@
 
 #include "config.h"
 
-#include <paludis/repositories/portage/portage_repository.hh>
-#include <paludis/repositories/portage/portage_repository_profile.hh>
-#include <paludis/repositories/portage/portage_repository_news.hh>
-#include <paludis/repositories/portage/portage_repository_sets.hh>
-#include <paludis/repositories/portage/portage_repository_exceptions.hh>
-#include <paludis/repositories/portage/portage_repository_entries.hh>
-#include <paludis/repositories/portage/portage_virtual_version_metadata.hh>
-#include <paludis/repositories/portage/use_desc.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository_profile.hh>
+#include <paludis/repositories/gentoo/portage_repository_news.hh>
+#include <paludis/repositories/gentoo/portage_repository_sets.hh>
+#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
+#include <paludis/repositories/gentoo/portage_repository_entries.hh>
+#include <paludis/repositories/gentoo/portage_virtual_version_metadata.hh>
+#include <paludis/repositories/gentoo/use_desc.hh>
 
 #include <paludis/config_file.hh>
 #include <paludis/dep_atom.hh>
@@ -73,7 +73,7 @@
 
 using namespace paludis;
 
-#include <paludis/repositories/portage/portage_repository-sr.cc>
+#include <paludis/repositories/gentoo/portage_repository-sr.cc>
 
 namespace paludis
 {
diff --git a/paludis/repositories/portage/portage_repository.hh b/paludis/repositories/gentoo/portage_repository.hh
index 1331388f2..26a080383 100644
--- a/paludis/repositories/portage/portage_repository.hh
+++ b/paludis/repositories/gentoo/portage_repository.hh
@@ -24,8 +24,8 @@
 #include <paludis/package_database.hh>
 #include <paludis/util/fs_entry.hh>
 #include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/repositories/portage/portage_repository_params.hh>
-#include <paludis/repositories/portage/portage_repository_profile.hh>
+#include <paludis/repositories/gentoo/portage_repository_params.hh>
+#include <paludis/repositories/gentoo/portage_repository_profile.hh>
 #include <string>
 
 /** \file
@@ -39,7 +39,7 @@ namespace paludis
     class PortageRepositoryProfile;
     class PortageRepositoryNews;
 
-#include <paludis/repositories/portage/portage_repository-sr.hh>
+#include <paludis/repositories/gentoo/portage_repository-sr.hh>
 
     /**
      * A PortageRepository is a Repository that handles the layout used by
diff --git a/paludis/repositories/portage/portage_repository.sr b/paludis/repositories/gentoo/portage_repository.sr
index 5f4c5156c..5f4c5156c 100644
--- a/paludis/repositories/portage/portage_repository.sr
+++ b/paludis/repositories/gentoo/portage_repository.sr
diff --git a/paludis/repositories/portage/portage_repository_TEST.cc b/paludis/repositories/gentoo/portage_repository_TEST.cc
index 396db9e65..3f8c7a382 100644
--- a/paludis/repositories/portage/portage_repository_TEST.cc
+++ b/paludis/repositories/gentoo/portage_repository_TEST.cc
@@ -17,8 +17,8 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/portage_repository.hh>
-#include <paludis/repositories/portage/make_ebuild_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
 #include <paludis/util/collection_concrete.hh>
 #include <paludis/environment/test/test_environment.hh>
 #include <paludis/util/system.hh>
diff --git a/paludis/repositories/portage/portage_repository_TEST_cleanup.sh b/paludis/repositories/gentoo/portage_repository_TEST_cleanup.sh
index 8c0b2902d..8c0b2902d 100755
--- a/paludis/repositories/portage/portage_repository_TEST_cleanup.sh
+++ b/paludis/repositories/gentoo/portage_repository_TEST_cleanup.sh
diff --git a/paludis/repositories/portage/portage_repository_TEST_setup.sh b/paludis/repositories/gentoo/portage_repository_TEST_setup.sh
index 5fc9373ba..5fc9373ba 100755
--- a/paludis/repositories/portage/portage_repository_TEST_setup.sh
+++ b/paludis/repositories/gentoo/portage_repository_TEST_setup.sh
diff --git a/paludis/repositories/portage/portage_repository_entries.cc b/paludis/repositories/gentoo/portage_repository_entries.cc
index 6abed92ba..6abed92ba 100644
--- a/paludis/repositories/portage/portage_repository_entries.cc
+++ b/paludis/repositories/gentoo/portage_repository_entries.cc
diff --git a/paludis/repositories/portage/portage_repository_entries.hh b/paludis/repositories/gentoo/portage_repository_entries.hh
index 2cee99324..bb85424d1 100644
--- a/paludis/repositories/portage/portage_repository_entries.hh
+++ b/paludis/repositories/gentoo/portage_repository_entries.hh
@@ -26,8 +26,8 @@
 #include <paludis/version_metadata.hh>
 #include <paludis/util/instantiation_policy.hh>
 #include <paludis/util/virtual_constructor.hh>
-#include <paludis/repositories/portage/portage_repository_profile.hh>
-#include <paludis/repositories/portage/portage_repository_params.hh>
+#include <paludis/repositories/gentoo/portage_repository_profile.hh>
+#include <paludis/repositories/gentoo/portage_repository_params.hh>
 #include <string>
 
 /** \file
diff --git a/paludis/repositories/portage/portage_repository_entry.cc b/paludis/repositories/gentoo/portage_repository_entry.cc
index ea568cd1f..ea568cd1f 100644
--- a/paludis/repositories/portage/portage_repository_entry.cc
+++ b/paludis/repositories/gentoo/portage_repository_entry.cc
diff --git a/paludis/repositories/portage/portage_repository_exceptions.cc b/paludis/repositories/gentoo/portage_repository_exceptions.cc
index f8e118697..f8e118697 100644
--- a/paludis/repositories/portage/portage_repository_exceptions.cc
+++ b/paludis/repositories/gentoo/portage_repository_exceptions.cc
diff --git a/paludis/repositories/portage/portage_repository_exceptions.hh b/paludis/repositories/gentoo/portage_repository_exceptions.hh
index 945182e5c..945182e5c 100644
--- a/paludis/repositories/portage/portage_repository_exceptions.hh
+++ b/paludis/repositories/gentoo/portage_repository_exceptions.hh
diff --git a/paludis/repositories/portage/portage_repository_news.cc b/paludis/repositories/gentoo/portage_repository_news.cc
index e8ec3fb28..4f89bac60 100644
--- a/paludis/repositories/portage/portage_repository_news.cc
+++ b/paludis/repositories/gentoo/portage_repository_news.cc
@@ -17,8 +17,8 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/portage_repository.hh>
-#include <paludis/repositories/portage/portage_repository_news.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository_news.hh>
 
 #include <paludis/config_file.hh>
 #include <paludis/environment.hh>
diff --git a/paludis/repositories/portage/portage_repository_news.hh b/paludis/repositories/gentoo/portage_repository_news.hh
index bd1b67d18..bd1b67d18 100644
--- a/paludis/repositories/portage/portage_repository_news.hh
+++ b/paludis/repositories/gentoo/portage_repository_news.hh
diff --git a/paludis/repositories/portage/portage_repository_params.cc b/paludis/repositories/gentoo/portage_repository_params.cc
index d52072565..eebc8f6cd 100644
--- a/paludis/repositories/portage/portage_repository_params.cc
+++ b/paludis/repositories/gentoo/portage_repository_params.cc
@@ -4,5 +4,5 @@
 
 using namespace paludis;
 
-#include <paludis/repositories/portage/portage_repository_params-sr.cc>
+#include <paludis/repositories/gentoo/portage_repository_params-sr.cc>
 
diff --git a/paludis/repositories/portage/portage_repository_params.hh b/paludis/repositories/gentoo/portage_repository_params.hh
index 058ef4eaf..cfb905390 100644
--- a/paludis/repositories/portage/portage_repository_params.hh
+++ b/paludis/repositories/gentoo/portage_repository_params.hh
@@ -36,7 +36,7 @@ namespace paludis
     class PackageDatabase;
     class PortageRepository;
 
-#include <paludis/repositories/portage/portage_repository_params-sr.hh>
+#include <paludis/repositories/gentoo/portage_repository_params-sr.hh>
 
 }
 
diff --git a/paludis/repositories/portage/portage_repository_params.sr b/paludis/repositories/gentoo/portage_repository_params.sr
index e741dc6ca..e741dc6ca 100644
--- a/paludis/repositories/portage/portage_repository_params.sr
+++ b/paludis/repositories/gentoo/portage_repository_params.sr
diff --git a/paludis/repositories/portage/portage_repository_profile.cc b/paludis/repositories/gentoo/portage_repository_profile.cc
index a411d9ca7..84b976f4a 100644
--- a/paludis/repositories/portage/portage_repository_profile.cc
+++ b/paludis/repositories/gentoo/portage_repository_profile.cc
@@ -17,9 +17,9 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/portage_repository_profile.hh>
-#include <paludis/repositories/portage/portage_repository_profile_file.hh>
-#include <paludis/repositories/portage/portage_repository_exceptions.hh>
+#include <paludis/repositories/gentoo/portage_repository_profile.hh>
+#include <paludis/repositories/gentoo/portage_repository_profile_file.hh>
+#include <paludis/repositories/gentoo/portage_repository_exceptions.hh>
 
 #include <paludis/util/log.hh>
 #include <paludis/util/tokeniser.hh>
diff --git a/paludis/repositories/portage/portage_repository_profile.hh b/paludis/repositories/gentoo/portage_repository_profile.hh
index e914b0a88..e914b0a88 100644
--- a/paludis/repositories/portage/portage_repository_profile.hh
+++ b/paludis/repositories/gentoo/portage_repository_profile.hh
diff --git a/paludis/repositories/portage/portage_repository_profile_file.cc b/paludis/repositories/gentoo/portage_repository_profile_file.cc
index 04fa13a52..04fa13a52 100644
--- a/paludis/repositories/portage/portage_repository_profile_file.cc
+++ b/paludis/repositories/gentoo/portage_repository_profile_file.cc
diff --git a/paludis/repositories/portage/portage_repository_profile_file.hh b/paludis/repositories/gentoo/portage_repository_profile_file.hh
index baa6552f6..baa6552f6 100644
--- a/paludis/repositories/portage/portage_repository_profile_file.hh
+++ b/paludis/repositories/gentoo/portage_repository_profile_file.hh
diff --git a/paludis/repositories/portage/portage_repository_sets.cc b/paludis/repositories/gentoo/portage_repository_sets.cc
index 0699cef3b..dfa8b5d20 100644
--- a/paludis/repositories/portage/portage_repository_sets.cc
+++ b/paludis/repositories/gentoo/portage_repository_sets.cc
@@ -18,9 +18,9 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/portage_repository.hh>
-#include <paludis/repositories/portage/portage_repository_sets.hh>
-#include <paludis/repositories/portage/glsa.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository_sets.hh>
+#include <paludis/repositories/gentoo/glsa.hh>
 
 #include <paludis/dep_list/dep_list.hh>
 #include <paludis/environment.hh>
diff --git a/paludis/repositories/portage/portage_repository_sets.hh b/paludis/repositories/gentoo/portage_repository_sets.hh
index 12cbabd62..12cbabd62 100644
--- a/paludis/repositories/portage/portage_repository_sets.hh
+++ b/paludis/repositories/gentoo/portage_repository_sets.hh
diff --git a/paludis/repositories/portage/portage_virtual_version_metadata.cc b/paludis/repositories/gentoo/portage_virtual_version_metadata.cc
index a10d4bc99..a10d4bc99 100644
--- a/paludis/repositories/portage/portage_virtual_version_metadata.cc
+++ b/paludis/repositories/gentoo/portage_virtual_version_metadata.cc
diff --git a/paludis/repositories/portage/portage_virtual_version_metadata.hh b/paludis/repositories/gentoo/portage_virtual_version_metadata.hh
index 79e602821..79e602821 100644
--- a/paludis/repositories/portage/portage_virtual_version_metadata.hh
+++ b/paludis/repositories/gentoo/portage_virtual_version_metadata.hh
diff --git a/paludis/repositories/portage/registration.cc b/paludis/repositories/gentoo/registration.cc
index 1b80763a6..9904b2cbc 100644
--- a/paludis/repositories/portage/registration.cc
+++ b/paludis/repositories/gentoo/registration.cc
@@ -18,7 +18,8 @@
  */
 
 #include <paludis/repositories/repository_maker.hh>
-#include <paludis/repositories/portage/make_ebuild_repository.hh>
+#include <paludis/repositories/gentoo/make_ebuild_repository.hh>
+#include <paludis/repositories/gentoo/vdb_repository.hh>
 #include <paludis/util/log.hh>
 #include "config.h"
 
@@ -55,6 +56,7 @@ void register_repositories(RepositoryMaker * maker)
 {
     maker->register_maker("ebuild", &make_ebuild_repository_wrapped);
     maker->register_maker("portage", &make_portage_repository);
+    maker->register_maker("vdb", &VDBRepository::make_vdb_repository);
 }
 
 #endif
diff --git a/paludis/repositories/portage/use_desc.cc b/paludis/repositories/gentoo/use_desc.cc
index 1899d867a..1899d867a 100644
--- a/paludis/repositories/portage/use_desc.cc
+++ b/paludis/repositories/gentoo/use_desc.cc
diff --git a/paludis/repositories/portage/use_desc.hh b/paludis/repositories/gentoo/use_desc.hh
index 64ffc0235..64ffc0235 100644
--- a/paludis/repositories/portage/use_desc.hh
+++ b/paludis/repositories/gentoo/use_desc.hh
diff --git a/paludis/repositories/vdb/vdb_repository.cc b/paludis/repositories/gentoo/vdb_repository.cc
index 38538fa8d..838d665ef 100644
--- a/paludis/repositories/vdb/vdb_repository.cc
+++ b/paludis/repositories/gentoo/vdb_repository.cc
@@ -17,8 +17,8 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/vdb/vdb_repository.hh>
-#include <paludis/repositories/vdb/vdb_version_metadata.hh>
+#include <paludis/repositories/gentoo/vdb_repository.hh>
+#include <paludis/repositories/gentoo/vdb_version_metadata.hh>
 
 #include <paludis/dep_atom.hh>
 #include <paludis/dep_atom_flattener.hh>
@@ -57,7 +57,7 @@
 
 using namespace paludis;
 
-#include <paludis/repositories/vdb/vdb_repository-sr.cc>
+#include <paludis/repositories/gentoo/vdb_repository-sr.cc>
 
 namespace
 {
diff --git a/paludis/repositories/vdb/vdb_repository.hh b/paludis/repositories/gentoo/vdb_repository.hh
index dff035581..ddf85d8f9 100644
--- a/paludis/repositories/vdb/vdb_repository.hh
+++ b/paludis/repositories/gentoo/vdb_repository.hh
@@ -34,7 +34,7 @@
 namespace paludis
 {
 
-#include <paludis/repositories/vdb/vdb_repository-sr.hh>
+#include <paludis/repositories/gentoo/vdb_repository-sr.hh>
 
     /**
      * A VDBRepository represents the /var/db/pkg database used for
diff --git a/paludis/repositories/vdb/vdb_repository.sr b/paludis/repositories/gentoo/vdb_repository.sr
index 48df1551a..48df1551a 100644
--- a/paludis/repositories/vdb/vdb_repository.sr
+++ b/paludis/repositories/gentoo/vdb_repository.sr
diff --git a/paludis/repositories/vdb/vdb_repository_TEST.cc b/paludis/repositories/gentoo/vdb_repository_TEST.cc
index c684ee06b..c684ee06b 100644
--- a/paludis/repositories/vdb/vdb_repository_TEST.cc
+++ b/paludis/repositories/gentoo/vdb_repository_TEST.cc
diff --git a/paludis/repositories/vdb/vdb_repository_TEST_cleanup.sh b/paludis/repositories/gentoo/vdb_repository_TEST_cleanup.sh
index e9f03a6b0..e9f03a6b0 100755
--- a/paludis/repositories/vdb/vdb_repository_TEST_cleanup.sh
+++ b/paludis/repositories/gentoo/vdb_repository_TEST_cleanup.sh
diff --git a/paludis/repositories/vdb/vdb_repository_TEST_setup.sh b/paludis/repositories/gentoo/vdb_repository_TEST_setup.sh
index 138a6b134..138a6b134 100755
--- a/paludis/repositories/vdb/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/gentoo/vdb_repository_TEST_setup.sh
diff --git a/paludis/repositories/vdb/vdb_version_metadata.cc b/paludis/repositories/gentoo/vdb_version_metadata.cc
index c5e3171a8..c5e3171a8 100644
--- a/paludis/repositories/vdb/vdb_version_metadata.cc
+++ b/paludis/repositories/gentoo/vdb_version_metadata.cc
diff --git a/paludis/repositories/vdb/vdb_version_metadata.hh b/paludis/repositories/gentoo/vdb_version_metadata.hh
index f22721bda..f22721bda 100644
--- a/paludis/repositories/vdb/vdb_version_metadata.hh
+++ b/paludis/repositories/gentoo/vdb_version_metadata.hh
diff --git a/paludis/repositories/portage/xml_things.cc b/paludis/repositories/gentoo/xml_things.cc
index 50ba25682..a54ac0719 100644
--- a/paludis/repositories/portage/xml_things.cc
+++ b/paludis/repositories/gentoo/xml_things.cc
@@ -19,7 +19,7 @@
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
-#include <paludis/repositories/portage/glsa.hh>
+#include <paludis/repositories/gentoo/glsa.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/util/join.hh>
 #include <paludis/config_file.hh>
diff --git a/paludis/repositories/portage/xml_things.hh b/paludis/repositories/gentoo/xml_things.hh
index 772def364..772def364 100644
--- a/paludis/repositories/portage/xml_things.hh
+++ b/paludis/repositories/gentoo/xml_things.hh
diff --git a/paludis/repositories/portage/xml_things_TEST.cc b/paludis/repositories/gentoo/xml_things_TEST.cc
index e993de067..76d8313fa 100644
--- a/paludis/repositories/portage/xml_things_TEST.cc
+++ b/paludis/repositories/gentoo/xml_things_TEST.cc
@@ -17,7 +17,7 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/portage/glsa.hh>
+#include <paludis/repositories/gentoo/glsa.hh>
 #include <paludis/util/join.hh>
 #include <test/test_framework.hh>
 #include <test/test_runner.hh>
diff --git a/paludis/repositories/portage/xml_things_TEST_cleanup.sh b/paludis/repositories/gentoo/xml_things_TEST_cleanup.sh
index 5e0843fa2..5e0843fa2 100755
--- a/paludis/repositories/portage/xml_things_TEST_cleanup.sh
+++ b/paludis/repositories/gentoo/xml_things_TEST_cleanup.sh
diff --git a/paludis/repositories/portage/xml_things_TEST_setup.sh b/paludis/repositories/gentoo/xml_things_TEST_setup.sh
index 530af804b..530af804b 100755
--- a/paludis/repositories/portage/xml_things_TEST_setup.sh
+++ b/paludis/repositories/gentoo/xml_things_TEST_setup.sh
diff --git a/paludis/repositories/vdb/Makefile.am b/paludis/repositories/vdb/Makefile.am
deleted file mode 100644
index e01432f8e..000000000
--- a/paludis/repositories/vdb/Makefile.am
+++ /dev/null
@@ -1,90 +0,0 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
-DISTCLEANFILES = vdb_repository-sr.hh vdb_repository-sr.cc
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\"
-
-paludis_repositories_libdir = $(libdir)/paludis/repositories
-
-if MONOLITHIC
-
-noinst_LTLIBRARIES = libpaludisvdbrepository.la
-
-else
-
-paludis_repositories_lib_LTLIBRARIES = libpaludisvdbrepository.la
-
-endif
-
-libpaludisvdbrepository_la_SOURCES = \
-	vdb_repository.cc \
-	vdb_repository.hh \
-	vdb_version_metadata.hh \
-	vdb_version_metadata.cc \
-	registration.cc
-
-libpaludisvdbrepository_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-paludis_repositories_vdb_includedir = $(includedir)/paludis/repositories/vdb/
-paludis_repositories_vdb_include_HEADERS = \
-	vdb_repository.hh \
-	vdb_version_metadata.hh \
-	vdb_repository-sr.hh
-
-if ! MONOLITHIC
-
-libpaludisvdbrepository_la_LIBADD = \
-	$(top_builddir)/paludis/libpaludis.la \
-	$(top_builddir)/paludis/util/libpaludisutil.la \
-	$(DYNAMIC_LD_LIBS)
-
-endif
-
-TESTS = vdb_repository_TEST
-
-vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
-
-vdb_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/test_extras.o \
-	$(top_builddir)/test/libtest.a \
-	$(top_builddir)/paludis/environment/test/libpaludistestenvironment.la \
-	libpaludisvdbrepository.la \
-	$(top_builddir)/paludis/libpaludis.la \
-	$(top_builddir)/paludis/util/libpaludisutil.la
-
-vdb_repository_TEST_CXXFLAGS = -I$(top_srcdir)
-
-EXTRA_DIST = \
-	vdb_repository_TEST.cc \
-	vdb_repository_TEST_setup.sh \
-	vdb_repository_TEST_cleanup.sh \
-	vdb_repository-sr.hh \
-	vdb_repository-sr.cc \
-	vdb_repository.sr
-
-BUILT_SOURCES = \
-	vdb_repository-sr.hh \
-	vdb_repository-sr.cc
-
-check_PROGRAMS = $(TESTS)
-check_SCRIPTS = vdb_repository_TEST_setup.sh vdb_repository_TEST_cleanup.sh
-
-TESTS_ENVIRONMENT = env \
-	PALUDIS_EBUILD_DIR="$(top_srcdir)/ebuild/" \
-	PALUDIS_SKIP_CONFIG="yes" \
-	PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
-	TEST_SCRIPT_DIR="$(srcdir)/" \
-	bash $(top_srcdir)/test/run_test.sh
-
-vdb_repository-sr.hh : vdb_repository.sr $(top_srcdir)/misc/make_sr.bash
-	$(top_srcdir)/misc/make_sr.bash --header $(srcdir)/vdb_repository.sr > $@
-
-vdb_repository-sr.cc : vdb_repository.sr $(top_srcdir)/misc/make_sr.bash
-	$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/vdb_repository.sr > $@
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/repositories/vdb/registration.cc b/paludis/repositories/vdb/registration.cc
deleted file mode 100644
index 95eb9a2fd..000000000
--- a/paludis/repositories/vdb/registration.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <paludis/repositories/repository_maker.hh>
-#include <paludis/repositories/vdb/vdb_repository.hh>
-#include "config.h"
-
-using namespace paludis;
-
-#ifndef MONOLITHIC
-
-extern "C"
-{
-    void register_repositories(RepositoryMaker * maker);
-}
-
-void register_repositories(RepositoryMaker * maker)
-{
-    maker->register_maker("vdb", &VDBRepository::make_vdb_repository);
-}
-
-#endif
-
-
diff --git a/ebuild/syncers/Makefile.am b/paludis/syncers/Makefile.am
index d58c4f7aa..d58c4f7aa 100644
--- a/ebuild/syncers/Makefile.am
+++ b/paludis/syncers/Makefile.am
diff --git a/ebuild/syncers/docvs.in b/paludis/syncers/docvs.in
index 9cce42cfa..9cce42cfa 100644
--- a/ebuild/syncers/docvs.in
+++ b/paludis/syncers/docvs.in
diff --git a/ebuild/syncers/dodarcs.in b/paludis/syncers/dodarcs.in
index 6281c4e80..6281c4e80 100644
--- a/ebuild/syncers/dodarcs.in
+++ b/paludis/syncers/dodarcs.in
diff --git a/ebuild/syncers/dogit.in b/paludis/syncers/dogit.in
index 70b73d798..70b73d798 100644
--- a/ebuild/syncers/dogit.in
+++ b/paludis/syncers/dogit.in
diff --git a/ebuild/syncers/dorsync.in b/paludis/syncers/dorsync.in
index 73b2640d4..73b2640d4 100644
--- a/ebuild/syncers/dorsync.in
+++ b/paludis/syncers/dorsync.in
diff --git a/ebuild/syncers/dosvn.in b/paludis/syncers/dosvn.in
index a7c0ff5df..a7c0ff5df 100644
--- a/ebuild/syncers/dosvn.in
+++ b/paludis/syncers/dosvn.in
diff --git a/ebuild/syncers/dotar.in b/paludis/syncers/dotar.in
index 9c62c336e..9c62c336e 100644
--- a/ebuild/syncers/dotar.in
+++ b/paludis/syncers/dotar.in
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 5fb4735cf..af84bb046 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -80,19 +80,19 @@ EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
 TESTS_ENVIRONMENT = env \
 	PALUDIS_NO_GLOBAL_HOOKS="yes" \
 	PALUDIS_NO_XTERM_TITLES="yes" \
-	PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
-	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
-	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+	PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
 	SYSCONFDIR="$(sysconfdir)" \
-	LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/portage/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
-			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`" \
+	LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
+			\`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs\`" \
 			| tr -d ' '` \
 	bash $(top_srcdir)/test/run_test.sh "$(RUBY) -I ./.libs/"
 
@@ -115,7 +115,7 @@ libpaludisruby_la_LIBADD = \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
 	$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+	$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
 	$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la \
 	$(top_builddir)/paludis/qa/libpaludisqa.la
@@ -130,7 +130,7 @@ libpaludisruby_la_LIBADD = \
 	$(top_builddir)/paludis/util/libpaludisutil.la \
 	$(top_builddir)/paludis/dep_list/libpaludisdeplist.la \
 	$(top_builddir)/paludis/repositories/libpaludisrepositories.la \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+	$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
 	$(top_builddir)/paludis/environment/default/libpaludisdefaultenvironment.la
 
diff --git a/ruby/paludis_ruby.hh b/ruby/paludis_ruby.hh
index f684d73ed..7c1c30140 100644
--- a/ruby/paludis_ruby.hh
+++ b/ruby/paludis_ruby.hh
@@ -33,7 +33,7 @@
 #include <paludis/util/fs_entry.hh>
 #include <paludis/environment.hh>
 #include <paludis/environment/no_config/no_config_environment.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/query.hh>
 
 #ifdef ENABLE_RUBY_QA
diff --git a/ruby/repository.cc b/ruby/repository.cc
index 2d55423cb..53a592aa8 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -20,7 +20,7 @@
 
 #include <paludis_ruby.hh>
 #include <paludis/repository.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/util/stringify.hh>
 #include <ruby.h>
 
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index 7757ce461..5f8c56153 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -48,7 +48,7 @@ adjutrix_SOURCES = \
 
 adjutrix_LDADD = \
 	$(top_builddir)/paludis/environment/no_config/libpaludisnoconfigenvironment.la \
-	$(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
+	$(top_builddir)/paludis/repositories/gentoo/libpaludisgentoorepository.la \
 	$(top_builddir)/paludis/repositories/fake/libpaludisfakerepository.la \
 	$(top_builddir)/paludis/tasks/libpaludistasks.a \
 	$(top_builddir)/paludis/libpaludis.la \
@@ -64,9 +64,9 @@ TESTS_ENVIRONMENT = env \
 	TEST_SCRIPT_DIR="$(srcdir)/" \
 	PALUDIS_NO_GLOBAL_HOOKS="yes" \
 	PALUDIS_NO_XTERM_TITLES="yes" \
-	PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
-	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
-	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+	PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
 	SYSCONFDIR="$(sysconfdir)" \
 	bash $(top_srcdir)/test/run_test.sh bash
 
diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index 8723c4840..e35a66917 100644
--- a/src/clients/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -21,7 +21,7 @@
 #include "command_line.hh"
 #include <output/colour.hh>
 #include <paludis/config_file.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/repositories/fake/fake_installed_repository.hh>
 #include <paludis/util/log.hh>
 #include <paludis/util/tokeniser.hh>
diff --git a/src/clients/adjutrix/display_profiles_use.cc b/src/clients/adjutrix/display_profiles_use.cc
index 9617264fc..ed68d7c79 100644
--- a/src/clients/adjutrix/display_profiles_use.cc
+++ b/src/clients/adjutrix/display_profiles_use.cc
@@ -21,7 +21,7 @@
 #include "command_line.hh"
 #include <output/colour.hh>
 #include <paludis/config_file.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/util/log.hh>
 #include <paludis/util/tokeniser.hh>
 #include <paludis/util/dir_iterator.hh>
diff --git a/src/clients/adjutrix/downgrade_check.cc b/src/clients/adjutrix/downgrade_check.cc
index 8e3254f4f..5c454897b 100644
--- a/src/clients/adjutrix/downgrade_check.cc
+++ b/src/clients/adjutrix/downgrade_check.cc
@@ -20,7 +20,7 @@
 #include "downgrade_check.hh"
 #include "command_line.hh"
 #include <paludis/query.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/util/sr.hh>
 #include <paludis/util/compare.hh>
 #include <paludis/util/tokeniser.hh>
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index c5410b60e..8d93477b8 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -23,7 +23,7 @@
 #include <paludis/util/tokeniser.hh>
 #include <paludis/util/compare.hh>
 #include <paludis/util/strip.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/repositories/fake/fake_installed_repository.hh>
 #include <paludis/dep_list/exceptions.hh>
 #include <paludis/dep_list/dep_list.hh>
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 0ff68ca08..f253b0cdc 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -80,9 +80,9 @@ TESTS_ENVIRONMENT = env \
 	PALUDIS_NO_GLOBAL_HOOKS="yes" \
 	PALUDIS_NO_XTERM_TITLES="yes" \
 	PALUDIS_OPTIONS="" \
-	PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
-	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
-	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
+	PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gentoo/ebuild/`" \
+	PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
 	SYSCONFDIR="$(sysconfdir)" \
 	bash $(top_srcdir)/test/run_test.sh bash
 
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index e7165d5eb..551413f71 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -20,7 +20,7 @@
 #include <paludis/args/args.hh>
 #include <paludis/paludis.hh>
 #include <paludis/qa/qa.hh>
-#include <paludis/repositories/portage/portage_repository.hh>
+#include <paludis/repositories/gentoo/portage_repository.hh>
 #include <paludis/util/join.hh>
 #include <paludis/util/dir_iterator.hh>
 #include <paludis/util/log.hh>