Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-settings-daemon/
Date: Mon, 01 Mar 2021 13:03:00
Message-Id: 1614603764.52ecc1587c52dd839887eff8df917f395503e2c8.juippis@gentoo
1 commit: 52ecc1587c52dd839887eff8df917f395503e2c8
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Wed Jan 27 04:09:24 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 1 13:02:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ecc158
7
8 gnome-extra/cinnamon-settings-daemon: Fix meson script shebangs
9
10 Also, xdg_src_prepare is handled by EAPI-7.
11
12 Bug: https://bugs.gentoo.org/766935
13 Package-Manager: Portage-3.0.13, Repoman-3.0.2
14 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
15 Closes: https://github.com/gentoo/gentoo/pull/19233
16 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
17
18 .../cinnamon-settings-daemon-4.8.5.ebuild | 10 +++++++++-
19 1 file changed, 9 insertions(+), 1 deletion(-)
20
21 diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
22 index decd70b8dc1..67d58faa2c5 100644
23 --- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
24 +++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
25 @@ -3,7 +3,9 @@
26
27 EAPI=7
28
29 -inherit meson gnome2-utils xdg
30 +PYTHON_COMPAT=( python3_{7,8,9} )
31 +
32 +inherit meson gnome2-utils python-any-r1 xdg
33
34 DESCRIPTION="Cinnamon's settings daemon"
35 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
36 @@ -56,6 +58,7 @@ DEPEND="
37 x11-base/xorg-proto
38 "
39 BDEPEND="
40 + ${PYTHON_DEPS}
41 dev-util/glib-utils
42 dev-util/gdbus-codegen
43 >=dev-util/intltool-0.37.1
44 @@ -68,6 +71,11 @@ PATCHES=(
45 "${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
46 )
47
48 +src_prepare() {
49 + default
50 + python_fix_shebang install-scripts
51 +}
52 +
53 src_configure() {
54 # gudev not optional on Linux platforms
55 local emesonargs=(