Apply patches from gnome-3.8 branch, systemd needed for power and session management, bug #464944

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

3 files changed, 24 insertions, 11 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 4cda39ce24e4..50d8a61a85a8 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # 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.119 2013/06/09 19:10:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.120 2013/07/14 18:45:52 pacho Exp $
+
+*gnome-settings-daemon-3.8.3-r1 (14 Jul 2013)
+
+  14 Jul 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-settings-daemon-3.8.3-r1.ebuild, -gnome-settings-daemon-3.8.2.ebuild:
+  Apply patches from gnome-3.8 branch, systemd needed for power and session
+  management, bug #464944
 
 *gnome-settings-daemon-3.8.3 (09 Jun 2013)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 69726aecd0f3..a9a11556d9cd 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -24,18 +24,18 @@ AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e
 DIST gnome-settings-daemon-2.32.1-gst-vol-control-support.patch 26788 SHA256 689f6152d6e27ddc0b8080d5c8c1644b6116075ff505951631af9b7289d2f933 SHA512 a4ee10135e7339fa25412e7b790c0c56b3def826d81a89ca399cfb6f2236da14ec78a729ec5d27d3528cdde3eff8fb70cf3f297ddee756665c1d83fb73d2ca15 WHIRLPOOL f3cc8d7ec7065018b69ee78a9f1cc278c8e37910e9dc5a061d8a57d52def0316fb4bbeb4891b742f54e32e06a8d31617241300e3aa82f5a0c39a79aa829225eb
 DIST gnome-settings-daemon-2.32.1.tar.bz2 1331850 SHA256 0074b3fec3ad6e3ab91a05dc20906b06101ea8bca0cd2caf394a5cc141b05e86 SHA512 69bceb01e1dd15a75dc3db1e78aebee8c7c4004f217856391a64bc527c6b46146f893e90292441d3c7650df8a1b3aee2078d7cbef33c76e47a8f1904dd8e447a WHIRLPOOL 6608a9470666d943e0f39a4cadb36a1ccffbe8b40bcdae97d93b3d9b676da0c3efb33d5be1accaf2066760de6a4a36db16c94a093965f2f8da29511464ec2071
 DIST gnome-settings-daemon-3.6.4.tar.xz 1518708 SHA256 3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15 SHA512 f8d263f9a22934e015ff642f9ac93c09764b89151260887242d6b946250d50a2400404f61376a34ec903606bf4061c9733ddb42f0ed92ecc42f873fafb766af7 WHIRLPOOL fba7fb4ec0c236584534b75fda3ebab651f67227c4fcc1183c085cba5cf315418f9a178a2c2ac9c96190a3b7b997a166a13172d48d8f068723bd5a0427cdf703
-DIST gnome-settings-daemon-3.8.2.tar.xz 1591764 SHA256 e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be SHA512 8e7c5b1ca70203bfb0ccf121b099dda7922cf0bfa0a0dc82ac44f035da420f0cbf692ea66f07744cd67c4cc13e4cb1d96e085e10432f38ca522baf379820818e WHIRLPOOL 8457d3238df9ee6882d4ff1449c757fe3aa710448cbf8a14b54be0e86e24e910aa36fd7e9d3b492f4193aebf3721a3547404266c546f15715e36fbbd33a639b0
+DIST gnome-settings-daemon-3.8.3-patches.tar.xz 4184 SHA256 3d5048f29449120b8cf8480d2dbe29e62281ceee3449fc2a0325947f63c03247 SHA512 81a258233691ee526a8a4a3f2ff87955a58f451570fd5a11243622846977c3508f33eb45e5d99be219c0d5ade5212270470ef3fd06de61720f6bbd340ca24bc1 WHIRLPOOL 8c22af9443e12fe6b19f8ad0e34f47274ecae930e9701a01f19b469a0ef8e0e47b11ec74a81d7cc868995c0ba67d9b56f4cf0cf1b29a39a56e37d6de561d4d68
 DIST gnome-settings-daemon-3.8.3.tar.xz 1576376 SHA256 00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c SHA512 e8b02a820f3785dc42b5f82b94804bf7ec761c2d2c797d7eba0f590ed1b8107094d5cb395cdd00c1a7ef7e294cdfb7d54b1e9c14e9584b5bcc03bb8cd61b3515 WHIRLPOOL d692216c13d38bc5cc57a9af6cecfc393460394c20efa97edf609416e03dffe3c55c35d69ad42ad43ac18fd0ad495d52bce57fb4707753ef65cc3016f947defc
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
 EBUILD gnome-settings-daemon-3.6.4.ebuild 3457 SHA256 368057b260e6af6b74c5e7d53abc52f005bde420faee14ec2d1b68c3178441ed SHA512 debdd113066e75c1f35c42ac8f583c187b211bd30905041fc2e00a8461e110975a3b316cf57f3e930463d8f7a697b2ad48e215f6a938ea7fa562322f096f7244 WHIRLPOOL a8c2c82ad03d6b60b543155aba9d7a653008f9e3e2cda52b601279711d351dbb58dd027391eadc8f0b4d7fc33a4cad751bbaf20eda9e088f915b5d1a88c44f44
-EBUILD gnome-settings-daemon-3.8.2.ebuild 3405 SHA256 62149de1cdbbe6daeececb8dbad07df3884c6d307ebd72fce7f12905bc7cbf75 SHA512 3b527b09414e9b24ee95383b1b6bbed9fe6ed7d0d655e0983c3f72017693bb0ffac24929be9edd1cc48b7a6320bd995fcbd1a2f638ad17556c43fe4180bdc444 WHIRLPOOL 39a33cca2f24fc3287f793ab4630e96b71a0b21a2c44b91b16f268da093d3bfc4d5cf9f3495f7aa4cda0d414dedf38566a7ddcd878cd6621744418d7978afe87
+EBUILD gnome-settings-daemon-3.8.3-r1.ebuild 3599 SHA256 0e586deba6ebd9b8a4a310fd45915bad21b50519166e53b629bf508b14086d41 SHA512 62e3f3dc07edc4597c10d3482264df8e1134eec54d155a6f11e3c769d3fa33375097fa1568e170da9bfe88892ec6c9db03f1230839ec5a22757e1eb3652fa0d1 WHIRLPOOL 0ea5004d0694e1e20acfd1f6af49a956279f01d4547ad244fca2eea47423b9650f6b5e6e6753d27e747fa9453684c87ec6e2d805d91e98b955503fe4ccf9b116
 EBUILD gnome-settings-daemon-3.8.3.ebuild 3343 SHA256 01e21cdca573a8e3c2c9c58a95cc091227fc63c0459989acc250a0428344b3e3 SHA512 9aca43426809f33097fb3afc35e348d187a91d5c26f11735910d675d3f25fcf371ff97d9e47fdcc67ba8331646ea4b4292369e2552f3d2fcb458ce4124f3590f WHIRLPOOL 1d86a6a449d63ca75e96bbff1576a532f56f090844bc38f9a7f54bafbd97825ee056813823faf654fbc5ba77c4d2f38152d9812a216bf78a403891b557fc0a5a
-MISC ChangeLog 24415 SHA256 bedd84b5ff07eca6aaefc6bbb726065325fe57557f407653ab6acd639e7363ad SHA512 bcc4795e1fb8cf87428ec1257f2e49a52d408242ce9f36c49398bd02a12812da8c5d9321a0b601ba3850ccafb0151bb9b59d106e2be2f78007751789906c6c1b WHIRLPOOL 31a0b16f3ac5ef65fa05586802e8aa4334c9a6ffd2365a46c8c680dcb76785916feb94ce7d560ab1809fe0c101dd31d0c055cb43b2f79e957857698c50e9d461
+MISC ChangeLog 24690 SHA256 6f14c4a2f4439c4ac25882ac2f4853c6afdc990c87b27db4293e2a7a434e1ca3 SHA512 63ed83507ababa363b447ff7afbe4efbbad0143176db307b3894bab73c19d44a02efc6f85f97659542da39d33c77d8f56967a3059b17965da0f6d1cacb2828de WHIRLPOOL d63c0d81a2583dd26f19804191662bae1ef2d55161cb6834651ce2d215c8564ec166139a7c3aa5c6f1bfecd2087d87c88efb9e845ad4084018a3fbbfb14243cf
 MISC metadata.xml 612 SHA256 f2d36be55be7e1eaccae78ca23a80840d94ee2b00fbe54e16078416f870a62de SHA512 ad289b7d988738de1f75f91d744fe3a7b6c44af8468e0e37af6f709eaab0d084233c38391447ff8638ec9ba262db447e75aa206b86b23c96f5b7837f49bf8fd1 WHIRLPOOL 69504210ec0b472144da510ef226f4695bf7822f7e8b546a4548afe0ed055977d7570f988b688058304c08403bd6da8298ae450310e246f9abf69ed9f5b2aaf0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG00y8ACgkQCaWpQKGI+9S/2wCeK8u0h6uJKAEJTNXtyr96BbpE
-qi4AnjbmtBkbwprrw4N7/9XXUne4j+I9
-=9IL4
+iEYEAREIAAYFAlHi8eEACgkQCaWpQKGI+9T+RwCeL5eRljgUHwfHA7bRwV9erAeN
+ID4An1aNJ2RscF9e9Atmbmwx9gPsVCkR
+=gSZU
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild
index 93052eb20d53..73331393d9d5 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/gnome-settings-daemon-3.8.2.ebuild,v 1.1 2013/05/15 07:32:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.3-r1.ebuild,v 1.1 2013/07/14 18:45:52 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -11,6 +11,8 @@ inherit autotools eutils gnome2 virtualx
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug +i18n input_devices_wacom packagekit policykit +short-touchpad-timeout smartcard +udev"
@@ -57,8 +59,10 @@ COMMON_DEPEND="
 # 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
+	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
@@ -90,14 +94,16 @@ src_prepare() {
 	# Make colord and wacom optional; requires eautoreconf
 	epatch "${FILESDIR}/${PN}-3.7.90-optional-color-wacom.patch"
 
+	# Apply patches from gnome-3.8 branch
+	epatch "${WORKDIR}"/${P}-patches/*.patch
+
+	epatch_user
 	eautoreconf
 
 	gnome2_src_prepare
 }
 
 src_configure() {
-	# README is empty
-	DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
 	gnome2_src_configure \
 		--disable-static \
 		--enable-man \