Version bump, fixes disk space calculation. Add optional systemd support (bug #416309, thanks to Christoph Brill (egore)).

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

4 files changed, 149 insertions, 10 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 298d978c14b0..4e17a325183e 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.101 2012/05/14 13:15:30 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.102 2012/05/19 22:12:33 tetromino Exp $
+
+*gnome-control-center-3.4.2 (19 May 2012)
+
+  19 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-control-center-3.4.2.ebuild, metadata.xml:
+  Version bump, fixes disk space calculation. Add optional systemd support (bug
+  #416309, thanks to Christoph Brill (egore)).
 
   14 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-control-center-3.4.1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 0a9a5a3c4cd5..5d7234487ea8 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -15,20 +15,22 @@ AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
 DIST gnome-control-center-3.2.2.tar.xz 4225196 RMD160 6a97f6cf9824c99daf3b33c0e347131b7024988f SHA1 e946ab719625e6f793141434179a932c35ece183 SHA256 e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369
 DIST gnome-control-center-3.4.1.tar.xz 4416236 RMD160 0823b75990b285d93826ae71d4caab83e342cf35 SHA1 0ba55a946211f70ecb7c195cfff8ca73a8f01c65 SHA256 c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1
+DIST gnome-control-center-3.4.2.tar.xz 4267688 RMD160 e5ef20cf80d148cd0a94a9d42206ac17805dd64d SHA1 f5296d1ae8eade22ad89fe30cfe32420c068f01b SHA256 efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 RMD160 400f355138bc3cc71bde6a48905ef3a6ffd64a43 SHA1 c0d41d57a9d3ac2b5230dd45f3fcf32b3f72c630 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270
 EBUILD gnome-control-center-3.2.2-r1.ebuild 3571 RMD160 312489edc0c7af7735e5e26a0c5a7ef51b50ac44 SHA1 bdcdde4ba2d4b3a0d7911f99721af7e7d3b41696 SHA256 6d1abc936f24c89b964daa0333d97cfd4ad6f95330466bfd5a0d2eb354e1b4ae
 EBUILD gnome-control-center-3.2.2.ebuild 3294 RMD160 671fbd3a72126da31caa358d1cb393e1a3a8e05f SHA1 cc9c5f14fcba378c2274074804a379f41165e6e3 SHA256 8d6a88f6bd1b5d5894c22739862409cf97c2662f1cd3e5c9a86946c6fc3ff42a
 EBUILD gnome-control-center-3.4.1.ebuild 3850 RMD160 fdee71f81089a6ad0f6811df1e0c3ab4470f065f SHA1 18a954924831a147d5ce1f65049be65be8b2b7dc SHA256 c5b296fa37aeef6b713b0b7c9ef9592d35188296fc5f254e261f71e1049cd0c2
-MISC ChangeLog 56381 RMD160 cd4dcdc464a8d133be8f38f2a565048cb3d73433 SHA1 b1263dbadd383687dced5af39d431e0ceb6acefc SHA256 b500e8137aa1171b97164d806796617ca5cfa4fd26a4cf7227d7706138ac336b
-MISC metadata.xml 606 RMD160 b90e138cd8311413b309d6f8dfccdc94ef347a23 SHA1 905f3f715944caaafdbafa2320d91a39d836f01f SHA256 72125f23efce3510c80ef6bd03c3b306dbdabbe7f7fa8478bf895fccf88164a0
+EBUILD gnome-control-center-3.4.2.ebuild 3908 RMD160 2a4884a1a320388e0e1456732d98197d4762b638 SHA1 65430695b233391b9c9c10d2cccbf6c148e7bfe6 SHA256 f2eee63af2d715141aa08e6caf7c42fb34f9b6179e635295e73127fa8242bb39
+MISC ChangeLog 56663 RMD160 8d4ab6c18ad8235f470f83ef68d220e3287f65e1 SHA1 a0dc7a5c53c5802f8858bd17c11a3e7151022661 SHA256 935fc3bb86236431907ceea2d1f911c9f70b02fb2edbba4ea664912b03f576ac
+MISC metadata.xml 734 RMD160 4bb175f304af7d332411634034cd27eedfcd766a SHA1 c4401e101b27cad60966b153f2bad30ad7ab1e52 SHA256 a0b1ff067c0b24471a16aa6862bddc3d712b5fffb0489bdf84f5297fa0593bc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsQV3AAoJEJ0WA1zPCt1hgq8H/1CIUATcpeJM/oH3CdMWPq6q
-58YBffY2rXo7C7dr3YyufVhEo2Bd27xuPlwypPXqZpOMc9V6GlGW8GGIwoK8cz6z
-jNK9BeZhT17ikQMNs535c8icQU33RK2l1XfHKKMS9FGa28ArqlhTrSMxtqJq/OcF
-GIw9VFKBk4rRin7zhG1t+dBiEA82RT41ZgIcbXqcvuoZQQ5kAzAHTWaZHXa6gVyG
-wB9PlwfNry562nsKUy6mAiv8WBIv0H1SoK7eituMxOb/S4wHQTY/Jp9lIWL0h4gH
-iqsCBBHwoGbdvaE9ZAM74Qhz+h8nCy1UCkN0nm+aQYyunbQD6CrRsmMOVidSH7E=
-=I9rz
+iQEcBAEBAgAGBQJPuBrXAAoJEJ0WA1zPCt1hjr8H/RYyxlTgS62jNVNnG2NUrZby
+hxWVryFbPdp+b5YQFc0AqKnrnwESwx/EAMfnzJ5N3ZGCRPXQilB/QDYxr8Fa8Di6
+I66MhmU18at4BvqUwG7DyljrOPGkDdcFAkvuikzGEUkchSJKDzUkP0IqvBbuPre3
+GlnZ8qxa5SSosOESbW1FnLXr/XrHt8jEN9/scAG1mFQYKXN/hrndemPoaxEyA6Tf
+OZ+KBpJSzZBQvLaMIuopXbbcmO+ZkP/GpIla7q06uRRGISkMSRTbzoUxlb435HZC
+6lkBG83rLdyvu/MzIi0ZycNAzWS21ZVp7/IroZ+omFSxq1BO9tsLip83Wc/IeXc=
+=HNux
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
new file mode 100644
index 000000000000..5509a9057064
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2.ebuild,v 1.1 2012/05/19 22:12:33 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GNOME Desktop Configuration Tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb systemd wacom"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
+# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
+#
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb
+# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325)
+# g-s-d[policykit] needed for bug #403527
+COMMON_DEPEND="
+	>=dev-libs/glib-2.31.0:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.3.5:3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	>=gnome-base/gnome-desktop-3.1.91:3
+	>=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit]
+	>=gnome-base/libgnomekbd-2.91.91
+
+	app-text/iso-codes
+	dev-libs/libxml2:2
+	gnome-base/gnome-menus:3
+	gnome-base/libgtop:2
+	media-libs/fontconfig
+	net-libs/gnome-online-accounts
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-0.9.16[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.9.1
+	>=x11-libs/libnotify-0.7.3
+
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libxklavier-5.1
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
+	cheese? (
+		media-libs/gstreamer:0.10
+		>=media-video/cheese-3.3.5 )
+	colord? ( >=x11-misc/colord-0.1.8 )
+	cups? ( >=net-print/cups-1.4[dbus] )
+	networkmanager? (
+		>=gnome-extra/nm-applet-0.9.1.90
+		>=net-misc/networkmanager-0.8.997 )
+	socialweb? ( net-libs/libsocialweb )
+	systemd? ( >=sys-apps/systemd-31 ) 
+	wacom? ( >=dev-libs/libwacom-0.3
+		x11-libs/libXi )"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+	app-admin/apg
+	sys-apps/accountsservice
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? ( net-print/cups-pk-helper )
+	!systemd? ( sys-auth/consolekit )
+	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40.1
+	virtual/pkgconfig
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_enable bluetooth)
+		$(use_with cheese)
+		$(use_enable colord color)
+		$(use_enable cups)
+		$(use_with socialweb libsocialweb)
+		$(use_enable systemd)
+		$(use_enable wacom)"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+	# Make colord plugin optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.4.1-optional-bluetooth-colord-wacom.patch"
+	eautoreconf
+
+	gnome2_src_prepare
+
+	# panels/datetime/Makefile.am gets touched as a result of something in our
+	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index f74a305b5d12..bc5209b07a1e 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -9,6 +9,8 @@
 			accounts panel using <pkg>media-video/cheese</pkg></flag>
 		<flag name="socialweb">Add support for configuring social web service
 			settings using <pkg>net-libs/libsocialweb</pkg></flag>
+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
+			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 		<flag name="wacom">Enable support for Wacom tablets and drawing
 			devices</flag>
 	</use>