Version bump for gnome-3.4 (bug #416313), now with optional systemd support.

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

4 files changed, 144 insertions, 4 deletions

diff --git a/gnome-extra/gnome-packagekit/ChangeLog b/gnome-extra/gnome-packagekit/ChangeLog
index 37feae81df70..6a092f5d4d6a 100644
--- a/gnome-extra/gnome-packagekit/ChangeLog
+++ b/gnome-extra/gnome-packagekit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-packagekit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.6 2012/05/05 06:25:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-packagekit/ChangeLog,v 1.7 2012/05/19 22:57:05 tetromino Exp $
+
+*gnome-packagekit-3.4.2 (19 May 2012)
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-packagekit-3.4.2.ebuild, metadata.xml:
+  Version bump for gnome-3.4 (bug #416313), now with optional systemd support.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-packagekit-3.2.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
index f9c9f59510f6..aad58d133f20 100644
--- a/gnome-extra/gnome-packagekit/Manifest
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
+DIST gnome-packagekit-3.4.2.tar.xz 4286032 RMD160 f8c6a164796b226db2daba5f2434ffd1eff26eca SHA1 358b4f013fab841354f47566773ec7080ac7d54f SHA256 b7d87db07cf979409b0e997af32b81c02f5324681978f1d687973e7570c5bdca
 EBUILD gnome-packagekit-3.2.1.ebuild 2604 RMD160 d7603a5e0ca36ffb50582123cdcfa6e8de3c0bb5 SHA1 70c2e5afbd4f526c1166cadadebc5a3bb38c8010 SHA256 ebe47ac4e743ed2693061355180d47aa60991940dc234f37d92297cd5b23a059
-MISC ChangeLog 1365 RMD160 bbc9081111c133d3056bd642bebe277ac24c4084 SHA1 8f7007643b0fc2454d4c18df824e4619d84677fd SHA256 07289d0e2772b8adad699c515198830355f696113306a92906ae93d708da75f9
-MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
+EBUILD gnome-packagekit-3.4.2.ebuild 2891 RMD160 c113d82343d789d91de7100170700402e02cfe9a SHA1 17f0075c519048b955573479b2bc8f1162105023 SHA256 aeca24367eb4203926fe35b6c72b34cde55580f090aaeab1c860077ab1045bc7
+MISC ChangeLog 1594 RMD160 1fa3294a5c115699f039c7fdd93664599c02eccc SHA1 811c88f90e9f7a191b741c30239d83bdc9e889cf SHA256 0aa443a1e6683f1fce1233514e93ae7e6a02114529cb3ad0a6731b5299307aa6
+MISC metadata.xml 290 RMD160 f76c0e9fe3da4ff60647da056c2cec17031774ef SHA1 bb6b385621cbc67586366b2f6be6ca4cf54e6ec7 SHA256 04c2cbbe12a89bdc958ec8e86dc27b300c321ade69c3e32459c53b2afc97b1d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuCVHAAoJEJ0WA1zPCt1hGUEIAJk4wdjk+m94mgLTbyclbrn/
+Jw5vuXGuZUNp81TRRw6iSt0n/dkrwsNeHBH5IYt8MhLnfumGp3iDK1lrG11J14kg
+QvthSPG1rL+5zVSzMtvVX5VLGtm6tg1QKmZsek1OE7ho0sexahrDU9OrpTkzhx6z
+Li8CfpB3IvFFJw7tUcEAf5Ww2dj4C8vBBXId8Sn88sOy4Vru/eGr8dgiOj6yeTdw
+UpzWoo0jh5IfdoMjQ0eEjNdv81McffTBaZrj/eUxEI2ku4zBsfnrlw4+PkEGd1v6
+OWGEN4gIMV2HjHHxkqs2p9V1dp1FD7Fua1Lvzib/0cS3AGUvH44A5cA7AWFoOws=
+=8vpP
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.4.2.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.4.2.ebuild
new file mode 100644
index 000000000000..5cee945e078e
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.4.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 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.4.2.ebuild,v 1.1 2012/05/19 22:57:05 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
+
+inherit eutils gnome2 python virtualx
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="http://www.packagekit.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nls systemd 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.7.2[udev]
+	>=app-admin/packagekit-gtk-0.7.2
+	>=media-libs/libcanberra-0.10[gtk3]
+	>=sys-apps/dbus-1.1.2
+	>=sys-power/upower-0.9.0
+
+	media-libs/fontconfig
+	x11-libs/libX11
+
+	systemd? ( >=sys-apps/systemd-42 )
+	!systemd? ( sys-auth/consolekit )
+	udev? ( >=sys-fs/udev-171[gudev] )"
+DEPEND="${RDEPEND}
+	app-text/docbook-sgml-utils
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+# NOTES:
+# app-text/docbook-sgml-utils required for man pages
+# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
+# gtk-doc is generating a useless file, don't need it
+
+# UPSTREAM:
+# misuse of CPPFLAGS/CXXFLAGS ?
+# see if tests can forget about display (use eclass for that ?)
+# 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="${G2CONF}
+		--localstatedir=/var
+		--enable-compile-warnings=yes
+		--enable-iso-c
+		--disable-scrollkeeper
+		--disable-schemas-compile
+		--disable-strict
+		$(use_enable nls)
+		$(use_enable systemd)
+		$(use_enable test tests)
+		$(use_enable udev gudev)"
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Regenerate marshalers for <glib-2.31 compat
+	rm -v src/gpk-marshal.{c,h} || die
+
+	gnome2_src_prepare
+
+	python_clean_py-compile_files
+
+	# disable tests with graphical dialogs and that require packagekitd to be
+	# run with the dummy backend
+	epatch "${FILESDIR}/${PN}-3.1.90-tests.patch"
+
+	# Fails every time packagekit developers make a tiny change to headers
+	sed -e '/gpk_enum_test (test)/ d' -i src/gpk-self-test.c || die
+}
+
+src_test() {
+	unset DISPLAY
+	Xemake check
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize packagekit
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup packagekit
+}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
index dad9001338dc..71d2b76596d5 100644
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ b/gnome-extra/gnome-packagekit/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<herd>gnome</herd>
+<use>
+	<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+		<pkg>sys-auth/consolekit</pkg> for rebooting</flag>
+</use>
 </pkgmetadata>