Bump to 3.2.1 from the gnome overlay; drop old. Notable changes: UI improvements. Enable tests that can be reasonably run on a gentoo system.

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

4 files changed, 60 insertions, 17 deletions

diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index 267a48387388..0c08ac6b85f5 100644
--- a/gnome-extra/gnome-packagekit/ChangeLog
+++ b/gnome-extra/gnome-packagekit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-packagekit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.2 2011/10/28 00:55:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.3 2011/11/22 20:30:10 tetromino Exp $
+
+*gnome-packagekit-3.2.1 (22 Nov 2011)
+
+  22 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-packagekit-3.0.3.ebuild, +files/gnome-packagekit-3.1.90-tests.patch,
+  +gnome-packagekit-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay; drop old. Notable changes: UI
+  improvements. Enable tests that can be reasonably run on a gentoo system.
 
   28 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-packagekit-3.0.3.ebuild:
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index 9e583c35ada9..a5de104453a3 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-packagekit-3.0.3.tar.bz2 4716341 RMD160 6ed6ba9a0d11ee71cbf59b8362d53f994b45aa61 SHA1 7778d2dbe310f432c3b84ad30b576b08bc3eb92f SHA256 9bf29bfb1de8eace9241f21132907676a8f50fda82fe4bd0c973736148cb8771
-EBUILD gnome-packagekit-3.0.3.ebuild 2570 RMD160 814b2fc86e6cf205f02c907a10a6a023a7c710ea SHA1 140845ff7c890b5f7382c112e8ae85892cfd39b8 SHA256 cdb9c21ffa2509f49777311b0a6ae5d4d8567f2f395ee00b957a782886c552bd
-MISC ChangeLog 577 RMD160 6cd640eb6462ca49fce55237c866bdc447f32d76 SHA1 4bd8aba4d3262d459b696285d86c066a7d72bb08 SHA256 a82601e620d7f238a0fee28792335e114d41ce27a87eeff48cb916cbb2a394e7
+AUX gnome-packagekit-3.1.90-tests.patch 946 RMD160 844391a9aa1264784e105672c890fdcb5b23976c SHA1 972c0226324c3e02772de30f2eeec1b2b28afaae SHA256 d3ab48c5bae468cdeb62ce50bf195c9fe617649dadeba9ab9cbb4c6c238a9fad
+DIST gnome-packagekit-3.2.1.tar.xz 4303912 RMD160 233bcea1611bcab27808daca2d22889c9c940f5a SHA1 680f353b3ab355a686448ba5a58b36bdf8a8bfda SHA256 7a6383a2a91fd29c0b6fd9b8900d498efd2e38b89149470433748d989926c341
+EBUILD gnome-packagekit-3.2.1.ebuild 2599 RMD160 28154b492f70656bda284b65bc7b2187422863d0 SHA1 9e4b09bcb392ca3f012a29e7e8c876bd8b61b5c6 SHA256 6d222df6897d562befd7200ba80c26426a88c0d86f090f40cb072767d6bee0b2
+MISC ChangeLog 934 RMD160 9a7e84b3f264455991a71c24bc5208ea717498d9 SHA1 4cc48cedbe3f4aea75fe78880902796178ad109b SHA256 371763a00eaf7f7f81ed8efd805b7cdd0ac528ab176775b0a229a02746325e1e
 MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6p/X4ACgkQdjK8w9WeBnA+fAD/aPLOz+nZL9yA55t8lumhaCLh
-M71LAhQu70WspVgDEssA/jlEsn25VWqxiKSiRcz8h0adHu+rmhh4Em6kByYQ+re3
-=7rCv
+iF4EAREIAAYFAk7MBlkACgkQdjK8w9WeBnA7OQD8D+hm0Za7XJv+5SO1A32KjZFQ
+7xNCFSM2wR9Dv7GYVt8BAIRr/dT+OlGxItKQmD/YOv9tkCTem2O8/96CgJ4hoOgK
+=Oca/
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-packagekit/files/gnome-packagekit-3.1.90-tests.patch b/gnome-extra/gnome-packagekit/files/gnome-packagekit-3.1.90-tests.patch
new file mode 100644
index 000000000000..ae6fcaa34bd3
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/files/gnome-packagekit-3.1.90-tests.patch
@@ -0,0 +1,32 @@
+From 553df35a405fccd679bdb16e65c79deb84928865 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 7 Sep 2011 03:21:42 -0400
+Subject: [PATCH] Disable tests that cannot be run from portage
+
+Disable tests with modal dialogs and the tasks test that requires for
+packagekit to preferentially use the dummy backend.
+---
+ src/gpk-self-test.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gpk-self-test.c b/src/gpk-self-test.c
+index f12ce73..ba01649 100644
+--- a/src/gpk-self-test.c
++++ b/src/gpk-self-test.c
+@@ -53,10 +53,10 @@ main (int argc, char **argv)
+ 	gpk_common_test (test);
+ //	gpk_dbus_test (test);
+ 	gpk_language_test (test);
+-	gpk_error_test (test);
++//	gpk_error_test (test);
+ //	gpk_client_test (test);
+-	gpk_modal_dialog_test (test);
+-	gpk_task_test (test);
++//	gpk_modal_dialog_test (test);
++//	gpk_task_test (test);
+ 
+ 	return egg_test_finish (test);
+ }
+-- 
+1.7.6.1
+
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild
index 873c1ba7ace0..5e02d9888f31 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild,v 1.2 2011/10/28 00:55:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/gnome-packagekit-3.2.1.ebuild,v 1.1 2011/11/22 20:30:10 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2"
 
@@ -16,15 +16,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc nls test udev"
 
+# gdk-pixbuf ised in gpk-animated-icon
+# pango used on gpk-common
 RDEPEND="
 	>=dev-libs/glib-2.25.9:2
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-2.91.0:3
 	>=x11-libs/libnotify-0.7.0
+	x11-libs/pango
 	>=dev-libs/dbus-glib-0.73
 
 	>=app-admin/packagekit-base-0.6.5[udev]
 	>=app-admin/packagekit-gtk-0.6.5
-	>=gnome-base/gnome-menus-2.24.1:0
 	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
 	>=sys-power/upower-0.9.0
@@ -42,12 +45,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
-# Fails, recheck for next release
-# (gpk-self-test:9412): GnomePackageKit-WARNING **: Unknown error
-# FAILED [failed to get cannot-fetch-sources]
-# FAIL: gpk-self-test
-RESTRICT="test"
-
 # NOTES:
 # app-text/docbook-sgml-utils required for man pages
 # app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
@@ -78,6 +75,7 @@ pkg_setup() {
 		$(use_enable test tests)
 		$(use_enable udev gudev)"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -85,11 +83,15 @@ src_prepare() {
 
 	# fix pyc/pyo generation
 	ln -sfn $(type -P true) py-compile
+
+	# disable tests with graphical dialogs and that require packagekitd to be
+	# run with the dummy backend
+	epatch "${FILESDIR}/${PN}-3.1.90-tests.patch"
 }
 
 src_test() {
 	unset DISPLAY
-	Xemake check || die "make check failed"
+	Xemake check
 }
 
 pkg_postinst() {