From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8470158020 for ; Tue, 22 Nov 2022 06:20:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D265E0CB9; Tue, 22 Nov 2022 06:20:14 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60EB5E0CBA for ; Tue, 22 Nov 2022 06:20:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9877534128F for ; Tue, 22 Nov 2022 06:20:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 531A377C for ; Tue, 22 Nov 2022 06:20:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1669097859.5746e89bed0a24bfd58eedf5f4d388e90421014b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/cinnamon/Manifest gnome-extra/cinnamon/cinnamon-5.4.12.ebuild X-VCS-Directories: gnome-extra/cinnamon/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5746e89bed0a24bfd58eedf5f4d388e90421014b X-VCS-Branch: master Date: Tue, 22 Nov 2022 06:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 220cae9b-030f-48c1-b67d-c415d28ea8f2 X-Archives-Hash: cab210c873ee53760b7233e4a81dbd9b commit: 5746e89bed0a24bfd58eedf5f4d388e90421014b Author: Matthew S. Turnbull bluefang-logic com> AuthorDate: Sun Nov 20 21:45:34 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 22 06:17:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5746e89b gnome-extra/cinnamon: drop 5.4.12 Signed-off-by: Matthew S. Turnbull bluefang-logic.com> Closes: https://github.com/gentoo/gentoo/pull/28378 Signed-off-by: Sam James gentoo.org> gnome-extra/cinnamon/Manifest | 1 - gnome-extra/cinnamon/cinnamon-5.4.12.ebuild | 182 ---------------------------- 2 files changed, 183 deletions(-) diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index 2f54b3d74f50..9e1b78ab7b61 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -1,3 +1,2 @@ DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733 -DIST cinnamon-5.4.12.tar.gz 2472187 BLAKE2B 3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff SHA512 62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7 DIST cinnamon-5.6.1.tar.gz 2482117 BLAKE2B 9b7f9f9c045adb1497875d7d735b3d8b684869695c3e476f3f8f671840b31a6bd043c8d9f7aca2ab8d1e3fa90d85da454cb612e16a9489e5bfaa7df590a91d3b SHA512 3ec7ce8cd1b2e98283ab84dd55a7e2e1693f6ad5cc7c6db8241808b9d96ab7c375c8739c470b99a83e3b6560ffcc50c070d2439dea71ab0d0792ef7c3bd8cd38 diff --git a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild deleted file mode 100644 index 488f5e3d3327..000000000000 --- a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild +++ /dev/null @@ -1,182 +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="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT" -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.4:0= - >=gnome-extra/cinnamon-menus-5.4 - >=gnome-extra/cjs-5.4[cairo] - 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/xapp-2.2.15[introspection] - >=x11-wm/muffin-5.4[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.2[${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.4[networkmanager=] - >=gnome-extra/cinnamon-screensaver-5.4 - >=gnome-extra/cinnamon-session-5.4 - >=gnome-extra/cinnamon-settings-daemon-5.4 - >=gnome-extra/nemo-5.4 - gnome-extra/polkit-gnome - media-libs/gsound - net-libs/libsoup:2.4[introspection] - net-misc/wget - sys-apps/accountsservice[introspection] - sys-power/upower[introspection] - x11-misc/xdg-utils - x11-themes/adwaita-icon-theme - x11-themes/gnome-themes-standard - - nls? ( - >=gnome-extra/cinnamon-translations-5.4 - ) -" -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 -) - -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 -}