aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-10 16:22:21 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-11 09:01:21 +0100
commit599c00bf450d19a4050d4c263817729bdb4eecac (patch)
tree0d40284401924e4821dec892fa6e64e176d64272
parent9d686d6023a87d5ceabe610f4feb2c8fb9ca4257 (diff)
downloadpaludis-599c00bf450d19a4050d4c263817729bdb4eecac.tar.gz
paludis-599c00bf450d19a4050d4c263817729bdb4eecac.tar.xz
Remove deprecated
-rw-r--r--paludis/repositories/e/e_repository.cc8
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc2
2 files changed, 1 insertions, 9 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 625065a..45db13a 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1408,14 +1408,6 @@ ERepository::repository_factory_create(
std::string profile_eapi(f("profile_eapi_when_unspecified"));
if (profile_eapi.empty())
{
- profile_eapi = f("profile_eapi");
- if (! profile_eapi.empty())
- Log::get_instance()->message("e.ebuild.configuration.profile_eapi", ll_warning, lc_context) <<
- "Key 'profile_eapi' in '" + f("repo_file") + "' is deprecated, use profile_eapi_when_unspecified";
- }
-
- if (profile_eapi.empty())
- {
if (! layout_conf
|| (profile_eapi = layout_conf->get("profile_eapi_when_unspecified")).empty())
profile_eapi = EExtraDistributionData::get_instance()->data_from_distribution(
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index f618f82..e47299f 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -118,7 +118,7 @@ namespace test_cases
keys->insert("layout", "exheres");
keys->insert("eapi_when_unknown", "exheres-0");
keys->insert("eapi_when_unspecified", "exheres-0");
- keys->insert("profile_eapi", "exheres-0");
+ keys->insert("profile_eapi_when_unspecified", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "build"));
std::tr1::shared_ptr<Repository> repo(ERepository::repository_factory_create(&env,