gentoo resync : 15.06.2021

5 files changed, 19 insertions, 150 deletions

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index d95cde4a5c8e..e35120665eb1 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.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-EBUILD cinnamon-screensaver-4.6.0.ebuild 1672 BLAKE2B 8020bd0aecf18fa044f477bbe702d79f1ed67425e9c3cd81f84ba8a23ac34d3efee118c40f23ad54969e2d21a45a9e639f277b03b046a9ef89fd02eed90401f8 SHA512 5e3a30c36adb4de717363a092387c35ed664f01e43b9cde26d71b232dc220d6bf30746615645e594ce8fb0602477b210d858703ae9a44c41f08411ecc3b2f0a7
-EBUILD cinnamon-screensaver-4.8.1.ebuild 1629 BLAKE2B 79882f5056919c8f47e8f64616de115fb8f3dc3c3223d841ccf20b6b72b8b73f77ae7131e369aa288864c358441de1df3402cf4a703d984cc2116857952c68eb SHA512 68da60c0a1d8c03782631874c97ec72ded3733cc7bbdd18982070cb4b17a94829155a628ad5d0b07d362a4319ce74015f27607e44d81d79b6d323192c967cdcc
+DIST cinnamon-screensaver-5.0.4.tar.gz 154088 BLAKE2B 2aed90c5498bf9a6e39436c87fbcc58ededebbe9a7e977385a8335bbb11f900e27dff59815513d239b92a8feddb596b1ef56a2dcfcba97db937fc6074b139c5b SHA512 4510da4aa9372bdc683a9aee2b4388cb332a733dabc8666b5529783a0f7c4428101ae1f55d90e9150ba97a56f628a728f82a9d9edaffadc596ab246798bd60c1
+EBUILD cinnamon-screensaver-4.8.1.ebuild 1627 BLAKE2B 7c70e371cda0b6de480e1f16ca781dd4b0df12ee6662e0b7ff59cd3aeba7ba225ebbd66c68ef3f12423ae5443dec4a565ccf989dfb1f6d66f97effb5c33d6de3 SHA512 974d19a75d0040350abb5584ec3a3d7cf28887d9711aaa8d5022b4acea68ec72a848633f353054fe34f2b32dccb8a27cdf93446e17cf8ce5c4497ae0a27d0a32
+EBUILD cinnamon-screensaver-5.0.4.ebuild 1637 BLAKE2B 51c491398aa684ce26e9c23bfc355016d7091f34a5525bc60cc0ec02a3fa5f0c3214649d8dd8ab65457504c0447a59f0e9fff5d49a9389457d66f432ea333da7 SHA512 fc0abc121eacd96015d922b64ddf1d0985783035d888519b6a76d730ceddbbb01d1ba1261db2bdd6c33d635f4f56d54c8234ac6c4137cab611cf2f809c2dafc7
 MISC metadata.xml 499 BLAKE2B cdc003bc99ca0cc2d1aac9255edc856e0a0856377957340cfb2654f6e40db406169a95789ffd1c8bbc3b91cc6ad1cabacfc880f8ae70244587bddf697c0cf1da SHA512 ade4955b678ef51cad43c4809c7165fdd084a18cd89f977e0f4daf8234ddab3fdec289ad43c60ca2f85251dbc7da368113294d8f0f955b92809ef373c13a8584
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
index 90fa66ab4774..2f57c3ceb435 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd xinerama"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.4.ebuild
index e25d02acbe8d..c0d4a43f7ae8 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.4.ebuild
@@ -2,50 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit meson python-single-r1 xdg
 
 DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
+HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-screensaver"
 SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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]
-	>=x11-libs/gtk+-3.22:3[introspection]
-	>=gnome-extra/cinnamon-desktop-4.6:0=
+	${PYTHON_DEPS}
 	>=dev-libs/dbus-glib-0.78
-
+	>=dev-libs/glib-2.37.3:2[dbus]
+	>=gnome-extra/cinnamon-desktop-5.0:0=
 	sys-apps/dbus
 	sys-libs/pam
+	>=x11-libs/gtk+-3.22:3[introspection]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrandr
 	x11-themes/adwaita-icon-theme
 
-	${PYTHON_DEPS}
-
 	xinerama? ( x11-libs/libXinerama )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	>=app-accessibility/caribou-0.3
 	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
+		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/xapp[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
+		>=dev-python/xapp-2.2.0[${PYTHON_USEDEP}]
 	')
+
 	systemd? ( >=sys-apps/systemd-31 )
 	!systemd? ( sys-auth/elogind )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="
+	${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 BDEPEND="
@@ -55,11 +57,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-python-build.patch
-	"${FILESDIR}"/${PN}-4.6.0-xinerama.patch
-)
-
 src_prepare() {
 	default
 	python_fix_shebang install-scripts src
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
deleted file mode 100644
index 1e43396257f0..000000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From f838b2ab03af0285043d980feba9d52d96d66164 Mon Sep 17 00:00:00 2001
-From: Michael Webster <miketwebster@gmail.com>
-Date: Fri, 15 May 2020 08:34:40 -0400
-Subject: [PATCH] Build: Only generate python bytecode during builds with no
- temporary install folder.  Package managers should handle this otherwise.
-
-This eliminates a lot of warnings during the packaging portion of
-the deb build.
----
- install-scripts/meson.build             | 16 ++++++++++++++++
- install-scripts/meson_compile_python.py | 10 ++++++++++
- meson.build                             |  1 +
- src/meson.build                         |  2 --
- 4 files changed, 27 insertions(+), 2 deletions(-)
- create mode 100644 install-scripts/meson.build
- create mode 100644 install-scripts/meson_compile_python.py
-
-diff --git a/install-scripts/meson.build b/install-scripts/meson.build
-new file mode 100644
-index 0000000..667d669
---- /dev/null
-+++ b/install-scripts/meson.build
-@@ -0,0 +1,16 @@
-+# These scripts run as post-installation scripts.
-+
-+# They're designed to do nothing if DESTDIR is set, which happens
-+# during debian builds for instance - there's a fake install target
-+# so running these would be pointless.
-+
-+# When using deb packaging, these aren't needed, as these operations
-+# are run automatically by the package manager.
-+
-+# They're really only necessary in straight builds where 'ninja install'
-+# will be run directly, to install the program onto the system.
-+
-+
-+# Generate python bytecode
-+meson.add_install_script('meson_compile_python.py')
-+
-diff --git a/install-scripts/meson_compile_python.py b/install-scripts/meson_compile_python.py
-new file mode 100644
-index 0000000..9ec0f4d
---- /dev/null
-+++ b/install-scripts/meson_compile_python.py
-@@ -0,0 +1,10 @@
-+#!/usr/bin/python3
-+
-+import os
-+import subprocess
-+
-+pythondir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'cinnamon-screensaver')
-+
-+if not os.environ.get('DESTDIR'):
-+    print('Generating python bytecode...')
-+    subprocess.call(['sh', '-c', 'python3 -m compileall "%s"' % pythondir])
-diff --git a/meson.build b/meson.build
-index c508770..d7dcd31 100644
---- a/meson.build
-+++ b/meson.build
-@@ -123,6 +123,7 @@ conf_h = configure_file(
- 
- inc = include_directories('.')
- 
-+subdir('install-scripts')
- subdir('libcscreensaver')
- subdir('data')
- subdir('src')
-diff --git a/src/meson.build b/src/meson.build
-index 7e0978e..f04fda0 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -64,5 +64,3 @@ foreach script : app_scripts
-   meson.add_install_script('sh', '-c',
-     'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]), join_paths(bindir, script[1])))
- endforeach
--
--meson.add_install_script('sh', '-c', 'python3 -m compileall "$DESTDIR/@0@"'.format(pkgdatadir) )
diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
deleted file mode 100644
index e3240a010012..000000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 13575ae3f332e33a1952a803f2392d6d70df2028 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Wed, 2 Sep 2020 17:59:45 -0400
-Subject: [PATCH] Fix meson syntax error when xinerama support is disabled.
-
-Fixes #346
----
- libcscreensaver/meson.build | 7 ++++++-
- meson.build                 | 3 ++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libcscreensaver/meson.build b/libcscreensaver/meson.build
-index 1800c46..c2c3757 100644
---- a/libcscreensaver/meson.build
-+++ b/libcscreensaver/meson.build
-@@ -145,13 +145,18 @@ gir_sources = [
-   dbus_built
- ]
- 
-+libcscreensaver_deps = [gobject, gtk, gdk, x11, xrandr, xext, glib, gio, gthread, pam, m]
-+if use_xinerama
-+  libcscreensaver_deps += xinerama
-+endif
-+
- libcscreensaver = library(
-   'cscreensaver',
-   cscreensaver_sources + gir_sources,
-   version: '0.0.0',
-   include_directories: inc,
-   cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
--  dependencies: [gobject, gtk, gdk, x11, xinerama, xrandr, xext, glib, gio, gthread, pam, m],
-+  dependencies: libcscreensaver_deps,
-   install: true
- )
- 
-diff --git a/meson.build b/meson.build
-index b15c3fb..2f9a9a5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -61,7 +61,8 @@ foreach sym : [
-   endif
- endforeach
- 
--if get_option('xinerama')
-+use_xinerama = get_option('xinerama')
-+if use_xinerama
-   if host_machine.system() == 'solaris'
-     xinerama = cc.find_library('Xext')
-     xinerama_h = cc.has_header('X11/extensions/xinerama.h')