| 1 |
commit: b099f15458c0284ccc17cf29172a7d22acdeef33 |
| 2 |
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> |
| 3 |
AuthorDate: Wed Jan 27 04:03:48 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=b099f154 |
| 7 |
|
| 8 |
gnome-extra/cinnamon-session: 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 |
.../cinnamon-session/cinnamon-session-4.6.2.ebuild | 15 ++++++++++++--- |
| 18 |
.../cinnamon-session/cinnamon-session-4.8.0.ebuild | 14 +++++++++++--- |
| 19 |
2 files changed, 23 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild |
| 22 |
index 03023fcda26..3bf07967179 100644 |
| 23 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild |
| 24 |
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild |
| 25 |
@@ -2,7 +2,10 @@ |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
-inherit meson gnome2-utils xdg |
| 30 |
+ |
| 31 |
+PYTHON_COMPAT=( python3_{7,8} ) |
| 32 |
+ |
| 33 |
+inherit meson gnome2-utils python-any-r1 xdg-utils |
| 34 |
|
| 35 |
DESCRIPTION="Cinnamon session manager" |
| 36 |
HOMEPAGE="https://projects.linuxmint.com/cinnamon/" |
| 37 |
@@ -39,6 +42,7 @@ RDEPEND="${COMMON_DEPEND} |
| 38 |
" |
| 39 |
DEPEND="${COMMON_DEPEND}" |
| 40 |
BDEPEND=" |
| 41 |
+ ${PYTHON_DEPS} |
| 42 |
>=dev-util/intltool-0.40.6 |
| 43 |
virtual/pkgconfig |
| 44 |
doc? ( |
| 45 |
@@ -46,6 +50,11 @@ BDEPEND=" |
| 46 |
dev-libs/libxslt ) |
| 47 |
" |
| 48 |
|
| 49 |
+src_prepare() { |
| 50 |
+ default |
| 51 |
+ python_fix_shebang data |
| 52 |
+} |
| 53 |
+ |
| 54 |
src_configure() { |
| 55 |
local emesonargs=( |
| 56 |
-Dgconf=false |
| 57 |
@@ -56,11 +65,11 @@ src_configure() { |
| 58 |
} |
| 59 |
|
| 60 |
pkg_postinst() { |
| 61 |
- xdg_pkg_postinst |
| 62 |
+ xdg_icon_cache_update |
| 63 |
gnome2_schemas_update |
| 64 |
} |
| 65 |
|
| 66 |
pkg_postrm() { |
| 67 |
- xdg_pkg_postrm |
| 68 |
+ xdg_icon_cache_update |
| 69 |
gnome2_schemas_update |
| 70 |
} |
| 71 |
|
| 72 |
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild |
| 73 |
index 9efab00f5a5..48382c50c3d 100644 |
| 74 |
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild |
| 75 |
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild |
| 76 |
@@ -3,7 +3,9 @@ |
| 77 |
|
| 78 |
EAPI=7 |
| 79 |
|
| 80 |
-inherit meson gnome2-utils xdg |
| 81 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 82 |
+ |
| 83 |
+inherit meson gnome2-utils python-any-r1 xdg-utils |
| 84 |
|
| 85 |
DESCRIPTION="Cinnamon session manager" |
| 86 |
HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session" |
| 87 |
@@ -40,6 +42,7 @@ RDEPEND=" |
| 88 |
>=gnome-extra/cinnamon-desktop-4.8 |
| 89 |
" |
| 90 |
BDEPEND=" |
| 91 |
+ ${PYTHON_DEPS} |
| 92 |
>=dev-util/intltool-0.40.6 |
| 93 |
virtual/pkgconfig |
| 94 |
|
| 95 |
@@ -48,6 +51,11 @@ BDEPEND=" |
| 96 |
dev-libs/libxslt ) |
| 97 |
" |
| 98 |
|
| 99 |
+src_prepare() { |
| 100 |
+ default |
| 101 |
+ python_fix_shebang data |
| 102 |
+} |
| 103 |
+ |
| 104 |
src_configure() { |
| 105 |
local emesonargs=( |
| 106 |
-Dgconf=false |
| 107 |
@@ -58,11 +66,11 @@ src_configure() { |
| 108 |
} |
| 109 |
|
| 110 |
pkg_postinst() { |
| 111 |
- xdg_pkg_postinst |
| 112 |
+ xdg_icon_cache_update |
| 113 |
gnome2_schemas_update |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postrm() { |
| 117 |
- xdg_pkg_postrm |
| 118 |
+ xdg_icon_cache_update |
| 119 |
gnome2_schemas_update |
| 120 |
} |
Archives