commit: b7cd026aa1bd1875b659093ad84b8015fe45e0cb
Author: Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 21:57:55 2016 +0000
Commit: Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 21:57:55 2016 +0000
URL:
https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=b7cd026a
Update ebuild and patch to support splited portage and repoman
ebuild/tbc-9999.ebuild | 5 +++--
patches/portage.patch | 38 ++++++++++++++++++++------------------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ebuild/tbc-9999.ebuild b/ebuild/tbc-9999.ebuild
index 24dd1d6..f21147e 100644
--- a/ebuild/tbc-9999.ebuild
+++ b/ebuild/tbc-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4})
+PYTHON_COMPAT=( python{2_7,3_4,3_5})
inherit distutils-r1 git-2
@@ -15,7 +15,8 @@ KEYWORDS="~amd64"
SLOT="0"
IUSE="+mysql"
-RDEPEND=">=sys-apps/portage-2.2.27[${PYTHON_USEDEP}]
+RDEPEND=">=sys-apps/portage-2.3.2[${PYTHON_USEDEP}]
+ >=sys-apps/repoman-2.3.0-r2[${PYTHON_USEDEP}]
dev-python/sqlalchemy[${PYTHON_USEDEP}]
dev-python/git-python[${PYTHON_USEDEP}]
mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] )"
diff --git a/patches/portage.patch b/patches/portage.patch
index 6f2d17f..d925ea8 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -35,16 +35,17 @@
if sys.hexversion >= 0x3000000:
long = int
_unicode = str
-@@ -90,7 +92,7 @@ else:
- _unicode = unicode
+@@ -98,7 +98,8 @@ else:
- def action_build(settings, trees, mtimedb,
-- myopts, myaction, myfiles, spinner):
-+ myopts, myaction, myfiles, spinner, build_dict, session):
+ def action_build(emerge_config, trees=DeprecationWarning,
+ mtimedb=DeprecationWarning, myopts=DeprecationWarning,
+- myaction=DeprecationWarning, myfiles=DeprecationWarning, spinner=None):
++ myaction=DeprecationWarning, myfiles=DeprecationWarning,
++ spinner=None, build_dict, session):
- if '--usepkgonly' not in myopts:
- old_tree_timestamp_warn(settings['PORTDIR'], settings)
-@@ -319,20 +319,14 @@ def action_build(settings, trees, mtimed
+ if not isinstance(emerge_config, _emerge_config):
+ warnings.warn("_emerge.actions.action_build() now expects "
+@@ -333,13 +334,8 @@ def action_build(emerge_config, trees=DeprecationWarning,
print(darkgreen("emerge: It seems we have nothing to
resume..."))
return os.EX_OK
@@ -56,10 +57,11 @@
- display_missing_pkg_set(root_config, e.value)
- return 1
+ success, settings, trees, mtimedb, mydepgraph =
build_mydepgraph(settings,
-+ trees, mtimedb, myopts, myparams, myaction, myfiles,
spinner, build_dict, session)
++ trees, mtimedb, myopts, myparams, myaction, myfiles, spinner,
build_dict, session)
- if "--autounmask-only" in myopts:
- mydepgraph.display_problems()
+ if success and mydepgraph.need_config_reload():
+ load_emerge_config(emerge_config=emerge_config)
+@@ -351,7 +347,6 @@ def action_build(emerge_config, trees=DeprecationWarning,
return 0
if not success:
@@ -177,12 +179,12 @@
# skip global updates prior to sync, since it's called after sync
if emerge_config.action not in ('help', 'info', 'sync', 'version') and \
-@@ -4059,7 +4059,7 @@ def run_action(emerge_config):
- retval = action_build(emerge_config.target_config.settings,
- emerge_config.trees,
emerge_config.target_config.mtimedb,
- emerge_config.opts, emerge_config.action,
-- emerge_config.args, spinner)
-+ emerge_config.args, spinner, build_dict, session)
+@@ -3258,7 +3253,7 @@ def run_action(emerge_config):
+ except OSError:
+ writemsg("Please install eselect to use
this feature.\n",
+ noiselevel=-1)
+- retval = action_build(emerge_config, spinner=spinner)
++ retval = action_build(emerge_config, spinner=spinner,
build_dict, session)
post_emerge(emerge_config.action, emerge_config.opts,
emerge_config.args, emerge_config.target_config.root,
emerge_config.trees,
emerge_config.target_config.mtimedb, retval)
@@ -321,7 +323,7 @@
- # output the results
- actions = Actions(repo_settings, options, scanner, vcs_settings)
-- if actions.inform(can_force, result):
+- if actions.inform(can_force.get(), result):
- # perform any other actions
- actions.perform(qa_output)
-
