aboutsummaryrefslogtreecommitdiff
path: root/paludis/distribution.cc
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/distribution.cc')
-rw-r--r--paludis/distribution.cc16
1 files changed, 3 insertions, 13 deletions
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index b6a7c2d..60f6b19 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/distribution.hh>
+#include <paludis/distribution-impl.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/destringify.hh>
#include <paludis/util/dir_iterator.hh>
@@ -68,20 +68,10 @@ namespace paludis
make_shared_ptr(new Distribution(make_named_values<Distribution>(
value_for<n::concept_keyword>(k.get("concept_keyword")),
value_for<n::concept_use>(k.get("concept_use")),
- value_for<n::default_ebuild_builddir>(k.get("default_ebuild_builddir")),
- value_for<n::default_ebuild_distdir>(k.get("default_ebuild_distdir")),
- value_for<n::default_ebuild_eapi_when_unknown>(k.get("default_ebuild_eapi_when_unknown")),
- value_for<n::default_ebuild_eapi_when_unspecified>(k.get("default_ebuild_eapi_when_unspecified")),
- value_for<n::default_ebuild_layout>(k.get("default_ebuild_layout")),
- value_for<n::default_ebuild_names_cache>(k.get("default_ebuild_names_cache")),
- value_for<n::default_ebuild_profile_eapi>(k.get("default_ebuild_profile_eapi")),
- value_for<n::default_ebuild_write_cache>(k.get("default_ebuild_write_cache")),
value_for<n::default_environment>(k.get("default_environment")),
- value_for<n::default_vdb_names_cache>(k.get("default_vdb_names_cache")),
- value_for<n::default_vdb_provides_cache>(k.get("default_vdb_provides_cache")),
+ value_for<n::extra_data_dir>(FSEntry(strip_trailing_string(stringify(d->realpath()), ".conf"))),
value_for<n::fallback_environment>(k.get("fallback_environment")),
- value_for<n::paludis_environment_keywords_conf_filename>(k.get("paludis_environment_keywords_conf_filename")),
- value_for<n::paludis_environment_use_conf_filename>(k.get("paludis_environment_use_conf_filename")),
+ value_for<n::name>(strip_trailing_string(d->basename(), ".conf")),
value_for<n::paludis_package>(k.get("paludis_package")),
value_for<n::support_old_style_virtuals>(destringify<bool>(k.get("support_old_style_virtuals")))
)))));