commit: b099f15458c0284ccc17cf29172a7d22acdeef33 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Wed Jan 27 04:03:48 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Mar 1 13:02:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b099f154
gnome-extra/cinnamon-session: Fix meson script shebangs Also, xdg_src_prepare is handled by EAPI-7. Bug: https://bugs.gentoo.org/766935 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../cinnamon-session/cinnamon-session-4.6.2.ebuild | 15 ++++++++++++--- .../cinnamon-session/cinnamon-session-4.8.0.ebuild | 14 +++++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild index 03023fcda26..3bf07967179 100644 --- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild +++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild @@ -2,7 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit meson gnome2-utils xdg + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit meson gnome2-utils python-any-r1 xdg-utils DESCRIPTION="Cinnamon session manager" HOMEPAGE="https://projects.linuxmint.com/cinnamon/"; @@ -39,6 +42,7 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND}" BDEPEND=" + ${PYTHON_DEPS} >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( @@ -46,6 +50,11 @@ BDEPEND=" dev-libs/libxslt ) " +src_prepare() { + default + python_fix_shebang data +} + src_configure() { local emesonargs=( -Dgconf=false @@ -56,11 +65,11 @@ src_configure() { } pkg_postinst() { - xdg_pkg_postinst + xdg_icon_cache_update gnome2_schemas_update } pkg_postrm() { - xdg_pkg_postrm + xdg_icon_cache_update gnome2_schemas_update } diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild index 9efab00f5a5..48382c50c3d 100644 --- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild +++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild @@ -3,7 +3,9 @@ EAPI=7 -inherit meson gnome2-utils xdg +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit meson gnome2-utils python-any-r1 xdg-utils DESCRIPTION="Cinnamon session manager" HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"; @@ -40,6 +42,7 @@ RDEPEND=" >=gnome-extra/cinnamon-desktop-4.8 " BDEPEND=" + ${PYTHON_DEPS} >=dev-util/intltool-0.40.6 virtual/pkgconfig @@ -48,6 +51,11 @@ BDEPEND=" dev-libs/libxslt ) " +src_prepare() { + default + python_fix_shebang data +} + src_configure() { local emesonargs=( -Dgconf=false @@ -58,11 +66,11 @@ src_configure() { } pkg_postinst() { - xdg_pkg_postinst + xdg_icon_cache_update gnome2_schemas_update } pkg_postrm() { - xdg_pkg_postrm + xdg_icon_cache_update gnome2_schemas_update }
