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-desktop/
Date: Mon, 01 Mar 2021 13:02:59
Message-Id: 1614603763.1077488e0ed1d515008bb6aedf046b36890959c1.juippis@gentoo
1 commit: 1077488e0ed1d515008bb6aedf046b36890959c1
2 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
3 AuthorDate: Wed Jan 27 03:29:11 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 1 13:02:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1077488e
7
8 gnome-extra/cinnamon-desktop: 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 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
16
17 gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild | 7 ++++++-
18 gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild | 7 ++++++-
19 2 files changed, 12 insertions(+), 2 deletions(-)
20
21 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
22 index 414b97507d1..aa76e6dcb9c 100644
23 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
24 +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
25 @@ -4,7 +4,7 @@
26 EAPI=7
27 PYTHON_COMPAT=( python3_{7,8} )
28
29 -inherit meson gnome2-utils python-any-r1 xdg
30 +inherit meson gnome2-utils python-any-r1
31
32 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
33 HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
34 @@ -40,6 +40,11 @@ BDEPEND="${PYTHON_DEPS}
35 virtual/pkgconfig
36 "
37
38 +src_prepare() {
39 + default
40 + python_fix_shebang install-scripts
41 +}
42 +
43 pkg_postinst() {
44 gnome2_schemas_update
45 }
46
47 diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
48 index bcb26761e4d..699cc426409 100644
49 --- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
50 +++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
51 @@ -5,7 +5,7 @@ EAPI=7
52
53 PYTHON_COMPAT=( python3_{7,8,9} )
54
55 -inherit meson gnome2-utils python-any-r1 xdg
56 +inherit meson gnome2-utils python-any-r1
57
58 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
59 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
60 @@ -42,6 +42,11 @@ BDEPEND="
61 virtual/pkgconfig
62 "
63
64 +src_prepare() {
65 + default
66 + python_fix_shebang install-scripts
67 +}
68 +
69 pkg_postinst() {
70 gnome2_schemas_update
71 }