gentoo new year resync : 01.01.2021

6 files changed, 3 insertions, 133 deletions

diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index edd6d4eccc6c..137d33e55317 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,7 +1,3 @@
-AUX cinnamon-session-3.8.0-elogind.patch 712 BLAKE2B dd1ce68b30e849a62dd563c3bd640639974763f4aae108ff379adf942289fdbda46367a13a9a640e11750ca978a0f28dc3c6cb17f309c7e7a44bc3b7c8769ea6 SHA512 b0f04b560cf76fa040ce838cd21e811b0e627187e7500e5bf7717f5b1ba242db0485feb986ba0e89e5daa044f0268047c9ff37b9a72c41cbda16975929db7178
-AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e16b2284e0fdd7a89963e1e9275cf635caade162022573e029f3d745bd1511f9a11920304da0a84b54b0bcca211327330d6f244 SHA512 756dc8c0f57187d20c491a27fa130ee56c01c156d8c0881f2a0bac7173dd7f039aea38475fdfba52b8c467ea2258cc0af7ebc7ba2053817df5c9e5f50bcc32f2
-DIST cinnamon-session-4.4.1.tar.gz 198819 BLAKE2B bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1 SHA512 f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
 DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
-EBUILD cinnamon-session-4.4.1.ebuild 1417 BLAKE2B 15d200dbc0213a6ecc73a257f80823a4088d30e4e4f44f7fed7f8f1d31572764a21e90523ec389c0cf659f28baf10ab623ab3cf55da888afe72826259b0a5f3e SHA512 c4e5f59281b992e9dc3b4d91564a61bf705b646e07edfd956ad44ef3fd13ee01ba1fdac0da25462ed7819d2f9a2e706bdda30772534d3bda5deb694f07e4be78
-EBUILD cinnamon-session-4.6.2.ebuild 1283 BLAKE2B 033817d9b5fed393b6c8758bdfb5e62860e25fb8abdb4f6c22b8bbc9d772c2bde0b341d10d7b26b1c1b7a25cab0f4ccfde64d47adf07515cba6cb937d93b42ed SHA512 3d5b138c558665d56bb5579d079627941f0cd6b5b9b0d5f35df252832a911e6e9d927e3cb30b1493f14a4dc55b97ee188dd284203448d4c18d53443497c89cf5
-MISC metadata.xml 573 BLAKE2B e7c49fc19d81b1c33ac69bcf57839e5e895bb656cedcb38efa37d5e88310d713705bd42209969301e4ad4c19863c242a4ab91c9d64b8c0924f0d4807ee54f358 SHA512 66288033b458b5c6bdd769c7a053401bebaaa015ea152640298a4cf4f341cc0c96d8024bacff6054c371a7a584f7a2b5e33334c563d2ec788b0bf755e1cef11e
+EBUILD cinnamon-session-4.6.2.ebuild 1282 BLAKE2B 0e3b3560242580f875462196be7994761c7656592f4bbbabebfa280df48b696f784d3a63ee2c432546815bc17dff9bbb6bf36a8ed46ed115ff2db1a2e8e0ee8d SHA512 924e7fbcae153a5b6935e07d8b4a04c5c73af67975f5d2f88979568dda13735d6cb18331ef90f90436b1f82f5e7bf0d28d31f7095d7fbd5d78894d480b58333a
+MISC metadata.xml 465 BLAKE2B e67971b7481b6dff91982fb7b3d72db752d62b683cd0043e215589aea4a026e5150b4da5a3798b8d09d39933b0bb41c5a62bfb41ff70ead0dcb01c2e4e732053 SHA512 35772b3727591d6cd02458d0862bdbd2346cb1d7a2640e9871a7dd0fa279ae7aece23e4f0194f10d67ae24ca999fd7463c6e29be470653d520c1295c7d679771
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
deleted file mode 100644
index 01a4029bbcbd..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson gnome2-utils xdg
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc elogind ipv6 systemd"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	>=x11-libs/xapps-1.0.4
-	virtual/opengl
-	systemd? ( >=sys-apps/systemd-183 )
-	elogind? ( sys-auth/elogind[policykit] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-4.4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-elogind.patch
-	"${FILESDIR}"/${PN}-3.8.0-elogind2.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dgconf=false
-		$(meson_use doc docbook)
-		$(meson_use ipv6)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
index 8b32bd223688..eed6cde87b4f 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
 
 LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="doc ipv6 systemd"
 
 COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
deleted file mode 100644
index 7ae0fba56978..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e9857299d098d6e62d866fa738cf53197e45c8e3 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 9 Jul 2018 13:26:51 +0200
-Subject: [PATCH] ELOGIND also needs this code that is wrapped in LOGIND
- condtional
-
----
- cinnamon-session/csm-systemd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index dc2aa2e..039abd9 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -23,7 +23,7 @@
- #include "config.h"
- #include "csm-systemd.h"
- 
--#ifdef HAVE_LOGIND
-+#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
- 
- #include <errno.h>
- #include <string.h>
--- 
-2.16.4
-
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
deleted file mode 100644
index 935541cf2a5b..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 10148b8831ba26c7991b4643cbb05d92445f4b61 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 9 Jul 2018 13:56:57 +0200
-Subject: [PATCH] elogind
-
----
- cinnamon-session/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
-index 1d0db5b..4be50e5 100644
---- a/cinnamon-session/meson.build
-+++ b/cinnamon-session/meson.build
-@@ -77,7 +77,7 @@ executable('cinnamon-session',
-     xext,
-     xrender,
-     xtest,
--    # elogind,
-+    elogind,
-   ],
-   link_with: [
-     libegg,
--- 
-2.16.4
-
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
index 67c3b0a3ebb6..46942b72cc14 100644
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -9,9 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
 	</upstream>