commit: 5311eaf36cee02533d900cfd12c8bf2b3bf52245
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 23 22:12:22 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 23 22:27:51 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5311eaf3
gnome-base/gnome-settings-daemon: 3.14.1 → 3.14.2
---
...n-3.14.1.ebuild => gnome-settings-daemon-3.14.2.ebuild} | 10 ++++++++--
.../gnome-settings-daemon-9999.ebuild | 14 +++++++++++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git
a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
similarity index 93%
rename from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
rename to gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
index c2d859f..e38f9c8 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
@@ -5,17 +5,19 @@
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 input_devices_wacom -openrc-force networkmanager
policykit +short-touchpad-timeout smartcard +udev wayland"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager
policykit +short-touchpad-timeout smartcard test +udev wayland"
REQUIRED_USE="
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"
@@ -77,6 +79,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
@@ -119,6 +124,7 @@ src_configure() {
}
src_test() {
+ python_export_best
Xemake check
}
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 4d2af19..7482043 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -5,8 +5,9 @@
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
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,9 +17,10 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon";
LICENSE="GPL-2+"
SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager
policykit +short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager
policykit +short-touchpad-timeout smartcard test +udev"
REQUIRED_USE="
smartcard? ( udev )
+ test? ( ${PYTHON_REQUIRED_USE} )
"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
@@ -65,6 +67,7 @@ COMMON_DEPEND="
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
@@ -83,6 +86,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
@@ -120,10 +126,12 @@ src_configure() {
$(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
}
