gentoo new year resync : 01.01.2021

3 files changed, 3 insertions, 71 deletions

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index b8be073c73b6..7595681610e2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,5 @@
 AUX cinnamon-screensaver-4.6.0-python-build.patch 2751 BLAKE2B bc1449bba5365bc746c1e3e46075fc279017c29872ef609ad97bce873d34c1fc7e65f5bc76e2ec211689e8e32cf07769fcc481dd2ba3f37d776a8a3bcd10d4dc SHA512 fea53eef6d5aaba7db28e2f6656decdf2bb44a3ab630f82c00da2bf2c94b0200409955cfc06e81b9106225f877a9f46c5b7e9d8da4139bf59db0dd9955e40118
 AUX cinnamon-screensaver-4.6.0-xinerama.patch 1482 BLAKE2B 4908aed13aca65da9cfe91a9c86a202291abb1ee94d63765f3285f259b2076d41db063f11cc04cf1f223699c92f4c5910c520e43f8fa8a12047913cb8badf368 SHA512 ec7b5fd4104ca59b8790ea7925c50765a6e024ca0729754828cea539d99908153784ec1fa8f925997c4d0e58e2e1a21dbde729b21df216274ba479793a09560d
-DIST cinnamon-screensaver-4.4.1.tar.gz 160214 BLAKE2B df19a370c76648e0717565a3aab4785c3d8b48b20b9d87cc5426506f196db72872642d0ed1109a40986311c0ad7a5c17fbdcfc69681083afd3884c04822c6afa SHA512 92050febcfd41ad03b277cef60b95080d56b8fd985d064e9420a3357d7d0475355a4ca55965e581ae45410df8f19f3c031f6df0e3eec5b6b78aee7141d0244f7
 DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
-EBUILD cinnamon-screensaver-4.4.1.ebuild 1475 BLAKE2B 586bec8c310ea88e328e1f9b824d90a90c6b28f29319a66ead39e0eab4abcf47ae81f47c7566ee97a224bf8d31e69ecabd0389f438df5c340d910d21c2900a29 SHA512 443077ba13918179062b2ffeb5ff9f69b3656853135d5acdd8285451ceb16fc0767c65b671ef09e4a3ad9c8b4e5ae1ec26fd85e8f945168ff77351d2072f4b62
-EBUILD cinnamon-screensaver-4.6.0.ebuild 1594 BLAKE2B 725c75e3dbf65ec69edcac4b663137fb66e8b145f09fd17b1aa97411ec2e4212a203c76c4cdee49be89093391989d2d9b91980391542133c105a10d7e17d9744 SHA512 fccd50c1cdd104d8ef8467fa696c5b520131609f939ed5e24753e4bd9136ef6e00b90c7421ecaa3886dfeadff6aee9b98a1a1b3380e41dc30b34f59652ee28d6
+EBUILD cinnamon-screensaver-4.6.0.ebuild 1634 BLAKE2B 0c225bd86ff14462467eeaac910b89c0d03d19f7820eedceb456b66ee772de5c579dfefbfd2b7539f56ec2a4eef5d52b3d1eda1670922ac04f4e9ab84e9b9a59 SHA512 0c2c8809f38a3ded57cfb28a897093c73466d4c2236c07a0411be68360b74040a1d0a76e71e3781cc262e19dc7073c6420e4cbf04ef00cd3b13cca6e786aae1b
 MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
deleted file mode 100644
index d5eb0b7997af..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.4.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools gnome2 python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-4.4:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=dev-libs/dbus-glib-0.78
-
-	sys-apps/dbus
-	sys-libs/pam
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	xinerama? ( x11-libs/libXinerama )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( sys-auth/elogind )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	python_fix_shebang src
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
index df2f0f2494ae..f0257609aa72 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2[dbus]
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 RDEPEND="${COMMON_DEPEND}
+	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]