[gentoo-commits] proj/gnome:gnome-next commit in: gnome-extra/gnome-packagekit/files/, gnome-extra/gnome-packagekit/

[Alexandre Restovtsev]

commit:     959b9f4ad7ba541ff1080c021b98d2df4325256e
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 07:25:38 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 07:25:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=959b9f4a

gnome-extra/gnome-packagekit: 3.0.3 → 3.1.90

Bump to gnome-3.1.x version. Add a patch to disable tests that cannot be
run from portage, and remove the RESTRICT.

---
 .../files/gnome-packagekit-3.1.90-tests.patch      |   32 ++++++++++++++++++++
 ...3.0.3.ebuild => gnome-packagekit-3.1.90.ebuild} |   16 +++++----
 2 files changed, 41 insertions(+), 7 deletions(-)

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 0000000..ae6fcaa
--- /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@×××××.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.1.90.ebuild
similarity index 88%
rename from gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
rename to gnome-extra/gnome-packagekit/gnome-packagekit-3.1.90.ebuild
index 04bc3cf..dc79a5f 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.0.3.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.1.90.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI="3"
+GNOME_TARBALL_SUFFIX="xz"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2"
 
@@ -16,15 +17,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~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
 	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
 	>=sys-power/upower-0.9.0
@@ -42,12 +46,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
@@ -85,6 +83,10 @@ 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() {