gentoo new year resync : 01.01.2021

3 files changed, 2 insertions, 180 deletions

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 8fbc98f0ace9..4ac98023158c 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1,8 +1,6 @@
 AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
 AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03e202b76956c96df2dea7f2401d03c3c679ce19ec7e6ad046abf0fa1f1715ee94194a370605454dd3f3a777493c9cad9a88a3878093cda96b77b39 SHA512 a8b810f0aafab57984e8189bcc827e72dad7b9201ff88b36948b701cddb61c3bf003aa7b1986ad3ea526242800cbd183890218471fde7e7d7d2b9550b6688dcc
 AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
-DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
 DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
-EBUILD cinnamon-4.4.8.ebuild 5622 BLAKE2B 89b253b06f80dc03bac458777059079cf7d331b0ae684917e02944d936ad875c2701fc016e0353cbc804988876e187fdaad8b430ff2018edbb9445f9c143ab38 SHA512 702307caa03256616eb68cec0a6d753c81064c68b5f9d7753154551418379251e43ce00f0d56f04896c9a5cc6d0cb0e506f241c8092f12ed2a99d5f7b4c83202
-EBUILD cinnamon-4.6.7.ebuild 5661 BLAKE2B 4213db13987203d87c77b24a8c6d2a07d22a748147ae2890da26f870d8f7b9f8c47f2a21d3b2036f303c295a522825bb72f48b244783aafc7143f401754a73d2 SHA512 04576ecde6536ef2e2b43cb3d153834778315f944484a02dcf1aaf9fb49b7bf9409f39ac9e43bc2f6ff164d078aaee7cd454462e0d1567c2fe804123c4ed9e5b
+EBUILD cinnamon-4.6.7.ebuild 5660 BLAKE2B e77a985e43266f34320c96a6db811fbee3174afbb7f31889d7d6bb3a61e82a97fd6f200a7e7a244ad4d04dd9d49c774a06aae93cf0d56eee6b7a86f0d2bd54e9 SHA512 2b0d7ace129e6ee55a41e9c19fc6b63b92f0a688bdd09ba1915efe21fb616d786466874d218ceaf8db632f1f0628ecd6ea47fc08e6306c256c22686062beeb8e
 MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
diff --git a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
deleted file mode 100644
index 8fb8410e1ee3..000000000000
--- a/gnome-extra/cinnamon/cinnamon-4.4.8.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE="gtk-doc +nls +networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-1.29.15:=
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-extra/cinnamon-menus-4.4
-	>=gnome-extra/cjs-4.4.0[cairo]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.12.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-4.0.3[introspection]
-	dev-libs/keybinder:3[introspection]
-	>=x11-libs/libnotify-0.7.3:0=[introspection]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4
-	sys-power/upower[introspection]
-
-	>=gnome-extra/cinnamon-session-4.4
-	>=gnome-extra/cinnamon-settings-daemon-4.4
-
-	>=app-accessibility/caribou-0.3
-
-	dev-libs/libtimezonemap
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pyinotify[${PYTHON_USEDEP}]
-		dev-python/pypam[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/tinycss[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-	')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-4.4
-	>=gnome-extra/cinnamon-control-center-4.4[networkmanager=]
-	>=gnome-extra/cinnamon-screensaver-4.4
-
-	gnome-extra/polkit-gnome
-
-	nls? ( >=gnome-extra/cinnamon-translations-4.4 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-	gtk-doc? ( dev-util/gtk-doc )
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${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
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/cinnamon*.session.in || die
-
-	# shebang fixing craziness
-	local p
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		$(use_enable gtk-doc) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
-}
-
-src_install() {
-	gnome2_src_install
-	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 -f "${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() {
-	gnome2_pkg_postinst
-
-	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
-}
diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index 99704c766804..0ffc7d806244 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="gtk-doc +nls +networkmanager"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	app-accessibility/at-spi2-atk:2