From e75364c99827641cd491206acfba4c6587cfcd33 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 20 Sep 2012 11:01:43 -0700 Subject: Enable official EAPI 5 support. The council has officialy approved EAPI 5 in PMS: http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git;a=commit;h=99c78a51ff4c9737cdd399620072abdc14f8df11 --- pym/portage/const.py | 2 +- pym/portage/tests/repoman/test_simple.py | 4 ++-- pym/portage/tests/update/test_update_dbentry.py | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pym') diff --git a/pym/portage/const.py b/pym/portage/const.py index fe283f486..49a14d3ab 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -109,7 +109,7 @@ SUPPORTED_FEATURES = frozenset([ "unmerge-logs", "unmerge-orphans", "userfetch", "userpriv", "usersandbox", "usersync", "webrsync-gpg", "xattr"]) -EAPI = 4 +EAPI = 5 HASHING_BLOCKSIZE = 32768 MANIFEST1_HASH_FUNCTIONS = ("MD5", "SHA256", "RMD160") diff --git a/pym/portage/tests/repoman/test_simple.py b/pym/portage/tests/repoman/test_simple.py index 639ec31ea..f29a177f0 100644 --- a/pym/portage/tests/repoman/test_simple.py +++ b/pym/portage/tests/repoman/test_simple.py @@ -79,7 +79,7 @@ class SimpleRepomanTestCase(TestCase): ) profile = { - "eapi": ("5_pre2",), + "eapi": ("5",), "package.use.stable.mask": ("dev-libs/A flag",) } @@ -87,7 +87,7 @@ class SimpleRepomanTestCase(TestCase): "dev-libs/A-0": { "COPYRIGHT_HEADER" : copyright_header, "DESCRIPTION" : "Desc goes here", - "EAPI" : "5_pre2", + "EAPI" : "5", "HOMEPAGE" : "http://example.com", "IUSE" : "flag", "KEYWORDS": "x86", diff --git a/pym/portage/tests/update/test_update_dbentry.py b/pym/portage/tests/update/test_update_dbentry.py index cb69053f7..ae634f031 100644 --- a/pym/portage/tests/update/test_update_dbentry.py +++ b/pym/portage/tests/update/test_update_dbentry.py @@ -27,16 +27,16 @@ class UpdateDbentryTestCase(TestCase): (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "2", " dev-libs/A[foo] ", " dev-libs/B[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/1=[foo] ", " dev-libs/B:0/1=[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/1[foo] ", " dev-libs/B:0/1[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0/0[foo] ", " dev-libs/B:0/0[foo] "), - (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5_pre2", + (("move", Atom("dev-libs/A"), Atom("dev-libs/B")), "5", " dev-libs/A:0=[foo] ", " dev-libs/B:0=[foo] "), (("slotmove", Atom("dev-libs/A"), "0", "1"), "1", @@ -45,16 +45,16 @@ class UpdateDbentryTestCase(TestCase): (("slotmove", Atom("dev-libs/A"), "0", "1"), "1", " >=dev-libs/A-1:0 ", " >=dev-libs/A-1:1 "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/1=[foo] ", " dev-libs/A:1/1=[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/1[foo] ", " dev-libs/A:1/1[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0/0[foo] ", " dev-libs/A:1/1[foo] "), - (("slotmove", Atom("dev-libs/A"), "0", "1"), "5_pre2", + (("slotmove", Atom("dev-libs/A"), "0", "1"), "5", " dev-libs/A:0=[foo] ", " dev-libs/A:1=[foo] "), ) for update_cmd, eapi, input_str, output_str in cases: -- cgit v1.2.3-1-g7c22