[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-packagekit/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     c4c1dbb396c7d41e4d6643d4b5f5cee8383a3dcf
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 23:57:16 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 00:48:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c4c1dbb3

gnome-base/gnome-packagekit: bump to 2.91.5, remove 2.30.1

* Haven't been able to test it well since I don't use portage-2.2

---
 ....30.1.ebuild => gnome-packagekit-2.91.5.ebuild} |   74 ++++++++++++--------
 1 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-2.30.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-2.91.5.ebuild
similarity index 56%
rename from gnome-extra/gnome-packagekit/gnome-packagekit-2.30.1.ebuild
rename to gnome-extra/gnome-packagekit/gnome-packagekit-2.91.5.ebuild
index e31c43b..7bd50a0 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-2.30.1.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-2.91.5.ebuild
@@ -2,46 +2,51 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-
+EAPI="3"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
-inherit eutils python gnome2
+inherit eutils gnome2 python virtualx
 
 DESCRIPTION="PackageKit client for the GNOME desktop"
 HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="udev nls"
+IUSE="doc nls test udev"
 
 RDEPEND="
-	udev? ( >=sys-fs/udev-145[extras] )
-	>=app-portage/packagekit-0.5.5
+	>=dev-libs/glib-2.25.9:2
+	>=x11-libs/gtk+-2.91.0:3
+	>=x11-libs/libnotify-0.7.0
 	>=dev-libs/dbus-glib-0.73
-	>=dev-libs/glib-2.18.0:2
-	>=dev-libs/libunique-1.0.0:0
-	>=gnome-base/gconf-2.22:2
+
+	>=app-portage/packagekit-0.6.5
+	>=gnome-base/gnome-control-center-2.31.4
 	>=gnome-base/gnome-menus-2.24.1
-	media-libs/fontconfig
-	>=media-libs/libcanberra-0.10[gtk]
+	>=media-libs/libcanberra-0.10[gtk3]
 	>=sys-apps/dbus-1.1.2
-	|| ( sys-power/upower >=sys-apps/devicekit-power-007 )
-	>=x11-libs/gtk+-2.19.3:2
-	>=x11-libs/libnotify-0.4.3"
+	>=sys-power/upower-0.9.0
+
+	media-libs/fontconfig
+	x11-libs/libX11
+
+	udev? ( >=sys-fs/udev-145[extras] )"
 DEPEND="${RDEPEND}
 	app-text/docbook-sgml-utils
 	>=app-text/gnome-doc-utils-0.3.2
 	dev-libs/libxslt
-	>=dev-util/intltool-0.35.0
+	>=dev-util/intltool-0.35
 	dev-util/pkgconfig
-	sys-devel/gettext"
-
-RESTRICT="test" # need DISPLAY
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.9 )"
 
-DOCS="AUTHORS MAINTAINERS NEWS README TODO"
+# 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
@@ -54,37 +59,46 @@ DOCS="AUTHORS MAINTAINERS NEWS README TODO"
 # intltool and gettext only with +nls
 
 pkg_setup() {
+	DOCS="AUTHORS MAINTAINERS NEWS README TODO"
 	# localstatedir: /var for upstream /var/lib for gentoo
 	# scrollkeeper and schemas-install: managed by gnome2 eclass
 	# tests: not working (need DISPLAY)
 	# gtk-doc: not needed (builded file is useless)
+#		--enable-libtool-lock
+#		--disable-dependency-tracking
+#		--enable-option-checking
 	G2CONF="
 		--localstatedir=/var
-		--enable-option-checking
-		--disable-dependency-tracking
-		--enable-libtool-lock
 		--enable-compile-warnings=yes
 		--enable-iso-c
 		--disable-scrollkeeper
-		--disable-schemas-install
-		--disable-tests
-		--disable-gtk-doc
+		--disable-schemas-compile
 		--disable-strict
 		$(use_enable nls)
+		$(use_enable test tests)
 		$(use_enable udev gudev)"
+	python_set_activer_version 2
 }
 
 src_prepare() {
+	gnome2_src_prepare
+
 	# fix pyc/pyo generation
-	rm py-compile || die "rm py-compile failed"
-	ln -s $(type -P true) py-compile
+	ln -sfn $(type -P true) py-compile
+}
+
+src_test() {
+	unset DISPLAY
+	Xemake check || die "make check failed"
 }
 
 pkg_postinst() {
+	gnome2_pkg_postinst
 	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/packagekit/
+	python_mod_optimize packagekit
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/packagekit/
+	gnome2_pkg_postrm
+	python_mod_cleanup packagekit
 }