commit: a4894da9617b19e48764bebd743477d2cbd9a967
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 11 22:32:11 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 11 22:32:11 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a4894da9
gnome-base/gnome-settings-daemon: 3.12.3 → 3.14.0
---
...=> gnome-settings-daemon-3.14.0-optional.patch} | 27 ++++++++++++++++------
....ebuild => gnome-settings-daemon-3.14.0.ebuild} | 25 ++++++++++----------
.../gnome-settings-daemon-9999.ebuild | 25 ++++++++++----------
3 files changed, 46 insertions(+), 31 deletions(-)
diff --git
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
similarity index 82%
rename from
gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
rename to
gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
index cb117d7..a7a56b0 100644
---
a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.12.0-optional.patch
+++
b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.14.0-optional.patch
@@ -1,8 +1,18 @@
+From b9515b8ef35915fd1a9721e2eb6ca4e1272d0f47 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhanmohammadpo...@yahoo.fr>
+Date: Tue, 10 Dec 2013 00:27:27 +0100
+Subject: [PATCH] Make colord and wacom support optional
+
+---
+ configure.ac | 35 +++++++++++++++++++++++++++++------
+ plugins/Makefile.am | 7 ++++++-
+ 2 files changed, 35 insertions(+), 7 deletions(-)
+
diff --git a/configure.ac b/configure.ac
-index dd95dd4..03d651c 100644
+index c42ea8b..26ccd36 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -248,7 +248,20 @@ dnl
---------------------------------------------------------------------------
+@@ -225,7 +225,20 @@ dnl
---------------------------------------------------------------------------
dnl - color
dnl
---------------------------------------------------------------------------
@@ -24,7 +34,7 @@ index dd95dd4..03d651c 100644
dnl
---------------------------------------------------------------------------
dnl - datetime
-@@ -279,15 +292,25 @@ case $host_os in
+@@ -256,15 +269,25 @@ case $host_os in
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
@@ -56,7 +66,7 @@ index dd95dd4..03d651c 100644
;;
*)
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 04f8e2a..55ed94c 100644
+index 7bb01f0..7cc3655 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,7 +4,6 @@ enabled_plugins = \
@@ -67,7 +77,7 @@ index 04f8e2a..55ed94c 100644
cursor \
datetime \
dummy \
-@@ -21,6 +20,12 @@ enabled_plugins = \
+@@ -22,6 +21,12 @@ enabled_plugins = \
disabled_plugins = $(NULL)
@@ -77,6 +87,9 @@ index 04f8e2a..55ed94c 100644
+disabled_plugins += color
+endif
+
- if HAVE_PACKAGEKIT
- enabled_plugins += updates
+ if SMARTCARD_SUPPORT
+ enabled_plugins += smartcard
else
+--
+2.1.2
+
diff --git
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
similarity index 86%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
index 2d40849..b4b6112 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.0.ebuild
@@ -6,16 +6,15 @@ EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 systemd virtualx
+inherit autotools eutils gnome2 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 +udev"
REQUIRED_USE="
- packagekit? ( udev )
smartcard? ( udev )
"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
@@ -31,7 +30,7 @@ COMMON_DEPEND="
>=media-libs/lcms-2.2:2
media-libs/libcanberra[gtk3]
>=media-sound/pulseaudio-2
- >=sys-power/upower-0.99
+ >=sys-power/upower-0.99:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2
>=x11-libs/libnotify-0.7.3:=
@@ -51,15 +50,14 @@ 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/udev[gudev] )
- packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+ virtual/libgudev:= )
+ networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/udev[gudev] )
+ udev? ( virtual/libgudev:= )
"
# 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
@@ -93,10 +91,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
@@ -112,8 +110,7 @@ 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)
@@ -123,6 +120,10 @@ src_test() {
Xemake check
}
+src_install() {
+ gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
pkg_postinst() {
gnome2_pkg_postinst
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 ebdba0b..4d2af19 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit autotools eutils gnome2 systemd virtualx
+inherit autotools eutils gnome2 systemd udev virtualx
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,9 +16,8 @@ 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 +udev"
REQUIRED_USE="
- packagekit? ( udev )
smartcard? ( udev )
"
if [[ ${PV} = 9999 ]]; then
@@ -38,7 +37,7 @@ COMMON_DEPEND="
>=media-libs/lcms-2.2:2
media-libs/libcanberra[gtk3]
>=media-sound/pulseaudio-2
- >=sys-power/upower-0.99
+ >=sys-power/upower-0.99:=
x11-libs/cairo
x11-libs/gdk-pixbuf:2
>=x11-libs/libnotify-0.7.3:=
@@ -58,15 +57,14 @@ 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/udev[gudev] )
- packagekit? ( >=app-admin/packagekit-base-0.8.1 )
+ virtual/libgudev:= )
+ networkmanager? ( >=net-misc/networkmanager-0.9.9.1 )
smartcard? ( >=dev-libs/nss-3.11.2 )
- udev? ( virtual/udev[gudev] )
+ udev? ( virtual/libgudev:= )
"
# 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
@@ -100,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
[[ ${PV} != 9999 ]] && eautoreconf
@@ -119,8 +117,7 @@ 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)
@@ -130,6 +127,10 @@ src_test() {
Xemake check
}
+src_install() {
+ gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
+}
+
pkg_postinst() {
gnome2_pkg_postinst
