summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest2
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch (renamed from gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch)0
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild (renamed from gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild)23
3 files changed, 11 insertions, 14 deletions
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 65ec7082be8..bf8f3402709 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,3 @@
DIST gnome-settings-daemon-3.20.2.tar.xz 1620696 SHA256 1dd7a084449a2c240308d253f86d60f3efe25f59322c3f5ec3b9e2e9f5eabb45 SHA512 b23ac4cfc5c1fe4b1eeb4ba37cae448b2a23e11b988ae609c3d23168a9c22502829b68a4ab5fc8291bde91b429fcb4159c0f37bef78437838de6c6f3417817ed WHIRLPOOL 94463af0fcc3c3e36ded002e359aa1049d8a6171ae9b7edbf1e3ceeda5f1d2ee9389c09fa2929c2197b20a48fa613cc35fb31dc3eed30feec5f370868b1b4e49
DIST gnome-settings-daemon-3.22.2.tar.xz 1657132 SHA256 0a1c1f9bce59a86617c45f77bd9cb99c6db38b96678a89d7ad2ab6b7bc6a1a01 SHA512 7bbeb0b50d178bf951f5a8375703f3e2e88b7c5082ec7394df1f277dd08059e616118e003db23dcc175b92d803924b3927326d10a2101b7923dfb0e980d277e3 WHIRLPOOL edae1afc97a314f3d90c7d77d9a456e74e9fe9059353e15a5a9b8318c32d2ebad792e7c9b7acaf54a8f3ea11a5de629f06d7bdb9cb3d5bff4f0621fe6a50683a
-DIST gnome-settings-daemon-3.23.90.tar.xz 1614204 SHA256 c9e860558a8132763f6441f317e1df47fc5fe64bc5517bcc9ff9d44a08824fac SHA512 995eae1876df7918746a0050fd4fa08fd50d6bef9e0c5474da33eb5fd7fc53a1f4214179035f6b0716f60620f198697cef4eaf70cb24c510ce5a30cfc761bdcb WHIRLPOOL 45b21a328a57c08fd6872fd1b7e1df30a5f2a47ffd2dc32d41b85ccc3e7c0937c505aa9aa7b21910140759c0f30d90bc5a9afba773547755805866822cf061fb
+DIST gnome-settings-daemon-3.24.0.tar.xz 1620184 SHA256 4f31a68aebdd4e0c37336306a4eea4cf219d46ed8fc59e3f3081b7a3088900c4 SHA512 94bf904cb424baa4201fc49e7ea978f86c6e7ede74794fefec784ca125e86b949e8ea7585284377a586d73d438a9fcf0ef9d9e0dc26c4fcba60250b384ec797a WHIRLPOOL e86332a1872bff33511d84d213f4ecb11be0510a1d1e87513f35efcc51a56b3c5d0233bb000671ccb3c5f49f975621a35a315b2353ccd3c02aaec135c0f842bb
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch
index 64c47a92e3f..64c47a92e3f 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.23.90-optional.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.24.0-optional.patch
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
index 558378672a3..e6ce7e8faeb 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.23.90.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.0.ebuild
@@ -2,10 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+GNOME2_EAUTORECONF="yes"
GNOME2_LA_PUNT="yes"
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit autotools eutils gnome2 python-any-r1 systemd udev virtualx
+inherit gnome2 python-any-r1 systemd udev virtualx
DESCRIPTION="Gnome Settings Daemon"
HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
@@ -91,6 +92,13 @@ DEPEND="${COMMON_DEPEND}
>=x11-proto/xproto-7.0.15
"
+PATCHES=(
+ # Make colord and wacom optional; requires eautoreconf
+ "${FILESDIR}"/${P}-optional.patch
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
+ "${FILESDIR}"/3.22.2-udevrulesdir-configure.patch
+)
+
python_check_deps() {
use test && has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
}
@@ -99,17 +107,10 @@ pkg_setup() {
use test && python-any-r1_pkg_setup
}
-src_prepare() {
- # Make colord and wacom optional; requires eautoreconf
- eapply "${FILESDIR}"/${P}-optional.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
src_configure() {
gnome2_src_configure \
--disable-static \
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \
$(use_enable colord color) \
$(use_enable cups) \
$(use_enable debug) \
@@ -125,10 +126,6 @@ src_test() {
virtx emake check
}
-src_install() {
- gnome2_src_install udevrulesdir="$(get_udevdir)"/rules.d #509484
-}
-
pkg_postinst() {
gnome2_pkg_postinst