[gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/files/, gnome-extra/cinnamon-screensaver/

[Sam James]

commit:     510b996e577f94f71f2f615422a60ef98fbabb26
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Fri Jun 11 16:43:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 03:55:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510b996e

gnome-extra/cinnamon-screensaver: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon-screensaver/Manifest          |  1 -
 .../cinnamon-screensaver-4.6.0.ebuild              | 78 ----------------------
 .../cinnamon-screensaver-4.6.0-python-build.patch  | 77 ---------------------
 .../cinnamon-screensaver-4.6.0-xinerama.patch      | 49 --------------
 4 files changed, 205 deletions(-)

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 52ebb3b94a4..8023d478cd2 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,3 +1,2 @@
-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
 DIST cinnamon-screensaver-5.0.2.tar.gz 153825 BLAKE2B cb09de296deed91b2669c008d1d266ae3a77ed3eb894d19fd1586043a568c9c48babc7518f3c0ab4c42384ee8cfd5705e99b9291b0887fc47546ffaa3893a615 SHA512 ac7c6a57307e8ba41c34337b9c0bb57efa7ab49fcb5cc6aa8eb81cd839de3c17c852e4677c35eac022638fe50966871c245510319b8fa64ed48ba56ed818e681

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
deleted file mode 100644
index e25d02acbe8..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit meson python-single-r1 xdg
-
-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="systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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=
-	>=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}
-	>=app-accessibility/caribou-0.3
-	sys-apps/accountsservice[introspection]
-	$(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}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	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
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use xinerama)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	python_optimize "${ED}"/usr/share/cinnamon-screensaver/
-}

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 1e43396257f..00000000000
--- 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@×××××.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 e3240a01001..00000000000
--- 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@××××××××××××××.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')