From 6ee701eb65fbfc00cbf6ebc16de2d6487ba2cfd7 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Fri, 21 Sep 2012 21:03:05 +0200 Subject: Support EAPI="5-progress". --- pym/portage/__init__.py | 2 +- pym/portage/eapi.py | 10 +++++----- pym/portage/tests/update/test_update_dbentry.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index afaff516b..83669398f 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -414,7 +414,7 @@ def abssymlink(symlink, target=None): _doebuild_manifest_exempt_depend = 0 -_testing_eapis = frozenset(["4-python", "4-slot-abi", "5_pre2"]) +_testing_eapis = frozenset(["4-python", "4-slot-abi", "5_pre2", "5-progress"]) _deprecated_eapis = frozenset(["4_pre1", "3_pre2", "3_pre1", "5_pre1"]) def _eapi_is_deprecated(eapi): diff --git a/pym/portage/eapi.py b/pym/portage/eapi.py index 42c108b2e..e02e017ee 100644 --- a/pym/portage/eapi.py +++ b/pym/portage/eapi.py @@ -48,7 +48,7 @@ def eapi_exports_EBUILD_PHASE_FUNC(eapi): return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi") def eapi_exports_REPOSITORY(eapi): - return eapi in ("4-python",) + return eapi in ("4-python", "5-progress") def eapi_has_pkg_pretend(eapi): return eapi not in ("0", "1", "2", "3") @@ -69,19 +69,19 @@ def eapi_has_use_dep_defaults(eapi): return eapi not in ("0", "1", "2", "3") def eapi_has_repo_deps(eapi): - return eapi in ("4-python",) + return eapi in ("4-python", "5-progress") def eapi_allows_dots_in_PN(eapi): - return eapi in ("4-python",) + return eapi in ("4-python", "5-progress") def eapi_allows_dots_in_use_flags(eapi): - return eapi in ("4-python",) + return eapi in ("4-python", "5-progress") def eapi_supports_stable_use_forcing_and_masking(eapi): return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi") def eapi_allows_directories_on_profile_level_and_repository_level(eapi): - return eapi in ("4-python",) + return eapi in ("4-python", "5-progress") _eapi_attrs = collections.namedtuple('_eapi_attrs', 'dots_in_PN dots_in_use_flags exports_EBUILD_PHASE_FUNC ' diff --git a/pym/portage/tests/update/test_update_dbentry.py b/pym/portage/tests/update/test_update_dbentry.py index ae634f031..0d4c5a02d 100644 --- a/pym/portage/tests/update/test_update_dbentry.py +++ b/pym/portage/tests/update/test_update_dbentry.py @@ -191,7 +191,7 @@ class UpdateDbentryTestCase(TestCase): self.assertTrue(old_pattern.search(rdepend) is None) self.assertTrue("dev-libs/M-moved" in rdepend) - # EAPI 4-python N -> N.moved + # EAPI 4-python/*-progress N -> N.moved rdepend = vardb.aux_get("dev-libs/B-1", ["RDEPEND"])[0] old_pattern = re.compile(r"\bdev-libs/N(\s|$)") self.assertTrue(old_pattern.search(rdepend) is None) -- cgit v1.2.3-1-g7c22