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

[Gilles Dartiguelongue]

commit:     d452e6ffcbca7f285f8b568a5e813bcc3d9d2ecd
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 21:44:29 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:44:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d452e6ff

gnome-base/gnome-settings-daemon: moved to gx86

    * Sync live ebuild with gx86 changes.

---
 .../gnome-settings-daemon-3.6.3.ebuild             |  126 --------------------
 .../gnome-settings-daemon-9999.ebuild              |   55 +++++----
 2 files changed, 28 insertions(+), 153 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
deleted file mode 100644
index 9512c1d..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.6.3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.2 2012/08/07 08:59:55 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/gnome-desktop-3.5.3:3
-	>=gnome-base/gsettings-desktop-schemas-3.5.90
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-0.9.16
-	>=sys-power/upower-0.9.11
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	>=media-sound/pulseaudio-0.9.16
-
-	colord? ( >=x11-misc/colord-0.1.13 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	packagekit? (
-		virtual/udev[gudev]
-		>=app-admin/packagekit-base-0.7.4 )
-	smartcard? (
-		virtual/udev[gudev]
-		>=dev-libs/nss-3.11.2 )
-	systemd? ( >=sys-apps/systemd-31 )
-	udev? ( virtual/udev[gudev] )
-	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
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	>=x11-themes/gnome-themes-standard-2.91
-	>=x11-themes/gnome-icon-theme-2.91
-	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-
-	!systemd? ( sys-auth/consolekit )
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15
-"
-
-src_prepare() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		--enable-man
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable debug more-warnings)
-		$(use_enable i18n ibus)
-		$(use_enable packagekit)
-		$(use_enable smartcard smartcard-support)
-		$(use_enable systemd)
-		$(use_enable udev gudev)
-		$(use_enable wacom)"
-
-	# 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.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}

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 9512c1d..15ad767 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.2.ebuild,v 1.2 2012/08/07 08:59:55 tetromino Exp $
+# $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -20,14 +20,18 @@ IUSE="+colord +cups debug +i18n packagekit policykit +short-touchpad-timeout sma
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
+REQUIRED_USE="
+	packagekit? ( udev )
+	smartcard? ( udev )
+"
 
 # colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
 	>=x11-libs/gtk+-3.3.4:3
-	>=gnome-base/gnome-desktop-3.5.3:3
+	>=gnome-base/gnome-desktop-3.5.3:3=
 	>=gnome-base/gsettings-desktop-schemas-3.5.90
 	media-fonts/cantarell
 	media-libs/fontconfig
@@ -37,7 +41,7 @@ COMMON_DEPEND="
 	>=sys-power/upower-0.9.11
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3
+	>=x11-libs/libnotify-0.7.3:=
 	x11-libs/libX11
 	x11-libs/libxkbfile
 	x11-libs/libXi
@@ -45,17 +49,12 @@ COMMON_DEPEND="
 	x11-libs/libXfixes
 	x11-libs/libXtst
 	x11-libs/libXxf86misc
-	>=media-sound/pulseaudio-0.9.16
 
 	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
-	packagekit? (
-		virtual/udev[gudev]
-		>=app-admin/packagekit-base-0.7.4 )
-	smartcard? (
-		virtual/udev[gudev]
-		>=dev-libs/nss-3.11.2 )
+	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
+	smartcard? ( >=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( virtual/udev[gudev] )
 	wacom? (
@@ -89,11 +88,26 @@ DEPEND="${COMMON_DEPEND}
 "
 
 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.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
+
+	# Make colord and wacom optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
+
+	[[ ${PV} != 9999 ]] && eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-schemas-compile
 		--enable-man
 		$(use_enable colord color)
 		$(use_enable cups)
@@ -105,20 +119,7 @@ src_prepare() {
 		$(use_enable systemd)
 		$(use_enable udev gudev)
 		$(use_enable wacom)"
-
-	# 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.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}/${PN}-3.5.91-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.5.91-optional-color-wacom.patch"
-
-	[[ ${PV} != 9999 ]] && eautoreconf
-
-	gnome2_src_prepare
+	gnome2_src_configure
 }
 
 src_test() {