From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 405371381F3 for ; Mon, 15 Apr 2013 20:24:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1F10E0AE9; Mon, 15 Apr 2013 20:24:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 46934E0AE9 for ; Mon, 15 Apr 2013 20:24:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EF7B33D8A3 for ; Mon, 15 Apr 2013 20:24:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B1F6AE43D6 for ; Mon, 15 Apr 2013 20:24:53 +0000 (UTC) From: "Magnus Granberg" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Magnus Granberg" Message-ID: <1366057422.b258d2db796f24eec44ddef6138c7aca0fd56a25.zorry@gentoo> Subject: [gentoo-commits] dev/zorry:master commit in: ebuild/dev-python/gobs/files/, ebuild/dev-python/gobs/ X-VCS-Repository: dev/zorry X-VCS-Files: ebuild/dev-python/gobs/Manifest ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch ebuild/dev-python/gobs/files/zobcs_portage_actions.patch ebuild/dev-python/gobs/files/zobcs_portage_main.patch ebuild/dev-python/gobs/gobs-9999.ebuild X-VCS-Directories: ebuild/dev-python/gobs/files/ ebuild/dev-python/gobs/ X-VCS-Committer: zorry X-VCS-Committer-Name: Magnus Granberg X-VCS-Revision: b258d2db796f24eec44ddef6138c7aca0fd56a25 X-VCS-Branch: master Date: Mon, 15 Apr 2013 20:24:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9ff2fa59-6d22-41f4-a66f-fb66d5aa8d48 X-Archives-Hash: 6fc2a885ac239bf379c6a5bf37dee936 commit: b258d2db796f24eec44ddef6138c7aca0fd56a25 Author: Magnus Granberg gentoo org> AuthorDate: Mon Apr 15 20:23:42 2013 +0000 Commit: Magnus Granberg gentoo org> CommitDate: Mon Apr 15 20:23:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/zorry.git;a=commit;h=b258d2db Update the ebuild --- ebuild/dev-python/gobs/Manifest | 5 +- .../gobs/files/zobcs_portage_Scheduler.patch | 63 +++++++++++++++++++ .../gobs/files/zobcs_portage_actions.patch | 66 ++++++++++++++++++++ .../dev-python/gobs/files/zobcs_portage_main.patch | 39 ++++++++++++ ebuild/dev-python/gobs/gobs-9999.ebuild | 13 ++++- 5 files changed, 184 insertions(+), 2 deletions(-) diff --git a/ebuild/dev-python/gobs/Manifest b/ebuild/dev-python/gobs/Manifest index 83f727e..600d4b5 100644 --- a/ebuild/dev-python/gobs/Manifest +++ b/ebuild/dev-python/gobs/Manifest @@ -1,2 +1,5 @@ AUX gobs.conf 305 SHA256 fd28bb95af69e507dbb0b9dbcb470eb155e81a97be3cefff9ed241cda766af4a SHA512 838113323adee7d3566714e18ba8af2416f193c2c9bf205af644e541235578107d2a573470d6679bff5e3cce67cb4645a93d38eb8c1b0b6899a22d577d3eb9f9 WHIRLPOOL e84e026def8da0511732be65b3d96fe8a046fd6629b8a914d9669cbbd4e96bd02617ac928cabbe1f3e599a25674037eb948570fa980c5d0451ce7f210166b212 -EBUILD gobs-9999.ebuild 950 SHA256 56a2c9eb5be33b5443c389ae53a4dbba5c1655503b7d09edbeb8a6141eb509a2 SHA512 1e529f6f2cfc5859f3094459534043b419aa6fc3c356f8bb9ae852106e0b5a435e84c119bb5e069e43393cae21b8e6c7b74258dbad333541edaf44fdc6e6a0ca WHIRLPOOL 4738451e367fc14d9a72eceec324e23ef36d2e8b3bf009afe3c255d7ee61dacc21503a90ee313fcaf0b2a695185aad82a3c1dee3cc6e336314673f25e3c671fc +AUX zobcs_portage_Scheduler.patch 2160 SHA256 670caff8033cd0025b1d6de64999960bed694bc4597561f20d5094aebb5a85da SHA512 f7f1c52b050abe48fa546603b8bdff4314ae13c5bde2cf515359199b8d03dca375b2700a085b9edf6021360dbb422039f1cb7f77810894cecc8ff05ca81296d5 WHIRLPOOL bb078bcdd015e618b7d5967746ef094104d352f13a996a2fecf33d3d29292cb37f189fd5ee78f8f7fc34ca819cfb0f9521f8f6802939339179d755e1e3e5e85e +AUX zobcs_portage_actions.patch 2511 SHA256 49379c2de876c575309dc98dbfa0abc9eb95fda399dc17ee6fc563ef74785303 SHA512 99422b461a52f2010f0a1f3f9abc716cb534821c67b93243bbe674d23edff3e3226bf4a7a2b2422ffabd4c293f39baee4b626f24b7f1f03dc8c5486d69f27bb7 WHIRLPOOL 85dd523751774850aa98284bf9ee1fba92b8a0710b6eb9a1dd85b276d9b28ba200fbe8cfcd007fece57e4de14b4036310de07ab93b7ddbd56ddddd024296c633 +AUX zobcs_portage_main.patch 1286 SHA256 9ef9c00a761085060b17db6d7afd52dd45a33eab1111d314ad918f7feb70c63c SHA512 50a1a1cc4466139974fd620d1c9a221942e8ce13527402b88553fcc92ef4bbfd9a027ecdb7bdf1d517f49c33e3fb7681e6defc7ecf5329df9a0fcc7681e8cb6c WHIRLPOOL 32f63cd7ca798b6c994a8206ff82c571c099dca93821ebe03f13687a1a4fb40f2eb5522d98365b2b05298651117f64e5a2af6c0920db074791edb492b93eefc2 +EBUILD gobs-9999.ebuild 1362 SHA256 412845826806f5e45f02cc3679d4ae4f9a49ae1dbe15d853e1a57ead80f2bf07 SHA512 45bc6b97879b60d2ea32253d4252484a6a8ef2a8faf44b891cb252d3475d99c7bddf445002184629efe1a5b93964382c540292559cbd46bf5433ebc536819ff8 WHIRLPOOL f36d78a44957dbfeebfa9321be0731e60753efd278ffff4f1fab00d9d17f7bba6621920537585be937b9220e54f42c8cd8f64cb9b311c9949d8cc08943cef51a diff --git a/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch b/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch new file mode 100644 index 0000000..a4f8a97 --- /dev/null +++ b/ebuild/dev-python/gobs/files/zobcs_portage_Scheduler.patch @@ -0,0 +1,63 @@ +--- a/gobs/pym/Scheduler.py 2013-03-22 17:57:23.000000000 +0100 ++++ b/gobs/pym/Scheduler.py 2012-12-21 02:09:28.082301168 +0100 +@@ -62,6 +62,8 @@ from _emerge.PackageMerge import Package + from _emerge.PollScheduler import PollScheduler + from _emerge.SequentialTaskQueue import SequentialTaskQueue + ++from gobs.build_log import add_buildlog_main ++ + if sys.hexversion >= 0x3000000: + basestring = str + +@@ -1254,8 +1251,9 @@ class Scheduler(PollScheduler): + + def _do_merge_exit(self, merge): + pkg = merge.merge.pkg ++ settings = merge.merge.settings ++ trees = self.trees + if merge.returncode != os.EX_OK: +- settings = merge.merge.settings + build_dir = settings.get("PORTAGE_BUILDDIR") + build_log = settings.get("PORTAGE_LOG_FILE") + +@@ -1266,6 +1264,7 @@ class Scheduler(PollScheduler): + if not self._terminated_tasks: + self._failed_pkg_msg(self._failed_pkgs[-1], "install", "to") + self._status_display.failed = len(self._failed_pkgs) ++ add_buildlog_main(settings, pkg) + return + + self._task_complete(pkg) +@@ -1284,6 +1283,7 @@ class Scheduler(PollScheduler): + self._pkg_cache.pop(pkg_to_replace, None) + + if pkg.installed: ++ add_buildlog_main(settings, pkg) + return + + # Call mtimedb.commit() after each merge so that +@@ -1294,6 +1294,7 @@ class Scheduler(PollScheduler): + if not mtimedb["resume"]["mergelist"]: + del mtimedb["resume"] + mtimedb.commit() ++ add_buildlog_main(settings, pkg) + + def _build_exit(self, build): + self._running_tasks.pop(id(build), None) +@@ -1318,6 +1319,8 @@ class Scheduler(PollScheduler): + self._status_display.merges = len(self._task_queues.merge) + else: + settings = build.settings ++ trees = self.trees ++ pkg=build.pkg + build_dir = settings.get("PORTAGE_BUILDDIR") + build_log = settings.get("PORTAGE_LOG_FILE") + +@@ -1329,6 +1332,7 @@ class Scheduler(PollScheduler): + self._failed_pkg_msg(self._failed_pkgs[-1], "emerge", "for") + self._status_display.failed = len(self._failed_pkgs) + self._deallocate_config(build.settings) ++ add_buildlog_main(settings, pkg) + self._jobs -= 1 + self._status_display.running = self._jobs + self._schedule() diff --git a/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch b/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch new file mode 100644 index 0000000..ba3ee57 --- /dev/null +++ b/ebuild/dev-python/gobs/files/zobcs_portage_actions.patch @@ -0,0 +1,66 @@ +--- a/gobs/pym/actions.py 2013-03-22 17:57:23.000000000 +0100 ++++ b/gobs/pym/actions.py 2013-03-22 19:00:43.265582143 +0100 +@@ -72,7 +72,7 @@ from _emerge.MetadataRegen import Metada + from _emerge.Package import Package + from _emerge.ProgressHandler import ProgressHandler + from _emerge.RootConfig import RootConfig +-from _emerge.Scheduler import Scheduler ++from gobs.Scheduler import Scheduler + from _emerge.search import search + from _emerge.SetArg import SetArg + from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice +@@ -83,6 +83,8 @@ from _emerge.UnmergeDepPriority import U + from _emerge.UseFlagDisplay import pkg_use_display + from _emerge.userquery import userquery + ++from gobs.build_depgraph import build_mydepgraph ++ + if sys.hexversion >= 0x3000000: + long = int + _unicode = str +@@ -90,7 +92,7 @@ else: + _unicode = unicode + + def action_build(settings, trees, mtimedb, +- myopts, myaction, myfiles, spinner): ++ myopts, myaction, myfiles, spinner, build_dict): + + if '--usepkgonly' not in myopts: + old_tree_timestamp_warn(settings['PORTDIR'], settings) +@@ -312,16 +314,10 @@ def action_build(settings, trees, mtimed + print(darkgreen("emerge: It seems we have nothing to resume...")) + return os.EX_OK + +- try: +- success, mydepgraph, favorites = backtrack_depgraph( +- settings, trees, myopts, myparams, myaction, myfiles, spinner) +- except portage.exception.PackageSetNotFound as e: +- root_config = trees[settings['EROOT']]['root_config'] +- 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) + + if not success: +- mydepgraph.display_problems() + return 1 + + mergecount = None +@@ -3508,7 +3504,7 @@ def repo_name_duplicate_check(trees): + + return bool(ignored_repos) + +-def run_action(settings, trees, mtimedb, myaction, myopts, myfiles, ++def run_action(settings, trees, mtimedb, myaction, myopts, myfiles, build_dict, + gc_locals=None): + + # The caller may have its local variables garbage collected, so +@@ -3925,7 +3921,7 @@ def run_action(settings, trees, mtimedb, + if "--pretend" not in myopts: + display_news_notification(root_config, myopts) + retval = action_build(settings, trees, mtimedb, +- myopts, myaction, myfiles, spinner) ++ myopts, myaction, myfiles, spinner, build_dict) + post_emerge(myaction, myopts, myfiles, settings['EROOT'], + trees, mtimedb, retval) + diff --git a/ebuild/dev-python/gobs/files/zobcs_portage_main.patch b/ebuild/dev-python/gobs/files/zobcs_portage_main.patch new file mode 100644 index 0000000..dc54b95 --- /dev/null +++ b/ebuild/dev-python/gobs/files/zobcs_portage_main.patch @@ -0,0 +1,39 @@ +--- a/gobs/pym/main.py 2013-03-22 17:57:23.000000000 +0100 ++++ b/gobs/pym/main.py 2012-12-06 03:32:56.104889716 +0100 +@@ -11,7 +11,7 @@ portage.proxy.lazyimport.lazyimport(glob + 'logging', + 'portage.util:writemsg_level', + 'textwrap', +- '_emerge.actions:load_emerge_config,run_action,' + \ ++ 'gobs.actions:load_emerge_config,run_action,' + \ + 'validate_ebuild_environment', + '_emerge.help:help@emerge_help', + ) +@@ -991,14 +966,19 @@ def profile_check(trees, myaction): + return 1 + return os.EX_OK + +-def emerge_main(args=None): ++def emerge_main(args=None, build_dict=None): + """ + @param args: command arguments (default: sys.argv[1:]) + @type args: list ++ @param build_dict: info of the build_job ++ @type build_dict: dict + """ + if args is None: + args = sys.argv[1:] + ++ if build_dict is None: ++ build_dict = {} ++ + # Disable color until we're sure that it should be enabled (after + # EMERGE_DEFAULT_OPTS has been parsed). + portage.output.havecolor = 0 +@@ -1040,5 +1022,5 @@ def emerge_main(args=None): + tmpcmdline.extend(args) + myaction, myopts, myfiles = parse_opts(tmpcmdline) + +- return run_action(settings, trees, mtimedb, myaction, myopts, myfiles, ++ return run_action(settings, trees, mtimedb, myaction, myopts, myfiles, build_dict, + gc_locals=locals().clear) diff --git a/ebuild/dev-python/gobs/gobs-9999.ebuild b/ebuild/dev-python/gobs/gobs-9999.ebuild index 3b84526..c1cb510 100644 --- a/ebuild/dev-python/gobs/gobs-9999.ebuild +++ b/ebuild/dev-python/gobs/gobs-9999.ebuild @@ -6,7 +6,7 @@ EAPI="2" PYTHON_DEPEND="*:2.7" SUPPORT_PYTHON_ABIS="1" -inherit distutils git-2 +inherit distutils git-2 eutils DESCRIPTION="Gobs" HOMEPAGE="http://git.overlays.gentoo.org/gitroot/dev/zorry.git" @@ -29,6 +29,17 @@ EGIT_REPO_URI="http://git.overlays.gentoo.org/gitroot/dev/zorry.git" PYTHON_MODNAME="gobs" +src_prepare() { + einfo "Copying needed files from portage" + cp /usr/lib64/portage/pym/_emerge/actions.py ${S}/gobs/pym + cp /usr/lib64/portage/pym/_emerge/main.py ${S}/gobs/pym + cp /usr/lib64/portage/pym/_emerge/Scheduler.py ${S}/gobs/pym + einfo "Done." + epatch "${FILESDIR}/zobcs_portage_actions.patch" + epatch "${FILESDIR}/zobcs_portage_main.patch" + epatch "${FILESDIR}/zobcs_portage_Scheduler.patch" +} + src_install() { dodir /var/lib/gobs || die dodir etc/gobs || die