Fix files

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 100 insertions, 147 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 2dfb7922a21b..1ffb6c3312e2 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.131 2013/12/24 17:53:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.132 2013/12/24 17:55:14 pacho Exp $
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-settings-daemon-3.10.2-optional.patch,
+  -files/gnome-settings-daemon-3.10.2.ebuild:
+  Fix files
 
 *gnome-settings-daemon-3.10.2 (24 Dec 2013)
 *gnome-settings-daemon-3.10.2 (24 Dec 2013)
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 9b8f5cf5e111..dcff9bdc6995 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -7,7 +7,7 @@ AUX gnome-settings-daemon-2.32.1-libnotify-init.patch 602 SHA256 3f81b1bf76b4e01
 AUX gnome-settings-daemon-2.32.1-media-keys-react.patch 1556 SHA256 9d56379de2c2cc83ffd4c40f7ab4c913647fefc54a1978ca0c5a4300bf3abec2 SHA512 88feac8fc90905f733734cbd82b3bdd6313a14b90f5c0cb116ec2edf243b9fd6a54bba41eb11f8e14c167b8be4b38904053f23e2d4c9c1a4adb8d099340170f0 WHIRLPOOL 9251a06f67908ed4b54b816b431c6b0d63dcc85b007b4fa7beeb26f04aa6ab727eb24846eafb7d15ec075f9df9b689fc0a042b7209540536e7a75a4ba4267a2e
 AUX gnome-settings-daemon-2.32.1-netfs-monitor.patch 1753 SHA256 ba30e87b4815dca4bae74076b787a3fb9bd083923a1a8e6dee2cd95e8f4ca4e9 SHA512 20e4a503241204986c784e1a35287900025734af8a17ed81447f8c71b03def83e90e485f1f3e73ce86e73f6f2a913d262bf14b1a0a4cd67609ebfadd862eb11f WHIRLPOOL 9aa94447bf256f9262f793ababc4ab057b388344857aa3ead252a79486e157e15973609cccc2500861fb1975ae626b19eba4b0ce55d41df6833a56f45340063f
 AUX gnome-settings-daemon-2.32.1-syndaemon-mode.patch 1612 SHA256 1ac8939aa161c9a9737f5bdf68ccfdc923944802a864cd76dcc8655fa5b129e0 SHA512 86f8baa39280bce8ae586bc31ad67e730589a6d56c51c85608df562e034faa64725798637ab2ec04ef416d8a9f23c136c0605a0941783900fcfdffa2bae530e9 WHIRLPOOL f99c386c75376808c3fbaefbe77cf719a8f9ca5b05fa41458e7db4c39d927c40400aa3cc998bc945d3a3b75d707063434e5160705d0914bef71ac06f7067cb64
-AUX gnome-settings-daemon-3.10.2.ebuild 4184 SHA256 5c18bf12cd3aa6c6b048c64542a71f2222b3e3e6b8aa4fd0f5c245c2fd9e7bd7 SHA512 620011866fed1a38c6be94de9ae335052f2574b6e9a2eecb702155d568d22556a9880a3ec8a9fb663d9c65746a4538b717337f4af9287042dd67838a2245e610 WHIRLPOOL 99ef2eaefb440402750e0bff95e34a4f3c56fb8399a9ca2063332a0d318d6a8c5cf27621d4458b732649a4fd96120b28b80cb1aab7f6bbf74609877245d0bfc5
+AUX gnome-settings-daemon-3.10.2-optional.patch 3190 SHA256 c4d84d2fc35ee254a637fbc24ab8504d492bd6e0171bda40083222d9c1f30da8 SHA512 33be2bd93c8603a5a7a6c0cfd53ced1413d1ffd6c8ef502c17625c4c766623bde3105a929a0bff88cdc3072594ffd9dd7b3d3eba583e3a5cb7b1bd32399c903e WHIRLPOOL e9ef1d3320970bb8ad850bc5dc00954a03fa4163daebbf398cae5fe6d5279776c1b346388b2c841c052bcca9ce9011578146610fafaeb410122040d68ed2e8a6
 AUX gnome-settings-daemon-3.7.90-optional-color-wacom.patch 5877 SHA256 8ff3403c00715bb674d01291588d541794ea795803e4165c7003d6b9652bbde7 SHA512 b7167df5843d90c379076d3bb4f8c247bcabd755f197c3217fb39df2123681fe619896f3d5a2729e969b4af9c47820143c594bbb5158978b2056d744f689c707 WHIRLPOOL f7a185c44539bd2cc8cd89de0ed3afeef0e1cf00326b08d25ad21570c72f22755f02568e6dc9e68a45a56ee2d6fb571dd72689271098ac3c7976d96b888a6dce
 AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
@@ -19,12 +19,12 @@ EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fce
 EBUILD gnome-settings-daemon-3.10.2.ebuild 4178 SHA256 ab01fcc1c731076f8587fca8ae7b56190bc8106f1d29167e23f1094bc041633d SHA512 cd8f79e7e2e7aed6d4517811772ef28c5cb4ec5987d6197cb9f9d0e1d14dd1dad0a55d0aaf4913aa32bbea8ae6e1541e8f76edbd5580727dfe2fb954168dd05d WHIRLPOOL 3f65adc91477acd3fb7a02fdb0f1f341f64938d5072cb5ef112096a2a9c8236d27c5efb31c867740d5a7003242bab2b0650534141b374ffb8ce9957eefb83b68
 EBUILD gnome-settings-daemon-3.8.3.ebuild 3247 SHA256 8796177232ce6a941bda954dd40d805eb3f7b22d3366287c95f4380f4a9a6897 SHA512 d992f5cc24d18d03d0248594217c2f3059b1ddbc60ff2a3a8b6e3ade01d05ef235cfc109c59ab10a89f05ce44f12584f29acffc9df76a6ac0e4824644c193491 WHIRLPOOL 6c0740c6beb1157a8ed9c54b57861c27322787180a9b23d719d95ca5008eab1a3c2d680d311ab88373b38a3b396269f43bf7e05e05e89f45d0e2a829346e1325
 EBUILD gnome-settings-daemon-3.8.6.1.ebuild 4186 SHA256 988d92b4031019d481918c106b9d91cb7da0f25ac78e7b5c535838c820375145 SHA512 68b4a5b82ee22679978292a9da86356e5ec3dd267d2c87642ecd8c9dbc6a1b7da53d96ecb9e7d1da956bec62d04f56fe64c4e0d813e78546fff232904b29cbc1 WHIRLPOOL 8737775ff12ef34d3d6975cd7b59de7fb80a2eb0ba748476b3fbda33463cb0774b561c691954a17b2cf8a3628ffaafe2d535a45311bf8e4b871e173480fe7767
-MISC ChangeLog 27500 SHA256 434cd8b51d9d5b58510a135c4a5b90950ec4ee7e977719b405579530c0039dec SHA512 966eeaeff2c2016ffbc90607c8ecdd84490be48e2ab5432c99d1f4edec42ed4f3074564c4c8b27c4c8ab2ecae10b9abc7abc4e52194e6a3a67289c0b8f373e51 WHIRLPOOL 37d61cfd4d89e98376ea3ccf28bc943e290677e48d5324ce36295da8b398f4cc7c3693d5b4786b60cff1db27658d5bca885d56c70fd871344aa3a1c0b2f4f4ac
+MISC ChangeLog 27659 SHA256 3074460552eb4fe93f4913c561e424db3580755cc681c716867f681b6577a28f SHA512 dd52c23b2fad08936414a6a87da2cbc139985305a60593766142fec7c38448bbe9b1aba6974090086f423de92f427159e124fd3fdf191fbfee8eddcb45604a6c WHIRLPOOL 7648c1ce16db5f118b5dfc434e1fea16cb89bd28e28e57e6b6a8027131c0e905f1b457a30cb689138fbfe127d88121e221c39524844c80ba49832e951f9ce8af
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK5yiUACgkQCaWpQKGI+9Q7BwCeIMluSxLFP8VXZreXsMHw2N7U
-qngAnRLLH8FoeLuoBEsaLaOabtrgTtx7
-=4JsT
+iEYEAREIAAYFAlK5yoMACgkQCaWpQKGI+9SMxgCcDkgrQCcOEaNZS/BKCYXS5o9u
+qZMAnRk1H1fsVypsSVU5WoNG+gzi3YuC
+=TxND
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
new file mode 100644
index 000000000000..213d0a738969
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2-optional.patch
@@ -0,0 +1,89 @@
+From a5ee890809d279c06bb5f00dec7ad71eae2af14f Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac        | 30 ++++++++++++++++++++++++++----
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f3b7ed..5720d36 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,20 @@ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
+ 
+-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++AC_ARG_ENABLE([color],
++  AS_HELP_STRING([--disable-color],
++                 [turn off color plugin]),
++       [with_color=$enableval],
++       [with_color=yes]) dnl Default value
++
++if test x$with_color = xyes; then
++       PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++       AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled])
++fi
++AM_CONDITIONAL(WITH_COLOR, test "x$with_color" = "xyes")
++
++AC_SUBST(COLOR_CFLAGS)
++AC_SUBST(COLOR_LIBS)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - datetime
+@@ -276,12 +289,21 @@ case $host_os in
+       have_wacom=no
+     else
+       if test x$enable_gudev != xno; then
+-        PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
+-        PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++        AC_ARG_ENABLE([wacom],
++          AS_HELP_STRING([--disable-wacom],
++                         [turn off wacom plugin]),
++                      [with_wacom=$enableval],
++                      [with_wacom=no]) dnl Default value
++        if test x$with_wacom = xyes; then
++          PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
++          PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
++          have_wacom=yes
++        fi
++        AC_SUBST(WACOM_CFLAGS)
++        AC_SUBST(WACOM_LIBS)
+       else
+         AC_MSG_ERROR([GUdev is necessary to compile Wacom support])
+       fi
+-      have_wacom=yes
+     fi
+     ;;
+   *)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 2f4840d..d517e77 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -4,7 +4,6 @@ enabled_plugins =	\
+ 	a11y-keyboard	\
+ 	a11y-settings	\
+ 	clipboard	\
+-	color		\
+ 	cursor		\
+ 	datetime	\
+ 	dummy		\
+@@ -22,6 +21,12 @@ enabled_plugins =	\
+ 
+ disabled_plugins = $(NULL)
+ 
++if WITH_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if HAVE_PACKAGEKIT
+ enabled_plugins += updates
+ else
+-- 
+1.8.3.2
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2.ebuild b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2.ebuild
deleted file mode 100644
index 929da6b16712..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.10.2.ebuild,v 1.1 2013/12/24 17:53:39 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 systemd virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
-REQUIRED_USE="
-	packagekit? ( udev )
-	smartcard? ( udev )
-"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.7:2
-	>=x11-libs/gtk+-3.7.8:3
-	>=gnome-base/gnome-desktop-3.9:3=
-	>=gnome-base/gsettings-desktop-schemas-3.9.91.1
-	>=gnome-base/librsvg-2.36.2
-	media-fonts/cantarell
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=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
-
-	app-misc/geoclue:2.0
-	>=dev-libs/libgweather-3.9.5:2
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? ( >=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/udev[gudev] )
-	packagekit? ( >=app-admin/packagekit-base-0.8.1 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/udev[gudev] )
-"
-# 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
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	>=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
-"
-# 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() {
-	# 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.7.90-short-touchpad-timeout.patch"
-
-	# Make colord and wacom optional; requires eautoreconf
-	epatch "${FILESDIR}/${PN}-3.10.2-optional.patch"
-
-	epatch_user
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--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 udev gudev) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	Xemake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "http://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}