build: remove autotools based build

There can be only one!

74 files changed, 0 insertions, 7028 deletions

diff --git a/.gitignore b/.gitignore
index 398b10f02..2b05cb7e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,17 +11,7 @@
 *.loT
 .deps
 .libs
-*-se.cc
-*-se.hh
-*-sr.cc
-*-sr.hh
-*-nn.cc
-*-nn.hh
-Makefile.in
-Makefile
-*.1
 man-*
-.keep
 *.epicfail
 *_TEST_dir/
 *.tmp
@@ -34,16 +24,6 @@ tags
 !/paludis/repositories/e/ebuild/utils/newlib.a
 !/paludis/repositories/e/ebuild/utils/newlib.so
 
-/INSTALL
-/aclocal.m4
-/autom4te.cache
-/automake-deps-built-hack.tmp
-/config.h
-/config.h.in
-/config.log
-/config.status
-/config
-/configure
 /cscope.files
 /cscope.in.out
 /cscope.out
@@ -223,13 +203,6 @@ tags
 /doc/faq/stricter.html
 /doc/faq/toplinks.html.part
 /doc/faq/upgrades.html
-/doc/footer.html.part
-/doc/header.html.part
-/doc/index.html
-/doc/index.html.part
-/doc/news.html
-/doc/news.html.part
-/doc/news.subst
 /doc/overview/contact.html
 /doc/overview/features.html
 /doc/overview/footer.html.part
@@ -239,259 +212,5 @@ tags
 /doc/overview/pbins.html
 /doc/overview/toplinks.html.part
 /doc/toplinks.html.part
-/done-check
-/hooks/Makefile.am
 /hooks/eselect_env_update.bash
-/hooks/news.hook
 /image
-/libtool
-/paludis/Makefile.am
-/paludis/about.hh
-/paludis/about_TEST
-/paludis/args/args_TEST
-/paludis/broken_linkage_configuration_TEST
-/paludis/comma_separated_dep_parser_TEST
-/paludis/dep_spec_TEST
-/paludis/elike_dep_parser_TEST
-/paludis/elike_use_requirement_TEST
-/paludis/environment_implementation_TEST
-/paludis/environments/adapted/adapted_environment_TEST
-/paludis/environments/paludis/paludis_environment_TEST
-/paludis/environments/paludis/world_TEST
-/paludis/environments/portage/portage_environment_TEST
-/paludis/fetchers/doftp
-/paludis/fetchers/dohttp
-/paludis/fetchers/dohttps
-/paludis/filter_TEST
-/paludis/filtered_generator_TEST
-/paludis/fs_merger_TEST
-/paludis/fuzzy_finder_TEST
-/paludis/generator_TEST
-/paludis/hooker_TEST
-/paludis/host_tuple_name_TEST
-/paludis/ihateautomake.cc
-/paludis/name_TEST
-/paludis/paludis.hh
-/paludis/partitioning_TEST
-/paludis/repositories/accounts/accounts_repository_TEST
-/paludis/repositories/e/aa_visitor_TEST
-/paludis/repositories/e/dep_parser_TEST
-/paludis/repositories/e/dep_spec_pretty_printer_TEST
-/paludis/repositories/e/depend_rdepend_TEST
-/paludis/repositories/e/e_repository_TEST
-/paludis/repositories/e/e_repository_TEST_0
-/paludis/repositories/e/e_repository_TEST_1
-/paludis/repositories/e/e_repository_TEST_2
-/paludis/repositories/e/e_repository_TEST_3
-/paludis/repositories/e/e_repository_TEST_4
-/paludis/repositories/e/e_repository_TEST_5
-/paludis/repositories/e/e_repository_TEST_dependencies_rewriter
-/paludis/repositories/e/e_repository_TEST_ever
-/paludis/repositories/e/e_repository_TEST_exheres_0
-/paludis/repositories/e/e_repository_TEST_exlibs
-/paludis/repositories/e/e_repository_TEST_pbin
-/paludis/repositories/e/e_repository_TEST_phases
-/paludis/repositories/e/e_repository_TEST_replacing
-/paludis/repositories/e/e_repository_TEST_symlink_rewriting
-/paludis/repositories/e/e_repository_sets_TEST
-/paludis/repositories/e/ebuild_flat_metadata_cache_TEST
-/paludis/repositories/e/ebuild/utils/4/dohard
-/paludis/repositories/e/ebuild/utils/4/dosed
-/paludis/repositories/e/ebuild/utils/exheres-0/dohard
-/paludis/repositories/e/ebuild/utils/exheres-0/dohtml
-/paludis/repositories/e/ebuild/utils/exheres-0/donewins
-/paludis/repositories/e/ebuild/utils/exheres-0/dosed
-/paludis/repositories/e/ebuild/utils/exheres-0/ecompress
-/paludis/repositories/e/ebuild/utils/exheres-0/ecompressdir
-/paludis/repositories/e/ebuild/utils/exheres-0/fperms
-/paludis/repositories/e/ebuild/utils/exheres-0/fowners
-/paludis/repositories/e/ebuild/utils/exheres-0/install
-/paludis/repositories/e/ebuild/utils/exheres-0/prepall
-/paludis/repositories/e/ebuild/utils/exheres-0/prepalldocs
-/paludis/repositories/e/ebuild/utils/exheres-0/prepallinfo
-/paludis/repositories/e/ebuild/utils/exheres-0/prepallman
-/paludis/repositories/e/ebuild/utils/exheres-0/prepallstrip
-/paludis/repositories/e/ebuild/utils/exheres-0/prepdocs
-/paludis/repositories/e/ebuild/utils/exheres-0/prepinfo
-/paludis/repositories/e/ebuild/utils/exheres-0/prepman
-/paludis/repositories/e/ebuild/utils/exheres-0/prepstrip
-/paludis/repositories/e/ebuild/utils/kdebuild-1/dohard
-/paludis/repositories/e/ebuild/utils/kdebuild-1/dohtml
-/paludis/repositories/e/ebuild/utils/kdebuild-1/donewins
-/paludis/repositories/e/ebuild/utils/kdebuild-1/dosed
-/paludis/repositories/e/ebuild/utils/kdebuild-1/ecompress
-/paludis/repositories/e/ebuild/utils/kdebuild-1/ecompressdir
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepall
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepalldocs
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepallinfo
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepallman
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepallstrip
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepdocs
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepinfo
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepman
-/paludis/repositories/e/ebuild/utils/kdebuild-1/prepstrip
-/paludis/repositories/e/ebuild/utils/locked_pipe_command
-/paludis/repositories/e/ebuild/utils/prepall
-/paludis/repositories/e/ebuild/utils/prepalldocs
-/paludis/repositories/e/ebuild/utils/prepallinfo
-/paludis/repositories/e/ebuild/utils/prepallman
-/paludis/repositories/e/ebuild/utils/prepallstrip
-/paludis/repositories/e/ebuild/utils/prepdocs
-/paludis/repositories/e/ebuild/utils/prepinfo
-/paludis/repositories/e/ebuild/utils/prepman
-/paludis/repositories/e/ebuild/utils/prepstrip
-/paludis/repositories/e/ebuild/utils/print_exports
-/paludis/repositories/e/ebuild/utils/strip_tar_corruption
-/paludis/repositories/e/ebuild/utils/unpaxinate
-/paludis/repositories/e/exndbam_repository_TEST
-/paludis/repositories/e/fetch_visitor_TEST
-/paludis/repositories/e/fix_locked_dependencies_TEST
-/paludis/repositories/e/source_uri_finder_TEST
-/paludis/repositories/e/vdb_merger_TEST
-/paludis/repositories/e/vdb_repository_TEST
-/paludis/repositories/e/vdb_repository_TEST_eapis
-/paludis/repositories/e/vdb_repository_TEST_cache
-/paludis/repositories/e/vdb_unmerger_TEST
-/paludis/repositories/e/xml_things_TEST
-/paludis/repositories/fake/dep_parser_TEST
-/paludis/repositories/fake/fake_installed_repository_TEST
-/paludis/repositories/fake/fake_repository_TEST
-/paludis/repositories/unavailable/unavailable_repository_TEST
-/paludis/repositories/unpackaged/installed_repository_TEST
-/paludis/repositories/unpackaged/unpackaged_repository_TEST
-/paludis/repositories/unwritten/unwritten_repository_TEST
-/paludis/repository_name_cache_TEST
-/paludis/resolver/resolver_TEST_any
-/paludis/resolver/resolver_TEST_binaries
-/paludis/resolver/resolver_TEST_blockers
-/paludis/resolver/resolver_TEST_continue_on_failure
-/paludis/resolver/resolver_TEST_cycles
-/paludis/resolver/resolver_TEST_errors
-/paludis/resolver/resolver_TEST_fetches
-/paludis/resolver/resolver_TEST_promote_binaries
-/paludis/resolver/resolver_TEST_purges
-/paludis/resolver/resolver_TEST_serialisation
-/paludis/resolver/resolver_TEST_simple
-/paludis/resolver/resolver_TEST_subslots
-/paludis/resolver/resolver_TEST_suggestions
-/paludis/resolver/resolver_TEST_uninstalls
-/paludis/selection_TEST
-/paludis/set_file_TEST
-/paludis/stringify_formatter_TEST
-/paludis/stripper_TEST
-/paludis/stripper_TEST_binary
-/paludis/syncers/dobzr
-/paludis/syncers/dobzr+aftp
-/paludis/syncers/dobzr+file
-/paludis/syncers/dobzr+ftp
-/paludis/syncers/dobzr+http
-/paludis/syncers/dobzr+https
-/paludis/syncers/dobzr+lp
-/paludis/syncers/dobzr+sftp
-/paludis/syncers/dobzr+ssh
-/paludis/syncers/docvs+ext
-/paludis/syncers/docvs+pserver
-/paludis/syncers/docvs+ssh
-/paludis/syncers/dodarcs+file
-/paludis/syncers/dodarcs+http
-/paludis/syncers/dodarcs+https
-/paludis/syncers/dodarcs+ssh
-/paludis/syncers/dofile
-/paludis/syncers/dogit
-/paludis/syncers/dogit+file
-/paludis/syncers/dogit+http
-/paludis/syncers/dogit+https
-/paludis/syncers/dogit+rsync
-/paludis/syncers/dogit+ssh
-/paludis/syncers/dohg+file
-/paludis/syncers/dohg+http
-/paludis/syncers/dohg+https
-/paludis/syncers/dohg+ssh
-/paludis/syncers/dohg+static-http
-/paludis/syncers/dorsync
-/paludis/syncers/dorsync+ssh
-/paludis/syncers/dosvn
-/paludis/syncers/dosvn+file
-/paludis/syncers/dosvn+http
-/paludis/syncers/dosvn+https
-/paludis/syncers/dosvn+ssh
-/paludis/syncers/dotar+file
-/paludis/syncers/dotar+ftp
-/paludis/syncers/dotar+http
-/paludis/syncers/dotar+https
-/paludis/tar_merger_TEST
-/paludis/user_dep_spec_TEST
-/paludis/util/Makefile.am
-/paludis/util/action_queue_TEST
-/paludis/util/active_object_ptr_TEST
-/paludis/util/buffer_output_stream_TEST
-/paludis/util/byte_swap_TEST
-/paludis/util/condition_variable_TEST
-/paludis/util/config_file_TEST
-/paludis/util/create_iterator_TEST
-/paludis/util/damerau_levenshtein_TEST
-/paludis/util/deferred_construction_ptr_TEST
-/paludis/util/destringify_TEST
-/paludis/util/dir_iterator_TEST
-/paludis/util/echo_functions.bash
-/paludis/util/enum_iterator_TEST
-/paludis/util/extract_host_from_url_TEST
-/paludis/util/fs_entry_TEST
-/paludis/util/fs_iterator_TEST
-/paludis/util/fs_path_TEST
-/paludis/util/fs_stat_TEST
-/paludis/util/graph_TEST
-/paludis/util/hashes_TEST
-/paludis/util/indirect_iterator_TEST
-/paludis/util/is_file_with_extension_TEST
-/paludis/util/iterator_funcs_TEST
-/paludis/util/join_TEST
-/paludis/util/log_TEST
-/paludis/util/md5_TEST
-/paludis/util/member_iterator_TEST
-/paludis/util/mutex_TEST
-/paludis/util/options_TEST
-/paludis/util/outputwrapper
-/paludis/util/pool_TEST
-/paludis/util/pretty_print_TEST
-/paludis/util/process_TEST
-/paludis/util/pty_TEST
-/paludis/util/random_TEST
-/paludis/util/realpath_TEST
-/paludis/util/return_literal_function_TEST
-/paludis/util/rmd160_TEST
-/paludis/util/safe_ifstream_TEST
-/paludis/util/safe_ofstream_TEST
-/paludis/util/save_TEST
-/paludis/util/sha1_TEST
-/paludis/util/sha256_TEST
-/paludis/util/sha512_TEST
-/paludis/util/simple_parser_TEST
-/paludis/util/singleton_TEST
-/paludis/util/stream_holder_TEST
-/paludis/util/stringify_TEST
-/paludis/util/string_list_stream_TEST
-/paludis/util/strip_TEST
-/paludis/util/system_TEST
-/paludis/util/tail_output_stream_TEST
-/paludis/util/thread_TEST
-/paludis/util/thread_pool_TEST
-/paludis/util/tokeniser_TEST
-/paludis/util/tribool_TEST
-/paludis/util/util.hh
-/paludis/util/visitor_TEST
-/paludis/util/visitor_cast_TEST
-/paludis/util/whirlpool_TEST
-/paludis/util/wildcard_expander_TEST
-/paludis/util/wrapped_forward_iterator_TEST
-/paludis/util/wrapped_value_TEST
-/paludis/version_operator_TEST
-/paludis/version_spec_TEST
-/pkg-config/paludis.pc
-/src/clients/cave/cave
-/src/clients/cave/*.txt
-/src/clients/cave/*.xml
-/src/clients/cave/*.html-man-fragment
-/stamp-h1
-/test/test_fail_TEST
-/test/test_pass_TEST
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 19e8ef2b8..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-CLEANFILES = *~ done-check gmon.out *.gcov *.gcno  *.gcda *.loT \
-	automake-deps-dist-hack.tmp automake-deps-built-hack.tmp *.epicfail
-MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
-			config.h config.h.in INSTALL
-AUTOMAKE_OPTIONS = 1.11 dist-bzip2 no-dist-gzip foreign parallel-tests
-EXTRA_DIST = autogen.bash autotools_prepare.bash automake-deps-dist-hack.tmp
-SUBDIRS = . misc paludis python ruby src doc hooks vim bash-completion zsh-completion pkg-config
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-ruby --enable-ruby-doc --enable-vim \
-	--enable-python --enable-python-doc --enable-xml \
-	--with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir' \
-	--with-hacked-log-dir='$${DESTDIR}$${prefix}/log_dir' \
-	--with-repositories=default,accounts,gemcutter \
-	--with-environments=default,portage \
-	--with-clients=default,cave \
-	--with-default-distribution=giant-space-monkey \
-	--enable-search-index
-
-automake-deps-built-hack.tmp : built-sources-subdirs
-	touch $@
-
-BUILT_SOURCES = automake-deps-built-hack.tmp
-
-automake-deps-dist-hack.tmp : all
-	touch $@
-
-dist-hook :
-	rm $(distdir)/automake-deps-dist-hack.tmp
-
-doxygen : built-sources
-	$(MAKE) -C doc $@
-
-epydoc : all
-	$(MAKE) -C doc $@
-
-htmldocs :
-	$(MAKE) -C doc $@
-
-documentation : doxygen epydoc htmldocs
-	$(MAKE) -C doc $@
-
-check-local : all
-	touch $(top_builddir)/done-check
-
-install-data-local :
-	@[ -f $(top_builddir)/done-check ] || echo || true
-	@[ -f $(top_builddir)/done-check ] || echo "**************************************" || true
-	@[ -f $(top_builddir)/done-check ] || echo "Looks like you didn't run 'make check'" || true
-	@[ -f $(top_builddir)/done-check ] || echo "      No cookies for you today.       " || true
-	@[ -f $(top_builddir)/done-check ] || echo "**************************************" || true
-	@[ -f $(top_builddir)/done-check ] || echo || true
-
-built-sources : $(BUILT_SOURCES) built-sources-subdirs
-
-built-sources-subdirs :
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-all-then-check :
-	$(MAKE) all
-	$(MAKE) check
-
diff --git a/autogen.bash b/autogen.bash
deleted file mode 100755
index 4fad8d4ec..000000000
--- a/autogen.bash
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et tw=80 :
-
-if test "xyes" = x"${BASH_VERSION}" ; then
-    echo "This is not bash!"
-    exit 127
-fi
-
-trap 'echo "exiting." ; exit 250' 15
-KILL_PID=$$
-
-run() {
-    echo ">>> $@" 1>&2
-    if ! $@ ; then
-        echo "oops!" 1>&2
-        exit 127
-    fi
-}
-
-get() {
-    local p=${1} v=
-    shift
-
-    for v in ${@} ; do
-        type ${p}-${v}    &>/dev/null && echo ${p}-${v}    && return
-        type ${p}${v//.}  &>/dev/null && echo ${p}${v//.}  && return
-    done
-    type ${p}         &>/dev/null && echo ${p}         && return
-    echo "Could not find ${p}" 1>&2
-    kill $KILL_PID
-}
-
-./autotools_prepare.bash || exit $?
-run mkdir -p config
-run $(get libtoolize 1.5 ) --copy --force --automake
-rm -f config.cache
-run $(get aclocal 1.15 1.14 1.13 1.12 1.11 )
-run $(get autoheader 2.65 2.64 2.63 2.62 2.61 2.60 2.59 )
-run $(get autoconf 2.65 2.64 2.63 2.62 2.61 2.60 2.59 )
-run $(get automake 1.15 1.14 1.13 1.12 1.11 ) -a --copy
-
diff --git a/autotools_prepare.bash b/autotools_prepare.bash
deleted file mode 100755
index 8af91e940..000000000
--- a/autotools_prepare.bash
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et tw=80 :
-
-if test "xyes" = x"${BASH_VERSION}" ; then
-    echo "This is not bash!"
-    exit 127
-fi
-
-trap 'echo "exiting." ; exit 250' 15
-KILL_PID=$$
-
-misc/do_m4.bash paludis/Makefile.am.m4 paludis/Makefile.am || exit $?
-misc/do_m4.bash paludis/paludis.hh.m4 paludis/paludis.hh || exit $?
-misc/do_m4.bash paludis/util/util.hh.m4 paludis/util/util.hh || exit $?
-misc/do_m4.bash paludis/util/Makefile.am.m4 paludis/util/Makefile.am || exit $?
-misc/do_m4.bash hooks/Makefile.am.m4 hooks/Makefile.am || exit $?
-
diff --git a/bash-completion/Makefile.am b/bash-completion/Makefile.am
deleted file mode 100644
index be3bd6ce6..000000000
--- a/bash-completion/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-noinst_DATA = cave
-EXTRA_DIST = $(noinst_DATA)
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 77fa73c04..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,1298 +0,0 @@
-dnl vim: set sw=4 sts=4 ts=4 noet ft=config foldmethod=marker foldmarker={{{,}}} :
-
-dnl {{{ program, version
-m4_define([MAJOR_VERSION], [2])
-m4_define([MINOR_VERSION], [6])
-m4_define([MICRO_VERSION], [0])
-m4_define([SUFFIX], [])
-m4_define([FULL_VERSION],
-          m4_join([], m4_joinall([.], MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION),
-                  SUFFIX))
-
-AC_PREREQ([2.65])
-AC_INIT([paludis], [FULL_VERSION])
-AC_CONFIG_SRCDIR([paludis/paludis.hh])
-AC_CONFIG_AUX_DIR(config)
-AC_CANONICAL_BUILD
-AC_CANONICAL_HOST
-
-AC_SUBST([VERSION_MAJOR], MAJOR_VERSION)
-AC_SUBST([VERSION_MINOR], MINOR_VERSION)
-AC_SUBST([VERSION_MICRO], MICRO_VERSION)
-AC_SUBST([VERSION_FULL], FULL_VERSION)
-AC_SUBST([VERSION_SUFFIX], SUFFIX)
-
-VERSION_LIB_CURRENT=`expr 100 '*' $VERSION_MAJOR + $VERSION_MINOR`
-VERSION_LIB_REVISION="$VERSION_MICRO"
-AC_SUBST([VERSION_LIB_CURRENT])
-AC_SUBST([VERSION_LIB_REVISION])
-
-AM_INIT_AUTOMAKE
-AC_LANG([C++])
-
-PALUDIS_CXXFLAGS=
-PALUDIS_RUBY_CXXFLAGS=
-
-dnl {{{ git revision
-if test -d "${GIT_DIR:-${ac_top_srcdir:-./}/.git}" ; then
-	GITHEAD=`git describe 2>/dev/null`
-	if test -z ${GITHEAD} ; then
-		GITHEAD=`git rev-parse HEAD`
-	fi
-	if test -n "`git diff-index -m --name-only HEAD`" ; then
-		GITHEAD=${GITHEAD}-dirty
-	fi
-else
-	GITHEAD=
-fi
-AC_MSG_CHECKING([for git head])
-AC_ARG_WITH([git-head],
-	AS_HELP_STRING([--with-git-head], [Specify Git head]),
-	GITHEAD=`eval echo $withval`,
-	GITHEAD=`eval echo $GITHEAD`)
-AC_MSG_RESULT([$GITHEAD])
-AC_SUBST([GITHEAD])
-dnl }}}
-
-PALUDIS_PC_VERSION="${VERSION_FULL}"
-PALUDIS_PC_SLOT="${VERSION_MAJOR}.${VERSION_MINOR}${VERSION_SUFFIX}"
-
-if test x"$((VERSION_MINOR % 2))" = x"1" || test -n "${GITHEAD}" ; then
-	PALUDIS_PC_SLOT="${PALUDIS_PC_SLOT}_"`echo ${GITHEAD} | sed -e 's,\(........\(-dirty\)\?\)$,#\1,' -e 's,.*#,,'`
-fi
-
-AC_MSG_CHECKING([for slot])
-AC_MSG_RESULT([$PALUDIS_PC_SLOT])
-AC_SUBST([PALUDIS_PC_SLOT])
-
-PALUDIS_PC_CFLAGS=
-PALUDIS_PC_LIBS="-lpaludis_${PALUDIS_PC_SLOT} -lpaludisutil_${PALUDIS_PC_SLOT} -lpaludisargs_${PALUDIS_PC_SLOT}"
-dnl }}}
-
-dnl {{{ static?
-AC_DISABLE_STATIC
-AC_MSG_CHECKING([whether we're building shared libaries])
-AC_MSG_RESULT([$enable_shared])
-AC_MSG_CHECKING([whether we're building static libaries])
-AC_MSG_RESULT([$enable_static])
-dnl }}}
-
-dnl {{{ basic toolchain checks
-AC_PROG_CXX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-LT_INIT
-AC_PROG_MAKE_SET
-dnl }}}
-
-dnl {{{ make pkg-config work... dumb macro...
-PKG_PROG_PKG_CONFIG([0.9.0])
-dnl }}}
-
-need_xml_check=
-need_pcrecpp_check=
-need_libarchive_check=
-need_sqlite3_check=
-need_jansson_check=
-need_stripper_check=
-
-dnl {{{ we can use abi::__cxa_demangle
-AC_MSG_CHECKING([for abi::__cxa_demangle])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <cxxabi.h>
-int main(int, char **)
-{
-    int status(0);
-    char * const name(abi::__cxa_demangle(
-                "_ZN7paludis21CategoryNamePartErrorE", 0, 0, &status));
-}
-])],
-	[have_cxa_demangle=yes],
-	[have_cxa_demangle=no])
-AC_MSG_RESULT([$have_cxa_demangle])
-if test "x$have_cxa_demangle" = "xyes"; then
-   AC_DEFINE([HAVE_CXA_DEMANGLE], [1], [Include abi::__cxa_demangle support])
-fi
-dnl}}}
-
-dnl {{{ check for various misc functions.
-dnl It's probably possible to make many of these optional rather than
-dnl hard requirements. If any of these fail for you, send patches.
-AC_CHECK_FUNCS([alarm],        [], [AC_MSG_ERROR([I need alarm])])
-AC_CHECK_FUNCS([strerror],     [], [AC_MSG_ERROR([I need strerror])])
-AC_CHECK_FUNCS([signal],       [], [AC_MSG_ERROR([I need signal])])
-AC_CHECK_FUNCS([popen],        [], [AC_MSG_ERROR([I need popen])])
-AC_CHECK_FUNCS([posix_openpt], [], [AC_MSG_ERROR([I need posix_openpt])])
-AC_CHECK_FUNCS([grantpt],      [], [AC_MSG_ERROR([I need grantpt])])
-AC_CHECK_FUNCS([unlockpt],     [], [AC_MSG_ERROR([I need unlockpt])])
-AC_CHECK_FUNCS([pipe2],        [], [AC_MSG_ERROR([I need pipe2])])
-dnl }}}
-
-dnl {{{ check for ptsname_r or ptsname function
-AC_CHECK_FUNCS([ptsname_r],    [],
-	[AC_CHECK_FUNCS([ptsname], [], [AC_MSG_ERROR([I need ptsname_r or ptsname])])])
-dnl }}}
-
-dnl {{{ check for lchflags function
-AC_CHECK_FUNCS([lchflags])
-dnl }}}
-
-dnl {{{ check for utimensat
-AC_CHECK_FUNCS([utimensat])
-dnl }}}
-
-dnl {{{ check for listxattrf etc
-AC_MSG_CHECKING([for f*xattr function family])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <sys/xattr.h>
-
-int main(int, char **)
-{
-	flistxattr(0, 0, 0);
-	fgetxattr(0, 0, 0, 0);
-	fsetxattr(0, 0, 0, 0, 0);
-}
-])],
-	[AC_MSG_RESULT([yes])
-	 HAVE_XATTRS=yes],
-	[AC_MSG_RESULT([no])
-	 HAVE_XATTRS=])
-if test "x$HAVE_XATTRS" = "xyes"; then
-    AC_DEFINE([HAVE_XATTRS], [1], [Have xattrs support])
-fi
-dnl }}}
-
-dnl {{{ check for canonicalize_file_name function
-AC_CHECK_FUNCS([canonicalize_file_name])
-AM_CONDITIONAL(HAVE_CANONICALIZE_FILE_NAME, test x$ac_cv_func_canonicalize_file_name = xyes)
-if test "x$ac_cv_func_canonicalize_file_name" = "xyes"; then
-   AC_DEFINE([HAVE_CANONICALIZE_FILE_NAME], [1], [Use canonicalize_file_name])
-fi
-dnl }}}
-
-dnl {{{ check for dirent.d_type
-AC_MSG_CHECKING([for dirent.d_type])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <sys/types.h>
-#include <dirent.h>
-int main(int, char **)
-{
-	struct dirent dent;
-	dent.d_type = DT_LNK;
-}
-])],
-	[have_dirent_dtype=yes],
-	[have_dirent_dtype=no])
-AC_MSG_RESULT([$have_dirent_dtype])
-if test "x$have_dirent_dtype" = "xyes"; then
-    AC_DEFINE([HAVE_DIRENT_DTYPE], [1], [Use dirent.d_type])
-fi
-dnl }}}
-
-dnl {{{ check for fallocate
-AC_MSG_CHECKING([for fallocate])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <linux/falloc.h>
-int main(int, char **)
-{
-	fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 100);
-}
-])],
-	[have_fallocate=yes],
-	[have_fallocate=no])
-AC_MSG_RESULT([$have_fallocate])
-if test "x$have_fallocate" = "xyes"; then
-    AC_DEFINE([HAVE_FALLOCATE], [1], [Use fallocate])
-fi
-dnl }}}
-
-dnl {{{ check for cxxflags
-if test x = x"$LET_ME_RICE"
-then
-	AC_MSG_CHECKING([for go faster stripes])
-	for x in "enforce-eh" "fast-math" "rtti" "visibility" "znow" "std=" \
-		"align-functions=" "prefetch-loop-arrays" "Ofast"
-	do
-		if echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | grep "$x" >/dev/null ; then
-			flag=`echo "${LDFLAGS} ${CFLAGS} ${CXXFLAGS}" | tr ' ' '\n' | grep $x | tr '\n' ' '`
-			AC_MSG_RESULT([$flag])
-			AC_MSG_ERROR([Bad ricer. No bagel. Try again with non-broken compiler flags.])
-		fi
-	done
-	AC_MSG_RESULT([no])
-fi
-
-PTHREAD_LIBS=""
-RT_LIBS=""
-
-AC_MSG_CHECKING([whether -pthread -lpthread gets us posix threads])
-save_CXXFLAGS=$CXXFLAGS
-save_LDFLAGS=$LDFLAGS
-CXXFLAGS="$CXXFLAGS -pthread"
-LDFLAGS="$LDFLAGS -pthread -lpthread"
-AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <pthread.h>
-int main(int, char **)
-{
-	pthread_mutexattr_t attr;
-	pthread_mutexattr_init(&attr);
-	return 0;
-}
-])],
-[AC_MSG_RESULT([yes])],
-[AC_MSG_RESULT([no])
-AC_MSG_ERROR([do not know how to enable pthreads for your compiler])])
-CXXFLAGS=$save_CXXFLAGS
-LDFLAGS=$save_LDFLAGS
-PALUDIS_CXXFLAGS="$PALUDIS_CXXFLAGS -pthread"
-PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -pthread"
-PTHREAD_LIBS="-pthread -lpthread"
-PALUDIS_PC_LIBS="${PALUDIS_PC_LIBS} -pthread -lpthread"
-
-AC_MSG_CHECKING([how to get clock_gettime])
-AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <time.h>
-#include <sys/time.h>
-int main(int, char **)
-{
-	struct timespec t;
-	clock_gettime(CLOCK_REALTIME, &t);
-}
-])],
-	[AC_MSG_RESULT([already have it])],
-	[save_LIBS=$LIBS
-	LIBS="-lrt $LIBS"
-	AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <time.h>
-#include <sys/time.h>
-int main(int, char **)
-{
-	struct timespec t;
-	clock_gettime(CLOCK_REALTIME, &t);
-}
-	])],
-	[
-		AC_MSG_RESULT([-lrt])
-		RT_LIBS="-lrt"
-	],
-	[
-		AC_MSG_RESULT([don't know])
-		AC_MSG_ERROR([don't know how to get clock_gettime])
-	])
-	LIBS=$save_LIBS
-	])
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([RT_LIBS])
-
-PALUDIS_CXXFLAGS_NO_STRICT_ALIASING=
-
-AC_DEFUN([CHECK_CXXFLAG], [
-	save_CXXFLAGS=$CXXFLAGS
-	CXXFLAGS="$CXXFLAGS $PALUDIS_CXXFLAGS $1 -Werror"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <string>
-#include <iostream>
-template <typename T_> struct S { };
-int main(int, char **)
-{
-	std::string s("test");
-	std::cout << s << std::endl;
-}
-	])],
-	[cxxflag_success=yes],
-	[cxxflag_success=no])
-	CXXFLAGS="$save_CXXFLAGS"
-	if test "x$cxxflag_success" = "xyes" ; then
-		PALUDIS_CXXFLAGS="$PALUDIS_CXXFLAGS $1"
-		cxxflags_message="${cxxflags_message} $1"
-	fi
-	])
-
-if test "x${ac_cv_cxx_compiler_gnu}" = "xyes" ; then
-	CHECK_CXXFLAG([-Wall])
-	CHECK_CXXFLAG([-Wextra])
-	CHECK_CXXFLAG([-Wold-style-cast])
-	CHECK_CXXFLAG([-Wredundant-decls])
-	CHECK_CXXFLAG([-Wstrict-null-sentinel])
-	CHECK_CXXFLAG([-Wmissing-noreturn])
-	CHECK_CXXFLAG([-Woverloaded-virtual])
-	CHECK_CXXFLAG([-Winit-self])
-	CHECK_CXXFLAG([-Wunreachable-code])
-	CHECK_CXXFLAG([-Wunused])
-	CHECK_CXXFLAG([-Wshadow])
-	CHECK_CXXFLAG([-Wwrite-strings])
-	CHECK_CXXFLAG([-Wsignature-shadow])
-	CHECK_CXXFLAG([-Wfloat-equal])
-
-	CHECK_CXXFLAG([-Wno-ignored-qualifiers])
-	CHECK_CXXFLAG([-Wno-non-virtual-dtor])
-else
-	CHECK_CXXFLAG([-Wall])
-fi
-AC_MSG_RESULT([${cxxflags_message}])
-
-CHECK_CXXFLAG([-std=c++11])
-
-CHECK_CXXFLAG([-fvisibility=hidden])
-CHECK_CXXFLAG([-fvisibility-inlines-hidden])
-
-AC_SUBST([PALUDIS_CXXFLAGS])
-
-save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $PALUDIS_CXXFLAGS"
-dnl }}}
-
-dnl {{{ check for -O3 / extern template breakage
-AC_MSG_CHECKING([whether your compiler tries to inline extern template things])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-template <typename> struct F;
-template <typename X_> struct T
-{
-	void f();
-};
-
-template <typename X_>
-void T<X_>::f()
-{
-	F<X_>::g();
-}
-
-extern template class T<int>;
-
-int main(int, char **)
-{
-	T<int> f;
-	f.f();
-}
-])],
-	[AC_MSG_RESULT([no])],
-	[AC_MSG_RESULT([yes])
-	 AC_MSG_ERROR([Your compiler is b0rked (GCC bug 39242? Try -O2 or -fno-inline-functions)])])
-dnl }}}
-
-dnl {{{ check whether we do explicit instantiation of fully specialised templates
-AC_MSG_CHECKING([whether we should explicitly instantiate fully specialised templates])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-template <typename T_> struct S;
-template <> struct S<int> { };
-template class S<int>;
-])],
-	[AC_MSG_RESULT([yes])],
-	[AC_MSG_RESULT([no])
-	 PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} -DPALUDIS_NO_EXPLICIT_FULLY_SPECIALISED=1"
-	 PALUDIS_PC_CFLAGS="${PALUDIS_PC_CFLAGS} -DPALUDIS_NO_EXPLICIT_FULLY_SPECIALISED=1"
-	])
-dnl }}}
-
-CXXFLAGS="$save_CXXFLAGS"
-
-dnl {{{ disabling strict aliasing for boost bindings
-AC_MSG_CHECKING([how to disable strict aliasing when using dodgy Boost libraries])
-old_PALUDIS_CXXFLAGS=$PALUDIS_CXXFLAGS
-PALUDIS_CXXFLAGS=
-CHECK_CXXFLAG([-fno-strict-aliasing])
-AC_MSG_RESULT([$PALUDIS_CXXFLAGS])
-PALUDIS_CXXFLAGS_NO_STRICT_ALIASING=$PALUDIS_CXXFLAGS
-PALUDIS_CXXFLAGS=$old_PALUDIS_CXXFLAGS
-AC_SUBST([PALUDIS_CXXFLAGS_NO_STRICT_ALIASING])
-dnl }}}
-
-dnl {{{ compiler flags
-AC_MSG_CHECKING([for debugging flags to move from CXXFLAGS to PALUDIS_CXXFLAGS])
-cxxflags_g=
-cxxflags_rest=
-for flag in $CXXFLAGS ; do
-	if echo $flag | grep '^-g' >/dev/null ; then
-		cxxflags_g="${cxxflags_g} ${flag}"
-	else
-		cxxflags_rest="${cxxflags_rest} ${flag}"
-	fi
-done
-AC_MSG_RESULT([$cxxflags_g])
-CXXFLAGS=$cxxflags_rest
-AC_MSG_CHECKING([for new CXXFLAGS])
-AC_MSG_RESULT([$CXXFLAGS])
-PALUDIS_CXXFLAGS="${PALUDIS_CXXFLAGS} ${cxxflags_g}"
-AC_MSG_CHECKING([for new PALUDIS_CXXFLAGS])
-AC_MSG_RESULT([$PALUDIS_CXXFLAGS])
-dnl }}}
-
-dnl {{{ python binding support
-AC_MSG_CHECKING([whether we can turn off debugging to avoid pythons eating all your rams])
-old_PALUDIS_CXXFLAGS=$PALUDIS_CXXFLAGS
-PALUDIS_CXXFLAGS=
-CHECK_CXXFLAG([-g0])
-AC_MSG_RESULT([$PALUDIS_CXXFLAGS])
-PALUDIS_CXXFLAGS_NO_DEBUGGING=$PALUDIS_CXXFLAGS
-PALUDIS_CXXFLAGS=$old_PALUDIS_CXXFLAGS
-AC_SUBST([PALUDIS_CXXFLAGS_NO_DEBUGGING])
-dnl }}}
-
-dnl {{{ doxygen
-AC_MSG_CHECKING([whether to enable doxygen])
-AC_ARG_ENABLE([doxygen],
-			  AS_HELP_STRING([--enable-doxygen], [Enable 'make doxygen' (developer docs)]),
-			  [HAVE_DOXYGEN=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [AC_MSG_RESULT([autodetect])
-			   AC_CHECK_PROG(HAVE_DOXYGEN, [doxygen], [yes], [no])])
-AC_SUBST([HAVE_DOXYGEN])
-AM_CONDITIONAL([HAVE_DOXYGEN], test "x$HAVE_DOXYGEN" = "xyes")
-
-AC_MSG_CHECKING([whether to use external Doxygen tags])
-AC_ARG_ENABLE([doxygen-tags],
-			  AS_HELP_STRING([--enable-doxygen-tags], [Use 'wget' to fetch external Doxygen tags]),
-			  [HAVE_DOXYGEN_TAGS=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [AC_MSG_RESULT([no])])
-AC_SUBST([HAVE_DOXYGEN_TAGS])
-AM_CONDITIONAL([HAVE_DOXYGEN_TAGS], test "x$HAVE_DOXYGEN_TAGS" = "xyes")
-
-if test "x$HAVE_DOXYGEN_TAGS" = xyes ; then
-	DOXYGEN_TAG_FILES="\
-		\"libstdc++.tag = http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen\""
-else
-	DOXYGEN_TAG_FILES=""
-fi
-AC_SUBST([DOXYGEN_TAG_FILES])
-dnl }}}
-
-dnl {{{ asciidoc & xmlto
-AC_MSG_CHECKING([whether we are cross-compiling])
-if test "x$host" != "x$build" ; then
-	AC_MSG_RESULT([yes, build $build, host $host])
-	USE_PREBUILT_DOCUMENTATION=yes
-else
-	AC_MSG_RESULT([no])
-	USE_PREBUILT_DOCUMENTATION=no
-fi
-
-AM_CONDITIONAL([USE_PREBUILT_DOCUMENTATION], test "x$USE_PREBUILT_DOCUMENTATION" = "xyes")
-
-if test x$USE_PREBUILT_DOCUMENTATION = xno ; then
-	AC_CHECK_PROG(HAVE_ASCIIDOC, [asciidoc], [yes], [no])
-	if test "x$HAVE_ASCIIDOC" = xno ; then
-		AC_MSG_ERROR([asciidoc not found])
-	fi
-
-	AC_CHECK_PROG(HAVE_XMLTO, [xmlto], [yes], [no])
-	if test "x$HAVE_XMLTO" = xno ; then
-		AC_MSG_ERROR([xmlto not found])
-	fi
-	HAVE_HTMLTIDY=yes
-	AC_CHECK_PROG(HAVE_HTMLTIDY_WORKS, [tidy], [yes], [no])
-	if test "x$HAVE_HTMLTIDY_WORKS" = xno ; then
-		AC_MSG_ERROR(['tidy' does not work])
-	fi
-else
-	HAVE_ASCIIDOC=no
-	HAVE_XMLTO=no
-	HAVE_HTMLTIDY=no
-fi
-
-AC_SUBST([HAVE_ASCIIDOC])
-AM_CONDITIONAL([HAVE_ASCIIDOC], test "x$HAVE_ASCIIDOC" = "xyes")
-
-AC_SUBST([HAVE_XMLTO])
-AM_CONDITIONAL([HAVE_XMLTO], test "x$HAVE_XMLTO" = "xyes")
-
-AC_SUBST([HAVE_HTMLTIDY])
-AM_CONDITIONAL([HAVE_HTMLTIDY], test "x$HAVE_HTMLTIDY" = "xyes")
-dnl }}}
-
-dnl {{{ check for whether to build xml stuff
-AC_MSG_CHECKING([whether to build xml things for metadata.xml and GLSA support])
-AC_ARG_ENABLE([xml],
-			  AS_HELP_STRING([--enable-xml], [Build xml things for metadata.xml and GLSA support (needs libxml2)]),
-			  [ENABLE_XML=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [ENABLE_XML=no
-			   AC_MSG_RESULT([no])])
-if test x"$ENABLE_XML" = "xyes" ; then
-	need_xml_check=yes
-	AC_DEFINE([ENABLE_XML], [1], [Build xml support])
-fi
-AC_SUBST([ENABLE_XML])
-AM_CONDITIONAL([ENABLE_XML], test "x$ENABLE_XML" = "xyes")
-dnl }}}
-
-dnl {{{ check for whether to build stripping things
-AC_MSG_CHECKING([whether to build the stripper])
-AC_ARG_ENABLE([stripper],
-			  AS_HELP_STRING([--enable-stripper], [Build the stripper (needs libmagic from file)]),
-			  [ENABLE_STRIPPER=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [ENABLE_STRIPPER=yes
-			   AC_MSG_RESULT([yes])])
-if test x"$ENABLE_STRIPPER" = "xyes" ; then
-	need_stripper_check=yes
-	AC_DEFINE([ENABLE_STRIPPER], [1], [Build the stripper])
-fi
-AC_SUBST([ENABLE_STRIPPER])
-AM_CONDITIONAL([ENABLE_STRIPPER], test "x$ENABLE_STRIPPER" = "xyes")
-dnl }}}
-
-dnl {{{ libmagic check
-NEED_STRIPPER=$need_stripper_check
-if test "x$need_stripper_check" = "xyes" ; then
-	save_LIBS="$LIBS"
-	LIBS="$LIBS -lmagic"
-	AC_MSG_CHECKING([whether libmagic works])
-	AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <magic.h>
-int main() { magic_t m(magic_open(MAGIC_NONE)); }
-	])],
-		[AC_MSG_RESULT([yes])
-		 LIBS="$save_LIBS -lmagic"],
-		[AC_MSG_RESULT([no])
-		 AC_MSG_ERROR([libmagic is needed for stripping])
-		])
-	LIBS="$save_LIBS"
-	LIBMAGICDEPS_CFLAGS=
-	LIBMAGICDEPS_LIBS=-lmagic
-	AC_SUBST(LIBMAGICDEPS_CFLAGS)
-	AC_SUBST(LIBMAGICDEPS_LIBS)
-fi
-AC_SUBST([NEED_STRIPPER])
-AM_CONDITIONAL([NEED_STRIPPER], test "x$NEED_STRIPPER" = "xyes")
-dnl }}}
-
-dnl {{{ check for whether to build search index things
-AC_MSG_CHECKING([whether to build search index support])
-AC_ARG_ENABLE([search-index],
-			  AS_HELP_STRING([--enable-search-index], [Enable search index (needs sqlite3)]),
-			  [ENABLE_SEARCH_INDEX=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [ENABLE_SEARCH_INDEX=no
-			   AC_MSG_RESULT([no])])
-if test x"$ENABLE_SEARCH_INDEX" = "xyes" ; then
-	need_sqlite3_check=yes
-	AC_DEFINE([ENABLE_SEARCH_INDEX], [1], [Build search index support])
-fi
-AC_SUBST([ENABLE_SEARCH_INDEX])
-AM_CONDITIONAL([ENABLE_SEARCH_INDEX], test "x$ENABLE_SEARCH_INDEX" = "xyes")
-dnl }}}
-
-dnl {{{ colourschemes
-AC_MSG_CHECKING([whether we like pink])
-AC_ARG_ENABLE([pink],
-			  AS_HELP_STRING([--enable-pink], [Make it pink]),
-			[WANT_PINK=$enableval
-			 AC_MSG_RESULT([$enableval])
-			 if test x$enableval = xyes ; then
-				 COLOURSCHEME=pink
-			 else
-				 COLOURSCHEME=default
-			 fi
-			 ],
-			[WANT_PINK=no
-			 AC_MSG_RESULT([no :(])
-			 COLOURSCHEME=default])
-AM_CONDITIONAL([WANT_PINK], test "x$WANT_PINK" = "xyes")
-AC_SUBST([COLOURSCHEME])
-if test x"$WANT_PINK" = "xyes"; then
-	AC_DEFINE([PALUDIS_COLOUR_PINK], 1, [Are we pinkified?])
-else
-	AC_DEFINE([PALUDIS_COLOUR_PINK], 0)
-fi
-dnl }}}
-
-dnl {{{ Check for dlopen symbol and set DYNAMIC_LD_LIBS.
-dnl
-dnl AM_DL()
-dnl
-
-AC_CHECK_LIB(c, dlopen,
-[DYNAMIC_LD_LIBS=""
-have_dl=yes])
-
-if test x$have_dl != "xyes"; then
-AC_CHECK_LIB(dl, dlopen,
- [DYNAMIC_LD_LIBS="-ldl"
-  have_dl=yes])
-fi
-
-if test x$have_dl != "xyes"; then
-AC_MSG_ERROR(dynamic linker needed)
-fi
-
-AC_SUBST(DYNAMIC_LD_LIBS)
-
-dnl }}}
-
-dnl {{{ ruby interface
-AC_ARG_VAR(RUBY,path to ruby interpreter)
-AC_MSG_CHECKING([whether to build the ruby interface])
-AC_ARG_ENABLE([ruby],
-   AS_HELP_STRING([--enable-ruby], [Enable ruby interface (default: disable)]),
-   enable_ruby=$enableval,
-   enable_ruby=no)
-AC_MSG_RESULT($enable_ruby)
-
-if test "x$enable_ruby" = "xyes" ; then
-	AC_ARG_WITH([ruby-version],
-		AS_HELP_STRING([--with-ruby-version=2.3], [Specify Ruby version]),
-		RUBY_VERSION="$withval",
-		RUBY_VERSION="2.3")
-
-	case "$RUBY_VERSION" in
-		2.1|2.2|2.3)
-			;;
-		*)
-			AC_MSG_ERROR([Invalid ruby version specified])
-			;;
-	esac
-
-	PKG_CHECK_MODULES(RUBY, [ruby-$RUBY_VERSION], [
-		RUBY=`${PKG_CONFIG} --variable=ruby ruby-$RUBY_VERSION`
-		RUBY_SITEARCHDIR=`${PKG_CONFIG} --variable=sitearchdir ruby-$RUBY_VERSION`
-	], [
-		AC_MSG_ERROR([Ruby $RUBY_VERSION is required for --enable-ruby])
-	])
-
-	AC_ARG_WITH([ruby-install-dir],
-		AS_HELP_STRING([--with-ruby-install-dir=dir], [Specify Ruby installation dir]),
-		RUBY_INSTALL_DIR=`eval echo $withval`,
-		RUBY_INSTALL_DIR=)
-	AC_MSG_CHECKING([for Ruby installation dir])
-	if test "x$RUBY_INSTALL_DIR" = "x" ; then
-		RUBY_INSTALL_DIR=$RUBY_SITEARCHDIR
-	fi
-	AC_MSG_RESULT([$RUBY_INSTALL_DIR])
-
-	AC_SUBST([RUBY])
-	AC_SUBST([RUBY_INSTALL_DIR])
-
-	ruby_saved_CXXFLAGS="$CXXFLAGS"
-	ruby_saved_PALUDIS_CXXFLAGS="$PALUDIS_CXXFLAGS"
-	CHECK_CXXFLAG([-Wno-shadow])
-	CHECK_CXXFLAG([-Wno-redundant-decls])
-	CHECK_CXXFLAG([-Wno-old-style-cast])
-	PALUDIS_RUBY_CXXFLAGS="$PALUDIS_CXXFLAGS"
-	AC_SUBST([PALUDIS_RUBY_CXXFLAGS])
-	CXXFLAGS="$ruby_saved_CXXFLAGS"
-	PALUDIS_CXXFLAGS="$ruby_saved_PALUDIS_CXXFLAGS"
-fi
-AM_CONDITIONAL([ENABLE_RUBY], test "x$enable_ruby" = "xyes")
-dnl }}}
-
-dnl {{{ ruby documentation
-AC_MSG_CHECKING([whether to build the Ruby documentation])
-AC_ARG_ENABLE([ruby-doc],
-   AS_HELP_STRING([--enable-ruby-doc], [Enable Ruby documentation, requires --enable-ruby (default: disable)]),
-   enable_ruby_doc=$enableval,
-   enable_ruby_doc=no)
-
-if test "x$enable_ruby_doc" = "xyes" && test "x$enable_ruby" = "xno"; then
-	AC_MSG_ERROR([--enable-ruby-doc requires --enable-ruby])
-fi
-
-AC_MSG_RESULT($enable_ruby_doc)
-
-if test "x$enable_ruby_doc" = "xyes" ; then
-
-	AC_MSG_CHECKING([for syntax])
-	if $RUBY -rubygems -e "require 'syntax/convertors/html'" >/dev/null 2>/dev/null ; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_ERROR([syntax (http://syntax.rubyforge.org) is needed to build Ruby documentation])
-	fi
-fi
-AM_CONDITIONAL([ENABLE_RUBY_DOC], test "x$enable_ruby_doc" = "xyes")
-dnl }}}
-
-dnl {{{ python interface
-AC_ARG_VAR(PYTHON, path to python interpreter)
-AC_MSG_CHECKING([whether to build the python interface])
-AC_ARG_ENABLE([python],
-   AS_HELP_STRING([--enable-python], [Enable python interface (default: disable)]),
-   enable_python=$enableval,
-   enable_python=no)
-AC_MSG_RESULT($enable_python)
-
-if test "x$enable_python" = "xyes" ; then
-
-	AM_PATH_PYTHON([2.3])
-	if test "x$PYTHON" = "x" ; then
-		AC_MSG_ERROR([Python is required for --enable-python])
-	fi
-	AC_SUBST([PYTHON_INSTALL_DIR])
-
-	AC_MSG_CHECKING([whether your gcc is new enough to enable Python])
-	AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-#ifdef __GNUC__
-#  if __GNUC__ < 4
-#    error too old
-#  endif
-#endif
-	])],
-	[AC_MSG_RESULT([yes])],
-	[AC_MSG_RESULT([no])]
-	 AC_MSG_ERROR([Your gcc is too old for Python support]))
-
-	AC_MSG_CHECKING(for headers required to compile python extensions)
-	py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
-	py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
-	PYTHON_INCLUDE_DIR="${py_prefix}/include/python${PYTHON_VERSION}"
-	if test "$py_prefix" != "$py_exec_prefix"; then
-		PYTHON_INCLUDE_DIR="$PYTHON_INCLUDE_DIR -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-	fi
-	AC_MSG_RESULT([$PYTHON_INCLUDE_DIR])
-	AC_SUBST(PYTHON_INCLUDE_DIR)
-
-	dnl {{{ check for Python.h
-	AC_MSG_CHECKING([for Python.h])
-	save_CXXFLAGS="$CXXFLAGS"
-	CXXFLAGS="$CXXFLAGS -I$PYTHON_INCLUDE_DIR"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-	#include <Python.h>
-	])],
-		[AC_MSG_RESULT([yes])],
-		[AC_MSG_RESULT([no])
-		AC_MSG_ERROR([Python.h not found in $PYTHON_INCLUDE_DIR])])
-	dnl Restore the C++ flags
-	CXXFLAGS="$save_CXXFLAGS"
-	dnl }}}
-
-	AC_ARG_WITH([python-install-dir],
-		AS_HELP_STRING([--with-python-install-dir=dir], [Specify Python installation dir]),
-		PYTHON_INSTALL_DIR=`eval echo $withval`,
-		PYTHON_INSTALL_DIR=)
-	AC_MSG_CHECKING([for Python installation dir])
-	if test "x$PYTHON_INSTALL_DIR" = "x" ; then
-		PYTHON_INSTALL_DIR=$pyexecdir
-	fi
-	AC_MSG_RESULT([$PYTHON_INSTALL_DIR])
-
-	dnl {{{ we need boost.Python
-	AC_MSG_CHECKING([for boost.python])
-	save_CXXFLAGS="$CXXFLAGS"
-	CXXFLAGS="$CXXFLAGS -I$PYTHON_INCLUDE_DIR"
-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-	#include <boost/python.hpp>
-	struct Foo {};
-	BOOST_PYTHON_MODULE(foo)
-	{
-		boost::python::class_<Foo> ("Foo");
-	}
-	])],
-		[AC_MSG_RESULT([yes])],
-		[AC_MSG_RESULT([no])
-		AC_MSG_ERROR([boost.python (http://www.boost.org/libs/python/doc/) is required. If you think you have boost.python, \
-					  you may need to reinstall it if you have upgraded Python since installing Boost.])])
-	dnl Restore the C++ flags
-	CXXFLAGS="$save_CXXFLAGS"
-	dnl }}}
-
-	dnl {{{ check whether we need -lboost_python or -lboost_python-mt
-	AC_MSG_CHECKING([for boost.python library name])
-	save_CXXFLAGS="$CXXFLAGS"
-	save_LIBS="$LIBS"
-	CXXFLAGS="$CXXFLAGS -I$PYTHON_INCLUDE_DIR"
-	BOOST_PYTHON_LIB=
-	for lib in boost_python-$PYTHON_VERSION boost_python-$PYTHON_VERSION-mt boost_python boost_python-mt; do
-		LIBS="$LIBS -l$lib -lpython$PYTHON_VERSION"
-		AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <boost/python.hpp>
-int main() { boost::python::throw_error_already_set(); return 0; }
-		])],
-			[BOOST_PYTHON_LIB="-l$lib"
-			AC_MSG_RESULT([$BOOST_PYTHON_LIB])
-			break],
-			[LIBS="$save_LIBS"])
-	done
-	if test "x$BOOST_PYTHON_LIB" = x; then
-		AC_MSG_RESULT([not found])
-		AC_MSG_ERROR([Cannot work out how to link to boost.python. You may need to reinstall boost.python, especially \
-					  if you have upgraded Python since installing Boost.])
-	fi
-	AC_SUBST(BOOST_PYTHON_LIB)
-	dnl Restore the C++ flags
-	LIBS="$save_LIBS"
-	CXXFLAGS="$save_CXXFLAGS"
-	dnl }}}
-
-	AC_DEFINE([ENABLE_PYTHON], [1], [Enable Python])
-
-	dnl {{{ check whether to enable Python Hooks
-	AC_MSG_CHECKING([whether to enable Python Hooks])
-	BOOST_MIN_VERSION="103400"
-	AC_EGREP_CPP(enable,
-				 [#include <boost/version.hpp>
-				  #if BOOST_VERSION >= $BOOST_MIN_VERSION
-				  enable
-				  #endif
-				  ], enable_python_hooks=yes, enable_python_hooks=no)
-	if test $enable_python_hooks = "yes" ; then
-		AC_DEFINE([ENABLE_PYTHON_HOOKS], [1], [Enable Python Hooks])
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-	fi
-	dnl }}}
-fi
-AM_CONDITIONAL([ENABLE_PYTHON], test "x$enable_python" = "xyes")
-AM_CONDITIONAL([ENABLE_PYTHON_HOOKS], test "x$enable_python_hooks" = "xyes")
-dnl }}}
-
-dnl {{{ python documentation
-AC_MSG_CHECKING([whether to build the Python documentation])
-AC_ARG_ENABLE([python-doc],
-   AS_HELP_STRING([--enable-python-doc], [Enable Python documentation, requires --enable-python (default: disable)]),
-   enable_python_doc=$enableval,
-   enable_python_doc=no)
-
-if test "x$enable_python_doc" = "xyes" && test "x$enable_python" = "xno"; then
-	AC_MSG_ERROR([--enable-python-doc requires --enable-python])
-fi
-
-AC_MSG_RESULT($enable_python_doc)
-
-if test "x$enable_python_doc" = "xyes" ; then
-	AC_CHECK_PROGS(SPHINX_BUILD, [sphinx-build], [no])
-	if test "x$SPHINX_BUILD" = "xno" ; then
-		AC_MSG_ERROR([sphinx-build (http://sphinx-doc.org/) is needed to build Python documentation])
-	fi
-fi
-AM_CONDITIONAL([ENABLE_PYTHON_DOC], test "x$enable_python_doc" = "xyes")
-dnl }}}
-
-dnl {{{ vim
-AC_MSG_CHECKING([whether to install Vim scripts])
-AC_ARG_ENABLE([vim],
-			  AS_HELP_STRING([--enable-vim], [Enable Vim extras]),
-			  [HAVE_VIM=$enableval
-			   AC_MSG_RESULT([$enableval])],
-			  [AC_MSG_RESULT([no])
-			   HAVE_VIM=no])
-VIM_INSTALL_DIR=
-if test x$HAVE_VIM = xyes ; then
-	AC_MSG_CHECKING([for Vim installation dir])
-	AC_ARG_WITH([vim-install-dir],
-		AS_HELP_STRING([--with-vim-install-dir=dir], [Specify Vim installation dir]),
-		VIM_INSTALL_DIR=`eval echo $withval`,
-		VIM_INSTALL_DIR=`eval echo $datadir/vim/vimfiles`)
-	AC_MSG_RESULT([$VIM_INSTALL_DIR])
-fi
-AC_SUBST([HAVE_VIM])
-AM_CONDITIONAL([HAVE_VIM], test "x$HAVE_VIM" = "xyes")
-AC_SUBST([VIM_INSTALL_DIR])
-dnl }}}
-
-dnl {{{ repositories
-m4_define(ALL_REPOSITORIES_m4, [accounts,e,fake,gemcutter,repository,unavailable,unpackaged,unwritten])
-ALL_REPOSITORIES=`echo ALL_REPOSITORIES_m4 | tr , ' '`
-DEFAULT_REPOSITORIES="e fake repository unavailable unpackaged unwritten"
-AC_MSG_CHECKING([which repositories to build...])
-AC_ARG_WITH([repositories],
-			[  --with-repositories=foo,bar,...
-			  Build the specified repositories:
-			  all             All available repositories
-			  default         Equivalent to e,fake,unavailable,unpackaged,unwritten
-
-			  accounts        Account management (requires distribution support)
-			  e               Ebuild, Ebin, Exheres, VDB etc
-			  fake            A fake repository for test cases
-			  gemcutter       Gemcutter for Ruby
-			  repository      Automatic repository config generation (via 'unavailable')
-			  unavailable     Unavailable
-			  unpackaged      Unpackaged (for cave import)
-			  unwritten       Unwritten],
-			[repositories="`echo $with_repositories | tr ',' ' '`"],
-			[repositories="$DEFAULT_REPOSITORIES"])
-repositories=`echo $repositories | tr ' ' '\n' \
-	| sed -e "s,^default\$,$DEFAULT_REPOSITORIES," \
-	| sed -e "s,^all\$,$ALL_REPOSITORIES," \
-	| tr ' ' '\n' | sort -u | tr '\n' ' '`
-AC_MSG_RESULT([$repositories])
-BUILD_REPOSITORIES="$repositories"
-AC_SUBST([ALL_REPOSITORIES])
-AC_SUBST([BUILD_REPOSITORIES])
-
-for r in e fake ; do
-	if ! echo $repositories | tr ' ' '\n' | grep "^$r\$" >/dev/null ; then
-		AC_MSG_ERROR([Building without $r repository is unsupported])
-	fi
-done
-
-AC_DEFUN([REPOSITORY_GROUP_IF], [
-enable_$1_repository=
-if echo $repositories | tr ' ' '\n' | grep '^$1$' >/dev/null ; then
-	enable_$1_repository=yes
-	AC_DEFINE_UNQUOTED([REPOSITORY_GROUP_IF_$1], [$1], [The $1 repository])
-	AC_DEFINE_UNQUOTED(ENABLE_[]m4_translit($1, [a-z], [A-Z])_REPOSITORY, [1], [Enable $1 repository])
-else
-	AC_DEFINE_UNQUOTED([REPOSITORY_GROUP_IF_$1], [], [Do not have the $1 repository])
-fi
-AM_CONDITIONAL(ENABLE_[]m4_translit($1, [a-z], [A-Z])_REPOSITORY, test "x$enable_$1_repository" = "xyes")
-	])
-
-m4_foreach(reponame, [ALL_REPOSITORIES_m4], [
-REPOSITORY_GROUP_IF(reponame)
-])
-
-AC_DEFINE_UNQUOTED(REPOSITORY_GROUPS_DECLS,
-	m4_foreach(reponame,
-			[ALL_REPOSITORIES_m4],
-			[ struct reponame; ] ) struct semicolon_goes_where { },
-	[Our repository groups])
-
-dnl make sure the code works even if everything's enabled
-REPOSITORY_GROUP_IF(dummy)
-
-if echo $repositories | tr ' ' '\n' | grep '^gemcutter$' >/dev/null ; then
-	need_jansson_check=yes
-fi
-dnl }}}
-
-dnl {{{ environments
-m4_define(ALL_ENVIRONMENTS_m4, [paludis,portage,test])
-ALL_ENVIRONMENTS=`echo ALL_ENVIRONMENTS_m4 | tr , ' '`
-DEFAULT_ENVIRONMENTS="paludis test"
-AC_MSG_CHECKING([which environments to build...])
-AC_ARG_WITH([environments],
-			[  --with-environments=foo,bar,...
-			  Build the specified environments:
-			  all             All available environments
-			  default         Equivalent to paludis,test
-
-			  paludis         Standard Paludis environments
-			  portage         Portage configuration (dodgy)
-			  test            For test cases],
-			[environments="`echo $with_environments | tr ',' ' '`"],
-			[environments="$DEFAULT_ENVIRONMENTS"])
-environments=`echo $environments | tr ' ' '\n' \
-	|sed -e "s,^default\$,$DEFAULT_ENVIRONMENTS," \
-	|sed -e "s,^all\$,$ALL_ENVIRONMENTS," \
-	| tr ' ' '\n' | sort -u | tr '\n' ' '`
-AC_MSG_RESULT([$environments])
-BUILD_ENVIRONMENTS="$environments"
-AC_SUBST([ALL_ENVIRONMENTS])
-AC_SUBST([BUILD_ENVIRONMENTS])
-
-AC_DEFUN([ENVIRONMENT_GROUP_IF], [
-enable_$1_environment=
-if echo $environments | tr ' ' '\n' | grep '^$1$' >/dev/null ; then
-	enable_$1_environment=yes
-	AC_DEFINE_UNQUOTED([ENVIRONMENT_GROUP_IF_$1], [environment_groups::$1], [The $1 environment])
-	AC_DEFINE_UNQUOTED(ENABLE_[]m4_translit($1, [a-z], [A-Z])_ENVIRONMENT, [1], [Enable $1 environment])
-else
-	AC_DEFINE_UNQUOTED([ENVIRONMENT_GROUP_IF_$1], [], [Do not have the $1 environment])
-fi
-AM_CONDITIONAL(ENABLE_[]m4_translit($1, [a-z], [A-Z])_ENVIRONMENT, test "x$enable_$1_environment" = "xyes")
-	])
-
-m4_foreach(envname, [ALL_ENVIRONMENTS_m4], [
-ENVIRONMENT_GROUP_IF(envname)
-])
-
-AC_DEFINE_UNQUOTED(ENVIRONMENT_GROUPS_DECLS,
-	m4_foreach(envname,
-			[ALL_ENVIRONMENTS_m4],
-			[ struct envname; ] ) struct semicolon_goes_where { },
-	[Our environment groups])
-
-dnl make sure the code works even if everything's enabled
-ENVIRONMENT_GROUP_IF(dummy)
-
-dnl }}}
-
-dnl {{{ distribution
-AC_MSG_CHECKING([for default distribution])
-AC_ARG_WITH([default-distribution],
-	AS_HELP_STRING([--with-default-distribution=distro], [Specify default distribution name]),
-	DEFAULT_DISTRIBUTION=`eval echo $withval`,
-	DEFAULT_DISTRIBUTION=gentoo)
-AC_MSG_RESULT([$DEFAULT_DISTRIBUTION])
-AC_SUBST([DEFAULT_DISTRIBUTION])
-AC_DEFINE_UNQUOTED([DEFAULT_DISTRIBUTION], "$DEFAULT_DISTRIBUTION", [Default distribution name])
-dnl }}}
-
-dnl {{{ clients
-ALL_CLIENTS="cave"
-ALL_CLIENTS_HTML=""
-for a in $ALL_CLIENTS ; do
-	ALL_CLIENTS_HTML="$ALL_CLIENTS_HTML $a.html"
-done
-DEFAULT_CLIENTS="cave"
-AC_MSG_CHECKING([which clients to build...])
-AC_ARG_WITH([clients],
-			[  --with-clients=foo,bar,...
-			  Build the specified clients:
-			  all             All available clients
-			  default         Equivalent to cave
-
-			  cave            The modular Paludis client],
-			[clients="`echo $with_clients | tr ',' ' '`"],
-			[clients="$DEFAULT_CLIENTS"])
-clients=`echo $clients | tr ' ' '\n' \
-	| sed -e "s,^default\$,$DEFAULT_CLIENTS," \
-	| sed -e "s,^all\$,$ALL_CLIENTS," \
-	| tr ' ' '\n' | sort -u | tr '\n' ' '`
-AC_MSG_RESULT([$clients])
-BUILD_CLIENTS="$clients"
-AC_SUBST([ALL_CLIENTS])
-AC_SUBST([ALL_CLIENTS_HTML])
-AC_SUBST([BUILD_CLIENTS])
-
-if echo $clients | tr ' ' '\n' | grep '^cave$' >/dev/null ; then
-	need_pcrecpp_check=yes
-fi
-dnl }}}
-
-dnl {{{ pbin support
-
-AC_MSG_CHECKING([whether to build pbins])
-AC_ARG_ENABLE([pbins],
-			  AS_HELP_STRING([--enable-pbins], [Enable pbins (nonfunctional, for development only)]),
-			  [ENABLE_PBINS=$enableval
-			   enable_pbins=$enableval],
-			  [ENABLE_PBINS=no
-			   enable_pbins=no])
-AC_MSG_RESULT([$ENABLE_PBINS])
-AC_SUBST([ENABLE_PBINS])
-AM_CONDITIONAL([ENABLE_PBINS], test "x$enable_pbins" = "xyes")
-if test x"$ENABLE_PBINS" = "xyes" ; then
-	AC_DEFINE([ENABLE_PBINS], [1], [Build pbin support])
-	need_libarchive_check=yes
-fi
-
-dnl }}}
-
-dnl {{{ gtest
-
-AC_MSG_CHECKING([whether to run tests that require Google Test])
-AC_ARG_ENABLE([gtest],
-	AS_HELP_STRING([--enable-gtest], [Run tests that require Google Test]),
-	[HAVE_GTEST=$enableval
-	 AC_MSG_RESULT([$enableval])],
-	[HAVE_GTEST=yes
-	 AC_MSG_RESULT([yes])])
-AC_SUBST([HAVE_GTEST])
-AM_CONDITIONAL([HAVE_GTEST], test "x$HAVE_GTEST" = "xyes")
-
-if test "x$HAVE_GTEST" = "xyes" ; then
-	AC_CHECK_PROG(HAVE_GTEST_CONFIG, [gtest-config], [yes], [no])
-	if test "x$HAVE_GTEST_CONFIG" = xno ; then
-		AC_MSG_ERROR([gtest-config from Google Test not found, but --disable-gtest was not used])
-	fi
-
-	GTESTDEPS_CXXFLAGS=`gtest-config --cxxflags`
-	GTESTDEPS_LDFLAGS=`gtest-config --ldflags`
-	GTESTDEPS_LIBS=`gtest-config --libs`
-	AC_SUBST(GTESTDEPS_CXXFLAGS)
-	AC_SUBST(GTESTDEPS_LDFLAGS)
-	AC_SUBST(GTESTDEPS_LIBS)
-fi
-
-dnl }}}
-
-dnl {{{ libxml2 check
-NEED_XML=$need_xml_check
-if test "x$need_xml_check" = "xyes" ; then
-	PKG_CHECK_MODULES(LIBXML2DEPS, [libxml-2.0 >= 2.6], [],
-		[AC_MSG_ERROR([libxml2 (http://xmlsoft.org/) is required if --enable-xml is used])])
-	AC_SUBST(LIBXML2DEPS_CFLAGS)
-	AC_SUBST(LIBXML2DEPS_LIBS)
-fi
-AC_SUBST([NEED_XML])
-AM_CONDITIONAL([NEED_XML], test "x$NEED_XML" = "xyes")
-dnl }}}
-
-dnl {{{ pcrecpp check
-if test "x$need_pcrecpp_check" = "xyes" ; then
-	PKG_CHECK_MODULES(PCRECPPDEPS, [libpcrecpp >= 7.8], [],
-		[AC_MSG_ERROR([pcrecpp (http://www.pcre.org/) is required if --with-clients=cave is used])])
-	AC_SUBST(PCRECPPDEPS_CFLAGS)
-	AC_SUBST(PCRECPPDEPS_LIBS)
-fi
-dnl }}}
-
-dnl {{{ libarchive
-libarchive_does_gnutar=no
-if test "x$need_libarchive_check" = "xyes" ; then
-	PKG_CHECK_MODULES(
-		LIBARCHIVE, [libarchive >= 3.0.4],
-		[AC_MSG_RESULT([yes])],
-		[AC_MSG_ERROR([libarchive >= 3.0.4 is required for pbins])])
-fi
-dnl }}}
-
-dnl {{{ sqlite3 check
-NEED_SQLITE3=$need_sqlite3_check
-if test "x$need_sqlite3_check" = "xyes" ; then
-	PKG_CHECK_MODULES(SQLITE3DEPS, [sqlite3], [],
-		[AC_MSG_ERROR([sqlite3 is required if --enable-search-index is used])])
-	AC_SUBST(SQLITE3_CFLAGS)
-	AC_SUBST(SQLITE3_LIBS)
-fi
-AC_SUBST([NEED_SQLITE3])
-AM_CONDITIONAL([NEED_SQLITE3], test "x$NEED_SQLITE3" = "xyes")
-dnl }}}
-
-dnl {{{ jansson check
-NEED_JANSSON=$need_jansson_check
-if test "x$need_jansson_check" = "xyes" ; then
-	PKG_CHECK_MODULES(JANSSONDEPS, [jansson], [],
-		[AC_MSG_ERROR([jansson is required if --with-repositories=gemcutter])])
-	AC_SUBST(JANSSON_CFLAGS)
-	AC_SUBST(JANSSON_LIBS)
-fi
-AC_SUBST([NEED_JANSSON])
-AM_CONDITIONAL([NEED_JANSSON], test "x$NEED_JANSSON" = "xyes")
-dnl }}}
-
-dnl {{{ eselect or eclectic
-AC_MSG_CHECKING([for config framework])
-AC_ARG_WITH([config-framework],
-	AS_HELP_STRING([--with-config-framework=@<:@eselect|eclectic@:>@],
-				   [Specify whether to use eselect or eclectic (default: auto)]),
-	CONFIG_FRAMEWORK=`eval echo $withval`,
-	CONFIG_FRAMEWORK=auto)
-
-if test x"$CONFIG_FRAMEWORK" = x"auto" ; then
-	eclectic=`which eclectic 2>/dev/null`
-	if test -n "$eclectic" && test -x "$eclectic" ; then
-		CONFIG_FRAMEWORK="eclectic"
-	else
-		CONFIG_FRAMEWORK="eselect"
-	fi
-fi
-
-if $CONFIG_FRAMEWORK version >/dev/null 2>/dev/null ; then
-	AC_MSG_RESULT([$CONFIG_FRAMEWORK])
-else
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([eselect or eclectic are required])
-fi
-AC_SUBST([CONFIG_FRAMEWORK])
-dnl }}}
-
-dnl {{{ check eselect/eclectic env and news
-for m in env news ; do
-	AC_MSG_CHECKING([for $CONFIG_FRAMEWORK $m])
-	if $CONFIG_FRAMEWORK $m version >/dev/null 2>/dev/null ; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([$CONFIG_FRAMEWORK $m is required])
-	fi
-done
-dnl }}}
-
-dnl {{{ path hacks for distcheck
-AC_ARG_WITH([hacked-log-dir],
-	AS_HELP_STRING([--with-hacked-log-dir=dir], [Hack the log dir (for distcheck only)]),
-	HACKED_LOG_DIR=`eval echo $withval`,
-	HACKED_LOG_DIR=)
-AC_MSG_CHECKING([for hacked log dir for distcheck])
-if test "x$HACKED_LOG_DIR" = "x" ; then
-	HACKED_LOG_DIR=/var/log/paludis
-fi
-AC_MSG_RESULT([$HACKED_LOG_DIR])
-AC_SUBST([HACKED_LOG_DIR])
-dnl }}}
-
-dnl {{{ pkg-config
-AC_SUBST([PALUDIS_PC_CFLAGS])
-AC_SUBST([PALUDIS_PC_LIBS])
-AC_SUBST([PALUDIS_PC_VERSION])
-AC_SUBST([PALUDIS_PC_SLOT])
-dnl }}}
-
-dnl {{{ built sources
-GENERATED_FILE=misc/generated-file.txt
-AC_SUBST_FILE(GENERATED_FILE)
-
-BUILDUSER=`whoami`
-AC_SUBST([BUILDUSER])
-BUILDHOST=`hostname`
-AC_SUBST([BUILDHOST])
-BUILDDATE=`date +%Y-%m-%dT%H:%M:%S%z`
-AC_SUBST([BUILDDATE])
-dnl }}}
-
-dnl {{{ output
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([
-	Makefile
-	bash-completion/Makefile
-	doc/Makefile
-	doc/api/Makefile
-	doc/api/cplusplus/doxygen.conf
-	doc/api/cplusplus/Makefile
-	doc/api/cplusplus/examples/Makefile
-	doc/api/python/conf.py
-	doc/api/python/Makefile
-	doc/api/ruby/Makefile
-	doc/clients/Makefile
-	doc/configuration/Makefile
-	doc/configuration/repositories/Makefile
-	doc/faq/Makefile
-	doc/overview/Makefile
-	hooks/Makefile
-	hooks/eselect_env_update.bash
-	hooks/news.hook
-	misc/Makefile
-	paludis/Makefile
-	paludis/about.hh
-	paludis/args/Makefile
-	paludis/distributions/Makefile
-	paludis/distributions/exherbo/Makefile
-	paludis/distributions/gentoo/Makefile
-	paludis/environments/Makefile
-	paludis/environments/paludis/Makefile
-	paludis/environments/portage/Makefile
-	paludis/environments/test/Makefile
-	paludis/fetchers/Makefile
-	paludis/fetchers/demos/Makefile
-	paludis/repositories/Makefile
-	paludis/repositories/accounts/Makefile
-	paludis/repositories/e/Makefile
-	paludis/repositories/e/eapis/Makefile
-	paludis/repositories/e/ebuild/0/Makefile
-	paludis/repositories/e/ebuild/1/Makefile
-	paludis/repositories/e/ebuild/2/Makefile
-	paludis/repositories/e/ebuild/3/Makefile
-	paludis/repositories/e/ebuild/4/Makefile
-	paludis/repositories/e/ebuild/5/Makefile
-	paludis/repositories/e/ebuild/6/Makefile
-	paludis/repositories/e/ebuild/Makefile
-	paludis/repositories/e/ebuild/exheres-0/Makefile
-	paludis/repositories/e/ebuild/paludis-1/Makefile
-	paludis/repositories/e/ebuild/pbin-1/Makefile
-	paludis/repositories/e/ebuild/utils/Makefile
-	paludis/repositories/e/ebuild/utils/4/Makefile
-	paludis/repositories/e/ebuild/utils/5/Makefile
-	paludis/repositories/e/ebuild/utils/exheres-0/Makefile
-	paludis/repositories/fake/Makefile
-	paludis/repositories/gemcutter/Makefile
-	paludis/repositories/repository/Makefile
-	paludis/repositories/unavailable/Makefile
-	paludis/repositories/unpackaged/Makefile
-	paludis/repositories/unwritten/Makefile
-	paludis/resolver/Makefile
-	paludis/selinux/Makefile
-	paludis/syncers/Makefile
-	paludis/util/Makefile
-	paludis/util/echo_functions.bash
-	pkg-config/Makefile
-	python/Makefile
-	ruby/Makefile
-	ruby/demos/Makefile
-	src/Makefile
-	src/clients/Makefile
-	src/clients/cave/Makefile
-	src/output/Makefile
-	vim/Makefile
-	vim/ftdetect/Makefile
-	vim/syntax/Makefile
-	zsh-completion/Makefile
-	])
-AC_OUTPUT
-dnl }}}
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 6a11237eb..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,118 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . api clients configuration faq overview
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html.part \
-	news.html.part \
-	news.subst \
-	changelog.html.part \
-	changelog.subst \
-	index.html \
-	news.html \
-	changelog.html
-
-EXTRA_DIST = \
-	header.html.part.in \
-	toplinks.html.part.in \
-	footer.html.part.in \
-	index.html.part.in \
-	news.html.part.in \
-	changelog.html.part.in \
-	paludis.css \
-	paludis_270.png \
-	paludis_64.png
-
-paludishtmldir = $(htmldir)
-
-paludishtml_DATA = \
-	index.html \
-	news.html \
-	changelog.html \
-	paludis.css \
-	paludis_270.png
-
-dist_check_SCRIPTS = \
-	htmltidy.bash
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludishtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part index.html.part footer.html.part
-	cat header.html.part index.html.part footer.html.part > $@
-
-news.html : header.html.part news.html.part footer.html.part
-	cat header.html.part news.html.part footer.html.part > $@
-
-changelog.html : header.html.part changelog.html.part footer.html.part
-	cat header.html.part changelog.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,./,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,./,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/footer.html.part.in > footer.html.part
-
-index.html.part : $(srcdir)/index.html.part.in
-	sed -e 's,###PALUDIS_VERSION###,$(VERSION_FULL),g' < $(srcdir)/index.html.part.in > index.html.part
-
-news.html.part : $(srcdir)/news.html.part.in news.subst
-	sed \
-	    -e '/###NEWS###/r news.subst' \
-	    -e 's,###NEWS###,,' \
-	    < $(srcdir)/news.html.part.in > news.html.part
-
-changelog.html.part : $(srcdir)/changelog.html.part.in changelog.subst
-	sed \
-	    -e '/###CHANGELOG###/r changelog.subst' \
-	    -e 's,###CHANGELOG###,,' \
-	    < $(srcdir)/changelog.html.part.in > changelog.html.part
-
-news.subst : $(top_srcdir)/NEWS
-	sed \
-	    -e 's,&,\&amp;,g' \
-	    -e 's,<,\&lt;,g' \
-	    -e 's,>,\&gt;,g' \
-	    < $(top_srcdir)/NEWS > news.subst
-
-changelog.subst :
-	git --git-dir=$(top_srcdir)/.git log | sed \
-	    -e 's,&,\&amp;,g' \
-	    -e 's,<,\&lt;,g' \
-	    -e 's,>,\&gt;,g' \
-	    -e 's,\([[:blank:][:punct:]]\)\?\([0-9a-f]\{40\}\)\([[:blank:][:punct:]]\)\?,\1<a href="http://git.exherbo.org/paludis/paludis.git/commit/?id=\2">\2</a>,g' \
-	    -e 's,ticket:\([0-9]\+\),<a href="http://paludis.exherbo.org/trac/ticket/\1">ticket:\1</a>,g' \
-	    > changelog.subst
-
-documentation : doxygen epydoc htmldocs
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludishtml_DATA)
-
-doxygen :
-	$(MAKE) -C api $@
-
-epydoc :
-	$(MAKE) -C api $@
-
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
deleted file mode 100644
index c9a430c71..000000000
--- a/doc/api/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = cplusplus python ruby .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html
-
-EXTRA_DIST = \
-	toplinks.html.part.in \
-	index.html.part
-
-paludisapihtmldir = $(htmldir)/api
-
-paludisapihtml_DATA = \
-	index.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisapihtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-doxygen :
-	$(MAKE) -C cplusplus $@
-
-epydoc :
-	$(MAKE) -C python $@
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisapihtml_DATA)
-
diff --git a/doc/api/cplusplus/Makefile.am b/doc/api/cplusplus/Makefile.am
deleted file mode 100644
index 4ab5e8509..000000000
--- a/doc/api/cplusplus/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-SUBDIRS = examples .
-
-if HAVE_DOXYGEN_TAGS
-
-tagfiles = \
-	libstdc++.tag
-
-libstdc++.tag :
-	wget -O $@ http://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen/libstdc++.tag
-
-endif
-
-doxygen_files = \
-	groups.doxygen \
-	main_page.doxygen \
-	namespaces.doxygen \
-	references.doxygen
-
-EXTRA_DIST = doxygen.conf.in $(doxygen_files)
-CLEANFILES = *~ cplusplus/* cplusplus paludis.tag *.epicfail
-
-MAINTAINERCLEANFILES = Makefile.in doxygen.conf $(tagfiles)
-
-if HAVE_DOXYGEN
-
-all-local : cplusplus
-
-doxygen : cplusplus
-
-cplusplus : doxygen.conf $(doxygen_files) $(tagfiles)
-	doxygen doxygen.conf
-
-install-data-local :
-	mkdir -p $(DESTDIR)$(htmldir)/api
-	cp -R cplusplus/ $(DESTDIR)$(htmldir)/api/
-
-else
-
-doxygen :
-	@echo "You don't have doxygen installed!"
-	exit 1
-
-endif
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-clean-local :
-	rm -fr cplusplus/
-
-uninstall-local :
-	rm -fr $(DESTDIR)$(htmldir)/api/cplusplus
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludishtmlapicplusplus_DATA)
-
diff --git a/doc/api/cplusplus/examples/Makefile.am b/doc/api/cplusplus/examples/Makefile.am
deleted file mode 100644
index fae161c5f..000000000
--- a/doc/api/cplusplus/examples/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-CLEANFILES = *~ *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-SUBDIRS = .
-
-noinst_PROGRAMS = \
-	example_about \
-	example_action \
-	example_contents \
-	example_dep_label \
-	example_dep_spec \
-	example_dep_spec_flattener \
-	example_environment \
-	example_package_id \
-	example_metadata_key \
-	example_mask \
-	example_repository \
-	example_match_package \
-	example_selection \
-	example_version_operator \
-	example_version_spec \
-	example_name
-
-EXTRA_DIST = $(noinst_SCRIPTS)
-
-noinst_LIBRARIES = libpaludisexamples.a
-
-libpaludisexamples_a_SOURCES = \
-	example_command_line.hh \
-	example_command_line.cc
-
-libpaludisexamples_a_LIBADD = \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_about_SOURCES = example_about.cc
-example_about_LDADD = \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-example_action_SOURCES = example_action.cc
-example_action_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_contents_SOURCES = example_contents.cc
-example_contents_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_dep_label_SOURCES = example_dep_label.cc
-example_dep_label_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_dep_spec_SOURCES = example_dep_spec.cc
-example_dep_spec_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_dep_spec_flattener_SOURCES = example_dep_spec_flattener.cc
-example_dep_spec_flattener_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_environment_SOURCES = example_environment.cc
-example_environment_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_package_id_SOURCES = example_package_id.cc
-example_package_id_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_mask_SOURCES = example_mask.cc
-example_mask_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_metadata_key_SOURCES = example_metadata_key.cc
-example_metadata_key_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_repository_SOURCES = example_repository.cc
-example_repository_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_match_package_SOURCES = example_match_package.cc
-example_match_package_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_selection_SOURCES = example_selection.cc
-example_selection_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_version_operator_SOURCES = example_version_operator.cc
-example_version_operator_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_version_spec_SOURCES = example_version_spec.cc
-example_version_spec_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-example_name_SOURCES = example_name.cc
-example_name_LDADD = \
-	libpaludisexamples.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisapicplusplusexampleshtml_DATA)
-
diff --git a/doc/api/python/Makefile.am b/doc/api/python/Makefile.am
deleted file mode 100644
index 65723a57d..000000000
--- a/doc/api/python/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-SUBDIRS = .
-
-CLEANFILES = *~ python/*/* doctrees/* *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-examples = \
-	example_about.py \
-	example_command_line.py \
-	example_version_spec.py
-
-rst_docs = \
-	example_about.rst \
-	example_command_line.rst \
-	example_version_spec.rst \
-	index.rst \
-	paludis.rst
-
-EXTRA_DIST = conf.py \
-	     $(rst_docs) \
-	     $(examples)
-
-if ENABLE_PYTHON_DOC
-
-all-local : sphinx
-
-sphinx : python
-
-python : $(top_builddir)/python/paludis.so $(examples) $(rst_docs)
-	mkdir -p $(builddir)/python && \
-	env \
-	    LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
-		    $(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
-		    `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs/ \
-		    `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs/ \
-		    `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/ \
-		    `:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
-	    PYTHONPATH="$(top_builddir)/python/:$(top_builddir)/python/.libs/" \
-	    $(SPHINX_BUILD) -c $(builddir) -b html -d $(builddir)/doctrees $(srcdir) $(builddir)/python
-
-
-install-data-local :
-	mkdir -p $(DESTDIR)$(htmldir)/api
-	cp -R python/ $(DESTDIR)$(htmldir)/api/
-
-else
-
-sphinx :
-	@echo "You don't have python-doc turned on!"
-	exit 1
-
-endif
-
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisapipythonhtml_DATA)
-
-clean-local :
-	rm -fr python/
-
-uninstall-local :
-	rm -fr $(DESTDIR)$(htmldir)/api/python
-
diff --git a/doc/api/ruby/Makefile.am b/doc/api/ruby/Makefile.am
deleted file mode 100644
index b536ed677..000000000
--- a/doc/api/ruby/Makefile.am
+++ /dev/null
@@ -1,63 +0,0 @@
-SUBDIRS = .
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisapirubyhtml_DATA)
-
-dist_noinst_SCRIPTS = create_ruby_doc.rb \
-		      create_ruby_examples.rb
-
-examples = \
-	example_about.rb \
-	example_action.rb \
-	example_command_line.rb \
-	example_contents.rb \
-	example_dep_tree.rb \
-	example_environment.rb \
-	example_package_id.rb \
-	example_mask.rb \
-	example_match_package.rb \
-	example_repository.rb \
-	example_selection.rb \
-	example_version_operator.rb \
-	example_version_spec.rb
-
-EXTRA_DIST = $(examples) \
-	     ruby_syntax.css
-
-if ENABLE_RUBY_DOC
-
-all-local : rdoc
-
-rdoc : ruby
-
-ruby : create_ruby_doc.rb create_ruby_examples.rb ruby_syntax.css $(examples)
-	rm -fr ruby
-	env TOP_SRCDIR="$(top_srcdir)" $(RUBY) \
-	    $(srcdir)/create_ruby_doc.rb -t "Paludis Ruby API" -m Paludis --op ruby \
-		$(top_srcdir)/ruby/*.cc
-	$(RUBY) $(srcdir)/create_ruby_examples.rb $(srcdir) $(examples)
-	cp $(srcdir)/ruby_syntax.css ruby
-
-install-data-local :
-	mkdir -p $(DESTDIR)$(htmldir)/api
-	cp -R ruby/ $(DESTDIR)$(htmldir)/api/
-
-endif
-
-clean-local :
-	rm -fr ruby
-
-uninstall-local :
-	rm -fr $(DESTDIR)$(htmldir)/api/ruby
-
diff --git a/doc/clients/Makefile.am b/doc/clients/Makefile.am
deleted file mode 100644
index 885f77212..000000000
--- a/doc/clients/Makefile.am
+++ /dev/null
@@ -1,152 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html
-
-DISTCLEANFILES = \
-	$(ALL_CLIENTS_HTML) \
-	$(CAVE_COMMANDS_HTML)
-
-EXTRA_DIST = \
-	$(ALL_CLIENTS_HTML) \
-	$(CAVE_COMMANDS_HTML) \
-	toplinks.html.part.in \
-	index.html.part
-
-paludisclientshtmldir = $(htmldir)/clients
-
-paludisclientshtml_DATA = \
-	index.html \
-	$(ALL_CLIENTS_HTML) \
-	$(CAVE_COMMANDS_HTML)
-
-CAVE_COMMANDS_HTML = \
-	cave-config.html \
-	cave-contents.html \
-	cave-digest.html \
-	cave-display-resolution.html \
-	cave-dump-cave-formats-conf.html \
-	cave-executables.html \
-	cave-execute-resolution.html \
-	cave-find-candidates.html \
-	cave-fix-cache.html \
-	cave-fix-linkage.html \
-	cave-generate-metadata.html \
-	cave-graph-jobs.html \
-	cave-has-version.html \
-	cave-help.html \
-	cave-import.html \
-	cave-info.html \
-	cave-manage-search-index.html \
-	cave-match.html \
-	cave-mirror.html \
-	cave-owner.html \
-	cave-perform.html \
-	cave-print-best-version.html \
-	cave-print-categories.html \
-	cave-print-checksum.html \
-	cave-print-checksum-algorithms.html \
-	cave-print-commands.html \
-	cave-print-dependent-ids.html \
-	cave-print-environment-metadata.html \
-	cave-print-id-actions.html \
-	cave-print-id-contents.html \
-	cave-print-id-environment-variable.html \
-	cave-print-id-executables.html \
-	cave-print-id-masks.html \
-	cave-print-id-metadata.html \
-	cave-print-id-size.html \
-	cave-print-ids.html \
-	cave-print-owners.html \
-	cave-print-packages.html \
-	cave-print-repositories.html \
-	cave-print-repository-formats.html \
-	cave-print-repository-metadata.html \
-	cave-print-resolution-required-confirmations.html \
-	cave-print-set.html \
-	cave-print-sets.html \
-	cave-print-spec.html \
-	cave-print-sync-protocols.html \
-	cave-print-unmanaged-files.html \
-	cave-print-unused-distfiles.html \
-	cave-purge.html \
-	cave-report.html \
-	cave-resolve.html \
-	cave-resume.html \
-	cave-search.html \
-	cave-show.html \
-	cave-size.html \
-	cave-sync.html \
-	cave-sync-protocol-options.html \
-	cave-uninstall.html \
-	cave-update-world.html \
-	cave-verify.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisclientshtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-# automake is retartded
-TEST_EXTENSIONS = .html
-HTML_LOG_COMPILER = $(LOG_COMPILER)
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-cave.html : header.html.part footer.html.part
-	{ cat header.html.part && { \
-	    echo "<h1>cave</h1>"; \
-	    if test -f $(top_builddir)/src/clients/cave/cave.html-man-fragment ; then \
-	        cat $(top_builddir)/src/clients/cave/cave.html-man-fragment ; \
-	    elif test -f $(top_srcdir)/src/clients/cave/cave.html-man-fragment ; then \
-	        cat $(top_srcdir)/src/clients/cave/cave.html-man-fragment ; \
-	    else \
-	        echo "<p>Sorry, documentation was generated without support for the cave client.</p>" ; \
-	    fi ; } | sed \
-	        -e '/<h2>SEE ALSO<.h2>/,/<.div>/s#<span class="strong"><strong>\(.*\)</strong></span>(1)#<a href="\1.html">\1</a>#' \
-	        -e '/<h2>CORE COMMANDS<.h2>/,/<h2>ENVIRONMENT<.h2>/s,^\([a-z-]\+\)$$,<a href="cave-\1.html">\1</a>,' \
-	    && cat footer.html.part ; } > $@
-
-$(CAVE_COMMANDS_HTML) : header.html.part footer.html.part
-	{ cat header.html.part && { \
-	    echo "<h1>cave `basename $@ .html | sed -e 's,cave-,,'`</h1>"; \
-	    if test -f $(top_builddir)/src/clients/cave/`basename $@ .html `.html-man-fragment ; then \
-	        cat $(top_builddir)/src/clients/cave/`basename $@ .html `.html-man-fragment ; \
-	    elif test -f $(top_srcdir)/src/clients/cave/`basename $@ .html `.html-man-fragment ; then \
-	        cat $(top_srcdir)/src/clients/cave/`basename $@ .html `.html-man-fragment ; \
-	    else \
-	        echo "<p>Sorry, documentation was generated without support for the cave client.</p>" ; \
-	    fi ; } \
-	    && cat footer.html.part ; } > $@
-
-header.html.part : $(srcdir)/../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisclientshtml_DATA)
-
diff --git a/doc/configuration/Makefile.am b/doc/configuration/Makefile.am
deleted file mode 100644
index c9c2f5fb3..000000000
--- a/doc/configuration/Makefile.am
+++ /dev/null
@@ -1,290 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = repositories .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html \
-	hooks.html \
-	syncers.html.part \
-	syncers.html \
-	fetchers.html.part \
-	fetchers.html \
-	envvars.html \
-	synclist \
-	fetchlist \
-	specpath.html \
-	specpath.html.part \
-	general.html \
-	general.html.part \
-	keywords.html \
-	keywords.html.part \
-	output.html \
-	output.html.part \
-	packagemask.html \
-	packagemask.html.part \
-	suggestions.html \
-	suggestions.html.part \
-	use.html \
-	use.html.part \
-	licenses.html \
-	licenses.html.part \
-	mirrors.html \
-	mirrors.html.part \
-	bashrc.html \
-	bashrc.html.part \
-	sets.html \
-	sets.html.part \
-	configfiles.html \
-	specs.html
-
-EXTRA_DIST = \
-	toplinks.html.part.in \
-	index.html.part \
-	hooks.html.part \
-	syncers.html.part.in \
-	fetchers.html.part.in \
-	envvars.html.part \
-	specpath.html.part.in \
-	general.html.part.in \
-	keywords.html.part.in \
-	output.html.part.in \
-	packagemask.html.part.in \
-	suggestions.html.part.in \
-	licenses.html.part.in \
-	mirrors.html.part.in \
-	bashrc.html.part.in \
-	use.html.part.in \
-	paludisenvironmentonly.html.part \
-	configfiles.html.part \
-	specs.html.part \
-	sets.html.part.in
-
-paludisconfigurationhtmldir = $(htmldir)/configuration
-
-paludisconfigurationhtml_DATA = \
-	index.html \
-	hooks.html \
-	syncers.html \
-	fetchers.html \
-	envvars.html \
-	specpath.html \
-	general.html \
-	keywords.html \
-	packagemask.html \
-	suggestions.html \
-	mirrors.html \
-	output.html \
-	bashrc.html \
-	licenses.html \
-	use.html \
-	configfiles.html \
-	specs.html \
-	sets.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisconfigurationhtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-specs.html : header.html.part $(srcdir)/specs.html.part footer.html.part
-	cat header.html.part $(srcdir)/specs.html.part footer.html.part > $@
-
-configfiles.html : header.html.part $(srcdir)/configfiles.html.part footer.html.part
-	cat header.html.part $(srcdir)/configfiles.html.part footer.html.part > $@
-
-envvars.html : header.html.part $(srcdir)/envvars.html.part footer.html.part
-	cat header.html.part $(srcdir)/envvars.html.part footer.html.part > $@
-
-synclist :
-	find $(top_srcdir)/paludis/syncers $(top_builddir)/paludis/syncers -type f \
-	    | while read a ; do \
-		basename $$a ; \
-	done | sort -u | \
-	while read a ; do \
-		if echo $$a | grep '.in$$' >/dev/null ; then \
-			: ; \
-		elif ! echo $$a | grep '^do' >/dev/null ; then \
-			: ; \
-		elif echo $$a | grep 'svn-base$$' >/dev/null ; then \
-			: ; \
-		else \
-			echo "<strong>$$a</strong>" | sed -e 's/>do/>/' ; \
-			if test -f $(top_builddir)/paludis/syncers/$$a ; then \
-				env PALUDIS_EBUILD_DIR="$(top_builddir)/paludis/util" \
-					bash $(top_builddir)/paludis/syncers/$$a --help || exit 1 ; \
-			else \
-				env PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/util" \
-					bash $(top_srcdir)/paludis/syncers/$$a --help || exit 1 ; \
-			fi ; \
-			echo ; \
-		fi ; \
-	done > synclist
-
-fetchlist :
-	find $(top_srcdir)/paludis/fetchers $(top_builddir)/paludis/fetchers -type f \
-	    | while read a ; do \
-		basename $$a ; \
-	done | sort -u | \
-	while read a ; do \
-		if echo $$a | grep '.in$$' >/dev/null ; then \
-			: ; \
-		elif ! echo $$a | grep '^do' >/dev/null ; then \
-			: ; \
-		elif echo $$a | grep 'svn-base$$' >/dev/null ; then \
-			: ; \
-		else \
-			echo "<li>$$a</li>" | sed -e 's/>do/>/' ; \
-		fi ; \
-	done > fetchlist
-
-syncers.html.part : $(srcdir)/syncers.html.part.in synclist
-	sed \
-	    -e '/###SYNCERS###/r synclist' \
-	    -e 's,###SYNCERS###,,g' \
-	    < $(srcdir)/syncers.html.part.in > syncers.html.part
-
-specpath.html.part : $(srcdir)/specpath.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/specpath.html.part.in > specpath.html.part
-
-general.html.part : $(srcdir)/general.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/general.html.part.in > general.html.part
-
-keywords.html.part : $(srcdir)/keywords.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/keywords.html.part.in > keywords.html.part
-
-packagemask.html.part : $(srcdir)/packagemask.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/packagemask.html.part.in > packagemask.html.part
-
-suggestions.html.part : $(srcdir)/suggestions.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/suggestions.html.part.in > suggestions.html.part
-
-mirrors.html.part : $(srcdir)/mirrors.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/mirrors.html.part.in > mirrors.html.part
-
-output.html.part : $(srcdir)/output.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/output.html.part.in > output.html.part
-
-bashrc.html.part : $(srcdir)/bashrc.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/bashrc.html.part.in > bashrc.html.part
-
-sets.html.part : $(srcdir)/sets.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/sets.html.part.in > sets.html.part
-
-licenses.html.part : $(srcdir)/licenses.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/licenses.html.part.in > licenses.html.part
-
-use.html.part : $(srcdir)/use.html.part.in $(srcdir)/paludisenvironmentonly.html.part
-	sed \
-	    -e '/###PALUDISENVIRONMENTONLY###/r $(srcdir)/paludisenvironmentonly.html.part' \
-	    -e 's,###PALUDISENVIRONMENTONLY###,,g' \
-	    < $(srcdir)/use.html.part.in > use.html.part
-
-fetchers.html.part : $(srcdir)/fetchers.html.part.in fetchlist
-	sed \
-	    -e '/###FETCHERS###/r fetchlist' \
-	    -e 's,###FETCHERS###,,g' \
-	    < $(srcdir)/fetchers.html.part.in > fetchers.html.part
-
-general.html : header.html.part general.html.part footer.html.part
-	cat header.html.part general.html.part footer.html.part > $@
-
-keywords.html : header.html.part keywords.html.part footer.html.part
-	cat header.html.part keywords.html.part footer.html.part > $@
-
-packagemask.html : header.html.part packagemask.html.part footer.html.part
-	cat header.html.part packagemask.html.part footer.html.part > $@
-
-suggestions.html : header.html.part suggestions.html.part footer.html.part
-	cat header.html.part suggestions.html.part footer.html.part > $@
-
-mirrors.html : header.html.part mirrors.html.part footer.html.part
-	cat header.html.part mirrors.html.part footer.html.part > $@
-
-output.html : header.html.part output.html.part footer.html.part
-	cat header.html.part output.html.part footer.html.part > $@
-
-bashrc.html : header.html.part bashrc.html.part footer.html.part
-	cat header.html.part bashrc.html.part footer.html.part > $@
-
-sets.html : header.html.part sets.html.part footer.html.part
-	cat header.html.part sets.html.part footer.html.part > $@
-
-licenses.html : header.html.part licenses.html.part footer.html.part
-	cat header.html.part licenses.html.part footer.html.part > $@
-
-use.html : header.html.part use.html.part footer.html.part
-	cat header.html.part use.html.part footer.html.part > $@
-
-specpath.html : header.html.part specpath.html.part footer.html.part
-	cat header.html.part specpath.html.part footer.html.part > $@
-
-syncers.html : header.html.part syncers.html.part footer.html.part
-	cat header.html.part syncers.html.part footer.html.part > $@
-
-fetchers.html : header.html.part fetchers.html.part footer.html.part
-	cat header.html.part fetchers.html.part footer.html.part > $@
-
-hooks.html : header.html.part $(srcdir)/hooks.html.part footer.html.part
-	cat header.html.part $(srcdir)/hooks.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisconfigurationhtml_DATA)
-
diff --git a/doc/configuration/repositories/Makefile.am b/doc/configuration/repositories/Makefile.am
deleted file mode 100644
index 905b0aa29..000000000
--- a/doc/configuration/repositories/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html \
-	accounts.html \
-	e.html \
-	exndbam.html \
-	installed_accounts.html \
-	installed_unpackaged.html \
-	repository.html \
-	unavailable.html \
-	unwritten.html \
-	vdb.html
-
-EXTRA_DIST = \
-	toplinks.html.part.in \
-	index.html.part \
-	accounts.html.part \
-	e.html.part \
-	exndbam.html.part \
-	installed_accounts.html.part \
-	installed_unpackaged.html.part \
-	repository.html.part \
-	unavailable.html.part \
-	unwritten.html.part \
-	vdb.html.part
-
-paludisconfigurationrepositorieshtmldir = $(htmldir)/configuration/repositories/
-
-paludisconfigurationrepositorieshtml_DATA = \
-	index.html \
-	accounts.html \
-	e.html \
-	exndbam.html \
-	installed_accounts.html \
-	installed_unpackaged.html \
-	repository.html \
-	unavailable.html \
-	unwritten.html \
-	vdb.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisconfigurationrepositorieshtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-accounts.html : header.html.part $(srcdir)/accounts.html.part footer.html.part
-	cat header.html.part $(srcdir)/accounts.html.part footer.html.part > $@
-
-e.html : header.html.part $(srcdir)/e.html.part footer.html.part
-	cat header.html.part $(srcdir)/e.html.part footer.html.part > $@
-
-exndbam.html : header.html.part $(srcdir)/exndbam.html.part footer.html.part
-	cat header.html.part $(srcdir)/exndbam.html.part footer.html.part > $@
-
-installed_accounts.html : header.html.part $(srcdir)/installed_accounts.html.part footer.html.part
-	cat header.html.part $(srcdir)/installed_accounts.html.part footer.html.part > $@
-
-installed_unpackaged.html : header.html.part $(srcdir)/installed_unpackaged.html.part footer.html.part
-	cat header.html.part $(srcdir)/installed_unpackaged.html.part footer.html.part > $@
-
-repository.html : header.html.part $(srcdir)/repository.html.part footer.html.part
-	cat header.html.part $(srcdir)/repository.html.part footer.html.part > $@
-
-unavailable.html : header.html.part $(srcdir)/unavailable.html.part footer.html.part
-	cat header.html.part $(srcdir)/unavailable.html.part footer.html.part > $@
-
-unwritten.html : header.html.part $(srcdir)/unwritten.html.part footer.html.part
-	cat header.html.part $(srcdir)/unwritten.html.part footer.html.part > $@
-
-vdb.html : header.html.part $(srcdir)/vdb.html.part footer.html.part
-	cat header.html.part $(srcdir)/vdb.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/../../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../../footer.html.part.in
-	sed -e 's,###TOPURI###,../../,g' < $(srcdir)/../../footer.html.part.in > footer.html.part
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisconfigurationrepositorieshtml_DATA)
-
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
deleted file mode 100644
index ceeae69c8..000000000
--- a/doc/faq/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	index.html \
-	different.html \
-	general.html \
-	howdoi.html \
-	misfunctionality.html \
-	operation.html \
-	stricter.html \
-	repositories.html \
-	upgrades.html
-
-EXTRA_DIST = \
-	toplinks.html.part.in \
-	index.html.part \
-	different.html.part \
-	general.html.part \
-	howdoi.html.part \
-	misfunctionality.html.part \
-	operation.html.part \
-	stricter.html.part \
-	repositories.html.part \
-	upgrades.html.part
-
-paludisfaqhtmldir = $(htmldir)/faq
-
-paludisfaqhtml_DATA = \
-	index.html \
-	different.html \
-	general.html \
-	howdoi.html \
-	misfunctionality.html \
-	operation.html \
-	stricter.html \
-	repositories.html \
-	upgrades.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisfaqhtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-different.html : header.html.part $(srcdir)/different.html.part footer.html.part
-	cat header.html.part $(srcdir)/different.html.part footer.html.part > $@
-
-general.html : header.html.part $(srcdir)/general.html.part footer.html.part
-	cat header.html.part $(srcdir)/general.html.part footer.html.part > $@
-
-howdoi.html : header.html.part $(srcdir)/howdoi.html.part footer.html.part
-	cat header.html.part $(srcdir)/howdoi.html.part footer.html.part > $@
-
-misfunctionality.html : header.html.part $(srcdir)/misfunctionality.html.part footer.html.part
-	cat header.html.part $(srcdir)/misfunctionality.html.part footer.html.part > $@
-
-operation.html : header.html.part $(srcdir)/operation.html.part footer.html.part
-	cat header.html.part $(srcdir)/operation.html.part footer.html.part > $@
-
-stricter.html : header.html.part $(srcdir)/stricter.html.part footer.html.part
-	cat header.html.part $(srcdir)/stricter.html.part footer.html.part > $@
-
-repositories.html : header.html.part $(srcdir)/repositories.html.part footer.html.part
-	cat header.html.part $(srcdir)/repositories.html.part footer.html.part > $@
-
-upgrades.html : header.html.part $(srcdir)/upgrades.html.part footer.html.part
-	cat header.html.part $(srcdir)/upgrades.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisfaqhtml_DATA)
-
diff --git a/doc/overview/Makefile.am b/doc/overview/Makefile.am
deleted file mode 100644
index 7b602d7b5..000000000
--- a/doc/overview/Makefile.am
+++ /dev/null
@@ -1,76 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-CLEANFILES += \
-	header.html.part \
-	toplinks.html.part \
-	footer.html.part \
-	features.html \
-	gettingstarted.html \
-	contact.html \
-	pbins.html \
-	index.html
-
-EXTRA_DIST = \
-	toplinks.html.part.in \
-	index.html.part \
-	features.html.part \
-	gettingstarted.html.part \
-	pbins.html.part \
-	contact.html.part
-
-paludisoverviewhtmldir = $(htmldir)/overview
-
-paludisoverviewhtml_DATA = \
-	index.html \
-	features.html \
-	gettingstarted.html \
-	contact.html \
-	pbins.html
-
-if HAVE_HTMLTIDY
-
-TESTS = $(paludisoverviewhtml_DATA)
-LOG_COMPILER_INTERP = $(top_srcdir)/doc/htmltidy.bash
-
-endif
-
-index.html : header.html.part $(srcdir)/index.html.part footer.html.part
-	cat header.html.part $(srcdir)/index.html.part footer.html.part > $@
-
-gettingstarted.html : header.html.part $(srcdir)/gettingstarted.html.part footer.html.part
-	cat header.html.part $(srcdir)/gettingstarted.html.part footer.html.part > $@
-
-features.html : header.html.part $(srcdir)/features.html.part footer.html.part
-	cat header.html.part $(srcdir)/features.html.part footer.html.part > $@
-
-contact.html : header.html.part $(srcdir)/contact.html.part footer.html.part
-	cat header.html.part $(srcdir)/contact.html.part footer.html.part > $@
-
-pbins.html : header.html.part $(srcdir)/pbins.html.part footer.html.part
-	cat header.html.part $(srcdir)/pbins.html.part footer.html.part > $@
-
-header.html.part : $(srcdir)/../header.html.part.in toplinks.html.part
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    -e '/###TOPLINKS###/r $(srcdir)/toplinks.html.part' \
-	    -e 's,###TOPLINKS###,,g' \
-	    < $(srcdir)/../header.html.part.in > header.html.part
-
-toplinks.html.part : $(srcdir)/toplinks.html.part.in
-	sed \
-	    -e 's,###TOPURI###,../,g' \
-	    < $(srcdir)/toplinks.html.part.in > toplinks.html.part
-
-footer.html.part : $(srcdir)/../footer.html.part.in
-	sed -e 's,###TOPURI###,./,g' < $(srcdir)/../footer.html.part.in > footer.html.part
-
-htmldocs : htmldocs-subdirs
-
-htmldocs-subdirs :
-	for s in $(SUBDIRS) . ; do if test x$$s = x. ; then $(MAKE) htmldocs-local || exit 1 ; \
-	    else $(MAKE) -C $$s htmldocs || exit 1 ; fi ; done
-
-htmldocs-local : $(paludisoverviewhtml_DATA)
-
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
deleted file mode 100644
index 309454413..000000000
--- a/hooks/Makefile.am.m4
+++ /dev/null
@@ -1,313 +0,0 @@
-ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
-')m4exit(1)') include(`misc/generated-file.txt')
-
-dnl vim: set ft=m4 noet :
-
-include $(top_srcdir)/misc/common-makefile.am
-
-CLEANFILES += .keep
-MAINTAINERCLEANFILES += Makefile.am
-SUBDIRS = .
-
-installvarlibpaludisnewsdir = $(localstatedir)/gentoo/news
-
-installhookcommonprogdir = $(libexecdir)/paludis/hooks/common
-installhookautoprogdir = $(libexecdir)/paludis/hooks/auto
-installhookinstallpostdir = $(libexecdir)/paludis/hooks/install_post
-
-installhookcommonprog_SCRIPTS = \
-	gnu_info_index.bash \
-	eselect_env_update.bash \
-	log.bash \
-	installable_cache_regen.bash \
-	installed_cache_regen.bash
-
-installhookautoprog_SCRIPTS = \
-	news.hook \
-	find_config_updates.hook
-
-installhookinstallpost_SCRIPTS = \
-	update_config_protect_list.bash
-
-installvarlibpaludisnews_DATA = \
-	.keep
-
-TESTS = \
-	eselect_env_update_TEST \
-	news_TEST
-
-check_SCRIPTS = $(TESTS) run_test.bash \
-	eselect_env_update_TEST_setup.sh eselect_env_update_TEST_cleanup.sh \
-	news_TEST_setup.sh news_TEST_cleanup.sh
-
-check_PROGRAMS =
-
-EXTRA_DIST = \
-	Makefile.am.m4 \
-	gnu_info_index.bash \
-	eselect_env_update.bash.in \
-	log.bash \
-	installable_cache_regen.bash \
-	installed_cache_regen.bash \
-	news.hook.in \
-	find_config_updates.hook \
-	$(installhookinstallpost_SCRIPTS) \
-	$(check_SCRIPTS)
-
-.keep :
-	touch $@
-
-define(`userhook', `
-installuserhooks$1dir = $(datadir)/paludis/hooks/$1
-installuserhooks$1_DATA = .keep
-installuserhooksplat$1dir = $(libdir)/paludis/hooks/$1
-installuserhooksplat$1_DATA = .keep')
-
-userhook(`auto')
-userhook(`install_pre')
-userhook(`install_fail')
-userhook(`install_post')
-userhook(`install_all_pre')
-userhook(`install_all_post')
-userhook(`install_pretend_pre')
-userhook(`install_pretend_post')
-userhook(`install_pretend_display_item_pre')
-userhook(`install_pretend_display_item_post')
-userhook(`install_task_execute_pre')
-userhook(`install_task_execute_post')
-userhook(`clean_all_post')
-userhook(`clean_all_pre')
-userhook(`clean_fail')
-userhook(`clean_post')
-userhook(`clean_pre')
-userhook(`uninstall_pre')
-userhook(`uninstall_fail')
-userhook(`uninstall_post')
-userhook(`uninstall_all_pre')
-userhook(`uninstall_all_post')
-userhook(`sync_pre')
-userhook(`sync_fail')
-userhook(`sync_post')
-userhook(`sync_all_pre')
-userhook(`sync_all_post')
-userhook(`fetch_pre')
-userhook(`fetch_post')
-userhook(`fetch_all_pre')
-userhook(`fetch_all_post')
-
-userhook(`ebuild_metadata_pre')
-userhook(`ebuild_metadata_fail')
-userhook(`ebuild_metadata_post')
-userhook(`ebuild_variable_pre')
-userhook(`ebuild_variable_fail')
-userhook(`ebuild_variable_post')
-userhook(`ebuild_init_pre')
-userhook(`ebuild_init_fail')
-userhook(`ebuild_init_post')
-userhook(`ebuild_initmisc_pre')
-userhook(`ebuild_initmisc_fail')
-userhook(`ebuild_initmisc_post')
-userhook(`ebuild_fetch_extra_pre')
-userhook(`ebuild_fetch_extra_fail')
-userhook(`ebuild_fetch_extra_post')
-userhook(`ebuild_tidyup_pre')
-userhook(`ebuild_tidyup_fail')
-userhook(`ebuild_tidyup_post')
-userhook(`ebuild_unpack_pre')
-userhook(`ebuild_unpack_fail')
-userhook(`ebuild_unpack_post')
-userhook(`ebuild_prepare_pre')
-userhook(`ebuild_prepare_fail')
-userhook(`ebuild_prepare_post')
-userhook(`ebuild_configure_pre')
-userhook(`ebuild_configure_fail')
-userhook(`ebuild_configure_post')
-userhook(`ebuild_compile_pre')
-userhook(`ebuild_compile_fail')
-userhook(`ebuild_compile_post')
-userhook(`ebuild_install_pre')
-userhook(`ebuild_install_fail')
-userhook(`ebuild_install_post')
-userhook(`ebuild_test_pre')
-userhook(`ebuild_test_fail')
-userhook(`ebuild_test_post')
-userhook(`ebuild_test_expensive_pre')
-userhook(`ebuild_test_expensive_fail')
-userhook(`ebuild_test_expensive_post')
-userhook(`ebuild_pretend_pre')
-userhook(`ebuild_pretend_fail')
-userhook(`ebuild_pretend_post')
-userhook(`ebuild_bad_options_pre')
-userhook(`ebuild_bad_options_fail')
-userhook(`ebuild_bad_options_post')
-userhook(`ebuild_bad_required_use_pre')
-userhook(`ebuild_bad_required_use_fail')
-userhook(`ebuild_bad_required_use_post')
-userhook(`ebuild_setup_pre')
-userhook(`ebuild_setup_fail')
-userhook(`ebuild_setup_post')
-userhook(`ebuild_config_pre')
-userhook(`ebuild_config_fail')
-userhook(`ebuild_config_post')
-userhook(`ebuild_nofetch_pre')
-userhook(`ebuild_nofetch_fail')
-userhook(`ebuild_nofetch_post')
-userhook(`ebuild_preinst_pre')
-userhook(`ebuild_preinst_fail')
-userhook(`ebuild_preinst_post')
-userhook(`ebuild_postinst_pre')
-userhook(`ebuild_postinst_fail')
-userhook(`ebuild_postinst_post')
-userhook(`ebuild_prerm_pre')
-userhook(`ebuild_prerm_fail')
-userhook(`ebuild_prerm_post')
-userhook(`ebuild_postrm_pre')
-userhook(`ebuild_postrm_fail')
-userhook(`ebuild_postrm_post')
-userhook(`ebuild_info_pre')
-userhook(`ebuild_info_fail')
-userhook(`ebuild_info_post')
-userhook(`ebuild_infovars_pre')
-userhook(`ebuild_infovars_fail')
-userhook(`ebuild_infovars_post')
-userhook(`ebuild_pivotbin_pre')
-userhook(`ebuild_pivotbin_fail')
-userhook(`ebuild_pivotbin_post')
-userhook(`ebuild_installbin_pre')
-userhook(`ebuild_installbin_fail')
-userhook(`ebuild_installbin_post')
-userhook(`ebuild_saveenv_pre')
-userhook(`ebuild_saveenv_fail')
-userhook(`ebuild_saveenv_post')
-userhook(`ebuild_loadenv_pre')
-userhook(`ebuild_loadenv_fail')
-userhook(`ebuild_loadenv_post')
-userhook(`ebuild_killold_pre')
-userhook(`ebuild_killold_fail')
-userhook(`ebuild_killold_post')
-
-userhook(`einfo')
-userhook(`ewarn')
-userhook(`eerror')
-userhook(`elog')
-
-userhook(`merger_unlink_file_pre')
-userhook(`merger_unlink_file_post')
-userhook(`merger_unlink_dir_pre')
-userhook(`merger_unlink_dir_post')
-userhook(`merger_unlink_sym_pre')
-userhook(`merger_unlink_sym_post')
-userhook(`merger_unlink_misc_pre')
-userhook(`merger_unlink_misc_post')
-userhook(`merger_install_pre')
-userhook(`merger_install_post')
-userhook(`merger_install_file_pre')
-userhook(`merger_install_file_post')
-userhook(`merger_install_sym_pre')
-userhook(`merger_install_sym_post')
-userhook(`merger_install_dir_pre')
-userhook(`merger_install_dir_post')
-userhook(`merger_check_pre')
-userhook(`merger_check_post')
-userhook(`merger_check_file_pre')
-userhook(`merger_check_file_post')
-userhook(`merger_check_sym_pre')
-userhook(`merger_check_sym_post')
-userhook(`merger_check_dir_pre')
-userhook(`merger_check_dir_post')
-userhook(`unmerger_unlink_pre')
-userhook(`unmerger_unlink_post')
-userhook(`unmerger_unlink_file_pre')
-userhook(`unmerger_unlink_file_post')
-userhook(`unmerger_unlink_dir_pre')
-userhook(`unmerger_unlink_dir_post')
-userhook(`unmerger_unlink_sym_pre')
-userhook(`unmerger_unlink_sym_post')
-userhook(`unmerger_unlink_misc_pre')
-userhook(`unmerger_unlink_misc_post')
-
-define(`systemhook', `
-installsystemhooks$1dir = $(libexecdir)/paludis/hooks/$1
-installsystemhooks$1_DATA = .keep')
-
-systemhook(`auto')
-systemhook(`install_pre')
-systemhook(`install_post')
-systemhook(`install_all_pre')
-systemhook(`install_all_post')
-systemhook(`install_pretend_pre')
-systemhook(`install_pretend_post')
-systemhook(`uninstall_pre')
-systemhook(`uninstall_post')
-systemhook(`uninstall_all_pre')
-systemhook(`uninstall_all_post')
-systemhook(`sync_pre')
-systemhook(`sync_post')
-systemhook(`sync_all_pre')
-systemhook(`sync_all_post')
-systemhook(`fetch_all_pre')
-systemhook(`fetch_all_post')
-systemhook(`fetch_all_all_pre')
-systemhook(`fetch_all_all_post')
-
-install-data-local :
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_all_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_all_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_all_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_all_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_pretend_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/install_pretend_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_all_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_all_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_all_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_all_post/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_pre/
-	install -d $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_post/
-	ln -sf ../common/gnu_info_index.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_post/
-	ln -sf ../common/gnu_info_index.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_all_post/
-	ln -sf ../common/eselect_env_update.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_post/
-	ln -sf ../common/eselect_env_update.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_all_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_all_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_all_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_all_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/fetch_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_all_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_all_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_all_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_post/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_pre/
-	ln -sf ../common/log.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_post/
-	ln -sf ../common/installable_cache_regen.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/sync_all_post/
-	ln -sf ../common/installed_cache_regen.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/install_post/
-	ln -sf ../common/installed_cache_regen.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/uninstall_post/
-	ln -sf ../common/installed_cache_regen.bash $(DESTDIR)/$(libexecdir)/paludis/hooks/clean_post/
-
-uninstall-local :
-	rm -f $(DESTDIR)/$(libexecdir)/paludis/hooks/*/gnu_info_index.bash
-	rm -f $(DESTDIR)/$(libexecdir)/paludis/hooks/*/eselect_env_update.bash
-	rm -f $(DESTDIR)/$(libexecdir)/paludis/hooks/*/log.bash
-
-Makefile.am : Makefile.am.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/Makefile.am.m4 $(abs_builddir)/Makefile.am
-
-all-local :
-	chmod +x $(builddir)/news.hook $(builddir)/eselect_env_update.bash
-
diff --git a/misc/Makefile.am b/misc/Makefile.am
deleted file mode 100644
index 6293f4ce7..000000000
--- a/misc/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-CLEANFILES = *~ *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = generated-file.txt do_m4.bash make_se.bash make_nn.bash common-makefile.am asciidoc.conf
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/misc/common-makefile.am b/misc/common-makefile.am
deleted file mode 100644
index cc35df06f..000000000
--- a/misc/common-makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-# vim: ft=automake :
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-LOG_COMPILER = \
-	unset PALUDIS_TESTS_REAL_STDOUT_FD 2>&1 >/dev/null ; \
-	test "x$$BASH_VERSION" == x || eval "exec 3<&1 ; export PALUDIS_TESTS_REAL_STDOUT_FD=3" ; \
-	env \
-		ACCERSO_OPTIONS="" \
-		ADJUTRIX_OPTIONS="" \
-		APPAREO_OPTIONS="" \
-		CAVE_FORMATS_CONF="/dev/null" \
-		CAVE_COMMANDS_PATH="" \
-		CAVE_OPTIONS="" \
-		CAVE_CONFIG_OPTIONS="" \
-		CAVE_CONTENTS_OPTIONS="" \
-		CAVE_DISPLAY_RESOLUTION_OPTIONS="" \
-		CAVE_EXECUTE_RESOLUTION_OPTIONS="" \
-		CAVE_FIND_CANDIDATES_OPTIONS="" \
-		CAVE_FIX_CACHE_OPTIONS="" \
-		CAVE_FIX_LINKAGE_OPTIONS="" \
-		CAVE_HELP_OPTIONS="" \
-		CAVE_IMPORT_OPTIONS="" \
-		CAVE_INFO_OPTIONS="" \
-		CAVE_MATCH_OPTIONS="" \
-		CAVE_PERFORM_OPTIONS="" \
-		CAVE_PRINT_CATEGORIES_OPTIONS="" \
-		CAVE_PRINT_COMMANDS_OPTIONS="" \
-		CAVE_PRINT_ENVIRONMENT_METADATA_OPTIONS="" \
-		CAVE_PRINT_ID_CONTENTS_OPTIONS="" \
-		CAVE_PRINT_ID_EXECUTABLES_OPTIONS="" \
-		CAVE_PRINT_ID_METADATA_OPTIONS="" \
-		CAVE_PRINT_IDS_OPTIONS="" \
-		CAVE_PRINT_OWNERS_OPTIONS="" \
-		CAVE_PRINT_PACKAGES_OPTIONS="" \
-		CAVE_PRINT_REPOSITORIES_OPTIONS="" \
-		CAVE_PRINT_REPOSITORY_FORMATS_OPTIONS="" \
-		CAVE_PRINT_SETS_OPTIONS="" \
-		CAVE_PRINT_SYNC_PROTOCOLS_OPTIONS="" \
-		CAVE_PURGE_OPTIONS="" \
-		CAVE_RESOLVE_OPTIONS="" \
-		CAVE_RESUME_OPTIONS="" \
-		CAVE_SEARCH_OPTIONS="" \
-		CAVE_SHOW_OPTIONS="" \
-		CAVE_SYNC_OPTIONS="" \
-		CAVE_UNINSTALL_OPTIONS="" \
-		CAVE_UPDATE_WORLD_OPTIONS="" \
-		INQUISITIO_OPTIONS="" \
-		FILESYSTEM_LAYOUT="" \
-		LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
-			$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
-			`:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/.libs/ \
-			`:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/ruby/.libs/ \
-			`:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/python/.libs/ \
-			`:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/ \
-			`:`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/gemcutter/.libs/`" \
-		PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
-		PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/tests_output.conf`" \
-		PALUDIS_DISTRIBUTION="gentoo" \
-		PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
-		PALUDIS_EAPIS_DIR="$(top_srcdir)/paludis/repositories/e/eapis/" \
-		PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
-		PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/ebuild/`" \
-		PALUDIS_ECHO_FUNCTIONS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
-		PALUDIS_EXTRA_EBUILD_MODULES_DIRS="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
-		PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
-		PALUDIS_FAILURE_IS_FATAL="" \
-		PALUDIS_FAILURE_IS_NONFATAL="" \
-		PALUDIS_GEMS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/gems/`" \
-		PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
-		PALUDIS_NO_CHOWN="yupyup" \
-		PALUDIS_NO_GLOBAL_HOOKS="yes" \
-		PALUDIS_NO_GLOBAL_SETS="yes" \
-		PALUDIS_NO_XML= \
-		PALUDIS_NO_XTERM_TITLES="yes" \
-		PALUDIS_OPTIONS="" \
-		PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/environments/paludis/output_managers/`" \
-		PALUDIS_PC_SLOT=@PALUDIS_PC_SLOT@ \
-		PALUDIS_PIPE_COMMAND_READ_FD="" \
-		PALUDIS_PIPE_COMMAND_WRITE_FD="" \
-		PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
-		PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
-		PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
-		PALUDIS_REDUCED_USERNAME="`id -un`" \
-		PALUDIS_SKIP_CONFIG="yes" \
-		PALUDIS_SUFFIXES_FILE="$(top_srcdir)/paludis/repositories/e/ebuild_entries_suffixes.conf" \
-		PALUDIS_SYNCERS_DIR="$(top_srcdir)/paludis/syncers/" \
-		PALUDIS_TMPDIR="`pwd`" \
-		PATH="${PATH}:/sbin:/usr/sbin" \
-		PYTHON="$(PYTHON)" \
-		RUBY="$(RUBY)" \
-		SO_SUFFIX=@VERSION_LIB_CURRENT@ \
-		SYSCONFDIR="$(sysconfdir)" \
-		PYTHONPATH="$(top_builddir)/python/:$(top_builddir)/python/.libs/" \
-		TEST_SCRIPT_DIR="$(srcdir)/" \
-		TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
-		TOP_BUILDDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)`" \
-		TZ=UTC \
-		$(LOG_COMPILER_EXTRA) \
-		bash $(top_srcdir)/paludis/util/run_test.sh $(LOG_COMPILER_INTERP)
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/misc/do_m4.bash b/misc/do_m4.bash
deleted file mode 100755
index a63fb5936..000000000
--- a/misc/do_m4.bash
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et tw=80 :
-
-if test "xyes" = x"${BASH_VERSION}" ; then
-    echo "This is not bash!"
-    exit 127
-fi
-
-trap 'echo "exiting." ; exit 250' 15
-KILL_PID=$$
-
-get_m4() {
-    type "gm4" &>/dev/null && echo gm4 && return
-    type "m4"  &>/dev/null && echo m4  && return
-    echo "Could not find m4" 1>&2
-    kill $KILL_PID
-}
-
-get_abs_top_srcdir() {
-    echo "$(dirname $(dirname "${0}"))"
-}
-
-echo ">>> $(get_m4) -I $(get_abs_top_srcdir) -E ${1} > ${2}"
-if ! $(get_m4) -I $(get_abs_top_srcdir) -E "${1}" > "${2}" ; then
-    echo "oops!" 1>&2
-    exit 127
-fi
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
deleted file mode 100644
index da050b41d..000000000
--- a/paludis/Makefile.am.m4
+++ /dev/null
@@ -1,178 +0,0 @@
-ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
-')m4exit(1)') include(`misc/generated-file.txt')
-
-dnl vim: set ft=m4 noet :
-
-include $(top_srcdir)/misc/common-makefile.am
-
-define(`filelist', `')dnl
-define(`gtestlist', `')dnl
-define(`headerlist', `')dnl
-define(`selist', `')dnl
-define(`secleanlist', `')dnl
-define(`seheaderlist', `')dnl
-define(`testscriptlist', `')dnl
-define(`addgtest', `define(`gtestlist', gtestlist `$1_TEST')dnl
-$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-$1_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-')dnl
-define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
-define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
-define(`addfwd', `define(`filelist', filelist `$1-fwd.hh')define(`headerlist', headerlist `$1-fwd.hh')')dnl
-define(`addhhx', `define(`filelist', filelist `$1.hh')')dnl
-define(`addcc', `define(`filelist', filelist `$1.cc')')dnl
-define(`addimpl', `define(`filelist', filelist `$1-impl.hh')define(`headerlist', headerlist `$1-impl.hh')')dnl
-define(`addse', `define(`selist', selist `$1.se')dnl
-define(`secleanlist', secleanlist `$1-se.hh $1-se.cc')dnl
-define(`seheaderlist', seheaderlist `$1-se.hh')dnl
-$1-se.hh : $1.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $`'(srcdir)/$1.se > $`'@ ; then rm -f $`'@ ; exit 1 ; fi
-
-$1-se.cc : $1.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $`'(srcdir)/$1.se > $`'@ ; then rm -f $`'@ ; exit 1 ; fi
-
-')dnl
-define(`addthis', `dnl
-ifelse(`$2', `hh', `addhh(`$1')', `')dnl
-ifelse(`$2', `fwd', `addfwd(`$1')', `')dnl
-ifelse(`$2', `hhx', `addhhx(`$1')', `')dnl
-ifelse(`$2', `cc', `addcc(`$1')', `')dnl
-ifelse(`$2', `se', `addse(`$1')', `')dnl
-ifelse(`$2', `impl', `addimpl(`$1')', `')dnl
-ifelse(`$2', `gtest', `addgtest(`$1')', `')dnl
-ifelse(`$2', `testscript', `addtestscript(`$1')', `')')dnl
-define(`add', `addthis(`$1',`$2')addthis(`$1',`$3')addthis(`$1',`$4')dnl
-addthis(`$1',`$5')addthis(`$1',`$6')addthis(`$1',`$7')addthis(`$1',`$8')')dnl
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-include(`paludis/files.m4')
-
-MAINTAINERCLEANFILES += Makefile.am about.hh paludis.hh
-DISTCLEANFILES = secleanlist
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DPYTHONINSTALLDIR=\"$(PYTHON_INSTALL_DIR)\"
-EXTRA_DIST = about.hh.in Makefile.am.m4 paludis.hh.m4 files.m4 \
-	testscriptlist selist secleanlist \
-	hooker.bash \
-	stripper_TEST_binary.cc
-SUBDIRS = distributions fetchers syncers util selinux repositories environments . args resolver
-BUILT_SOURCES = secleanlist
-
-libpaludis_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
-libpaludis_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS)
-
-libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_SOURCES = python_hooks.cc
-libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) \
-	@PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@ \
-	-I@PYTHON_INCLUDE_DIR@
-libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 @BOOST_PYTHON_LIB@ -lpython@PYTHON_VERSION@
-libpaludispythonhooks_@PALUDIS_PC_SLOT@_la_LIBADD = libpaludis_@PALUDIS_PC_SLOT@.la
-
-libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_SOURCES = sohooks_TEST.cc
-
-# -rpath to force shared library
-libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_LDFLAGS = -rpath /nowhere -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-libpaludissohooks_TEST_@PALUDIS_PC_SLOT@_la_LIBADD = libpaludis_@PALUDIS_PC_SLOT@.la
-
-repositories_libadd =
-
-define(`condrepo', `
-if ENABLE_`'translit($1,`a-z',`A-Z')_REPOSITORY
-repositories_libadd += $(top_builddir)/paludis/repositories/$1/libpaludis$1repository.la
-endif
-')
-
-condrepo(accounts)
-condrepo(dummy)
-condrepo(e)
-condrepo(fake)
-condrepo(gemcutter)
-condrepo(repository)
-condrepo(unavailable)
-condrepo(unpackaged)
-condrepo(unwritten)
-
-environments_libadd =
-
-define(`condenv', `
-if ENABLE_`'translit($1,`a-z',`A-Z')_ENVIRONMENT
-environments_libadd += $(top_builddir)/paludis/environments/$1/libpaludis`'translit($1,_,)environment.la
-endif
-')
-
-condenv(dummy)
-condenv(paludis)
-condenv(portage)
-condenv(test)
-
-libpaludis_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/selinux/libpaludisselinux_@PALUDIS_PC_SLOT@.la \
-	$(repositories_libadd) \
-	$(environments_libadd) \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	@DYNAMIC_LD_LIBS@ \
-	$(PTHREAD_LIBS)
-
-if HAVE_GTEST
-TESTS = gtestlist
-else
-TESTS =
-endif
-
-check_PROGRAMS = $(TESTS) stripper_TEST_binary
-check_SCRIPTS = testscriptlist
-check_LTLIBRARIES = libpaludissohooks_TEST_@PALUDIS_PC_SLOT@.la
-
-stripper_TEST_binary_SOURCES = stripper_TEST_binary.cc
-
-paludis_libexecdir = $(libexecdir)/paludis
-paludis_libexec_SCRIPTS = hooker.bash
-
-lib_LTLIBRARIES = libpaludis_@PALUDIS_PC_SLOT@.la
-
-if ENABLE_PYTHON_HOOKS
-lib_LTLIBRARIES += libpaludispythonhooks_@PALUDIS_PC_SLOT@.la
-endif
-
-if ENABLE_PBINS
-lib_LTLIBRARIES += libpaludistarextras_@PALUDIS_PC_SLOT@.la
-endif
-
-libpaludistarextras_@PALUDIS_PC_SLOT@_la_SOURCES = tar_extras.cc tar_extras.hh
-libpaludistarextras_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS)
-libpaludistarextras_@PALUDIS_PC_SLOT@_la_LIBADD = -larchive
-libpaludistarextras_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-if ENABLE_STRIPPER
-lib_LTLIBRARIES += libpaludisstripperextras_@PALUDIS_PC_SLOT@.la
-endif
-
-libpaludisstripperextras_@PALUDIS_PC_SLOT@_la_SOURCES = stripper_extras.cc stripper_extras.hh
-libpaludisstripperextras_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBMAGICDEPS_CFLAGS)
-libpaludisstripperextras_@PALUDIS_PC_SLOT@_la_LIBADD = $(LIBMAGICDEPS_LIBS)
-libpaludisstripperextras_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-paludis_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/
-paludis_include_HEADERS = headerlist seheaderlist
-
-Makefile.am : Makefile.am.m4 files.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/Makefile.am.m4 $(abs_builddir)/Makefile.am
-
-paludis.hh : paludis.hh.m4 files.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/paludis.hh.m4 $(abs_builddir)/paludis.hh
-
-comparison_policy.hh : comparison_policy.hh.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/comparison_policy.hh.m4 $(abs_builddir)/comparison_policy.hh
-
diff --git a/paludis/args/Makefile.am b/paludis/args/Makefile.am
deleted file mode 100644
index 2a877dd03..000000000
--- a/paludis/args/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-DISTCLEANFILES = args_handler-se.hh args_handler-se.cc
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-EXTRA_DIST = args_handler-se.hh args_handler-se.cc args_handler.se
-BUILT_SOURCES = args_handler-se.hh args_handler-se.cc
-
-TESTS = \
-	args_TEST
-
-paludis_args_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/args/
-
-paludis_args_include_HEADERS = \
-	args.hh                \
-	args_error.hh          \
-	args_group.hh          \
-	args_handler.hh        \
-	args_handler-se.hh     \
-	args_option.hh         \
-	args_section.hh        \
-	bad_argument.hh        \
-	args_visitor.hh        \
-	args_dumper.hh         \
-	escape.hh              \
-	man.hh                 \
-	log_level_arg.hh       \
-	do_help.hh
-
-libpaludisargs_@PALUDIS_PC_SLOT@_la_SOURCES = \
-	args.cc \
-	args_error.cc \
-	args_group.cc \
-	args_handler.cc \
-	args_option.cc \
-	args_section.cc \
-	bad_argument.cc \
-	args_visitor.cc \
-	args_dumper.cc \
-	escape.cc \
-	log_level_arg.cc \
-	man.cc
-
-libpaludisargs_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-libpaludisargs_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-
-lib_LTLIBRARIES = libpaludisargs_@PALUDIS_PC_SLOT@.la
-
-check_PROGRAMS = $(TESTS)
-
-test_ldadd = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	libpaludisargs_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-
-args_TEST_SOURCES = args_TEST.cc
-args_TEST_LDADD = $(test_ldadd)
-args_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-args_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-args_handler-se.hh : args_handler.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/args_handler.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-args_handler-se.cc : args_handler.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/args_handler.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
diff --git a/paludis/distributions/Makefile.am b/paludis/distributions/Makefile.am
deleted file mode 100644
index 2a9d6b002..000000000
--- a/paludis/distributions/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS = . exherbo gentoo
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-distributions = \
-	exherbo.conf \
-	gentoo.conf
-
-distributionsdir = $(datadir)/paludis/distributions/
-
-distributions_DATA = $(distributions)
-
-EXTRA_DIST = $(distributions)
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/distributions/exherbo/Makefile.am b/paludis/distributions/exherbo/Makefile.am
deleted file mode 100644
index 5fa94ac94..000000000
--- a/paludis/distributions/exherbo/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS =
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-distributiondir = $(datadir)/paludis/distributions/exherbo/
-
-distribution_DATA = e.conf gems.conf paludis.conf repository_blacklist.conf
-
-EXTRA_DIST = $(distribution_DATA)
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/distributions/gentoo/Makefile.am b/paludis/distributions/gentoo/Makefile.am
deleted file mode 100644
index 3a2f5b95a..000000000
--- a/paludis/distributions/gentoo/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS =
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-distributiondir = $(datadir)/paludis/distributions/gentoo/
-
-distribution_DATA = e.conf gems.conf paludis.conf repository_blacklist.conf
-
-EXTRA_DIST = $(distribution_DATA)
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/environments/Makefile.am b/paludis/environments/Makefile.am
deleted file mode 100644
index 27a503735..000000000
--- a/paludis/environments/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = . $(BUILD_ENVIRONMENTS)
-DIST_SUBDIRS = $(ALL_ENVIRONMENTS)
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
deleted file mode 100644
index 0ff8e41df..000000000
--- a/paludis/environments/paludis/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DSHAREDIR=\"$(datarootdir)\"
-
-libpaludispaludisenvironment_la_SOURCES = \
-	bashable_conf.cc           bashable_conf.hh \
-	extra_distribution_data.cc extra_distribution_data.hh \
-	keywords_conf.cc           keywords_conf.hh \
-	licenses_conf.cc           licenses_conf.hh \
-	mirrors_conf.cc            mirrors_conf.hh \
-	output_conf.cc             output_conf.hh \
-	package_mask_conf.cc       package_mask_conf.hh \
-	paludis_config.cc          paludis_config.hh \
-	paludis_environment.cc     paludis_environment.hh \
-	suggestions_conf.cc        suggestions_conf.hh \
-	use_conf.cc                use_conf.hh \
-	world.cc                   world.hh \
-	registration.cc
-
-shareenvpaludisdir = $(datarootdir)/paludis/environments/paludis/
-
-dist_shareenvpaludis_DATA = \
-	default_output.conf
-
-dist_noinst_DATA = \
-	tests_output.conf
-
-libenvdir = $(libdir)/paludis/environments
-
-noinst_LTLIBRARIES = libpaludispaludisenvironment.la
-
-noinst_HEADERS = \
-	bashable_conf.hh \
-	extra_distribution_data.hh \
-	keywords_conf.hh \
-	licenses_conf.hh \
-	mirrors_conf.hh \
-	package_mask_conf.hh \
-	paludis_config.hh \
-	paludis_environment.hh \
-	suggestions_conf.hh \
-	use_conf.hh \
-	world.hh
-
-EXTRA_DIST = \
-	paludis_environment_TEST_setup.sh \
-	paludis_environment_TEST.cc \
-	paludis_environment_TEST_cleanup.sh \
-	world_TEST_setup.sh \
-	world_TEST.cc \
-	world_TEST_cleanup.sh \
-	$(BUILT_SOURCES)
-
-TESTS = paludis_environment_TEST world_TEST
-
-check_PROGRAMS = $(TESTS)
-check_SCRIPTS = \
-	paludis_environment_TEST_setup.sh paludis_environment_TEST_cleanup.sh \
-	world_TEST_setup.sh world_TEST_cleanup.sh
-
-paludis_environment_TEST_SOURCES = paludis_environment_TEST.cc
-
-paludis_environment_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-paludis_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-paludis_environment_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-world_TEST_SOURCES = world_TEST.cc
-
-world_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-world_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-world_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-logdir = @HACKED_LOG_DIR@
-
-log_DATA = .keep
-
-.keep :
-	touch $@
-
-CLEANFILES += .keep
-
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
deleted file mode 100644
index b6892360e..000000000
--- a/paludis/environments/portage/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-libpaludisportageenvironment_la_SOURCES = \
-	registration.cc \
-	portage_environment.cc portage_environment.hh
-
-libexecenvdir = $(libexecdir)/paludis/environments/portage/
-libexecenv_SCRIPTS = bashrc
-
-noinst_LTLIBRARIES = libpaludisportageenvironment.la
-
-noinst_HEADERS = \
-	portage_environment.hh
-
-EXTRA_DIST = \
-	$(BUILT_SOURCES) \
-	$(libexecenv_SCRIPTS) \
-	portage_environment_TEST_setup.sh \
-	portage_environment_TEST.cc \
-	portage_environment_TEST_cleanup.sh
-
-TESTS = portage_environment_TEST
-
-portage_environment_TEST_SOURCES = portage_environment_TEST.cc
-
-portage_environment_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-portage_environment_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-portage_environment_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-check_PROGRAMS = $(TESTS)
-check_SCRIPTS = portage_environment_TEST_setup.sh portage_environment_TEST_cleanup.sh
-
diff --git a/paludis/environments/test/Makefile.am b/paludis/environments/test/Makefile.am
deleted file mode 100644
index fbdb07087..000000000
--- a/paludis/environments/test/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT ihateautomake.cc ihateautomake.o *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-libpaludistestenvironment_la_SOURCES = \
-	test_environment.cc test_environment.hh \
-	registration.cc
-
-noinst_LTLIBRARIES = libpaludistestenvironment.la
-
-paludis_environment_test_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/environments/test
-paludis_environment_test_include_HEADERS = test_environment.hh
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/fetchers/Makefile.am b/paludis/fetchers/Makefile.am
deleted file mode 100644
index b68d03500..000000000
--- a/paludis/fetchers/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . demos
-
-CLEANFILES += .keep
-
-.keep :
-	touch $@
-
-libexecprogdir = $(libexecdir)/paludis/fetchers/
-
-libexecprog_SCRIPTS = \
-	dohttp \
-	dohttps \
-	doftp \
-	dofile
-installuserfetchersdir = $(datadir)/paludis/fetchers
-installuserfetchers_DATA = .keep
-
-TESTS =
-EXTRA_DIST = $(libexecprog_SCRIPTS) dowget.in
-
-check_SCRIPTS =
-check_PROGRAMS = $(TESTS)
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-dohttp dohttps doftp : dowget.in
-	cat $? > $@
-
diff --git a/paludis/fetchers/demos/Makefile.am b/paludis/fetchers/demos/Makefile.am
deleted file mode 100644
index 3ba1ccf59..000000000
--- a/paludis/fetchers/demos/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS = .
-
-DEMOS = \
-	docurl
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.o *.so *.epicfail
-
-fetchersdemosdir = $(datadir)/paludis/fetchers/demos/
-fetchersdemos_SCRIPTS = $(DEMOS)
-
-EXTRA_DIST = $(DEMOS)
-
-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/Makefile.am b/paludis/repositories/Makefile.am
deleted file mode 100644
index 9192188f6..000000000
--- a/paludis/repositories/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . $(BUILD_REPOSITORIES)
-
-DIST_SUBDIRS = $(ALL_REPOSITORIES)
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
deleted file mode 100644
index 11dd077f9..000000000
--- a/paludis/repositories/accounts/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisaccountsrepository.la
-
-noinst_HEADERS = \
-	accounts_exceptions.hh \
-	accounts_handler.hh \
-	accounts_repository.hh \
-	accounts_repository_store.hh \
-	dummy_accounts_handler.hh \
-	passwd_accounts_handler.hh \
-	accounts_id.hh \
-	accounts_dep_key.hh \
-	accounts_installed_mask.hh \
-	installed_accounts_id.hh
-
-libpaludisaccountsrepository_la_SOURCES = \
-	accounts_exceptions.cc \
-	accounts_handler.cc \
-	accounts_repository.cc \
-	accounts_repository_store.cc \
-	accounts_id.cc \
-	accounts_dep_key.cc \
-	accounts_installed_mask.cc \
-	installed_accounts_id.cc \
-	dummy_accounts_handler.cc \
-	passwd_accounts_handler.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
-accounts_repository_TEST_SOURCES = accounts_repository_TEST.cc
-
-accounts_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-accounts_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-accounts_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-EXTRA_DIST = \
-	accounts_repository_TEST.cc
-
-check_SCRIPTS =
-
-TESTS = \
-	accounts_repository_TEST
-
-check_PROGRAMS = $(TESTS)
-
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
deleted file mode 100644
index b0fefad8e..000000000
--- a/paludis/repositories/e/Makefile.am
+++ /dev/null
@@ -1,750 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = eapis ebuild .
-DISTCLEANFILES = \
-	e_repository_params-se.hh e_repository_params-se.cc \
-	dep_parser-se.hh dep_parser-se.cc \
-	iuse-se.hh iuse-se.cc
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludiserepository.la
-
-if ENABLE_XML
-lib_LTLIBRARIES = libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@.la
-endif
-
-noinst_HEADERS = \
-	a_finder.hh \
-	aa_visitor.hh \
-	can_skip_phase.hh \
-	check_fetched_files_visitor.hh \
-	check_userpriv.hh \
-	dep_parser.hh \
-	dep_parser-se.hh \
-	dep_parser-fwd.hh \
-	do_fetch_action.hh \
-	do_info_action.hh \
-	do_install_action.hh \
-	do_pretend_action.hh \
-	do_pretend_fetch_action.hh \
-	e_choice_value.hh \
-	e_installed_repository.hh \
-	e_installed_repository_id.hh \
-	e_choices_key.hh \
-	e_key.hh \
-	e_keywords_key.hh \
-	e_mask.hh \
-	e_repository.hh \
-	e_repository_exceptions.hh \
-	e_repository_id.hh \
-	e_repository_news.hh \
-	e_repository_params-se.hh \
-	e_repository_params.hh \
-	e_repository_sets.hh \
-	e_slot_key.hh \
-	e_string_set_key.hh \
-	e_stripper.hh \
-	eapi.hh \
-	eapi-fwd.hh \
-	eapi_phase.hh \
-	ebuild.hh \
-	ebuild_flat_metadata_cache.hh \
-	ebuild_id.hh \
-	eclass_mtimes.hh \
-	exheres_layout.hh \
-	exheres_mask_store.hh \
-	exheres_profile.hh \
-	exndbam_id.hh \
-	exndbam_repository.hh \
-	extra_distribution_data.hh \
-	fetch_visitor.hh \
-	file_suffixes.hh \
-	info_metadata_key.hh \
-	iuse.hh \
-	iuse-se.hh \
-	pretend_fetch_visitor.hh \
-	fix_locked_dependencies.hh \
-	glsa.hh \
-	layout.hh \
-	licence_groups.hh \
-	make_archive_strings.hh \
-	make_use.hh \
-	manifest2_reader.hh \
-	mask_info.hh \
-	memoised_hashes.hh \
-	metadata_xml.hh \
-	myoption.hh \
-	myoptions_requirements_verifier.hh \
-	parse_annotations.hh \
-	parse_dependency_label.hh \
-	parse_plain_text_label.hh \
-	parse_uri_label.hh \
-	pbin_merger.hh \
-	permitted_directories.hh permitted_directories-fwd.hh \
-	pipe_command_handler.hh \
-	profile.hh \
-	required_use_verifier.hh \
-	source_uri_finder.hh \
-	spec_tree_pretty_printer.hh \
-	traditional_layout.hh \
-	traditional_mask_file.hh \
-	traditional_mask_store.hh \
-	traditional_profile.hh \
-	traditional_profile_file.hh \
-	use_desc.hh \
-	xml_things_handle.hh \
-	vdb_contents_tokeniser.hh \
-	vdb_id.hh \
-	vdb_merger.hh \
-	vdb_repository.hh \
-	vdb_unmerger.hh
-
-libpaludiserepository_la_SOURCES = \
-	a_finder.cc \
-	aa_visitor.cc \
-	can_skip_phase.cc \
-	check_fetched_files_visitor.cc \
-	check_userpriv.cc \
-	dep_parser.cc \
-	do_fetch_action.cc \
-	do_info_action.cc \
-	do_install_action.cc \
-	do_pretend_action.cc \
-	do_pretend_fetch_action.cc \
-	e_choice_value.cc \
-	e_installed_repository.cc \
-	e_installed_repository_id.cc \
-	e_choices_key.cc \
-	e_key.cc \
-	e_keywords_key.cc \
-	e_mask.cc \
-	e_repository.cc \
-	e_repository_exceptions.cc \
-	e_repository_id.cc \
-	e_repository_news.cc \
-	e_repository_params.cc \
-	e_repository_sets.cc \
-	e_slot_key.cc \
-	e_string_set_key.cc \
-	e_stripper.cc \
-	eapi.cc \
-	eapi_phase.cc \
-	ebuild.cc \
-	ebuild_flat_metadata_cache.cc \
-	ebuild_id.cc \
-	eclass_mtimes.cc \
-	exndbam_id.cc \
-	exndbam_repository.cc \
-	exheres_layout.cc \
-	exheres_mask_store.cc \
-	exheres_profile.cc \
-	extra_distribution_data.cc \
-	fetch_visitor.cc \
-	file_suffixes.cc \
-	info_metadata_key.cc \
-	iuse.cc \
-	pretend_fetch_visitor.cc \
-	fix_locked_dependencies.cc \
-	glsa.cc \
-	layout.cc \
-	licence_groups.cc \
-	make_archive_strings.cc \
-	make_use.cc \
-	manifest2_reader.cc \
-	mask_info.cc \
-	memoised_hashes.cc \
-	metadata_xml.cc \
-	myoption.cc \
-	myoptions_requirements_verifier.cc \
-	parse_annotations.cc \
-	parse_dependency_label.cc \
-	parse_plain_text_label.cc \
-	parse_uri_label.cc \
-	pbin_merger.cc \
-	permitted_directories.cc \
-	pipe_command_handler.cc \
-	profile.cc \
-	registration.cc \
-	required_use_verifier.cc \
-	source_uri_finder.cc \
-	spec_tree_pretty_printer.cc \
-	traditional_layout.cc \
-	traditional_mask_file.cc \
-	traditional_mask_store.cc \
-	traditional_profile.cc \
-	traditional_profile_file.cc \
-	use_desc.cc \
-	xml_things_handle.cc \
-	vdb_id.cc \
-	vdb_merger.cc \
-	vdb_repository.cc \
-	vdb_unmerger.cc \
-	$(noinst_HEADERS)
-
-e_repository_TEST_SOURCES = e_repository_TEST.cc
-
-e_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-depend_rdepend_TEST_SOURCES = depend_rdepend_TEST.cc
-
-depend_rdepend_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-depend_rdepend_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-depend_rdepend_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_ever_SOURCES = e_repository_TEST_ever.cc
-
-e_repository_TEST_ever_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_ever_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_ever_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_exheres_0_SOURCES = e_repository_TEST_exheres_0.cc
-
-e_repository_TEST_exheres_0_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_exheres_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_exheres_0_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_0_SOURCES = e_repository_TEST_0.cc
-
-e_repository_TEST_0_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_0_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_1_SOURCES = e_repository_TEST_1.cc
-
-e_repository_TEST_1_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_1_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_1_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_2_SOURCES = e_repository_TEST_2.cc
-
-e_repository_TEST_2_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_2_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_2_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_3_SOURCES = e_repository_TEST_3.cc
-
-e_repository_TEST_3_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_3_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_3_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_4_SOURCES = e_repository_TEST_4.cc
-
-e_repository_TEST_4_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_4_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_4_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_5_SOURCES = e_repository_TEST_5.cc
-
-e_repository_TEST_5_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_5_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_5_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_6_SOURCES = e_repository_TEST_6.cc
-
-e_repository_TEST_6_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_6_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_6_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_phases_SOURCES = e_repository_TEST_phases.cc
-
-e_repository_TEST_phases_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_phases_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_phases_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_exlibs_SOURCES = e_repository_TEST_exlibs.cc
-
-e_repository_TEST_exlibs_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_exlibs_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_exlibs_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_replacing_SOURCES = e_repository_TEST_replacing.cc
-
-e_repository_TEST_replacing_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_replacing_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_replacing_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-e_repository_TEST_symlink_rewriting_SOURCES = e_repository_TEST_symlink_rewriting.cc
-
-e_repository_TEST_symlink_rewriting_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_symlink_rewriting_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_symlink_rewriting_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_repository_TEST_SOURCES = vdb_repository_TEST.cc
-
-vdb_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-vdb_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-vdb_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_repository_TEST_eapis_SOURCES = vdb_repository_TEST_eapis.cc
-
-vdb_repository_TEST_eapis_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-vdb_repository_TEST_eapis_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-vdb_repository_TEST_eapis_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_repository_TEST_cache_SOURCES = vdb_repository_TEST_cache.cc
-
-vdb_repository_TEST_cache_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-vdb_repository_TEST_cache_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-vdb_repository_TEST_cache_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-exndbam_repository_TEST_SOURCES = exndbam_repository_TEST.cc
-
-exndbam_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-exndbam_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-exndbam_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_merger_TEST_SOURCES = vdb_merger_TEST.cc
-
-vdb_merger_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-vdb_merger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-vdb_merger_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
-
-vdb_unmerger_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-vdb_unmerger_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc
-
-e_repository_sets_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_sets_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-dep_parser_TEST_SOURCES = dep_parser_TEST.cc
-
-dep_parser_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-dep_parser_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-aa_visitor_TEST_SOURCES = aa_visitor_TEST.cc
-
-aa_visitor_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-aa_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-aa_visitor_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-fetch_visitor_TEST_SOURCES = fetch_visitor_TEST.cc
-
-fetch_visitor_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-fetch_visitor_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-fetch_visitor_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-source_uri_finder_TEST_SOURCES = source_uri_finder_TEST.cc
-
-source_uri_finder_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-source_uri_finder_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-source_uri_finder_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-fix_locked_dependencies_TEST_SOURCES = fix_locked_dependencies_TEST.cc
-
-fix_locked_dependencies_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-fix_locked_dependencies_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-fix_locked_dependencies_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-ebuild_flat_metadata_cache_TEST_SOURCES = ebuild_flat_metadata_cache_TEST.cc
-
-ebuild_flat_metadata_cache_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-ebuild_flat_metadata_cache_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-ebuild_flat_metadata_cache_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-EXTRA_DIST = \
-	aa_visitor_TEST.cc \
-	dep_parser.se \
-	dep_parser-se.hh \
-	dep_parser-se.cc \
-	dep_parser_TEST.cc \
-	depend_rdepend_TEST.cc \
-	depend_rdepend_TEST_setup.sh \
-	depend_rdepend_TEST_cleanup.sh \
-	e_repository_TEST.cc \
-	e_repository_TEST_setup.sh \
-	e_repository_TEST_cleanup.sh \
-	e_repository_TEST_ever.cc \
-	e_repository_TEST_ever_setup.sh \
-	e_repository_TEST_ever_cleanup.sh \
-	e_repository_TEST_exheres_0.cc \
-	e_repository_TEST_exheres_0_setup.sh \
-	e_repository_TEST_exheres_0_cleanup.sh \
-	e_repository_TEST_0.cc \
-	e_repository_TEST_0_setup.sh \
-	e_repository_TEST_0_cleanup.sh \
-	e_repository_TEST_1.cc \
-	e_repository_TEST_1_setup.sh \
-	e_repository_TEST_1_cleanup.sh \
-	e_repository_TEST_2.cc \
-	e_repository_TEST_2_setup.sh \
-	e_repository_TEST_2_cleanup.sh \
-	e_repository_TEST_3.cc \
-	e_repository_TEST_3_setup.sh \
-	e_repository_TEST_3_cleanup.sh \
-	e_repository_TEST_4.cc \
-	e_repository_TEST_4_setup.sh \
-	e_repository_TEST_4_cleanup.sh \
-	e_repository_TEST_5.cc \
-	e_repository_TEST_5_setup.sh \
-	e_repository_TEST_5_cleanup.sh \
-	e_repository_TEST_6.cc \
-	e_repository_TEST_6_setup.sh \
-	e_repository_TEST_6_cleanup.sh \
-	e_repository_TEST_pbin.cc \
-	e_repository_TEST_pbin_setup.sh \
-	e_repository_TEST_pbin_cleanup.sh \
-	e_repository_TEST_phases.cc \
-	e_repository_TEST_phases_setup.sh \
-	e_repository_TEST_phases_cleanup.sh \
-	e_repository_TEST_exlibs.cc \
-	e_repository_TEST_exlibs_setup.sh \
-	e_repository_TEST_exlibs_cleanup.sh \
-	e_repository_TEST_replacing.cc \
-	e_repository_TEST_replacing_setup.sh \
-	e_repository_TEST_replacing_cleanup.sh \
-	e_repository_TEST_symlink_rewriting.cc \
-	e_repository_TEST_symlink_rewriting_setup.sh \
-	e_repository_TEST_symlink_rewriting_cleanup.sh \
-	e_repository_params-se.hh \
-	e_repository_params-se.cc \
-	e_repository_params.se \
-	e_repository_sets_TEST.cc \
-	e_repository_sets_TEST_setup.sh \
-	e_repository_sets_TEST_cleanup.sh \
-	ebuild_flat_metadata_cache_TEST.cc \
-	ebuild_flat_metadata_cache_TEST_setup.sh \
-	ebuild_flat_metadata_cache_TEST_cleanup.sh \
-	exndbam_repository_TEST.cc \
-	exndbam_repository_TEST_setup.sh \
-	exndbam_repository_TEST_cleanup.sh \
-	fetch_visitor_TEST.cc \
-	fetch_visitor_TEST_setup.sh \
-	fetch_visitor_TEST_cleanup.sh \
-	fix_locked_dependencies_TEST.cc \
-	iuse.se \
-	iuse-se.hh \
-	iuse-se.cc \
-	source_uri_finder_TEST.cc \
-	xml_things_TEST.cc \
-	xml_things_TEST_setup.sh \
-	xml_things_TEST_cleanup.sh \
-	vdb_repository_TEST.cc \
-	vdb_repository_TEST_setup.sh \
-	vdb_repository_TEST_cleanup.sh \
-	vdb_repository_TEST_eapis.cc \
-	vdb_repository_TEST_eapis_setup.sh \
-	vdb_repository_TEST_eapis_cleanup.sh \
-	vdb_repository_TEST_cache.cc \
-	vdb_repository_TEST_cache_setup.sh \
-	vdb_repository_TEST_cache_cleanup.sh \
-	vdb_merger_TEST.cc \
-	vdb_merger_TEST_setup.sh \
-	vdb_merger_TEST_cleanup.sh \
-	vdb_unmerger_TEST.cc \
-	vdb_unmerger_TEST_setup.sh \
-	vdb_unmerger_TEST_cleanup.sh
-
-BUILT_SOURCES = \
-	dep_parser-se.hh \
-	dep_parser-se.cc \
-	e_repository_params-se.hh \
-	e_repository_params-se.cc \
-	iuse-se.hh \
-	iuse-se.cc
-
-check_SCRIPTS = \
-	depend_rdepend_TEST_setup.sh depend_rdepend_TEST_cleanup.sh \
-	e_repository_TEST_setup.sh e_repository_TEST_cleanup.sh \
-	e_repository_TEST_ever_setup.sh e_repository_TEST_ever_cleanup.sh \
-	e_repository_TEST_exheres_0_setup.sh e_repository_TEST_exheres_0_cleanup.sh \
-	e_repository_TEST_0_setup.sh e_repository_TEST_0_cleanup.sh \
-	e_repository_TEST_1_setup.sh e_repository_TEST_1_cleanup.sh \
-	e_repository_TEST_2_setup.sh e_repository_TEST_2_cleanup.sh \
-	e_repository_TEST_3_setup.sh e_repository_TEST_3_cleanup.sh \
-	e_repository_TEST_4_setup.sh e_repository_TEST_4_cleanup.sh \
-	e_repository_TEST_5_setup.sh e_repository_TEST_5_cleanup.sh \
-	e_repository_TEST_6_setup.sh e_repository_TEST_6_cleanup.sh \
-	e_repository_TEST_pbin_setup.sh e_repository_TEST_pbin_cleanup.sh \
-	e_repository_TEST_phases_setup.sh e_repository_TEST_phases_cleanup.sh \
-	e_repository_TEST_exlibs_setup.sh e_repository_TEST_exlibs_cleanup.sh \
-	e_repository_TEST_replacing_setup.sh e_repository_TEST_replacing_cleanup.sh \
-	e_repository_TEST_symlink_rewriting_setup.sh e_repository_TEST_symlink_rewriting_cleanup.sh \
-	xml_things_TEST_setup.sh xml_things_TEST_cleanup.sh \
-	vdb_repository_TEST_setup.sh vdb_repository_TEST_cleanup.sh \
-	vdb_repository_TEST_eapis_setup.sh vdb_repository_TEST_eapis_cleanup.sh \
-	vdb_repository_TEST_cache_setup.sh vdb_repository_TEST_cache_cleanup.sh \
-	exndbam_repository_TEST_setup.sh exndbam_repository_TEST_cleanup.sh \
-	e_repository_sets_TEST_setup.sh e_repository_sets_TEST_cleanup.sh \
-	fetch_visitor_TEST_setup.sh fetch_visitor_TEST_cleanup.sh
-
-dep_parser-se.hh : dep_parser.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/dep_parser.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-dep_parser-se.cc : dep_parser.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/dep_parser.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-iuse-se.hh : iuse.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/iuse.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-iuse-se.cc : iuse.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/iuse.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-e_repository_params-se.hh : e_repository_params.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/e_repository_params.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-e_repository_params-se.cc : e_repository_params.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/e_repository_params.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_SOURCES = xml_things.cc xml_things.hh
-libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @LIBXML2DEPS_CFLAGS@
-
-libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	@LIBXML2DEPS_LIBS@
-
-libpaludiserepositoryxmlthings_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-if ENABLE_XML
-
-GLSA_TESTS = xml_things_TEST
-xml_things_TEST_SOURCES = xml_things_TEST.cc
-
-xml_things_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-xml_things_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-xml_things_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-endif
-
-if ENABLE_PBINS
-
-PBINS_TESTS = e_repository_TEST_pbin
-
-e_repository_TEST_pbin_SOURCES = e_repository_TEST_pbin.cc
-
-e_repository_TEST_pbin_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_pbin_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-e_repository_TEST_pbin_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-endif
-
-paludis_datadir = $(datadir)/paludis
-
-dist_paludis_data_DATA = traditional.exclude ebuild_entries_suffixes.conf
-
-TESTS = \
-	vdb_repository_TEST \
-	vdb_repository_TEST_eapis \
-	vdb_repository_TEST_cache \
-	e_repository_TEST \
-	e_repository_TEST_0 \
-	e_repository_TEST_1 \
-	e_repository_TEST_2 \
-	e_repository_TEST_3 \
-	e_repository_TEST_4 \
-	e_repository_TEST_5 \
-	e_repository_TEST_6 \
-	e_repository_TEST_ever \
-	e_repository_TEST_exheres_0 \
-	e_repository_TEST_exlibs \
-	e_repository_TEST_phases \
-	e_repository_TEST_replacing \
-	e_repository_TEST_symlink_rewriting \
-	exndbam_repository_TEST \
-	aa_visitor_TEST \
-	dep_parser_TEST \
-	depend_rdepend_TEST \
-	e_repository_sets_TEST \
-	ebuild_flat_metadata_cache_TEST \
-	fetch_visitor_TEST \
-	fix_locked_dependencies_TEST \
-	source_uri_finder_TEST \
-	vdb_merger_TEST \
-	vdb_unmerger_TEST \
-	$(GLSA_TESTS) \
-	$(PBINS_TESTS)
-
-check_PROGRAMS = $(TESTS)
-
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
deleted file mode 100644
index 3922c2cbf..000000000
--- a/paludis/repositories/e/eapis/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS =
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-eapis = \
-	0.conf \
-	1.conf \
-	2.conf \
-	3.conf \
-	4.conf \
-	5.conf \
-	6.conf \
-	exheres-0.conf \
-	paludis-1.conf \
-	pbin-1+0.conf \
-	pbin-1+1.conf \
-	pbin-1+2.conf \
-	pbin-1+3.conf \
-	pbin-1+4.conf \
-	pbin-1+5.conf \
-	pbin-1+6.conf \
-	pbin-1+paludis-1.conf \
-	pbin-1+exheres-0.conf
-
-future_eapis =
-
-eapidir = $(datadir)/paludis/eapis/
-
-eapi_DATA = $(eapis)
-
-EXTRA_DIST = $(eapis) $(future_eapis)
-
-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/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
deleted file mode 100644
index 56ff48932..000000000
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog0dir = $(libexecdir)/paludis/0/
-
-libexecprog0_SCRIPTS = \
-	build_functions.bash \
-	builtin_infovars.bash \
-	builtin_init.bash \
-	builtin_initrm.bash \
-	builtin_initmisc.bash \
-	builtin_loadenv.bash \
-	builtin_metadata.bash \
-	builtin_killold.bash \
-	builtin_killoldrm.bash \
-	builtin_saveenv.bash \
-	builtin_tidyup.bash \
-	builtin_tidyuprm.bash \
-	builtin_variable.bash \
-	conditional_functions.bash \
-	eclass_functions.bash \
-	list_functions.bash \
-	output_functions.bash \
-	pkg_config.bash \
-	pkg_info.bash \
-	pkg_nofetch.bash \
-	pkg_postinst.bash \
-	pkg_postrm.bash \
-	pkg_preinst.bash \
-	pkg_prerm.bash \
-	pkg_pretend.bash \
-	pkg_setup.bash \
-	portage_stubs.bash \
-	src_compile.bash \
-	src_install.bash \
-	src_test.bash \
-	src_unpack.bash
-
-LOG_COMPILER_EXTRA = \
-	PALUDIS_EBUILD_LOG_LEVEL="warning" \
-	PALUDIS_EBUILD_MODULE_SUFFIXES="0"
-
-LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
-TESTS = conditional_functions_TEST.bash list_functions_TEST.bash
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog0_SCRIPTS) $(check_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/1/Makefile.am b/paludis/repositories/e/ebuild/1/Makefile.am
deleted file mode 100644
index c690624ad..000000000
--- a/paludis/repositories/e/ebuild/1/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog1dir = $(libexecdir)/paludis/1
-
-libexecprog1_SCRIPTS = \
-	src_compile.bash \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog1_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/2/Makefile.am b/paludis/repositories/e/ebuild/2/Makefile.am
deleted file mode 100644
index 5aff4bd3a..000000000
--- a/paludis/repositories/e/ebuild/2/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog2dir = $(libexecdir)/paludis/2
-
-libexecprog2_SCRIPTS = \
-	eclass_functions.bash \
-	pkg_nofetch.bash \
-	src_compile.bash \
-	src_configure.bash \
-	src_install.bash \
-	src_prepare.bash \
-	src_test.bash \
-	src_unpack.bash \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog2_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/3/Makefile.am b/paludis/repositories/e/ebuild/3/Makefile.am
deleted file mode 100644
index 86b5b9cbf..000000000
--- a/paludis/repositories/e/ebuild/3/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog3dir = $(libexecdir)/paludis/3
-
-libexecprog3_SCRIPTS = \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog3_SCRIPTS)
-
-
diff --git a/paludis/repositories/e/ebuild/4/Makefile.am b/paludis/repositories/e/ebuild/4/Makefile.am
deleted file mode 100644
index 14590a593..000000000
--- a/paludis/repositories/e/ebuild/4/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog4dir = $(libexecdir)/paludis/4
-
-libexecprog4_SCRIPTS = \
-	builtin_bad_required_use.bash \
-	pkg_pretend.bash \
-	src_install.bash \
-	die_functions.bash \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog4_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/5/Makefile.am b/paludis/repositories/e/ebuild/5/Makefile.am
deleted file mode 100644
index ced4e5354..000000000
--- a/paludis/repositories/e/ebuild/5/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog5dir = $(libexecdir)/paludis/5
-
-libexecprog5_SCRIPTS = \
-	src_test.bash \
-	usex.bash \
-	list_functions.bash \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog5_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/6/Makefile.am b/paludis/repositories/e/ebuild/6/Makefile.am
deleted file mode 100644
index 0511c3462..000000000
--- a/paludis/repositories/e/ebuild/6/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog6dir = $(libexecdir)/paludis/6
-
-libexecprog6_SCRIPTS = \
-	build_functions.bash \
-	list_functions.bash \
-	multilib_functions.bash \
-	output_functions.bash \
-	src_install.bash \
-	src_prepare.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprog6_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
deleted file mode 100644
index ba17a9356..000000000
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . 0 1 2 3 4 5 6 exheres-0 paludis-1 pbin-1 utils
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-libexecprogdir = $(libexecdir)/paludis/
-
-libexecprog_SCRIPTS = \
-	binary_functions.bash \
-	die_functions.bash \
-	ebuild.bash \
-	kernel_functions.bash \
-	install_functions.bash \
-	multilib_functions.bash \
-	output_functions.bash \
-	pipe_functions.bash \
-	sandbox.bash \
-	sydbox.bash \
-	source_functions.bash \
-	usage_error.bash \
-	write_vdb_entry.bash \
-	write_binary_ebuild.bash
-
-LOG_COMPILER_EXTRA = \
-	PALUDIS_EBUILD_LOG_LEVEL="warning" \
-	PALUDIS_EBUILD_MODULE_SUFFIXES="0"
-
-LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
-TESTS = kernel_functions_TEST.bash
-
-EXTRA_DIST = $(libexecprog_SCRIPTS) run_test.bash $(TESTS) $(check_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
deleted file mode 100644
index 68562dfe8..000000000
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogexheresdir = $(libexecdir)/paludis/exheres-0
-
-libexecprogexheres_SCRIPTS = \
-	build_functions.bash \
-	builtin_infovars.bash \
-	builtin_init.bash \
-	builtin_initrm.bash \
-	builtin_initmisc.bash \
-	builtin_loadenv.bash \
-	builtin_metadata.bash \
-	builtin_killold.bash \
-	builtin_killoldrm.bash \
-	builtin_saveenv.bash \
-	builtin_tidyup.bash \
-	builtin_tidyuprm.bash \
-	builtin_variable.bash \
-	conditional_functions.bash \
-	ever_functions.bash \
-	exlib_functions.bash \
-	list_functions.bash \
-	output_functions.bash \
-	pkg_bad_options.bash \
-	pkg_config.bash \
-	pkg_info.bash \
-	pkg_nofetch.bash \
-	pkg_postinst.bash \
-	pkg_postrm.bash \
-	pkg_preinst.bash \
-	pkg_prerm.bash \
-	pkg_pretend.bash \
-	pkg_setup.bash \
-	portage_stubs.bash \
-	src_compile.bash \
-	src_configure.bash \
-	src_fetch_extra.bash \
-	src_install.bash \
-	src_test.bash \
-	src_test_expensive.bash \
-	src_prepare.bash \
-	src_unpack.bash
-
-LOG_COMPILER_EXTRA = \
-	PALUDIS_EBUILD_LOG_LEVEL="warning" \
-	PALUDIS_EBUILD_MODULE_SUFFIXES="exheres-0"
-
-LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
-TESTS = conditional_functions_TEST.bash
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprogexheres_SCRIPTS) $(check_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/paludis-1/Makefile.am b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
deleted file mode 100644
index 91d798395..000000000
--- a/paludis/repositories/e/ebuild/paludis-1/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogpaludis1dir = $(libexecdir)/paludis/paludis-1
-
-libexecprogpaludis1_SCRIPTS = \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprogpaludis1_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/pbin-1/Makefile.am b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
deleted file mode 100644
index d0a069aff..000000000
--- a/paludis/repositories/e/ebuild/pbin-1/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogpaludisbinary1dir = $(libexecdir)/paludis/pbin-1
-libexecprogpaludisbinary1_SCRIPTS = \
-	builtin_installbin.bash \
-	builtin_pivotbin.bash
-
-
-EXTRA_DIST = $(libexecprogpaludisbinary1_SCRIPTS)
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
diff --git a/paludis/repositories/e/ebuild/utils/4/Makefile.am b/paludis/repositories/e/ebuild/utils/4/Makefile.am
deleted file mode 100644
index 629be8f03..000000000
--- a/paludis/repositories/e/ebuild/utils/4/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog4dir = $(libexecdir)/paludis/utils/4/
-
-libexecprog4_SCRIPTS = \
-	docompress \
-	dohard \
-	dosed \
-	banned_in_eapi_4
-
-TESTS =
-EXTRA_DIST = \
-	$(libexecprog4_SCRIPTS) \
-	$(TESTS)
-
-bannedscripts = dohard dosed
-
-$(bannedscripts) : banned_in_eapi_4
-	cat $? > $@
-	chmod +x $@
-
-CLEANFILES += $(bannedscripts)
-
diff --git a/paludis/repositories/e/ebuild/utils/5/Makefile.am b/paludis/repositories/e/ebuild/utils/5/Makefile.am
deleted file mode 100644
index a11ae9c23..000000000
--- a/paludis/repositories/e/ebuild/utils/5/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprog5dir = $(libexecdir)/paludis/utils/5/
-
-libexecprog5_SCRIPTS = \
-	doheader \
-	newheader
-
-TESTS =
-EXTRA_DIST = \
-	$(libexecprog5_SCRIPTS) \
-	$(TESTS)
-
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
deleted file mode 100644
index 9f5ee5605..000000000
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . 4 5 exheres-0
-
-libexecprogdir = $(libexecdir)/paludis/utils
-
-libexecprog_SCRIPTS = \
-	canonicalise \
-	dobin \
-	doconfd \
-	dodir \
-	dodoc \
-	doenvd \
-	doexe \
-	dohard \
-	dohtml \
-	doinfo \
-	doinitd \
-	doins \
-	dolib \
-	dolib.a \
-	dolib.so \
-	doman \
-	domo \
-	donewins \
-	dosbin \
-	dosed \
-	dosym \
-	ecompress \
-	ecompressdir \
-	emake \
-	fowners \
-	fperms \
-	keepdir \
-	newbin \
-	newconfd \
-	newdoc \
-	newenvd \
-	newexe \
-	newinitd \
-	newins \
-	newlib.a \
-	newlib.so \
-	newman \
-	newsbin \
-	prepall \
-	prepallstrip \
-	prepstrip \
-	prepallman \
-	prepman \
-	prepallinfo \
-	prepinfo \
-	prepdocs \
-	prepalldocs \
-	unpack \
-	wrapped_ldconfig \
-	wrapped_getfsize \
-	wrapped_getmtime
-
-libexecbindir = $(libexecdir)/paludis/utils
-libexecbin_PROGRAMS = \
-	print_exports \
-	locked_pipe_command \
-	strip_tar_corruption
-
-if ENABLE_PBINS
-libexecbin_PROGRAMS += \
-	unpaxinate
-
-unpaxinate_SOURCES = unpaxinate.cc
-unpaxinate_CXXFLAGS = $(AM_CXXFLAGS)
-unpaxinate_LDADD = -larchive
-
-endif
-
-print_exports_SOURCES = print_exports.cc
-locked_pipe_command_SOURCES = locked_pipe_command.cc
-strip_tar_corruption_SOURCES = strip_tar_corruption.cc
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-LOG_COMPILER_EXTRA = \
-	PALUDIS_EBUILD_LOG_LEVEL="warning" \
-	PALUDIS_EBUILD_MODULE_SUFFIXES="0"
-
-LOG_COMPILER_INTERP = $(top_srcdir)/paludis/repositories/e/ebuild/run_test.bash
-
-TESTS = \
-	wrapped_getfsize_TEST.bash
-
-prep_scripts = prepall prepallstrip prepallman prepallinfo prepstrip prepman prepinfo prepdocs prepalldocs
-
-EXTRA_DIST = $(libexecprog_SCRIPTS) $(check_SCRIPTS) run_test.bash prep.in $(TESTS)
-
-CLEANFILES += $(prep_scripts)
-
-$(prep_scripts) : prep.in
-	cat $? > $@
-
-check_PROGRAMS =
-
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
deleted file mode 100644
index 6b3156f67..000000000
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogdir = $(libexecdir)/paludis/utils/exheres-0
-
-libexecprog_SCRIPTS = \
-	dohard \
-	dohtml \
-	dolib \
-	dosbin \
-	dosed \
-	donewins \
-	emake \
-	fperms \
-	fowners \
-	herebin \
-	hereconfd \
-	hereenvd \
-	hereinitd \
-	hereins \
-	heresbin \
-	newsbin \
-	nonfatal \
-	prepall \
-	prepallstrip \
-	prepstrip \
-	prepallman \
-	prepman \
-	prepallinfo \
-	prepinfo \
-	prepdocs \
-	prepalldocs \
-	ecompress \
-	ecompressdir \
-	strip \
-	banned_in_eapi_exheres-0
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-TESTS =
-
-EXTRA_DIST = \
-	$(check_SCRIPTS) \
-	$(libexecprog_SCRIPTS) \
-	$(TESTS)
-
-bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
-		prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
-		ecompress ecompressdir fperms fowners
-
-CLEANFILES += $(bannedscripts)
-
-$(bannedscripts) : banned_in_eapi_exheres-0
-	cat $? > $@
-	chmod +x $@
-
-check_PROGRAMS =
-
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
deleted file mode 100644
index 45386d1db..000000000
--- a/paludis/repositories/fake/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\"
-
-TESTS = fake_repository_TEST fake_installed_repository_TEST dep_parser_TEST
-check_PROGRAMS = $(TESTS)
-
-EXTRA_DIST = \
-	fake_repository_TEST.cc \
-	fake_installed_repository_TEST.cc \
-	dep_parser_TEST.cc
-
-fake_repository_TEST_SOURCES = \
-	fake_repository_TEST.cc
-
-fake_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-fake_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-fake_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-fake_installed_repository_TEST_SOURCES = \
-	fake_installed_repository_TEST.cc
-
-fake_installed_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-fake_installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-fake_installed_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-dep_parser_TEST_SOURCES = \
-	dep_parser_TEST.cc
-
-dep_parser_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la
-
-dep_parser_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-dep_parser_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-noinst_LTLIBRARIES = libpaludisfakerepository.la
-
-libpaludisfakerepository_la_SOURCES = \
-	dep_parser.cc dep_parser.hh \
-	fake_repository_base.cc fake_repository_base.hh \
-	fake_repository.cc fake_repository.hh \
-	fake_installed_repository.cc fake_installed_repository.hh \
-	fake_package_id.cc fake_package_id.hh \
-	registration.cc
-
-paludis_repositories_fake_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/repositories/fake/
-paludis_repositories_fake_include_HEADERS = \
-	dep_parser.hh \
-	fake_repository.hh \
-	fake_repository_base.hh \
-	fake_installed_repository.hh \
-	fake_package_id.hh
-
diff --git a/paludis/repositories/gemcutter/Makefile.am b/paludis/repositories/gemcutter/Makefile.am
deleted file mode 100644
index 40c636669..000000000
--- a/paludis/repositories/gemcutter/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisgemcutterrepository.la
-
-noinst_HEADERS = \
-	gemcutter_dependencies_key.hh \
-	gemcutter_id.hh gemcutter_id-fwd.hh \
-	gemcutter_repository.hh gemcutter_repository-fwd.hh \
-	gemcutter_repository_store.hh \
-	gemcutter_uri_key.hh \
-	json_common.hh json_common-fwd.hh \
-	json_things_handle.hh json_things_handle-fwd.hh
-
-libpaludisgemcutterrepository_la_SOURCES = \
-	gemcutter_dependencies_key.cc \
-	gemcutter_id.cc \
-	gemcutter_uri_key.cc \
-	gemcutter_repository.cc \
-	gemcutter_repository_store.cc \
-	json_common.cc \
-	json_things_handle.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
-lib_LTLIBRARIES = libpaludisgemcutterrepositoryjsonthings_@PALUDIS_PC_SLOT@.la
-
-libpaludisgemcutterrepositoryjsonthings_@PALUDIS_PC_SLOT@_la_SOURCES = json_things.cc json_things.hh
-libpaludisgemcutterrepositoryjsonthings_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @JANSSONDEPS_CFLAGS@
-libpaludisgemcutterrepositoryjsonthings_@PALUDIS_PC_SLOT@_la_LIBADD = @JANSSONDEPS_LIBS@
-libpaludisgemcutterrepositoryjsonthings_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
diff --git a/paludis/repositories/repository/Makefile.am b/paludis/repositories/repository/Makefile.am
deleted file mode 100644
index 288960572..000000000
--- a/paludis/repositories/repository/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisrepositoryrepository.la
-
-noinst_HEADERS = \
-	repository_id.hh \
-	repository_repository.hh repository_repository-fwd.hh \
-	repository_repository_store.hh
-
-libpaludisrepositoryrepository_la_SOURCES = \
-	repository_id.cc \
-	repository_repository.cc \
-	repository_repository_store.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
deleted file mode 100644
index 1088edff8..000000000
--- a/paludis/repositories/unavailable/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisunavailablerepository.la
-
-noinst_HEADERS = \
-	unavailable_repository.hh unavailable_repository-fwd.hh \
-	unavailable_package_id.hh \
-	unavailable_repository_id.hh \
-	unavailable_repository_dependencies_key.hh \
-	unavailable_mask.hh \
-	unavailable_repository_store.hh \
-	unavailable_repository_file.hh unavailable_repository_file-fwd.hh
-
-libpaludisunavailablerepository_la_SOURCES = \
-	unavailable_repository.cc \
-	unavailable_package_id.cc \
-	unavailable_repository_id.cc \
-	unavailable_repository_dependencies_key.cc \
-	unavailable_mask.cc \
-	unavailable_repository_store.cc \
-	unavailable_repository_file.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
-unavailable_repository_TEST_SOURCES = unavailable_repository_TEST.cc
-
-unavailable_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-unavailable_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-unavailable_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-EXTRA_DIST = \
-	unavailable_repository_TEST.cc \
-	unavailable_repository_TEST_setup.sh \
-	unavailable_repository_TEST_cleanup.sh
-
-check_SCRIPTS = \
-	unavailable_repository_TEST_setup.sh \
-	unavailable_repository_TEST_cleanup.sh
-
-TESTS = \
-	unavailable_repository_TEST
-
-check_PROGRAMS = $(TESTS)
-
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
deleted file mode 100644
index 71e3266c1..000000000
--- a/paludis/repositories/unpackaged/Makefile.am
+++ /dev/null
@@ -1,79 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisunpackagedrepository.la
-
-noinst_HEADERS = \
-	exceptions.hh \
-	unpackaged_id.hh \
-	unpackaged_repository.hh \
-	unpackaged_key.hh \
-	unpackaged_stripper.hh \
-	installed_repository.hh \
-	installed_id.hh
-
-libpaludisunpackagedrepository_la_SOURCES = \
-	exceptions.cc \
-	unpackaged_id.cc \
-	unpackaged_repository.cc \
-	unpackaged_key.cc \
-	unpackaged_stripper.cc \
-	installed_repository.cc \
-	installed_id.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
-unpackaged_repository_TEST_SOURCES = unpackaged_repository_TEST.cc
-
-unpackaged_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-unpackaged_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-unpackaged_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-installed_repository_TEST_SOURCES = installed_repository_TEST.cc
-
-installed_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-installed_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-installed_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-EXTRA_DIST = \
-	unpackaged_repository_TEST.cc \
-	unpackaged_repository_TEST_setup.sh \
-	unpackaged_repository_TEST_cleanup.sh \
-	installed_repository_TEST.cc \
-	installed_repository_TEST_setup.sh \
-	installed_repository_TEST_cleanup.sh \
-	installed_id.cc
-
-check_SCRIPTS = \
-	unpackaged_repository_TEST_setup.sh \
-	unpackaged_repository_TEST_cleanup.sh \
-	installed_repository_TEST_setup.sh \
-	installed_repository_TEST_cleanup.sh
-
-TESTS = \
-	unpackaged_repository_TEST \
-	installed_repository_TEST
-
-check_PROGRAMS = $(TESTS)
-
diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
deleted file mode 100644
index a384a6f70..000000000
--- a/paludis/repositories/unwritten/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_builddir) @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-noinst_LTLIBRARIES = libpaludisunwrittenrepository.la
-
-noinst_HEADERS = \
-	unwritten_repository.hh \
-	unwritten_id.hh \
-	unwritten_mask.hh \
-	unwritten_repository_store.hh \
-	unwritten_repository_file.hh
-
-libpaludisunwrittenrepository_la_SOURCES = \
-	unwritten_repository.cc \
-	unwritten_id.cc \
-	unwritten_mask.cc \
-	unwritten_repository_store.cc \
-	unwritten_repository_file.cc \
-	registration.cc \
-	$(noinst_HEADERS)
-
-unwritten_repository_TEST_SOURCES = unwritten_repository_TEST.cc
-
-unwritten_repository_TEST_LDADD = \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(DYNAMIC_LD_LIBS)
-
-unwritten_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-unwritten_repository_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-EXTRA_DIST = \
-	unwritten_repository_TEST.cc \
-	unwritten_repository_TEST_setup.sh \
-	unwritten_repository_TEST_cleanup.sh
-
-check_SCRIPTS = \
-	unwritten_repository_TEST_setup.sh \
-	unwritten_repository_TEST_cleanup.sh
-
-TESTS = \
-	unwritten_repository_TEST
-
-check_PROGRAMS = $(TESTS)
-
diff --git a/paludis/resolver/Makefile.am b/paludis/resolver/Makefile.am
deleted file mode 100644
index e99090786..000000000
--- a/paludis/resolver/Makefile.am
+++ /dev/null
@@ -1,488 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-DISTCLEANFILES = \
-	any_child_score-se.hh any_child_score-se.cc \
-	change_type-se.hh change_type-se.cc \
-	decision-se.hh decision-se.cc \
-	destination_types-se.hh destination_types-se.cc \
-	job_requirements-se.hh job_requirements-se.cc \
-	nag-se.hh nag-se.cc \
-	promote_binaries-se.hh promote_binaries-se.cc \
-	resolver_functions-se.hh resolver_functions-se.cc \ \
-	use_existing-se.hh use_existing-se.cc
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-EXTRA_DIST = \
-	any_child_score-se.hh any_child_score-se.cc any_child_score.se \
-	change_type-se.hh change_type-se.cc change_type.se \
-	decision-se.hh decision-se.cc decision.se \
-	destination_types-se.hh destination_types-se.cc destination_types.se \
-	job_requirements-se.hh job_requirements-se.cc job_requirements.se \
-	nag-se.hh nag-se.cc nag.se \
-	promote_binaries-se.hh promote_binaries-se.cc promote_binaries.se \
-	resolver_functions-se.hh resolver_functions-se.cc resolver_functions.se \
-	use_existing-se.hh use_existing-se.cc use_existing.se \
-	$(check_SCRIPTS)
-
-BUILT_SOURCES = \
-	any_child_score-se.hh any_child_score-se.cc \
-	change_type-se.hh change_type-se.cc \
-	decision-se.hh decision-se.cc \
-	destination_types-se.hh destination_types-se.cc \
-	nag-se.hh nag-se.cc \
-	job_requirements-se.hh job_requirements-se.cc \
-	promote_binaries-se.hh promote_binaries-se.cc \
-	resolver_functions-se.hh resolver_functions-se.cc \
-	use_existing-se.hh use_existing-se.cc
-
-noinst_HEADERS = \
-	accumulate_deps.hh accumulate_deps-fwd.hh \
-	allow_choice_changes_helper.hh allow_choice_changes_helper-fwd.hh \
-	allowed_to_remove_helper.hh allowed_to_remove_helper-fwd.hh \
-	allowed_to_restart_helper.hh allowed_to_restart_helper-fwd.hh \
-	always_via_binary_helper.hh always_via_binary_helper-fwd.hh \
-	any_child_score.hh any_child_score-fwd.hh any_child_score-se.hh \
-	can_use_helper.hh can_use_helper-fwd.hh \
-	change_by_resolvent.hh change_by_resolvent-fwd.hh \
-	change_type.hh change_type-fwd.hh change_type-se.hh \
-	collect_depped_upon.hh collect_depped_upon-fwd.hh \
-	collect_installed.hh collect_installed-fwd.hh \
-	collect_purges.hh collect_purges-fwd.hh \
-	collect_world.hh collect_world-fwd.hh \
-	confirm_helper.hh confirm_helper-fwd.hh \
-	constraint.hh constraint-fwd.hh \
-	decider.hh decider-fwd.hh \
-	decision.hh decision-fwd.hh decision-se.hh \
-	decision_utils.hh decision_utils-fwd.hh \
-	decisions.hh decisions-fwd.hh \
-	destination.hh destination-fwd.hh \
-	destination_types.hh destination_types-fwd.hh destination_types-se.hh \
-	destination_utils.hh destination_utils-fwd.hh \
-	find_replacing_helper.hh find_replacing_helper-fwd.hh \
-	find_repository_for_helper.hh find_repository_for_helper-fwd.hh \
-	get_constraints_for_dependent_helper.hh get_constraints_for_dependent_helper-fwd.hh \
-	get_constraints_for_purge_helper.hh get_constraints_for_purge_helper-fwd.hh \
-	get_constraints_for_via_binary_helper.hh get_constraints_for_via_binary_helper-fwd.hh \
-	get_destination_types_for_blocker_helper.hh get_destination_types_for_blocker_helper-fwd.hh \
-	get_destination_types_for_error_helper.hh get_destination_types_for_error_helper-fwd.hh \
-	get_initial_constraints_for_helper.hh get_initial_constraints_for_helper-fwd.hh \
-	get_resolvents_for_helper.hh get_resolvents_for_helper-fwd.hh \
-	get_sameness.hh get_sameness-fwd.hh \
-	get_use_existing_nothing_helper.hh get_use_existing_nothing_helper-fwd.hh \
-	has_behaviour.hh has_behaviour-fwd.hh \
-	interest_in_spec_helper.hh interest_in_spec_helper-fwd.hh \
-	job.hh job-fwd.hh \
-	job_list.hh job_list-fwd.hh \
-	job_lists.hh job_lists-fwd.hh \
-	job_requirements.hh job_requirements-fwd.hh \
-	job_state.hh job_state-fwd.hh \
-	labels_classifier.hh labels_classifier-fwd.hh \
-	make_destination_filtered_generator_helper.hh make_destination_filtered_generator_helper-fwd.hh \
-	make_origin_filtered_generator_helper.hh make_origin_filtered_generator_helper-fwd.hh \
-	make_uninstall_blocker.hh make_uninstall_blocker-fwd.hh \
-	make_unmaskable_filter_helper.hh make_unmaskable_filter_helper-fwd.hh \
-	match_qpns.hh match_qpns-fwd.hh \
-	nag.hh nag-fwd.hh \
-	order_early_helper.hh order_early_helper-fwd.hh \
-	orderer.hh orderer-fwd.hh \
-	orderer_notes.hh orderer_notes-fwd.hh \
-	package_id_comparator_with_promotion.hh package_id_comparator_with_promotion-fwd.hh \
-	package_or_block_dep_spec.hh package_or_block_dep_spec-fwd.hh \
-	prefer_or_avoid_helper.hh prefer_or_avoid_helper-fwd.hh \
-	promote_binaries.hh promote_binaries-fwd.hh promote_binaries-se.hh \
-	promote_binaries_helper.hh \
-	reason.hh reason-fwd.hh \
-	reason_utils.hh reason_utils-fwd.hh \
-	remove_hidden_helper.hh remove_hidden_helper-fwd.hh \
-	remove_if_dependent_helper.hh remove_if_dependent_helper-fwd.hh \
-	required_confirmations.hh required_confirmations-fwd.hh \
-	resolution.hh resolution-fwd.hh \
-	resolutions_by_resolvent.hh resolutions_by_resolvent-fwd.hh \
-	resolved.hh resolved-fwd.hh \
-	resolvent.hh resolvent-fwd.hh \
-	resolver.hh resolver-fwd.hh \
-	resolver_functions.hh resolver_functions-fwd.hh \
-	same_slot.hh same_slot-fwd.hh \
-	sanitised_dependencies.hh sanitised_dependencies-fwd.hh \
-	selection_with_promotion.hh selection_with_promotion-fwd.hh \
-	slot_name_or_null.hh slot_name_or_null-fwd.hh \
-	strongly_connected_component.hh strongly_connected_component-fwd.hh \
-	suggest_restart.hh suggest_restart-fwd.hh \
-	unsuitable_candidates.hh unsuitable_candidates-fwd.hh \
-	use_existing.hh use_existing-fwd.hh use_existing-se.hh \
-	why_changed_choices.hh why_changed_choices-fwd.hh
-
-libpaludisresolver_a_SOURCES = \
-	accumulate_deps.cc \
-	allow_choice_changes_helper.cc \
-	allowed_to_remove_helper.cc \
-	allowed_to_restart_helper.cc \
-	always_via_binary_helper.cc \
-	any_child_score.cc \
-	can_use_helper.cc \
-	change_by_resolvent.cc \
-	change_type.cc \
-	collect_depped_upon.cc \
-	collect_installed.cc \
-	collect_purges.cc \
-	collect_world.cc \
-	confirm_helper.cc \
-	constraint.cc \
-	decider.cc \
-	decision.cc \
-	decision_utils.cc \
-	decisions.cc \
-	destination.cc \
-	destination_types.cc \
-	destination_utils.cc \
-	find_replacing_helper.cc \
-	find_repository_for_helper.cc \
-	get_constraints_for_dependent_helper.cc \
-	get_constraints_for_purge_helper.cc \
-	get_constraints_for_via_binary_helper.cc \
-	get_destination_types_for_blocker_helper.cc \
-	get_destination_types_for_error_helper.cc \
-	get_initial_constraints_for_helper.cc \
-	get_resolvents_for_helper.cc \
-	get_sameness.cc \
-	get_use_existing_nothing_helper.cc \
-	has_behaviour.cc \
-	interest_in_spec_helper.cc \
-	job.cc \
-	job_list.cc \
-	job_lists.cc \
-	job_requirements.cc \
-	job_state.cc \
-	labels_classifier.cc \
-	make_destination_filtered_generator_helper.cc \
-	make_origin_filtered_generator_helper.cc \
-	make_uninstall_blocker.cc \
-	make_unmaskable_filter_helper.cc \
-	match_qpns.cc \
-	nag.cc \
-	order_early_helper.cc \
-	orderer.cc \
-	orderer_notes.cc \
-	package_id_comparator_with_promotion.cc \
-	package_or_block_dep_spec.cc \
-	prefer_or_avoid_helper.cc \
-	promote_binaries.cc \
-	promote_binaries_helper.cc \
-	reason.cc \
-	reason_utils.cc \
-	remove_hidden_helper.cc \
-	remove_if_dependent_helper.cc \
-	required_confirmations.cc \
-	resolution.cc \
-	resolutions_by_resolvent.cc \
-	resolved.cc \
-	resolvent.cc \
-	resolver.cc \
-	resolver_functions.cc \
-	same_slot.cc \
-	sanitised_dependencies.cc \
-	selection_with_promotion.cc \
-	slot_name_or_null.cc \
-	strongly_connected_component.cc \
-	suggest_restart.cc \
-	unsuitable_candidates.cc \
-	use_existing.cc \
-	why_changed_choices.cc
-
-noinst_LIBRARIES = libpaludisresolver.a
-
-TESTS = \
-	resolver_TEST_simple \
-	resolver_TEST_serialisation \
-	resolver_TEST_blockers \
-	resolver_TEST_cycles \
-	resolver_TEST_suggestions \
-	resolver_TEST_any \
-	resolver_TEST_errors \
-	resolver_TEST_continue_on_failure \
-	resolver_TEST_uninstalls \
-	resolver_TEST_fetches \
-	resolver_TEST_purges \
-	resolver_TEST_binaries \
-	resolver_TEST_subslots \
-	$(if_pbin_TESTS)
-
-if ENABLE_PBINS
-if_pbin_TESTS = resolver_TEST_promote_binaries
-endif
-
-check_PROGRAMS = $(TESTS)
-
-check_SCRIPTS = \
-	resolver_TEST_blockers_setup.sh resolver_TEST_blockers_cleanup.sh \
-	resolver_TEST_cycles_setup.sh resolver_TEST_cycles_cleanup.sh \
-	resolver_TEST_serialisation_setup.sh resolver_TEST_serialisation_cleanup.sh \
-	resolver_TEST_suggestions_setup.sh resolver_TEST_suggestions_cleanup.sh \
-	resolver_TEST_simple_setup.sh resolver_TEST_simple_cleanup.sh \
-	resolver_TEST_any_setup.sh resolver_TEST_any_cleanup.sh \
-	resolver_TEST_errors_setup.sh resolver_TEST_errors_cleanup.sh \
-	resolver_TEST_continue_on_failure_setup.sh resolver_TEST_continue_on_failure_cleanup.sh \
-	resolver_TEST_uninstalls_setup.sh resolver_TEST_uninstalls_cleanup.sh \
-	resolver_TEST_fetches_setup.sh resolver_TEST_fetches_cleanup.sh \
-	resolver_TEST_purges_setup.sh resolver_TEST_purges_cleanup.sh \
-	resolver_TEST_binaries_setup.sh resolver_TEST_binaries_cleanup.sh \
-	resolver_TEST_promote_binaries_setup.sh resolver_TEST_promote_binaries_cleanup.sh \
-	resolver_TEST_subslots_setup.sh resolver_TEST_subslots_cleanup.sh
-
-check_LIBRARIES = libpaludisresolvertest.a
-
-libpaludisresolvertest_a_SOURCES = \
-	resolver_test.hh \
-	resolver_test.cc
-
-resolver_TEST_blockers_SOURCES = resolver_TEST_blockers.cc
-
-resolver_TEST_blockers_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_blockers_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_blockers_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_cycles_SOURCES = resolver_TEST_cycles.cc
-
-resolver_TEST_cycles_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_cycles_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_cycles_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_suggestions_SOURCES = resolver_TEST_suggestions.cc
-
-resolver_TEST_suggestions_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_suggestions_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_suggestions_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_serialisation_SOURCES = resolver_TEST_serialisation.cc
-
-resolver_TEST_serialisation_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_serialisation_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_serialisation_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_simple_SOURCES = resolver_TEST_simple.cc
-
-resolver_TEST_simple_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_simple_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_simple_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_any_SOURCES = resolver_TEST_any.cc
-
-resolver_TEST_any_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_any_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_any_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_errors_SOURCES = resolver_TEST_errors.cc
-
-resolver_TEST_errors_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_errors_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_errors_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_continue_on_failure_SOURCES = resolver_TEST_continue_on_failure.cc
-
-resolver_TEST_continue_on_failure_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_continue_on_failure_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_continue_on_failure_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_uninstalls_SOURCES = resolver_TEST_uninstalls.cc
-
-resolver_TEST_uninstalls_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_uninstalls_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_uninstalls_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_fetches_SOURCES = resolver_TEST_fetches.cc
-
-resolver_TEST_fetches_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_fetches_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_fetches_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_purges_SOURCES = resolver_TEST_purges.cc
-
-resolver_TEST_purges_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_purges_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_purges_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_binaries_SOURCES = resolver_TEST_binaries.cc
-
-resolver_TEST_binaries_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_binaries_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_binaries_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_promote_binaries_SOURCES = resolver_TEST_promote_binaries.cc
-
-resolver_TEST_promote_binaries_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_promote_binaries_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_promote_binaries_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-resolver_TEST_subslots_SOURCES = resolver_TEST_subslots.cc
-
-resolver_TEST_subslots_LDADD = \
-	libpaludisresolvertest.a \
-	$(top_builddir)/paludis/util/gtest_runner.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	libpaludisresolver.a \
-	$(DYNAMIC_LD_LIBS)
-
-resolver_TEST_subslots_CXXFLAGS = $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-
-resolver_TEST_subslots_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-
-use_existing-se.hh : use_existing.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/use_existing.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-use_existing-se.cc : use_existing.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/use_existing.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-destination_types-se.hh : destination_types.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/destination_types.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-destination_types-se.cc : destination_types.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/destination_types.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-any_child_score-se.hh : any_child_score.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/any_child_score.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-any_child_score-se.cc : any_child_score.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/any_child_score.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-change_type-se.hh : change_type.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/change_type.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-change_type-se.cc : change_type.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/change_type.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-resolver_functions-se.hh : resolver_functions.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/resolver_functions.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-resolver_functions-se.cc : resolver_functions.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/resolver_functions.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-job_requirements-se.hh : job_requirements.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/job_requirements.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-job_requirements-se.cc : job_requirements.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/job_requirements.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-nag-se.hh : nag.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/nag.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-nag-se.cc : nag.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/nag.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-decision-se.hh : decision.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/decision.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-decision-se.cc : decision.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/decision.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-promote_binaries-se.hh : promote_binaries.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $(srcdir)/promote_binaries.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
-promote_binaries-se.cc : promote_binaries.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $(srcdir)/promote_binaries.se > $@ ; then rm -f $@ ; exit 1 ; fi
-
diff --git a/paludis/selinux/Makefile.am b/paludis/selinux/Makefile.am
deleted file mode 100644
index cfbb48dc3..000000000
--- a/paludis/selinux/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-paludis_selinux_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/selinux/
-
-paludis_selinux_include_HEADERS = \
-	security_context.hh
-
-libpaludisselinux_@PALUDIS_PC_SLOT@_la_SOURCES = \
-	$(paludis_selinux_include_HEADERS) \
-	security_context.cc
-
-libpaludisselinux_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	@DYNAMIC_LD_LIBS@
-
-libpaludisselinux_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-lib_LTLIBRARIES = libpaludisselinux_@PALUDIS_PC_SLOT@.la
-
-TESTS =
-EXTRA_DIST =
-
-check_PROGRAMS = $(TESTS)
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
diff --git a/paludis/syncers/Makefile.am b/paludis/syncers/Makefile.am
deleted file mode 100644
index 07b352609..000000000
--- a/paludis/syncers/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-CLEANFILES += +*~ .keep dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+lp dobzr+sftp \
-	     dobzr+ssh docvs+ext docvs+pserver docvs+ssh dodarcs+file dodarcs+http dodarcs+https \
-	     dodarcs+ssh dofile dogit dogit+file dogit+http dogit+https dogit+rsync dogit+ssh \
-	     dohg+file dohg+http dohg+https dohg+ssh dohg+static-http dorsync dorsync+ssh dosvn \
-	     dosvn+file dosvn+http dosvn+https dosvn+ssh dotar+file dotar+ftp dotar+http dotar+https
-SUBDIRS = .
-
-.keep :
-	touch $@
-
-libexecprogdir = $(libexecdir)/paludis/syncers/
-
-libexecprog_SCRIPTS = \
-	dobzr \
-	dobzr+aftp \
-	dobzr+file \
-	dobzr+ftp \
-	dobzr+http \
-	dobzr+https \
-	dobzr+lp \
-	dobzr+sftp \
-	dobzr+ssh \
-	docvs+ext \
-	docvs+pserver \
-	docvs+ssh \
-	dodarcs+file \
-	dodarcs+http \
-	dodarcs+https \
-	dodarcs+ssh \
-	dofile \
-	dogit \
-	dogit+file \
-	dogit+http \
-	dogit+https \
-	dogit+rsync \
-	dogit+ssh \
-	dohg+file \
-	dohg+http \
-	dohg+https \
-	dohg+ssh \
-	dohg+static-http \
-	dorsync \
-	dorsync+ssh \
-	dosvn \
-	dosvn+file \
-	dosvn+http \
-	dosvn+https \
-	dosvn+ssh \
-	dotar+file \
-	dotar+ftp \
-	dotar+http \
-	dotar+https \
-	dodummy
-
-installusersyncersdir = $(datadir)/paludis/syncers
-installusersyncers_DATA = .keep
-
-TESTS =
-EXTRA_DIST = $(libexecprog_SCRIPTS) dobzr.in docvs.in dodarcs.in dogit.in dohg.in dorsync.in dosvn.in dotar.in
-
-check_SCRIPTS =
-check_PROGRAMS = $(TESTS)
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-dobzr dobzr+aftp dobzr+file dobzr+ftp dobzr+http dobzr+https dobzr+lp dobzr+sftp dobzr+ssh : dobzr.in
-	cat $? > $@
-docvs+ext docvs+pserver docvs+ssh : docvs.in
-	cat $? > $@
-dodarcs+file dodarcs+http dodarcs+https dodarcs+ssh : dodarcs.in
-	cat $? > $@
-dogit dogit+file dogit+http dogit+https dogit+rsync dogit+ssh : dogit.in
-	cat $? > $@
-dohg+file dohg+http dohg+https dohg+ssh dohg+static-http : dohg.in
-	cat $? > $@
-dofile dorsync dorsync+ssh : dorsync.in
-	cat $? > $@
-dosvn dosvn+file dosvn+http dosvn+https dosvn+ssh : dosvn.in
-	cat $? > $@
-dotar+file dotar+ftp dotar+http dotar+https : dotar.in
-	cat $? > $@
-
diff --git a/paludis/util/Makefile.am.m4 b/paludis/util/Makefile.am.m4
deleted file mode 100644
index 22e71f20f..000000000
--- a/paludis/util/Makefile.am.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-ifdef(`__gnu__',`',`errprint(`This is not GNU m4...
-')m4exit(1)') include(`misc/generated-file.txt')
-
-dnl vim: set ft=m4 noet :
-
-include $(top_srcdir)/misc/common-makefile.am
-
-define(`filelist', `')dnl
-define(`headerlist', `')dnl
-define(`gtestlist', `')dnl
-define(`testscriptlist', `')dnl
-define(`selist', `')dnl
-define(`secleanlist', `')dnl
-define(`seheaderlist', `')dnl
-define(`addgtest', `define(`gtestlist', gtestlist `$1_TEST')dnl
-$1_TEST_SOURCES = $1_TEST.cc
-$1_TEST_LDADD = \
-	gtest_runner.o \
-	libpaludisutil_@PALUDIS_PC_SLOT@.la
-$1_TEST_LDFLAGS = @GTESTDEPS_LDFLAGS@ @GTESTDEPS_LIBS@
-$1_TEST_CXXFLAGS = -I$(top_srcdir) $(AM_CXXFLAGS) @PALUDIS_CXXFLAGS_NO_DEBUGGING@ @GTESTDEPS_CXXFLAGS@
-')dnl
-define(`addtestscript', `define(`testscriptlist', testscriptlist `$1_TEST_setup.sh $1_TEST_cleanup.sh')')dnl
-define(`addhh', `define(`filelist', filelist `$1.hh')define(`headerlist', headerlist `$1.hh')')dnl
-define(`addfwd', `define(`filelist', filelist `$1-fwd.hh')define(`headerlist', headerlist `$1-fwd.hh')')dnl
-define(`addhhx', `define(`filelist', filelist `$1.hh')')dnl
-define(`addcc', `define(`filelist', filelist `$1.cc')')dnl
-define(`addimpl', `define(`filelist', filelist `$1-impl.hh')define(`headerlist', headerlist `$1-impl.hh')')dnl
-define(`addse', `define(`selist', selist `$1.se')dnl
-define(`secleanlist', secleanlist `$1-se.hh $1-se.cc')dnl
-define(`seheaderlist', seheaderlist `$1-se.hh')dnl
-$1-se.hh : $1.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --header $`'(srcdir)/$1.se > $`'@ ; then rm -f $`'@ ; exit 1 ; fi
-
-$1-se.cc : $1.se $(top_srcdir)/misc/make_se.bash
-	if ! $(top_srcdir)/misc/make_se.bash --source $`'(srcdir)/$1.se > $`'@ ; then rm -f $`'@ ; exit 1 ; fi
-
-')dnl
-define(`addthis', `dnl
-ifelse(`$2', `hh', `addhh(`$1')', `')dnl
-ifelse(`$2', `fwd', `addfwd(`$1')', `')dnl
-ifelse(`$2', `hhx', `addhhx(`$1')', `')dnl
-ifelse(`$2', `cc', `addcc(`$1')', `')dnl
-ifelse(`$2', `impl', `addimpl(`$1')', `')dnl
-ifelse(`$2', `se', `addse(`$1')', `')dnl
-ifelse(`$2', `gtest', `addgtest(`$1')', `')dnl
-ifelse(`$2', `testscript', `addtestscript(`$1')', `')')dnl
-define(`add', `addthis(`$1',`$2')addthis(`$1',`$3')addthis(`$1',`$4')dnl
-addthis(`$1',`$5')addthis(`$1',`$6')addthis(`$1',`$7')addthis(`$1',`$8')')dnl
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-include(`paludis/util/files.m4')
-
-MAINTAINERCLEANFILES += Makefile.am paludis.hh \
-	hashed_containers.hh util.hh echo_functions.bash
-DISTCLEANFILES = secleanlist
-BUILT_SOURCES = secleanlist
-DEFS=\
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\"
-EXTRA_DIST = util.hh.m4 Makefile.am.m4 files.m4 selist secleanlist \
-	testscriptlist \
-	gtest_runner.cc \
-	echo_functions.bash.in \
-	run_test.sh
-SUBDIRS = .
-
-libpaludisutil_@PALUDIS_PC_SLOT@_la_SOURCES = filelist
-libpaludisutil_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 $(PTHREAD_LIBS) $(RT_LIBS)
-libpaludisutil_@PALUDIS_PC_SLOT@_la_LIBADD = $(PTHREAD_LIBS) $(RT_LIBS)
-
-if HAVE_GTEST
-TESTS = gtestlist
-endif
-
-check_PROGRAMS = $(TESTS)
-check_SCRIPTS = testscriptlist
-
-lib_LTLIBRARIES = libpaludisutil_@PALUDIS_PC_SLOT@.la
-
-paludis_util_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT)/paludis/util/
-paludis_util_include_HEADERS = headerlist seheaderlist
-
-Makefile.am : Makefile.am.m4 files.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/Makefile.am.m4 $(abs_builddir)/Makefile.am
-
-util.hh : util.hh.m4 files.m4
-	$(top_srcdir)/misc/do_m4.bash $(abs_srcdir)/util.hh.m4 $(abs_builddir)/util.hh
-
-libexecpaludisdir = $(libexecdir)/paludis
-libexecpaludis_SCRIPTS = echo_functions.bash
-
-libexecutilsdir = $(libexecdir)/paludis/utils
-libexecutils_PROGRAMS = outputwrapper
-
-outputwrapper_SOURCES = output_wrapper.cc
-
diff --git a/pkg-config/Makefile.am b/pkg-config/Makefile.am
deleted file mode 100644
index 890c1c3a1..000000000
--- a/pkg-config/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-pkgconfigdir = $(libdir)/pkgconfig/
-pkgconfig_DATA = paludis.pc
-EXTRA_DIST = paludis.pc.in
-CLEANFILES = paludis.pc *.epicfail
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
-paludis.pc : paludis.pc.in Makefile
-	sed \
-	    -e "s,#PALUDIS_PC_PREFIX#,$(prefix)," \
-	    -e "s,#PALUDIS_PC_LIBDIR#,$(libdir)," \
-	    -e "s,#PALUDIS_PC_INCLUDEDIR#,$(includedir)/paludis-$(PALUDIS_PC_SLOT)," \
-	    -e "s,#PALUDIS_PC_VERSION#,$(PALUDIS_PC_VERSION)," \
-	    -e "s,#PALUDIS_PC_LIBS#,$(PALUDIS_PC_LIBS)," \
-	    -e "s,#PALUDIS_PC_CFLAGS#,$(PALUDIS_PC_CFLAGS)," \
-	    < $(srcdir)/paludis.pc.in > paludis.pc
-
diff --git a/pkg-config/paludis.pc.in b/pkg-config/paludis.pc.in
deleted file mode 100644
index b926c4ac8..000000000
--- a/pkg-config/paludis.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=#PALUDIS_PC_PREFIX#
-exec_prefix=${prefix}
-libdir=#PALUDIS_PC_LIBDIR#
-includedir=#PALUDIS_PC_INCLUDEDIR#
-
-Name: Paludis
-Description: The Other Package Mangler
-Version: #PALUDIS_PC_VERSION#
-Libs: -L${libdir} #PALUDIS_PC_LIBS#
-Cflags: -I${includedir} #PALUDIS_PC_CFLAGS#
-
diff --git a/python/Makefile.am b/python/Makefile.am
deleted file mode 100644
index 92a145f0e..000000000
--- a/python/Makefile.am
+++ /dev/null
@@ -1,162 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
-	      -I$(top_builddir)/ \
-	      @PALUDIS_CXXFLAGS@ \
-	      @PALUDIS_CXXFLAGS_NO_STRICT_ALIASING@ \
-	      @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-CLEANFILES += paludis.so
-DISTCLEANFILES = *-nn.hh *-nn.cc
-
-IF_PYTHON_TESTS = \
-	action_TEST.py \
-	contents_TEST.py \
-	choices_TEST.py \
-	dep_label_TEST.py \
-	dep_spec_TEST.py \
-	environment_TEST.py \
-	filter_TEST.py \
-	filtered_generator_TEST.py \
-	generator_TEST.py \
-	log_TEST.py \
-	mask_TEST.py \
-	metadata_key_TEST.py \
-	name_TEST.py \
-	package_id_TEST.py \
-	repository_TEST.py \
-	selection_TEST.py \
-	version_operator_TEST.py \
-	version_requirements_TEST.py \
-	version_spec_TEST.py
-
-IF_PYTHON_SOURCES = \
-	paludis_python.hh \
-	options.hh \
-	iterable.hh \
-	wrapped_value.hh \
-	about.cc \
-	action.cc \
-	choices.cc \
-	contents.cc \
-	dep_label.cc \
-	dep_spec.hh dep_spec.cc \
-	environment.cc \
-	exception.hh exception.cc \
-	filter.cc \
-	filtered_generator.cc \
-	fs_path.cc \
-	generator.cc \
-	mask.cc \
-	match_package.cc \
-	metadata_key.cc \
-	mutex.hh mutex.cc \
-	name.cc \
-	nice_names-nn.hh nice_names-nn.cc \
-	log.cc \
-	package_id.cc \
-	repository.cc \
-	selection.cc \
-	slot_requirement.cc \
-	version_operator.cc \
-	version_requirements.cc \
-	version_spec.cc
-
-BUILT_SOURCES = \
-	nice_names-nn.hh nice_names-nn.cc
-
-EXTRA_DIST = $(IF_PYTHON_TESTS) $(IF_PYTHON_SOURCES) \
-	paludis_python_so.cc \
-	additional_tests_so.cc \
-	choices_TEST_setup.sh choices_TEST_cleanup.sh \
-	environment_TEST_setup.sh environment_TEST_cleanup.sh \
-	mask_TEST_setup.sh mask_TEST_cleanup.sh \
-	metadata_key_TEST_setup.sh metadata_key_TEST_cleanup.sh \
-	nice_names.nn \
-	package_id_TEST_setup.sh package_id_TEST_cleanup.sh \
-	repository_TEST_setup.sh repository_TEST_cleanup.sh \
-	paludis_output_wrapper.py
-
-if ENABLE_PYTHON
-
-lib_LTLIBRARIES = libpaludispython_@PALUDIS_PC_SLOT@.la
-
-libpaludispython_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
-libpaludispython_@PALUDIS_PC_SLOT@_la_LDFLAGS = \
-	@BOOST_PYTHON_LIB@ \
-	-version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0 \
-	$(PTHREAD_LIBS)
-
-check_LTLIBRARIES = libadditionaltests_@PALUDIS_PC_SLOT@.la
-
-libadditionaltests_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) -I. -I@PYTHON_INCLUDE_DIR@
-libadditionaltests_@PALUDIS_PC_SLOT@_la_LDFLAGS = @BOOST_PYTHON_LIB@ -rpath /nowhere
-
-paludis_python_so.o : paludis_python_so.cc
-	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
-	    $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) -c \
-	    -o $@ $(srcdir)/paludis_python_so.cc ; then ln -fs .libs/paludis_python_so.o $@ ; else rm -f $@ ; exit 1 ; fi
-
-additional_tests_so.o : additional_tests_so.cc
-	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
-	    $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS) -I$(PYTHON_INCLUDE_DIR) -c \
-	    -o $@ $(srcdir)/additional_tests_so.cc ; then ln -fs .libs/addtional_tests_so.o $@ ; else rm -f $@ ; exit 1 ; fi
-
-libpaludispython_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_PYTHON_SOURCES)
-TESTS = $(IF_PYTHON_TESTS)
-
-libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la
-
-libadditionaltests_@PALUDIS_PC_SLOT@_la_SOURCES = additional_tests.hh additional_tests.cc
-libadditionaltests_@PALUDIS_PC_SLOT@_la_LIBADD = $(libpaludispython_@PALUDIS_PC_SLOT@_la_LIBADD)
-
-check_DATA = .libs/paludis.so .libs/additional_tests.so
-pythonlibdir = @PYTHON_INSTALL_DIR@
-pythonlib_DATA = paludis.so paludis_output_wrapper.py
-
-.libs/paludis.so : libpaludispython_@PALUDIS_PC_SLOT@.la paludis_python_so.o
-	mkdir -p .libs
-	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	    $(AM_LDFLAGS) $(LDFLAGS) \
-	    -I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@  $(PTHREAD_LIBS) \
-	    -o $@ \
-	    .libs/paludis_python_so.o \
-	    -L$(top_builddir)/python/.libs -lpaludispython_@PALUDIS_PC_SLOT@
-
-paludis.so : libpaludispython_@PALUDIS_PC_SLOT@.la paludis_python_so.o
-	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	    $(AM_LDFLAGS) $(LDFLAGS) \
-	    -I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@  $(PTHREAD_LIBS) \
-	    -o $@ \
-	    .libs/paludis_python_so.o \
-	    -L$(top_builddir)/python/.libs -lpaludispython_@PALUDIS_PC_SLOT@
-
-.libs/additional_tests.so : libadditionaltests_@PALUDIS_PC_SLOT@.la additional_tests_so.o
-	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	    $(AM_LDFLAGS) $(LDFLAGS) \
-	    -I@PYTHON_INCLUDE_DIR@ @BOOST_PYTHON_LIB@  $(PTHREAD_LIBS) \
-	    -o $@ \
-	    .libs/additional_tests_so.o \
-	    -L$(top_builddir)/python/.libs -ladditionaltests_@PALUDIS_PC_SLOT@
-
-endif
-
-nice_names-nn.hh : nice_names.nn $(top_srcdir)/misc/make_nn.bash
-	if ! $(top_srcdir)/misc/make_nn.bash --header $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-
-nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
-	if ! $(top_srcdir)/misc/make_nn.bash --source $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
deleted file mode 100644
index 66fd38c97..000000000
--- a/ruby/Makefile.am
+++ /dev/null
@@ -1,121 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = . demos
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ \
-	      -I$(top_builddir)/ \
-	      @PALUDIS_RUBY_CXXFLAGS@
-
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-CLEANFILES += Paludis.so .libs/Paludis.so
-
-IF_RUBY_TESTS = \
-	action_TEST.rb \
-	choice_TEST.rb \
-	contents_TEST.rb \
-	dep_spec_TEST.rb \
-	environment_TEST.rb \
-	filter_TEST.rb \
-	filtered_generator_TEST.rb \
-	generator_TEST.rb \
-	log_TEST.rb \
-	package_id_TEST.rb \
-	paludis_ruby_TEST.rb \
-	qualified_package_name_TEST.rb \
-	repository_TEST.rb \
-	selection_TEST.rb \
-	version_spec_TEST.rb
-
-IF_RUBY_SOURCES = \
-	action.cc \
-	choice.cc \
-	contents.cc \
-	dep_label.cc \
-	dep_spec.cc \
-	environment.cc \
-	filter.cc \
-	filtered_generator.cc \
-	generator.cc \
-	log.cc \
-	mask.cc \
-	metadata_key.cc \
-	name.cc \
-	nice_names-nn.hh nice_names-nn.cc \
-	package_id.cc \
-	paludis_ruby.cc paludis_ruby.hh \
-	qualified_package_name.cc \
-	repository.cc \
-	selection.cc \
-	version_spec.cc
-
-BUILT_SOURCES = \
-	nice_names-nn.hh nice_names-nn.cc
-
-EXTRA_DIST = $(IF_RUBY_TESTS) $(IF_RUBY_SOURCES) \
-	paludis_ruby_so.cc \
-	choice_TEST_setup.sh choice_TEST_cleanup.sh \
-	dep_spec_TEST_setup.sh dep_spec_TEST_cleanup.sh \
-	environment_TEST_setup.sh environment_TEST_cleanup.sh \
-	generator_TEST_setup.sh generator_TEST_cleanup.sh \
-	nice_names.nn \
-	package_id_TEST_setup.sh package_id_TEST_cleanup.sh \
-	paludis_ruby_TEST_setup.sh paludis_ruby_TEST_cleanup.sh \
-	repository_TEST_setup.sh repository_TEST_cleanup.sh \
-	action_TEST_setup.sh action_TEST_cleanup.sh
-
-if ENABLE_RUBY
-
-lib_LTLIBRARIES = libpaludisruby_@PALUDIS_PC_SLOT@.la
-
-libpaludisruby_@PALUDIS_PC_SLOT@_la_CXXFLAGS =  $(RUBY_CFLAGS) $(AM_CXXFLAGS) -I.
-libpaludisruby_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-paludis_ruby_so.o : paludis_ruby_so.cc
-	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) \
-	    $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(RUBY_CFLAGS) $(AM_CXXFLAGS) -c \
-	    -o $@ $(srcdir)/paludis_ruby_so.cc ; then ln -fs .libs/paludis_ruby_so.o $@ ; else rm -f $@ ; exit 1 ; fi
-
-libpaludisruby_@PALUDIS_PC_SLOT@_la_SOURCES = $(IF_RUBY_SOURCES)
-TESTS = $(IF_RUBY_TESTS)
-
-libpaludisruby_@PALUDIS_PC_SLOT@_la_LIBADD = \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(PTHREAD_LIBS)
-
-check_DATA = .libs/Paludis.so
-rubylibdir = $(RUBY_INSTALL_DIR)
-rubylib_DATA = Paludis.so
-
-.libs/Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
-	mkdir -p .libs
-	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	    $(AM_LDFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) \
-	    $(RUBY_LIBS) \
-	    -o $@ \
-	    .libs/paludis_ruby_so.o \
-	    -L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@
-
-Paludis.so : libpaludisruby_@PALUDIS_PC_SLOT@.la paludis_ruby_so.o
-	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	    $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	    $(AM_LDFLAGS) $(LDFLAGS) $(PTHREAD_LIBS) \
-	    $(RUBY_LIBS) \
-	    -o $@ \
-	    .libs/paludis_ruby_so.o \
-	    -L$(top_builddir)/ruby/.libs -lpaludisruby_@PALUDIS_PC_SLOT@
-
-endif
-
-nice_names-nn.hh : nice_names.nn $(top_srcdir)/misc/make_nn.bash
-	if ! $(top_srcdir)/misc/make_nn.bash --header $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-
-nice_names-nn.cc : nice_names.nn $(top_srcdir)/misc/make_nn.bash
-	if ! $(top_srcdir)/misc/make_nn.bash --source $(srcdir)/nice_names.nn > $@ ; then rm -f $@ ; exit 1 ; fi
-
diff --git a/ruby/demos/Makefile.am b/ruby/demos/Makefile.am
deleted file mode 100644
index 6872df57f..000000000
--- a/ruby/demos/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(srcdir)/ -I$(top_srcdir)/ruby/ \
-	      @PALUDIS_CXXFLAGS@
-
-DEFS= \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLIBDIR=\"$(libdir)\"
-
-IF_RUBY_DEMOS = \
-	version_spec_distributions.rb \
-	latest_stable.rb \
-	playman.rb
-
-EXTRA_DIST = $(IF_RUBY_DEMOS)
-
-if ENABLE_RUBY
-
-rubydemosdir = $(datadir)/paludis/ruby/demos/
-rubydemos_SCRIPTS = $(IF_RUBY_DEMOS)
-
-install-exec-local :
-	$(INSTALL) -d $(DESTDIR)$(bindir)
-	ln -sf $(rubydemosdir)/playman.rb $(DESTDIR)$(bindir)/playman
-
-uninstall-local :
-	rm $(DESTDIR)$(bindir)/playman
-
-endif
-
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index c1339230a..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS = output clients
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/src/clients/Makefile.am b/src/clients/Makefile.am
deleted file mode 100644
index 6b57986c5..000000000
--- a/src/clients/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = . $(BUILD_CLIENTS)
-DIST_SUBDIRS = . $(ALL_CLIENTS)
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
deleted file mode 100644
index 75db797a2..000000000
--- a/src/clients/cave/Makefile.am
+++ /dev/null
@@ -1,276 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src \
-	      @PALUDIS_CXXFLAGS@
-DEFS= \
-	-DBINDIR=\"$(bindir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DPYTHONINSTALLDIR=\"$(PYTHON_INSTALL_DIR)\" \
-	-DRUBYINSTALLDIR=\"$(RUBY_INSTALL_DIR)\"
-
-SUBDIRS = .
-
-bin_PROGRAMS = cave
-
-# When adding commands, you need to add to both command_MANS and
-# libcave_a_SOURCES. You should also update command_factory.cc,
-# doc/clients/Makefile.am and .gitignore.
-
-command_MANS = \
-	cave-config.1 \
-	cave-contents.1 \
-	cave-digest.1 \
-	cave-display-resolution.1 \
-	cave-dump-cave-formats-conf.1 \
-	cave-executables.1 \
-	cave-execute-resolution.1 \
-	cave-find-candidates.1 \
-	cave-fix-cache.1 \
-	cave-fix-linkage.1 \
-	cave-generate-metadata.1 \
-	cave-graph-jobs.1 \
-	cave-has-version.1 \
-	cave-help.1 \
-	cave-import.1 \
-	cave-info.1 \
-	cave-manage-search-index.1 \
-	cave-match.1 \
-	cave-mirror.1 \
-	cave-owner.1 \
-	cave-perform.1 \
-	cave-print-best-version.1 \
-	cave-print-categories.1 \
-	cave-print-checksum.1 \
-	cave-print-checksum-algorithms.1 \
-	cave-print-commands.1 \
-	cave-print-dependent-ids.1 \
-	cave-print-environment-metadata.1 \
-	cave-print-id-actions.1 \
-	cave-print-id-contents.1 \
-	cave-print-id-environment-variable.1 \
-	cave-print-id-executables.1 \
-	cave-print-id-masks.1 \
-	cave-print-id-metadata.1 \
-	cave-print-id-size.1 \
-	cave-print-ids.1 \
-	cave-print-owners.1 \
-	cave-print-packages.1 \
-	cave-print-repositories.1 \
-	cave-print-repository-formats.1 \
-	cave-print-repository-metadata.1 \
-	cave-print-resolution-required-confirmations.1 \
-	cave-print-set.1 \
-	cave-print-sets.1 \
-	cave-print-spec.1 \
-	cave-print-sync-protocols.1 \
-	cave-print-unmanaged-files.1 \
-	cave-print-unused-distfiles.1 \
-	cave-purge.1 \
-	cave-report.1 \
-	cave-resolve.1 \
-	cave-resume.1 \
-	cave-search.1 \
-	cave-show.1 \
-	cave-size.1 \
-	cave-sync.1 \
-	cave-sync-protocol-options.1 \
-	cave-uninstall.1 \
-	cave-update-world.1 \
-	cave-verify.1
-
-man_MANS = \
-	cave.1 \
-	$(command_MANS)
-
-man_MANS_txts = $(man_MANS:.1=.txt)
-man_MANS_xmls = $(man_MANS_txts:.txt=.xml)
-man_MANS_html_man_fragments = $(man_MANS_txts:.txt=.html-man-fragment)
-
-command_MANS_html_man_fragments = $(command_MANS_txts:.txt=.html-man-fragment)
-
-SUFFIXES = .1 .txt .xml .html-man-fragment
-
-if USE_PREBUILT_DOCUMENTATION
-else
-
-noinst_PROGRAMS = man-cave
-
-$(man_MANS_txts) : man-cave
-	if ! env \
-	    CAVE_FORMATS_CONF="/dev/null" \
-	    CAVE_COMMANDS_PATH="" \
-	    ./man-cave `echo $@ | sed -e 's.^cave-*..' -e 's,\.txt$$,,'` > $@ ; then rm -f $@ ; exit 1 ; fi
-
-.txt.xml : $(man_MANS_txts)
-	asciidoc --doctype=manpage --backend=docbook --out-file=$@ --conf=$(top_srcdir)/misc/asciidoc.conf $<
-
-.xml.1 : $(man_MANS_xmls)
-	xmlto man $<
-
-.xml.html-man-fragment : $(man_MANS_xmls)
-	xmlto -o $@-dir html $<
-	sed \
-	    -e '1s,^.*\(<div class="refnamediv">\),\1,' \
-	    -e '$$s,</body>.*,,' -e '$$s,</div><div class="navfooter"><hr></div>,,' \
-	    -e 's,<a name="[^"]*"></a>,,g' \
-	    $@-dir/index.html > $@
-	rm -fr $@-dir
-
-man_cave_SOURCES = \
-	man_cave.cc
-
-man_cave_LDADD = \
-	libcave.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/resolver/libpaludisresolver.a
-
-endif
-
-cave_SOURCES = \
-	cave.cc
-
-cave_LDADD = \
-	libcave.a \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/args/libpaludisargs_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/resolver/libpaludisresolver.a \
-	$(top_builddir)/src/output/liboutput.a \
-	$(DYNAMIC_LD_LIBS)
-
-noinst_LIBRARIES = libcave.a
-
-# See note above for adding commands
-libcave_a_SOURCES = \
-	colour_pretty_printer.cc colour_pretty_printer.hh colour_pretty_printer-fmt.hh \
-	command.cc command.hh \
-	command_line.cc command_line.hh \
-	command_command_line.cc command_command_line.hh \
-	command_factory.cc command_factory.hh \
-	cmd_contents.cc cmd_contents.hh cmd_contents-fmt.hh \
-	cmd_config.cc cmd_config.hh \
-	cmd_digest.cc cmd_digest.hh \
-	cmd_display_resolution.cc cmd_display_resolution.hh cmd_display_resolution-fmt.hh \
-	cmd_dump_cave_formats_conf.cc cmd_dump_cave_formats_conf.hh \
-	cmd_executables.cc cmd_executables.hh cmd_executables-fmt.hh \
-	cmd_execute_resolution.cc cmd_execute_resolution.hh cmd_execute_resolution-fmt.hh \
-	cmd_find_candidates.cc cmd_find_candidates.hh \
-	cmd_fix_cache.cc cmd_fix_cache.hh cmd_fix_cache-fmt.hh \
-	cmd_fix_linkage.cc cmd_fix_linkage.hh \
-	cmd_generate_metadata.cc cmd_generate_metadata.hh \
-	cmd_graph_jobs.cc cmd_graph_jobs.hh \
-	cmd_has_version.cc cmd_has_version.hh \
-	cmd_help.cc cmd_help.hh \
-	cmd_import.cc cmd_import.hh \
-	cmd_info.cc cmd_info.hh cmd_info-fmt.hh \
-	cmd_manage_search_index.cc cmd_manage_search_index.hh \
-	cmd_match.cc cmd_match.hh \
-	cmd_mirror.cc cmd_mirror.hh \
-	cmd_owner.cc cmd_owner.hh cmd_owner-fmt.hh \
-	cmd_perform.cc cmd_perform.hh cmd_perform-fmt.hh \
-	cmd_print_best_version.cc cmd_print_best_version.hh \
-	cmd_print_categories.cc cmd_print_categories.hh \
-	cmd_print_checksum.cc cmd_print_checksum.hh \
-	cmd_print_checksum_algorithms.cc cmd_print_checksum_algorithms.hh \
-	cmd_print_commands.cc cmd_print_commands.hh \
-	cmd_print_dependent_ids.cc cmd_print_dependent_ids.hh \
-	cmd_print_environment_metadata.cc cmd_print_environment_metadata.hh \
-	cmd_print_id_actions.cc cmd_print_id_actions.hh \
-	cmd_print_id_contents.cc cmd_print_id_contents.hh \
-	cmd_print_id_environment_variable.cc cmd_print_id_environment_variable.hh \
-	cmd_print_id_executables.cc cmd_print_id_executables.hh \
-	cmd_print_id_masks.cc cmd_print_id_masks.hh \
-	cmd_print_id_metadata.cc cmd_print_id_metadata.hh \
-	cmd_print_id_size.cc cmd_print_id_size.hh \
-	cmd_print_ids.cc cmd_print_ids.hh \
-	cmd_print_owners.cc cmd_print_owners.hh \
-	cmd_print_packages.cc cmd_print_packages.hh \
-	cmd_print_repositories.cc cmd_print_repositories.hh \
-	cmd_print_repository_formats.cc cmd_print_repository_formats.hh \
-	cmd_print_repository_metadata.cc cmd_print_repository_metadata.hh \
-	cmd_print_resolution_required_confirmations.cc cmd_print_resolution_required_confirmations.hh \
-	cmd_print_set.cc cmd_print_set.hh \
-	cmd_print_sets.cc cmd_print_sets.hh \
-	cmd_print_spec.cc cmd_print_spec.hh \
-	cmd_print_sync_protocols.cc cmd_print_sync_protocols.hh \
-	cmd_print_unmanaged_files.cc cmd_print_unmanaged_files.hh \
-	cmd_print_unused_distfiles.cc cmd_print_unused_distfiles.hh \
-	cmd_purge.cc cmd_purge.hh \
-	cmd_report.cc cmd_report.hh cmd_report-fmt.hh \
-	cmd_resolve.cc cmd_resolve.hh \
-	cmd_resolve_display_callback.cc cmd_resolve_display_callback.hh \
-	cmd_resolve_dump.cc cmd_resolve_dump.hh \
-	cmd_resume.cc cmd_resume.hh \
-	cmd_search.cc cmd_search.hh \
-	cmd_search_cmdline.cc cmd_search_cmdline.hh \
-	cmd_show.cc cmd_show.hh cmd_show-fmt.hh \
-	cmd_size.cc cmd_size.hh \
-	cmd_sync.cc cmd_sync.hh cmd_sync-fmt.hh \
-	cmd_sync_protocol_options.cc cmd_sync_protocol_options.hh \
-	cmd_uninstall.cc cmd_uninstall.hh \
-	cmd_update_world.cc cmd_update_world.hh cmd_update_world-fmt.hh \
-	cmd_verify.cc cmd_verify.hh cmd_verify-fmt.hh \
-	colours.cc colours.hh \
-	exceptions.cc exceptions.hh \
-	executables_common.cc executables_common.hh \
-	format_package_id.cc format_package_id.hh \
-	format_plain_contents_entry.cc format_plain_contents_entry.hh \
-	format_plain_metadata_key.cc format_plain_metadata_key.hh \
-	format_string.cc format_string.hh \
-	format_user_config.cc format_user_config.hh \
-	script_command.cc script_command.hh \
-	search_extras_handle.cc search_extras_handle.hh \
-	select_format_for_spec.cc select_format_for_spec.hh \
-	owner_common.cc owner_common.hh \
-	parse_spec_with_nice_error.cc parse_spec_with_nice_error.hh \
-	resolve_cmdline.cc resolve_cmdline.hh \
-	resolve_common.cc resolve_common.hh \
-	resume_data.cc resume_data.hh \
-	size_common.cc size_common.hh
-
-TESTS = \
-	continue_on_failure_TEST
-
-EXTRA_DIST = \
-	$(man_MANS) \
-	$(man_MANS_html_man_fragments) \
-	$(TESTS) \
-	continue_on_failure_TEST_setup.sh continue_on_failure_TEST_cleanup.sh \
-	moo
-
-noinst_DATA = $(man_MANS_html_man_fragments)
-
-DISTCLEANFILES = \
-	$(man_MANS) \
-	$(man_MANS_html_man_fragments) \
-	$(man_MANS_txts) \
-	$(man_MANS_xmls)
-
-lib_LTLIBRARIES =
-
-lib_LTLIBRARIES += libcavematchextras_@PALUDIS_PC_SLOT@.la
-
-libcavematchextras_@PALUDIS_PC_SLOT@_la_SOURCES = match_extras.cc match_extras.hh
-libcavematchextras_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @PCRECPPDEPS_CFLAGS@
-libcavematchextras_@PALUDIS_PC_SLOT@_la_LIBADD = @PCRECPPDEPS_LIBS@
-libcavematchextras_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-if ENABLE_SEARCH_INDEX
-
-lib_LTLIBRARIES += libcavesearchextras_@PALUDIS_PC_SLOT@.la
-
-libcavesearchextras_@PALUDIS_PC_SLOT@_la_SOURCES = search_extras.cc search_extras.hh
-libcavesearchextras_@PALUDIS_PC_SLOT@_la_CXXFLAGS = $(AM_CXXFLAGS) @SQLITE3DEPS_CFLAGS@
-libcavesearchextras_@PALUDIS_PC_SLOT@_la_LIBADD = @SQLITE3DEPS_LIBS@
-libcavesearchextras_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-
-endif
-
-cavecommandsdir = $(libexecdir)/cave/commands
-cavecommands_SCRIPTS = moo
-
diff --git a/src/output/Makefile.am b/src/output/Makefile.am
deleted file mode 100644
index a5260367a..000000000
--- a/src/output/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT *.epicfail
-MAINTAINERCLEANFILES = Makefile.in
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-noinst_LIBRARIES = liboutput.a
-liboutput_a_SOURCES = \
-	colour.cc colour.hh \
-	colour_pretty_printer.cc colour_pretty_printer.hh
-
-AM_CXXFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src @PALUDIS_CXXFLAGS@
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/vim/Makefile.am b/vim/Makefile.am
deleted file mode 100644
index b7f85dd00..000000000
--- a/vim/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS = ftdetect syntax
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/vim/ftdetect/Makefile.am b/vim/ftdetect/Makefile.am
deleted file mode 100644
index abfdfdeb4..000000000
--- a/vim/ftdetect/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS =
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-vimscripts = \
-	paludis.vim
-
-if HAVE_VIM
-
-vimftdetectdir = $(VIM_INSTALL_DIR)/ftdetect/
-
-vimftdetect_DATA = $(vimscripts)
-
-endif
-
-EXTRA_DIST = $(vimscripts)
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/vim/syntax/Makefile.am b/vim/syntax/Makefile.am
deleted file mode 100644
index d80cf759b..000000000
--- a/vim/syntax/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES = *~ gmon.out *.gcov *.gcno  *.gcda *.loT .keep *.epicfail
-SUBDIRS =
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-vimscripts = \
-	paludis-general-conf.vim \
-	paludis-keywords-conf.vim \
-	paludis-licenses-conf.vim \
-	paludis-mirrors-conf.vim \
-	paludis-output-conf.vim \
-	paludis-package-mask-conf.vim \
-	paludis-repositories-conf.vim \
-	paludis-suggestions-conf.vim \
-	paludis-use-conf.vim
-
-if HAVE_VIM
-
-vimsyntaxdir = $(VIM_INSTALL_DIR)/syntax/
-
-vimsyntax_DATA = $(vimscripts)
-
-endif
-
-EXTRA_DIST = $(vimscripts)
-
-
-built-sources : $(BUILT_SOURCES)
-	for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/zsh-completion/Makefile.am b/zsh-completion/Makefile.am
deleted file mode 100644
index 352cb544d..000000000
--- a/zsh-completion/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-noinst_DATA = _cave
-EXTRA_DIST = $(noinst_DATA)
-
-AUTOMAKE_OPTIONS = 1.11 parallel-tests
-
-built-sources : $(BUILT_SOURCES)
-	for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-