aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-30 07:19:25 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-30 07:19:25 +0000
commit3176f6a7fe50417fc0357d92eaeead39f2512aba (patch)
treeaad43ccd891ae740e44f9eabb77943c2fc95aa27
parent74335ff02286376d3cd514af0c723e96d6f3e914 (diff)
downloadpaludis-3176f6a7fe50417fc0357d92eaeead39f2512aba.tar.gz
paludis-3176f6a7fe50417fc0357d92eaeead39f2512aba.tar.xz
Fix virtual masking
-rw-r--r--paludis/repositories/fake/fake_installed_repository.cc3
-rw-r--r--paludis/repositories/fake/fake_repository.cc3
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc7
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh2
-rw-r--r--paludis/repositories/portage/portage_repository.cc3
-rw-r--r--paludis/repositories/portage/portage_virtual_version_metadata.cc7
-rw-r--r--paludis/repositories/portage/portage_virtual_version_metadata.hh4
-rw-r--r--paludis/repositories/vdb/vdb_repository.cc2
-rw-r--r--paludis/repositories/vdb/vdb_version_metadata.cc7
-rw-r--r--paludis/repositories/vdb/vdb_version_metadata.hh3
10 files changed, 9 insertions, 32 deletions
diff --git a/paludis/repositories/fake/fake_installed_repository.cc b/paludis/repositories/fake/fake_installed_repository.cc
index 8f535cb..d8fd7ac 100644
--- a/paludis/repositories/fake/fake_installed_repository.cc
+++ b/paludis/repositories/fake/fake_installed_repository.cc
@@ -96,9 +96,6 @@ FakeInstalledRepository::provided_package_version_metadata(const RepositoryProvi
std::tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_name, p.version, name())));
- if (m->license_interface)
- result->license_interface->license_string = m->license_interface->license_string;
-
result->eapi = m->eapi;
result->deps_interface->build_depend_string = stringify(p.provided_by_name);
result->deps_interface->run_depend_string = stringify(p.provided_by_name);
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index 6f7af2c..7d0097a 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -65,9 +65,6 @@ FakeRepository::virtual_package_version_metadata(
std::tr1::shared_ptr<FakeVirtualVersionMetadata> result(new FakeVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_atom->package(), v, name())));
- if (m->license_interface)
- result->license_interface->license_string = m->license_interface->license_string;
-
result->eapi = m->eapi;
result->deps_interface->build_depend_string = "=" + stringify(p.provided_by_atom->package()) + "-" + stringify(v);
result->deps_interface->run_depend_string = "=" + stringify(p.provided_by_atom->package()) + "-" + stringify(v);
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 4da8914..7a162f6 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -328,19 +328,16 @@ FakeVirtualVersionMetadata::FakeVirtualVersionMetadata(const SlotName & s, const
VersionMetadata(
VersionMetadataBase(s, "", "", "paludis-1"),
VersionMetadataCapabilities::create()
- .ebuild_interface(this)
+ .ebuild_interface(0)
.deps_interface(this)
- .license_interface(this)
+ .license_interface(0)
.cran_interface(0)
.virtual_interface(this)
.origins_interface(0)
),
- VersionMetadataEbuildInterface(),
VersionMetadataDepsInterface(&PortageDepParser::parse_depend),
- VersionMetadataLicenseInterface(&PortageDepParser::parse_license),
VersionMetadataVirtualInterface(p)
{
- keywords = "test";
}
FakeVirtualVersionMetadata::~FakeVirtualVersionMetadata()
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index f6b5fb7..4c415e5 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -59,9 +59,7 @@ namespace paludis
*/
class FakeVirtualVersionMetadata :
public VersionMetadata,
- public VersionMetadataEbuildInterface,
public VersionMetadataDepsInterface,
- public VersionMetadataLicenseInterface,
public VersionMetadataVirtualInterface
{
public:
diff --git a/paludis/repositories/portage/portage_repository.cc b/paludis/repositories/portage/portage_repository.cc
index 0114703..415e96a 100644
--- a/paludis/repositories/portage/portage_repository.cc
+++ b/paludis/repositories/portage/portage_repository.cc
@@ -969,9 +969,6 @@ PortageRepository::virtual_package_version_metadata(const RepositoryVirtualsEntr
std::tr1::shared_ptr<PortageVirtualVersionMetadata> result(new PortageVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_atom->package(), v, name())));
- if (m->license_interface)
- result->license_string = m->license_interface->license_string;
- result->keywords = "*";
result->eapi = m->eapi;
result->build_depend_string = "=" + stringify(p.provided_by_atom->package()) + "-" + stringify(v);
result->run_depend_string = "=" + stringify(p.provided_by_atom->package()) + "-" + stringify(v);
diff --git a/paludis/repositories/portage/portage_virtual_version_metadata.cc b/paludis/repositories/portage/portage_virtual_version_metadata.cc
index 21e12dc..a10d4bc 100644
--- a/paludis/repositories/portage/portage_virtual_version_metadata.cc
+++ b/paludis/repositories/portage/portage_virtual_version_metadata.cc
@@ -28,15 +28,14 @@ PortageVirtualVersionMetadata::PortageVirtualVersionMetadata(const SlotName & s,
VersionMetadataBase(s, "", "", "paludis-1"),
VersionMetadataCapabilities::create()
.virtual_interface(this)
- .ebuild_interface(this)
+ .ebuild_interface(0)
.deps_interface(this)
- .license_interface(this)
+ .license_interface(0)
.cran_interface(0)
.origins_interface(0)
),
VersionMetadataVirtualInterface(e),
- VersionMetadataDepsInterface(&PortageDepParser::parse_depend),
- VersionMetadataLicenseInterface(&PortageDepParser::parse_license)
+ VersionMetadataDepsInterface(&PortageDepParser::parse_depend)
{
}
diff --git a/paludis/repositories/portage/portage_virtual_version_metadata.hh b/paludis/repositories/portage/portage_virtual_version_metadata.hh
index 33af661..79e6028 100644
--- a/paludis/repositories/portage/portage_virtual_version_metadata.hh
+++ b/paludis/repositories/portage/portage_virtual_version_metadata.hh
@@ -27,9 +27,7 @@ namespace paludis
class PortageVirtualVersionMetadata :
public VersionMetadata,
public VersionMetadataVirtualInterface,
- public VersionMetadataEbuildInterface,
- public VersionMetadataDepsInterface,
- public VersionMetadataLicenseInterface
+ public VersionMetadataDepsInterface
{
public:
PortageVirtualVersionMetadata(const SlotName &, const PackageDatabaseEntry &);
diff --git a/paludis/repositories/vdb/vdb_repository.cc b/paludis/repositories/vdb/vdb_repository.cc
index b9ee76a..bc56970 100644
--- a/paludis/repositories/vdb/vdb_repository.cc
+++ b/paludis/repositories/vdb/vdb_repository.cc
@@ -1184,8 +1184,6 @@ VDBRepository::provided_package_version_metadata(const RepositoryProvidesEntry &
std::tr1::shared_ptr<VDBVirtualVersionMetadata> result(new VDBVirtualVersionMetadata(
m->slot, PackageDatabaseEntry(p.provided_by_name, p.version, name())));
- if (m->license_interface)
- result->license_string = m->license_interface->license_string;
result->eapi = m->eapi;
result->build_depend_string = stringify(p.provided_by_name);
result->run_depend_string = stringify(p.provided_by_name);
diff --git a/paludis/repositories/vdb/vdb_version_metadata.cc b/paludis/repositories/vdb/vdb_version_metadata.cc
index 873d525..c5e3171 100644
--- a/paludis/repositories/vdb/vdb_version_metadata.cc
+++ b/paludis/repositories/vdb/vdb_version_metadata.cc
@@ -48,14 +48,13 @@ VDBVirtualVersionMetadata::VDBVirtualVersionMetadata(const SlotName & s,
VersionMetadataBase(s, "", "", "UNKNOWN"),
VersionMetadataCapabilities::create()
.deps_interface(this)
- .origins_interface(this)
- .ebuild_interface(this)
- .license_interface(this)
+ .origins_interface(0)
+ .ebuild_interface(0)
+ .license_interface(0)
.virtual_interface(this)
.cran_interface(0)
),
VersionMetadataDepsInterface(&PortageDepParser::parse_depend),
- VersionMetadataLicenseInterface(&PortageDepParser::parse_license),
VersionMetadataVirtualInterface(e)
{
}
diff --git a/paludis/repositories/vdb/vdb_version_metadata.hh b/paludis/repositories/vdb/vdb_version_metadata.hh
index d3b6036..f22721b 100644
--- a/paludis/repositories/vdb/vdb_version_metadata.hh
+++ b/paludis/repositories/vdb/vdb_version_metadata.hh
@@ -39,9 +39,6 @@ namespace paludis
class VDBVirtualVersionMetadata :
public VersionMetadata,
public VersionMetadataDepsInterface,
- public VersionMetadataOriginsInterface,
- public VersionMetadataEbuildInterface,
- public VersionMetadataLicenseInterface,
public VersionMetadataVirtualInterface
{
public: