aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc30
-rw-r--r--paludis/repositories/e/eapis/4.conf12
2 files changed, 2 insertions, 40 deletions
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index 04269afb1..b137b6051 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -225,36 +225,6 @@ namespace test_cases
}
{
- TestMessageSuffix suffix("strict use", true);
- const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-4",
- &env, { })), { }))]->last());
- TEST_CHECK(bool(id));
- TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
- id->perform_action(action);
- }
-
- {
- TestMessageSuffix suffix("strict use fail", true);
- const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-fail-4",
- &env, { })), { }))]->last());
- TEST_CHECK(bool(id));
- TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
- TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
- }
-
- {
- TestMessageSuffix suffix("strict use injection", true);
- const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("=cat/strict-use-injection-4",
- &env, { })), { }))]->last());
- TEST_CHECK(bool(id));
- TEST_CHECK_EQUAL(simple_visitor_cast<const MetadataValueKey<std::string> >(**id->find_metadata("EAPI"))->value(), "4");
- id->perform_action(action);
- }
-
- {
TestMessageSuffix suffix("global scope use", true);
const std::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/global-scope-use-4",
diff --git a/paludis/repositories/e/eapis/4.conf b/paludis/repositories/e/eapis/4.conf
index 376c88cf2..c21a5b7db 100644
--- a/paludis/repositories/e/eapis/4.conf
+++ b/paludis/repositories/e/eapis/4.conf
@@ -34,15 +34,10 @@ env_kv =
env_replacing_versions = REPLACING_VERSIONS
env_replaced_by_version = REPLACED_BY_VERSION
-metadata_iuse_effective = IUSE_EFFECTIVE
-description_iuse_effective = All relevant USE flags
-flat_list_iuse_effective = -1
-description_iuse = Listed relevant USE flags
-
-vdb_from_env_variables = ${vdb_from_env_variables} IUSE_EFFECTIVE
+vdb_from_env_variables = ${vdb_from_env_variables}
package_dep_spec_parse_options = ${package_dep_spec_parse_options} \
- allow_slot_equal_deps allow_slot_star_deps allow_use_dep_defaults
+ allow_use_dep_defaults
ebuild_module_suffixes = 4 3 2 1 0
utility_path_suffixes = 4 3 2 1 0
@@ -59,6 +54,3 @@ rdepend_defaults_to_depend = false
econf_extra_options = --disable-dependency-tracking
-require_use_expand_in_iuse = true
-profile_iuse_injection = true
-