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

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     14487eb8073dec33dcf55c0d42274c1bd5b76e97
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 07:46:33 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 07:46:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=14487eb8

gnome-base/gnome-settings-daemon: moved to gx86; update live ebuild

---
 .../gnome-settings-daemon-3.4.0.ebuild             |  130 --------------------
 .../gnome-settings-daemon-9999.ebuild              |    5 +-
 2 files changed, 2 insertions(+), 133 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
deleted file mode 100644
index 00aa6b4..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.4.0.ebuild
+++ /dev/null
@@ -1,130 +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.2.2-r1.ebuild,v 1.2 2012/01/12 03:32:00 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"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-IUSE="+colord +cups debug packagekit policykit +short-touchpad-timeout smartcard systemd +udev wacom"
-
-# 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/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-3.3.92:3
-	>=gnome-base/gsettings-desktop-schemas-3.3.0
-	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/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	>=x11-libs/libxklavier-5.0
-	>=media-sound/pulseaudio-0.9.16
-
-	colord? ( >=x11-misc/colord-0.1.13 )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	packagekit? (
-		sys-fs/udev[gudev]
-		>=app-admin/packagekit-base-0.6.12 )
-	smartcard? (
-		sys-fs/udev[gudev] 
-		>=dev-libs/nss-3.11.2 )
-	systemd? ( >=sys-apps/systemd-31 )
-	udev? ( sys-fs/udev[gudev] )
-	wacom? ( >=dev-libs/libwacom-0.3
-		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 )
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xf86miscproto
-	>=x11-proto/xproto-7.0.15"
-
-pkg_setup() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	# TODO: systemd support
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		$(use_enable colord color)
-		$(use_enable cups)
-		$(use_enable debug)
-		$(use_enable debug more-warnings)
-		$(use_enable packagekit)
-		$(use_enable smartcard smartcard-support)
-		$(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.
-	# Revisit if/when upstream adds a setting for customizing the timeout.
-	use short-touchpad-timeout &&
-		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.4.0-optional-color-wacom.patch"
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf || die "doenvd failed"
-}

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 00aa6b4..3ad8a9d 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -54,7 +54,7 @@ COMMON_DEPEND="
 		sys-fs/udev[gudev]
 		>=app-admin/packagekit-base-0.6.12 )
 	smartcard? (
-		sys-fs/udev[gudev] 
+		sys-fs/udev[gudev]
 		>=dev-libs/nss-3.11.2 )
 	systemd? ( >=sys-apps/systemd-31 )
 	udev? ( sys-fs/udev[gudev] )
@@ -87,7 +87,6 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	# README is empty
 	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-	# TODO: systemd support
 	G2CONF="${G2CONF}
 		--disable-static
 		--disable-schemas-compile
@@ -126,5 +125,5 @@ src_install() {
 	gnome2_src_install
 
 	echo 'GSETTINGS_BACKEND="dconf"' >> 51gsettings-dconf
-	doenvd 51gsettings-dconf || die "doenvd failed"
+	doenvd 51gsettings-dconf
 }