[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

[Gilles Dartiguelongue]

commit:     cb8b7ec2d79adae9e5be0ae831d4d9ade627f22f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 30 21:24:10 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Oct 30 21:27:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb8b7ec2

gnome-base/gnome-settings-daemon: 3.6.0-r1 → 3.6.1

Drop dconf varible env.d creation since it is handled by dconf ebuild.

---
 .../gnome-settings-daemon-3.6.0-crashfix.patch     |   29 --------------------
 ...1.ebuild => gnome-settings-daemon-3.6.1.ebuild} |   26 ++++++-----------
 .../gnome-settings-daemon-9999.ebuild              |   23 ++++++---------
 gnome-base/gnome-settings-daemon/metadata.xml      |   19 +++++++++++++
 4 files changed, 37 insertions(+), 60 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
deleted file mode 100644
index 3980fbd..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.6.0-crashfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dcfe290500e0d68a71f09e576e28c09f7572cef6 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@××××××.net>
-Date: Fri, 21 Sep 2012 11:46:34 +0000
-Subject: housekeeping: Don't crash on exit
-
-If a notification popup was shown, and then dismissed, notification
-wouldn't have been reset, and we would crash on exit trying to
-dismiss it.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=859383
-https://bugzilla.gnome.org/show_bug.cgi?id=684548
-
-Also includes 63b8c025d446b1a8d7c5fdee92d624dd604f3a24 (typo fix)
-
----
-diff --git a/plugins/housekeeping/gsd-disk-space.c b/plugins/housekeeping/gsd-disk-space.c
-index 4c6b3c5..51e4a8e 100644
---- a/plugins/housekeeping/gsd-disk-space.c
-+++ b/plugins/housekeeping/gsd-disk-space.c
-@@ -294,6 +294,7 @@ static void
- on_notification_closed (NotifyNotification *notification)
- {
-         g_object_unref (notification);
-+        notification = NULL;
- }
- 
- static gboolean
---
-cgit v0.9.0.2

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
similarity index 90%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
index 016f92b..b7f5c48 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.0-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.1.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )"
+	wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
+"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -72,7 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
 
-	!systemd? ( sys-auth/consolekit )"
+	!systemd? ( sys-auth/consolekit )
+"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -82,9 +85,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
+	>=x11-proto/xproto-7.0.15
+"
 
-pkg_setup() {
+src_prepare() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	G2CONF="${G2CONF}
@@ -101,9 +105,7 @@ pkg_setup() {
 		$(use_enable systemd)
 		$(use_enable udev gudev)
 		$(use_enable wacom)"
-}
 
-src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some
 	# people, so revert it if USE=short-touchpad-timeout.
@@ -114,9 +116,6 @@ src_prepare() {
 	# Make colord and wacom optional; requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
 
-	# Fixes crash; in next release
-	epatch "${FILESDIR}/${P}-crashfix.patch"
-
 	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
@@ -125,10 +124,3 @@ src_prepare() {
 src_test() {
 	Xemake check
 }
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf
-}

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 162a4de..b7f5c48 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -58,8 +58,10 @@ COMMON_DEPEND="
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.6
-		x11-drivers/xf86-input-wacom )"
+	wacom? (
+		>=dev-libs/libwacom-0.6
+		x11-drivers/xf86-input-wacom )
+"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -72,7 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-color-manager-3.1.1
 	!<gnome-extra/gnome-power-manager-3.1.3
 
-	!systemd? ( sys-auth/consolekit )"
+	!systemd? ( sys-auth/consolekit )
+"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
@@ -82,9 +85,10 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
+	>=x11-proto/xproto-7.0.15
+"
 
-pkg_setup() {
+src_prepare() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	G2CONF="${G2CONF}
@@ -101,9 +105,7 @@ pkg_setup() {
 		$(use_enable systemd)
 		$(use_enable udev gudev)
 		$(use_enable wacom)"
-}
 
-src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some
 	# people, so revert it if USE=short-touchpad-timeout.
@@ -122,10 +124,3 @@ src_prepare() {
 src_test() {
 	Xemake check
 }
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf
-}

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
new file mode 100644
index 0000000..7e1cb01
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="colord">Support color management using
+			<pkg>x11-misc/colord</pkg></flag>
+    <flag name="i18n">Enable support for enhanced input methods through
+			<pkg>app-i18n/ibus</pkg></flag>
+    <flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+    <flag name="short-touchpad-timeout">Change the touchpad timeout so that 
+			it's effective for fast typists</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>
+</pkgmetadata>