Version bump.

Package-Manager: portage-2.1.5_rc4

1 files changed, 0 insertions, 60 deletions

diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch
deleted file mode 100644
index 84d953b3fba9..000000000000
--- a/sys-apps/paludis/files/paludis-0.26.0_alpha14-broken-profiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: paludis/repositories/e/e_repository.cc
-===================================================================
---- paludis/repositories/e/e_repository.cc	(revision 4539)
-+++ paludis/repositories/e/e_repository.cc	(revision 4541)
-@@ -395,14 +395,26 @@
- 
-                 FSEntrySequence profiles;
-                 profiles.push_back(layout->profiles_base_dir() / tokens.at(1));
--                profiles_desc.push_back(RepositoryEInterface::ProfilesDescLine::named_create()
--                        (k::arch(), tokens.at(0))
--                        (k::path(), *profiles.begin())
--                        (k::status(), tokens.at(2))
--                        (k::profile(), tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
--                                    params.environment, repo, repo->name(), profiles,
--                                    (*(*erepository::EAPIData::get_instance()->eapi_from_string(
--                                        params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
-+                try
-+                {
-+                    profiles_desc.push_back(RepositoryEInterface::ProfilesDescLine::named_create()
-+                            (k::arch(), tokens.at(0))
-+                            (k::path(), *profiles.begin())
-+                            (k::status(), tokens.at(2))
-+                            (k::profile(), tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
-+                                        params.environment, repo, repo->name(), profiles,
-+                                        (*(*erepository::EAPIData::get_instance()->eapi_from_string(
-+                                            params.eapi_when_unknown))[k::supported()])[k::ebuild_environment_variables()][k::env_arch()]))));
-+                }
-+                catch (const InternalError &)
-+                {
-+                    throw;
-+                }
-+                catch (const Exception & e)
-+                {
-+                    Log::get_instance()->message(ll_warning, lc_context, "Not loading profile '" +
-+                            tokens.at(1) + "' due to exception '" + e.message() + "' (" + e.what() + ")");
-+                }
-             }
-         }
- 
-@@ -1027,6 +1039,7 @@
- {
-     Context context("When setting profile by iterator:");
- 
-+    Log::get_instance()->message(ll_debug, lc_context, "Using profile '" + stringify((*iter)[k::path()]) + "'");
-     _imp->profile_ptr = (*iter)[k::profile()];
- 
-     if ((*DistributionData::get_instance()->distribution_from_string(_imp->params.environment->default_distribution()))
-Index: paludis/repositories/e/e_repository_profile.cc
-===================================================================
---- paludis/repositories/e/e_repository_profile.cc	(revision 4539)
-+++ paludis/repositories/e/e_repository_profile.cc	(revision 4541)
-@@ -182,7 +182,7 @@
-                             tr1::shared_ptr<AllDepSpec>(new AllDepSpec))),
-                 system_tag(new GeneralSetDepTag(SetName("system"), stringify(name)))
-             {
--                Context context("When loading profiles for repository '" + stringify(name) + "':");
-+                Context context("When loading profiles '" + join(dirs.begin(), dirs.end(), "' '") + "' for repository '" + stringify(name) + "':");
-                 load_environment();
- 
-                 for (FSEntrySequence::ConstIterator d(dirs.begin()), d_end(dirs.end()) ;