From a4f9ab81d6cbfc3ff649dd3577e3efa700b47387 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 6 Oct 2022 01:20:42 +0100 Subject: gentoo auto-resync : 06:10:2022 - 01:20:42 --- gnome-extra/Manifest.gz | Bin 11075 -> 11076 bytes gnome-extra/cinnamon/Manifest | 2 +- gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild | 186 ------------------------- gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild | 189 ++++++++++++++++++++++++++ 4 files changed, 190 insertions(+), 187 deletions(-) delete mode 100644 gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild create mode 100644 gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index 5ff3a823f515..381690e43ed8 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 291cd1cc0484..55fbaf79ab41 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -5,5 +5,5 @@ AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b10902 AUX cinnamon-5.2.7-revert-meson-0.60-fix.patch 2020 BLAKE2B 83060c16d8f91188bbfc9e784633ad4d40ba1ab91c1b980866b5d6870cffddbabdce6eceb7121543618e7d94b5f02ed115ea915b7371acb8f271ce6391b98759 SHA512 2c41deff381bc043eee05fc106a7c6b4177728b6500279d0185b99a8f5014ca04158b6348ab3f47c28938f2559193916abc80d387c8ffbb1528532ad26ce1f33 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733 -EBUILD cinnamon-5.2.7-r3.ebuild 5376 BLAKE2B 799921f581b61c1554d1e644e8b68ab974e4271b0dfbc12bd07596f393010972c40a4e138ee8357f2c3d1a649b294fa3bf5dab51c513ca63052e2fbb6ff053b9 SHA512 21615aaab56e3889181afda69f1bebf1a257a7a5389ab8102e5f88111af74f44f32701762ab3f9cb5c93518a33270b044b1b9e022b64029dbdc703978a2ddb94 +EBUILD cinnamon-5.2.7-r4.ebuild 5445 BLAKE2B dc6fb81c16ebe15ddf29b93557a41383fa923bf3f01add697421a0de1498f2a9791868a8145822e13edac5b186ec62356fef0cc09f2708b0de75f894291614da SHA512 8be4fceee3f3346ef70e2d25a619281620ec1e6aef4e2e34bd1f01cacc71e00d7e6575629f3401ac6d9c6270bf73adb4f93cd17b1b7fc0580958ec69ea927fbb MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744 diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild deleted file mode 100644 index 1e5fd0b76c77..000000000000 --- a/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="xml(+)" - -inherit meson gnome2-utils pax-utils python-single-r1 xdg - -DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" -SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+eds +gstreamer gtk-doc +nls +networkmanager" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="amd64 ~arm64 ~riscv x86" - -DEPEND=" - ${PYTHON_DEPS} - app-accessibility/at-spi2-atk:2 - >=dev-libs/glib-2.52.0:2[dbus] - >=dev-libs/gobject-introspection-1.29.15:= - dev-libs/libxml2:2 - >=gnome-extra/cinnamon-desktop-5.2:0= - >=gnome-extra/cinnamon-menus-5.2 - >=gnome-extra/cjs-5.2[cairo] - net-libs/libsoup:2.4[introspection] - sys-apps/dbus - >=sys-auth/polkit-0.100[introspection] - virtual/opengl - x11-libs/gdk-pixbuf:2[introspection] - >=x11-libs/gtk+-3.12.0:3[introspection] - >=x11-libs/libnotify-0.7.3:0=[introspection] - x11-libs/libX11 - >=x11-libs/libXfixes-5.0 - x11-libs/pango[introspection] - >=x11-libs/startup-notification-0.11 - >=x11-wm/muffin-5.2[introspection] - - eds? ( - gnome-extra/evolution-data-server - ) - gstreamer? ( - media-libs/gst-plugins-base:1.0 - media-libs/gstreamer:1.0 - ) - networkmanager? ( - net-misc/networkmanager[introspection] - ) -" -# caribou used by onscreen keyboard -# libtimezonemap used by datetime settings -# iso-flag-png (unpackaged) used by keyboard layout settings -RDEPEND=" - ${DEPEND} - >=app-accessibility/caribou-0.3 - dev-libs/keybinder:3[introspection] - dev-libs/libtimezonemap - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/distro[${PYTHON_USEDEP}] - dev-python/pexpect[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pycairo[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/python-pam[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/setproctitle[${PYTHON_USEDEP}] - dev-python/tinycss2[${PYTHON_USEDEP}] - >=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}] - ') - >=gnome-base/dconf-0.4.1 - >=gnome-base/gsettings-desktop-schemas-2.91.91 - >=gnome-base/libgnomekbd-2.91.4 - >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] - >=gnome-extra/cinnamon-screensaver-5.2 - >=gnome-extra/cinnamon-session-5.2 - >=gnome-extra/cinnamon-settings-daemon-5.2 - >=gnome-extra/nemo-5.2 - gnome-extra/polkit-gnome - net-misc/wget - sys-apps/accountsservice[introspection] - sys-power/upower[introspection] - >=x11-libs/xapp-2.2.8[introspection] - x11-misc/xdg-utils - x11-themes/adwaita-icon-theme - x11-themes/gnome-themes-standard - - nls? ( - >=gnome-extra/cinnamon-translations-5.2 - ) -" -BDEPEND=" - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - - gtk-doc? ( dev-util/gtk-doc ) -" - -PATCHES=( - # Fix backgrounds path as cinnamon doesn't provide them - # https://github.com/linuxmint/Cinnamon/issues/3575 - "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch - - # Use wheel group instead of sudo (from Fedora/Arch) - # https://github.com/linuxmint/Cinnamon/issues/3576 - "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch - - # Make evolution-data-server integration optional - "${FILESDIR}"/${PN}-5.2.7-eds-detection.patch - - # Meson fixes - "${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch - "${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch -) - -src_prepare() { - xdg_src_prepare - - # Add polkit agent to required components - # https://github.com/linuxmint/Cinnamon/issues/3579 - sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die - - # shebang fixing craziness - local p - for p in $(grep -rl '#!.*python3' || die); do - python_fix_shebang "${p}" - done -} - -src_configure() { - local emesonargs=( - $(meson_use gstreamer build_recorder) - $(meson_use gtk-doc docs) - -Ddisable_networkmanager=$(usex networkmanager false true) - -Dpy3modules_dir="$(python_get_sitedir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - - python_optimize "${D}$(python_get_sitedir)" - python_optimize "${ED}"/usr/share/cinnamon/ - - # Required for gnome-shell on hardened/PaX, bug #398941 - pax-mark mr "${ED}"/usr/bin/cinnamon - - # Doesn't exist on Gentoo, causing this to be a dead symlink - rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die - - # Ensure authentication-agent is started, bug #523958 - # https://github.com/linuxmint/Cinnamon/issues/3579 - insinto /etc/xdg/autostart/ - doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if use gstreamer; then - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of Cinnamon's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" - ewarn "org.cinnamon.recorder/pipeline to what you want to use." - fi - else - ewarn "Cinnamon's built-in screen recording utility is not installed" - ewarn "because gstreamer support is disabled." - fi -} - -pkg_postrm() { - xdg_pkg_postinst - gnome2_schemas_update -} diff --git a/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild new file mode 100644 index 000000000000..9be3d8520c54 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r4.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_REQ_USE="xml(+)" + +inherit meson gnome2-utils pax-utils python-single-r1 xdg + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon" +SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+eds +gstreamer gtk-doc +nls +networkmanager" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +KEYWORDS="amd64 ~arm64 ~riscv x86" + +DEPEND=" + ${PYTHON_DEPS} + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.29.15:= + dev-libs/libxml2:2 + >=gnome-extra/cinnamon-desktop-5.2:0= + >=gnome-extra/cinnamon-menus-5.2 + >=gnome-extra/cjs-5.2[cairo] + net-libs/libsoup:2.4[introspection] + sys-apps/dbus + >=sys-auth/polkit-0.100[introspection] + virtual/opengl + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12.0:3[introspection] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/startup-notification-0.11 + >=x11-wm/muffin-5.2[introspection] + + eds? ( + gnome-extra/evolution-data-server + ) + gstreamer? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + ) + networkmanager? ( + net-misc/networkmanager[introspection] + ) +" +# caribou used by onscreen keyboard +# libtimezonemap used by datetime settings +# iso-flag-png (unpackaged) used by keyboard layout settings +RDEPEND=" + ${DEPEND} + >=app-accessibility/caribou-0.3 + dev-libs/keybinder:3[introspection] + dev-libs/libtimezonemap + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/python-pam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/python3-xapp-2.2.1-r1[${PYTHON_USEDEP}] + ') + >=gnome-base/dconf-0.4.1 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/libgnomekbd-2.91.4 + >=gnome-extra/cinnamon-control-center-5.2[networkmanager=] + >=gnome-extra/cinnamon-screensaver-5.2 + >=gnome-extra/cinnamon-session-5.2 + >=gnome-extra/cinnamon-settings-daemon-5.2 + >=gnome-extra/nemo-5.2 + gnome-extra/polkit-gnome + net-misc/wget + sys-apps/accountsservice[introspection] + sys-power/upower[introspection] + >=x11-libs/xapp-2.2.8[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-5.2 + ) +" +BDEPEND=" + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gtk-doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + "${FILESDIR}"/${PN}-3.8.0-gnome-background-compatibility.patch + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch + + # Make evolution-data-server integration optional + "${FILESDIR}"/${PN}-5.2.7-eds-detection.patch + + # Meson fixes + "${FILESDIR}"/${PN}-5.2.7-revert-meson-0.60-fix.patch + "${FILESDIR}"/${PN}-5.2.7-meson-0.61-fix.patch +) + +src_prepare() { + xdg_src_prepare + + # Add polkit agent to required components + # https://github.com/linuxmint/Cinnamon/issues/3579 + sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die + + # shebang fixing craziness + local p + for p in $(grep -rl '#!.*python3' || die); do + python_fix_shebang "${p}" + done +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + -Ddisable_networkmanager=$(usex networkmanager false true) + -Dpy3modules_dir="$(python_get_sitedir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + python_optimize "${D}$(python_get_sitedir)" + python_optimize "${ED}"/usr/share/cinnamon/ + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}"/usr/bin/cinnamon + + # Doesn't exist on Gentoo, causing this to be a dead symlink + rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die + + # Ensure authentication-agent is started, bug #523958 + # https://github.com/linuxmint/Cinnamon/issues/3579 + insinto /etc/xdg/autostart/ + doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use gstreamer; then + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of Cinnamon's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "org.cinnamon.recorder/pipeline to what you want to use." + fi + else + ewarn "Cinnamon's built-in screen recording utility is not installed" + ewarn "because gstreamer support is disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postinst + gnome2_schemas_update +} -- cgit v1.2.3