diff options
author | 2011-06-12 01:23:41 +0100 | |
---|---|---|
committer | 2011-06-12 01:23:41 +0100 | |
commit | 5b4f92da6f5ee79476684853af7c0d844e5e6880 (patch) | |
tree | 3a7100a3ea73435e58ed86648ac0e6b891ac36d1 | |
parent | 971c850475575fbb92fb33998323dacc721b7eb8 (diff) | |
download | paludis-5b4f92da6f5ee79476684853af7c0d844e5e6880.tar.gz paludis-5b4f92da6f5ee79476684853af7c0d844e5e6880.tar.xz |
Unmention provides in EAPI defs
-rw-r--r-- | paludis/repositories/e/eapi.cc | 1 | ||||
-rw-r--r-- | paludis/repositories/e/eapi.hh | 2 | ||||
-rw-r--r-- | paludis/repositories/e/eapis/0.conf | 3 | ||||
-rw-r--r-- | paludis/repositories/e/eapis/exheres-0.conf | 3 | ||||
-rw-r--r-- | paludis/repositories/e/eapis/paludis-1.conf | 3 | ||||
-rwxr-xr-x | paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh | 39 |
6 files changed, 8 insertions, 43 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc index 1ffab5446..eeac0a2eb 100644 --- a/paludis/repositories/e/eapi.cc +++ b/paludis/repositories/e/eapi.cc @@ -140,7 +140,6 @@ namespace n::myoptions() = make_metadata_variable(k, "myoptions"), n::pdepend() = make_metadata_variable(k, "pdepend"), n::properties() = make_metadata_variable(k, "properties"), - n::provide() = make_metadata_variable(k, "provide"), n::remote_ids() = make_metadata_variable(k, "remote_ids"), n::required_use() = make_metadata_variable(k, "required_use"), n::restrictions() = make_metadata_variable(k, "restrict"), diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh index 5ab037d84..246555277 100644 --- a/paludis/repositories/e/eapi.hh +++ b/paludis/repositories/e/eapi.hh @@ -173,7 +173,6 @@ namespace paludis typedef Name<struct name_pipe_commands> pipe_commands; typedef Name<struct name_profile_iuse_injection> profile_iuse_injection; typedef Name<struct name_properties> properties; - typedef Name<struct name_provide> provide; typedef Name<struct name_rdepend_defaults_to_depend> rdepend_defaults_to_depend; typedef Name<struct name_remote_ids> remote_ids; typedef Name<struct name_require_use_expand_in_iuse> require_use_expand_in_iuse; @@ -383,7 +382,6 @@ namespace paludis NamedValue<n::myoptions, std::shared_ptr<const EAPIMetadataVariable> > myoptions; NamedValue<n::pdepend, std::shared_ptr<const EAPIMetadataVariable> > pdepend; NamedValue<n::properties, std::shared_ptr<const EAPIMetadataVariable> > properties; - NamedValue<n::provide, std::shared_ptr<const EAPIMetadataVariable> > provide; NamedValue<n::remote_ids, std::shared_ptr<const EAPIMetadataVariable> > remote_ids; NamedValue<n::required_use, std::shared_ptr<const EAPIMetadataVariable> > required_use; NamedValue<n::restrictions, std::shared_ptr<const EAPIMetadataVariable> > restrictions; diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf index 0e0bd11ee..7962dd04c 100644 --- a/paludis/repositories/e/eapis/0.conf +++ b/paludis/repositories/e/eapis/0.conf @@ -164,7 +164,6 @@ description_iuse = Relevant USE flags description_keywords = Keywords description_license = License description_pdepend = Post dependencies -description_provide = Provided packages description_restrict = Restrictions description_run_depend = Run dependencies description_slot = Slot @@ -187,7 +186,6 @@ metadata_iuse = IUSE metadata_keywords = KEYWORDS metadata_license = LICENSE metadata_pdepend = PDEPEND -metadata_provide = PROVIDE metadata_restrict = RESTRICT metadata_run_depend = RDEPEND metadata_slot = SLOT @@ -214,7 +212,6 @@ flat_list_myoptions = -1 flat_list_keywords = 8 flat_list_license = 6 flat_list_pdepend = 12 -flat_list_provide = 13 flat_list_restrict = 4 flat_list_run_depend = 1 flat_list_slot = 2 diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf index 4ad8d3ac5..8be093315 100644 --- a/paludis/repositories/e/eapis/exheres-0.conf +++ b/paludis/repositories/e/eapis/exheres-0.conf @@ -210,7 +210,6 @@ metadata_inherited = INHERITED metadata_iuse = metadata_myoptions = MYOPTIONS metadata_pdepend = -metadata_provide = metadata_eapi = EAPI metadata_dependencies = DEPENDENCIES metadata_use = @@ -235,7 +234,6 @@ description_myoptions = Relevant option flags description_keywords = Supported platforms description_license = Licences description_pdepend = -description_provide = description_restrict = Restrictions description_run_depend = description_slot = Slot @@ -268,7 +266,6 @@ flat_list_myoptions = -1 flat_list_keywords = -1 flat_list_license = -1 flat_list_pdepend = -1 -flat_list_provide = -1 flat_list_restrict = -1 flat_list_run_depend = -1 flat_list_slot = -1 diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf index dd4af4b34..7705aedaa 100644 --- a/paludis/repositories/e/eapis/paludis-1.conf +++ b/paludis/repositories/e/eapis/paludis-1.conf @@ -169,7 +169,6 @@ metadata_keywords = KEYWORDS metadata_inherited = INHERITED metadata_iuse = IUSE metadata_pdepend = PDEPEND -metadata_provide = PROVIDE metadata_eapi = EAPI metadata_dependencies = metadata_use = @@ -188,7 +187,6 @@ description_iuse = Relevant use flags description_keywords = Keywords description_license = License description_pdepend = Post dependencies -description_provide = Provided packages description_restrict = Restrictions description_run_depend = Run dependencies description_slot = Slot @@ -216,7 +214,6 @@ flat_list_myoptions = -1 flat_list_keywords = -1 flat_list_license = -1 flat_list_pdepend = -1 -flat_list_provide = -1 flat_list_restrict = -1 flat_list_run_depend = -1 flat_list_slot = -1 diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh index 5b313fce9..e8a61f02e 100755 --- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh +++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST_setup.sh @@ -50,7 +50,7 @@ the-keywords the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -81,7 +81,7 @@ the-keywords the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -113,7 +113,7 @@ the-keywords the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -136,7 +136,7 @@ foo the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -167,7 +167,7 @@ foo the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -200,7 +200,7 @@ bar the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -231,7 +231,7 @@ baz the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -254,7 +254,7 @@ the-keywords the-iuse unused the/pdepend -the/provide + 0 the-properties @@ -277,7 +277,6 @@ DESCRIPTION=the-description-flat_hash KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -308,7 +307,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -343,7 +341,6 @@ DESCRIPTION=the-description-flat_hash-no-guessed-eapi KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -366,7 +363,6 @@ LICENSE=the-license KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -397,7 +393,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -417,7 +412,6 @@ DESCRIPTION=the-description-flat_hash-no-mtime KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -447,7 +441,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -478,7 +471,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -510,7 +502,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide END TZ=UTC touch -t 197001010001 cat/flat_hash-no-eapi/flat_hash-no-eapi-1.ebuild || exit 2 @@ -539,7 +530,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 FOO=bar FOO=bar @@ -564,7 +554,6 @@ DESCRIPTION=the-description-flat_hash-eclass KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -596,7 +585,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -628,7 +616,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -660,7 +647,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -684,7 +670,6 @@ DESCRIPTION=the-description-flat_hash-full-eclass KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -708,7 +693,6 @@ DESCRIPTION=the-description-flat_hash-full-eclass-nonstandard KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -740,7 +724,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -772,7 +755,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -804,7 +786,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -836,7 +817,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -866,7 +846,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -898,7 +877,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END @@ -930,7 +908,6 @@ DESCRIPTION=The Stale Description KEYWORDS=the-keywords IUSE=the-iuse PDEPEND=the/pdepend -PROVIDE=the/provide EAPI=0 PROPERTIES=the-properties END |