aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-14 03:00:23 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-14 03:13:46 +0100
commit5f1f70c41f5cb0c537e3d140acbcd633bf5d207b (patch)
treee81d7550a4916f492b056c8c04256faf1d9fb054
parent7b5c57442b295a7930b80f1e14085b2ebeb848ea (diff)
downloadpaludis-5f1f70c41f5cb0c537e3d140acbcd633bf5d207b.tar.gz
paludis-5f1f70c41f5cb0c537e3d140acbcd633bf5d207b.tar.xz
Update CRAN for previous (continued)
-rw-r--r--paludis/repositories/cran/cran_package_id.cc12
-rw-r--r--paludis/repositories/cran/cran_package_id.hh3
2 files changed, 4 insertions, 11 deletions
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index 3216d76..0212b73 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -409,16 +409,10 @@ CRANPackageID::installed_time_key() const
return std::tr1::shared_ptr<const MetadataTimeKey>();
}
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
-CRANPackageID::source_origin_key() const
-{
- return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
-}
-
-const std::tr1::shared_ptr<const MetadataValueKey<std::string> >
-CRANPackageID::binary_origin_key() const
+const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >
+CRANPackageID::from_repositories_key() const
{
- return std::tr1::shared_ptr<const MetadataValueKey<std::string> >();
+ return std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > >();
}
std::size_t
diff --git a/paludis/repositories/cran/cran_package_id.hh b/paludis/repositories/cran/cran_package_id.hh
index e27caba..daaecc3 100644
--- a/paludis/repositories/cran/cran_package_id.hh
+++ b/paludis/repositories/cran/cran_package_id.hh
@@ -71,12 +71,11 @@ namespace paludis
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > long_description_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const Contents> > > contents_key() const;
virtual const std::tr1::shared_ptr<const MetadataTimeKey> installed_time_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > source_origin_key() const;
- virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > binary_origin_key() const;
virtual const std::tr1::shared_ptr<const MetadataCollectionKey<PackageIDSequence> > contains_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::tr1::shared_ptr<const PackageID> > > contained_in_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > fs_location_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<bool> > transient_key() const;
+ virtual const std::tr1::shared_ptr<const MetadataCollectionKey<Set<std::string> > > from_repositories_key() const;
virtual bool supports_action(const SupportsActionTestBase &) const PALUDIS_ATTRIBUTE((warn_unused_result));