aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-29 00:32:56 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-06-29 00:32:56 +0000
commitacb7dccb5ed48c50da05850bf96d5cf2707b2227 (patch)
tree01059ff2642c2b1513cc214818bf55fd3b4608f5
parent4f253d1c8bc1474f27aec2fb55a453dd6039abe7 (diff)
downloadpaludis-acb7dccb5ed48c50da05850bf96d5cf2707b2227.tar.gz
paludis-acb7dccb5ed48c50da05850bf96d5cf2707b2227.tar.xz
r3637@snowflake: ciaranm | 2007-06-29 01:31:25 +0100
PortageRepository -> ERepository. Fixes: ticket:254
-rw-r--r--doc/doc_main.doxygen2
-rw-r--r--doc/programmingwithpaludis.html.skel2
-rw-r--r--paludis/environments/no_config/no_config_environment.cc16
-rw-r--r--paludis/environments/portage/portage_environment.hh4
-rw-r--r--paludis/portage_dep_lexer.hh4
-rw-r--r--paludis/portage_dep_parser-fwd.hh4
-rw-r--r--paludis/portage_dep_parser.hh4
-rw-r--r--paludis/repositories/Makefile.am14
-rw-r--r--paludis/repositories/cran/cran_repository.cc2
-rw-r--r--paludis/repositories/e/Makefile.am84
-rw-r--r--paludis/repositories/e/e_repository.cc (renamed from paludis/repositories/e/portage_repository.cc)182
-rw-r--r--paludis/repositories/e/e_repository.hh (renamed from paludis/repositories/e/portage_repository.hh)36
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc (renamed from paludis/repositories/e/portage_repository_TEST.cc)228
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_cleanup.sh10
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_setup.sh (renamed from paludis/repositories/e/portage_repository_TEST_setup.sh)4
-rw-r--r--paludis/repositories/e/e_repository_entries.cc (renamed from paludis/repositories/e/portage_repository_entries.cc)18
-rw-r--r--paludis/repositories/e/e_repository_entries.hh (renamed from paludis/repositories/e/portage_repository_entries.hh)48
-rw-r--r--paludis/repositories/e/e_repository_exceptions.cc (renamed from paludis/repositories/e/portage_repository_exceptions.cc)8
-rw-r--r--paludis/repositories/e/e_repository_exceptions.hh (renamed from paludis/repositories/e/portage_repository_exceptions.hh)18
-rw-r--r--paludis/repositories/e/e_repository_news.cc (renamed from paludis/repositories/e/portage_repository_news.cc)42
-rw-r--r--paludis/repositories/e/e_repository_news.hh (renamed from paludis/repositories/e/portage_repository_news.hh)26
-rw-r--r--paludis/repositories/e/e_repository_params.cc8
-rw-r--r--paludis/repositories/e/e_repository_params.hh (renamed from paludis/repositories/e/portage_repository_params.hh)12
-rw-r--r--paludis/repositories/e/e_repository_params.sr (renamed from paludis/repositories/e/portage_repository_params.sr)10
-rw-r--r--paludis/repositories/e/e_repository_profile.cc (renamed from paludis/repositories/e/portage_repository_profile.cc)92
-rw-r--r--paludis/repositories/e/e_repository_profile.hh (renamed from paludis/repositories/e/portage_repository_profile.hh)30
-rw-r--r--paludis/repositories/e/e_repository_profile_file.cc (renamed from paludis/repositories/e/portage_repository_profile_file.cc)2
-rw-r--r--paludis/repositories/e/e_repository_profile_file.hh (renamed from paludis/repositories/e/portage_repository_profile_file.hh)8
-rw-r--r--paludis/repositories/e/e_repository_sets.cc (renamed from paludis/repositories/e/portage_repository_sets.cc)38
-rw-r--r--paludis/repositories/e/e_repository_sets.hh (renamed from paludis/repositories/e/portage_repository_sets.hh)26
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc (renamed from paludis/repositories/e/portage_repository_sets_TEST.cc)60
-rwxr-xr-xpaludis/repositories/e/e_repository_sets_TEST_cleanup.sh10
-rwxr-xr-xpaludis/repositories/e/e_repository_sets_TEST_setup.sh (renamed from paludis/repositories/e/portage_repository_sets_TEST_setup.sh)4
-rw-r--r--paludis/repositories/e/eapi_phase.hh4
-rw-r--r--paludis/repositories/e/ebin.se2
-rw-r--r--paludis/repositories/e/ebin_entries.cc24
-rw-r--r--paludis/repositories/e/ebin_entries.hh26
-rw-r--r--paludis/repositories/e/ebuild.cc4
-rw-r--r--paludis/repositories/e/ebuild.hh6
-rw-r--r--paludis/repositories/e/ebuild_entries.cc90
-rw-r--r--paludis/repositories/e/ebuild_entries.hh32
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache.hh10
-rw-r--r--paludis/repositories/e/ebuild_id.cc14
-rw-r--r--paludis/repositories/e/ebuild_id.hh6
-rw-r--r--paludis/repositories/e/eclass_mtimes.hh10
-rw-r--r--paludis/repositories/e/exheres_layout.cc22
-rw-r--r--paludis/repositories/e/exheres_layout.hh10
-rw-r--r--paludis/repositories/e/glsa.cc6
-rw-r--r--paludis/repositories/e/glsa.hh8
-rw-r--r--paludis/repositories/e/glsa.sr4
-rw-r--r--paludis/repositories/e/layout.cc10
-rw-r--r--paludis/repositories/e/layout.hh16
-rw-r--r--paludis/repositories/e/make_ebin_repository.cc18
-rw-r--r--paludis/repositories/e/make_ebin_repository.hh12
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc18
-rw-r--r--paludis/repositories/e/make_ebuild_repository.hh16
-rwxr-xr-xpaludis/repositories/e/portage_repository_TEST_cleanup.sh10
-rw-r--r--paludis/repositories/e/portage_repository_params.cc8
-rwxr-xr-xpaludis/repositories/e/portage_repository_sets_TEST_cleanup.sh10
-rw-r--r--paludis/repositories/e/traditional_layout.cc18
-rw-r--r--paludis/repositories/e/traditional_layout.hh10
-rw-r--r--paludis/repositories/e/use_desc.hh8
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.hh2
-rw-r--r--paludis/repositories/e/xml_things.hh6
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc2
-rw-r--r--paludis/repositories/fake/fake_repository.cc2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc2
-rw-r--r--paludis/repository-fwd.hh4
-rw-r--r--paludis/repository.cc2
-rw-r--r--paludis/repository.hh18
-rw-r--r--paludis/repository.sr10
-rw-r--r--src/clients/adjutrix/display_default_system_resolution.cc16
-rw-r--r--src/clients/adjutrix/downgrade_check.cc20
-rw-r--r--src/clients/adjutrix/what_needs_keywording.cc2
76 files changed, 782 insertions, 796 deletions
diff --git a/doc/doc_main.doxygen b/doc/doc_main.doxygen
index c48e0a3..2f4161f 100644
--- a/doc/doc_main.doxygen
+++ b/doc/doc_main.doxygen
@@ -213,7 +213,7 @@
* \ingroup grprepository
*/
-/** \defgroup grpportagerepository Portage repository
+/** \defgroup grperepository Portage repository
*
* \ingroup grprepository
*/
diff --git a/doc/programmingwithpaludis.html.skel b/doc/programmingwithpaludis.html.skel
index 76eb2bc..5e78cce 100644
--- a/doc/programmingwithpaludis.html.skel
+++ b/doc/programmingwithpaludis.html.skel
@@ -227,7 +227,7 @@ along with various optional others based upon the repository's capabilities.</p>
<p>The commonly used subclasses are:</p>
<ul>
- <li>paludis::PortageRepository, which is used for Gentoo-style ebuild
+ <li>paludis::ERepository, which is used for Gentoo-style ebuild
repositories.</li>
<li>paludis::VDBRepository, which is used for installed packages.</li>
<li>paludis::VirtualsRepository, which is used for old-style virtuals.</li>
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 841e180..2fd3819 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -201,14 +201,14 @@ NoConfigEnvironment::NoConfigEnvironment(const no_config_environment::Params & p
_imp->initialise(this);
if (_imp->main_repo)
- if (_imp->main_repo->portage_interface->end_profiles() != _imp->main_repo->portage_interface->begin_profiles())
- _imp->main_repo->portage_interface->set_profile(_imp->main_repo->portage_interface->begin_profiles());
+ if (_imp->main_repo->e_interface->end_profiles() != _imp->main_repo->e_interface->begin_profiles())
+ _imp->main_repo->e_interface->set_profile(_imp->main_repo->e_interface->begin_profiles());
if (_imp->master_repo)
- if (_imp->master_repo->portage_interface->end_profiles() !=
- _imp->master_repo->portage_interface->begin_profiles())
- _imp->master_repo->portage_interface->set_profile(
- _imp->master_repo->portage_interface->begin_profiles());
+ if (_imp->master_repo->e_interface->end_profiles() !=
+ _imp->master_repo->e_interface->begin_profiles())
+ _imp->master_repo->e_interface->set_profile(
+ _imp->master_repo->e_interface->begin_profiles());
}
NoConfigEnvironment::~NoConfigEnvironment()
@@ -282,11 +282,11 @@ NoConfigEnvironment::accept_keywords(tr1::shared_ptr<const KeywordNameCollection
if (_imp->is_vdb)
return true;
- std::string ak(_imp->main_repo->portage_interface->profile_variable("ACCEPT_KEYWORDS"));
+ std::string ak(_imp->main_repo->e_interface->profile_variable("ACCEPT_KEYWORDS"));
if (ak.empty())
{
- std::string arch(_imp->main_repo->portage_interface->profile_variable("ARCH"));
+ std::string arch(_imp->main_repo->e_interface->profile_variable("ARCH"));
if (keywords->end() != keywords->find(KeywordName(arch)))
return true;
diff --git a/paludis/environments/portage/portage_environment.hh b/paludis/environments/portage/portage_environment.hh
index bd2385b..8660cd7 100644
--- a/paludis/environments/portage/portage_environment.hh
+++ b/paludis/environments/portage/portage_environment.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PORTAGE_PORTAGE_ENVIRONMENT_HH
-#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_PORTAGE_PORTAGE_ENVIRONMENT_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_E_E_ENVIRONMENT_HH
+#define PALUDIS_GUARD_PALUDIS_ENVIRONMENTS_E_E_ENVIRONMENT_HH 1
#include <paludis/environment_implementation.hh>
#include <paludis/util/exception.hh>
diff --git a/paludis/portage_dep_lexer.hh b/paludis/portage_dep_lexer.hh
index 44d104c..bfc94a1 100644
--- a/paludis/portage_dep_lexer.hh
+++ b/paludis/portage_dep_lexer.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_LEXER_HH
-#define PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_LEXER_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_E_DEP_LEXER_HH
+#define PALUDIS_GUARD_PALUDIS_E_DEP_LEXER_HH 1
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
diff --git a/paludis/portage_dep_parser-fwd.hh b/paludis/portage_dep_parser-fwd.hh
index dc44afd..e9c04b0 100644
--- a/paludis/portage_dep_parser-fwd.hh
+++ b/paludis/portage_dep_parser-fwd.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_PARSER_FWD_HH
-#define PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_PARSER_FWD_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_E_DEP_PARSER_FWD_HH
+#define PALUDIS_GUARD_PALUDIS_E_DEP_PARSER_FWD_HH 1
#include <iosfwd>
#include <paludis/util/attributes.hh>
diff --git a/paludis/portage_dep_parser.hh b/paludis/portage_dep_parser.hh
index f693c69..4214d90 100644
--- a/paludis/portage_dep_parser.hh
+++ b/paludis/portage_dep_parser.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_PARSER_HH
-#define PALUDIS_GUARD_PALUDIS_PORTAGE_DEP_PARSER_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_E_DEP_PARSER_HH
+#define PALUDIS_GUARD_PALUDIS_E_DEP_PARSER_HH 1
#include <paludis/portage_dep_parser-fwd.hh>
#include <paludis/dep_spec.hh>
diff --git a/paludis/repositories/Makefile.am b/paludis/repositories/Makefile.am
index e1f0a9d..8b7953f 100644
--- a/paludis/repositories/Makefile.am
+++ b/paludis/repositories/Makefile.am
@@ -29,25 +29,11 @@ libpaludisrepositories_la_SOURCES = \
libpaludisrepositories_la_LDFLAGS = -version-info @VERSION_LIB_CURRENT@:@VERSION_LIB_REVISION@:0
-if MONOLITHIC
-
libpaludisrepositories_la_LIBADD = \
- $(top_builddir)/paludis/repositories/virtuals/libpaludisvirtualsrepository.la \
- $(top_builddir)/paludis/repositories/portage/libpaludisportagerepository.la \
- $(top_builddir)/paludis/repositories/vdb/libpaludisvdbrepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/libpaludis.la \
@DYNAMIC_LD_LIBS@
-else
-
-libpaludisrepositories_la_LIBADD = \
- $(top_builddir)/paludis/util/libpaludisutil.la \
- $(top_builddir)/paludis/libpaludis.la \
- @DYNAMIC_LD_LIBS@
-
-endif
-
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
DEFS= \
-DSYSCONFDIR=\"$(sysconfdir)\" \
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 10f99e3..6546bce 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -62,7 +62,7 @@ namespace paludis
/**
* Implementation data for a CRANRepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
template <>
struct Implementation<CRANRepository>
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 24d3003..7303512 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = ebuild .
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
DISTCLEANFILES = \
glsa-sr.hh glsa-sr.cc \
- portage_repository_params-sr.hh portage_repository_params-sr.cc \
+ e_repository_params-sr.hh e_repository_params-sr.cc \
vdb_repository-sr.hh vdb_repository-sr.cc \
ebuild-sr.hh ebuild-sr.cc \
ebin-sr.hh ebin-sr.cc ebin-se.hh ebin-se.cc \
@@ -39,15 +39,15 @@ paludis_repositories_e_include_HEADERS = \
ebin-sr.hh \
glsa.hh \
glsa-sr.hh \
- portage_repository.hh \
- portage_repository_profile_file.hh \
- portage_repository_profile.hh \
- portage_repository_exceptions.hh \
- portage_repository_news.hh \
- portage_repository_params.hh \
- portage_repository_params-sr.hh \
- portage_repository_sets.hh \
- portage_repository_entries.hh \
+ e_repository.hh \
+ e_repository_profile_file.hh \
+ e_repository_profile.hh \
+ e_repository_exceptions.hh \
+ e_repository_news.hh \
+ e_repository_params.hh \
+ e_repository_params-sr.hh \
+ e_repository_sets.hh \
+ e_repository_entries.hh \
ebuild_entries.hh \
ebin_entries.hh \
ebuild_flat_metadata_cache.hh \
@@ -73,18 +73,18 @@ libpaludiserepository_la_SOURCES = \
ebuild.cc \
ebin.cc \
glsa.cc \
- portage_repository.cc \
- portage_repository_profile_file.cc \
- portage_repository_profile.cc \
- portage_repository_exceptions.cc \
- portage_repository_news.cc \
- portage_repository_sets.cc \
- portage_repository_entries.cc \
+ e_repository.cc \
+ e_repository_profile_file.cc \
+ e_repository_profile.cc \
+ e_repository_exceptions.cc \
+ e_repository_news.cc \
+ e_repository_sets.cc \
+ e_repository_entries.cc \
ebuild_entries.cc \
ebin_entries.cc \
ebuild_flat_metadata_cache.cc \
eclass_mtimes.cc \
- portage_repository_params.cc \
+ e_repository_params.cc \
make_ebuild_repository.cc \
make_ebin_repository.cc \
use_desc.cc \
@@ -109,9 +109,9 @@ libpaludiserepository_la_LIBADD = \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
-portage_repository_TEST_SOURCES = portage_repository_TEST.cc
+e_repository_TEST_SOURCES = e_repository_TEST.cc
-portage_repository_TEST_LDADD = \
+e_repository_TEST_LDADD = \
libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -120,7 +120,7 @@ portage_repository_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-portage_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+e_repository_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
vdb_unmerger_TEST_SOURCES = vdb_unmerger_TEST.cc
@@ -135,9 +135,9 @@ vdb_unmerger_TEST_LDADD = \
vdb_unmerger_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
-portage_repository_sets_TEST_SOURCES = portage_repository_sets_TEST.cc
+e_repository_sets_TEST_SOURCES = e_repository_sets_TEST.cc
-portage_repository_sets_TEST_LDADD = \
+e_repository_sets_TEST_LDADD = \
libpaludiserepository.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(top_builddir)/paludis/util/test_extras.o \
@@ -147,7 +147,7 @@ portage_repository_sets_TEST_LDADD = \
$(top_builddir)/test/libtest.a \
$(DYNAMIC_LD_LIBS)
-portage_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
+e_repository_sets_TEST_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)
EXTRA_DIST = \
ebuild.sr \
@@ -162,15 +162,15 @@ EXTRA_DIST = \
glsa.sr \
glsa-sr.hh \
glsa-sr.cc \
- portage_repository_TEST.cc \
- portage_repository_TEST_setup.sh \
- portage_repository_TEST_cleanup.sh \
- portage_repository_params-sr.hh \
- portage_repository_params-sr.cc \
- portage_repository_params.sr \
- portage_repository_sets_TEST.cc \
- portage_repository_sets_TEST_setup.sh \
- portage_repository_sets_TEST_cleanup.sh \
+ e_repository_TEST.cc \
+ e_repository_TEST_setup.sh \
+ e_repository_TEST_cleanup.sh \
+ e_repository_params-sr.hh \
+ e_repository_params-sr.cc \
+ e_repository_params.sr \
+ e_repository_sets_TEST.cc \
+ e_repository_sets_TEST_setup.sh \
+ e_repository_sets_TEST_cleanup.sh \
xml_things_TEST.cc \
xml_things_TEST_setup.sh \
xml_things_TEST_cleanup.sh \
@@ -191,8 +191,8 @@ EXTRA_DIST = \
vdb_unmerger_TEST_cleanup.sh
BUILT_SOURCES = \
- portage_repository_params-sr.hh \
- portage_repository_params-sr.cc \
+ e_repository_params-sr.hh \
+ e_repository_params-sr.cc \
glsa-sr.hh \
glsa-sr.cc \
vdb_repository-sr.hh \
@@ -209,10 +209,10 @@ BUILT_SOURCES = \
vdb_unmerger-sr.cc
check_SCRIPTS = \
- portage_repository_TEST_setup.sh portage_repository_TEST_cleanup.sh \
+ e_repository_TEST_setup.sh e_repository_TEST_cleanup.sh \
xml_things_TEST_setup.sh xml_things_TEST_cleanup.sh \
vdb_repository_TEST_setup.sh vdb_repository_TEST_cleanup.sh \
- portage_repository_sets_TEST_setup.sh portage_repository_sets_TEST_cleanup.sh
+ e_repository_sets_TEST_setup.sh e_repository_sets_TEST_cleanup.sh
TESTS_ENVIRONMENT = env \
PALUDIS_EBUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)/paludis/repositories/e/ebuild/`" \
@@ -226,11 +226,11 @@ TESTS_ENVIRONMENT = env \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
bash $(top_srcdir)/test/run_test.sh
-portage_repository_params-sr.hh : portage_repository_params.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/portage_repository_params.sr > $@
+e_repository_params-sr.hh : e_repository_params.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/e_repository_params.sr > $@
-portage_repository_params-sr.cc : portage_repository_params.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/portage_repository_params.sr > $@
+e_repository_params-sr.cc : e_repository_params.sr $(top_srcdir)/misc/make_sr.bash
+ $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/e_repository_params.sr > $@
vdb_merger-sr.hh : vdb_merger.sr $(top_srcdir)/misc/make_sr.bash
$(top_srcdir)/misc/make_sr.bash --header $(srcdir)/vdb_merger.sr > $@
@@ -301,7 +301,7 @@ xml_things_TEST_LDADD = \
endif
-TESTS = portage_repository_TEST vdb_unmerger_TEST $(GLSA_TESTS) portage_repository_sets_TEST
+TESTS = e_repository_TEST vdb_unmerger_TEST $(GLSA_TESTS) e_repository_sets_TEST
check_PROGRAMS = $(TESTS)
built-sources : $(BUILT_SOURCES)
diff --git a/paludis/repositories/e/portage_repository.cc b/paludis/repositories/e/e_repository.cc
index 3604d21..d2280ff 100644
--- a/paludis/repositories/e/portage_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -20,12 +20,12 @@
#include "config.h"
-#include <paludis/repositories/e/portage_repository.hh>
-#include <paludis/repositories/e/portage_repository_profile.hh>
-#include <paludis/repositories/e/portage_repository_news.hh>
-#include <paludis/repositories/e/portage_repository_sets.hh>
-#include <paludis/repositories/e/portage_repository_exceptions.hh>
-#include <paludis/repositories/e/portage_repository_entries.hh>
+#include <paludis/repositories/e/e_repository.hh>
+#include <paludis/repositories/e/e_repository_profile.hh>
+#include <paludis/repositories/e/e_repository_news.hh>
+#include <paludis/repositories/e/e_repository_sets.hh>
+#include <paludis/repositories/e/e_repository_exceptions.hh>
+#include <paludis/repositories/e/e_repository_entries.hh>
#include <paludis/repositories/e/use_desc.hh>
#include <paludis/repositories/e/layout.hh>
#include <paludis/repository_info.hh>
@@ -65,9 +65,9 @@
#include <ctype.h>
/** \file
- * Implementation of PortageRepository.
+ * Implementation of ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
using namespace paludis;
@@ -75,20 +75,20 @@ using namespace paludis;
typedef MakeHashedMap<QualifiedPackageName, std::list<tr1::shared_ptr<const PackageDepSpec> > >::Type RepositoryMaskMap;
typedef MakeHashedMultiMap<std::string, std::string>::Type MirrorMap;
typedef MakeHashedMap<QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> >::Type VirtualsMap;
-typedef std::list<RepositoryPortageInterface::ProfilesDescLine> ProfilesDesc;
+typedef std::list<RepositoryEInterface::ProfilesDescLine> ProfilesDesc;
namespace paludis
{
/**
- * Implementation data for a PortageRepository.
+ * Implementation data for a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
template <>
- struct Implementation<PortageRepository>
+ struct Implementation<ERepository>
{
- PortageRepository * const repo;
- const PortageRepositoryParams params;
+ ERepository * const repo;
+ const ERepositoryParams params;
tr1::shared_ptr<RepositoryNameCache> names_cache;
@@ -107,29 +107,29 @@ namespace paludis
mutable ProfilesDesc profiles_desc;
mutable std::list<tr1::shared_ptr<UseDesc> > use_desc;
- mutable tr1::shared_ptr<PortageRepositoryProfile> profile_ptr;
- mutable tr1::shared_ptr<PortageRepositoryNews> news_ptr;
- mutable tr1::shared_ptr<PortageRepositorySets> sets_ptr;
- mutable tr1::shared_ptr<PortageRepositoryEntries> entries_ptr;
+ mutable tr1::shared_ptr<ERepositoryProfile> profile_ptr;
+ mutable tr1::shared_ptr<ERepositoryNews> news_ptr;
+ mutable tr1::shared_ptr<ERepositorySets> sets_ptr;
+ mutable tr1::shared_ptr<ERepositoryEntries> entries_ptr;
mutable tr1::shared_ptr<Layout> layout;
- Implementation(PortageRepository * const, const PortageRepositoryParams &);
+ Implementation(ERepository * const, const ERepositoryParams &);
~Implementation();
void need_profiles() const;
void need_profiles_desc() const;
};
- Implementation<PortageRepository>::Implementation(PortageRepository * const r,
- const PortageRepositoryParams & p) :
+ Implementation<ERepository>::Implementation(ERepository * const r,
+ const ERepositoryParams & p) :
repo(r),
params(p),
names_cache(new RepositoryNameCache(p.names_cache, r)),
has_repo_mask(false),
has_mirrors(false),
has_profiles_desc(false),
- sets_ptr(new PortageRepositorySets(params.environment, r, p)),
- entries_ptr(PortageRepositoryEntriesMaker::get_instance()->find_maker(
+ sets_ptr(new ERepositorySets(params.environment, r, p)),
+ entries_ptr(ERepositoryEntriesMaker::get_instance()->find_maker(
params.entry_format)(params.environment, r, p)),
layout(LayoutMaker::get_instance()->find_maker(
params.layout)(r, params.location, entries_ptr, params.master_repository ?
@@ -138,23 +138,23 @@ namespace paludis
{
}
- Implementation<PortageRepository>::~Implementation()
+ Implementation<ERepository>::~Implementation()
{
}
void
- Implementation<PortageRepository>::need_profiles() const
+ Implementation<ERepository>::need_profiles() const
{
if (profile_ptr)
return;
- profile_ptr.reset(new PortageRepositoryProfile(
+ profile_ptr.reset(new ERepositoryProfile(
params.environment, repo, repo->name(), *params.profiles,
EAPIData::get_instance()->eapi_from_string(params.eapi_when_unknown)->supported->ebuild_options->want_arch_var));
}
void
- Implementation<PortageRepository>::need_profiles_desc() const
+ Implementation<ERepository>::need_profiles_desc() const
{
if (has_profiles_desc)
return;
@@ -182,11 +182,11 @@ namespace paludis
FSEntryCollection::Concrete profiles;
profiles.push_back(layout->profiles_base_dir() / tokens.at(1));
- profiles_desc.push_back(RepositoryPortageInterface::ProfilesDescLine::create()
+ profiles_desc.push_back(RepositoryEInterface::ProfilesDescLine::create()
.arch(tokens.at(0))
.path(*profiles.begin())
.status(tokens.at(2))
- .profile(tr1::shared_ptr<PortageRepositoryProfile>(new PortageRepositoryProfile(
+ .profile(tr1::shared_ptr<ERepositoryProfile>(new ERepositoryProfile(
params.environment, repo, repo->name(), profiles,
EAPIData::get_instance()->eapi_from_string(
params.eapi_when_unknown)->supported->ebuild_options->want_arch_var))));
@@ -194,7 +194,7 @@ namespace paludis
}
if (! found_one)
- throw PortageRepositoryConfigurationError("No profiles.desc found");
+ throw ERepositoryConfigurationError("No profiles.desc found");
has_profiles_desc = true;
}
@@ -238,7 +238,7 @@ namespace
}
}
-PortageRepository::PortageRepository(const PortageRepositoryParams & p) :
+ERepository::ERepository(const ERepositoryParams & p) :
Repository(fetch_repo_name(p.location),
RepositoryCapabilities::create()
.mask_interface(this)
@@ -258,11 +258,11 @@ PortageRepository::PortageRepository(const PortageRepositoryParams & p) :
.destination_interface(p.enable_destinations ? this : 0)
.licenses_interface(this)
.make_virtuals_interface(0)
- .portage_interface(this)
+ .e_interface(this)
.pretend_interface(this)
.hook_interface(this),
p.entry_format),
- PrivateImplementationPattern<PortageRepository>(new Implementation<PortageRepository>(this, p))
+ PrivateImplementationPattern<ERepository>(new Implementation<ERepository>(this, p))
{
// the info_vars and info_pkgs info is only added on demand, since it's
// fairly slow to calculate.
@@ -295,42 +295,42 @@ PortageRepository::PortageRepository(const PortageRepositoryParams & p) :
_info->add_section(config_info);
}
-PortageRepository::~PortageRepository()
+ERepository::~ERepository()
{
}
bool
-PortageRepository::do_has_category_named(const CategoryNamePart & c) const
+ERepository::do_has_category_named(const CategoryNamePart & c) const
{
return _imp->layout->has_category_named(c);
}
bool
-PortageRepository::do_has_package_named(const QualifiedPackageName & q) const
+ERepository::do_has_package_named(const QualifiedPackageName & q) const
{
return _imp->layout->has_package_named(q);
}
tr1::shared_ptr<const CategoryNamePartCollection>
-PortageRepository::do_category_names() const
+ERepository::do_category_names() const
{
return _imp->layout->category_names();
}
tr1::shared_ptr<const QualifiedPackageNameCollection>
-PortageRepository::do_package_names(const CategoryNamePart & c) const
+ERepository::do_package_names(const CategoryNamePart & c) const
{
return _imp->layout->package_names(c);
}
tr1::shared_ptr<const PackageIDSequence>
-PortageRepository::do_package_ids(const QualifiedPackageName & n) const
+ERepository::do_package_ids(const QualifiedPackageName & n) const
{
return _imp->layout->package_ids(n);
}
bool
-PortageRepository::do_query_repository_masks(const PackageID & id) const
+ERepository::do_query_repository_masks(const PackageID & id) const
{
if (! _imp->has_repo_mask)
{
@@ -384,21 +384,21 @@ PortageRepository::do_query_repository_masks(const PackageID & id) const
}
bool
-PortageRepository::do_query_profile_masks(const PackageID & id) const
+ERepository::do_query_profile_masks(const PackageID & id) const
{
_imp->need_profiles();
return _imp->profile_ptr->profile_masked(id);
}
UseFlagState
-PortageRepository::do_query_use(const UseFlagName & f, const PackageID & e) const
+ERepository::do_query_use(const UseFlagName & f, const PackageID & e) const
{
_imp->need_profiles();
return _imp->profile_ptr->use_state_ignoring_masks(f, e);
}
bool
-PortageRepository::do_query_use_mask(const UseFlagName & u, const PackageID & e) const
+ERepository::do_query_use_mask(const UseFlagName & u, const PackageID & e) const
{
_imp->need_profiles();
return _imp->profile_ptr->use_masked(u, e) ||
@@ -406,14 +406,14 @@ PortageRepository::do_query_use_mask(const UseFlagName & u, const PackageID & e)
}
bool
-PortageRepository::do_query_use_force(const UseFlagName & u, const PackageID & e) const
+ERepository::do_query_use_force(const UseFlagName & u, const PackageID & e) const
{
_imp->need_profiles();
return _imp->profile_ptr->use_forced(u, e);
}
tr1::shared_ptr<const UseFlagNameCollection>
-PortageRepository::do_arch_flags() const
+ERepository::do_arch_flags() const
{
if (! _imp->arch_flags)
{
@@ -444,7 +444,7 @@ PortageRepository::do_arch_flags() const
}
tr1::shared_ptr<FSEntry>
-PortageRepository::do_license_exists(const std::string & license) const
+ERepository::do_license_exists(const std::string & license) const
{
tr1::shared_ptr<FSEntry> p;
@@ -463,7 +463,7 @@ PortageRepository::do_license_exists(const std::string & license) const
}
void
-PortageRepository::need_mirrors() const
+ERepository::need_mirrors() const
{
if (! _imp->has_mirrors)
{
@@ -507,7 +507,7 @@ PortageRepository::need_mirrors() const
}
void
-PortageRepository::do_install(const tr1::shared_ptr<const PackageID> & id,
+ERepository::do_install(const tr1::shared_ptr<const PackageID> & id,
const InstallOptions & o) const
{
_imp->need_profiles();
@@ -515,14 +515,14 @@ PortageRepository::do_install(const tr1::shared_ptr<const PackageID> & id,
}
bool
-PortageRepository::do_pretend(const tr1::shared_ptr<const PackageID> & id) const
+ERepository::do_pretend(const tr1::shared_ptr<const PackageID> & id) const
{
_imp->need_profiles();
return _imp->entries_ptr->pretend(id, _imp->profile_ptr);
}
tr1::shared_ptr<SetSpecTree::ConstItem>
-PortageRepository::do_package_set(const SetName & s) const
+ERepository::do_package_set(const SetName & s) const
{
if (s.data() == "system")
{
@@ -534,13 +534,13 @@ PortageRepository::do_package_set(const SetName & s) const
}
tr1::shared_ptr<const SetNameCollection>
-PortageRepository::sets_list() const
+ERepository::sets_list() const
{
return _imp->sets_ptr->sets_list();
}
bool
-PortageRepository::do_sync() const
+ERepository::do_sync() const
{
Context context("When syncing repository '" + stringify(name()) + "':");
@@ -579,28 +579,28 @@ PortageRepository::do_sync() const
}
void
-PortageRepository::invalidate()
+ERepository::invalidate()
{
- _imp.reset(new Implementation<PortageRepository>(this, _imp->params));
+ _imp.reset(new Implementation<ERepository>(this, _imp->params));
}
void
-PortageRepository::update_news() const
+ERepository::update_news() const
{
if (! _imp->news_ptr)
- _imp->news_ptr.reset(new PortageRepositoryNews(_imp->params.environment, this, _imp->params));
+ _imp->news_ptr.reset(new ERepositoryNews(_imp->params.environment, this, _imp->params));
_imp->news_ptr->update_news();
}
const tr1::shared_ptr<const Layout>
-PortageRepository::layout() const
+ERepository::layout() const
{
return _imp->layout;
}
std::string
-PortageRepository::get_environment_variable(
+ERepository::get_environment_variable(
const tr1::shared_ptr<const PackageID> & for_package,
const std::string & var) const
{
@@ -613,7 +613,7 @@ PortageRepository::get_environment_variable(
}
tr1::shared_ptr<const RepositoryInfo>
-PortageRepository::info(bool verbose) const
+ERepository::info(bool verbose) const
{
tr1::shared_ptr<const RepositoryInfo> result_non_verbose(Repository::info(verbose));
if (! verbose)
@@ -692,29 +692,29 @@ PortageRepository::info(bool verbose) const
}
std::string
-PortageRepository::profile_variable(const std::string & s) const
+ERepository::profile_variable(const std::string & s) const
{
_imp->need_profiles();
return _imp->profile_ptr->environment_variable(s);
}
-PortageRepository::MirrorsIterator
-PortageRepository::begin_mirrors(const std::string & s) const
+ERepository::MirrorsIterator
+ERepository::begin_mirrors(const std::string & s) const
{
need_mirrors();
return MirrorsIterator(_imp->mirrors.equal_range(s).first);
}
-PortageRepository::MirrorsIterator
-PortageRepository::end_mirrors(const std::string & s) const
+ERepository::MirrorsIterator
+ERepository::end_mirrors(const std::string & s) const
{
need_mirrors();
return MirrorsIterator(_imp->mirrors.equal_range(s).second);
}
-tr1::shared_ptr<const PortageRepository::VirtualsSequence>
-PortageRepository::virtual_packages() const
+tr1::shared_ptr<const ERepository::VirtualsSequence>
+ERepository::virtual_packages() const
{
Context context("When loading virtual packages for repository '" +
stringify(name()) + "'");
@@ -723,7 +723,7 @@ PortageRepository::virtual_packages() const
tr1::shared_ptr<VirtualsSequence> result(new VirtualsSequence::Concrete);
- for (PortageRepositoryProfile::VirtualsIterator i(_imp->profile_ptr->begin_virtuals()),
+ for (ERepositoryProfile::VirtualsIterator i(_imp->profile_ptr->begin_virtuals()),
i_end(_imp->profile_ptr->end_virtuals()) ; i != i_end ; ++i)
result->push_back(RepositoryVirtualsEntry::create()
.provided_by_spec(i->second)
@@ -733,12 +733,12 @@ PortageRepository::virtual_packages() const
}
tr1::shared_ptr<const UseFlagNameCollection>
-PortageRepository::do_use_expand_flags() const
+ERepository::do_use_expand_flags() const
{
_imp->need_profiles();
tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
- for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
+ for (ERepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
std::list<std::string> values;
@@ -757,12 +757,12 @@ PortageRepository::do_use_expand_flags() const
}
tr1::shared_ptr<const UseFlagNameCollection>
-PortageRepository::do_use_expand_prefixes() const
+ERepository::do_use_expand_prefixes() const
{
_imp->need_profiles();
tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
- for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
+ for (ERepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand()),
i_end(_imp->profile_ptr->end_use_expand()) ; i != i_end ; ++i)
{
std::string lower_i;
@@ -774,12 +774,12 @@ PortageRepository::do_use_expand_prefixes() const
}
tr1::shared_ptr<const UseFlagNameCollection>
-PortageRepository::do_use_expand_hidden_prefixes() const
+ERepository::do_use_expand_hidden_prefixes() const
{
_imp->need_profiles();
tr1::shared_ptr<UseFlagNameCollection> result(new UseFlagNameCollection::Concrete);
- for (PortageRepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand_hidden()),
+ for (ERepositoryProfile::UseExpandIterator i(_imp->profile_ptr->begin_use_expand_hidden()),
i_end(_imp->profile_ptr->end_use_expand_hidden()) ; i != i_end ; ++i)
{
std::string lower_i;
@@ -791,13 +791,13 @@ PortageRepository::do_use_expand_hidden_prefixes() const
}
void
-PortageRepository::regenerate_cache() const
+ERepository::regenerate_cache() const
{
_imp->names_cache->regenerate_cache();
}
tr1::shared_ptr<const CategoryNamePartCollection>
-PortageRepository::do_category_names_containing_package(const PackageNamePart & p) const
+ERepository::do_category_names_containing_package(const PackageNamePart & p) const
{
if (! _imp->names_cache->usable())
return Repository::do_category_names_containing_package(p);
@@ -808,22 +808,22 @@ PortageRepository::do_category_names_containing_package(const PackageNamePart &
return result ? result : Repository::do_category_names_containing_package(p);
}
-PortageRepository::ProfilesIterator
-PortageRepository::begin_profiles() const
+ERepository::ProfilesIterator
+ERepository::begin_profiles() const
{
_imp->need_profiles_desc();
return ProfilesIterator(_imp->profiles_desc.begin());
}
-PortageRepository::ProfilesIterator
-PortageRepository::end_profiles() const
+ERepository::ProfilesIterator
+ERepository::end_profiles() const
{
_imp->need_profiles_desc();
return ProfilesIterator(_imp->profiles_desc.end());
}
-PortageRepository::ProfilesIterator
-PortageRepository::find_profile(const FSEntry & location) const
+ERepository::ProfilesIterator
+ERepository::find_profile(const FSEntry & location) const
{
_imp->need_profiles_desc();
for (ProfilesDesc::const_iterator i(_imp->profiles_desc.begin()),
@@ -834,7 +834,7 @@ PortageRepository::find_profile(const FSEntry & location) const
}
void
-PortageRepository::set_profile(const ProfilesIterator & iter)
+ERepository::set_profile(const ProfilesIterator & iter)
{
Context context("When setting profile by iterator:");
@@ -847,7 +847,7 @@ PortageRepository::set_profile(const ProfilesIterator & iter)
}
void
-PortageRepository::set_profile_by_arch(const UseFlagName & arch)
+ERepository::set_profile_by_arch(const UseFlagName & arch)
{
Context context("When setting profile by arch '" + stringify(arch) + "':");
@@ -869,7 +869,7 @@ PortageRepository::set_profile_by_arch(const UseFlagName & arch)
}
std::string
-PortageRepository::do_describe_use_flag(const UseFlagName & f,
+ERepository::do_describe_use_flag(const UseFlagName & f,
const PackageID & e) const
{
if (_imp->use_desc.empty())
@@ -891,39 +891,39 @@ PortageRepository::do_describe_use_flag(const UseFlagName & f,
return result;
}
-const PortageRepositoryParams &
-PortageRepository::params() const
+const ERepositoryParams &
+ERepository::params() const
{
return _imp->params;
}
bool
-PortageRepository::is_suitable_destination_for(const PackageID & e) const
+ERepository::is_suitable_destination_for(const PackageID & e) const
{
std::string f(e.repository()->format());
return f == "ebuild" || f == "ebin";
}
bool
-PortageRepository::is_default_destination() const
+ERepository::is_default_destination() const
{
return false;
}
bool
-PortageRepository::want_pre_post_phases() const
+ERepository::want_pre_post_phases() const
{
return false;
}
void
-PortageRepository::merge(const MergeOptions & o)
+ERepository::merge(const MergeOptions & o)
{
_imp->entries_ptr->merge(o);
}
HookResult
-PortageRepository::perform_hook(const Hook & hook) const
+ERepository::perform_hook(const Hook & hook) const
{
Context context("When performing hook '" + stringify(hook.name()) + "' for repository '"
+ stringify(name()) + "':");
diff --git a/paludis/repositories/e/portage_repository.hh b/paludis/repositories/e/e_repository.hh
index 89eb92d..352efc9 100644
--- a/paludis/repositories/e/portage_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -17,38 +17,38 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_PORTAGE_REPOSITORY_HH
-#define PALUDIS_GUARD_PALUDIS_PORTAGE_REPOSITORY_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_E_REPOSITORY_HH
+#define PALUDIS_GUARD_PALUDIS_E_REPOSITORY_HH 1
#include <paludis/repository.hh>
#include <paludis/package_database.hh>
#include <paludis/util/fs_entry.hh>
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/tr1_memory.hh>
-#include <paludis/repositories/e/portage_repository_params.hh>
-#include <paludis/repositories/e/portage_repository_profile.hh>
+#include <paludis/repositories/e/e_repository_params.hh>
+#include <paludis/repositories/e/e_repository_profile.hh>
#include <paludis/repositories/e/layout.hh>
#include <string>
/** \file
- * Declaration for the PortageRepository class.
+ * Declaration for the ERepository class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
- class PortageRepositoryProfile;
- class PortageRepositoryNews;
+ class ERepositoryProfile;
+ class ERepositoryNews;
/**
- * A PortageRepository is a Repository that handles the layout used by
+ * A ERepository is a Repository that handles the layout used by
* Portage for the main Gentoo tree.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE PortageRepository :
+ class PALUDIS_VISIBLE ERepository :
public Repository,
public RepositoryMaskInterface,
public RepositoryUseInterface,
@@ -60,11 +60,11 @@ namespace paludis
public RepositoryVirtualsInterface,
public RepositoryDestinationInterface,
public RepositoryLicensesInterface,
- public RepositoryPortageInterface,
+ public RepositoryEInterface,
public RepositoryHookInterface,
public RepositoryPretendInterface,
- public tr1::enable_shared_from_this<PortageRepository>,
- private PrivateImplementationPattern<PortageRepository>
+ public tr1::enable_shared_from_this<ERepository>,
+ private PrivateImplementationPattern<ERepository>
{
private:
void need_mirrors() const;
@@ -164,12 +164,12 @@ namespace paludis
/**
* Constructor.
*/
- PortageRepository(const PortageRepositoryParams &);
+ ERepository(const ERepositoryParams &);
/**
* Destructor.
*/
- ~PortageRepository();
+ ~ERepository();
virtual void invalidate();
@@ -201,12 +201,12 @@ namespace paludis
///\}
- ///\name Information about PortageRepository
+ ///\name Information about ERepository
///\{
std::string profile_variable(const std::string &) const;
- const PortageRepositoryParams & params() const;
+ const ERepositoryParams & params() const;
///\}
diff --git a/paludis/repositories/e/portage_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index 88d4ff4..e3bae46 100644
--- a/paludis/repositories/e/portage_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/make_ebuild_repository.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/environments/test/test_environment.hh>
@@ -38,19 +38,19 @@ using namespace test;
using namespace paludis;
/** \file
- * Test cases for PortageRepository.
+ * Test cases for ERepository.
*
*/
namespace test_cases
{
/**
- * \test Test PortageRepository repository names.
+ * \test Test ERepository repository names.
*
*/
- struct PortageRepositoryRepoNameTest : TestCase
+ struct ERepositoryRepoNameTest : TestCase
{
- PortageRepositoryRepoNameTest() : TestCase("repo name") { }
+ ERepositoryRepoNameTest() : TestCase("repo name") { }
void run()
{
@@ -59,21 +59,21 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "test-repo-1");
}
- } test_portage_repository_repo_name;
+ } test_e_repository_repo_name;
/**
- * \test Test PortageRepository repository with no names.
+ * \test Test ERepository repository with no names.
*
*/
- struct PortageRepositoryNoRepoNameTest : TestCase
+ struct ERepositoryNoRepoNameTest : TestCase
{
- PortageRepositoryNoRepoNameTest() : TestCase("no repo name") { }
+ ERepositoryNoRepoNameTest() : TestCase("no repo name") { }
void run()
{
@@ -82,21 +82,21 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo2");
- keys->insert("profiles", "portage_repository_TEST_dir/repo2/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo2");
+ keys->insert("profiles", "e_repository_TEST_dir/repo2/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo2");
}
- } test_portage_repository_no_repo_name;
+ } test_e_repository_no_repo_name;
/**
- * \test Test PortageRepository repository empty names.
+ * \test Test ERepository repository empty names.
*
*/
- struct PortageRepositoryEmptyRepoNameTest : TestCase
+ struct ERepositoryEmptyRepoNameTest : TestCase
{
- PortageRepositoryEmptyRepoNameTest() : TestCase("empty repo name") { }
+ ERepositoryEmptyRepoNameTest() : TestCase("empty repo name") { }
void run()
{
@@ -105,21 +105,21 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo3");
- keys->insert("profiles", "portage_repository_TEST_dir/repo3/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo3");
+ keys->insert("profiles", "e_repository_TEST_dir/repo3/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
TEST_CHECK_STRINGIFY_EQUAL(repo->name(), "x-repo3");
}
- } test_portage_repository_empty_repo_name;
+ } test_e_repository_empty_repo_name;
/**
- * \test Test PortageRepository repository has_category_named.
+ * \test Test ERepository repository has_category_named.
*
*/
- struct PortageRepositoryHasCategoryNamedTest : TestCase
+ struct ERepositoryHasCategoryNamedTest : TestCase
{
- PortageRepositoryHasCategoryNamedTest() : TestCase("has category named") { }
+ ERepositoryHasCategoryNamedTest() : TestCase("has category named") { }
void run()
{
@@ -128,9 +128,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -143,15 +143,15 @@ namespace test_cases
TEST_CHECK(! repo->has_category_named(CategoryNamePart("cat-four")));
}
}
- } test_portage_repository_has_category_named;
+ } test_e_repository_has_category_named;
/**
- * \test Test PortageRepository category_names.
+ * \test Test ERepository category_names.
*
*/
- struct PortageRepositoryCategoryNamesTest : TestCase
+ struct ERepositoryCategoryNamesTest : TestCase
{
- PortageRepositoryCategoryNamesTest() : TestCase("category names") { }
+ ERepositoryCategoryNamesTest() : TestCase("category names") { }
void run()
{
@@ -160,9 +160,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -177,15 +177,15 @@ namespace test_cases
TEST_CHECK_EQUAL(3, std::distance(c->begin(), c->end()));
}
}
- } test_portage_repository_category_names;
+ } test_e_repository_category_names;
/**
- * \test Test PortageRepository has_package_named.
+ * \test Test ERepository has_package_named.
*
*/
- struct PortageRepositoryHasPackageNamedTest : TestCase
+ struct ERepositoryHasPackageNamedTest : TestCase
{
- PortageRepositoryHasPackageNamedTest() : TestCase("has package named") { }
+ ERepositoryHasPackageNamedTest() : TestCase("has package named") { }
void run()
{
@@ -194,9 +194,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo4");
- keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo4");
+ keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -217,15 +217,15 @@ namespace test_cases
TEST_CHECK(! repo->has_package_named(QualifiedPackageName("cat-three/pkg-neither")));
}
}
- } test_portage_repository_has_package_named;
+ } test_e_repository_has_package_named;
/**
- * \test Test PortageRepository has_package_named cached.
+ * \test Test ERepository has_package_named cached.
*
*/
- struct PortageRepositoryHasPackageNamedCachedTest : TestCase
+ struct ERepositoryHasPackageNamedCachedTest : TestCase
{
- PortageRepositoryHasPackageNamedCachedTest() : TestCase("has package named cached") { }
+ ERepositoryHasPackageNamedCachedTest() : TestCase("has package named cached") { }
void run()
{
@@ -234,9 +234,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo4");
- keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo4");
+ keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
repo->package_names(CategoryNamePart("cat-one"));
@@ -261,15 +261,15 @@ namespace test_cases
TEST_CHECK(! repo->has_package_named(QualifiedPackageName("cat-three/pkg-neither")));
}
}
- } test_portage_repository_has_package_named_cached;
+ } test_e_repository_has_package_named_cached;
/**
- * \test Test PortageRepository package_names.
+ * \test Test ERepository package_names.
*
*/
- struct PortageRepositoryPackageNamesTest : TestCase
+ struct ERepositoryPackageNamesTest : TestCase
{
- PortageRepositoryPackageNamesTest() : TestCase("package names") { }
+ ERepositoryPackageNamesTest() : TestCase("package names") { }
void run()
{
@@ -278,9 +278,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo4");
- keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo4");
+ keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
tr1::shared_ptr<const QualifiedPackageNameCollection> names;
@@ -314,15 +314,15 @@ namespace test_cases
TEST_CHECK_EQUAL(0, std::distance(names->begin(), names->end()));
}
}
- } test_portage_repository_package_names;
+ } test_e_repository_package_names;
/**
- * \test Test PortageRepository bad package names.
+ * \test Test ERepository bad package names.
*
*/
- struct PortageRepositoryBadPackageNamesTest : TestCase
+ struct ERepositoryBadPackageNamesTest : TestCase
{
- PortageRepositoryBadPackageNamesTest() : TestCase("bad package names") { }
+ ERepositoryBadPackageNamesTest() : TestCase("bad package names") { }
void run()
{
@@ -331,9 +331,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo5");
- keys->insert("profiles", "portage_repository_TEST_dir/repo5/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo5");
+ keys->insert("profiles", "e_repository_TEST_dir/repo5/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
tr1::shared_ptr<const QualifiedPackageNameCollection> names;
@@ -348,11 +348,11 @@ namespace test_cases
TEST_CHECK_EQUAL(1, std::distance(names->begin(), names->end()));
}
}
- } test_portage_repository_bad_package_names;
+ } test_e_repository_bad_package_names;
- struct PortageRepositoryPackageIDTest : TestCase
+ struct ERepositoryPackageIDTest : TestCase
{
- PortageRepositoryPackageIDTest() : TestCase("package_ids") { }
+ ERepositoryPackageIDTest() : TestCase("package_ids") { }
void run()
{
@@ -363,9 +363,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo4");
- keys->insert("profiles", "portage_repository_TEST_dir/repo4/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo4");
+ keys->insert("profiles", "e_repository_TEST_dir/repo4/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -392,15 +392,15 @@ namespace test_cases
TEST_CHECK_EQUAL(0, std::distance(versions->begin(), versions->end()));
}
}
- } test_portage_repository_versions;
+ } test_e_repository_versions;
/**
- * \test Test PortageRepository duff versions.
+ * \test Test ERepository duff versions.
*
*/
- struct PortageRepositoryDuffVersionsTest : TestCase
+ struct ERepositoryDuffVersionsTest : TestCase
{
- PortageRepositoryDuffVersionsTest() : TestCase("duff versions") { }
+ ERepositoryDuffVersionsTest() : TestCase("duff versions") { }
void run()
{
@@ -411,9 +411,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo8");
- keys->insert("profiles", "portage_repository_TEST_dir/repo8/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_TEST_dir/repo8");
+ keys->insert("profiles", "e_repository_TEST_dir/repo8/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -440,15 +440,15 @@ namespace test_cases
TEST_CHECK_EQUAL(0, std::distance(versions->begin(), versions->end()));
}
}
- } test_portage_repository_duff_versions;
+ } test_e_repository_duff_versions;
/**
- * \test Test PortageRepository cached metadata.
+ * \test Test ERepository cached metadata.
*
*/
- struct PortageRepositoryMetadataCachedTest : TestCase
+ struct ERepositoryMetadataCachedTest : TestCase
{
- PortageRepositoryMetadataCachedTest() : TestCase("metadata cached") { }
+ ERepositoryMetadataCachedTest() : TestCase("metadata cached") { }
void run()
{
@@ -457,9 +457,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo6");
- keys->insert("profiles", "portage_repository_TEST_dir/repo6/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(&env, keys));
+ keys->insert("location", "e_repository_TEST_dir/repo6");
+ keys->insert("profiles", "e_repository_TEST_dir/repo6/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -472,15 +472,15 @@ namespace test_cases
TEST_CHECK_EQUAL(id->short_description_key()->value(), "the-description");
}
}
- } test_portage_repository_metadata_cached;
+ } test_e_repository_metadata_cached;
/**
- * \test Test PortageRepository uncached metadata.
+ * \test Test ERepository uncached metadata.
*
*/
- struct PortageRepositoryMetadataUncachedTest : TestCase
+ struct ERepositoryMetadataUncachedTest : TestCase
{
- PortageRepositoryMetadataUncachedTest() : TestCase("metadata uncached") { }
+ ERepositoryMetadataUncachedTest() : TestCase("metadata uncached") { }
bool skip() const
{
@@ -498,10 +498,10 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("write_cache", "portage_repository_TEST_dir/repo7/metadata/cache");
- keys->insert("location", "portage_repository_TEST_dir/repo7");
- keys->insert("profiles", "portage_repository_TEST_dir/repo7/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(&env, keys));
+ keys->insert("write_cache", "e_repository_TEST_dir/repo7/metadata/cache");
+ keys->insert("location", "e_repository_TEST_dir/repo7");
+ keys->insert("profiles", "e_repository_TEST_dir/repo7/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 3 ; ++pass)
@@ -542,15 +542,15 @@ namespace test_cases
}
}
}
- } test_portage_repository_metadata_uncached;
+ } test_e_repository_metadata_uncached;
/**
- * \test Test PortageRepository unparsable metadata.
+ * \test Test ERepository unparsable metadata.
*
*/
- struct PortageRepositoryMetadataUnparsableTest : TestCase
+ struct ERepositoryMetadataUnparsableTest : TestCase
{
- PortageRepositoryMetadataUnparsableTest() : TestCase("metadata unparsable") { }
+ ERepositoryMetadataUnparsableTest() : TestCase("metadata unparsable") { }
bool skip() const
{
@@ -564,9 +564,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo7");
- keys->insert("profiles", "portage_repository_TEST_dir/repo7/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository( &env, keys));
+ keys->insert("location", "e_repository_TEST_dir/repo7");
+ keys->insert("profiles", "e_repository_TEST_dir/repo7/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository( &env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -581,15 +581,15 @@ namespace test_cases
TEST_CHECK(! id1->short_description_key());
}
}
- } test_portage_repository_metadata_unparsable;
+ } test_e_repository_metadata_unparsable;
/**
- * \test Test PortageRepository query_use and query_use_mask functions.
+ * \test Test ERepository query_use and query_use_mask functions.
*
*/
- struct PortageRepositoryQueryUseTest : TestCase
+ struct ERepositoryQueryUseTest : TestCase
{
- PortageRepositoryQueryUseTest() : TestCase("USE query") { }
+ ERepositoryQueryUseTest() : TestCase("USE query") { }
void run()
{
@@ -598,9 +598,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_TEST_dir/repo9");
- keys->insert("profiles", "portage_repository_TEST_dir/repo9/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(&env, keys));
+ keys->insert("location", "e_repository_TEST_dir/repo9");
+ keys->insert("profiles", "e_repository_TEST_dir/repo9/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -625,15 +625,15 @@ namespace test_cases
TEST_CHECK(repo->query_use(UseFlagName("flag5"), *p1) == use_unspecified);
}
}
- } test_portage_repository_query_use;
+ } test_e_repository_query_use;
/**
- * \test Test PortageRepository query_profile_masks functions.
+ * \test Test ERepository query_profile_masks functions.
*
*/
- struct PortageRepositoryQueryProfileMasksTest : TestCase
+ struct ERepositoryQueryProfileMasksTest : TestCase
{
- PortageRepositoryQueryProfileMasksTest() : TestCase("profiles package.mask") { }
+ ERepositoryQueryProfileMasksTest() : TestCase("profiles package.mask") { }
void run()
{
@@ -642,9 +642,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
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");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(&env, keys));
+ keys->insert("location", "e_repository_TEST_dir/repo10");
+ keys->insert("profiles", "e_repository_TEST_dir/repo10/profiles/profile/subprofile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
for (int pass = 1 ; pass <= 2 ; ++pass)
@@ -659,6 +659,6 @@ namespace test_cases
"=cat/was_masked-0", pds_pm_unspecific)), qo_require_exactly_one)->begin()));
}
}
- } test_portage_repository_query_profile_masks;
+ } test_e_repository_query_profile_masks;
}
diff --git a/paludis/repositories/e/e_repository_TEST_cleanup.sh b/paludis/repositories/e/e_repository_TEST_cleanup.sh
new file mode 100755
index 0000000..3fcc1aa
--- /dev/null
+++ b/paludis/repositories/e/e_repository_TEST_cleanup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# vim: set ft=sh sw=4 sts=4 et :
+
+if [ -d e_repository_TEST_dir ] ; then
+ rm -fr e_repository_TEST_dir
+else
+ true
+fi
+
+
diff --git a/paludis/repositories/e/portage_repository_TEST_setup.sh b/paludis/repositories/e/e_repository_TEST_setup.sh
index 3c5f5f3..8b10040 100755
--- a/paludis/repositories/e/portage_repository_TEST_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_setup.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
-mkdir portage_repository_TEST_dir || exit 1
-cd portage_repository_TEST_dir || exit 1
+mkdir e_repository_TEST_dir || exit 1
+cd e_repository_TEST_dir || exit 1
mkdir -p repo1/{eclass,distfiles,profiles/profile} || exit 1
cd repo1 || exit 1
diff --git a/paludis/repositories/e/portage_repository_entries.cc b/paludis/repositories/e/e_repository_entries.cc
index a5c76a4..8a6fb1d 100644
--- a/paludis/repositories/e/portage_repository_entries.cc
+++ b/paludis/repositories/e/e_repository_entries.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "portage_repository_entries.hh"
+#include "e_repository_entries.hh"
#include "ebuild_entries.hh"
#include "ebin_entries.hh"
#include <paludis/util/virtual_constructor-impl.hh>
@@ -26,22 +26,22 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
- const PortageRepositoryParams &),
- virtual_constructor_not_found::ThrowException<NoSuchPortageRepositoryEntriesType> >;
+ tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
+ const ERepositoryParams &),
+ virtual_constructor_not_found::ThrowException<NoSuchERepositoryEntriesType> >;
-template class InstantiationPolicy<PortageRepositoryEntriesMaker, instantiation_method::SingletonTag>;
+template class InstantiationPolicy<ERepositoryEntriesMaker, instantiation_method::SingletonTag>;
-PortageRepositoryEntries::~PortageRepositoryEntries()
+ERepositoryEntries::~ERepositoryEntries()
{
}
-NoSuchPortageRepositoryEntriesType::NoSuchPortageRepositoryEntriesType(const std::string & format) throw ():
- ConfigurationError("No available maker for Portage repository entries type '" + format + "'")
+NoSuchERepositoryEntriesType::NoSuchERepositoryEntriesType(const std::string & format) throw ():
+ ConfigurationError("No available maker for E Repository entries type '" + format + "'")
{
}
-PortageRepositoryEntriesMaker::PortageRepositoryEntriesMaker()
+ERepositoryEntriesMaker::ERepositoryEntriesMaker()
{
register_maker("ebuild", &EbuildEntries::make_ebuild_entries);
#if 0
diff --git a/paludis/repositories/e/portage_repository_entries.hh b/paludis/repositories/e/e_repository_entries.hh
index 3440461..b49b890 100644
--- a/paludis/repositories/e/portage_repository_entries.hh
+++ b/paludis/repositories/e/e_repository_entries.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_METADATA_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_METADATA_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_METADATA_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_METADATA_HH 1
#include <paludis/name-fwd.hh>
#include <paludis/repository-fwd.hh>
@@ -26,34 +26,34 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/util/virtual_constructor.hh>
-#include <paludis/repositories/e/portage_repository_profile.hh>
-#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/e_repository_profile.hh>
+#include <paludis/repositories/e/e_repository_params.hh>
#include <string>
/** \file
- * Declaration for the PortageRepositoryEntries class.
+ * Declaration for the ERepositoryEntries class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
- class PortageRepository;
+ class ERepository;
class Environment;
/**
- * Handle entries (for example, ebuilds) in a PortageRepository.
+ * Handle entries (for example, ebuilds) in a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE PortageRepositoryEntries
+ class PALUDIS_VISIBLE ERepositoryEntries
{
public:
///\name Basic operations
///\{
- virtual ~PortageRepositoryEntries() = 0;
+ virtual ~ERepositoryEntries() = 0;
///\}
@@ -74,19 +74,19 @@ namespace paludis
* Fetch an environment variable.
*/
virtual std::string get_environment_variable(const tr1::shared_ptr<const PackageID> &, const std::string & var,
- tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle an install.
*/
virtual void install(const tr1::shared_ptr<const PackageID> &, const InstallOptions &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a pretend.
*/
virtual bool pretend(const tr1::shared_ptr<const PackageID> &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const = 0;
+ tr1::shared_ptr<const ERepositoryProfile>) const = 0;
/**
* Handle a merge.
@@ -101,31 +101,31 @@ namespace paludis
* \ingroup grprepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE NoSuchPortageRepositoryEntriesType : public ConfigurationError
+ class PALUDIS_VISIBLE NoSuchERepositoryEntriesType : public ConfigurationError
{
public:
/**
* Constructor.
*/
- NoSuchPortageRepositoryEntriesType(const std::string & format) throw ();
+ NoSuchERepositoryEntriesType(const std::string & format) throw ();
};
/**
- * Virtual constructor for PortageRepositoryEntries.
+ * Virtual constructor for ERepositoryEntries.
*
* \ingroup grprepository
*/
- class PALUDIS_VISIBLE PortageRepositoryEntriesMaker :
+ class PALUDIS_VISIBLE ERepositoryEntriesMaker :
public VirtualConstructor<std::string,
- tr1::shared_ptr<PortageRepositoryEntries> (*) (const Environment * const, PortageRepository * const,
- const PortageRepositoryParams &),
- virtual_constructor_not_found::ThrowException<NoSuchPortageRepositoryEntriesType> >,
- public InstantiationPolicy<PortageRepositoryEntriesMaker, instantiation_method::SingletonTag>
+ tr1::shared_ptr<ERepositoryEntries> (*) (const Environment * const, ERepository * const,
+ const ERepositoryParams &),
+ virtual_constructor_not_found::ThrowException<NoSuchERepositoryEntriesType> >,
+ public InstantiationPolicy<ERepositoryEntriesMaker, instantiation_method::SingletonTag>
{
- friend class InstantiationPolicy<PortageRepositoryEntriesMaker, instantiation_method::SingletonTag>;
+ friend class InstantiationPolicy<ERepositoryEntriesMaker, instantiation_method::SingletonTag>;
private:
- PortageRepositoryEntriesMaker();
+ ERepositoryEntriesMaker();
};
}
diff --git a/paludis/repositories/e/portage_repository_exceptions.cc b/paludis/repositories/e/e_repository_exceptions.cc
index f8e1186..11f18af 100644
--- a/paludis/repositories/e/portage_repository_exceptions.cc
+++ b/paludis/repositories/e/e_repository_exceptions.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2005, 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
@@ -17,13 +17,13 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "portage_repository_exceptions.hh"
+#include "e_repository_exceptions.hh"
using namespace paludis;
-PortageRepositoryConfigurationError::PortageRepositoryConfigurationError(
+ERepositoryConfigurationError::ERepositoryConfigurationError(
const std::string & msg) throw () :
- ConfigurationError("Portage repository configuration error: " + msg)
+ ConfigurationError("E Repository configuration error: " + msg)
{
}
diff --git a/paludis/repositories/e/portage_repository_exceptions.hh b/paludis/repositories/e/e_repository_exceptions.hh
index 945182e..c2d1b18 100644
--- a/paludis/repositories/e/portage_repository_exceptions.hh
+++ b/paludis/repositories/e/e_repository_exceptions.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2005, 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
@@ -17,34 +17,34 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EXCEPTIONS_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EXCEPTIONS_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_EXCEPTIONS_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_EXCEPTIONS_HH 1
#include <paludis/util/exception.hh>
/** \file
- * Declaration for the PortageRepository exception classes.
+ * Declaration for the ERepository exception classes.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
/**
* Thrown if invalid parameters are provided for
- * PortageRepository::make_portage_repository.
+ * ERepository::make_e_repository.
*
* \ingroup grpexceptions
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
- class PALUDIS_VISIBLE PortageRepositoryConfigurationError :
+ class PALUDIS_VISIBLE ERepositoryConfigurationError :
public ConfigurationError
{
public:
/**
* Constructor.
*/
- PortageRepositoryConfigurationError(const std::string & msg) throw ();
+ ERepositoryConfigurationError(const std::string & msg) throw ();
};
diff --git a/paludis/repositories/e/portage_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index a5a22ba..c0ab375 100644
--- a/paludis/repositories/e/portage_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/portage_repository.hh>
-#include <paludis/repositories/e/portage_repository_news.hh>
+#include <paludis/repositories/e/e_repository.hh>
+#include <paludis/repositories/e/e_repository_news.hh>
#include <paludis/config_file.hh>
#include <paludis/environment.hh>
@@ -40,50 +40,50 @@ using namespace paludis;
namespace paludis
{
/**
- * Implementation data for PortageRepositoryNews.
+ * Implementation data for ERepositoryNews.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
template<>
- struct Implementation<PortageRepositoryNews>
+ struct Implementation<ERepositoryNews>
{
const Environment * const environment;
- const PortageRepository * const portage_repository;
- const PortageRepositoryParams params;
+ const ERepository * const e_repository;
+ const ERepositoryParams params;
const FSEntry skip_file;
const FSEntry unread_file;
- Implementation(const Environment * const e, const PortageRepository * const p,
- const PortageRepositoryParams & k) :
+ Implementation(const Environment * const e, const ERepository * const p,
+ const ERepositoryParams & k) :
environment(e),
- portage_repository(p),
+ e_repository(p),
params(k),
skip_file(e->root() / "var" / "lib" / "paludis" / "news" /
- ("news-" + stringify(portage_repository->name()) + ".skip")),
+ ("news-" + stringify(e_repository->name()) + ".skip")),
unread_file(e->root() / "var" / "lib" / "paludis" / "news" /
- ("news-" + stringify(portage_repository->name()) + ".unread"))
+ ("news-" + stringify(e_repository->name()) + ".unread"))
{
}
};
}
-PortageRepositoryNews::PortageRepositoryNews(const Environment * const e, const PortageRepository * const p,
- const PortageRepositoryParams & k) :
- PrivateImplementationPattern<PortageRepositoryNews>(new Implementation<PortageRepositoryNews>(e, p, k))
+ERepositoryNews::ERepositoryNews(const Environment * const e, const ERepository * const p,
+ const ERepositoryParams & k) :
+ PrivateImplementationPattern<ERepositoryNews>(new Implementation<ERepositoryNews>(e, p, k))
{
}
-PortageRepositoryNews::~PortageRepositoryNews()
+ERepositoryNews::~ERepositoryNews()
{
}
void
-PortageRepositoryNews::update_news() const
+ERepositoryNews::update_news() const
{
Context context("When updating news at location '" +
stringify(_imp->params.newsdir) + "' for repository '" +
- stringify(_imp->portage_repository->name()) + "':");
+ stringify(_imp->e_repository->name()) + "':");
if (! _imp->params.newsdir.is_directory_or_symlink_to_directory())
return;
@@ -102,10 +102,10 @@ PortageRepositoryNews::update_news() const
{
Context local_context("When handling news entry '" + stringify(*d) + "':");
- if (0 == stringify(_imp->portage_repository->name()).compare(0, 2, "x-"))
+ if (0 == stringify(_imp->e_repository->name()).compare(0, 2, "x-"))
{
Log::get_instance()->message(ll_warning, lc_context, "Cannot enable GLEP 42 news items for repository '"
- + stringify(_imp->portage_repository->name()) + "' because it is using a generated repository name");
+ + stringify(_imp->e_repository->name()) + "' because it is using a generated repository name");
return;
}
@@ -140,7 +140,7 @@ PortageRepositoryNews::update_news() const
bool local_show(false);
for (NewsFile::DisplayIfKeywordIterator i(news.begin_display_if_keyword()),
i_end(news.end_display_if_keyword()) ; i != i_end && ! local_show ; ++i)
- if (*i == _imp->portage_repository->profile_variable("ARCH"))
+ if (*i == _imp->e_repository->profile_variable("ARCH"))
local_show = true;
show &= local_show;
}
diff --git a/paludis/repositories/e/portage_repository_news.hh b/paludis/repositories/e/e_repository_news.hh
index 447c692..6abeb2e 100644
--- a/paludis/repositories/e/portage_repository_news.hh
+++ b/paludis/repositories/e/e_repository_news.hh
@@ -17,42 +17,42 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_NEWS_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_NEWS_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_NEWS_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_NEWS_HH 1
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
#include <paludis/config_file.hh>
/** \file
- * Declaration for the PortageRepositoryNews class.
+ * Declaration for the ERepositoryNews class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
class Environment;
class FSEntry;
- class PortageRepository;
+ class ERepository;
/**
- * Holds the news/ data for a PortageRepository instance.
+ * Holds the news/ data for a ERepository instance.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE PortageRepositoryNews :
- private PrivateImplementationPattern<PortageRepositoryNews>,
- private InstantiationPolicy<PortageRepositoryNews, instantiation_method::NonCopyableTag>
+ class PALUDIS_VISIBLE ERepositoryNews :
+ private PrivateImplementationPattern<ERepositoryNews>,
+ private InstantiationPolicy<ERepositoryNews, instantiation_method::NonCopyableTag>
{
public:
///\name Basic operations
///\{
- PortageRepositoryNews(const Environment * const, const PortageRepository * const,
- const PortageRepositoryParams &);
- ~PortageRepositoryNews();
+ ERepositoryNews(const Environment * const, const ERepository * const,
+ const ERepositoryParams &);
+ ~ERepositoryNews();
///\}
diff --git a/paludis/repositories/e/e_repository_params.cc b/paludis/repositories/e/e_repository_params.cc
new file mode 100644
index 0000000..769290f
--- /dev/null
+++ b/paludis/repositories/e/e_repository_params.cc
@@ -0,0 +1,8 @@
+/* vim: set sw=4 sts=4 et foldmethod=syntax : */
+
+#include "e_repository_params.hh"
+
+using namespace paludis;
+
+#include <paludis/repositories/e/e_repository_params-sr.cc>
+
diff --git a/paludis/repositories/e/portage_repository_params.hh b/paludis/repositories/e/e_repository_params.hh
index 3c37440..8d2db41 100644
--- a/paludis/repositories/e/portage_repository_params.hh
+++ b/paludis/repositories/e/e_repository_params.hh
@@ -17,26 +17,26 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PARAMS_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PARAMS_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PARAMS_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PARAMS_HH 1
#include <paludis/util/fs_entry.hh>
#include <paludis/util/collection.hh>
#include <paludis/util/sr.hh>
/** \file
- * Declaration for the PortageRepositoryParams class.
+ * Declaration for the ERepositoryParams class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
class Environment;
class PackageDatabase;
- class PortageRepository;
+ class ERepository;
-#include <paludis/repositories/e/portage_repository_params-sr.hh>
+#include <paludis/repositories/e/e_repository_params-sr.hh>
}
diff --git a/paludis/repositories/e/portage_repository_params.sr b/paludis/repositories/e/e_repository_params.sr
index 3e90450..b1fd33a 100644
--- a/paludis/repositories/e/portage_repository_params.sr
+++ b/paludis/repositories/e/e_repository_params.sr
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set sw=4 sts=4 et :
-make_class_PortageRepositoryParams()
+make_class_ERepositoryParams()
{
visible
@@ -21,7 +21,7 @@ make_class_PortageRepositoryParams()
key sync std::string
key sync_options std::string
key buildroot FSEntry
- key master_repository "tr1::shared_ptr<const PortageRepository>"
+ key master_repository "tr1::shared_ptr<const ERepository>"
key enable_destinations bool
key write_bin_uri_prefix std::string
key eapi_when_unknown std::string
@@ -29,10 +29,10 @@ make_class_PortageRepositoryParams()
doxygen_comment << "END"
/**
- * Parameters used to create a PortageRepository
+ * Parameters used to create a ERepository
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
* \nosubgrouping
*/
END
diff --git a/paludis/repositories/e/portage_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index 6fc9fe2..007504c 100644
--- a/paludis/repositories/e/portage_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/portage_repository_profile.hh>
-#include <paludis/repositories/e/portage_repository_profile_file.hh>
-#include <paludis/repositories/e/portage_repository_exceptions.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository_profile.hh>
+#include <paludis/repositories/e/e_repository_profile_file.hh>
+#include <paludis/repositories/e/e_repository_exceptions.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/util/log.hh>
#include <paludis/util/tokeniser.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
@@ -81,13 +81,13 @@ namespace
namespace paludis
{
/**
- * Implementation for PortageRepositoryProfile.
+ * Implementation for ERepositoryProfile.
*
- * \ingroup grpportagerepository
- * \see PortageRepositoryProfile
+ * \ingroup grperepository
+ * \see ERepositoryProfile
*/
template<>
- class Implementation<PortageRepositoryProfile>
+ class Implementation<ERepositoryProfile>
{
private:
void load_environment();
@@ -115,7 +115,7 @@ namespace paludis
///\{
const Environment * const env;
- const PortageRepository * const repository;
+ const ERepository * const repository;
///\}
@@ -161,7 +161,7 @@ namespace paludis
///\name Basic operations
///\{
- Implementation(const Environment * const e, const PortageRepository * const p,
+ Implementation(const Environment * const e, const ERepository * const p,
const RepositoryName & name, const FSEntryCollection & dirs,
bool arch_is_special) :
env(e),
@@ -192,14 +192,14 @@ namespace paludis
}
void
-Implementation<PortageRepositoryProfile>::load_environment()
+Implementation<ERepositoryProfile>::load_environment()
{
environment_variables["CONFIG_PROTECT"] = getenv_with_default("CONFIG_PROTECT", "/etc");
environment_variables["CONFIG_PROTECT_MASK"] = getenv_with_default("CONFIG_PROTECT_MASK", "");
}
void
-Implementation<PortageRepositoryProfile>::load_profile_directory_recursively(const FSEntry & dir)
+Implementation<ERepositoryProfile>::load_profile_directory_recursively(const FSEntry & dir)
{
Context context("When adding profile directory '" + stringify(dir) + ":");
Log::get_instance()->message(ll_debug, lc_context, "Loading profile directory '" + stringify(dir) + "'");
@@ -229,7 +229,7 @@ Implementation<PortageRepositoryProfile>::load_profile_directory_recursively(con
}
void
-Implementation<PortageRepositoryProfile>::load_profile_parent(const FSEntry & dir)
+Implementation<ERepositoryProfile>::load_profile_parent(const FSEntry & dir)
{
Context context("When handling parent file for profile directory '" + stringify(dir) + ":");
@@ -274,7 +274,7 @@ Implementation<PortageRepositoryProfile>::load_profile_parent(const FSEntry & di
}
void
-Implementation<PortageRepositoryProfile>::load_profile_make_defaults(const FSEntry & dir)
+Implementation<ERepositoryProfile>::load_profile_make_defaults(const FSEntry & dir)
{
Context context("When handling make.defaults file for profile directory '" + stringify(dir) + ":");
@@ -329,7 +329,7 @@ Implementation<PortageRepositoryProfile>::load_profile_make_defaults(const FSEnt
}
void
-Implementation<PortageRepositoryProfile>::load_special_make_defaults_vars()
+Implementation<ERepositoryProfile>::load_special_make_defaults_vars()
{
try
{
@@ -368,7 +368,7 @@ Implementation<PortageRepositoryProfile>::load_special_make_defaults_vars()
}
bool
-Implementation<PortageRepositoryProfile>::is_incremental(const std::string & s) const
+Implementation<ERepositoryProfile>::is_incremental(const std::string & s) const
{
try
{
@@ -384,7 +384,7 @@ Implementation<PortageRepositoryProfile>::is_incremental(const std::string & s)
}
void
-Implementation<PortageRepositoryProfile>::make_vars_from_file_vars()
+Implementation<ERepositoryProfile>::make_vars_from_file_vars()
{
try
{
@@ -455,7 +455,7 @@ Implementation<PortageRepositoryProfile>::make_vars_from_file_vars()
}
void
-Implementation<PortageRepositoryProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap & m)
+Implementation<ERepositoryProfile>::load_basic_use_file(const FSEntry & file, FlagStatusMap & m)
{
if (! file.exists())
return;
@@ -490,7 +490,7 @@ Implementation<PortageRepositoryProfile>::load_basic_use_file(const FSEntry & fi
}
void
-Implementation<PortageRepositoryProfile>::load_spec_use_file(const FSEntry & file, PackageFlagStatusMapList & m)
+Implementation<ERepositoryProfile>::load_spec_use_file(const FSEntry & file, PackageFlagStatusMapList & m)
{
if (! file.exists())
return;
@@ -539,7 +539,7 @@ Implementation<PortageRepositoryProfile>::load_spec_use_file(const FSEntry & fil
}
void
-Implementation<PortageRepositoryProfile>::add_use_expand_to_use()
+Implementation<ERepositoryProfile>::add_use_expand_to_use()
{
Context context("When adding USE_EXPAND to USE:");
@@ -562,13 +562,13 @@ Implementation<PortageRepositoryProfile>::add_use_expand_to_use()
}
void
-Implementation<PortageRepositoryProfile>::handle_profile_arch_var()
+Implementation<ERepositoryProfile>::handle_profile_arch_var()
{
Context context("When handling profile ARCH variable:");
std::string arch_s(environment_variables["ARCH"]);
if (arch_s.empty())
- throw PortageRepositoryConfigurationError("ARCH variable is unset or empty");
+ throw ERepositoryConfigurationError("ARCH variable is unset or empty");
stacked_values_list.push_back(StackedValues("arch special values"));
try
@@ -580,25 +580,25 @@ Implementation<PortageRepositoryProfile>::handle_profile_arch_var()
}
catch (const Exception &)
{
- throw PortageRepositoryConfigurationError("ARCH variable has invalid value '" + arch_s + "'");
+ throw ERepositoryConfigurationError("ARCH variable has invalid value '" + arch_s + "'");
}
}
-PortageRepositoryProfile::PortageRepositoryProfile(
- const Environment * const env, const PortageRepository * const p, const RepositoryName & name,
+ERepositoryProfile::ERepositoryProfile(
+ const Environment * const env, const ERepository * const p, const RepositoryName & name,
const FSEntryCollection & location,
bool arch_is_special) :
- PrivateImplementationPattern<PortageRepositoryProfile>(
- new Implementation<PortageRepositoryProfile>(env, p, name, location, arch_is_special))
+ PrivateImplementationPattern<ERepositoryProfile>(
+ new Implementation<ERepositoryProfile>(env, p, name, location, arch_is_special))
{
}
-PortageRepositoryProfile::~PortageRepositoryProfile()
+ERepositoryProfile::~ERepositoryProfile()
{
}
bool
-PortageRepositoryProfile::use_masked(const UseFlagName & u,
+ERepositoryProfile::use_masked(const UseFlagName & u,
const PackageID & e) const
{
bool result(false);
@@ -625,7 +625,7 @@ PortageRepositoryProfile::use_masked(const UseFlagName & u,
}
bool
-PortageRepositoryProfile::use_forced(const UseFlagName & u, const PackageID & e) const
+ERepositoryProfile::use_forced(const UseFlagName & u, const PackageID & e) const
{
bool result(false);
for (StackedValuesList::const_iterator i(_imp->stacked_values_list.begin()),
@@ -651,7 +651,7 @@ PortageRepositoryProfile::use_forced(const UseFlagName & u, const PackageID & e)
}
UseFlagState
-PortageRepositoryProfile::use_state_ignoring_masks(const UseFlagName & u,
+ERepositoryProfile::use_state_ignoring_masks(const UseFlagName & u,
const PackageID & e) const
{
UseFlagState result(use_unspecified);
@@ -687,7 +687,7 @@ PortageRepositoryProfile::use_state_ignoring_masks(const UseFlagName & u,
}
std::string
-PortageRepositoryProfile::environment_variable(const std::string & s) const
+ERepositoryProfile::environment_variable(const std::string & s) const
{
EnvironmentVariablesMap::const_iterator i(_imp->environment_variables.find(s));
if (_imp->environment_variables.end() == i)
@@ -697,49 +697,49 @@ PortageRepositoryProfile::environment_variable(const std::string & s) const
}
tr1::shared_ptr<SetSpecTree::ConstItem>
-PortageRepositoryProfile::system_packages() const
+ERepositoryProfile::system_packages() const
{
return _imp->system_packages;
}
-PortageRepositoryProfile::UseExpandIterator
-PortageRepositoryProfile::begin_use_expand() const
+ERepositoryProfile::UseExpandIterator
+ERepositoryProfile::begin_use_expand() const
{
return UseExpandIterator(_imp->use_expand.begin());
}
-PortageRepositoryProfile::UseExpandIterator
-PortageRepositoryProfile::end_use_expand() const
+ERepositoryProfile::UseExpandIterator
+ERepositoryProfile::end_use_expand() const
{
return UseExpandIterator(_imp->use_expand.end());
}
-PortageRepositoryProfile::UseExpandIterator
-PortageRepositoryProfile::begin_use_expand_hidden() const
+ERepositoryProfile::UseExpandIterator
+ERepositoryProfile::begin_use_expand_hidden() const
{
return UseExpandIterator(_imp->use_expand_hidden.begin());
}
-PortageRepositoryProfile::UseExpandIterator
-PortageRepositoryProfile::end_use_expand_hidden() const
+ERepositoryProfile::UseExpandIterator
+ERepositoryProfile::end_use_expand_hidden() const
{
return UseExpandIterator(_imp->use_expand_hidden.end());
}
-PortageRepositoryProfile::VirtualsIterator
-PortageRepositoryProfile::begin_virtuals() const
+ERepositoryProfile::VirtualsIterator
+ERepositoryProfile::begin_virtuals() const
{
return VirtualsIterator(_imp->virtuals.begin());
}
-PortageRepositoryProfile::VirtualsIterator
-PortageRepositoryProfile::end_virtuals() const
+ERepositoryProfile::VirtualsIterator
+ERepositoryProfile::end_virtuals() const
{
return VirtualsIterator(_imp->virtuals.end());
}
bool
-PortageRepositoryProfile::profile_masked(const PackageID & id) const
+ERepositoryProfile::profile_masked(const PackageID & id) const
{
PackageMaskMap::const_iterator rr(_imp->package_mask.find(id.name()));
if (_imp->package_mask.end() == rr)
diff --git a/paludis/repositories/e/portage_repository_profile.hh b/paludis/repositories/e/e_repository_profile.hh
index 33b2601..165400a 100644
--- a/paludis/repositories/e/portage_repository_profile.hh
+++ b/paludis/repositories/e/e_repository_profile.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PROFILE_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PROFILE_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PROFILE_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PROFILE_HH 1
#include <paludis/dep_spec-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -32,37 +32,37 @@
#include <string>
/** \file
- * Declaration for the PortageRepositoryProfile class.
+ * Declaration for the ERepositoryProfile class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
class Environment;
- class PortageRepository;
+ class ERepository;
/**
* Holds the profile data (but <em>not</em> the profiles/ top level data) for
- * a PortageRepository instance.
+ * a ERepository instance.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE PortageRepositoryProfile :
- private PrivateImplementationPattern<PortageRepositoryProfile>,
- private InstantiationPolicy<PortageRepositoryProfile, instantiation_method::NonCopyableTag>
+ class PALUDIS_VISIBLE ERepositoryProfile :
+ private PrivateImplementationPattern<ERepositoryProfile>,
+ private InstantiationPolicy<ERepositoryProfile, instantiation_method::NonCopyableTag>
{
public:
///\name Basic operations
///\{
- PortageRepositoryProfile(const Environment * const env,
- const PortageRepository * const,
+ ERepositoryProfile(const Environment * const env,
+ const ERepository * const,
const RepositoryName & name,
const FSEntryCollection & location,
bool arch_is_special);
- ~PortageRepositoryProfile();
+ ~ERepositoryProfile();
///\}
@@ -83,7 +83,7 @@ namespace paludis
///\name Iterate over USE_EXPAND, USE_EXPAND_HIDDEN
///\{
- typedef libwrapiter::ForwardIterator<PortageRepositoryProfile, const UseFlagName> UseExpandIterator;
+ typedef libwrapiter::ForwardIterator<ERepositoryProfile, const UseFlagName> UseExpandIterator;
UseExpandIterator begin_use_expand() const;
UseExpandIterator end_use_expand() const;
@@ -117,7 +117,7 @@ namespace paludis
///\name Virtuals
///\{
- typedef libwrapiter::ForwardIterator<PortageRepositoryProfile,
+ typedef libwrapiter::ForwardIterator<ERepositoryProfile,
const std::pair<const QualifiedPackageName, tr1::shared_ptr<const PackageDepSpec> > > VirtualsIterator;
VirtualsIterator begin_virtuals() const;
diff --git a/paludis/repositories/e/portage_repository_profile_file.cc b/paludis/repositories/e/e_repository_profile_file.cc
index 4bcb4ad..071d938 100644
--- a/paludis/repositories/e/portage_repository_profile_file.cc
+++ b/paludis/repositories/e/e_repository_profile_file.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "portage_repository_profile_file.hh"
+#include "e_repository_profile_file.hh"
#include <paludis/util/log.hh>
#include <paludis/util/stringify.hh>
#include <paludis/config_file.hh>
diff --git a/paludis/repositories/e/portage_repository_profile_file.hh b/paludis/repositories/e/e_repository_profile_file.hh
index 9aa9437..5e9e7a3 100644
--- a/paludis/repositories/e/portage_repository_profile_file.hh
+++ b/paludis/repositories/e/e_repository_profile_file.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PROFILE_FILE_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_PROFILE_FILE_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PROFILE_FILE_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_PROFILE_FILE_HH 1
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/attributes.hh>
@@ -28,11 +28,11 @@
namespace paludis
{
/**
- * A file in a PortageRepository profile.
+ * A file in a ERepository profile.
*
* Handles -lines, comments, inherits automatically.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
class PALUDIS_VISIBLE ProfileFile :
private PrivateImplementationPattern<ProfileFile>
diff --git a/paludis/repositories/e/portage_repository_sets.cc b/paludis/repositories/e/e_repository_sets.cc
index 898c324..35db9d5 100644
--- a/paludis/repositories/e/portage_repository_sets.cc
+++ b/paludis/repositories/e/e_repository_sets.cc
@@ -18,8 +18,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/portage_repository.hh>
-#include <paludis/repositories/e/portage_repository_sets.hh>
+#include <paludis/repositories/e/e_repository.hh>
+#include <paludis/repositories/e/e_repository_sets.hh>
#include <paludis/repositories/e/glsa.hh>
#include <paludis/environment.hh>
@@ -53,50 +53,50 @@ using namespace paludis;
namespace paludis
{
/**
- * Implementation data for PortageRepositorySets.
+ * Implementation data for ERepositorySets.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
template<>
- struct Implementation<PortageRepositorySets>
+ struct Implementation<ERepositorySets>
{
const Environment * const environment;
- const PortageRepository * const portage_repository;
- const PortageRepositoryParams params;
+ const ERepository * const e_repository;
+ const ERepositoryParams params;
- Implementation(const Environment * const e, const PortageRepository * const p,
- const PortageRepositoryParams & k) :
+ Implementation(const Environment * const e, const ERepository * const p,
+ const ERepositoryParams & k) :
environment(e),
- portage_repository(p),
+ e_repository(p),
params(k)
{
}
};
}
-PortageRepositorySets::PortageRepositorySets(const Environment * const e, const PortageRepository * const p,
- const PortageRepositoryParams & k) :
- PrivateImplementationPattern<PortageRepositorySets>(new Implementation<PortageRepositorySets>(e, p, k))
+ERepositorySets::ERepositorySets(const Environment * const e, const ERepository * const p,
+ const ERepositoryParams & k) :
+ PrivateImplementationPattern<ERepositorySets>(new Implementation<ERepositorySets>(e, p, k))
{
}
-PortageRepositorySets::~PortageRepositorySets()
+ERepositorySets::~ERepositorySets()
{
}
tr1::shared_ptr<SetSpecTree::ConstItem>
-PortageRepositorySets::package_set(const SetName & s) const
+ERepositorySets::package_set(const SetName & s) const
{
if ("system" == s.data())
- throw InternalError(PALUDIS_HERE, "system set should've been handled by PortageRepository");
+ throw InternalError(PALUDIS_HERE, "system set should've been handled by ERepository");
else if ("security" == s.data())
return security_set(false);
else if ("insecurity" == s.data())
return security_set(true);
else if ((_imp->params.setsdir / (stringify(s) + ".conf")).exists())
{
- tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(_imp->portage_repository->name())));
+ tr1::shared_ptr<GeneralSetDepTag> tag(new GeneralSetDepTag(s, stringify(_imp->e_repository->name())));
FSEntry ff(_imp->params.setsdir / (stringify(s) + ".conf"));
Context context("When loading package set '" + stringify(s) + "' from '" + stringify(ff) + "':");
@@ -116,7 +116,7 @@ PortageRepositorySets::package_set(const SetName & s) const
}
tr1::shared_ptr<const SetNameCollection>
-PortageRepositorySets::sets_list() const
+ERepositorySets::sets_list() const
{
Context context("While generating the list of sets:");
@@ -217,7 +217,7 @@ namespace
}
tr1::shared_ptr<SetSpecTree::ConstItem>
-PortageRepositorySets::security_set(bool insecurity) const
+ERepositorySets::security_set(bool insecurity) const
{
Context context("When building security or insecurity package set:");
tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > security_packages(
diff --git a/paludis/repositories/e/portage_repository_sets.hh b/paludis/repositories/e/e_repository_sets.hh
index bdf4b65..e5c9fbd 100644
--- a/paludis/repositories/e/portage_repository_sets.hh
+++ b/paludis/repositories/e/e_repository_sets.hh
@@ -18,40 +18,40 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_SETS_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_SETS_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_SETS_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_SETS_HH 1
#include <paludis/dep_spec-fwd.hh>
#include <paludis/repository-fwd.hh>
/** \file
- * Declaration for the PortageRepositorySets class.
+ * Declaration for the ERepositorySets class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
class Environment;
- class PortageRepository;
+ class ERepository;
/**
- * Holds the information about sets, except system, for a PortageRepository.
+ * Holds the information about sets, except system, for a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE PortageRepositorySets :
- private PrivateImplementationPattern<PortageRepositorySets>,
- private InstantiationPolicy<PortageRepositorySets, instantiation_method::NonCopyableTag>
+ class PALUDIS_VISIBLE ERepositorySets :
+ private PrivateImplementationPattern<ERepositorySets>,
+ private InstantiationPolicy<ERepositorySets, instantiation_method::NonCopyableTag>
{
public:
///\name Basic operations
///\{
- PortageRepositorySets(const Environment * const env, const PortageRepository * const,
- const PortageRepositoryParams &);
- ~PortageRepositorySets();
+ ERepositorySets(const Environment * const env, const ERepository * const,
+ const ERepositoryParams &);
+ ~ERepositorySets();
///\}
diff --git a/paludis/repositories/e/portage_repository_sets_TEST.cc b/paludis/repositories/e/e_repository_sets_TEST.cc
index 07985a6..557b8f0 100644
--- a/paludis/repositories/e/portage_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/make_ebuild_repository.hh>
#include <paludis/repositories/fake/fake_installed_repository.hh>
#include <paludis/dep_spec_pretty_printer.hh>
@@ -35,19 +35,19 @@ using namespace test;
using namespace paludis;
/** \file
- * Test cases for PortageRepositorySets.
+ * Test cases for ERepositorySets.
*
*/
namespace test_cases
{
/**
- * \test Test PortageRepositorySets sets list.
+ * \test Test ERepositorySets sets list.
*
*/
- struct PortageRepositorySetsSetsListTest : TestCase
+ struct ERepositorySetsSetsListTest : TestCase
{
- PortageRepositorySetsSetsListTest() : TestCase("sets list") { }
+ ERepositorySetsSetsListTest() : TestCase("sets list") { }
void run()
{
@@ -56,9 +56,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_sets_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_sets_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
tr1::shared_ptr<const SetNameCollection> sets_list(repo->sets_interface->sets_list());
@@ -68,15 +68,15 @@ namespace test_cases
TEST_CHECK(sets_list->end() != sets_list->find(SetName("insecurity")));
TEST_CHECK(sets_list->end() != sets_list->find(SetName("set1")));
}
- } test_portage_repository_sets_sets_list;
+ } test_e_repository_sets_sets_list;
/**
- * \test Test PortageRepositorySets maintainer-defined sets.
+ * \test Test ERepositorySets maintainer-defined sets.
*
*/
- struct PortageRepositorySetsMaintainerDefinedSetsTest : TestCase
+ struct ERepositorySetsMaintainerDefinedSetsTest : TestCase
{
- PortageRepositorySetsMaintainerDefinedSetsTest() : TestCase("maintainer-defined sets") { }
+ ERepositorySetsMaintainerDefinedSetsTest() : TestCase("maintainer-defined sets") { }
void run()
{
@@ -85,9 +85,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_sets_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_sets_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
tr1::shared_ptr<FakeInstalledRepository> installed(
new FakeInstalledRepository(&env, RepositoryName("installed")));
@@ -99,16 +99,16 @@ namespace test_cases
set1->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "cat-one/foo >=cat-two/bar-2");
}
- } test_portage_repository_sets_maintainer_defined_sets_list;
+ } test_e_repository_sets_maintainer_defined_sets_list;
#if ENABLE_GLSA
/**
- * \test Test PortageRepositorySets insecurity set.
+ * \test Test ERepositorySets insecurity set.
*
*/
- struct PortageRepositorySetsInsecuritySetTest : TestCase
+ struct ERepositorySetsInsecuritySetTest : TestCase
{
- PortageRepositorySetsInsecuritySetTest() : TestCase("insecurity set") { }
+ ERepositorySetsInsecuritySetTest() : TestCase("insecurity set") { }
virtual unsigned max_run_time() const
{
@@ -122,9 +122,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_sets_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_sets_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
@@ -135,15 +135,15 @@ namespace test_cases
"=cat-two/bar-1.5.1::test-repo-1 =cat-three/baz-1.0::test-repo-1 "
"=cat-three/baz-1.1-r2::test-repo-1 =cat-three/baz-1.2::test-repo-1");
}
- } test_portage_repository_sets_insecurity_set;
+ } test_e_repository_sets_insecurity_set;
/**
- * \test Test PortageRepositorySets security set.
+ * \test Test ERepositorySets security set.
*
*/
- struct PortageRepositorySetsSecuritySetTest : TestCase
+ struct ERepositorySetsSecuritySetTest : TestCase
{
- PortageRepositorySetsSecuritySetTest() : TestCase("security set") { }
+ ERepositorySetsSecuritySetTest() : TestCase("security set") { }
virtual unsigned max_run_time() const
{
@@ -157,9 +157,9 @@ namespace test_cases
new AssociativeCollection<std::string, std::string>::Concrete);
keys->insert("format", "ebuild");
keys->insert("names_cache", "/var/empty");
- keys->insert("location", "portage_repository_sets_TEST_dir/repo1");
- keys->insert("profiles", "portage_repository_sets_TEST_dir/repo1/profiles/profile");
- tr1::shared_ptr<PortageRepository> repo(make_ebuild_repository(
+ keys->insert("location", "e_repository_sets_TEST_dir/repo1");
+ keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
+ tr1::shared_ptr<ERepository> repo(make_ebuild_repository(
&env, keys));
env.package_database()->add_repository(1, repo);
tr1::shared_ptr<FakeInstalledRepository> installed(
@@ -174,7 +174,7 @@ namespace test_cases
security->accept(pretty);
TEST_CHECK_STRINGIFY_EQUAL(pretty, "=cat-two/bar-2.0::test-repo-1 =cat-three/baz-1.3::test-repo-1");
}
- } test_portage_repository_sets_security_set;
+ } test_e_repository_sets_security_set;
#endif
}
diff --git a/paludis/repositories/e/e_repository_sets_TEST_cleanup.sh b/paludis/repositories/e/e_repository_sets_TEST_cleanup.sh
new file mode 100755
index 0000000..03e7320
--- /dev/null
+++ b/paludis/repositories/e/e_repository_sets_TEST_cleanup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# vim: set ft=sh sw=4 sts=4 et :
+
+if [ -d e_repository_sets_TEST_dir ] ; then
+ rm -fr e_repository_sets_TEST_dir
+else
+ true
+fi
+
+
diff --git a/paludis/repositories/e/portage_repository_sets_TEST_setup.sh b/paludis/repositories/e/e_repository_sets_TEST_setup.sh
index 4111994..b6167e8 100755
--- a/paludis/repositories/e/portage_repository_sets_TEST_setup.sh
+++ b/paludis/repositories/e/e_repository_sets_TEST_setup.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# vim: set ft=sh sw=4 sts=4 et :
-mkdir portage_repository_sets_TEST_dir || exit 1
-cd portage_repository_sets_TEST_dir || exit 1
+mkdir e_repository_sets_TEST_dir || exit 1
+cd e_repository_sets_TEST_dir || exit 1
mkdir -p repo1/{eclass,distfiles,profiles/profile,sets,metadata/glsa} || exit 1
cd repo1 || exit 1
diff --git a/paludis/repositories/e/eapi_phase.hh b/paludis/repositories/e/eapi_phase.hh
index 10e4a6d..09f5e39 100644
--- a/paludis/repositories/e/eapi_phase.hh
+++ b/paludis/repositories/e/eapi_phase.hh
@@ -32,7 +32,7 @@ namespace paludis
* Holds a parsed EAPI phase.
*
* \nosubgrouping
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \ingroup grpeapi
*/
class EAPIPhase :
@@ -63,7 +63,7 @@ namespace paludis
* Holds parsed EAPI phases.
*
* \nosubgrouping
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \ingroup grpeapi
*/
class EAPIPhases :
diff --git a/paludis/repositories/e/ebin.se b/paludis/repositories/e/ebin.se
index 0bfb079..9d1474e 100644
--- a/paludis/repositories/e/ebin.se
+++ b/paludis/repositories/e/ebin.se
@@ -18,7 +18,7 @@ make_enum_EbinInstallCommandPhase()
* Which phase of an EbinInstallCommand to run.
*
* \see EbinInstallCommand
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
END
}
diff --git a/paludis/repositories/e/ebin_entries.cc b/paludis/repositories/e/ebin_entries.cc
index 6994b95..0f25496 100644
--- a/paludis/repositories/e/ebin_entries.cc
+++ b/paludis/repositories/e/ebin_entries.cc
@@ -19,7 +19,7 @@
#include "ebin_entries.hh"
#include <paludis/repositories/e/ebin.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/portage_dep_parser.hh>
#include <paludis/dep_spec_flattener.hh>
@@ -50,11 +50,11 @@ namespace paludis
struct Implementation<EbinEntries>
{
const Environment * const environment;
- PortageRepository * const portage_repository;
- const PortageRepositoryParams params;
+ ERepository * const portage_repository;
+ const ERepositoryParams params;
- Implementation(const Environment * const e, PortageRepository * const p,
- const PortageRepositoryParams & k) :
+ Implementation(const Environment * const e, ERepository * const p,
+ const ERepositoryParams & k) :
environment(e),
portage_repository(p),
params(k)
@@ -64,7 +64,7 @@ namespace paludis
}
EbinEntries::EbinEntries(
- const Environment * const e, PortageRepository * const p, const PortageRepositoryParams & k) :
+ const Environment * const e, ERepository * const p, const ERepositoryParams & k) :
PrivateImplementationPattern<EbinEntries>(new Implementation<EbinEntries>(e, p, k))
{
}
@@ -129,7 +129,7 @@ namespace
void
EbinEntries::install(const tr1::shared_ptr<const PackageID> & id,
- const InstallOptions & o, tr1::shared_ptr<const PortageRepositoryProfile>) const
+ const InstallOptions & o, tr1::shared_ptr<const ERepositoryProfile>) const
{
std::string binaries, flat_bin_uri;
{
@@ -328,16 +328,16 @@ EbinEntries::install(const tr1::shared_ptr<const PackageID> & id,
tidyup_cmd();
}
-tr1::shared_ptr<PortageRepositoryEntries>
+tr1::shared_ptr<ERepositoryEntries>
EbinEntries::make_ebin_entries(
- const Environment * const e, PortageRepository * const r, const PortageRepositoryParams & p)
+ const Environment * const e, ERepository * const r, const ERepositoryParams & p)
{
- return tr1::shared_ptr<PortageRepositoryEntries>(new EbinEntries(e, r, p));
+ return tr1::shared_ptr<ERepositoryEntries>(new EbinEntries(e, r, p));
}
std::string
EbinEntries::get_environment_variable(const tr1::shared_ptr<const PackageID> & id,
- const std::string & var, tr1::shared_ptr<const PortageRepositoryProfile>) const
+ const std::string & var, tr1::shared_ptr<const ERepositoryProfile>) const
{
PackageID::Iterator i(id->find(var));
if (id->end() != i)
@@ -463,7 +463,7 @@ EbinEntries::extract_package_file_version(const QualifiedPackageName & n, const
bool
EbinEntries::pretend(const QualifiedPackageName &, const VersionSpec &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const
+ tr1::shared_ptr<const ERepositoryProfile>) const
{
return true;
}
diff --git a/paludis/repositories/e/ebin_entries.hh b/paludis/repositories/e/ebin_entries.hh
index 8a7d6d1..e9be746 100644
--- a/paludis/repositories/e/ebin_entries.hh
+++ b/paludis/repositories/e/ebin_entries.hh
@@ -20,37 +20,37 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EBIN_ENTRIES_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_EBIN_ENTRIES_HH 1
-#include <paludis/repositories/e/portage_repository_entries.hh>
-#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/e_repository_entries.hh>
+#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
namespace paludis
{
class FSEntry;
- class PortageRepository;
+ class ERepository;
/**
- * PortageRepositoryEntries handler for ebins.
+ * ERepositoryEntries handler for ebins.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
class PALUDIS_VISIBLE EbinEntries :
- public PortageRepositoryEntries,
+ public ERepositoryEntries,
private PrivateImplementationPattern<EbinEntries>
{
public:
/**
* Create an EbinEntries instance.
*/
- static tr1::shared_ptr<PortageRepositoryEntries> make_ebin_entries(const Environment * const,
- PortageRepository * const, const PortageRepositoryParams &);
+ static tr1::shared_ptr<ERepositoryEntries> make_ebin_entries(const Environment * const,
+ ERepository * const, const ERepositoryParams &);
///\name Basic operations
///\{
EbinEntries(const Environment * const,
- PortageRepository * const portage_repository,
- const PortageRepositoryParams &);
+ ERepository * const e_repository,
+ const ERepositoryParams &);
virtual ~EbinEntries();
@@ -67,13 +67,13 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string get_environment_variable(const tr1::shared_ptr<const PackageID> &, const std::string & var,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
virtual void install(const tr1::shared_ptr<const PackageID> &, const InstallOptions &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
virtual bool pretend(const tr1::shared_ptr<const PackageID> &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
virtual void merge(const MergeOptions &);
};
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index ea8484e..effc21f 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/e/ebuild.hh>
#include <paludis/repositories/e/ebuild_id.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/util/system.hh>
#include <paludis/util/strip.hh>
@@ -303,7 +303,7 @@ EbuildMetadataCommand::load(const tr1::shared_ptr<const EbuildID> & id)
if (! ((s = get(keys, id->eapi()->supported->ebuild_metadata_variables->metadata_eapi))).empty())
id->set_eapi(s);
else
- id->set_eapi(id->portage_repository()->params().eapi_when_unspecified);
+ id->set_eapi(id->e_repository()->params().eapi_when_unspecified);
if (! id->eapi()->supported)
{
diff --git a/paludis/repositories/e/ebuild.hh b/paludis/repositories/e/ebuild.hh
index 42f7975..471a934 100644
--- a/paludis/repositories/e/ebuild.hh
+++ b/paludis/repositories/e/ebuild.hh
@@ -124,7 +124,7 @@ namespace paludis
/**
* An EbuildVariableCommand is used to fetch the value of an environment
- * variable for a particular ebuild in a PortageRepository.
+ * variable for a particular ebuild in a ERepository.
*
* \ingroup grpebuildinterface
*/
@@ -161,7 +161,7 @@ namespace paludis
/**
* An EbuildFetchCommand is used to download and verify the digests for a
- * particular ebuild in a PortageRepository. On failure it throws.
+ * particular ebuild in a ERepository. On failure it throws.
*
* \ingroup grpebuildinterface
*/
@@ -187,7 +187,7 @@ namespace paludis
/**
* An EbuildInstallCommand is used to install an ebuild from a
- * PortageRepository. On failure it throws.
+ * ERepository. On failure it throws.
*
* \ingroup grpebuildinterface
*/
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 48ccff5..e19b8e6 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -19,7 +19,7 @@
#include <paludis/repositories/e/ebuild_entries.hh>
#include <paludis/repositories/e/ebuild_flat_metadata_cache.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/ebuild.hh>
#include <paludis/repositories/e/eapi_phase.hh>
#include <paludis/repositories/e/ebuild_id.hh>
@@ -59,22 +59,22 @@ namespace paludis
/**
* Implementation data for EbuildEntries.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
template<>
struct Implementation<EbuildEntries>
{
const Environment * const environment;
- PortageRepository * const portage_repository;
- const PortageRepositoryParams params;
+ ERepository * const e_repository;
+ const ERepositoryParams params;
tr1::shared_ptr<EclassMtimes> eclass_mtimes;
time_t master_mtime;
- Implementation(const Environment * const e, PortageRepository * const p,
- const PortageRepositoryParams & k) :
+ Implementation(const Environment * const e, ERepository * const p,
+ const ERepositoryParams & k) :
environment(e),
- portage_repository(p),
+ e_repository(p),
params(k),
eclass_mtimes(new EclassMtimes(k.eclassdirs)),
master_mtime(0)
@@ -87,7 +87,7 @@ namespace paludis
}
EbuildEntries::EbuildEntries(
- const Environment * const e, PortageRepository * const p, const PortageRepositoryParams & k) :
+ const Environment * const e, ERepository * const p, const ERepositoryParams & k) :
PrivateImplementationPattern<EbuildEntries>(new Implementation<EbuildEntries>(e, p, k))
{
}
@@ -103,7 +103,7 @@ EbuildEntries::make_id(const QualifiedPackageName & q, const VersionSpec & v, co
Context context("When creating ID for '" + stringify(q) + "-" + stringify(v) + "' from '" + stringify(f) + "':");
tr1::shared_ptr<EbuildID> result(new EbuildID(q, v, _imp->params.environment,
- _imp->portage_repository->shared_from_this(), f, guessed_eapi,
+ _imp->e_repository->shared_from_this(), f, guessed_eapi,
_imp->master_mtime, _imp->eclass_mtimes));
return result;
}
@@ -156,7 +156,7 @@ namespace
std::string make_use(const Environment * const env,
const PackageID & id,
- tr1::shared_ptr<const PortageRepositoryProfile> profile)
+ tr1::shared_ptr<const ERepositoryProfile> profile)
{
std::string use;
@@ -176,13 +176,13 @@ namespace
tr1::shared_ptr<AssociativeCollection<std::string, std::string> >
make_expand(const Environment * const env,
const PackageID & e,
- tr1::shared_ptr<const PortageRepositoryProfile> profile,
+ tr1::shared_ptr<const ERepositoryProfile> profile,
std::string & use)
{
tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(
new AssociativeCollection<std::string, std::string>::Concrete);
- for (PortageRepositoryProfile::UseExpandIterator x(profile->begin_use_expand()),
+ for (ERepositoryProfile::UseExpandIterator x(profile->begin_use_expand()),
x_end(profile->end_use_expand()) ; x != x_end ; ++x)
{
std::string lower_x;
@@ -231,7 +231,7 @@ namespace
void
EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
- const InstallOptions & o, tr1::shared_ptr<const PortageRepositoryProfile> p) const
+ const InstallOptions & o, tr1::shared_ptr<const ERepositoryProfile> p) const
{
using namespace tr1::placeholders;
@@ -310,7 +310,7 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
throw PackageInstallActionError("Can't install '" + stringify(*id) + "' since SRC_URI is broken");
tr1::shared_ptr<const MirrorsCollection> mirrors(_imp->params.environment->mirrors(mirror.substr(0, spos)));
- if (! _imp->portage_repository->is_mirror(mirror.substr(0, spos)) &&
+ if (! _imp->e_repository->is_mirror(mirror.substr(0, spos)) &&
mirrors->empty())
throw PackageInstallActionError("Can't install '" + stringify(*id) +
"' since SRC_URI references unknown mirror:// '" +
@@ -320,8 +320,8 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
flat_src_uri.append(*m + "/" + mirror.substr(spos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
- m(_imp->portage_repository->begin_mirrors(mirror.substr(0, spos))),
- m_end(_imp->portage_repository->end_mirrors(mirror.substr(0, spos))) ;
+ m(_imp->e_repository->begin_mirrors(mirror.substr(0, spos))),
+ m_end(_imp->e_repository->end_mirrors(mirror.substr(0, spos))) ;
m != m_end ; ++m)
flat_src_uri.append(m->second + "/" + mirror.substr(spos + 1) + " ");
}
@@ -330,8 +330,8 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
flat_src_uri.append(" ");
/* add mirror://gentoo/ entries */
- std::string master_mirror(strip_trailing_string(stringify(_imp->portage_repository->name()), "x-"));
- if (! no_mirror && _imp->portage_repository->is_mirror(master_mirror))
+ std::string master_mirror(strip_trailing_string(stringify(_imp->e_repository->name()), "x-"));
+ if (! no_mirror && _imp->e_repository->is_mirror(master_mirror))
{
tr1::shared_ptr<const MirrorsCollection> repo_mirrors(_imp->params.environment->mirrors(master_mirror));
@@ -339,8 +339,8 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
flat_src_uri.append(*m + "/" + spec->original_url().substr(pos + 1) + " ");
for (RepositoryMirrorsInterface::MirrorsIterator
- m(_imp->portage_repository->begin_mirrors(master_mirror)),
- m_end(_imp->portage_repository->end_mirrors(master_mirror)) ;
+ m(_imp->e_repository->begin_mirrors(master_mirror)),
+ m_end(_imp->e_repository->end_mirrors(master_mirror)) ;
m != m_end ; ++m)
flat_src_uri.append(m->second + "/" + spec->original_url().substr(pos + 1) + " ");
}
@@ -395,7 +395,7 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use));
- tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->portage_repository->layout()->exlibsdirs(id->name()));
+ tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
/* fetch */
{
@@ -436,9 +436,9 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
EbuildCommandParams command_params(EbuildCommandParams::create()
.environment(_imp->params.environment)
.package_id(id)
- .ebuild_dir(_imp->portage_repository->layout()->package_directory(id->name()))
- .ebuild_file(_imp->portage_repository->layout()->package_file(*id))
- .files_dir(_imp->portage_repository->layout()->package_directory(id->name()) / "files")
+ .ebuild_dir(_imp->e_repository->layout()->package_directory(id->name()))
+ .ebuild_file(_imp->e_repository->layout()->package_file(*id))
+ .files_dir(_imp->e_repository->layout()->package_directory(id->name()) / "files")
.eclassdirs(_imp->params.eclassdirs)
.exlibsdirs(exlibsdirs)
.portdir(_imp->params.master_repository ? _imp->params.master_repository->params().location :
@@ -520,9 +520,9 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
EbuildCommandParams command_params(EbuildCommandParams::create()
.environment(_imp->params.environment)
.package_id(id)
- .ebuild_dir(_imp->portage_repository->layout()->package_directory(id->name()))
- .ebuild_file(_imp->portage_repository->layout()->package_file(*id))
- .files_dir(_imp->portage_repository->layout()->package_directory(id->name()) / "files")
+ .ebuild_dir(_imp->e_repository->layout()->package_directory(id->name()))
+ .ebuild_file(_imp->e_repository->layout()->package_file(*id))
+ .files_dir(_imp->e_repository->layout()->package_directory(id->name()) / "files")
.eclassdirs(_imp->params.eclassdirs)
.exlibsdirs(exlibsdirs)
.portdir(_imp->params.master_repository ? _imp->params.master_repository->params().location :
@@ -544,8 +544,8 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
.profiles(_imp->params.profiles)
.disable_cfgpro(o.no_config_protect)
.debug_build(o.debug_build)
- .config_protect(_imp->portage_repository->profile_variable("CONFIG_PROTECT"))
- .config_protect_mask(_imp->portage_repository->profile_variable("CONFIG_PROTECT_MASK"))
+ .config_protect(_imp->e_repository->profile_variable("CONFIG_PROTECT"))
+ .config_protect_mask(_imp->e_repository->profile_variable("CONFIG_PROTECT_MASK"))
.loadsaveenv_dir(_imp->params.buildroot / stringify(id->name().category) / (
stringify(id->name().package) + "-" + stringify(id->version())) / "temp")
.slot(SlotName(id->slot())));
@@ -558,7 +558,7 @@ EbuildEntries::install(const tr1::shared_ptr<const PackageID> & id,
std::string
EbuildEntries::get_environment_variable(const tr1::shared_ptr<const PackageID> & id,
- const std::string & var, tr1::shared_ptr<const PortageRepositoryProfile>) const
+ const std::string & var, tr1::shared_ptr<const ERepositoryProfile>) const
{
EAPIPhases phases(id->eapi()->supported->ebuild_phases->ebuild_variable);
@@ -567,14 +567,14 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const PackageID> &
throw EAPIConfigurationError("EAPI '" + id->eapi()->name + "' defines "
+ (c == 0 ? "no" : stringify(c)) + " ebuild variable phases but expected exactly one");
- tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->portage_repository->layout()->exlibsdirs(id->name()));
+ tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EbuildVariableCommand cmd(EbuildCommandParams::create()
.environment(_imp->params.environment)
.package_id(id)
- .ebuild_dir(_imp->portage_repository->layout()->package_directory(id->name()))
- .ebuild_file(_imp->portage_repository->layout()->package_file(*id))
- .files_dir(_imp->portage_repository->layout()->package_directory(id->name()) / "files")
+ .ebuild_dir(_imp->e_repository->layout()->package_directory(id->name()))
+ .ebuild_file(_imp->e_repository->layout()->package_file(*id))
+ .files_dir(_imp->e_repository->layout()->package_directory(id->name()) / "files")
.eclassdirs(_imp->params.eclassdirs)
.exlibsdirs(exlibsdirs)
.portdir(_imp->params.master_repository ? _imp->params.master_repository->params().location :
@@ -594,23 +594,23 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const PackageID> &
return cmd.result();
}
-tr1::shared_ptr<PortageRepositoryEntries>
+tr1::shared_ptr<ERepositoryEntries>
EbuildEntries::make_ebuild_entries(
- const Environment * const e, PortageRepository * const r, const PortageRepositoryParams & p)
+ const Environment * const e, ERepository * const r, const ERepositoryParams & p)
{
- return tr1::shared_ptr<PortageRepositoryEntries>(new EbuildEntries(e, r, p));
+ return tr1::shared_ptr<ERepositoryEntries>(new EbuildEntries(e, r, p));
}
void
EbuildEntries::merge(const MergeOptions &)
{
- throw InternalError(PALUDIS_HERE, "Cannot merge to PortageRepository with ebuild entries");
+ throw InternalError(PALUDIS_HERE, "Cannot merge to ERepository with ebuild entries");
}
bool
EbuildEntries::is_package_file(const QualifiedPackageName & n, const FSEntry & e) const
{
- if (_imp->portage_repository->layout()->eapi_ebuild_suffix())
+ if (_imp->e_repository->layout()->eapi_ebuild_suffix())
return (0 == e.basename().compare(0, stringify(n.package).length() + 1, stringify(n.package) + "-")) &&
std::string::npos != e.basename().rfind('.') &&
e.basename().at(e.basename().length() - 1) != '~' &&
@@ -623,7 +623,7 @@ VersionSpec
EbuildEntries::extract_package_file_version(const QualifiedPackageName & n, const FSEntry & e) const
{
Context context("When extracting version from '" + stringify(e) + "':");
- if (_imp->portage_repository->layout()->eapi_ebuild_suffix())
+ if (_imp->e_repository->layout()->eapi_ebuild_suffix())
{
std::string::size_type p(e.basename().rfind('.'));
return VersionSpec(strip_leading_string(e.basename().substr(0, p), stringify(n.package) + "-"));
@@ -634,7 +634,7 @@ EbuildEntries::extract_package_file_version(const QualifiedPackageName & n, cons
bool
EbuildEntries::pretend(const tr1::shared_ptr<const PackageID> & id,
- tr1::shared_ptr<const PortageRepositoryProfile> p) const
+ tr1::shared_ptr<const ERepositoryProfile> p) const
{
using namespace tr1::placeholders;
@@ -649,7 +649,7 @@ EbuildEntries::pretend(const tr1::shared_ptr<const PackageID> & id,
tr1::shared_ptr<AssociativeCollection<std::string, std::string> > expand_vars(make_expand(
_imp->params.environment, *id, p, use));
- tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->portage_repository->layout()->exlibsdirs(id->name()));
+ tr1::shared_ptr<const FSEntryCollection> exlibsdirs(_imp->e_repository->layout()->exlibsdirs(id->name()));
EAPIPhases phases(id->eapi()->supported->ebuild_phases->ebuild_pretend);
for (EAPIPhases::Iterator phase(phases.begin_phases()), phase_end(phases.end_phases()) ;
@@ -658,9 +658,9 @@ EbuildEntries::pretend(const tr1::shared_ptr<const PackageID> & id,
EbuildCommandParams command_params(EbuildCommandParams::create()
.environment(_imp->params.environment)
.package_id(id)
- .ebuild_dir(_imp->portage_repository->layout()->package_directory(id->name()))
- .ebuild_file(_imp->portage_repository->layout()->package_file(*id))
- .files_dir(_imp->portage_repository->layout()->package_directory(id->name()) / "files")
+ .ebuild_dir(_imp->e_repository->layout()->package_directory(id->name()))
+ .ebuild_file(_imp->e_repository->layout()->package_file(*id))
+ .files_dir(_imp->e_repository->layout()->package_directory(id->name()) / "files")
.eclassdirs(_imp->params.eclassdirs)
.exlibsdirs(exlibsdirs)
.portdir(_imp->params.master_repository ? _imp->params.master_repository->params().location :
diff --git a/paludis/repositories/e/ebuild_entries.hh b/paludis/repositories/e/ebuild_entries.hh
index fc4a5f0..b6582b1 100644
--- a/paludis/repositories/e/ebuild_entries.hh
+++ b/paludis/repositories/e/ebuild_entries.hh
@@ -17,46 +17,46 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_EBUILD_METADATA_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_E_REPOSITORY_EBUILD_METADATA_HH 1
-#include <paludis/repositories/e/portage_repository_entries.hh>
-#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/e_repository_entries.hh>
+#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
/** \file
* Declaration for the EbuildEntries class.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
namespace paludis
{
class FSEntry;
- class PortageRepository;
+ class ERepository;
/**
- * PortageRepositoryEntries handler for ebuilds.
+ * ERepositoryEntries handler for ebuilds.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
class PALUDIS_VISIBLE EbuildEntries :
- public PortageRepositoryEntries,
+ public ERepositoryEntries,
private PrivateImplementationPattern<EbuildEntries>
{
public:
/**
* Create an EbuildEntries instance.
*/
- static tr1::shared_ptr<PortageRepositoryEntries> make_ebuild_entries(const Environment * const,
- PortageRepository * const, const PortageRepositoryParams &);
+ static tr1::shared_ptr<ERepositoryEntries> make_ebuild_entries(const Environment * const,
+ ERepository * const, const ERepositoryParams &);
///\name Basic operations
///\{
EbuildEntries(const Environment * const,
- PortageRepository * const portage_repository,
- const PortageRepositoryParams &);
+ ERepository * const e_repository,
+ const ERepositoryParams &);
virtual ~EbuildEntries();
@@ -75,13 +75,13 @@ namespace paludis
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::string get_environment_variable(const tr1::shared_ptr<const PackageID> &, const std::string & var,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
virtual void install(const tr1::shared_ptr<const PackageID> &, const InstallOptions &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
virtual bool pretend(const tr1::shared_ptr<const PackageID> &,
- tr1::shared_ptr<const PortageRepositoryProfile>) const;
+ tr1::shared_ptr<const ERepositoryProfile>) const;
};
}
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.hh b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
index 2d27265..c499534 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.hh
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_EBUILD_FLAT_METADATA_CACHE_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_EBUILD_FLAT_METADATA_CACHE_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_EBUILD_FLAT_METADATA_CACHE_HH 1
#include <paludis/repositories/e/ebuild.hh>
#include <paludis/repositories/e/ebuild_id.hh>
@@ -30,12 +30,12 @@ namespace paludis
namespace erepository
{
/**
- * Implements flat file metadata cache handling for a PortageRepository
+ * Implements flat file metadata cache handling for a ERepository
* using EbuildEntries.
*
* \see EbuildEntries
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class EbuildFlatMetadataCache
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 1a82e90..cb20658 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -19,8 +19,8 @@
#include <paludis/repositories/e/ebuild_id.hh>
#include <paludis/repositories/e/ebuild_flat_metadata_cache.hh>
-#include <paludis/repositories/e/portage_repository.hh>
-#include <paludis/repositories/e/portage_repository_params.hh>
+#include <paludis/repositories/e/e_repository.hh>
+#include <paludis/repositories/e/e_repository_params.hh>
#include <paludis/repositories/e/eapi_phase.hh>
#include <paludis/repositories/e/e_key.hh>
@@ -65,7 +65,7 @@ namespace paludis
const QualifiedPackageName name;
const VersionSpec version;
const Environment * const environment;
- const tr1::shared_ptr<const PortageRepository> repository;
+ const tr1::shared_ptr<const ERepository> repository;
const FSEntry ebuild;
tr1::shared_ptr<const SlotName> slot;
mutable tr1::shared_ptr<const EAPI> eapi;
@@ -89,7 +89,7 @@ namespace paludis
Implementation(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const PortageRepository> r, const FSEntry & f, const std::string & g,
+ const tr1::shared_ptr<const ERepository> r, const FSEntry & f, const std::string & g,
const time_t t, const tr1::shared_ptr<const EclassMtimes> & m) :
name(q),
version(v),
@@ -107,7 +107,7 @@ namespace paludis
EbuildID::EbuildID(const QualifiedPackageName & q, const VersionSpec & v,
const Environment * const e,
- const tr1::shared_ptr<const PortageRepository> & r,
+ const tr1::shared_ptr<const ERepository> & r,
const FSEntry & f,
const std::string & g,
const time_t t,
@@ -459,8 +459,8 @@ EbuildID::set_slot(const SlotName & s) const
_imp->slot.reset(new SlotName(s));
}
-tr1::shared_ptr<const PortageRepository>
-EbuildID::portage_repository() const
+tr1::shared_ptr<const ERepository>
+EbuildID::e_repository() const
{
return _imp->repository;
}
diff --git a/paludis/repositories/e/ebuild_id.hh b/paludis/repositories/e/ebuild_id.hh
index 04440b4..49761e6 100644
--- a/paludis/repositories/e/ebuild_id.hh
+++ b/paludis/repositories/e/ebuild_id.hh
@@ -26,7 +26,7 @@
namespace paludis
{
- class PortageRepository;
+ class ERepository;
class EclassMtimes;
namespace erepository
@@ -45,7 +45,7 @@ namespace paludis
public:
EbuildID(const QualifiedPackageName &, const VersionSpec &,
const Environment * const e,
- const tr1::shared_ptr<const PortageRepository> &,
+ const tr1::shared_ptr<const ERepository> &,
const FSEntry & file,
const std::string & guessed_eapi,
const time_t master_mtime,
@@ -89,7 +89,7 @@ namespace paludis
virtual std::size_t extra_hash_value() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual tr1::shared_ptr<const PortageRepository> portage_repository() const;
+ virtual tr1::shared_ptr<const ERepository> e_repository() const;
void set_eapi(const std::string &) const;
void set_slot(const SlotName &) const;
diff --git a/paludis/repositories/e/eclass_mtimes.hh b/paludis/repositories/e/eclass_mtimes.hh
index 4fd49c0..083f6f4 100644
--- a/paludis/repositories/e/eclass_mtimes.hh
+++ b/paludis/repositories/e/eclass_mtimes.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_ECLASS_MTIMES_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_ECLASS_MTIMES_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_ECLASS_MTIMES_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_ECLASS_MTIMES_HH 1
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/fs_entry.hh>
@@ -27,10 +27,10 @@
namespace paludis
{
/**
- * Holds an eclass mtimes cache for a PortageRepository.
+ * Holds an eclass mtimes cache for a ERepository.
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class EclassMtimes :
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 461d0c1..153fd89 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -18,9 +18,9 @@
*/
#include <paludis/repositories/e/exheres_layout.hh>
-#include <paludis/repositories/e/portage_repository_entries.hh>
-#include <paludis/repositories/e/portage_repository_exceptions.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository_entries.hh>
+#include <paludis/repositories/e/e_repository_exceptions.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/hashed_containers.hh>
#include <paludis/package_id.hh>
@@ -53,7 +53,7 @@ namespace paludis
template<>
struct Implementation<ExheresLayout>
{
- const PortageRepository * const repository;
+ const ERepository * const repository;
const FSEntry tree_root;
mutable bool has_category_names;
@@ -62,7 +62,7 @@ namespace paludis
mutable IDMap ids;
mutable tr1::shared_ptr<CategoryNamePartCollection> category_names_collection;
- tr1::shared_ptr<const PortageRepositoryEntries> entries;
+ tr1::shared_ptr<const ERepositoryEntries> entries;
tr1::shared_ptr<FSEntryCollection> arch_list_files;
tr1::shared_ptr<FSEntryCollection> repository_mask_files;
@@ -70,8 +70,8 @@ namespace paludis
tr1::shared_ptr<FSEntryCollection> mirror_files;
tr1::shared_ptr<FSEntryCollection> use_desc_dirs;
- Implementation(const PortageRepository * const n, const FSEntry & t,
- tr1::shared_ptr<const PortageRepositoryEntries> e) :
+ Implementation(const ERepository * const n, const FSEntry & t,
+ tr1::shared_ptr<const ERepositoryEntries> e) :
repository(n),
tree_root(t),
has_category_names(false),
@@ -86,8 +86,8 @@ namespace paludis
};
}
-ExheresLayout::ExheresLayout(const PortageRepository * const r, const FSEntry & tree_root,
- tr1::shared_ptr<const PortageRepositoryEntries> e,
+ExheresLayout::ExheresLayout(const ERepository * const r, const FSEntry & tree_root,
+ tr1::shared_ptr<const ERepositoryEntries> e,
tr1::shared_ptr<const FSEntry> f) :
Layout(f),
PrivateImplementationPattern<ExheresLayout>(new Implementation<ExheresLayout>(r, tree_root, e))
@@ -156,7 +156,7 @@ ExheresLayout::need_category_names() const
}
if (! found_one)
- throw PortageRepositoryConfigurationError("No categories file available for repository '"
+ throw ERepositoryConfigurationError("No categories file available for repository '"
+ stringify(_imp->repository->name()) + "', and this layout does not allow auto-generation");
_imp->has_category_names = true;
@@ -297,7 +297,7 @@ ExheresLayout::package_names(const CategoryNamePart & c) const
continue;
if (DirIterator() == std::find_if(DirIterator(*d), DirIterator(),
- tr1::bind(&PortageRepositoryEntries::is_package_file, _imp->entries.get(),
+ tr1::bind(&ERepositoryEntries::is_package_file, _imp->entries.get(),
c + PackageNamePart(d->basename()), _1)))
continue;
diff --git a/paludis/repositories/e/exheres_layout.hh b/paludis/repositories/e/exheres_layout.hh
index 1517af8..9bfd074 100644
--- a/paludis/repositories/e/exheres_layout.hh
+++ b/paludis/repositories/e/exheres_layout.hh
@@ -25,12 +25,12 @@
namespace paludis
{
- class PortageRepositoryEntries;
+ class ERepositoryEntries;
/**
- * The Exheres tree layout for a PortageRepository.
+ * The Exheres tree layout for a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE ExheresLayout :
@@ -46,8 +46,8 @@ namespace paludis
///\name Basic operations
///\{
- ExheresLayout(const PortageRepository * const, const FSEntry &,
- tr1::shared_ptr<const PortageRepositoryEntries>,
+ ExheresLayout(const ERepository * const, const FSEntry &,
+ tr1::shared_ptr<const ERepositoryEntries>,
tr1::shared_ptr<const FSEntry>);
virtual ~ExheresLayout();
diff --git a/paludis/repositories/e/glsa.cc b/paludis/repositories/e/glsa.cc
index df4f723..2f9ed2a 100644
--- a/paludis/repositories/e/glsa.cc
+++ b/paludis/repositories/e/glsa.cc
@@ -35,7 +35,7 @@ using namespace paludis;
#include "glsa-sr.cc"
#ifdef MONOLITHIC
-# include <paludis/repositories/portage/xml_things.hh>
+# include <paludis/repositories/e/xml_things.hh>
#endif
namespace paludis
@@ -217,11 +217,11 @@ GLSA::create_from_xml_file(const std::string & filename)
# else
if (0 == libxmlhandle.handle)
- libxmlhandle.handle = dlopen("libpaludisgentoorepositoryxmlthings.so",
+ libxmlhandle.handle = dlopen("libpaludiserepositoryxmlthings.so",
RTLD_NOW | RTLD_GLOBAL);
if (0 == libxmlhandle.handle)
throw NotAvailableError("Cannot create GLSA from XML file '" + filename + "' due to error '"
- + stringify(dlerror()) + "' when dlopen(libpaludisgentoorepositoryxmlthings.so)");
+ + stringify(dlerror()) + "' when dlopen(libpaludiserepositoryxmlthings.so)");
if (0 == libxmlhandle.create_glsa_from_xml_file_handle)
libxmlhandle.create_glsa_from_xml_file_handle = STUPID_CAST(tr1::shared_ptr<GLSA> (*)(const std::string &),
diff --git a/paludis/repositories/e/glsa.hh b/paludis/repositories/e/glsa.hh
index 47ffae5..6de46d3 100644
--- a/paludis/repositories/e/glsa.hh
+++ b/paludis/repositories/e/glsa.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_GLSA_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_GLSA_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_GLSA_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_GLSA_HH 1
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/sr.hh>
@@ -56,7 +56,7 @@ namespace paludis
* Represents a package entry in a GLSA.
*
* \see GLSA
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE GLSAPackage :
@@ -115,7 +115,7 @@ namespace paludis
/**
* Represents a GLSA (security advisory).
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE GLSA :
diff --git a/paludis/repositories/e/glsa.sr b/paludis/repositories/e/glsa.sr
index fdff8e4..e96d6e8 100644
--- a/paludis/repositories/e/glsa.sr
+++ b/paludis/repositories/e/glsa.sr
@@ -12,8 +12,8 @@ make_class_GLSARange()
/**
* A version range in a GLSA.
*
- * \see PortageRepositorySets
- * \ingroup grpportagerepository
+ * \see ERepositorySets
+ * \ingroup grperepository
*/
END
}
diff --git a/paludis/repositories/e/layout.cc b/paludis/repositories/e/layout.cc
index 88f22d7..6fa7aa7 100644
--- a/paludis/repositories/e/layout.cc
+++ b/paludis/repositories/e/layout.cc
@@ -29,8 +29,8 @@
using namespace paludis;
template class VirtualConstructor<std::string,
- tr1::shared_ptr<Layout> (*) (const PortageRepository * const, const FSEntry &,
- tr1::shared_ptr<const PortageRepositoryEntries>,
+ tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
+ tr1::shared_ptr<const ERepositoryEntries>,
tr1::shared_ptr<const FSEntry>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >;
@@ -55,8 +55,8 @@ namespace
{
template <typename T_>
tr1::shared_ptr<Layout>
- make_layout(const PortageRepository * const n, const FSEntry & b,
- tr1::shared_ptr<const PortageRepositoryEntries> e,
+ make_layout(const ERepository * const n, const FSEntry & b,
+ tr1::shared_ptr<const ERepositoryEntries> e,
tr1::shared_ptr<const FSEntry> f)
{
return tr1::shared_ptr<Layout>(new T_(n, b, e, f));
@@ -70,7 +70,7 @@ LayoutMaker::LayoutMaker()
}
NoSuchLayoutType::NoSuchLayoutType(const std::string & format) throw () :
- ConfigurationError("No available maker for Portage repository layout type '" + format + "'")
+ ConfigurationError("No available maker for E repository layout type '" + format + "'")
{
}
diff --git a/paludis/repositories/e/layout.hh b/paludis/repositories/e/layout.hh
index 7d257bb..c7caf83 100644
--- a/paludis/repositories/e/layout.hh
+++ b/paludis/repositories/e/layout.hh
@@ -32,13 +32,13 @@
namespace paludis
{
- class PortageRepositoryEntries;
- class PortageRepository;
+ class ERepositoryEntries;
+ class ERepository;
/**
- * Manages the layout of a PortageRepository.
+ * Manages the layout of a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE Layout
@@ -135,7 +135,7 @@ namespace paludis
* Thrown if a layout of the specified type does not exist.
*
* \ingroup grpexceptions
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE NoSuchLayoutType :
@@ -151,12 +151,12 @@ namespace paludis
/**
* Virtual constructor for Layout.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
class PALUDIS_VISIBLE LayoutMaker :
public VirtualConstructor<std::string,
- tr1::shared_ptr<Layout> (*) (const PortageRepository * const, const FSEntry &,
- tr1::shared_ptr<const PortageRepositoryEntries>,
+ tr1::shared_ptr<Layout> (*) (const ERepository * const, const FSEntry &,
+ tr1::shared_ptr<const ERepositoryEntries>,
tr1::shared_ptr<const FSEntry>),
virtual_constructor_not_found::ThrowException<NoSuchLayoutType> >,
public InstantiationPolicy<LayoutMaker, instantiation_method::SingletonTag>
diff --git a/paludis/repositories/e/make_ebin_repository.cc b/paludis/repositories/e/make_ebin_repository.cc
index 1244a4f..d7019b7 100644
--- a/paludis/repositories/e/make_ebin_repository.cc
+++ b/paludis/repositories/e/make_ebin_repository.cc
@@ -21,7 +21,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/repositories/e/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/environment.hh>
#include <paludis/distribution.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -29,7 +29,7 @@
using namespace paludis;
-tr1::shared_ptr<PortageRepository>
+tr1::shared_ptr<ERepository>
paludis::make_ebin_repository(
Environment * const env,
tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
@@ -41,10 +41,10 @@ paludis::make_ebin_repository(
std::string location;
if (m->end() == m->find("location") || ((location = m->find("location")->second)).empty())
- throw PortageRepositoryConfigurationError("Key 'location' not specified or empty");
+ throw ERepositoryConfigurationError("Key 'location' not specified or empty");
tr1::shared_ptr<const RepositoryName> master_repository_name;
- tr1::shared_ptr<const PortageRepository> master_repository;
+ tr1::shared_ptr<const ERepository> master_repository;
if (m->end() != m->find("master_repository") && ! m->find("master_repository")->second.empty())
{
Context context_local("When finding configuration information for master_repository '"
@@ -56,13 +56,13 @@ paludis::make_ebin_repository(
env->package_database()->fetch_repository(*master_repository_name));
if (master_repository_uncasted->format() != "ebuild" && master_repository_uncasted->format() != "ebin")
- throw PortageRepositoryConfigurationError("Master repository format is '" +
+ throw ERepositoryConfigurationError("Master repository format is '" +
stringify(master_repository_uncasted->format()) + "', not 'ebuild' or 'ebin'");
- master_repository = tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
+ master_repository = tr1::static_pointer_cast<const ERepository>(master_repository_uncasted);
if (master_repository->params().master_repository)
- throw PortageRepositoryConfigurationError("Requested master repository has a master_repository of '" +
+ throw ERepositoryConfigurationError("Requested master repository has a master_repository of '" +
stringify(master_repository->params().master_repository->name()) + "', so it cannot "
"be used as a master repository");
}
@@ -78,7 +78,7 @@ paludis::make_ebin_repository(
std::copy(master_repository->params().profiles->begin(),
master_repository->params().profiles->end(), profiles->inserter());
else
- throw PortageRepositoryConfigurationError("No profiles have been specified");
+ throw ERepositoryConfigurationError("No profiles have been specified");
}
tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
@@ -161,7 +161,7 @@ paludis::make_ebin_repository(
buildroot = DistributionData::get_instance()->distribution_from_string(
env->default_distribution())->default_ebuild_build_root;
- return tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
+ return tr1::shared_ptr<ERepository>(new ERepository(ERepositoryParams::create()
.entry_format("ebin")
.layout(layout)
.environment(env)
diff --git a/paludis/repositories/e/make_ebin_repository.hh b/paludis/repositories/e/make_ebin_repository.hh
index a4fb4b5..dee233b 100644
--- a/paludis/repositories/e/make_ebin_repository.hh
+++ b/paludis/repositories/e/make_ebin_repository.hh
@@ -20,17 +20,17 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_MAKE_EBIN_REPOSITORY_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_MAKE_EBIN_REPOSITORY_HH 1
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
namespace paludis
{
/**
* Create an ebin format repository.
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
*/
- tr1::shared_ptr<PortageRepository>
+ tr1::shared_ptr<ERepository>
make_ebin_repository(
Environment * const,
tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
@@ -38,8 +38,8 @@ namespace paludis
/**
* Create an ebin format repository (wrapper for our virtual constructor).
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
*/
tr1::shared_ptr<Repository>
make_ebin_repository_wrapped(
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 1527698..a3b9b24 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -21,7 +21,7 @@
#include <paludis/util/log.hh>
#include <paludis/util/collection_concrete.hh>
#include <paludis/util/tokeniser.hh>
-#include <paludis/repositories/e/portage_repository_exceptions.hh>
+#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/environment.hh>
#include <paludis/distribution.hh>
#include <libwrapiter/libwrapiter_forward_iterator.hh>
@@ -29,7 +29,7 @@
using namespace paludis;
-tr1::shared_ptr<PortageRepository>
+tr1::shared_ptr<ERepository>
paludis::make_ebuild_repository(
Environment * const env,
tr1::shared_ptr<const AssociativeCollection<std::string, std::string> > m)
@@ -41,10 +41,10 @@ paludis::make_ebuild_repository(
std::string location;
if (m->end() == m->find("location") || ((location = m->find("location")->second)).empty())
- throw PortageRepositoryConfigurationError("Key 'location' not specified or empty");
+ throw ERepositoryConfigurationError("Key 'location' not specified or empty");
tr1::shared_ptr<const RepositoryName> master_repository_name;
- tr1::shared_ptr<const PortageRepository> master_repository;
+ tr1::shared_ptr<const ERepository> master_repository;
if (m->end() != m->find("master_repository") && ! m->find("master_repository")->second.empty())
{
Context context_local("When finding configuration information for master_repository '"
@@ -56,13 +56,13 @@ paludis::make_ebuild_repository(
env->package_database()->fetch_repository(*master_repository_name));
if (master_repository_uncasted->format() != "ebuild")
- throw PortageRepositoryConfigurationError("Master repository format is '" +
+ throw ERepositoryConfigurationError("Master repository format is '" +
stringify(master_repository_uncasted->format()) + "', not 'ebuild'");
- master_repository = tr1::static_pointer_cast<const PortageRepository>(master_repository_uncasted);
+ master_repository = tr1::static_pointer_cast<const ERepository>(master_repository_uncasted);
if (master_repository->params().master_repository)
- throw PortageRepositoryConfigurationError("Requested master repository has a master_repository of '" +
+ throw ERepositoryConfigurationError("Requested master repository has a master_repository of '" +
stringify(master_repository->params().master_repository->name()) + "', so it cannot "
"be used as a master repository");
}
@@ -78,7 +78,7 @@ paludis::make_ebuild_repository(
std::copy(master_repository->params().profiles->begin(),
master_repository->params().profiles->end(), profiles->inserter());
else
- throw PortageRepositoryConfigurationError("No profiles have been specified");
+ throw ERepositoryConfigurationError("No profiles have been specified");
}
tr1::shared_ptr<FSEntryCollection> eclassdirs(new FSEntryCollection::Concrete);
@@ -188,7 +188,7 @@ paludis::make_ebuild_repository(
layout = DistributionData::get_instance()->distribution_from_string(
env->default_distribution())->default_ebuild_layout;
- return tr1::shared_ptr<PortageRepository>(new PortageRepository(PortageRepositoryParams::create()
+ return tr1::shared_ptr<ERepository>(new ERepository(ERepositoryParams::create()
.entry_format("ebuild")
.layout(layout)
.environment(env)
diff --git a/paludis/repositories/e/make_ebuild_repository.hh b/paludis/repositories/e/make_ebuild_repository.hh
index 259f8ad..fe4e182 100644
--- a/paludis/repositories/e/make_ebuild_repository.hh
+++ b/paludis/repositories/e/make_ebuild_repository.hh
@@ -17,20 +17,20 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_MAKE_EBUILD_REPOSITORY_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MAKE_EBUILD_REPOSITORY_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_MAKE_EBUILD_REPOSITORY_HH 1
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository.hh>
namespace paludis
{
/**
* Create an ebuild format repository.
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
*/
- tr1::shared_ptr<PortageRepository>
+ tr1::shared_ptr<ERepository>
make_ebuild_repository(
Environment * const,
tr1::shared_ptr<const AssociativeCollection<std::string, std::string> >) PALUDIS_VISIBLE;
@@ -38,8 +38,8 @@ namespace paludis
/**
* Create an ebuild format repository (wrapper for our virtual constructor).
*
- * \see PortageRepository
- * \ingroup grpportagerepository
+ * \see ERepository
+ * \ingroup grperepository
*/
tr1::shared_ptr<Repository>
make_ebuild_repository_wrapped(
diff --git a/paludis/repositories/e/portage_repository_TEST_cleanup.sh b/paludis/repositories/e/portage_repository_TEST_cleanup.sh
deleted file mode 100755
index 8c0b290..0000000
--- a/paludis/repositories/e/portage_repository_TEST_cleanup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d portage_repository_TEST_dir ] ; then
- rm -fr portage_repository_TEST_dir
-else
- true
-fi
-
-
diff --git a/paludis/repositories/e/portage_repository_params.cc b/paludis/repositories/e/portage_repository_params.cc
deleted file mode 100644
index 692a8bf..0000000
--- a/paludis/repositories/e/portage_repository_params.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-/* vim: set sw=4 sts=4 et foldmethod=syntax : */
-
-#include "portage_repository_params.hh"
-
-using namespace paludis;
-
-#include <paludis/repositories/e/portage_repository_params-sr.cc>
-
diff --git a/paludis/repositories/e/portage_repository_sets_TEST_cleanup.sh b/paludis/repositories/e/portage_repository_sets_TEST_cleanup.sh
deleted file mode 100755
index 26cfada..0000000
--- a/paludis/repositories/e/portage_repository_sets_TEST_cleanup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# vim: set ft=sh sw=4 sts=4 et :
-
-if [ -d portage_repository_sets_TEST_dir ] ; then
- rm -fr portage_repository_sets_TEST_dir
-else
- true
-fi
-
-
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index aab039c..8fb5ee8 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -19,8 +19,8 @@
*/
#include <paludis/repositories/e/traditional_layout.hh>
-#include <paludis/repositories/e/portage_repository_entries.hh>
-#include <paludis/repositories/e/portage_repository.hh>
+#include <paludis/repositories/e/e_repository_entries.hh>
+#include <paludis/repositories/e/e_repository.hh>
#include <paludis/config_file.hh>
#include <paludis/package_id.hh>
#include <paludis/hashed_containers.hh>
@@ -53,7 +53,7 @@ namespace paludis
template<>
struct Implementation<TraditionalLayout>
{
- const PortageRepository * const repository;
+ const ERepository * const repository;
const FSEntry tree_root;
mutable bool has_category_names;
@@ -62,7 +62,7 @@ namespace paludis
mutable IDMap ids;
mutable tr1::shared_ptr<CategoryNamePartCollection> category_names_collection;
- tr1::shared_ptr<const PortageRepositoryEntries> entries;
+ tr1::shared_ptr<const ERepositoryEntries> entries;
tr1::shared_ptr<FSEntryCollection> arch_list_files;
tr1::shared_ptr<FSEntryCollection> repository_mask_files;
@@ -70,8 +70,8 @@ namespace paludis
tr1::shared_ptr<FSEntryCollection> mirror_files;
tr1::shared_ptr<FSEntryCollection> use_desc_dirs;
- Implementation(const PortageRepository * const r, const FSEntry & t,
- tr1::shared_ptr<const PortageRepositoryEntries> e) :
+ Implementation(const ERepository * const r, const FSEntry & t,
+ tr1::shared_ptr<const ERepositoryEntries> e) :
repository(r),
tree_root(t),
has_category_names(false),
@@ -86,8 +86,8 @@ namespace paludis
};
}
-TraditionalLayout::TraditionalLayout(const PortageRepository * const repo, const FSEntry & tree_root,
- tr1::shared_ptr<const PortageRepositoryEntries> e,
+TraditionalLayout::TraditionalLayout(const ERepository * const repo, const FSEntry & tree_root,
+ tr1::shared_ptr<const ERepositoryEntries> e,
tr1::shared_ptr<const FSEntry> f) :
Layout(f),
PrivateImplementationPattern<TraditionalLayout>(new Implementation<TraditionalLayout>(repo, tree_root, e))
@@ -316,7 +316,7 @@ TraditionalLayout::package_names(const CategoryNamePart & c) const
continue;
if (DirIterator() == std::find_if(DirIterator(*d), DirIterator(),
- tr1::bind(&PortageRepositoryEntries::is_package_file, _imp->entries.get(),
+ tr1::bind(&ERepositoryEntries::is_package_file, _imp->entries.get(),
c + PackageNamePart(d->basename()), _1)))
continue;
diff --git a/paludis/repositories/e/traditional_layout.hh b/paludis/repositories/e/traditional_layout.hh
index 95e61da..76e9e8e 100644
--- a/paludis/repositories/e/traditional_layout.hh
+++ b/paludis/repositories/e/traditional_layout.hh
@@ -26,12 +26,12 @@
namespace paludis
{
- class PortageRepositoryEntries;
+ class ERepositoryEntries;
/**
- * The traditional tree layout (as used by Gentoo) for a PortageRepository.
+ * The traditional tree layout (as used by Gentoo) for a ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
* \nosubgrouping
*/
class PALUDIS_VISIBLE TraditionalLayout :
@@ -47,8 +47,8 @@ namespace paludis
///\name Basic operations
///\{
- TraditionalLayout(const PortageRepository * const, const FSEntry &,
- tr1::shared_ptr<const PortageRepositoryEntries>,
+ TraditionalLayout(const ERepository * const, const FSEntry &,
+ tr1::shared_ptr<const ERepositoryEntries>,
tr1::shared_ptr<const FSEntry>);
virtual ~TraditionalLayout();
diff --git a/paludis/repositories/e/use_desc.hh b/paludis/repositories/e/use_desc.hh
index 4522676..f6c0be3 100644
--- a/paludis/repositories/e/use_desc.hh
+++ b/paludis/repositories/e/use_desc.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_PORTAGE_USE_DESC_HH
-#define PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_PORTAGE_USE_DESC_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_E_USE_DESC_HH
+#define PALUDIS_GUARD_PALUDIS_PALUDIS_REPOSITORIES_E_USE_DESC_HH 1
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/instantiation_policy.hh>
@@ -30,9 +30,9 @@ namespace paludis
class FSEntry;
/**
- * Implements use.desc options for PortageRepository.
+ * Implements use.desc options for ERepository.
*
- * \ingroup grpportagerepository
+ * \ingroup grperepository
*/
class UseDesc :
private PrivateImplementationPattern<UseDesc>,
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index c4778da..2b06a20 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -138,7 +138,7 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
.destination_interface(this)
.config_interface(this)
.licenses_interface(0)
- .portage_interface(0)
+ .e_interface(0)
.pretend_interface(0)
.make_virtuals_interface(0)
.hook_interface(this),
diff --git a/paludis/repositories/e/vdb_repository.hh b/paludis/repositories/e/vdb_repository.hh
index d4bc566..fdfb49f 100644
--- a/paludis/repositories/e/vdb_repository.hh
+++ b/paludis/repositories/e/vdb_repository.hh
@@ -235,7 +235,7 @@ namespace paludis
/**
* Thrown if invalid parameters are provided for
- * PortageRepository::make_portage_repository.
+ * VDBRepository::make_vdb_repository.
*
* \ingroup grpvdbrepository
* \ingroup grpexceptions
diff --git a/paludis/repositories/e/xml_things.hh b/paludis/repositories/e/xml_things.hh
index 3b4095e..8b2f6be 100644
--- a/paludis/repositories/e/xml_things.hh
+++ b/paludis/repositories/e/xml_things.hh
@@ -17,10 +17,10 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_XML_THINGS_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_XML_THINGS_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_XML_THINGS_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_XML_THINGS_HH 1
-#include <paludis/repositories/portage/glsa.hh>
+#include <paludis/repositories/e/glsa.hh>
extern "C"
{
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 6a6ad94..859c90a 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -48,7 +48,7 @@ FakeInstalledRepository::FakeInstalledRepository(const Environment * const e, co
.config_interface(0)
.destination_interface(this)
.licenses_interface(0)
- .portage_interface(0)
+ .e_interface(0)
.pretend_interface(0)
.make_virtuals_interface(0)
.hook_interface(0),
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 3eb4d50..369607a 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -65,7 +65,7 @@ FakeRepository::FakeRepository(const Environment * const e, const RepositoryName
.config_interface(0)
.destination_interface(0)
.licenses_interface(0)
- .portage_interface(0)
+ .e_interface(0)
.pretend_interface(0)
.make_virtuals_interface(0)
.hook_interface(0),
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index 7581fdc..4f88efd 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -111,7 +111,7 @@ InstalledVirtualsRepository::InstalledVirtualsRepository(const Environment * con
.config_interface(0)
.destination_interface(0)
.licenses_interface(0)
- .portage_interface(0)
+ .e_interface(0)
.make_virtuals_interface(0)
.pretend_interface(0)
.hook_interface(this),
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index 2222e54..23b7914 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -106,7 +106,7 @@ VirtualsRepository::VirtualsRepository(const Environment * const env) :
.destination_interface(0)
.config_interface(0)
.licenses_interface(0)
- .portage_interface(0)
+ .e_interface(0)
.pretend_interface(0)
.make_virtuals_interface(this)
.hook_interface(0),
diff --git a/paludis/repository-fwd.hh b/paludis/repository-fwd.hh
index cc0b88c..ef4bcf5 100644
--- a/paludis/repository-fwd.hh
+++ b/paludis/repository-fwd.hh
@@ -27,7 +27,7 @@ namespace paludis
{
class Environment;
class RepositoryNameCache;
- class PortageRepositoryProfile;
+ class ERepositoryProfile;
class Hook;
class HookResult;
@@ -49,7 +49,7 @@ namespace paludis
class RepositoryConfigInterface;
class RepositoryPretendInterface;
class RepositoryLicensesInterface;
- class RepositoryPortageInterface;
+ class RepositoryEInterface;
class RepositoryHookInterface;
class InstallOptions;
diff --git a/paludis/repository.cc b/paludis/repository.cc
index 21eeda8..38eeb86 100644
--- a/paludis/repository.cc
+++ b/paludis/repository.cc
@@ -216,7 +216,7 @@ RepositoryLicensesInterface::~RepositoryLicensesInterface()
{
}
-RepositoryPortageInterface::~RepositoryPortageInterface()
+RepositoryEInterface::~RepositoryEInterface()
{
}
diff --git a/paludis/repository.hh b/paludis/repository.hh
index 7130c84..742eb0a 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -884,35 +884,35 @@ namespace paludis
virtual ~RepositoryLicensesInterface();
};
- class PortageRepositoryParams;
+ class ERepositoryParams;
class Layout;
/**
- * Interface for handling PortageRepository specific functionality.
+ * Interface for handling ERepository specific functionality.
*
* \see Repository
- * \see PortageRepository
+ * \see ERepository
* \ingroup grprepository
* \nosubgrouping
*/
- class PALUDIS_VISIBLE RepositoryPortageInterface
+ class PALUDIS_VISIBLE RepositoryEInterface
{
public:
- ///\name Information about a PortageRepository
+ ///\name Information about a ERepository
///\{
virtual std::string profile_variable(const std::string &) const = 0;
- virtual const PortageRepositoryParams & params() const = 0;
+ virtual const ERepositoryParams & params() const = 0;
///\}
///\name Profile setting and querying functions
///\{
- typedef RepositoryPortageInterfaceProfilesDescLine ProfilesDescLine;
+ typedef RepositoryEInterfaceProfilesDescLine ProfilesDescLine;
- typedef libwrapiter::ForwardIterator<RepositoryPortageInterface,
+ typedef libwrapiter::ForwardIterator<RepositoryEInterface,
const ProfilesDescLine> ProfilesIterator;
virtual ProfilesIterator begin_profiles() const = 0;
virtual ProfilesIterator end_profiles() const = 0;
@@ -928,7 +928,7 @@ namespace paludis
*/
virtual const tr1::shared_ptr<const Layout> layout() const = 0;
- virtual ~RepositoryPortageInterface();
+ virtual ~RepositoryEInterface();
};
/**
diff --git a/paludis/repository.sr b/paludis/repository.sr
index 146facf..e77f898 100644
--- a/paludis/repository.sr
+++ b/paludis/repository.sr
@@ -60,7 +60,7 @@ make_class_RepositoryCapabilities()
key config_interface "RepositoryConfigInterface *"
key pretend_interface "RepositoryPretendInterface *"
key licenses_interface "RepositoryLicensesInterface *"
- key portage_interface "RepositoryPortageInterface *"
+ key e_interface "RepositoryEInterface *"
key hook_interface "RepositoryHookInterface *"
doxygen_comment << "END"
@@ -76,22 +76,22 @@ END
allow_named_args
}
-make_class_RepositoryPortageInterfaceProfilesDescLine()
+make_class_RepositoryEInterfaceProfilesDescLine()
{
visible
key path FSEntry
key arch std::string
key status std::string
- key profile "tr1::shared_ptr<PortageRepositoryProfile>"
+ key profile "tr1::shared_ptr<ERepositoryProfile>"
allow_named_args
doxygen_comment << "END"
/**
- * A profiles.desc line in a Repository implementing RepositoryPortageInterface.
+ * A profiles.desc line in a Repository implementing RepositoryEInterface.
*
* \see Repository
- * \see RepositoryPortageInterface
+ * \see RepositoryEInterface
* \nosubgrouping
*/
END
diff --git a/src/clients/adjutrix/display_default_system_resolution.cc b/src/clients/adjutrix/display_default_system_resolution.cc
index 29a5dd2..5d0b9de 100644
--- a/src/clients/adjutrix/display_default_system_resolution.cc
+++ b/src/clients/adjutrix/display_default_system_resolution.cc
@@ -122,11 +122,11 @@ int do_display_default_system_resolution(NoConfigEnvironment & env)
if (CommandLine::get_instance()->a_profile.begin_args() ==
CommandLine::get_instance()->a_profile.end_args())
{
- for (RepositoryPortageInterface::ProfilesIterator
- p(env.main_repository()->portage_interface->begin_profiles()),
- p_end(env.main_repository()->portage_interface->end_profiles()) ; p != p_end ; ++p)
+ for (RepositoryEInterface::ProfilesIterator
+ p(env.main_repository()->e_interface->begin_profiles()),
+ p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
{
- env.main_repository()->portage_interface->set_profile(p);
+ env.main_repository()->e_interface->set_profile(p);
return_code |= display_default_system_resolution(env, p->arch + "." + p->status, p->path);
}
}
@@ -135,13 +135,13 @@ int do_display_default_system_resolution(NoConfigEnvironment & env)
for (args::StringSetArg::Iterator i(CommandLine::get_instance()->a_profile.begin_args()),
i_end(CommandLine::get_instance()->a_profile.end_args()) ; i != i_end ; ++i)
{
- RepositoryPortageInterface::ProfilesIterator
- p(env.main_repository()->portage_interface->find_profile(
+ RepositoryEInterface::ProfilesIterator
+ p(env.main_repository()->e_interface->find_profile(
env.main_repository_dir() / "profiles" / (*i)));
- if (p == env.main_repository()->portage_interface->end_profiles())
+ if (p == env.main_repository()->e_interface->end_profiles())
throw ConfigurationError("Repository does not have a profile listed in profiles.desc matching '"
+ stringify(*i) + "'");
- env.main_repository()->portage_interface->set_profile(p);
+ env.main_repository()->e_interface->set_profile(p);
return_code |= display_default_system_resolution(env, *i, env.main_repository_dir()
/ "profiles" / *i);
}
diff --git a/src/clients/adjutrix/downgrade_check.cc b/src/clients/adjutrix/downgrade_check.cc
index 8271705..62b286a 100644
--- a/src/clients/adjutrix/downgrade_check.cc
+++ b/src/clients/adjutrix/downgrade_check.cc
@@ -67,7 +67,7 @@ namespace
}
std::string
- make_filename(const RepositoryPortageInterface::ProfilesIterator & p, bool unstable)
+ make_filename(const RepositoryEInterface::ProfilesIterator & p, bool unstable)
{
std::string result;
FSEntry f(p->path);
@@ -83,7 +83,7 @@ namespace
}
std::string
- make_desc(const RepositoryPortageInterface::ProfilesIterator & p, bool unstable)
+ make_desc(const RepositoryEInterface::ProfilesIterator & p, bool unstable)
{
std::string result;
FSEntry f(p->path);
@@ -166,14 +166,14 @@ do_build_downgrade_check_list(NoConfigEnvironment & env)
if (! output_dir.mkdir())
throw ConfigurationError("Output directory already exists");
- for (RepositoryPortageInterface::ProfilesIterator
- p(env.main_repository()->portage_interface->begin_profiles()),
- p_end(env.main_repository()->portage_interface->end_profiles()) ; p != p_end ; ++p)
+ for (RepositoryEInterface::ProfilesIterator
+ p(env.main_repository()->e_interface->begin_profiles()),
+ p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
{
for (int i = 0 ; i < 2 ; ++i)
{
env.set_accept_unstable(i);
- env.main_repository()->portage_interface->set_profile(p);
+ env.main_repository()->e_interface->set_profile(p);
std::string n(make_filename(p, i));
std::cerr << "Generating " << n << "..." << std::endl;
std::ofstream f(stringify(output_dir / n).c_str());
@@ -199,14 +199,14 @@ do_downgrade_check(NoConfigEnvironment & env)
std::multimap<QPNS, std::string> results;
- for (RepositoryPortageInterface::ProfilesIterator
- p(env.main_repository()->portage_interface->begin_profiles()),
- p_end(env.main_repository()->portage_interface->end_profiles()) ; p != p_end ; ++p)
+ for (RepositoryEInterface::ProfilesIterator
+ p(env.main_repository()->e_interface->begin_profiles()),
+ p_end(env.main_repository()->e_interface->end_profiles()) ; p != p_end ; ++p)
{
for (int i = 0 ; i < 2 ; ++i)
{
env.set_accept_unstable(i);
- env.main_repository()->portage_interface->set_profile(p);
+ env.main_repository()->e_interface->set_profile(p);
std::string n(make_filename(p, i)), desc(make_desc(p, i));
if ((before_dir / n).exists() && (after_dir / n).exists())
diff --git a/src/clients/adjutrix/what_needs_keywording.cc b/src/clients/adjutrix/what_needs_keywording.cc
index 0de297d..5d25d75 100644
--- a/src/clients/adjutrix/what_needs_keywording.cc
+++ b/src/clients/adjutrix/what_needs_keywording.cc
@@ -56,7 +56,7 @@ int do_what_needs_keywording(NoConfigEnvironment & env)
UseFlagName target_arch(strip_leading_string(
*CommandLine::get_instance()->begin_parameters(), "~"));
- env.main_repository()->portage_interface->set_profile_by_arch(target_arch);
+ env.main_repository()->e_interface->set_profile_by_arch(target_arch);
env.set_accept_unstable('~' == stringify(target_keyword).at(0));
DepListOptions d_options;