Ban einstall for exheres-0

Change-Id: I30a4221cec2ac5492e932eaa7ba3b9f47b6a5df3
Reviewed-on: https://galileo.mailstation.de/gerrit/4899
Reviewed-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Reviewed-by: Bo Ørsted Andresen <zlin@exherbo.org>

3 files changed, 1 insertions, 96 deletions

diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 4116784d8..1104484d8 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -270,30 +270,6 @@ TEST(ERepository, InstallExheres0)
 
     {
         const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                        PackageDepSpec(parse_user_package_dep_spec("cat/einstall-fail",
-                                &env, { })), nullptr, { }))]->last());
-        ASSERT_TRUE(bool(id));
-        EXPECT_THROW(id->perform_action(action), ActionFailedError);
-    }
-
-    {
-        const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                        PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall",
-                                &env, { })), nullptr, { }))]->last());
-        ASSERT_TRUE(bool(id));
-        id->perform_action(action);
-    }
-
-    {
-        const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
-                        PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-einstall-die",
-                                &env, { })), nullptr, { }))]->last());
-        ASSERT_TRUE(bool(id));
-        EXPECT_THROW(id->perform_action(action), ActionFailedError);
-    }
-
-    {
-        const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
                         PackageDepSpec(parse_user_package_dep_spec("cat/keepdir-success",
                                 &env, { })), nullptr, { }))]->last());
         ASSERT_TRUE(bool(id));
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh b/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
index 69215f609..a9bb84610 100755
--- a/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
@@ -445,54 +445,6 @@ src_install() {
     nonfatal keepdir /usr/share/monkey || die
 }
 END
-mkdir -p "packages/cat/einstall-fail"
-cat <<'END' > packages/cat/einstall-fail/einstall-fail-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
-    einstall
-}
-END
-mkdir -p "packages/cat/nonfatal-einstall"
-cat <<'END' > packages/cat/nonfatal-einstall/nonfatal-einstall-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
-    nonfatal einstall
-}
-END
-mkdir -p "packages/cat/nonfatal-einstall-die"
-cat <<'END' > packages/cat/nonfatal-einstall-die/nonfatal-einstall-die-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
-    nonfatal einstall || die
-}
-END
 mkdir -p "packages/cat/dobin-success"
 cat <<'END' > packages/cat/dobin-success/dobin-success-1.ebuild || exit 1
 DESCRIPTION="The Long Description"
diff --git a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
index eb23ef17c..f71045c15 100644
--- a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
@@ -165,30 +165,7 @@ econf()
 
 einstall()
 {
-    if [[ "${!PALUDIS_EBUILD_PHASE_VAR}" != "install" ]] ; then
-        die "einstall called in phase ${!PALUDIS_EBUILD_PHASE_VAR}"
-    fi
-
-    if [[ -f Makefile ]] || [[ -f makefile ]] || [[ -f GNUmakefile ]] ; then
-        local makecmd=""
-        type -p gmake &>/dev/null && makecmd="gmake" || makecmd="make"
-        local cmd="${EINSTALL_WRAPPER} ${makecmd} prefix=${IMAGE}/usr"
-        cmd="${cmd} mandir=${IMAGE}/usr/share/man"
-        cmd="${cmd} infodir=${IMAGE}/usr/share/info"
-        cmd="${cmd} datadir=${IMAGE}/usr/share"
-        cmd="${cmd} sysconfdir=${IMAGE}/etc"
-        cmd="${cmd} localstatedir=${IMAGE}/var/lib"
-        cmd="${cmd} libdir=${IMAGE}/usr/${LIBDIR:-lib}"
-        if [[ ${FILESYSTEM_LAYOUT} == cross ]] ; then
-            cmd="${cmd} bindir=${IMAGE}/usr/$(exhost --target)/bin"
-            cmd="${cmd} sbindir=${IMAGE}/usr/$(exhost --target)/bin"
-        fi
-        cmd="${cmd} ${@} install"
-        echo "${cmd}" 1>&2
-        ${cmd} || paludis_die_unless_nonfatal "einstall failed" || return 247
-    else
-        paludis_die_unless_nonfatal "No Makefile for einstall" || return 247
-    fi
+    die "Function 'einstall' banned in this EAPI"
 }
 
 emagicdocs()