Remove kdebuild-1

17 files changed, 22 insertions, 1713 deletions

diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 04bc9125a..82eae42c9 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -194,17 +194,6 @@ e_repository_TEST_exheres_0_LDADD = \
 
 e_repository_TEST_exheres_0_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
 
-e_repository_TEST_kdebuild_1_SOURCES = e_repository_TEST_kdebuild_1.cc
-
-e_repository_TEST_kdebuild_1_LDADD = \
-	$(top_builddir)/paludis/util/libpaludisutil_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/paludis/util/test_extras.o \
-	$(top_builddir)/paludis/libpaludis_@PALUDIS_PC_SLOT@.la \
-	$(top_builddir)/test/libtest.a \
-	$(DYNAMIC_LD_LIBS)
-
-e_repository_TEST_kdebuild_1_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) @PALUDIS_CXXFLAGS_NO_DEBUGGING@
-
 e_repository_TEST_3_SOURCES = e_repository_TEST_3.cc
 
 e_repository_TEST_3_LDADD = \
@@ -458,9 +447,6 @@ EXTRA_DIST = \
 	e_repository_TEST_exheres_0.cc \
 	e_repository_TEST_exheres_0_setup.sh \
 	e_repository_TEST_exheres_0_cleanup.sh \
-	e_repository_TEST_kdebuild_1.cc \
-	e_repository_TEST_kdebuild_1_setup.sh \
-	e_repository_TEST_kdebuild_1_cleanup.sh \
 	e_repository_TEST_0.cc \
 	e_repository_TEST_0_setup.sh \
 	e_repository_TEST_0_cleanup.sh \
@@ -535,7 +521,6 @@ check_SCRIPTS = \
 	e_repository_TEST_dependencies_rewriter_setup.sh e_repository_TEST_dependencies_rewriter_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_kdebuild_1_setup.sh e_repository_TEST_kdebuild_1_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 \
@@ -614,7 +599,6 @@ TESTS = \
 	e_repository_TEST_ever \
 	e_repository_TEST_exheres_0 \
 	e_repository_TEST_exlibs \
-	e_repository_TEST_kdebuild_1 \
 	e_repository_TEST_phases \
 	e_repository_TEST_replacing \
 	e_repository_TEST_symlink_rewriting \
diff --git a/paludis/repositories/e/dep_parser_TEST.cc b/paludis/repositories/e/dep_parser_TEST.cc
index 7e6dfedd4..b0a9040ba 100644
--- a/paludis/repositories/e/dep_parser_TEST.cc
+++ b/paludis/repositories/e/dep_parser_TEST.cc
@@ -453,9 +453,9 @@ namespace test_cases
         }
     } test_dep_spec_parser_labels;
 
-    struct DepParserKDEBuildURILabelsTest : TestCase
+    struct DepParserExheres0URILabelsTest : TestCase
     {
-        DepParserKDEBuildURILabelsTest() : TestCase("kdebuild uri label handling") { }
+        DepParserExheres0URILabelsTest() : TestCase("exheres-0 uri label handling") { }
 
         void run()
         {
@@ -470,12 +470,12 @@ namespace test_cases
 
             DepSpecPrettyPrinter d(0, std::tr1::shared_ptr<const PackageID>(), ff, 0, false, false);
             parse_fetchable_uri("http://foo/bar manual: two",
-                    &env, id, *EAPIData::get_instance()->eapi_from_string("kdebuild-1"))->root()->accept(d);
+                    &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d);
             TEST_CHECK_EQUAL(stringify(d), "http://foo/bar manual: two");
             TEST_CHECK_THROWS(parse_fetchable_uri("http://foo/bar monkey: two",
-                        &env, id, *EAPIData::get_instance()->eapi_from_string("kdebuild-1"))->root()->accept(d), EDepParseError);
+                        &env, id, *EAPIData::get_instance()->eapi_from_string("exheres-0"))->root()->accept(d), EDepParseError);
         }
-    } test_dep_spec_parser_kdebuild_uri_labels;
+    } test_dep_spec_parser_exheres_0_uri_labels;
 
     struct AnnotationsTest : TestCase
     {
diff --git a/paludis/repositories/e/e_repository_TEST_kdebuild_1.cc b/paludis/repositories/e/e_repository_TEST_kdebuild_1.cc
deleted file mode 100644
index 536fba775..000000000
--- a/paludis/repositories/e/e_repository_TEST_kdebuild_1.cc
+++ /dev/null
@@ -1,290 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-/*
- * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
- *
- * This file is part of the Paludis package manager. Paludis is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General
- * Public License version 2, as published by the Free Software Foundation.
- *
- * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <paludis/repositories/e/e_repository.hh>
-#include <paludis/repositories/e/e_repository_exceptions.hh>
-#include <paludis/repositories/e/e_repository_id.hh>
-#include <paludis/repositories/e/vdb_repository.hh>
-#include <paludis/repositories/e/eapi.hh>
-#include <paludis/repositories/e/dep_spec_pretty_printer.hh>
-#include <paludis/repositories/fake/fake_installed_repository.hh>
-#include <paludis/repositories/fake/fake_package_id.hh>
-#include <paludis/environments/test/test_environment.hh>
-#include <paludis/util/system.hh>
-#include <paludis/util/simple_visitor_cast.hh>
-#include <paludis/util/map.hh>
-#include <paludis/util/make_shared_ptr.hh>
-#include <paludis/util/make_named_values.hh>
-#include <paludis/util/set.hh>
-#include <paludis/standard_output_manager.hh>
-#include <paludis/util/safe_ifstream.hh>
-#include <paludis/package_id.hh>
-#include <paludis/metadata_key.hh>
-#include <paludis/action.hh>
-#include <paludis/stringify_formatter.hh>
-#include <paludis/user_dep_spec.hh>
-#include <paludis/generator.hh>
-#include <paludis/filter.hh>
-#include <paludis/filtered_generator.hh>
-#include <paludis/selection.hh>
-#include <paludis/repository_factory.hh>
-#include <paludis/choice.hh>
-#include <test/test_framework.hh>
-#include <test/test_runner.hh>
-#include <tr1/functional>
-#include <set>
-#include <string>
-
-#include "config.h"
-
-using namespace test;
-using namespace paludis;
-
-namespace
-{
-    void cannot_uninstall(const std::tr1::shared_ptr<const PackageID> & id, const UninstallActionOptions &)
-    {
-        if (id)
-            throw InternalError(PALUDIS_HERE, "cannot uninstall");
-    }
-
-    std::tr1::shared_ptr<OutputManager> make_standard_output_manager(const Action &)
-    {
-        return make_shared_ptr(new StandardOutputManager);
-    }
-
-    std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
-            const std::string & k)
-    {
-        Map<std::string, std::string>::ConstIterator mm(m->find(k));
-        if (m->end() == mm)
-            return "";
-        else
-            return mm->second;
-    }
-
-    WantPhase want_all_phases(const std::string &)
-    {
-        return wp_yes;
-    }
-}
-
-namespace test_cases
-{
-    struct ERepositoryInstallEAPIKdebuild1Test : TestCase
-    {
-        ERepositoryInstallEAPIKdebuild1Test() : TestCase("install_eapi_kdebuild_1") { }
-
-        unsigned max_run_time() const
-        {
-            return 3000;
-        }
-
-        bool repeatable() const
-        {
-            return false;
-        }
-
-        void run()
-        {
-            TestEnvironment env;
-            env.set_paludis_command("/bin/false");
-            std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
-            keys->insert("format", "ebuild");
-            keys->insert("names_cache", "/var/empty");
-            keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "repo"));
-            keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "repo/profiles/profile"));
-            keys->insert("layout", "traditional");
-            keys->insert("eapi_when_unknown", "0");
-            keys->insert("eapi_when_unspecified", "0");
-            keys->insert("profile_eapi", "0");
-            keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "distdir"));
-            keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "build"));
-            std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
-                        std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
-            env.package_database()->add_repository(1, repo);
-
-            std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
-                        make_named_values<FakeInstalledRepositoryParams>(
-                            value_for<n::environment>(&env),
-                            value_for<n::name>(RepositoryName("installed")),
-                            value_for<n::suitable_destination>(true),
-                            value_for<n::supports_uninstall>(true)
-                            )));
-            env.package_database()->add_repository(2, installed_repo);
-
-            InstallAction action(make_named_values<InstallActionOptions>(
-                        value_for<n::destination>(installed_repo),
-                        value_for<n::make_output_manager>(&make_standard_output_manager),
-                        value_for<n::perform_uninstall>(&cannot_uninstall),
-                        value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
-                        value_for<n::want_phase>(&want_all_phases)
-                        ));
-
-            {
-                TestMessageSuffix suffix("econf source kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/econf-source-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-
-            {
-                TestMessageSuffix suffix("banned functions kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/banned-functions-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
-            }
-
-            {
-                TestMessageSuffix suffix("banned vars kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/banned-vars-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "UNKNOWN");
-            }
-
-            {
-                TestMessageSuffix suffix("dosym success kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-success-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-
-            {
-                TestMessageSuffix suffix("dosym fail kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/dosym-fail-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
-            }
-
-            {
-                TestMessageSuffix suffix("doman kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/doman-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-
-            {
-                TestMessageSuffix suffix("no src_prepare kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/src_prepare-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-
-            {
-                TestMessageSuffix suffix("no src_configure kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/src_configure-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-        }
-    } test_e_repository_install_eapi_kdebuild_1;
-
-    struct ERepositoryInfoEAPIKdebuild1Test : TestCase
-    {
-        ERepositoryInfoEAPIKdebuild1Test() : TestCase("info_eapi_kdebuild_1") { }
-
-        unsigned max_run_time() const
-        {
-            return 3000;
-        }
-
-        bool repeatable() const
-        {
-            return false;
-        }
-
-        void run()
-        {
-            TestEnvironment env;
-            env.set_paludis_command("/bin/false");
-            std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
-            keys->insert("format", "ebuild");
-            keys->insert("names_cache", "/var/empty");
-            keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "repo"));
-            keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "repo/profiles/profile"));
-            keys->insert("layout", "traditional");
-            keys->insert("eapi_when_unknown", "0");
-            keys->insert("eapi_when_unspecified", "0");
-            keys->insert("profile_eapi", "0");
-            keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "distdir"));
-            keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_kdebuild_1_dir" / "build"));
-            std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,
-                        std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1)));
-            env.package_database()->add_repository(1, repo);
-
-            std::tr1::shared_ptr<FakeInstalledRepository> installed_repo(new FakeInstalledRepository(
-                        make_named_values<FakeInstalledRepositoryParams>(
-                            value_for<n::environment>(&env),
-                            value_for<n::name>(RepositoryName("installed")),
-                            value_for<n::suitable_destination>(true),
-                            value_for<n::supports_uninstall>(true)
-                            )));
-            env.package_database()->add_repository(2, installed_repo);
-
-            InfoActionOptions options(make_named_values<InfoActionOptions>(
-                        value_for<n::make_output_manager>(&make_standard_output_manager)
-                        ));
-            InfoAction action(options);
-
-            {
-                TestMessageSuffix suffix("info success kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/info-success-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                id->perform_action(action);
-            }
-
-            {
-                TestMessageSuffix suffix("info fail kdebuild-1", true);
-                const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                                PackageDepSpec(parse_user_package_dep_spec("=cat/info-fail-kdebuild-1",
-                                        &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
-                TEST_CHECK(id);
-                TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "kdebuild-1");
-                TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
-            }
-        }
-    } test_e_repository_info_eapi_kdebuild_1;
-}
-
diff --git a/paludis/repositories/e/e_repository_TEST_kdebuild_1_cleanup.sh b/paludis/repositories/e/e_repository_TEST_kdebuild_1_cleanup.sh
deleted file mode 100755
index 1d5d96ddd..000000000
--- a/paludis/repositories/e/e_repository_TEST_kdebuild_1_cleanup.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d e_repository_TEST_kdebuild_1_dir ] ; then
-    rm -fr e_repository_TEST_kdebuild_1_dir
-else
-    true
-fi
-
diff --git a/paludis/repositories/e/e_repository_TEST_kdebuild_1_setup.sh b/paludis/repositories/e/e_repository_TEST_kdebuild_1_setup.sh
deleted file mode 100755
index 15adb9731..000000000
--- a/paludis/repositories/e/e_repository_TEST_kdebuild_1_setup.sh
+++ /dev/null
@@ -1,1120 +0,0 @@
-#!/usr/bin/env bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-mkdir e_repository_TEST_kdebuild_1_dir || exit 1
-cd e_repository_TEST_kdebuild_1_dir || exit 1
-
-mkdir -p root/etc
-
-mkdir -p vdb
-touch vdb/THISISTHEVDB
-
-mkdir -p build
-ln -s build symlinked_build
-
-mkdir -p distdir
-echo "already fetched" > distdir/already-fetched.txt || exit 1
-cat <<END > distdir/expatch-success-1.patch || exit 1
---- a/bar
-+++ b/bar
-@@ -1 +1,3 @@
- foo
-+bar
-+baz
-END
-
-mkdir -p repo/{profiles/profile,metadata,eclass} || exit 1
-cd repo || exit 1
-echo "test-repo" >> profiles/repo_name || exit 1
-echo "cat" >> profiles/categories || exit 1
-cat <<END > profiles/profile/virtuals
-virtual/virtual-pretend-installed cat/pretend-installed
-virtual/virtual-doesnotexist cat/doesnotexist
-END
-cat <<END > profiles/profile/make.defaults
-ARCH="cheese"
-USERLAND="GNU"
-KERNEL="linux"
-LIBC="glibc"
-CHOST="i286-badger-linux-gnu"
-LINGUAS="enabled_en enabled_en_GB enabled_en_GB@UTF-8"
-USE_EXPAND="LINGUAS USERLAND"
-USE_EXPAND_UNPREFIXED="ARCH"
-USE_EXPAND_IMPLICIT="USERLAND ARCH"
-USE_EXPAND_VALUES_USERLAND="GNU"
-USE_EXPAND_VALUES_ARCH="cheese otherarch"
-IUSE_IMPLICIT="build"
-END
-mkdir -p "cat/in-ebuild-die"
-cat <<END > cat/in-ebuild-die/in-ebuild-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    die "boom"
-}
-END
-mkdir -p "cat/in-subshell-die"
-cat <<'END' > cat/in-subshell-die/in-subshell-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    ( hasq test $KEYWORDS && die "boom" )
-}
-END
-mkdir -p "cat/success"
-cat <<END > cat/success/success-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    useq spork && die "boom"
-}
-END
-mkdir -p "cat/unpack-die"
-cat <<END > cat/unpack-die/unpack-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    echo "123" > f.bz2
-    unpack ./f.bz2
-}
-END
-mkdir -p "cat/econf-die"
-cat <<END > cat/econf-die/econf-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    econf
-}
-END
-mkdir -p "cat/emake-fail"
-cat <<END > cat/emake-fail/emake-fail-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    emake monkey
-}
-END
-mkdir -p "cat/emake-die"
-cat <<END > cat/emake-die/emake-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    emake monkey || die
-}
-END
-mkdir -p "cat/einstall-die"
-cat <<END > cat/einstall-die/einstall-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    einstall
-}
-END
-mkdir -p "cat/keepdir-die"
-cat <<"END" > cat/keepdir-die/keepdir-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dodir /usr/share
-    touch "${D}"/usr/share/monkey
-    keepdir /usr/share/monkey
-}
-END
-mkdir -p "cat/dobin-fail"
-cat <<END > cat/dobin-fail/dobin-fail-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dobin monkey
-}
-END
-mkdir -p "cat/dobin-die"
-cat <<END > cat/dobin-die/dobin-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dobin monkey || die
-}
-END
-mkdir -p "cat/fperms-fail"
-cat <<END > cat/fperms-fail/fperms-fail-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    fperms 755 monkey
-}
-END
-mkdir -p "cat/fperms-die"
-cat <<END > cat/fperms-die/fperms-die-1.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    fperms 755 monkey || die
-}
-END
-mkdir -p "cat/pretend-installed"
-cat <<END > cat/pretend-installed/pretend-installed-2.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    die "not supposed to install this"
-}
-END
-mkdir -p "cat/econf-source"
-cat <<END > cat/econf-source/econf-source-0.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    ECONF_SOURCE=subdir
-    mkdir \${S}
-    cd \${S}
-    mkdir subdir
-    echo 'touch monkey' > subdir/configure
-    chmod +x subdir/configure
-}
-
-src_install() {
-    insinto /usr/bin
-    doins monkey || die "no monkey"
-}
-END
-cp cat/econf-source/econf-source-{0,1}.ebuild || exit 1
-cp cat/econf-source/econf-source-{0,2}.ebuild || exit 1
-mkdir -p "cat/doman"
-cat <<END > cat/doman/doman-0.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    echo \${PF} >foo.1
-    mkdir dir
-    echo \${PF} >dir/foo.2
-    echo \${PF} >foo.2
-    echo \${PF} >foo.3x
-    echo \${PF} >foo.4.gz
-    echo \${PF} >foo.5f.bz2
-    echo \${PF} >foo.6.Z
-    echo \${PF} >foo.en.7
-    echo \${PF} >foo.en_GB.8
-    echo \${PF} >foo.e.9
-    echo \${PF} >foo.enn.n
-    echo \${PF} >foo.EN.1
-    echo \${PF} >foo.en-GB.2
-    echo \${PF} >foo.en_gb.3
-    echo \${PF} >foo.en_G.4
-    echo \${PF} >foo.en_GBB.5
-    echo \${PF} >foo.nonkey
-    touch foo.1x
-    echo \${PF} >bar.m
-    echo \${PF} >bar.monkey
-    echo \${PF} >baz.6
-    echo \${PF} >baz.en_US.7
-}
-
-src_install() {
-    doman foo.* dir/foo.* || die
-    doman bar.m && die
-    doman bar.monkey && die
-    doman bar.1 && die
-    doman -i18n=en_GB baz.* || die
-    keepdir /meh || die
-    cd "\${D}"/meh || die
-    doman .keep* || die
-    rm "\${D}"/usr/share/man/{man1/foo.1,man2/foo.2,man3/foo.3x,man4/foo.4.gz,man5/foo.5f.bz2} || die
-    rm "\${D}"/usr/share/man/{man6/foo.6.Z,man7/foo.en.7,man8/foo.en_GB.8,man9/foo.e.9,mann/foo.enn.n} || die
-    rm "\${D}"/usr/share/man/{man1/foo.EN.1,man2/foo.en-GB.2,man3/foo.en_gb.3,man4/foo.en_G.4} || die
-    rm "\${D}"/usr/share/man/{man5/foo.en_GBB.5,mann/foo.nonkey,en_GB/man6/baz.6,en_GB/man7/baz.en_US.7} || die
-    rmdir "\${D}"/usr/share/man/{man1,man2,man3,man4,man5,man6,man7,man8,man9,mann,en_GB/man6,en_GB/man7,en_GB,} || die
-}
-END
-cp cat/doman/doman-{0,1}.ebuild || exit 1
-cat <<END > cat/doman/doman-2.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_compile() {
-    echo \${PF} >foo.1
-    mkdir dir
-    echo \${PF} >dir/foo.2
-    echo \${PF} >foo.3x
-    echo \${PF} >foo.4.gz
-    echo \${PF} >foo.5f.bz2
-    echo \${PF} >foo.6.Z
-    echo \${PF} >foo.en.7
-    echo \${PF} >foo.en_GB.8
-    echo \${PF} >foo.e.9
-    echo \${PF} >foo.enn.n
-    echo \${PF} >foo.EN.1
-    echo \${PF} >foo.en-GB.2
-    echo \${PF} >foo.en_gb.3
-    echo \${PF} >foo.en_G.4
-    echo \${PF} >foo.en_GBB.5
-    echo \${PF} >foo.nonkey
-    touch foo.1x
-    echo \${PF} >bar.m
-    echo \${PF} >bar.monkey
-    echo \${PF} >baz.6
-    echo \${PF} >baz.en_US.7
-}
-
-src_install() {
-    doman foo.* dir/foo.* || die
-    doman bar.m && die
-    doman bar.monkey && die
-    doman bar.1 && die
-    doman -i18n=en_GB baz.* || die
-    keepdir /meh || die
-    cd "\${D}"/meh || die
-    doman .keep* || die
-    rm "\${D}"/usr/share/man/{man1/foo.1,man2/foo.2,man3/foo.3x,man4/foo.4.gz,man5/foo.5f.bz2} || die
-    rm "\${D}"/usr/share/man/{man6/foo.6.Z,en/man7/foo.7,en_GB/man8/foo.8,man9/foo.e.9,mann/foo.enn.n} || die
-    rm "\${D}"/usr/share/man/{man1/foo.EN.1,man2/foo.en-GB.2,man3/foo.en_gb.3,man4/foo.en_G.4} || die
-    rm "\${D}"/usr/share/man/{man5/foo.en_GBB.5,mann/foo.nonkey,en_GB/man6/baz.6,en_US/man7/baz.7} || die
-    rmdir "\${D}"/usr/share/man/{man1,man2,man3,man4,man5,man6,man9,mann,en/man7,en_GB/man6,en_GB/man8,en_US/man7,en,en_GB,en_US,} || die
-}
-END
-mkdir -p "cat/dosym-success"
-cat <<'END' > cat/dosym-success/dosym-success-1.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dosym foo /usr/bin/bar
-    [[ "$(readlink ${D}/usr/bin/bar )" == "foo" ]] || die
-}
-END
-mkdir -p "cat/best-version"
-cat <<'END' > cat/best-version/best-version-0.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    if ! best_version cat/pretend-installed >/dev/null ; then
-        die "failed cat/pretend-installed"
-    fi
-
-    BV1=$(best_version cat/pretend-installed )
-    [[ "$BV1" == "cat/pretend-installed-1" ]] || die "BV1 is $BV1"
-
-    if best_version cat/doesnotexist >/dev/null ; then
-        die "not failed cat/doesnotexist"
-    fi
-
-    BV2=$(best_version cat/doesnotexist )
-    [[ "$BV2" == "" ]] || die "BV2 is $BV2"
-
-    if [[ -n "$PALUDIS_ENABLE_VIRTUALS_REPOSITORY" ]] ; then
-        if ! best_version virtual/virtual-pretend-installed >/dev/null ; then
-            die "failed virtual/virtual-pretend-installed"
-        fi
-
-        BV3=$(best_version virtual/virtual-pretend-installed )
-        [[ "$BV3" == "cat/pretend-installed-1" ]] || die "BV3 is $BV3"
-
-        if best_version virtual/virtual-doesnotexist >/dev/null ; then
-            die "not failed virtual/virtual-doesnotexist"
-        fi
-
-        BV2=$(best_version virtual/virtual-doesnotexist )
-        [[ "$BV4" == "" ]] || die "BV4 is $BV4"
-    fi
-}
-END
-mkdir -p "cat/has-version"
-cat <<'END' > cat/has-version/has-version-0.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    if ! has_version cat/pretend-installed ; then
-        die "failed cat/pretend-installed"
-    fi
-
-    if has_version cat/doesnotexist >/dev/null ; then
-        die "not failed cat/doesnotexist"
-    fi
-}
-END
-mkdir -p "cat/match"
-cat <<'END' > cat/match/match-0.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    if ! portageq match "${ROOT}" cat/pretend-installed >/dev/null ; then
-        die "failed cat/pretend-installed"
-    fi
-
-    cat <<'DONE' > ${T}/expected
-cat/pretend-installed-0
-cat/pretend-installed-1
-DONE
-    portageq match "${ROOT}" cat/pretend-installed > ${T}/got
-    cmp ${T}/expected ${T}/got || die "oops"
-
-    if portageq match "${ROOT}" cat/doesnotexist >/dev/null ; then
-        die "not failed cat/doesnotexist"
-    fi
-
-    BV2=$(portageq match "${ROOT}" cat/doesnotexist )
-    [[ "$BV2" == "" ]] || die "BV2 is $BV2"
-}
-END
-mkdir -p "cat/vars"
-cat <<'END' > cat/vars/vars-0.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    [[ -d "${T}" ]] || die "T not a dir"
-}
-
-src_compile() {
-    [[ -d "${T}" ]] || die "T not a dir"
-}
-
-pkg_preinst() {
-    [[ -d "${T}" ]] || die "T not a dir"
-}
-END
-mkdir -p "cat/src_prepare"
-cat <<END > cat/src_prepare/src_prepare-0.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_prepare() {
-    die src_prepare
-}
-END
-cp cat/src_prepare/src_prepare-{0,1}.ebuild || exit 1
-cp cat/src_prepare/src_prepare-{0,2}.ebuild || exit 1
-mkdir -p "cat/src_configure"
-cat <<END > cat/src_configure/src_configure-0.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_configure() {
-    die src_configure
-}
-END
-cp cat/src_configure/src_configure-{0,1}.ebuild || exit 1
-cp cat/src_configure/src_configure-{0,2}.ebuild || exit 1
-mkdir -p "cat/default-src_configure" || exit 1
-cat << END > cat/default-src_configure/default-src_configure-2.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    cat <<EOF >configure
-#! /bin/sh
-touch foo
-EOF
-    chmod +x configure
-    echo 'all: ; rm foo' >Makefile
-}
-
-src_compile() {
-    [[ -e foo ]] || die
-}
-END
-mkdir -p "cat/default-src_compile" || exit 1
-cat << END > cat/default-src_compile/default-src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    cat <<EOF >configure
-#! /bin/sh
-rm Makefile
-EOF
-    chmod +x configure
-    echo 'all: ; touch foo' >Makefile
-}
-
-src_configure() {
-    :
-}
-
-src_install() {
-    [[ -e foo ]] || die
-}
-END
-mkdir -p "cat/default_src_compile" || exit 1
-cat << END > cat/default_src_compile/default_src_compile-2.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    cat <<EOF >configure
-#! /bin/sh
-rm Makefile
-EOF
-    chmod +x configure
-    echo 'all: ; touch foo' >Makefile
-}
-
-src_configure() {
-    :
-}
-
-src_compile() {
-    default_src_compile
-    [[ -e foo ]] || die
-}
-END
-mkdir -p "cat/src_compile-via-default-func" || exit 1
-cat << END > cat/src_compile-via-default-func/src_compile-via-default-func-2.ebuild || exit 1
-EAPI="\${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    cat <<EOF >configure
-#! /bin/sh
-rm Makefile
-EOF
-    chmod +x configure
-    echo 'all: ; touch foo' >Makefile
-}
-
-src_configure() {
-    :
-}
-
-src_compile() {
-    default
-    [[ -e foo ]] || die
-}
-END
-mkdir -p "cat/econf-source-kdebuild"
-cat <<END > cat/econf-source-kdebuild/econf-source-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_unpack() {
-    ECONF_SOURCE=subdir
-    mkdir \${S}
-    cd \${S}
-    mkdir subdir
-    echo 'touch monkey' > subdir/configure
-    chmod +x subdir/configure
-}
-
-src_install() {
-    insinto /usr/bin
-    doins monkey || die "no monkey"
-}
-END
-mkdir -p "cat/info-success-kdebuild"
-cat <<END > cat/info-success-kdebuild/info-success-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_info() {
-    einfo "This is my pkg_info. There are many like it, but this one is mine."
-}
-END
-mkdir -p "cat/info-fail-kdebuild"
-cat <<END > cat/info-fail-kdebuild/info-fail-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_info() {
-    die "This is my pkg_info. There are many like it, but this one is mine."
-}
-END
-mkdir -p "cat/banned-functions-kdebuild"
-cat <<END > cat/banned-functions-kdebuild/banned-functions-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    prepall
-}
-END
-mkdir -p "cat/banned-vars-kdebuild"
-cat <<END > cat/banned-vars-kdebuild/banned-vars-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-PROVIDE="virtual/monkey"
-END
-mkdir -p "cat/dosym-success-kdebuild"
-cat <<'END' > cat/dosym-success-kdebuild/dosym-success-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dodir /usr/bin
-    dosym foo /usr/bin/bar
-    [[ "$(readlink ${D}/usr/bin/bar )" == "foo" ]] || die
-}
-END
-mkdir -p "cat/dosym-fail-kdebuild"
-cat <<END > cat/dosym-fail-kdebuild/dosym-fail-kdebuild-1.kdebuild-1 || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-src_install() {
-    dosym foo /usr/bin/bar
-}
-END
-mkdir -p "cat/doman-kdebuild"
-sed -e /EAPI=/d cat/doman/doman-0.ebuild >cat/doman-kdebuild/doman-kdebuild-1.kdebuild-1 || exit 1
-mkdir -p "cat/src_prepare-kdebuild"
-sed -e /EAPI=/d cat/src_prepare/src_prepare-0.ebuild >cat/src_prepare-kdebuild/src_prepare-kdebuild-1.kdebuild-1 || exit 1
-mkdir -p "cat/src_configure-kdebuild"
-sed -e /EAPI=/d cat/src_configure/src_configure-0.ebuild >cat/src_configure-kdebuild/src_configure-kdebuild-1.kdebuild-1 || exit 1
-mkdir -p "cat/expand-vars"
-cat <<"END" > cat/expand-vars/expand-vars-0.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="enabled-weasel broccoli"
-LICENSE="GPL-2"
-KEYWORDS="test"
-
-pkg_setup() {
-    [[ $USE == "enabled-weasel linguas_enabled_en linguas_enabled_en_GB linguas_enabled_en_GB@UTF-8 userland_GNU cheese " ]] \
-        || die "USE=$USE is wrong"
-    [[ $USERLAND == "GNU" ]] || die "USERLAND=$USERLAND is wrong"
-    [[ $LINGUAS == "enabled_en enabled_en_GB enabled_en_GB@UTF-8" ]] || die "LINGUAS=$LINGUAS is wrong"
-}
-END
-mkdir -p "cat/pkg_pretend"
-cat <<"END" > cat/pkg_pretend/pkg_pretend-3.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="enabled-weasel broccoli"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-pkg_pretend() {
-    einfo "This is my pkg_pretend. There are many like it, but this one is mine."
-}
-END
-mkdir -p "cat/pkg_pretend-failure"
-cat <<"END" > cat/pkg_pretend-failure/pkg_pretend-failure-3.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="enabled-weasel broccoli"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-pkg_pretend() {
-    die "This is my pkg_pretend. There are many like it, but this one is mine."
-}
-END
-mkdir -p "cat/default_src_install" || exit 1
-cat << 'END' > cat/default_src_install/default_src_install-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    mkdir -p ${WORKDIR}
-    cat <<'EOF' >${WORKDIR}/Makefile
-all :
-	echo spork > README
-	echo monkey > README.txt
-	touch README.foo
-	echo gerbil > GERBIL
-
-install :
-	echo spork > $(DESTDIR)/EATME
-EOF
-}
-
-pkg_preinst() {
-    [[ -e ${D}/usr/share/doc/${PF}/README ]] || die README
-    [[ -e ${D}/usr/share/doc/${PF}/README.txt ]] || die README.txt
-    [[ -e ${D}/usr/share/doc/${PF}/README.foo ]] && die README.foo
-    [[ -e ${D}/usr/share/doc/${PF}/GERBIL ]] && die GERBIL
-    [[ -e ${D}/EATME ]] || die EATME
-}
-END
-mkdir -p "cat/docompress" || exit 1
-cat << 'END' > cat/docompress/docompress-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-src_install() {
-    docompress foo || die
-    docompress bar || die
-}
-END
-mkdir -p "cat/dodoc-r" || exit 1
-cat << 'END' > cat/dodoc-r/dodoc-r-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    mkdir -p ${WORKDIR}
-    cd "${WORKDIR}"
-
-    mkdir one two three
-    echo foo > one/first
-    echo foo > two/second
-    echo foo > four
-    mkdir dot
-    mkdir dot/five
-    echo foo > dot/five/fifth
-}
-
-src_install() {
-    dodoc -r one two three four
-    cd dot
-    dodoc -r .
-}
-
-pkg_preinst() {
-    [[ -e ${D}/usr/share/doc/${PF}/one/first ]] || die one/first
-    [[ -e ${D}/usr/share/doc/${PF}/two/second ]] || die two/second
-    [[ -e ${D}/usr/share/doc/${PF}/four ]] || die four
-    [[ -e ${D}/usr/share/doc/${PF}/five/fifth ]] || die five/fifth
-}
-END
-mkdir -p "cat/doins-symlink" || exit 1
-cat << 'END' > cat/doins-symlink/doins-symlink-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    mkdir -p ${WORKDIR}
-    cd "${WORKDIR}"
-
-    mkdir a
-    cd a
-    echo qwerty > qwerty
-    ln -s qwerty uiop
-    ln -s qwerty adfs
-
-    cd ..
-
-    mkdir b
-    cd b
-    echo foo > foo
-    ln -s foo bar
-
-}
-
-src_install() {
-    insinto /foo
-    doins a/qwerty
-    doins a/uiop
-    newins a/adfs asdf
-    cd b
-    doins -r .
-}
-
-pkg_preinst() {
-    [[ -f ${D}/foo/qwerty ]] || die qwerty
-    [[ -L ${D}/foo/uiop ]] || die uiop
-    [[ $(readlink ${D}/foo/uiop ) == qwerty ]] || die sym
-    [[ -L ${D}/foo/asdf ]] || die asdf
-    [[ $(readlink ${D}/foo/asdf ) == qwerty ]] || die sym
-    [[ -f ${D}/foo/foo ]] || die foo
-    [[ -L ${D}/foo/bar ]] || die bar
-    [[ $(readlink ${D}/foo/bar ) == foo ]] || die sym
-}
-END
-mkdir -p "cat/banned-functions"
-cat <<END > cat/banned-functions/banned-functions-3.ebuild || exit 1
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="\${WORKDIR}"
-
-src_install() {
-    touch foo
-    dohard foo bar
-}
-END
-mkdir -p "cat/econf-disable-dependency-tracking" || exit 1
-cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-0.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="0"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    mkdir -p ${WORKDIR}
-    cd "${WORKDIR}"
-
-    cat <<'EOF' > configure
-#!/bin/sh
-
-if echo "$@" | grep -q 'disable-dependency-tracking' ; then
-    exit 1
-fi
-
-exit 0
-EOF
-
-    chmod +x configure
-}
-END
-cat << 'END' > cat/econf-disable-dependency-tracking/econf-disable-dependency-tracking-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-src_unpack() {
-    mkdir -p ${WORKDIR}
-    cd "${WORKDIR}"
-
-    cat <<'EOF' > configure
-#!/bin/sh
-
-if ! echo "$@" | grep -q 'disable-dependency-tracking' ; then
-    exit 1
-fi
-
-exit 0
-EOF
-
-    chmod +x configure
-}
-END
-mkdir -p "cat/strict-use" || exit 1
-cat << 'END' > cat/strict-use/strict-use-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork enabled"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-    use enabled || die "enabled not enabled"
-    use spork && die "sporks are bad"
-}
-END
-mkdir -p "cat/strict-use-fail" || exit 1
-cat << 'END' > cat/strict-use-fail/strict-use-fail-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork enabled"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-    use pony
-}
-END
-mkdir -p "cat/strict-use-injection" || exit 1
-cat << 'END' > cat/strict-use-injection/strict-use-injection-3.ebuild || exit 1
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork enabled"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-    use build && die "build set"
-    use userland_GNU || die "userland_GNU not set"
-    use cheese || die "cheese not set"
-    use otherarch && die "otherarch set"
-}
-END
-mkdir -p "cat/global-scope-use" || exit 1
-cat << 'END' > cat/global-scope-use/global-scope-use-3.ebuild || exit 1
-use spork
-
-EAPI="${PV}"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-SRC_URI=""
-SLOT="0"
-IUSE="spork enabled"
-LICENSE="GPL-2"
-KEYWORDS="test"
-EAPI="3"
-
-S="${WORKDIR}"
-END
-cd ..
-
-cd ..
-
diff --git a/paludis/repositories/e/eapis/Makefile.am b/paludis/repositories/e/eapis/Makefile.am
index 17f851a2b..afc01762a 100644
--- a/paludis/repositories/e/eapis/Makefile.am
+++ b/paludis/repositories/e/eapis/Makefile.am
@@ -11,7 +11,6 @@ eapis = \
 	3.conf \
 	4.conf \
 	exheres-0.conf \
-	kdebuild-1.conf \
 	paludis-1.conf \
 	pbin-1+0.conf \
 	pbin-1+1.conf \
diff --git a/paludis/repositories/e/eapis/kdebuild-1.conf b/paludis/repositories/e/eapis/kdebuild-1.conf
deleted file mode 100644
index 313cc9c94..000000000
--- a/paludis/repositories/e/eapis/kdebuild-1.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# Configuration for EAPI kdebuild-1
-# EAPI kdebuild-1 is used by the Gentoo KDE project. It is specified in PMS,
-# possibly as a hidden extra.
-
-source ${PALUDIS_EAPIS_DIR}/1.conf
-exported_name = kdebuild-1
-can_be_pbin = false
-
-package_dep_spec_parse_options = allow_slot_deps allow_slot_deps allow_slot_equal_deps \
-    allow_slot_star_deps allow_use_deps allow_ranged_deps
-ebuild_module_suffixes = kdebuild-1 1 0
-utility_path_suffixes = kdebuild-1 1 0
-dependency_spec_tree_parse_options = uri_supports_arrow
-breaks_portage = true
-has_optional_tests = false
-has_recommended_tests = true
-
-bracket_merged_variables = DEPEND RDEPEND PDEPEND
-source_merged_variables = IUSE KEYWORDS
-
-ebuild_must_not_set_variables = ${ebuild_must_not_set_variables} PROVIDE
-must_not_change_variables = ${must_not_change_variables} EAPI
-description_provide =
-metadata_provide =
-
-flat_list_minimum_size = -1
-
-ebuild_install = \
-    skipname=killold : killold ; \
-    skipname=init userpriv sandbox : init saveenv ; \
-    skipname=setup skipifno=setup clearenv : loadenv setup saveenv ; \
-    skipname=unpack skipifno=*sources,unpack sandbox userpriv clearenv : loadenv unpack saveenv ; \
-    skipname=compile skipifno=*sources,unpack,compile sandbox userpriv clearenv : loadenv compile saveenv ; \
-    skipname=test skipifno=*sources,unpack,compile,test sandbox userpriv clearenv recommended_tests : loadenv test saveenv ; \
-    skipname=install skipifno=install sandbox clearenv : loadenv install saveenv ; \
-    skipname=strip strip : ; \
-    skipname=preinst skipifno=preinst clearenv prepost : loadenv preinst saveenv ; \
-    skipname=merge merge : ; \
-    skipname=postinst skipifno=postinst clearenv prepost : loadenv postinst saveenv ; \
-    skipname=tidyup : tidyup
-
-ebuild_info = \
-    : killold ; \
-    sandbox userpriv : initmisc infovars info ; \
-    : tidyup
-
-uri_labels = \
-    default                  = URIMirrorsThenListedLabel ; \
-    default-restrict-fetch   = URIManualOnlyLabel ; \
-    default-restrict-mirror  = URIListedOnlyLabel ; \
-    mirrors-first            = URIMirrorsThenListedLabel ; \
-    mirrors-only             = URIMirrorsOnlyLabel ; \
-    listed-first             = URIListedThenMirrorsLabel ; \
-    listed-only              = URIListedOnlyLabel ; \
-    manual                   = URIManualOnlyLabel
-
-dependency_labels = \
-    suggested       = DependenciesSuggestionLabel ; \
-    required        = DependenciesPostLabel ;
-
-dosym_mkdir = false
-
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index ace2ad99b..a7835e336 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/common-makefile.am
 
-SUBDIRS = . 0 1 2 3 4 exheres-0 kdebuild-1 paludis-1 pbin-1 utils
+SUBDIRS = . 0 1 2 3 4 exheres-0 paludis-1 pbin-1 utils
 
 AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
 
diff --git a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
deleted file mode 100644
index 60e84a1b3..000000000
--- a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogkdebuild1dir = $(libexecdir)/paludis/kdebuild-1
-
-libexecprogkdebuild1_SCRIPTS = \
-	output_functions.bash
-
-TESTS =
-check_SCRIPTS = $(TESTS)
-
-EXTRA_DIST = $(libexecprogkdebuild1_SCRIPTS)
-
diff --git a/paludis/repositories/e/ebuild/kdebuild-1/output_functions.bash b/paludis/repositories/e/ebuild/kdebuild-1/output_functions.bash
deleted file mode 100644
index e3415593e..000000000
--- a/paludis/repositories/e/ebuild/kdebuild-1/output_functions.bash
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License, version 2, as published by the Free Software Foundation.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA
-
-ebuild_notice()
-{
-    [[ -z "${PALUDIS_PIPE_COMMANDS_SUPPORTED}" ]] && return
-    paludis_pipe_command LOG "$EAPI" "$@" >/dev/null
-}
-
-ebuild_section()
-{
-    echo -ne "${COLOUR_CYAN}>>>${COLOUR_NORMAL} "
-    echo "$@"
-}
-
-
diff --git a/paludis/repositories/e/ebuild/utils/Makefile.am b/paludis/repositories/e/ebuild/utils/Makefile.am
index fd19057eb..68a55c321 100644
--- a/paludis/repositories/e/ebuild/utils/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/common-makefile.am
 
-SUBDIRS = . 4 exheres-0 kdebuild-1
+SUBDIRS = . 4 exheres-0
 
 libexecprogdir = $(libexecdir)/paludis/utils
 
diff --git a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
deleted file mode 100644
index 044ee4cff..000000000
--- a/paludis/repositories/e/ebuild/utils/kdebuild-1/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-include $(top_srcdir)/misc/common-makefile.am
-
-SUBDIRS = .
-
-libexecprogdir = $(libexecdir)/paludis/utils/kdebuild-1
-
-libexecprog_SCRIPTS = \
-	dohard \
-	dohtml \
-	dosed \
-	donewins \
-	prepall \
-	prepallstrip \
-	prepstrip \
-	prepallman \
-	prepman \
-	prepallinfo \
-	prepinfo \
-	prepdocs \
-	prepalldocs \
-	ecompress \
-	ecompressdir \
-	banned_in_eapi_kdebuild-1
-
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@
-
-TESTS =
-
-EXTRA_DIST = $(libexecprog_SCRIPTS) $(check_SCRIPTS) \
-	banned_in_eapi_kdebuild-1 $(TESTS)
-
-bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
-		prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
-		ecompress ecompressdir
-
-CLEANFILES += $(bannedscripts)
-
-$(bannedscripts) : banned_in_eapi_kdebuild-1
-	cat $? > $@
-	chmod +x $@
-
-check_PROGRAMS =
-
diff --git a/paludis/repositories/e/ebuild/utils/kdebuild-1/banned_in_eapi_kdebuild-1 b/paludis/repositories/e/ebuild/utils/kdebuild-1/banned_in_eapi_kdebuild-1
deleted file mode 100644
index 2504c7f76..000000000
--- a/paludis/repositories/e/ebuild/utils/kdebuild-1/banned_in_eapi_kdebuild-1
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-# Copyright (c) 2007, 2008 Ciaran McCreesh
-#
-# This file is part of the Paludis package manager. Paludis is free software;
-# you can redistribute it and/or modify it under the terms of the GNU General
-# Public License as published by the Free Software Foundation; either version
-# 2 of the License, or (at your option) any later version.
-#
-# Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA  02111-1307  USA
-
-COLOUR_RED=$'\e[31;01m'
-COLOUR_NORMAL=$'\e[0m'
-
-echo "${COLOUR_RED}!!! Ebuild bug: '$(basename ${0} )' banned in EAPI kdebuild-1${COLOUR_NORMAL}"
-echo "$(basename ${0} ): making ebuild PID ${EBUILD_KILL_PID} exit with error" 1>&2
-kill -s SIGUSR1 "${EBUILD_KILL_PID}"
-
-exit 123
-
-
diff --git a/paludis/repositories/e/ebuild_entries_suffixes.conf b/paludis/repositories/e/ebuild_entries_suffixes.conf
index 1bc766397..91e1cc7be 100644
--- a/paludis/repositories/e/ebuild_entries_suffixes.conf
+++ b/paludis/repositories/e/ebuild_entries_suffixes.conf
@@ -6,10 +6,6 @@ suffix_exheres-0_known = yes
 guess_eapi_exheres-0 = exheres-0
 manifest_key_exheres-0 = EXHERES
 
-suffix_kdebuild-1_known = yes
-guess_eapi_kdebuild-1 = kdebuild-1
-manifest_key_kdebuild-1 = EBUILD
-
 suffix_pbin-1+0_known = yes
 guess_eapi_pbin-1+0 = pbin-1+0
 manifest_key_pbin-1+0 = PBIN
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
index a5054fc2d..5b313fce9 100755
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh
@@ -325,20 +325,6 @@ LICENCES="GPL-2"
 PLATOFORMS="test"
 DEPENDENCIES=""
 END
-cat <<END > metadata/cache/cat/flat_hash-guessed-eapi-extension-1 || exit 1
-_mtime_=60
-_guessed_eapi_=kdebuild-1
-DEPENDENCIES=the/dependencies
-SLOT=the-slot
-DOWNLOADS=the-downloads
-RESTRICT=the-restrict
-HOMEPAGE=the-homepage
-LICENCES=the-licences
-SUMMARY=The Stale Description
-PLATFORMS=the-platforms
-MYOPTIONS=the-myoptions
-EAPI=kdebuild-1
-END
 TZ=UTC touch -t 197001010001 cat/flat_hash-guessed-eapi-extension/flat_hash-guessed-eapi-extension-1.exheres-0 || exit 2
 
 mkdir cat/flat_hash-no-guessed-eapi
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 76a494ce7..4f34fc865 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -428,7 +428,7 @@ namespace test_cases
             }
         }
     } test_phases_eapi_0("0"), test_phases_eapi_1("1"), test_phases_eapi_2("2"), test_phases_eapi_3("3"),
-                        test_phases_eapi_exheres_0("exheres-0"), test_phases_eapi_kdebuild_1("kdebuild-1");
+                        test_phases_eapi_exheres_0("exheres-0");
 
     struct VarsTest : TestCase
     {
@@ -558,7 +558,7 @@ namespace test_cases
             }
         }
     } test_vdb_vars_eapi_0("0"), test_vdb_vars_eapi_1("1"), test_vdb_vars_eapi_2("2"),
-                      test_vdb_vars_eapi_exheres_0("exheres-0"), test_vdb_vars_eapi_kdebuild_1("kdebuild-1");
+                      test_vdb_vars_eapi_exheres_0("exheres-0");
 
     struct NamesCacheIncrementalTest : TestCase
     {
@@ -1327,6 +1327,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("install eapi 1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-install-eapi-1", 1);
                 install(env, vdb_repo, "=cat/pkg-0::postinsttest", "");
                 vdb_repo->invalidate();
 
@@ -1337,6 +1338,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("reinstall eapi 1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "0", 1);
                 install(env, vdb_repo, "=cat/pkg-0::postinsttest", "");
                 vdb_repo->invalidate();
 
@@ -1347,6 +1349,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("upgrade eapi 1 -> 1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-upgrade-eapi-1-1", 1);
                 install(env, vdb_repo, "=cat/pkg-0.1::postinsttest", "=cat/pkg-0::installed");
                 vdb_repo->invalidate();
 
@@ -1357,6 +1360,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("upgrade eapi 1 -> paludis-1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-upgrade-eapi-1-paludis-1", 1);
                 install(env, vdb_repo, "=cat/pkg-1::postinsttest", "=cat/pkg-0.1::installed");
                 vdb_repo->invalidate();
 
@@ -1368,6 +1372,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("reinstall eapi paludis-1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-reinstall-eapi-paludis-1", 1);
                 install(env, vdb_repo, "=cat/pkg-1::postinsttest", "");
                 vdb_repo->invalidate();
 
@@ -1378,6 +1383,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("upgrade eapi paludis-1 -> paludis-1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "1.1", 1);
                 install(env, vdb_repo, "=cat/pkg-1.1::postinsttest", "=cat/pkg-1::installed");
                 vdb_repo->invalidate();
 
@@ -1388,6 +1394,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("new slot", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-new-slot", 1);
                 install(env, vdb_repo, "=cat/pkg-2::postinsttest", "");
                 vdb_repo->invalidate();
 
@@ -1399,6 +1406,7 @@ namespace test_cases
             {
                 TestMessageSuffix suffix("downgrade eapi paludis-1 -> 1", true);
 
+                ::setenv("VDB_REPOSITORY_TEST_RMDIR", "x-downgrade-eapi-paludis-1-1", 1);
                 install(env, vdb_repo, "=cat/pkg-0::postinsttest", "=cat/pkg-1.1::installed");
                 vdb_repo->invalidate();
 
diff --git a/paludis/repositories/e/vdb_repository_TEST_setup.sh b/paludis/repositories/e/vdb_repository_TEST_setup.sh
index 1c19dfe68..75eb7585b 100755
--- a/paludis/repositories/e/vdb_repository_TEST_setup.sh
+++ b/paludis/repositories/e/vdb_repository_TEST_setup.sh
@@ -84,7 +84,7 @@ echo "cat/pkg1 build: cat/pkg2 build+run: cat/pkg3 suggestion: cat/pkg4 post: ca
 
 mkdir -p repo3
 
-mkdir -p srcrepo/{profiles/profile,cat/{target,vars}{,-exheres,-kdebuild},eclass}
+mkdir -p srcrepo/{profiles/profile,cat/{target,vars}{,-exheres},eclass}
 cat <<END > srcrepo/profiles/profile/make.defaults
 ARCH=test
 USERLAND="GNU"
@@ -215,30 +215,6 @@ pkg_config() {
 }
 END
 
-cat <<'END' > srcrepo/cat/target-kdebuild/target-kdebuild-1.ebuild
-EAPI="exheres-0"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS=""
-LICENCES="GPL-2"
-PLATFORMS="test"
-DEPENDENCIES=""
-
-src_install() {
-    echo MONKEY > ${IMAGE}/monkey
-}
-
-pkg_info() {
-    echo "This is pkg_info"
-}
-
-pkg_config() {
-    echo "This is pkg_config"
-}
-END
-
 cat <<'END' > srcrepo/cat/vars/vars-0.ebuild
 EAPI="0"
 DESCRIPTION="The Description"
@@ -365,48 +341,6 @@ pkg_config() {
 }
 END
 
-cat <<'END' > srcrepo/cat/vars-kdebuild/vars-kdebuild-1.ebuild
-EAPI="exheres-0"
-DESCRIPTION="The Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS=""
-LICENCES="GPL-2"
-PLATFORMS="test"
-DEPENDENCIES="foo/bar"
-
-pkg_setup() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-
-src_compile() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-
-pkg_preinst() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-
-pkg_prerm() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-
-pkg_info() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-
-pkg_config() {
-    einfo "${EBUILD_PHASE}: TEMP=${TEMP}"
-    [[ -d "${TEMP}" ]] || die "TEMP not a dir"
-}
-END
-
 mkdir -p namesincrtest/.cache/names/installed namesincrtest_src/{eclass,profiles/profile,cat1/{pkg1,pkg2},{cat2,cat3}/pkg1} || exit 1
 echo paludis-2 >namesincrtest/.cache/names/installed/_VERSION_
 echo installed >>namesincrtest/.cache/names/installed/_VERSION_
@@ -536,7 +470,7 @@ echo cat >postinsttest_src1/profiles/categories
 
 cat <<END >postinsttest_src1/cat/pkg/pkg-0.ebuild
 if [[ \${PV} == 0* ]]; then
-    EAPI=kdebuild-1
+    EAPI=1
 else
     EAPI=paludis-1
 fi
@@ -562,10 +496,10 @@ pkg_postinst() {
     \${COMMAND} "\${ROOT}"/\${OTHER##*/} || die
 }
 pkg_postrm() {
-    if has_version "\${CATEGORY}/\${PN}:\${SLOT}[<\${PVR}&=0*]" || has_version "\${CATEGORY}/\${PN}:\${SLOT}[>\${PVR}&=0*]"; then
-        rmdir "\${ROOT}"/\${PF} || die
+    if [[ \$VDB_REPOSITORY_TEST_RMDIR == \${PV} ]] ; then
+        rmdir "\${ROOT}"/\${PF} || die "rmdir failed, pv is \${PV}, comparing to \$VDB_REPOSITORY_TEST_RMDIR"
     else
-        mkdir "\${ROOT}"/\${PF} || die
+        mkdir "\${ROOT}"/\${PF} || die "mkdir failed, pv is \${PV}, comparing to \$VDB_REPOSITORY_TEST_RMDIR"
     fi
 }
 END