summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-base/gnome-settings-daemon/ChangeLog9
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest14
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild (renamed from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild)33
-rw-r--r--gnome-base/gnome-settings-daemon/metadata.xml4
4 files changed, 34 insertions, 26 deletions
diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index e7a1f22f4e53..c664ed33f09b 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.154 2015/03/15 13:23:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.155 2015/03/28 16:07:02 pacho Exp $
+
+*gnome-settings-daemon-3.14.3 (28 Mar 2015)
+
+ 28 Mar 2015; Pacho Ramos <pacho@gentoo.org>
+ +gnome-settings-daemon-3.14.3.ebuild, -gnome-settings-daemon-3.12.3.ebuild,
+ metadata.xml:
+ Version bump, drop old
15 Mar 2015; Pacho Ramos <pacho@gentoo.org>
gnome-settings-daemon-3.14.2.ebuild:
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index d8f083ab2968..694c0289917c 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
AUX gnome-settings-daemon-3.12.0-optional.patch 3231 SHA256 02cba586c02849e7bb6662fed09e7ee43c375440088baba943ef676fd358dc9c SHA512 237212486b458144f5d795887fffbf29b0b8b2560eb4bb78b7dccf53dc1acd90f097bd47080d07d0b62a70c6df89b50b8891ebba2007253b2f5c182025297bf9 WHIRLPOOL d03bbc35493a63d226e8c703fac42052f45be3fd98c44f995b02c96b945dc13016b73b981d7bc13720e7cd9b06ca2736897c5f0cb09db5890faaf7baa04d48fe
AUX gnome-settings-daemon-3.14.0-optional.patch 3621 SHA256 f32703d16e3a4a3165ee1fc628766a64c469988a222f73e98a715f72b91c19f6 SHA512 b02efcb5030f9ea3694c7c320bf4efb73bedd7a55386f7a3a610e6f86fb20c4fb05162a6c9926ee4358c77ae6735d8809684be219d1ebb2844cf5a3a17213ba6 WHIRLPOOL 378bc84a3514f1eee18b4c249a05f8804340c9af1cdf1a9066c3c4cd9a22a25bb05393b3ee8d9e1c04fb745223e5a307e6578ef5cfe05c2fb1186820b69ffd4e
AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
-DIST gnome-settings-daemon-3.12.3.tar.xz 1632208 SHA256 4a92ad7090e76d621be181a48ede75a8da310e86e85d16cd82a9f5cf20297dbc SHA512 0e1f7a61c449ba0785f0d26cc681fe412c57b555aea4d4ac47f83c85147c4d1940c5a563b88e947728543822366703c7939bceaecc0b5f68817d87950a0de09d WHIRLPOOL bb9393e71d64f5b221082cff04b29c2b4eace0d0e56f547d1bafa4098d9dcfd9c953d73defaa8e3da1b060992c14717f06675a192e46dc7d262522331f8c0f2c
DIST gnome-settings-daemon-3.14.2.tar.xz 1612184 SHA256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee SHA512 3cd125ed89d47b03439f473df861d41696f6281c9df84218f3fe29d86570fbcd13dd2bedb3f63b354e06043d7d8fda0d1304e03a6ca39b9bcbd369a908d88ba2 WHIRLPOOL 157195486a9ed8db18fe851ea8a567d2c53beeaf3cfc6d21f5e25a876f2e5b6847ccb6e848bae6accdd3861c96b16a0bfd5642f8e0fce3f8c3d4923599d49260
-EBUILD gnome-settings-daemon-3.12.3.ebuild 4344 SHA256 68172054e0801e20b3fda895a0dcc0cfd4d312ddb0c035d20b66e91e943d90d4 SHA512 5489633420b9f9f3c95a2fd723fc5a161c0af5dd5a0b64bef848ceb8c0d0c4a5143e6906102d965c7959038d60cb29841bb3e7e02e2b3147c668211fbe0e26d9 WHIRLPOOL 44d500f32e776fcfa92c4eaf68973629c564c15d1e8db6be0dc50851109d901bacc7da75f436842f55fc28df9bdc871d97ab20286780846386fe9a01c6699f5c
+DIST gnome-settings-daemon-3.14.3.tar.xz 1607624 SHA256 3c015a395d4815a22e5b6061272d4dd6ac93f499086bf12ae288946647447037 SHA512 31fffbab33e930b1a312b3eadd5229532e7e3c906eca6db5a5a5bcc561241dfd7965a1be27fc5676ff3e6d503a25b2bc324608793ab988ce1754f0274da0e1b2 WHIRLPOOL 6ebb619dfa7f061dfccf7f93d52736170a976fea22b54964fa9a4c4b0656e5676c50d35bf4cf0ef0ab25f8da13387df587798123832dfb043ff9ab1f08099f2b
EBUILD gnome-settings-daemon-3.14.2.ebuild 4525 SHA256 9f6478b0127570cad19bd2a8b9dce8ff5e2923a02f4e50b9285bee0c3280dbe8 SHA512 c8155622b5bf21fe95db045a4755160373901017085be0f4d99786fc0cb0944f432afbf85a8732ca7037f7d7754876997336454ce6f6475548976ebc73406246 WHIRLPOOL fc3b0ee5e035e3225a73547ce2830614145cf51c156476b83cf5d5c86945432249397c86bbe8abab077e9436776af428f6d9d41969eeacfe0c4d4bb0abfd5112
-MISC ChangeLog 31578 SHA256 dfc7e41ab8d61838654ccc8f8a82dd8236cfaa0941e4df8101bdd4e778ff8641 SHA512 874e717d1cbdca20ee869c72347ef6b992939c842f1d92032f1b18c0f256662a843c94c698bf565e7dc1dc15f7a09ab39775c9071b033096bd090c48d3a3476c WHIRLPOOL 2d21e8ff4603d3ea4d7e8b3550d037d7d7554f660080a8241be792c59e2e1cb90db17dd57390fef9e1ea5f485ef66fa8cdadf477d82440128be8d597df4db2ab
-MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
+EBUILD gnome-settings-daemon-3.14.3.ebuild 4533 SHA256 36d46ce9982498ca0887e39929accb7f2a960573768355d5dc30d59c506b8eea SHA512 3beaa4c51737b8b6f25bb1e19b303a56f11e30faf76fa078db0eedca7a1626cd349e28d1c454d5849b8c6e31e5265ce011f1595661f0531668366535834ee3fa WHIRLPOOL bcae2211c6b5856b1443dc4d79fe47a5ced8c4928ded4057b8df317b92f2a3fe66c620f016717ba9de53d66ed2811fcf44ac7353ab500b3e8aea1147a067dbe6
+MISC ChangeLog 31789 SHA256 b8a4a7111655a653100e2a66c940dba46b5480be579e3b977074971eacf89952 SHA512 6f1f477857821f592cedc56c37073c606fc654c99c1b4f8285da0f3233ad6f4c8c4ddb1f4c1ccb4d7df6d72b1f9b6edd78ffa0092bf84d8d5fc6c4ec5c1cda03 WHIRLPOOL 0c96568a08ac4fa7e285eb53c7f7c39eb030907aa50168b7f493e00d2a24dd483881913b43e62c1720634c87f29409b21cb47ce351ddaf9064cd82982428f9d9
+MISC metadata.xml 614 SHA256 ff799c6810b3398bf3d2678f89daccc3b2299d7b837eaea672489c4e6f992031 SHA512 6b4418aceaa83c008317cbc33e3dc1b53ae9d373a4a13af4ace91b302fedae5c34b2e80e68040a7db63d78cb2a4beb08590f8228023fc1fbfb17d8ea21be554e WHIRLPOOL 77e484c5f8dad10907ce52d875d2dc9060babc037e3624b4706af9f88c51d130f550c0d4f61f0c066df2e3cc27fb7f884a3a14cf10a4bebaeef6ba7e8c7f7ab1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlUFh7AACgkQCaWpQKGI+9S/qQCbBo9I/8x2kQItuthQttkTkF0A
-qRkAnRy3nOI4Js57afsKiHImMPHtXvpE
-=CmCS
+iEYEAREIAAYFAlUW0acACgkQCaWpQKGI+9SOGQCfUHCHLha9KD/jkXskEuLQaOO7
+jkQAnjIT3wMUmJZ1d0OlnOjclI/yuZKE
+=j8N/
-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild
index e044f056ac33..32c3a6d42398 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.12.3.ebuild,v 1.4 2014/12/27 01:51:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.3.ebuild,v 1.1 2015/03/28 16:07:02 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit autotools eutils gnome2 systemd udev virtualx
+inherit autotools eutils gnome2 python-r1 systemd udev 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"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
REQUIRED_USE="
input_devices_wacom? ( udev )
- packagekit? ( udev )
smartcard? ( udev )
+ test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
- >=dev-libs/glib-2.37.7:2
+ >=dev-libs/glib-2.37.7:2[dbus]
>=x11-libs/gtk+-3.7.8:3
>=gnome-base/gnome-desktop-3.11.1:3=
>=gnome-base/gsettings-desktop-schemas-3.9.91.1
@@ -52,15 +53,15 @@ COMMON_DEPEND="
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/libgudev:= )
- packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+ networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
smartcard? ( >=dev-libs/nss-3.11.2 )
udev? ( virtual/libgudev:= )
+ wayland? ( dev-libs/wayland )
"
# 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
@@ -79,6 +80,9 @@ RDEPEND="${COMMON_DEPEND}
# xproto-7.0.15 needed for power plugin
DEPEND="${COMMON_DEPEND}
cups? ( sys-apps/sed )
+ test? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject[${PYTHON_USEDEP}] )
dev-libs/libxml2:2
sys-devel/gettext
>=dev-util/intltool-0.40
@@ -94,10 +98,10 @@ src_prepare() {
# 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"
+ epatch "${FILESDIR}"/${PN}-3.7.90-short-touchpad-timeout.patch
# Make colord and wacom optional; requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.12.0-optional.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
epatch_user
eautoreconf
@@ -113,14 +117,15 @@ src_configure() {
$(use_enable cups) \
$(use_enable debug) \
$(use_enable debug more-warnings) \
- $(use_enable i18n ibus) \
- $(use_enable packagekit) \
+ $(use_enable networkmanager network-manager) \
$(use_enable smartcard smartcard-support) \
$(use_enable udev gudev) \
- $(use_enable input_devices_wacom wacom)
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable wayland)
}
src_test() {
+ python_export_best
Xemake check
}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index ee514e6e0b09..4bfad2599972 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -5,14 +5,10 @@
<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="openrc-force">Skip systemd dependency (#480336),
enabling this flag will become your setup to be fully
unsupported by upstream and downstream Gnome team. Do not
try to enable it unless completely needed</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>
</use>