revision bump, add upstream patch for entropy

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 57 insertions, 4 deletions

diff --git a/app-admin/packagekit-base/ChangeLog b/app-admin/packagekit-base/ChangeLog
index 956bada246fd..b8fe50e67e22 100644
--- a/app-admin/packagekit-base/ChangeLog
+++ b/app-admin/packagekit-base/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/packagekit-base
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.2 2011/08/02 05:45:08 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/ChangeLog,v 1.3 2011/08/09 10:54:23 lxnay Exp $
+
+*packagekit-base-0.6.17-r1 (09 Aug 2011)
+
+  09 Aug 2011; Fabio Erculiani <lxnay@gentoo.org>
+  -packagekit-base-0.6.17.ebuild, +packagekit-base-0.6.17-r1.ebuild,
+  +files/packagekit-base-0.6.17-entropy-extra-downloads-support.patch:
+  revision bump, add upstream patch for entropy
 
 *packagekit-base-0.6.17 (02 Aug 2011)
 
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index e5217bca0e52..11119dc899e4 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,6 +1,7 @@
+AUX packagekit-base-0.6.17-entropy-extra-downloads-support.patch 1700 RMD160 c37400f3590fdaaad17a50850827dc7b08016af0 SHA1 1681081a791907b4a6f17faa2cc32aae51d1140e SHA256 224b0ef6ec87af14bac62e20f35264791891b72e17d11d15e2f4a9f323fbe266
 DIST PackageKit-0.6.16.tar.xz 7900928 RMD160 67a6b0cb37c1d58b8a63391c46ab2de9d84f90f2 SHA1 30ca0c4f9f945abdbeb237256254d32581f8e417 SHA256 28fc2149e2dac4bed5b6b0479488dacc8af7e8a18556851711502b26de567e67
 DIST PackageKit-0.6.17.tar.xz 7890112 RMD160 2121081f2155324c592b3e3c7c8a5ac88c368bf3 SHA1 c538dd1a87eca8a1461dcb5839931bb23f792370 SHA256 7d6e0d0c63d0a0ef9b393a80ae3711e073cd4b884ff4996d5622f688e28d63c3
 EBUILD packagekit-base-0.6.16.ebuild 4880 RMD160 4d47b9ff47fc7b2e09cee6c14c2dfc6ab4facd76 SHA1 046c31a7b14060c547fa50b7968d7cd3f7746b12 SHA256 a4146d99dd599f83a811cb121ea76ccde69ba6d60c14515d1c5c87ce06f5f173
-EBUILD packagekit-base-0.6.17.ebuild 4880 RMD160 2804be4b9653ec72a87f7c95210cb915c3affe83 SHA1 d3cb2ebc7f9dcf630f93d50c01d9befba104c0c3 SHA256 6daf10d38fc06cfc83cfaf034db07c5ffcd077772d77c50762593dc03c184e6a
-MISC ChangeLog 513 RMD160 8e94e5c8bfdb798228d67a320fa44c28d837d79a SHA1 af444d2f248b1414dd5b83c3856473cfb41c6034 SHA256 f75e63ddc186058a3a77bc4b4851bf3082a4599134c4a7b732b2e97f76fc4cb3
+EBUILD packagekit-base-0.6.17-r1.ebuild 4967 RMD160 49eda49e8180a02110e575bc469fbddd02814398 SHA1 8c3b5632f98cca563d7952ef601286158aae7e3b SHA256 9f4b6922e26c82df1870651e225c35d72ae3d5d4674a990f4656c1c78f15ff21
+MISC ChangeLog 794 RMD160 13910c84f53377c6bc53c9fc09fa626943e2abd1 SHA1 a78330274f2744d3c5c95b1bddc78806bfb95b43 SHA256 43bad612da7f15bc51628dcd19612fead04f4cb9c2882aef09df238a3157c99e
 MISC metadata.xml 785 RMD160 7dacc6f63cc0eb060dde5b0f6e29392de30a3326 SHA1 4be03153c0372bb94b4e5dc68f43a3f9bcca4796 SHA256 11d2883f4f23f8647f0f1d17920af6787c4160d547ee43d4d8d06fa1b28a80f1
diff --git a/app-admin/packagekit-base/files/packagekit-base-0.6.17-entropy-extra-downloads-support.patch b/app-admin/packagekit-base/files/packagekit-base-0.6.17-entropy-extra-downloads-support.patch
new file mode 100644
index 000000000000..2b4030602f6e
--- /dev/null
+++ b/app-admin/packagekit-base/files/packagekit-base-0.6.17-entropy-extra-downloads-support.patch
@@ -0,0 +1,41 @@
+commit 5d6419ac83883e4d2161032f65d565df8eb007ac
+Author: Fabio Erculiani <lxnay@sabayon.org>
+Date:   Tue Aug 9 12:48:16 2011 +0200
+
+    entropy: properly account package size when "extra" downloads are available
+
+diff --git a/backends/entropy/entropyBackend.py b/backends/entropy/entropyBackend.py
+index 02b83a7..fe8c609 100755
+--- a/backends/entropy/entropyBackend.py
++++ b/backends/entropy/entropyBackend.py
+@@ -244,10 +244,28 @@ class PackageKitEntropyMixin(object):
+         packages, the on-disk size is returned instead.
+         """
+         pkg_id, c_repo = pkg_match
++        size = 0
+         if c_repo is self._entropy.installed_repository():
+-            return c_repo.retrieveOnDiskSize(pkg_id)
++            size += c_repo.retrieveOnDiskSize(pkg_id)
+         else:
+-            return c_repo.retrieveSize(pkg_id)
++            size += c_repo.retrieveSize(pkg_id)
++
++        supports_extra_download = hasattr(c_repo, "retrieveExtraDownload")
++        if not supports_extra_download:
++            return size
++
++        cl_id = etpConst['system_settings_plugins_ids']['client_plugin']
++        debug = self._settings[cl_id]['misc']['splitdebug']
++        extra_downloads = c_repo.retrieveExtraDownload(pkg_id)
++        for extra_download in extra_downloads:
++            if (not debug) and (extra_download['type'] == "debug") and \
++                (c_repo is not self._entropy.installed_repository()):
++                continue
++            if c_repo is self._entropy.installed_repository():
++                size += extra_download['disksize']
++            else:
++                size += extra_download['size']
++        return size
+ 
+     def _pk_feed_sorted_pkgs(self, pkgs):
+         """
diff --git a/app-admin/packagekit-base/packagekit-base-0.6.17.ebuild b/app-admin/packagekit-base/packagekit-base-0.6.17-r1.ebuild
index 6da417f8eb72..090207c95672 100644
--- a/app-admin/packagekit-base/packagekit-base-0.6.17.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-0.6.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.17.ebuild,v 1.1 2011/08/02 05:45:08 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/packagekit-base/packagekit-base-0.6.17-r1.ebuild,v 1.1 2011/08/09 10:54:23 lxnay Exp $
 
 EAPI="3"
 
@@ -67,6 +67,10 @@ RESTRICT="test" # tests are failing atm
 # documentation/website with --enable-doc-install
 # failing tests
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-entropy-extra-downloads-support.patch"
+}
+
 src_configure() {
 	local myconf=""