commit: 51e4f526c064f5d16629a17efe5c973017cc724c Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Dec 13 17:49:32 2015 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Dec 13 17:49:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=51e4f526
app-admin/packagekit-base: 1.0.10 → 1.0.11 ...-exception-handling-to-be-python2.7-compa.patch | 44 ---- ...2-portage-do-not-redefine-builtin-license.patch | 34 --- .../files/0003-portage-drop-unused-imports.patch | 25 -- ...0004-portage-initialize-licenses-variable.patch | 26 --- ...-fix-a-typo-in-restoring-license-settings.patch | 30 --- ...-PackageKitProgress-to-ease-progress-step.patch | 260 --------------------- ...ython-make-PackagekitProgress-an-Iterable.patch | 56 ----- ...steps-on-PackagekitProgress-instanciation.patch | 49 ---- ...age-use-PackagekitProgress-as-an-iterable.patch | 222 ------------------ .../files/0011-portage-fix-a-typo.patch | 25 -- ...2-portage-fix-step-percentage-computation.patch | 25 -- ...not-refetch-package-listing-for-no-reason.patch | 32 --- ...1.0.10.ebuild => packagekit-base-1.0.11.ebuild} | 8 +- 13 files changed, 2 insertions(+), 834 deletions(-) diff --git a/app-admin/packagekit-base/files/0001-portage-fix-exception-handling-to-be-python2.7-compa.patch b/app-admin/packagekit-base/files/0001-portage-fix-exception-handling-to-be-python2.7-compa.patch deleted file mode 100644 index b834f2b..0000000 --- a/app-admin/packagekit-base/files/0001-portage-fix-exception-handling-to-be-python2.7-compa.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 56a54a7bbf3b28546619a4d2b458ea50c3f5c3e9 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 13:32:23 +0200 -Subject: [PATCH 1/9] portage: fix exception handling to be python2.7+ - compatible - ---- - backends/portage/portageBackend.py | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index dc72bd9..d4726b6 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -1542,9 +1542,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - if not enable and self._is_repo_enabled(installed_layman_db, repoid): - try: - installed_layman_db.delete(installed_layman_db.select(repoid)) -- except Exception, e: -+ except Exception as exc: - self.error(ERROR_INTERNAL_ERROR, -- "Failed to disable repository " + repoid + " : " + str(e)) -+ "Failed to disable repository %s: %s" % -+ (repoid, str(exc))) - return - - # enabling (adding) a db -@@ -1555,10 +1556,11 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self._block_output() - installed_layman_db.add(available_layman_db.select(repoid)) - self._unblock_output() -- except Exception, e: -+ except Exception as exc: - self._unblock_output() - self.error(ERROR_INTERNAL_ERROR, -- "Failed to enable repository " + repoid + " : " + str(e)) -+ "Failed to enable repository %s: %s" % -+ (repoid, str(exc))) - return - - def resolve(self, filters, pkgs): --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0002-portage-do-not-redefine-builtin-license.patch b/app-admin/packagekit-base/files/0002-portage-do-not-redefine-builtin-license.patch deleted file mode 100644 index 8ef1e9a..0000000 --- a/app-admin/packagekit-base/files/0002-portage-do-not-redefine-builtin-license.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 232519b102571933f034cee72979ecf834af4b46 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 14:14:03 +0200 -Subject: [PATCH 2/9] portage: do not redefine builtin license - ---- - backends/portage/portageBackend.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index d4726b6..f40ca92 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -334,14 +334,14 @@ class PackageKitPortageMixin(object): - def _get_real_license_str(self, cpv, metadata): - # use conditionals info (w/ USE) in LICENSE and remove || - ebuild_settings = self._get_ebuild_settings(cpv, metadata) -- license = set(portage.flatten( -+ license_ = set(portage.flatten( - portage.dep.use_reduce( - portage.dep.paren_reduce(metadata["LICENSE"]), - uselist=ebuild_settings.get("USE", "").split() - ) - )) -- license.discard('||') -- return ' '.join(license) -+ license_.discard('||') -+ return ' '.join(license_) - - def _signal_config_update(self): - result = list(portage.util.find_updated_config_files( --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0003-portage-drop-unused-imports.patch b/app-admin/packagekit-base/files/0003-portage-drop-unused-imports.patch deleted file mode 100644 index 2b99528..0000000 --- a/app-admin/packagekit-base/files/0003-portage-drop-unused-imports.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6b2592232d9ed2713df874d3bb770f68ef701841 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 14:14:45 +0200 -Subject: [PATCH 3/9] portage: drop unused imports - ---- - backends/portage/portageBackend.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index f40ca92..4301c14 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -40,8 +40,6 @@ from packagekit.backend import ( - split_package_id, - ) - from packagekit.enums import * --from packagekit.package import PackagekitPackage --from packagekit.progress import * - # portage imports - import _emerge.AtomArg - import _emerge.actions --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0004-portage-initialize-licenses-variable.patch b/app-admin/packagekit-base/files/0004-portage-initialize-licenses-variable.patch deleted file mode 100644 index 5c31b26..0000000 --- a/app-admin/packagekit-base/files/0004-portage-initialize-licenses-variable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 438fd88070860f858d09758daf5ff379a4d788a5 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 14:33:48 +0200 -Subject: [PATCH 4/9] portage: initialize licenses variable - -It should not be possible for licenses to be undefined but cleans up -static analysis warnings. ---- - backends/portage/portageBackend.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index 4301c14..f36695a 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -554,6 +554,7 @@ class PackageKitPortageMixin(object): - return not self.pvar.settings._getMissingLicenses(cpv, metadata) - - if FILTER_FREE in filters or FILTER_NOT_FREE in filters: -+ licenses = "" - free_licenses = "@FSF-APPROVED" - if FILTER_FREE in filters: - licenses = "-* " + free_licenses --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0005-portage-fix-a-typo-in-restoring-license-settings.patch b/app-admin/packagekit-base/files/0005-portage-fix-a-typo-in-restoring-license-settings.patch deleted file mode 100644 index 885c90f..0000000 --- a/app-admin/packagekit-base/files/0005-portage-fix-a-typo-in-restoring-license-settings.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d42390d7c78e622a8051d47f86a422a1861d7eef Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 14:35:40 +0200 -Subject: [PATCH 5/9] portage: fix a typo in restoring license settings - ---- - backends/portage/portageBackend.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index f36695a..9b572e9 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -560,11 +560,11 @@ class PackageKitPortageMixin(object): - licenses = "-* " + free_licenses - elif FILTER_NOT_FREE in filters: - licenses = "* -" + free_licenses -- backup_license = self.pvar.settings["ACCEPT_LICENSE"] -+ backup_licenses = self.pvar.settings["ACCEPT_LICENSE"] - - self.pvar.apply_settings({'ACCEPT_LICENSE': licences}) - cpv_list = filter(_has_validLicense, cpv_list) -- self.pvar.apply_settings({'ACCEPT_LICENSE': backup_licence}) -+ self.pvar.apply_settings({'ACCEPT_LICENSE': backup_licenses}) - - return cpv_list - --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0006-portage-use-PackageKitProgress-to-ease-progress-step.patch b/app-admin/packagekit-base/files/0006-portage-use-PackageKitProgress-to-ease-progress-step.patch deleted file mode 100644 index 8d6a51c..0000000 --- a/app-admin/packagekit-base/files/0006-portage-use-PackageKitProgress-to-ease-progress-step.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 3c002cb530493664f94405c408b27203c7355cad Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 15:09:50 +0200 -Subject: [PATCH 6/9] portage: use PackageKitProgress to ease progress steps - manipulations - ---- - backends/portage/portageBackend.py | 91 +++++++++++++++++++++----------------- - 1 file changed, 51 insertions(+), 40 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index 9b572e9..5cb64f6 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -40,6 +40,7 @@ from packagekit.backend import ( - split_package_id, - ) - from packagekit.enums import * -+from packagekit.progress import PackagekitProgress - # portage imports - import _emerge.AtomArg - import _emerge.actions -@@ -68,6 +69,11 @@ from portage.exception import InvalidAtom - # Map Gentoo categories to the PackageKit group name space - - -+def compute_equal_steps(iterable): -+ return [idx * (100.0 / len(iterable)) / 100.0 -+ for idx, _ in enumerate(iterable, start=1)] -+ -+ - class PortagePackageGroups(dict): - - """ -@@ -932,10 +938,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - def get_details(self, pkgs): - self.status(STATUS_INFO) - self.allow_cancel(True) -- self.percentage(0) - -- nb_pkg = float(len(pkgs)) -- pkg_processed = 0.0 -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(pkgs)) -+ self.percentage(progress.percent) - - for pkg in pkgs: - cpv = self._id_to_cpv(pkg) -@@ -961,18 +967,18 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self._get_size(cpv) - ) - -- pkg_processed += 100.0 -- self.percentage(int(pkg_processed / nb_pkg)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - - def get_files(self, pkgs): - self.status(STATUS_INFO) - self.allow_cancel(True) -- self.percentage(0) - -- nb_pkg = float(len(pkgs)) -- pkg_processed = 0.0 -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(pkgs)) -+ self.percentage(progress.percent) - - for pkg in pkgs: - cpv = self._id_to_cpv(pkg) -@@ -990,19 +996,20 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - - self.files(pkg, ';'.join(sorted(self._get_file_list(cpv)))) - -- pkg_processed += 100.0 -- self.percentage(int(pkg_processed / nb_pkg)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - - def get_packages(self, filters): - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - cp_list = self._get_all_cp(filters) -- nb_cp = float(len(cp_list)) -- cp_processed = 0.0 -+ -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cp_list)) -+ self.percentage(progress.percent) - - for cp in self._get_all_cp(filters): - for cpv in self._get_all_cpv(cp, filters): -@@ -1011,8 +1018,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - except InvalidAtom: - continue - -- cp_processed += 100.0 -- self.percentage(int(cp_processed / nb_cp)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - -@@ -1565,11 +1572,11 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - def resolve(self, filters, pkgs): - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - cp_list = self._get_all_cp(filters) -- nb_cp = float(len(cp_list)) -- cp_processed = 0.0 -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cp_list)) -+ self.percentage(progress.percent) - - reg_expr = [] - for pkg in pkgs: -@@ -1584,8 +1591,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- cp_processed += 100.0 -- self.percentage(int(cp_processed / nb_cp)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - -@@ -1593,13 +1600,14 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - # NOTES: very bad performance - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - cp_list = self._get_all_cp(filters) -- nb_cp = float(len(cp_list)) -- cp_processed = 0.0 - search_list = self._get_search_list(keys) - -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cp_list)) -+ self.percentage(progress.percent) -+ - for cp in cp_list: - # unfortunatelly, everything is related to cpv, not cp - # can't filter cp -@@ -1635,8 +1643,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in cpv_list: - self._package(cpv) - -- cp_processed += 100.0 -- self.percentage(int(cp_processed / nb_cp)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - -@@ -1647,7 +1655,6 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - # - newest: as only installed, by himself - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - if FILTER_NOT_INSTALLED in filters: - self.error(ERROR_CANNOT_GET_FILELIST, -@@ -1655,10 +1662,12 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - return - - cpv_list = self.pvar.vardb.cpv_all() -- nb_cpv = 0.0 -- cpv_processed = 0.0 - is_full_path = True - -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cpv_list)) -+ self.percentage(progress.percent) -+ - count = 0 - values_len = len(values) - for key in values: -@@ -1679,8 +1688,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self._package(cpv) - break - -- count += 1 -- self.percentage(float(count) / values_len) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - -@@ -1688,11 +1697,12 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - # TODO: filter unknown groups before searching ? (optimization) - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - cp_list = self._get_all_cp(filters) -- nb_cp = float(len(cp_list)) -- cp_processed = 0.0 -+ -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cp_list)) -+ self.percentage(progress.percent) - - for cp in cp_list: - for group in groups: -@@ -1700,8 +1710,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- cp_processed += 100.0 -- self.percentage(int(cp_processed / nb_cp)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - -@@ -1711,7 +1721,6 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - # keys contain more than one category name, no results can be found - self.status(STATUS_QUERY) - self.allow_cancel(True) -- self.percentage(0) - - categories = [] - for k in keys_list[:]: -@@ -1736,8 +1745,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - search_list.append(re.compile(k, re.IGNORECASE)) - - cp_list = self._get_all_cp(filters) -- nb_cp = float(len(cp_list)) -- cp_processed = 0.0 -+ -+ progress = PackagekitProgress() -+ progress.set_steps(compute_equal_steps(cp_list)) -+ self.percentage(progress.percent) - - for cp in cp_list: - if category_filter: -@@ -1757,8 +1768,8 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- cp_processed += 100.0 -- self.percentage(int(cp_processed / nb_cp)) -+ progress.step() -+ self.percentage(progress.percent) - - self.percentage(100) - --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0007-python-make-PackagekitProgress-an-Iterable.patch b/app-admin/packagekit-base/files/0007-python-make-PackagekitProgress-an-Iterable.patch deleted file mode 100644 index ca78c62..0000000 --- a/app-admin/packagekit-base/files/0007-python-make-PackagekitProgress-an-Iterable.patch +++ /dev/null @@ -1,56 +0,0 @@ -From eb52dc157c5dbda9630b448dab06fb05cdf1060c Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 15:26:05 +0200 -Subject: [PATCH 7/9] python: make PackagekitProgress an Iterable - ---- - lib/python/packagekit/progress.py | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/lib/python/packagekit/progress.py b/lib/python/packagekit/progress.py -index 7a5d363..d0c0c26 100644 ---- a/lib/python/packagekit/progress.py -+++ b/lib/python/packagekit/progress.py -@@ -17,7 +17,13 @@ - # Copyright (C) 2008 - # Richard Hughes <[email protected]> - --class PackagekitProgress: -+try: -+ from collections import Iterable -+except ImportError: -+ from collections.abc import Iterable -+ -+ -+class PackagekitProgress(Iterable): - ''' - Progress class there controls the total progress of a transaction - the transaction is divided in n milestones. the class contains -@@ -42,6 +48,7 @@ class PackagekitProgress: - #TODO: Add support for elapsed/remaining time - - def __init__(self): -+ super(PackagekitProgress, self).__init__() - self.percent = 0 - self.steps = [] - self.current_step = 0 -@@ -68,8 +75,16 @@ class PackagekitProgress: - self.current_step += 1 - self.percent = self.steps[self.current_step] - else: -+ self.current_step = len(self.steps) - self.percent = 100 - -+ def __iter__(self): -+ while self.current_step < len(self.steps): -+ yield self.percent -+ self.step() -+ -+ raise StopIteration -+ - def _update_percent(self): - ''' - Increment percentage based on current step --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0008-python-set-steps-on-PackagekitProgress-instanciation.patch b/app-admin/packagekit-base/files/0008-python-set-steps-on-PackagekitProgress-instanciation.patch deleted file mode 100644 index b15df47..0000000 --- a/app-admin/packagekit-base/files/0008-python-set-steps-on-PackagekitProgress-instanciation.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3c046f4586605f51a55c82f81861adcf5e408488 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 16:10:32 +0200 -Subject: [PATCH 8/9] python: set steps on PackagekitProgress instanciation - ---- - lib/python/packagekit/progress.py | 18 ++++++++---------- - 1 file changed, 8 insertions(+), 10 deletions(-) - -diff --git a/lib/python/packagekit/progress.py b/lib/python/packagekit/progress.py -index d0c0c26..b5c7e52 100644 ---- a/lib/python/packagekit/progress.py -+++ b/lib/python/packagekit/progress.py -@@ -34,24 +34,22 @@ class PackagekitProgress(Iterable): - from packagekit import PackagekitProgress - - steps = [10, 30, 50, 70] # Milestones in % -- progress = PackagekitProgress() -- progress.set_steps(steps) -- for milestone in range(len(steps)): -+ progress = PackagekitProgress(steps) -+ for milestone in progress: - # do the action is this step - for i in range(100): - # do some action -- print "progress : %s " % progress.percent -- progress.step() # step to next milestone -- -+ print "progress : %s " % milestone - ''' - - #TODO: Add support for elapsed/remaining time - -- def __init__(self): -+ def __init__(self, steps=None): - super(PackagekitProgress, self).__init__() -- self.percent = 0 -- self.steps = [] -- self.current_step = 0 -+ if not steps: -+ self.reset() -+ else: -+ self.set_steps(steps) - - def set_steps(self, steps): - ''' --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0009-portage-use-PackagekitProgress-as-an-iterable.patch b/app-admin/packagekit-base/files/0009-portage-use-PackagekitProgress-as-an-iterable.patch deleted file mode 100644 index 435bb09..0000000 --- a/app-admin/packagekit-base/files/0009-portage-use-PackagekitProgress-as-an-iterable.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 5a3b0b213c53aca26f91f0a3eae65518f1376235 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 6 Sep 2015 16:10:06 +0200 -Subject: [PATCH 9/9] portage: use PackagekitProgress as an iterable - ---- - backends/portage/portageBackend.py | 73 +++++++++++++++----------------------- - 1 file changed, 29 insertions(+), 44 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index 5cb64f6..de1c490 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -27,7 +27,10 @@ import signal - import sys - import traceback - from collections import defaultdict --from itertools import izip -+try: -+ from itertools import izip -+except ImportError: -+ izip = zip - - # layman imports (>=2) - import layman.config -@@ -939,11 +942,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self.status(STATUS_INFO) - self.allow_cancel(True) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(pkgs)) -+ progress = PackagekitProgress(compute_equal_steps(pkgs)) - self.percentage(progress.percent) - -- for pkg in pkgs: -+ for percentage, pkg in izip(progress, pkgs): - cpv = self._id_to_cpv(pkg) - - if not self._is_cpv_valid(cpv): -@@ -967,8 +969,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self._get_size(cpv) - ) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -976,11 +977,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self.status(STATUS_INFO) - self.allow_cancel(True) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(pkgs)) -+ progress = PackagekitProgress(compute_equal_steps(pkgs)) - self.percentage(progress.percent) - -- for pkg in pkgs: -+ for percentage, pkg in izip(progress, pkgs): - cpv = self._id_to_cpv(pkg) - - if not self._is_cpv_valid(cpv): -@@ -996,8 +996,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - - self.files(pkg, ';'.join(sorted(self._get_file_list(cpv)))) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1007,19 +1006,17 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - - cp_list = self._get_all_cp(filters) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cp_list)) -+ progress = PackagekitProgress(compute_equal_steps(cp_list)) - self.percentage(progress.percent) - -- for cp in self._get_all_cp(filters): -+ for percentage, cp in izip(progress, self._get_all_cp(filters)): - for cpv in self._get_all_cpv(cp, filters): - try: - self._package(cpv) - except InvalidAtom: - continue - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1574,8 +1571,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self.allow_cancel(True) - - cp_list = self._get_all_cp(filters) -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cp_list)) -+ progress = PackagekitProgress(compute_equal_steps(cp_list)) - self.percentage(progress.percent) - - reg_expr = [] -@@ -1586,13 +1582,12 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - # specifications says "be case sensitive" - s = re.compile(reg_expr) - -- for cp in cp_list: -+ for percentage, cp in izip(progress, cp_list): - if s.match(cp): - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1604,11 +1599,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - cp_list = self._get_all_cp(filters) - search_list = self._get_search_list(keys) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cp_list)) -+ progress = PackagekitProgress(compute_equal_steps(cp_list)) - self.percentage(progress.percent) - -- for cp in cp_list: -+ for percentage, cp in izip(progress, cp_list): - # unfortunatelly, everything is related to cpv, not cp - # can't filter cp - cpv_list = [] -@@ -1643,8 +1637,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in cpv_list: - self._package(cpv) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1664,13 +1657,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - cpv_list = self.pvar.vardb.cpv_all() - is_full_path = True - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cpv_list)) -- self.percentage(progress.percent) -+ progress = PackagekitProgress(compute_equal_steps(values)) -+ self.percentage(progress.percentage) - -- count = 0 -- values_len = len(values) -- for key in values: -+ for percentage, key in izip(progress, values): - - if key[0] != "/": - is_full_path = False -@@ -1688,8 +1678,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - self._package(cpv) - break - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1700,18 +1689,16 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - - cp_list = self._get_all_cp(filters) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cp_list)) -+ progress = PackagekitProgress(compute_equal_steps(cp_list)) - self.percentage(progress.percent) - -- for cp in cp_list: -+ for percentage, cp in izip(progress, cp_list): - for group in groups: - if self._get_pk_group(cp) == group: - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - -@@ -1746,11 +1733,10 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - - cp_list = self._get_all_cp(filters) - -- progress = PackagekitProgress() -- progress.set_steps(compute_equal_steps(cp_list)) -+ progress = PackagekitProgress(compute_equal_steps(cp_list)) - self.percentage(progress.percent) - -- for cp in cp_list: -+ for percentage, cp in izip(progress, cp_list): - if category_filter: - cat, pkg_name = portage.versions.catsplit(cp) - if cat != category_filter: -@@ -1768,8 +1754,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - for cpv in self._get_all_cpv(cp, filters): - self._package(cpv) - -- progress.step() -- self.percentage(progress.percent) -+ self.percentage(percentage) - - self.percentage(100) - --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0011-portage-fix-a-typo.patch b/app-admin/packagekit-base/files/0011-portage-fix-a-typo.patch deleted file mode 100644 index 6b41d7c..0000000 --- a/app-admin/packagekit-base/files/0011-portage-fix-a-typo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 782b68eb1b381fe9bda602da7d0b951827d489a1 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Fri, 27 Nov 2015 11:36:40 +0100 -Subject: [PATCH 1/3] portage: fix a typo - ---- - backends/portage/portageBackend.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index de1c490..004c18b 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -1658,7 +1658,7 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - is_full_path = True - - progress = PackagekitProgress(compute_equal_steps(values)) -- self.percentage(progress.percentage) -+ self.percentage(progress.percent) - - for percentage, key in izip(progress, values): - --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0012-portage-fix-step-percentage-computation.patch b/app-admin/packagekit-base/files/0012-portage-fix-step-percentage-computation.patch deleted file mode 100644 index 301b56d..0000000 --- a/app-admin/packagekit-base/files/0012-portage-fix-step-percentage-computation.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b76a5ee07912e0a739a5ba39aef6d96e85e58a98 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Fri, 27 Nov 2015 13:00:38 +0100 -Subject: [PATCH 2/3] portage: fix step percentage computation - ---- - backends/portage/portageBackend.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index 004c18b..12918b9 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -73,7 +73,7 @@ from portage.exception import InvalidAtom - - - def compute_equal_steps(iterable): -- return [idx * (100.0 / len(iterable)) / 100.0 -+ return [idx * (100.0 / len(iterable)) - for idx, _ in enumerate(iterable, start=1)] - - --- -2.6.3 - diff --git a/app-admin/packagekit-base/files/0013-portage-do-not-refetch-package-listing-for-no-reason.patch b/app-admin/packagekit-base/files/0013-portage-do-not-refetch-package-listing-for-no-reason.patch deleted file mode 100644 index 0e46401..0000000 --- a/app-admin/packagekit-base/files/0013-portage-do-not-refetch-package-listing-for-no-reason.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 284dd27dc9f73415f49e7502de7ed0bddedcb8c0 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Fri, 27 Nov 2015 13:01:37 +0100 -Subject: [PATCH 3/3] portage: do not refetch package listing for no reason - ---- - backends/portage/portageBackend.py | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/backends/portage/portageBackend.py b/backends/portage/portageBackend.py -index 12918b9..505feec 100755 ---- a/backends/portage/portageBackend.py -+++ b/backends/portage/portageBackend.py -@@ -1003,13 +1003,12 @@ class PackageKitPortageBackend(PackageKitPortageMixin, PackageKitBaseBackend): - def get_packages(self, filters): - self.status(STATUS_QUERY) - self.allow_cancel(True) -+ self.percentage(0) - - cp_list = self._get_all_cp(filters) -- - progress = PackagekitProgress(compute_equal_steps(cp_list)) -- self.percentage(progress.percent) - -- for percentage, cp in izip(progress, self._get_all_cp(filters)): -+ for percentage, cp in izip(progress, cp_list): - for cpv in self._get_all_cpv(cp, filters): - try: - self._package(cpv) --- -2.6.3 - diff --git a/app-admin/packagekit-base/packagekit-base-1.0.10.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild similarity index 91% rename from app-admin/packagekit-base/packagekit-base-1.0.10.ebuild rename to app-admin/packagekit-base/packagekit-base-1.0.11.ebuild index 844e6b6..ebe534f 100644 --- a/app-admin/packagekit-base/packagekit-base-1.0.10.ebuild +++ b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild @@ -9,7 +9,7 @@ EAPI="5" PYTHON_COMPAT=( python2_7 ) VALA_USE_DEPEND="vapigen" -inherit bash-completion-r1 eutils multilib nsplugins python-single-r1 systemd vala +inherit bash-completion-r1 multilib nsplugins python-single-r1 systemd vala MY_PN="PackageKit" MY_P=${MY_PN}-${PV} @@ -69,9 +69,6 @@ S="${WORKDIR}/${MY_P}" RESTRICT="test" src_prepare() { - # Upstreamed portage backend patches - epatch "${FILESDIR}"/* - use vala && vala_src_prepare } @@ -107,8 +104,7 @@ src_install() { einstalldocs - #dodoc AUTHORS MAINTAINERS NEWS README || die "dodoc failed" - #dodoc ChangeLog || die "dodoc failed" + dodoc AUTHORS ChangeLog MAINTAINERS NEWS README if use nsplugin; then dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
