aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-13 15:40:45 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-13 15:40:45 +0000
commit29c80e375828fe5bcdbbb54fceccdf1a031d6f28 (patch)
tree94ef1ec7e0d8d6f4a9a17e9438e7f14a6b9941b5
parent93212aae445aa064c699990acb49b71ca64aeaaa (diff)
downloadpaludis-29c80e375828fe5bcdbbb54fceccdf1a031d6f28.tar.gz
paludis-29c80e375828fe5bcdbbb54fceccdf1a031d6f28.tar.xz
Deprecate format=portage, use format=ebuild
-rw-r--r--doc/cachefiles.html.skel2
-rw-r--r--doc/configuration.html.skel15
-rwxr-xr-xpaludis/environment/default/default_environment_TEST_setup.sh6
-rw-r--r--paludis/environment/no_config/no_config_environment.cc4
-rw-r--r--paludis/repositories/portage/portage_repository_TEST.cc34
-rw-r--r--paludis/repositories/portage/registration.cc25
-rw-r--r--paludis/repositories/repository_maker.cc3
-rwxr-xr-xruby/dep_list_TEST_setup.sh2
-rwxr-xr-xruby/environment_TEST_setup.sh2
-rwxr-xr-xruby/package_database_TEST_setup.sh2
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh2
-rwxr-xr-xruby/repository_TEST_setup.sh2
-rwxr-xr-xsrc/clients/gtkpaludis/quit_TEST_setup.sh2
-rwxr-xr-xsrc/clients/gtkpaludis/sets_list_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST_setup.sh2
16 files changed, 61 insertions, 46 deletions
diff --git a/doc/cachefiles.html.skel b/doc/cachefiles.html.skel
index 39339cc..db2d308 100644
--- a/doc/cachefiles.html.skel
+++ b/doc/cachefiles.html.skel
@@ -52,7 +52,7 @@ user explicitly enable or disable it.</p>
<p>Turning an unqualified package name, like <code>vim</code>, into a qualified
name, like <code>app-editors/vim</code>, involves scanning every category
directory. This can take several seconds on a cold filesystem cache. Paludis can
-cache unqualified to qualified name mappings for <code>portage</code> and
+cache unqualified to qualified name mappings for <code>ebuild</code> and
<code>vdb</code> repository formats. This makes certain common tasks much
faster.</p>
diff --git a/doc/configuration.html.skel b/doc/configuration.html.skel
index c89f6c4..e492258 100644
--- a/doc/configuration.html.skel
+++ b/doc/configuration.html.skel
@@ -119,7 +119,7 @@ app-editors/vim-core ~x86
<p>If <code>*</code> is not used, then every package that is to be installed will require
an entry in <code>keywords.conf</code>. It is also generally assumed within the gentoo
-portage tree that if <code>~ARCH</code> is accepted for a package, then so is
+tree that if <code>~ARCH</code> is accepted for a package, then so is
<code>ARCH</code>; not doing so may result in all versions or the latest version of a
package being masked, as the package is stabilised.</p>
@@ -201,14 +201,9 @@ two different repositories contain an identical package atom (e.g. foo/bar-1.0).
The repository with the higher importance will always be chosen first. If not
provided, the default is 0.</p>
-<h4>portage Format Repositories</h4>
+<h4>ebuild Format Repositories</h4>
-<p>Note: The name <code>portage</code> is used here to refer to repositories in the
-format used by the <code>gentoo-portage</code> (or <code>gentoo-x86</code>) tree.
-The name is far from ideal... In future, this may be changed to <code>format =
- ebuild</code>.</p>
-
-<p>The following keys are available for <code>format = portage</code>:</p>
+<p>The following keys are available for <code>format = ebuild</code>:</p>
<ul>
<li><code>location</code> (mandatory), which points to the location of the
@@ -249,7 +244,7 @@ The name is far from ideal... In future, this may be changed to <code>format =
<h4>vdb Format Repositories</h4>
<p>You should have exactly one VDB format repository. It holds packages that have
-been installed from a <code>portage</code> format repository.</p>
+been installed from a <code>ebuild</code> format repository.</p>
<p>The following keys are available for <code>format = vdb</code>:</p>
@@ -279,7 +274,7 @@ been installed from a <code>portage</code> format repository.</p>
<li><code>location</code> (mandatory), which points to the location of the
CRAN tree.</li>
<li><code>sync</code> (default: empty), as per <code>format =
- portage</code>.</li>
+ ebuild</code>.</li>
</ul>
<h4>CRAN Installed Format Repositories</h4>
diff --git a/paludis/environment/default/default_environment_TEST_setup.sh b/paludis/environment/default/default_environment_TEST_setup.sh
index 48cd9d8..9b40b8e 100755
--- a/paludis/environment/default/default_environment_TEST_setup.sh
+++ b/paludis/environment/default/default_environment_TEST_setup.sh
@@ -33,7 +33,7 @@ cat <<END > home1/.paludis/licenses.conf
* keyword
END
cat <<END > home1/.paludis/repositories/foo.conf
-format = portage
+format = ebuild
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
@@ -53,7 +53,7 @@ cat <<END > home2/.paludis/licenses.conf
* *
END
cat <<END > home2/.paludis/repositories/foo.conf
-format = portage
+format = ebuild
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
@@ -73,7 +73,7 @@ cat <<END > home3/.paludis/licenses.conf
* *
END
cat <<END > home3/.paludis/repositories/foo.conf
-format = portage
+format = ebuild
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
diff --git a/paludis/environment/no_config/no_config_environment.cc b/paludis/environment/no_config/no_config_environment.cc
index 4aef99c..514dba6 100644
--- a/paludis/environment/no_config/no_config_environment.cc
+++ b/paludis/environment/no_config/no_config_environment.cc
@@ -121,14 +121,14 @@ Implementation<NoConfigEnvironment>::Implementation(
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("location", stringify(params.repository_dir));
keys->insert("profiles", "/var/empty");
keys->insert("write_cache", stringify(params.write_cache));
keys->insert("names_cache", "/var/empty");
env->package_database()->add_repository(((portage_repo =
- RepositoryMaker::get_instance()->find_maker("portage")(env, keys))));
+ RepositoryMaker::get_instance()->find_maker("ebuild")(env, keys))));
env->package_database()->add_repository(RepositoryMaker::get_instance()->find_maker("virtuals")(env,
AssociativeCollection<std::string, std::string>::Pointer(0)));
}
diff --git a/paludis/repositories/portage/portage_repository_TEST.cc b/paludis/repositories/portage/portage_repository_TEST.cc
index 39efefe..98713cd 100644
--- a/paludis/repositories/portage/portage_repository_TEST.cc
+++ b/paludis/repositories/portage/portage_repository_TEST.cc
@@ -48,7 +48,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
@@ -71,7 +71,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo2");
keys->insert("profile", "portage_repository_TEST_dir/repo2/profiles/profile");
@@ -94,7 +94,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo3");
keys->insert("profile", "portage_repository_TEST_dir/repo3/profiles/profile");
@@ -117,7 +117,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
@@ -149,7 +149,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo1");
keys->insert("profile", "portage_repository_TEST_dir/repo1/profiles/profile");
@@ -183,7 +183,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
@@ -223,7 +223,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
@@ -267,7 +267,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
@@ -320,7 +320,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo5");
keys->insert("profile", "portage_repository_TEST_dir/repo5/profiles/profile");
@@ -354,7 +354,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
@@ -398,7 +398,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo4");
keys->insert("profile", "portage_repository_TEST_dir/repo4/profiles/profile");
@@ -441,7 +441,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo8");
keys->insert("profile", "portage_repository_TEST_dir/repo8/profiles/profile");
@@ -484,7 +484,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo6");
keys->insert("profile", "portage_repository_TEST_dir/repo6/profiles/profile");
@@ -525,7 +525,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profile", "portage_repository_TEST_dir/repo7/profiles/profile");
@@ -562,7 +562,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo7");
keys->insert("profile", "portage_repository_TEST_dir/repo7/profiles/profile");
@@ -593,7 +593,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo9");
keys->insert("profile", "portage_repository_TEST_dir/repo9/profiles/profile");
@@ -641,7 +641,7 @@ namespace test_cases
TestEnvironment env;
AssociativeCollection<std::string, std::string>::Pointer keys(
new AssociativeCollection<std::string, std::string>::Concrete);
- keys->insert("format", "portage");
+ keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
keys->insert("location", "portage_repository_TEST_dir/repo10");
keys->insert("profiles", "portage_repository_TEST_dir/repo10/profiles/profile/subprofile");
diff --git a/paludis/repositories/portage/registration.cc b/paludis/repositories/portage/registration.cc
index 8ad699e..6a0adef 100644
--- a/paludis/repositories/portage/registration.cc
+++ b/paludis/repositories/portage/registration.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
@@ -19,6 +19,7 @@
#include <paludis/repositories/repository_maker.hh>
#include <paludis/repositories/portage/make_ebuild_repository.hh>
+#include <paludis/util/log.hh>
#include "config.h"
using namespace paludis;
@@ -30,10 +31,30 @@ extern "C"
void register_repositories(RepositoryMaker * maker);
}
+namespace
+{
+ CountedPtr<Repository>
+ make_portage_repository(
+ Environment * const env,
+ AssociativeCollection<std::string, std::string>::ConstPointer m)
+ {
+ std::string repo_file = "?";
+ if (m->end() != m->find("repo_file"))
+ repo_file = m->find("repo_file")->second;
+
+ Context context("When creating repository using '" + repo_file + "':");
+
+ Log::get_instance()->message(ll_warning, lc_context, "Format 'portage' is "
+ "deprecated, use 'ebuild' instead");
+
+ return make_ebuild_repository_wrapped(env, m);
+ }
+}
+
void register_repositories(RepositoryMaker * maker)
{
maker->register_maker("ebuild", &make_ebuild_repository_wrapped);
- maker->register_maker("portage", &make_ebuild_repository_wrapped);
+ maker->register_maker("portage", &make_portage_repository);
}
#endif
diff --git a/paludis/repositories/repository_maker.cc b/paludis/repositories/repository_maker.cc
index b6e2c8d..e1e583e 100644
--- a/paludis/repositories/repository_maker.cc
+++ b/paludis/repositories/repository_maker.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
@@ -118,7 +118,6 @@ RepositoryMaker::RepositoryMaker() :
#ifdef MONOLITHIC
register_maker("ebuild", &make_ebuild_repository_wrapped);
- register_maker("portage", &make_ebuild_repository_wrapped);
register_maker("vdb", &VDBRepository::make_vdb_repository);
register_maker("virtuals", &VirtualsRepository::make_virtuals_repository);
register_maker("installed_virtuals", &InstalledVirtualsRepository::make_installed_virtuals_repository);
diff --git a/ruby/dep_list_TEST_setup.sh b/ruby/dep_list_TEST_setup.sh
index 6707c4e..6ae157a 100755
--- a/ruby/dep_list_TEST_setup.sh
+++ b/ruby/dep_list_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/environment_TEST_setup.sh b/ruby/environment_TEST_setup.sh
index 8538b5d..c563c87 100755
--- a/ruby/environment_TEST_setup.sh
+++ b/ruby/environment_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/package_database_TEST_setup.sh b/ruby/package_database_TEST_setup.sh
index 987cf4d..8df1a13 100755
--- a/ruby/package_database_TEST_setup.sh
+++ b/ruby/package_database_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index d43eca2..54d498c 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index 88b4dcd..3ee7146 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/src/clients/gtkpaludis/quit_TEST_setup.sh b/src/clients/gtkpaludis/quit_TEST_setup.sh
index 216b4dd..1495874 100755
--- a/src/clients/gtkpaludis/quit_TEST_setup.sh
+++ b/src/clients/gtkpaludis/quit_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/src/clients/gtkpaludis/sets_list_TEST_setup.sh b/src/clients/gtkpaludis/sets_list_TEST_setup.sh
index 4d89e89..f43bf05 100755
--- a/src/clients/gtkpaludis/sets_list_TEST_setup.sh
+++ b/src/clients/gtkpaludis/sets_list_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = portage
+format = ebuild
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/src/clients/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index ceef012..bda9b46 100755
--- a/src/clients/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
@@ -31,7 +31,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = portage
+format = ebuild
names_cache = /var/empty
profiles = \${location}/profiles/testprofile \${location}/profiles/anothertestprofile
buildroot = `pwd`/build
diff --git a/src/clients/paludis/upgrade_TEST_setup.sh b/src/clients/paludis/upgrade_TEST_setup.sh
index 8069947..cde2f3c 100755
--- a/src/clients/paludis/upgrade_TEST_setup.sh
+++ b/src/clients/paludis/upgrade_TEST_setup.sh
@@ -31,7 +31,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = portage
+format = ebuild
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
buildroot = `pwd`/build