From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1663624-garchives=archives.gentoo.org@lists.gentoo.org>
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 0B18015852A
for <garchives@archives.gentoo.org>; Fri, 23 Aug 2024 05:23:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8B06CE29B8;
Fri, 23 Aug 2024 05:23:40 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6DD39E29B8
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Aug 2024 05:23:40 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6BD1E342FA2
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Aug 2024 05:23:39 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C790C1F0D
for <gentoo-commits@lists.gentoo.org>; Fri, 23 Aug 2024 05:23:37 +0000 (UTC)
From: "Eli Schwartz" <eschwartz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" <eschwartz@gentoo.org>
Message-ID: <1724390483.320c3f519cfc55453897f6ed2e2eb02129dec95f.eschwartz@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-6.2.7.ebuild
X-VCS-Directories: gnome-extra/cinnamon/
X-VCS-Committer: eschwartz
X-VCS-Committer-Name: Eli Schwartz
X-VCS-Revision: 320c3f519cfc55453897f6ed2e2eb02129dec95f
X-VCS-Branch: master
Date: Fri, 23 Aug 2024 05:23:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: c63ebf0f-22af-4f76-9551-d526041c0af8
X-Archives-Hash: e2ebf4809b6dd65f047a5ded86842fa4
commit: 320c3f519cfc55453897f6ed2e2eb02129dec95f
Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Mon Aug 5 08:28:05 2024 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 05:21:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320c3f51
gnome-extra/cinnamon: drop 6.2.7
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
gnome-extra/cinnamon/Manifest | 1 -
gnome-extra/cinnamon/cinnamon-6.2.7.ebuild | 206 -----------------------------
2 files changed, 207 deletions(-)
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 06532380d032..7fc49774105e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,3 +1,2 @@
DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
-DIST cinnamon-6.2.7.tar.gz 2547822 BLAKE2B 67f15fdd39c7168bcaa03f637fa6a4b9e9076657a92ba92472c69960c0c26fcad7aa0b4e1f6926e57d76364bf4a42f28381b67a03cba75de87a4fc31ef9e7377 SHA512 d8617cf73dd754b91915826527e674a8084ad141831112def661eac6b39b1c39e61e06fdf79bd7f0a7045b2abc29e223f8616796f5e51d1354486f0d0e4faf5a
DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
diff --git a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
deleted file mode 100644
index faad5075ad15..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.2.7.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-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"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+eds +gstreamer gtk-doc internal-polkit +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- >=app-accessibility/at-spi2-core-2.46.0:2
- >=dev-libs/glib-2.52.0:2[dbus]
- >=dev-libs/gobject-introspection-1.29.15:=
- dev-libs/libxml2:2
- >=gnome-extra/cinnamon-desktop-6.2:0=
- >=gnome-extra/cinnamon-menus-6.2
- >=gnome-extra/cjs-6.2[cairo]
- sys-apps/dbus
- >=sys-auth/polkit-0.100[introspection]
- virtual/opengl
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.12.0:3[introspection,wayland?]
- >=x11-libs/libnotify-0.7.3:0=[introspection]
- x11-libs/libX11
- >=x11-libs/libXfixes-5.0
- x11-libs/pango[introspection]
- >=x11-libs/xapp-2.8.4[introspection]
- >=x11-wm/muffin-6.2[introspection,wayland?]
-
- 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.4.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-6.2[networkmanager=,wayland?]
- >=gnome-extra/cinnamon-screensaver-6.2
- >=gnome-extra/cinnamon-session-6.2
- >=gnome-extra/cinnamon-settings-daemon-6.2[wayland?]
- >=gnome-extra/nemo-6.2[wayland?]
- media-libs/gsound
- net-libs/libsoup:3.0[introspection]
- net-misc/wget
- sys-apps/accountsservice[introspection]
- sys-apps/coreutils
- sys-apps/pciutils
- sys-apps/util-linux
- sys-apps/xdg-desktop-portal-gtk
- sys-apps/xdg-desktop-portal-xapp
- sys-power/upower[introspection]
- x11-misc/xdg-utils
- x11-themes/adwaita-icon-theme
- x11-themes/gnome-themes-standard
-
- !internal-polkit? (
- gnome-extra/polkit-gnome
- )
- nls? (
- >=gnome-extra/cinnamon-translations-6.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 wayland optional
- # https://github.com/linuxmint/cinnamon/pull/12273
- "${FILESDIR}/${PN}-6.2.0-optional-wayland.patch"
-
- # Fix path for settings panels on arm64
- # https://github.com/linuxmint/cinnamon/pull/12278
- "${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
-)
-
-src_prepare() {
- if use internal-polkit; then
- PATCHES+=(
- # Use internal polkit agent on X11
- # https://github.com/linuxmint/cinnamon/pull/12272
- "${FILESDIR}/${PN}-6.2.0-polkit-agent-on-x11.patch"
- )
- else
- # 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
- fi
-
- default
-
- # 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)
- $(meson_use wayland)
- -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 by default
- keepdir /etc/xdg/menus/applications-merged
-
- if ! use internal-polkit; then
- # 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
- fi
-}
-
-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
-}