gentoo auto-resync : 28:09:2024 - 01:25:57

3 files changed, 1 insertions, 203 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 5534008da969..f2038ce69257 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,8 +4,6 @@ AUX cinnamon-6.2.0-fix-arm64-settings-panel-path.patch 1832 BLAKE2B 15f3300a695f
 AUX cinnamon-6.2.0-optional-wayland.patch 2333 BLAKE2B 2c52be837f95f24a20c4a4a506891bba315eefcbc7574b8024c741881d3b04c7bbebba716539d52ee960c5d2295812d81b0affc6112ae2fca0c80a845e95b4e3 SHA512 c43995dec07d4be77bc1c14c1a73d8d8d1acef9ab22479a1bd74067aed162523a21279aa7f3b45353e555708b2af9d0ea6ac39dc1150bd2b9cc1da57941f1b0c
 AUX cinnamon-6.2.0-polkit-agent-on-x11.patch 2440 BLAKE2B ddecfd38e2ac60ab9089e68708efae1e24e5c597c2523222e2b8be4f0f71020dc2dff7008e4c4d895fb58d345263e6176e2f097e96ed7d5c98966dc41d447a4f SHA512 e8b72d5c024a8b3b5d4b171c43f0528e2915a21d21893bb4fb4c5fe2a5e9ce6272c9da781a9282f1445b6643929e666af325c3f4d0e755e53365861b9279c078
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
-DIST cinnamon-6.0.4.tar.gz 2538844 BLAKE2B de67c2e465d04dd4ed269172b4b58cfe0391446466e32e15410b5a847248566c075823d0a2fb87d7a693033b3e4e1fc21a18c7b9f45dca89ce8968a0be71eaba SHA512 357dd44f40b195a4a3ca3e88c5c9e55f1c06d36b4cec812a001c54ffb784b0d67bb9f41c1ae74fec590184b3480c9cd21ae54f7ee01e31f80eab0297b0d18a9c
 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
-EBUILD cinnamon-6.0.4.ebuild 5945 BLAKE2B 17ae5056db7e7e1851f9f479907b1bf7afa274ec5bed469c47c05981d4cc7683587b29cd1f0b5b7005687ae0284ead7db55376135e4ebaaa457b75f1f459e07a SHA512 6030813b585ae55b23922d91be537e92c73c2ae7b0e0b2a074b09f07567344825a80b478a167c8b61c6f18eb6b6abfa739d1d6163e44e3af31e97123d757dbf5
 EBUILD cinnamon-6.2.9.ebuild 5958 BLAKE2B 617b2963485bf1d6990d275b87147312d00b4747ca9467ab88761251009faf51b385a930a01ec8506704e779f272a27e4bd3f1566e6d38deadab061cf9c6047a SHA512 c3d6778646849044eea584f58e3ddef19dd679e91ac4b81d265383ad6fbb996e718bbaa334dedabe18959c58b35f24022c8524fec573532e33076043b665fe2d
-MISC metadata.xml 804 BLAKE2B eb34dbf26a7366035f626b9edb3229b47bd351a740baefeffaadfd337a37b132fa3ec939de647d7f3b77a06e05d0d21158b86c3201e4d089cc5312e817031cba SHA512 cb2c2ab9ad69af9951e149bd26e6345ad90b22916239d00d44d0dbd57367172b8d1e7c09666529eb0d84b2e14e62484cddc50e0b201d82bf373af7d01cc221b6
+MISC metadata.xml 685 BLAKE2B abc17d8b8cf6c9e0886fe404030821ac588090c26477e72e4d8a0bdc7cc26b20dc130c7a7b41cd240db4c8073f05fd9947447ae517cfc2646d59aeb35c1783f6 SHA512 84b352a0ebcc832bd71733e4b9b5954bcdf2005e18d357f5d39f03d177b7be6f8477e88965c8b66119da5209071745a197f21a9d049bbed8e903f794bf110b62
diff --git a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild b/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
deleted file mode 100644
index 7b9098651020..000000000000
--- a/gnome-extra/cinnamon/cinnamon-6.0.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{10..12} )
-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="+desktop-portal +eds +gstreamer gtk-doc +nls +networkmanager wayland"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~arm64 ~loong ~riscv x86"
-
-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.0:0=
-	>=gnome-extra/cinnamon-menus-6.0
-	>=gnome-extra/cjs-6.0[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.2[introspection]
-	>=x11-wm/muffin-6.0[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.1-r2[${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.0[networkmanager=,wayland?]
-	>=gnome-extra/cinnamon-screensaver-6.0
-	>=gnome-extra/cinnamon-session-6.0
-	>=gnome-extra/cinnamon-settings-daemon-6.0[wayland?]
-	>=gnome-extra/nemo-6.0[wayland?]
-	gnome-extra/polkit-gnome
-	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-power/upower[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	desktop-portal? (
-		sys-apps/xdg-desktop-portal-gtk
-		sys-apps/xdg-desktop-portal-xapp
-	)
-	nls? (
-		>=gnome-extra/cinnamon-translations-6.0
-	)
-"
-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
-
-	if ! use desktop-portal; then
-		sed -i "s/subdir('xdg-portal')/#&/" data/meson.build || die
-	fi
-
-	if ! use wayland; then
-		sed -i "s/, 'cinnamon-wayland.session'//" meson.build || die
-		sed -i "s/'cinnamon-wayland.desktop',//" data/meson.build || die
-		sed -i "s/subdir('wayland_sessions')/#&/" data/meson.build || die
-		sed -i "s/exec cinnamon-session --session cinnamon-wayland/echo 'wayland support disabled'; exit 1/" \
-			files/usr/bin/cinnamon-session-cinnamon || die
-	fi
-}
-
-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/metadata.xml b/gnome-extra/cinnamon/metadata.xml
index 3eaadcd0d9a0..5170275f61aa 100644
--- a/gnome-extra/cinnamon/metadata.xml
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -13,7 +13,6 @@
 		<remote-id type="github">linuxmint/Cinnamon</remote-id>
 	</upstream>
 	<use>
-		<flag name="desktop-portal">Enable <pkg>sys-apps/xdg-desktop-portal</pkg> backend implementation for Cinnamon</flag>
 		<flag name="internal-polkit">Use Cinnamon's internal polkit agent instead of <pkg>gnome-extra/polkit-gnome</pkg>. This does not currently support multi-user fast switching.</flag>
 	</use>
 </pkgmetadata>