aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2014-09-17 20:09:50 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2014-09-17 20:09:50 +0100
commite50565b501d2e1484a92b62c41ae9628d6a51b53 (patch)
tree502e7ae3f2c1291600f6175ffc747fbe3f61d7f8
parent484fd93ff91f84c5e89cd4ef69ccf9a4fa15aee6 (diff)
downloadpaludis-e50565b501d2e1484a92b62c41ae9628d6a51b53.tar.gz
paludis-e50565b501d2e1484a92b62c41ae9628d6a51b53.tar.xz
Remove 'breaks Portage' code
-rw-r--r--doc/api/cplusplus/examples/example_package_id.cc3
-rw-r--r--doc/configuration/general.html.part.in13
-rw-r--r--doc/overview/gettingstarted.html.part6
-rw-r--r--paludis/environment.hh16
-rw-r--r--paludis/environments/paludis/paludis_config.cc34
-rw-r--r--paludis/environments/paludis/paludis_config.hh12
-rw-r--r--paludis/environments/paludis/paludis_environment.cc22
-rw-r--r--paludis/environments/paludis/paludis_environment.hh5
-rw-r--r--paludis/environments/portage/portage_environment.cc38
-rw-r--r--paludis/environments/portage/portage_environment.hh5
-rw-r--r--paludis/environments/test/test_environment.cc8
-rw-r--r--paludis/environments/test/test_environment.hh5
-rw-r--r--paludis/package_id.hh10
-rw-r--r--paludis/repositories/accounts/accounts_id.cc8
-rw-r--r--paludis/repositories/accounts/accounts_id.hh4
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.cc8
-rw-r--r--paludis/repositories/accounts/installed_accounts_id.hh4
-rw-r--r--paludis/repositories/e/e_repository_id.cc13
-rw-r--r--paludis/repositories/e/e_repository_id.hh4
-rw-r--r--paludis/repositories/e/eapi.cc3
-rw-r--r--paludis/repositories/e/eapi.hh4
-rw-r--r--paludis/repositories/e/eapis/0.conf1
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf1
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf1
-rw-r--r--paludis/repositories/e/ebuild_id.cc7
-rw-r--r--paludis/repositories/fake/fake_package_id.cc12
-rw-r--r--paludis/repositories/fake/fake_package_id.hh4
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.cc8
-rw-r--r--paludis/repositories/gemcutter/gemcutter_id.hh5
-rw-r--r--paludis/repositories/repository/repository_id.cc8
-rw-r--r--paludis/repositories/repository/repository_id.hh5
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.cc8
-rw-r--r--paludis/repositories/unavailable/unavailable_package_id.hh5
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.cc8
-rw-r--r--paludis/repositories/unavailable/unavailable_repository_id.hh5
-rw-r--r--paludis/repositories/unpackaged/installed_id.cc10
-rw-r--r--paludis/repositories/unpackaged/installed_id.hh3
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.cc10
-rw-r--r--paludis/repositories/unpackaged/unpackaged_id.hh3
-rw-r--r--paludis/repositories/unwritten/unwritten_id.cc8
-rw-r--r--paludis/repositories/unwritten/unwritten_id.hh5
-rw-r--r--python/additional_tests.cc2
-rw-r--r--python/environment.cc17
-rwxr-xr-xpython/environment_TEST.py3
-rw-r--r--ruby/package_id.cc34
-rw-r--r--ruby/package_id_TEST.rb4
-rw-r--r--vim/syntax/paludis-general-conf.vim4
47 files changed, 38 insertions, 368 deletions
diff --git a/doc/api/cplusplus/examples/example_package_id.cc b/doc/api/cplusplus/examples/example_package_id.cc
index 2555f9b..c1cdc88 100644
--- a/doc/api/cplusplus/examples/example_package_id.cc
+++ b/doc/api/cplusplus/examples/example_package_id.cc
@@ -119,9 +119,6 @@ int main(int argc, char * argv[])
/* And various misc methods. Clients don't usually use these
* directly. */
- std::shared_ptr<const Set<std::string> > breaks_portage((*i)->breaks_portage());
- cout << left << setw(30) << " breaks_portage:" << " " << join(breaks_portage->begin(),
- breaks_portage->end(), ", ") << endl;
cout << left << setw(30) << " extra_hash_value:" << " " << "0x" << hex << (*i)->extra_hash_value() << endl;
cout << endl;
diff --git a/doc/configuration/general.html.part.in b/doc/configuration/general.html.part.in
index 8fb5a95..abaefd4 100644
--- a/doc/configuration/general.html.part.in
+++ b/doc/configuration/general.html.part.in
@@ -15,19 +15,6 @@ file, and may optionally be in bash format.</p>
<dd>If set, Paludis will use this username rather than <code>paludisbuild</code> when a reduced privilege user is
required.</dd>
- <dt><code>accept_breaks_portage</code></dt>
- <dd>Possibly-empty list of characteristics that can cause a package to be incompatible
- with Portage, but that should <em>not</em> cause the package to be masked, or
- <code>*</code> (the default) to ignore Portage compatibility entirely. Currently
- available characteristics are:
- <dl><dt><code>eapi</code></dt><dd>ebuilds with an EAPI that is not supported by Portage</dd>
- <dt><code>version</code></dt><dd>ebuilds that use Paludis-specific features of the package version syntax</dd>
- <dt><code>format</code></dt><dd>packages other than ebuilds</dd></dl>
- Note that this does <em>not</em> disable cache options that would cause interoperability problems.</dd>
-
- <dt><code>portage_compatible</code></dt>
- <dd>If set to a non-empty string, deprecated equivalent of <code>accept_breaks_portage =</code>.</dd>
-
<dt><code>distribution</code></dt>
<dd>If set, overrides the distribution used when distribution-specific defaults are used.</dd>
</dl>
diff --git a/doc/overview/gettingstarted.html.part b/doc/overview/gettingstarted.html.part
index 6e75f3b..5eff2b3 100644
--- a/doc/overview/gettingstarted.html.part
+++ b/doc/overview/gettingstarted.html.part
@@ -42,12 +42,6 @@ All Paludis clients that use configuration can also be told explicitly to use Po
<code>--environment portage</code> (or <code>--environment portage:/other/root</code> to use configuration files in
another filesystem root).</p>
-<p>By default, will be unable to use packages that use EAPIs that Portage does not support. The packages in the Paludis
-overlay fall into this category. You may override this by setting the <code>PALUDIS_IGNORE_BREAKS_PORTAGE</code>
-in <code>make.conf</code>; the allowed values are the same as for the <code>accept_breaks_portage</code>
-key in Paludis's <a href="../configuration/general.html"><code>general.conf</code></a>,
-except that the default is an empty string.</p>
-
<p>Next, proceed to <a href="#testing">Testing a configuration</a>.</p>
<h2 id="automatic">Automatically migrating</h2>
diff --git a/paludis/environment.hh b/paludis/environment.hh
index 984b16e..33fa528 100644
--- a/paludis/environment.hh
+++ b/paludis/environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -336,20 +336,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
/**
- * Do we have a 'breaks' mask for a particular package?
- *
- * Returns a zero pointer if no.
- *
- * Used by PackageID implementations. Generally PackageID's masks methods
- * should be used rather than calling this directly.
- *
- * \since 0.58 takes id by shared_ptr
- */
- virtual const std::shared_ptr<const Mask> mask_for_breakage(
- const std::shared_ptr<const PackageID> &) const
- PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
-
- /**
* Do we have a 'user' mask for a particular package?
*
* Returns a zero pointer if no.
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 5f7b777..0af9c81 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -194,8 +194,6 @@ namespace paludis
mutable std::mutex general_conf_mutex;
mutable bool has_general_conf;
- mutable bool accept_all_breaks_portage;
- mutable Set<std::string> accept_breaks_portage;
mutable std::string reduced_username;
std::shared_ptr<Map<std::string, std::string> > commandline_environment;
@@ -219,7 +217,6 @@ namespace paludis
output_conf(std::make_shared<OutputConf>(e)),
suggestions_conf(std::make_shared<SuggestionsConf>(e)),
has_general_conf(false),
- accept_all_breaks_portage(false),
reduced_username(getenv_with_default(env_vars::reduced_username, "paludisbuild")),
commandline_environment(std::make_shared<Map<std::string, std::string>>())
{
@@ -240,7 +237,6 @@ namespace paludis
commandline_environment->insert("root", root);
commandline_environment->insert("ROOT", root);
- commandline_environment->insert("accept_breaks_portage", "*");
const KeyValueConfigFile::DefaultFunction def_predefined =
std::bind(
@@ -344,18 +340,6 @@ namespace paludis
if (! kv->get("reduced_username").empty())
reduced_username = kv->get("reduced_username");
- std::list<std::string> breakages;
- tokenise_whitespace(kv->get("accept_breaks_portage"), std::back_inserter(breakages));
- for (std::list<std::string>::const_iterator it(breakages.begin()),
- it_end(breakages.end()); it_end != it; ++it)
- if ("*" == *it)
- {
- accept_all_breaks_portage = true;
- break;
- }
- else
- accept_breaks_portage.insert(*it);
-
distribution = kv->get("distribution");
if (! kv->get("world").empty())
@@ -1062,22 +1046,6 @@ PaludisConfig::reduced_username() const
return _imp->reduced_username;
}
-bool
-PaludisConfig::accept_all_breaks_portage() const
-{
- _imp->need_general_conf();
-
- return _imp->accept_all_breaks_portage;
-}
-
-const Set<std::string> &
-PaludisConfig::accept_breaks_portage() const
-{
- _imp->need_general_conf();
-
- return _imp->accept_breaks_portage;
-}
-
std::shared_ptr<const KeywordsConf>
PaludisConfig::keywords_conf() const
{
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index 815107f..539ab88 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -156,16 +156,6 @@ namespace paludis
*/
std::string system_root() const;
- /**
- * Whether it's ok to unmask things that break Portage, regardless of the reason.
- */
- bool accept_all_breaks_portage() const;
-
- /**
- * Specific reasons why a package might break Portage that it's ok to ignore.
- */
- const Set<std::string> & accept_breaks_portage() const;
-
///\name Userpriv
///\{
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index c92972f..4bc1808 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -383,26 +383,6 @@ namespace
}
const std::shared_ptr<const Mask>
-PaludisEnvironment::mask_for_breakage(const std::shared_ptr<const PackageID> & id) const
-{
- if (! _imp->config->accept_all_breaks_portage())
- {
- std::shared_ptr<const Set<std::string> > breakages(id->breaks_portage());
- if (breakages)
- {
- std::list<std::string> bad_breakages;
- std::set_difference(breakages->begin(), breakages->end(),
- _imp->config->accept_breaks_portage().begin(), _imp->config->accept_breaks_portage().end(),
- std::back_inserter(bad_breakages));
- if (! bad_breakages.empty())
- return std::make_shared<BreaksPortageMask>(join(breakages->begin(), breakages->end(), " "));
- }
- }
-
- return std::shared_ptr<const Mask>();
-}
-
-const std::shared_ptr<const Mask>
PaludisEnvironment::mask_for_user(const std::shared_ptr<const PackageID> & d, const bool o) const
{
if (_imp->config->package_mask_conf()->query(d, ""))
diff --git a/paludis/environments/paludis/paludis_environment.hh b/paludis/environments/paludis/paludis_environment.hh
index 553ff23..080bf0d 100644
--- a/paludis/environments/paludis/paludis_environment.hh
+++ b/paludis/environments/paludis/paludis_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -108,9 +108,6 @@ namespace paludis
virtual bool accept_license(const std::string &, const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::shared_ptr<const Mask> mask_for_breakage(const std::shared_ptr<const PackageID> &) const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 71fc907..6239dd0 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -104,9 +104,6 @@ namespace paludis
PackageMask package_mask;
PackageUnmask package_unmask;
- std::set<std::string> ignore_breaks_portage;
- bool ignore_all_breaks_portage;
-
mutable std::mutex reduced_mutex;
bool userpriv_enabled;
mutable std::shared_ptr<uid_t> reduced_uid;
@@ -130,7 +127,6 @@ namespace paludis
Imp(const std::string & s) :
conf_dir(FSPath(s.empty() ? "/" : s) / SYSCONFDIR),
- ignore_all_breaks_portage(false),
done_hooks(false),
overlay_importance(10),
world_file(s + "/var/lib/portage/world"),
@@ -365,18 +361,6 @@ PortageEnvironment::PortageEnvironment(const std::string & s) :
}
}
- std::list<std::string> ignore_breaks_portage;
- tokenise_whitespace(_imp->vars->get("PALUDIS_IGNORE_BREAKS_PORTAGE"), std::back_inserter(ignore_breaks_portage));
- for (std::list<std::string>::const_iterator it(ignore_breaks_portage.begin()),
- it_end(ignore_breaks_portage.end()); it_end != it; ++it)
- if ("*" == *it)
- {
- _imp->ignore_all_breaks_portage = true;
- break;
- }
- else
- _imp->ignore_breaks_portage.insert(*it);
-
add_metadata_key(_imp->format_key);
add_metadata_key(_imp->config_location_key);
add_metadata_key(_imp->world_file_key);
@@ -811,26 +795,6 @@ namespace
}
const std::shared_ptr<const Mask>
-PortageEnvironment::mask_for_breakage(const std::shared_ptr<const PackageID> & id) const
-{
- if (! _imp->ignore_all_breaks_portage)
- {
- std::shared_ptr<const Set<std::string> > breakages(id->breaks_portage());
- if (breakages)
- {
- std::set<std::string> bad_breakages;
- std::set_difference(breakages->begin(), breakages->end(),
- _imp->ignore_breaks_portage.begin(), _imp->ignore_breaks_portage.end(),
- std::inserter(bad_breakages, bad_breakages.end()));
- if (! bad_breakages.empty())
- return std::make_shared<BreaksPortageMask>(join(breakages->begin(), breakages->end(), " "));
- }
- }
-
- return std::shared_ptr<const Mask>();
-}
-
-const std::shared_ptr<const Mask>
PortageEnvironment::mask_for_user(const std::shared_ptr<const PackageID> & d, const bool o) const
{
for (PackageMask::const_iterator i(_imp->package_mask.begin()), i_end(_imp->package_mask.end()) ;
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index 11e2e62..7030dab 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -136,9 +136,6 @@ namespace paludis
virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::shared_ptr<const Mask> mask_for_breakage(const std::shared_ptr<const PackageID> &) const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 06578bf..2e8b77c 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -158,12 +158,6 @@ TestEnvironment::hook_dirs() const
}
const std::shared_ptr<const Mask>
-TestEnvironment::mask_for_breakage(const std::shared_ptr<const PackageID> &) const
-{
- return std::shared_ptr<const Mask>();
-}
-
-const std::shared_ptr<const Mask>
TestEnvironment::mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
{
return std::shared_ptr<const Mask>();
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index e202d8f..b778872 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -68,9 +68,6 @@ namespace paludis
virtual bool accept_keywords(const std::shared_ptr<const KeywordNameSet> &, const std::shared_ptr<const PackageID> &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::shared_ptr<const Mask> mask_for_breakage(const std::shared_ptr<const PackageID> &) const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> &, const bool) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/package_id.hh b/paludis/package_id.hh
index 3ff1e9d..af8fe46 100644
--- a/paludis/package_id.hh
+++ b/paludis/package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -340,14 +340,6 @@ namespace paludis
*/
bool masked() const PALUDIS_ATTRIBUTE((warn_unused_result));
- /**
- * Do we break Portage, and if so, why?
- *
- * This method may be used by Environment implementations to apply a "we don't
- * want packages that break Portage" mask.
- */
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
-
///\}
///\name Overridden masks
diff --git a/paludis/repositories/accounts/accounts_id.cc b/paludis/repositories/accounts/accounts_id.cc
index 8199c73..2eaac01 100644
--- a/paludis/repositories/accounts/accounts_id.cc
+++ b/paludis/repositories/accounts/accounts_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2013, 2014 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
@@ -408,12 +408,6 @@ AccountsID::slot_key() const
return nullptr;
}
-std::shared_ptr<const Set<std::string> >
-AccountsID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
AccountsID::arbitrary_less_than_comparison(const PackageID &) const
{
diff --git a/paludis/repositories/accounts/accounts_id.hh b/paludis/repositories/accounts/accounts_id.hh
index dd835b0..4d4c1e0 100644
--- a/paludis/repositories/accounts/accounts_id.hh
+++ b/paludis/repositories/accounts/accounts_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2014 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
@@ -89,8 +89,6 @@ namespace paludis
///\}
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/accounts/installed_accounts_id.cc b/paludis/repositories/accounts/installed_accounts_id.cc
index a807437..a69b26a 100644
--- a/paludis/repositories/accounts/installed_accounts_id.cc
+++ b/paludis/repositories/accounts/installed_accounts_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2013, 2014 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
@@ -317,12 +317,6 @@ InstalledAccountsID::slot_key() const
return nullptr;
}
-std::shared_ptr<const Set<std::string> >
-InstalledAccountsID::breaks_portage() const
-{
- return std::make_shared<Set<std::string> >();
-}
-
bool
InstalledAccountsID::arbitrary_less_than_comparison(const PackageID &) const
{
diff --git a/paludis/repositories/accounts/installed_accounts_id.hh b/paludis/repositories/accounts/installed_accounts_id.hh
index 076dfa7..dc6a243 100644
--- a/paludis/repositories/accounts/installed_accounts_id.hh
+++ b/paludis/repositories/accounts/installed_accounts_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2009, 2010, 2011, 2014 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
@@ -87,8 +87,6 @@ namespace paludis
///\}
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/repositories/e/e_repository_id.cc b/paludis/repositories/e/e_repository_id.cc
index 6c88596..f8be488 100644
--- a/paludis/repositories/e/e_repository_id.cc
+++ b/paludis/repositories/e/e_repository_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2010, 2011, 2014 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
@@ -25,17 +25,6 @@
using namespace paludis;
using namespace paludis::erepository;
-std::shared_ptr<const Set<std::string> >
-ERepositoryID::breaks_portage() const
-{
- std::shared_ptr<Set<std::string> > why(std::make_shared<Set<std::string>>());
- if (version().has_try_part() || version().has_scm_part() || version().has_local_revision())
- why->insert("version");
- if ((! eapi()->supported()) || eapi()->supported()->breaks_portage())
- why->insert("eapi");
- return why;
-}
-
CannotChangeSCMRevision::CannotChangeSCMRevision(const std::string & id_s, const std::string & revision) throw () :
Exception("Cannot change SCM revision for '" + id_s + "' to '" + revision + "'")
{
diff --git a/paludis/repositories/e/e_repository_id.hh b/paludis/repositories/e/e_repository_id.hh
index 3d16007..f5cfc22 100644
--- a/paludis/repositories/e/e_repository_id.hh
+++ b/paludis/repositories/e/e_repository_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -57,8 +57,6 @@ namespace paludis
virtual const std::shared_ptr<const MetadataSpecTreeKey<RequiredUseSpecTree> > required_use_key() const = 0;
virtual const std::shared_ptr<const MetadataValueKey<std::string> > scm_revision_key() const = 0;
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual const std::shared_ptr<const ChoiceValue> make_choice_value(
const std::shared_ptr<const Choice> &, const UnprefixedChoiceName &, const Tribool,
const bool, const ChoiceOrigin, const std::string &, const bool, const bool)
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index c86b2ba..8740b3e 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -364,7 +364,6 @@ namespace
return std::make_shared<SupportedEAPI>(make_named_values<SupportedEAPI>(
n::allow_tokens_in_mask_files() = destringify_key<bool>(k, "allow_tokens_in_mask_files"),
n::annotations() = make_annotations(k),
- n::breaks_portage() = destringify_key<bool>(k, "breaks_portage"),
n::can_be_pbin() = destringify_key<bool>(k, "can_be_pbin"),
n::choices_options() = make_choices_options(k),
n::dependency_labels() = std::make_shared<const EAPILabels>(check_get(k, "dependency_labels")),
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index 34f22df..d518063 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -50,7 +50,6 @@ namespace paludis
typedef Name<struct name_bracket_merged_variables> bracket_merged_variables;
typedef Name<struct name_bracket_merged_variables_annotatable> bracket_merged_variables_annotatable;
typedef Name<struct name_bracket_merged_variables_annotation> bracket_merged_variables_annotation;
- typedef Name<struct name_breaks_portage> breaks_portage;
typedef Name<struct name_bugs_to> bugs_to;
typedef Name<struct name_build_depend> build_depend;
typedef Name<struct name_can_be_pbin> can_be_pbin;
@@ -301,7 +300,6 @@ namespace paludis
{
NamedValue<n::allow_tokens_in_mask_files, bool> allow_tokens_in_mask_files;
NamedValue<n::annotations, std::shared_ptr<const EAPIAnnotations> > annotations;
- NamedValue<n::breaks_portage, bool> breaks_portage;
NamedValue<n::can_be_pbin, bool> can_be_pbin;
NamedValue<n::choices_options, std::shared_ptr<const EAPIChoicesOptions> > choices_options;
NamedValue<n::dependency_labels, std::shared_ptr<const EAPILabels> > dependency_labels;
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index c568fd1..29063e0 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -11,7 +11,6 @@ iuse_flag_parse_options =
version_spec_options =
merger_options = rewrite_symlinks allow_empty_dirs
fs_merger_options =
-breaks_portage = false
rdepend_defaults_to_depend = true
use_expand_separator = _
want_portage_emulation_vars = true
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index d17a134..3223890 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -17,7 +17,6 @@ version_spec_options = flexible_dashes flexible_dots ignore_case \
letters_anywhere dotted_suffixes
merger_options = preserve_mtimes
fs_merger_options = dir_over_sym_dir_is_error
-breaks_portage = true
want_portage_emulation_vars = false
require_use_expand_in_iuse = true
profile_iuse_injection = false
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index 5b66b19..46cf082 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -12,7 +12,6 @@ package_dep_spec_parse_options = allow_slot_deps allow_use_deps allow_use_deps_p
dependency_spec_tree_parse_options = disallow_any_use uri_supports_arrow double_bang_blocks
iuse_flag_parse_options = allow_iuse_defaults
merger_options = rewrite_symlinks allow_empty_dirs
-breaks_portage = true
rdepend_defaults_to_depend = false
want_portage_emulation_vars = true
require_use_expand_in_iuse = false
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 1f43365..627996a 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -713,11 +713,6 @@ EbuildID::need_masks_added() const
add_mask(user_mask);
}
}
-
- /* break portage */
- std::shared_ptr<const Mask> breaks_mask(_imp->environment->mask_for_breakage(shared_from_this()));
- if (breaks_mask)
- add_mask(breaks_mask);
}
const std::string
diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc
index b63f5d2..2b4bfa2 100644
--- a/paludis/repositories/fake/fake_package_id.cc
+++ b/paludis/repositories/fake/fake_package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -1051,10 +1051,6 @@ FakePackageID::need_masks_added() const
)));
}
- std::shared_ptr<const Mask> breaks_mask(_imp->env->mask_for_breakage(shared_from_this()));
- if (breaks_mask)
- add_mask(breaks_mask);
-
if (_imp->unsupported_mask)
add_mask(_imp->unsupported_mask);
}
@@ -1131,12 +1127,6 @@ FakePackageID::perform_action(Action & a) const
a.accept(b);
}
-std::shared_ptr<const Set<std::string> >
-FakePackageID::breaks_portage() const
-{
- return std::shared_ptr<const Set<std::string> >();
-}
-
const std::shared_ptr<const MetadataValueKey<FSPath> >
FakePackageID::fs_location_key() const
{
diff --git a/paludis/repositories/fake/fake_package_id.hh b/paludis/repositories/fake/fake_package_id.hh
index e041489..2662850 100644
--- a/paludis/repositories/fake/fake_package_id.hh
+++ b/paludis/repositories/fake/fake_package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -285,8 +285,6 @@ namespace paludis
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
-
virtual const std::shared_ptr<const Contents> contents() const;
};
diff --git a/paludis/repositories/gemcutter/gemcutter_id.cc b/paludis/repositories/gemcutter/gemcutter_id.cc
index 06a8915..d9c1dc8 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.cc
+++ b/paludis/repositories/gemcutter/gemcutter_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 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
@@ -303,12 +303,6 @@ GemcutterID::perform_action(Action & a) const
throw ActionFailedError("Unsupported action: " + a.simple_name());
}
-std::shared_ptr<const Set<std::string> >
-GemcutterID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
GemcutterID::arbitrary_less_than_comparison(const PackageID &) const
{
diff --git a/paludis/repositories/gemcutter/gemcutter_id.hh b/paludis/repositories/gemcutter/gemcutter_id.hh
index 9bb68e3..a968052 100644
--- a/paludis/repositories/gemcutter/gemcutter_id.hh
+++ b/paludis/repositories/gemcutter/gemcutter_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 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
@@ -89,9 +89,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- std::shared_ptr<const Set<std::string> > breaks_portage() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
std::size_t extra_hash_value() const
diff --git a/paludis/repositories/repository/repository_id.cc b/paludis/repositories/repository/repository_id.cc
index 27e7007..96f7d0f 100644
--- a/paludis/repositories/repository/repository_id.cc
+++ b/paludis/repositories/repository/repository_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 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
@@ -161,12 +161,6 @@ RepositoryID::perform_action(Action & a) const
throw ActionFailedError("Unsupported action: " + a.simple_name());
}
-std::shared_ptr<const Set<std::string> >
-RepositoryID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
RepositoryID::arbitrary_less_than_comparison(const PackageID &) const
{
diff --git a/paludis/repositories/repository/repository_id.hh b/paludis/repositories/repository/repository_id.hh
index 4d3be4e..600fb87 100644
--- a/paludis/repositories/repository/repository_id.hh
+++ b/paludis/repositories/repository/repository_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2014 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
@@ -87,9 +87,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- std::shared_ptr<const Set<std::string> > breaks_portage() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
std::size_t extra_hash_value() const
diff --git a/paludis/repositories/unavailable/unavailable_package_id.cc b/paludis/repositories/unavailable/unavailable_package_id.cc
index b3f729c..a77119d 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.cc
+++ b/paludis/repositories/unavailable/unavailable_package_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
@@ -172,12 +172,6 @@ UnavailablePackageID::perform_action(Action & a) const
throw ActionFailedError("Unsupported action: " + a.simple_name());
}
-std::shared_ptr<const Set<std::string> >
-UnavailablePackageID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
UnavailablePackageID::arbitrary_less_than_comparison(const PackageID & other) const
{
diff --git a/paludis/repositories/unavailable/unavailable_package_id.hh b/paludis/repositories/unavailable/unavailable_package_id.hh
index edafb57..196a1e9 100644
--- a/paludis/repositories/unavailable/unavailable_package_id.hh
+++ b/paludis/repositories/unavailable/unavailable_package_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
@@ -101,9 +101,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- std::shared_ptr<const Set<std::string> > breaks_portage() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
std::size_t extra_hash_value() const
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.cc b/paludis/repositories/unavailable/unavailable_repository_id.cc
index 4bb2218..0005a18 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.cc
+++ b/paludis/repositories/unavailable/unavailable_repository_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2010, 2011, 2013, 2014 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
@@ -298,12 +298,6 @@ UnavailableRepositoryID::perform_action(Action & action) const
output_manager->succeeded();
}
-std::shared_ptr<const Set<std::string> >
-UnavailableRepositoryID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
UnavailableRepositoryID::arbitrary_less_than_comparison(const PackageID &) const
{
diff --git a/paludis/repositories/unavailable/unavailable_repository_id.hh b/paludis/repositories/unavailable/unavailable_repository_id.hh
index 0fc082a..e947f54 100644
--- a/paludis/repositories/unavailable/unavailable_repository_id.hh
+++ b/paludis/repositories/unavailable/unavailable_repository_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
@@ -101,9 +101,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
void perform_action(Action &) const;
- std::shared_ptr<const Set<std::string> > breaks_portage() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
std::size_t extra_hash_value() const
diff --git a/paludis/repositories/unpackaged/installed_id.cc b/paludis/repositories/unpackaged/installed_id.cc
index 2dbca35..6f7eb75 100644
--- a/paludis/repositories/unpackaged/installed_id.cc
+++ b/paludis/repositories/unpackaged/installed_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -668,14 +668,6 @@ InstalledUnpackagedID::perform_action(Action & action) const
);
}
-std::shared_ptr<const Set<std::string> >
-InstalledUnpackagedID::breaks_portage() const
-{
- std::shared_ptr<Set<std::string> > why(std::make_shared<Set<std::string>>());
- why->insert("format");
- return why;
-}
-
bool
InstalledUnpackagedID::arbitrary_less_than_comparison(const PackageID & other) const
{
diff --git a/paludis/repositories/unpackaged/installed_id.hh b/paludis/repositories/unpackaged/installed_id.hh
index 3c8f825..8a35771 100644
--- a/paludis/repositories/unpackaged/installed_id.hh
+++ b/paludis/repositories/unpackaged/installed_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -75,7 +75,6 @@ namespace paludis
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::size_t extra_hash_value() const
diff --git a/paludis/repositories/unpackaged/unpackaged_id.cc b/paludis/repositories/unpackaged/unpackaged_id.cc
index 2bd9984..1fdea2a 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.cc
+++ b/paludis/repositories/unpackaged/unpackaged_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014 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
@@ -483,14 +483,6 @@ UnpackagedID::perform_action(Action & action) const
output_manager->succeeded();
}
-std::shared_ptr<const Set<std::string> >
-UnpackagedID::breaks_portage() const
-{
- std::shared_ptr<Set<std::string> > why(std::make_shared<Set<std::string>>());
- why->insert("format");
- return why;
-}
-
bool
UnpackagedID::arbitrary_less_than_comparison(const PackageID & other) const
{
diff --git a/paludis/repositories/unpackaged/unpackaged_id.hh b/paludis/repositories/unpackaged/unpackaged_id.hh
index ad2de1d..1c0097d 100644
--- a/paludis/repositories/unpackaged/unpackaged_id.hh
+++ b/paludis/repositories/unpackaged/unpackaged_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -77,7 +77,6 @@ namespace paludis
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void perform_action(Action &) const;
- virtual std::shared_ptr<const Set<std::string> > breaks_portage() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::size_t extra_hash_value() const
diff --git a/paludis/repositories/unwritten/unwritten_id.cc b/paludis/repositories/unwritten/unwritten_id.cc
index fb5e675..9a6f60b 100644
--- a/paludis/repositories/unwritten/unwritten_id.cc
+++ b/paludis/repositories/unwritten/unwritten_id.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
@@ -186,12 +186,6 @@ UnwrittenID::perform_action(Action & a) const
throw ActionFailedError("Unsupported action: " + a.simple_name());
}
-std::shared_ptr<const Set<std::string> >
-UnwrittenID::breaks_portage() const
-{
- return std::make_shared<Set<std::string>>();
-}
-
bool
UnwrittenID::arbitrary_less_than_comparison(const PackageID & other) const
{
diff --git a/paludis/repositories/unwritten/unwritten_id.hh b/paludis/repositories/unwritten/unwritten_id.hh
index 9517001..341348a 100644
--- a/paludis/repositories/unwritten/unwritten_id.hh
+++ b/paludis/repositories/unwritten/unwritten_id.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2008, 2009, 2010, 2011, 2014 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
@@ -113,9 +113,6 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
void perform_action(Action &) const PALUDIS_ATTRIBUTE((noreturn));
- std::shared_ptr<const Set<std::string> > breaks_portage() const
- PALUDIS_ATTRIBUTE((warn_unused_result));
-
bool arbitrary_less_than_comparison(const PackageID &) const
PALUDIS_ATTRIBUTE((warn_unused_result));
std::size_t extra_hash_value() const
diff --git a/python/additional_tests.cc b/python/additional_tests.cc
index b9c39eb..28b5bf6 100644
--- a/python/additional_tests.cc
+++ b/python/additional_tests.cc
@@ -56,8 +56,6 @@ namespace environment
kns->insert(KeywordName("keyword"));
bool PALUDIS_ATTRIBUTE((unused)) b3(e.accept_keywords(kns, pid));
- e.mask_for_breakage(pid);
-
e.mask_for_user(pid, false);
bool PALUDIS_ATTRIBUTE((unused)) b4(e.unmasked_by_user(pid, ""));
diff --git a/python/environment.cc b/python/environment.cc
index 3691443..8ed442b 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -84,17 +84,6 @@ class EnvironmentImplementationWrapper :
throw PythonMethodNotImplemented("EnvironmentImplementation", "accept_keywords");
}
- virtual const std::shared_ptr<const Mask> mask_for_breakage(const std::shared_ptr<const PackageID> & p) const
- PALUDIS_ATTRIBUTE((warn_unused_result))
- {
- std::unique_lock<std::recursive_mutex> l(get_mutex());
-
- if (bp::override f = get_override("mask_for_breakage"))
- return f(p);
- else
- throw PythonMethodNotImplemented("EnvironmentImplementation", "mask_for_breakage");
- }
-
virtual const std::shared_ptr<const Mask> mask_for_user(const std::shared_ptr<const PackageID> & p, const bool b) const
PALUDIS_ATTRIBUTE((warn_unused_result))
{
@@ -557,12 +546,6 @@ void expose_environment()
"If the collection includes \"*\", should return true."
)
- .def("mask_for_breakage", bp::pure_virtual(&EnvImp::mask_for_breakage),
- "mask_for_breakage(PackageID) -> Mask\n"
- "Do we have a 'breaks' mask for a particular package?\n\n"
- "Returns None if no."
- )
-
.def("mask_for_user", bp::pure_virtual(&EnvImp::mask_for_user),
"mask_for_user(PackageID, bool) -> Mask\n"
"Do we have a 'user' mask for a particular package?\n\n"
diff --git a/python/environment_TEST.py b/python/environment_TEST.py
index ce8f5bc..bba853b 100755
--- a/python/environment_TEST.py
+++ b/python/environment_TEST.py
@@ -76,9 +76,6 @@ class TestCase_04_Environment_subclassingd(unittest.TestCase):
def accept_keywords(self, kns, pid):
return False
- def mask_for_breakage(self, pid):
- return UserMask()
-
def mask_for_user(self, pid, b):
return UserMask()
diff --git a/ruby/package_id.cc b/ruby/package_id.cc
index 75e6232..b5bd20e 100644
--- a/ruby/package_id.cc
+++ b/ruby/package_id.cc
@@ -2,7 +2,7 @@
/*
* Copyright (c) 2007, 2008 Richard Brown
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2014 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
@@ -311,37 +311,6 @@ namespace
}
/*
- * call-seq:
- * breaks_portage -> [:reason, :reason, ...]
- *
- * Do we break Portage, and if so, why?
- *
- * This method may be used by Environment implementations to apply a "we don't want packages that break Portage" mask.
- */
- VALUE
- package_id_breaks_portage(VALUE self)
- {
- VALUE result(rb_ary_new());
- std::shared_ptr<const PackageID> * self_ptr;
- Data_Get_Struct(self, std::shared_ptr<const PackageID>, self_ptr);
- try
- {
- std::shared_ptr<const Set<std::string> > breakages((*self_ptr)->breaks_portage());
- if (breakages)
- for (Set<std::string>::ConstIterator it(breakages->begin()),
- it_end(breakages->end()); it_end != it; ++it)
- rb_ary_push(result, ID2SYM(rb_intern(it->c_str())));
- return result;
- }
- catch (const std::exception & e)
- {
- exception_to_ruby_exception(e);
- }
-
- return Qnil;
- }
-
- /*
* Document-method: contents
*
* call-seq:
@@ -546,7 +515,6 @@ namespace
rb_define_method(c_package_id, "masks", RUBY_FUNC_CAST(&package_id_masks), 0);
rb_define_method(c_package_id, "overridden_masks", RUBY_FUNC_CAST(&package_id_overridden_masks), 0);
rb_define_method(c_package_id, "masked?", RUBY_FUNC_CAST((&PackageIDBool<&PackageID::masked>::fetch)), 0);
- rb_define_method(c_package_id, "breaks_portage", RUBY_FUNC_CAST(&package_id_breaks_portage), 0);
rb_define_method(c_package_id, "keywords_key", RUBY_FUNC_CAST((&KeyValue<MetadataCollectionKey<KeywordNameSet>,&PackageID::keywords_key>::fetch)), 0);
rb_define_method(c_package_id, "dependencies_key", RUBY_FUNC_CAST((
diff --git a/ruby/package_id_TEST.rb b/ruby/package_id_TEST.rb
index 0215af2..52e0ce8 100644
--- a/ruby/package_id_TEST.rb
+++ b/ruby/package_id_TEST.rb
@@ -170,10 +170,6 @@ module Paludis
assert !pid_installed.masked?
end
- def test_breaks_portage
- assert pid_testrepo.breaks_portage.empty?
- end
-
def test_masks
masks = pid_testrepo.masks
assert_equal 1, masks.length
diff --git a/vim/syntax/paludis-general-conf.vim b/vim/syntax/paludis-general-conf.vim
index c836ce5..f9dbbb2 100644
--- a/vim/syntax/paludis-general-conf.vim
+++ b/vim/syntax/paludis-general-conf.vim
@@ -1,7 +1,7 @@
" Vim syntax file
" Language: Paludis general.conf files
" Author: Ciaran McCreesh
-" Copyright: Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
+" Copyright: Copyright (c) 2007, 2008, 2010, 2014 Ciaran McCreesh
" Licence: You may redistribute this under the same terms as Vim itself
"
" Syntax highlighting for Paludis general.conf files.
@@ -39,7 +39,7 @@ syn region PaludisGeneralConfString contained start=/"/ end=/"/
\ skipwhite
syn keyword PaludisGeneralConfKnownKey contained
- \ reduced_username portage_compatible distribution world
+ \ reduced_username distribution world
syn match PaludisGeneralConfVariable contained /\$\({[^{}]\+}\|\(ENV{\)\@!=[a-zA-Z0-9_]\+\)/ skipwhite