gentoo resync : 12.05.2022

3 files changed, 4 insertions, 182 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index bed102e51dcb..f2b7b9e6ea0e 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,8 +4,6 @@ AUX cinnamon-5.2.7-eds-detection.patch 5038 BLAKE2B 287cdf4bd91b8be422a471fd86dd
 AUX cinnamon-5.2.7-meson-0.61-fix.patch 1668 BLAKE2B bf0490423fcfa3d1228a3b1090264449c98f9beebdc064a5815e8603faa494473a46cf6be46e6003a32ab8610ff6e8621e815437052bb5b3d6cccd6c428088ba SHA512 69d8ca0413ad2d1b6e259eeb2d3538cff16b6c3a50491cb288c462363880f9ee9299547141120a3a8e9ab364049178eec0851ab972415e2845e9ed21d3075f9b
 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.0.6.tar.gz 2397950 BLAKE2B e54f8ed02fc36c121d15d30aaed4633f7db30bcf3e0179fb5fa0b9f12b42f0a29b341f531eed7ba19f849c0400ee9887ee59b5218f4558586a360d173798aeea SHA512 3ed835b1c41a34dfd1e2eac7746bfa01fe48359c6c3e8085877a4c18b895ea065efc343a855cbdee3fcbfb63aa40166bbe40fa19154ae1544be675411d49a962
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
-EBUILD cinnamon-5.0.6-r1.ebuild 5094 BLAKE2B 6b3f64ffce5368b1ea6e725f0cfad7820b2b2e440d2da79087f3a2d26ea080d8312d220a735165c69ba13c1d7cef3fe60ca3638c570a654f627bdcb528e60c93 SHA512 e8bf1bbf34998df7df5b0fc31d1189d87a04c04cac91075a8cdb0608ec82cd1e277fb94f5477e804a45b3e267251a8e6a1d514a807d3396802073938d7eed10b
-EBUILD cinnamon-5.2.7-r2.ebuild 5372 BLAKE2B 2aed6a3cfe360040929edd5fae5e86952c9437cb8d50c51d56b62902865c6e8ecb0fdec8723d03b0c51a0d8f14b4cba3797d58d26095ddfc0bcb3622cce8618c SHA512 07e18607696498980903980dc779bbccc1904c95667961c2ab33920060ed9cc54c9956d71716d40238d66d2691acb0c14c2585fc6c3fb42e3f02aec2a3c7ae67
+EBUILD cinnamon-5.2.7-r3.ebuild 5359 BLAKE2B 42d2bd0f2e6cf3c17b3df4f66c8854e472d32baba4cfae463add222a5961f6237beea873961ca05f60a657aef3b87e76fde71dfa5a6f7672c750023c80ac4120 SHA512 fe405b7a08816ec7e2629a9aa07d5f977f791c254b82e96510144bc0ec9da082760ccdd5ce697320ef766e66c108c7bf1b106a1e1ea80d2008381a62ad066b3b
 MISC metadata.xml 488 BLAKE2B 422b0fe2eb6afbe708925e9fb6fa7f038497b11d51e06165e69e43515a27cf4a77c74a1a10156bbcfd6084704bbfa7f24d4e8a8409970c5d365aa6ba80ab5bd8 SHA512 5952deb426e8adcceb83a9bcaf94bbe96e4f065fbdfd6fa17b08988989f79c3f1de55e58ca13a26a6146b5cef90d8e3853d614d390c7afe0d2494d78ea3df744
diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
deleted file mode 100644
index d6c3792cf966..000000000000
--- a/gnome-extra/cinnamon/cinnamon-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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="+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.0:0=
-	>=gnome-extra/cinnamon-menus-5.0
-	>=gnome-extra/cjs-5.0[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.0[introspection]
-
-	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/pypam[${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.0[${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.0[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-5.0
-	>=gnome-extra/cinnamon-session-5.0
-	>=gnome-extra/cinnamon-settings-daemon-5.0
-	>=gnome-extra/nemo-5.0
-	gnome-extra/polkit-gnome
-	net-misc/wget
-	sys-apps/accountsservice[introspection]
-	sys-power/upower[introspection]
-	>=x11-libs/xapp-2.2.0[introspection]
-	x11-misc/xdg-utils
-	x11-themes/adwaita-icon-theme
-	x11-themes/gnome-themes-standard
-
-	nls? (
-		>=gnome-extra/cinnamon-translations-5.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
-}
-
-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-r2.ebuild b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
index 5237a3b90b2a..d161aeb40ce5 100644
--- a/gnome-extra/cinnamon/cinnamon-5.2.7-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.2.7-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="xml"
 
 inherit meson gnome2-utils pax-utils python-single-r1 xdg
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -67,7 +67,7 @@ RDEPEND="
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
+		dev-python/python-pam[${PYTHON_USEDEP}]
 		dev-python/pytz[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]