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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/, gnome-extra/cinnamon-screensaver/files/
@ 2020-09-09  2:15 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-09-09  2:15 UTC (permalink / raw
  To: gentoo-commits

commit:     595bf917931b90247bfb191800275de6b7480ebf
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Wed Jul 29 16:05:00 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 02:15:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595bf917

gnome-extra/cinnamon-screensaver: 4.6.0 version bump

Switch to EAPI=7/meson. Include temp patchs, to fix python
install and builds with xinerama disabled, both of which have
been committed upstream but are currently unreleased.

Bug: https://bugs.gentoo.org/733544
Package-Manager: Portage-3.0.4, Repoman-2.3.23
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              | 76 +++++++++++++++++++++
 .../cinnamon-screensaver-4.6.0-python-build.patch  | 77 ++++++++++++++++++++++
 .../cinnamon-screensaver-4.6.0-xinerama.patch      | 49 ++++++++++++++
 4 files changed, 203 insertions(+)

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index c77ec27b17f..cff09de74a1 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1 +1,2 @@
 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

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
new file mode 100644
index 00000000000..b06476c95bd
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,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 ~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}
+	$(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() {
+	xdg_src_prepare
+	python_fix_shebang 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
new file mode 100644
index 00000000000..1e43396257f
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-python-build.patch
@@ -0,0 +1,77 @@
+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
new file mode 100644
index 00000000000..e3240a01001
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-4.6.0-xinerama.patch
@@ -0,0 +1,49 @@
+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')


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/, gnome-extra/cinnamon-screensaver/files/
@ 2018-05-26 11:32 Mart Raudsepp
  0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2018-05-26 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     a086b46e8f56f08aa7b34708b2a8554f3e9b42d2
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 11:19:06 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 26 11:31:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a086b46e

gnome-extra/cinnamon-screensaver: remove old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 gnome-extra/cinnamon-screensaver/Manifest          |   7 --
 .../cinnamon-screensaver-2.8.0-r1.ebuild           | 104 ---------------------
 .../cinnamon-screensaver-3.0.1.ebuild              | 102 --------------------
 .../cinnamon-screensaver-3.2.13-r1.ebuild          |  89 ------------------
 .../cinnamon-screensaver-3.2.13-r2.ebuild          |  89 ------------------
 .../cinnamon-screensaver-3.2.2-r1.ebuild           |  88 -----------------
 .../cinnamon-screensaver-3.2.2.ebuild              |  87 -----------------
 .../cinnamon-screensaver-3.2.6.ebuild              |  89 ------------------
 .../cinnamon-screensaver-3.4.1.ebuild              |  92 ------------------
 .../cinnamon-screensaver-3.4.2.ebuild              |  92 ------------------
 .../cinnamon-screensaver-3.6.1.ebuild              |  91 ------------------
 ...nnamon-screensaver-2.6.3-automagic-logind.patch |  33 -------
 .../files/cinnamon-screensaver-2.8.0-webkit4.patch |  11 ---
 ...nnamon-screensaver-3.0.1-automagic-logind.patch |  21 -----
 14 files changed, 995 deletions(-)

diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index cb1559e4181..d9e0df5e418 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,8 +1 @@
-DIST cinnamon-screensaver-2.8.0.tar.gz 146275 BLAKE2B 5987cee6fdc14c7160560ef0870618d2371fcf5f07e3f0224d8d60992167f3a6793fc55251a6b2b9000af9e7c73eb54fece363b49c35afbe6c893976cfa5cacc SHA512 438ce35145d29b2cee8bb2f07191e0aeb5803e21a67ddd0a4bb13e113ac12e2e1be6b8780c657a67e9c27f8cb09aaec1e261f478432aa9fdbd1f21229294df6d
-DIST cinnamon-screensaver-3.0.1.tar.gz 147036 BLAKE2B 949caf4e047a596a9d083ac00089bccd7ae168889e9de86ea4c6053ba48b7ec2bc7da813e884219d8915776dbbd9bfa8331133346bcdbada2407a6463e778e12 SHA512 d9ad3f5c09d35388811387e3a7d1a8637d59390c4f797dedc4f6ff97cff631deb009d1cd1288317ca119f5db6456c05fd99c87c135595b2b1f07882892447427
-DIST cinnamon-screensaver-3.2.13.tar.gz 143389 BLAKE2B 8194f17e6f5dc55efa421290b70a1855677b374fefef960ec2ec494046da4d3906e92f3db59adda1119e2d79bbc7281e0066ec7612b3b60de9e478ef45d4c167 SHA512 f0c8b533416d5ec9e80f1220a54a8f87839dfd24ac6c00b1b4166c893f0c75519b14f19e9fa91b7c1d71864002d256787d66926042efa9e19b18b7f9f270e8c4
-DIST cinnamon-screensaver-3.2.2.tar.gz 120816 BLAKE2B 61fefea0a89badbfb78d6a8668363031938f06d87f110eefa1edfc3fb7c0e3c0a74fe6f13a4ccf2b987e6e041bfebb1100c8c4278773001792637c9d9aab9363 SHA512 0ebc5da00973b6b7972e3f7a2ee671d204cadf25ae99af8a53fd176a5070598aaec9a0def86dca47538e6334c2b6d19db09bc0ac1ec226c85b439c0762a40d18
-DIST cinnamon-screensaver-3.2.6.tar.gz 124287 BLAKE2B f477b5f4741a8d6222fd1f6fff0285eb2ad41a5d1d406819af0e48022ee9e0f4b913cac5ff98b9e516c21ae5dc7d8a994a7cfe230dacf1a3b91b61055a686bef SHA512 78b0347e5d6ae7970d070410d0a4aac08b2dbd69442d278f4869aa636f13de19c1d03118dce2f540739c37cbeebd5fa53ebf31270033fa8393220d6c35672d00
-DIST cinnamon-screensaver-3.4.1.tar.gz 153389 BLAKE2B 64d43fc81ec94b66e88791ba7802f672980441d7968bc2dbefe9cba8c0285404811b6c40f10f5c0655fc1cefc7c5fc77c7905c13b719d9fbd7192399f4db8328 SHA512 3b5b35bfac37d220a260917633a2f0ed79bcc4d479cc9924a86eb73e864b2893d037eabf6c70b0ba68d93008b649399e29dd42b8490e58662db4840ee470e137
-DIST cinnamon-screensaver-3.4.2.tar.gz 154119 BLAKE2B 2350f8aa1d256f964ef2da0e05b867da5a807b7799b47961e16e83fb25bdc0086b080638904b7d6dce44680640c73bcb2dc6946d2c0c7924291c9eb1aefea42e SHA512 1d226f72c1f7d8e264bee8b1c175cf32866dfdbf7738383552c4d218dc6ca1f04ef37f56c91793ff42358dcf6b832ba1962b8e39129683b5bf9cd3c3c2b1a764
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
deleted file mode 100644
index 54a0d6e276a..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
-	epatch "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
-
-	# Fix xscreensaver paths for gentoo
-	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
-		-i data/screensavers/xscreensaver@cinnamon.org/main || die
-
-	python_fix_shebang data/screensavers
-
-	epatch_user
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_configure \
-		$(use_enable doc docbook-docs) \
-		$(use_enable pam locking) \
-		$(use_enable systemd logind) \
-		--with-mit-ext \
-		--with-pam-prefix=/etc \
-		--with-xf86gamma-ext \
-		--with-kbd-layout-indicator
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
deleted file mode 100644
index 7ae4daa8640..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.0.1-automagic-logind.patch
-	eapply "${FILESDIR}"/${PN}-2.8.0-webkit4.patch #566572
-
-	# Fix xscreensaver paths for gentoo
-	sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr/$(get_libdir)/misc/xscreensaver/#" \
-		-i data/screensavers/xscreensaver@cinnamon.org/main || die
-
-	python_fix_shebang data/screensavers
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable doc docbook-docs) \
-		$(use_enable pam locking) \
-		$(use_enable systemd logind) \
-		--with-mit-ext \
-		--with-pam-prefix=/etc \
-		--with-xf86gamma-ext \
-		--with-kbd-layout-indicator
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
deleted file mode 100644
index 2b978b4e29d..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-3.2.2:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-	x11-libs/xapps
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
deleted file mode 100644
index b0916e14019..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-3.2.2:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-	x11-libs/xapps[introspection]
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
deleted file mode 100644
index 53df4f1a9ed..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-	x11-libs/xapps
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
deleted file mode 100644
index d50ce77b243..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_4 )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
deleted file mode 100644
index f200fc231f7..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-	x11-libs/xapps
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
deleted file mode 100644
index af5cf3ca3e4..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
deleted file mode 100644
index af5cf3ca3e4..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	!systemd? ( sys-auth/consolekit )
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
deleted file mode 100644
index e175e6c4054..00000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd"
-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-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-	# Do not use --without-console-kit, it would provide no benefit: there is
-	# no build-time or run-time check for consolekit, $PN merely listens to
-	# consolekit's messages over dbus.
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
deleted file mode 100644
index cc12685296c..00000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b382066324d2c42c3d5d04fbb21cf144c79daff0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 13 Jun 2015 17:16:34 -0400
-Subject: [PATCH] Make logind check non-automagic
-
----
- configure.ac | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c6c424c..0eae195 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -581,7 +581,15 @@ dnl ---------------------------------------------------------------------------
- dnl logind support
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+AC_ARG_ENABLE([logind],
-+              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+              [enable_logind=$enableval],
-+              [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes ; then
-         AC_DEFINE(HAVE_LOGIND, 1, [logind support])
--- 
-2.4.3
-

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
deleted file mode 100644
index cbf74270214..00000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.8.0-webkit4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac~	2015-10-16 17:06:50.000000000 +0200
-+++ b/configure.ac	2016-01-30 13:33:07.595401835 +0100
-@@ -58,7 +58,7 @@
-         gtk+-3.0 >= $GTK_REQUIRED_VERSION
-         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-         cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
--PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
-+PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])
- AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
- AC_SUBST(CINNAMON_SCREENSAVER_LIBS)
- 

diff --git a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
deleted file mode 100644
index 06048d59ad7..00000000000
--- a/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-3.0.1-automagic-logind.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac~	2016-05-30 17:09:04.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:26:08.614205626 +0200
-@@ -580,9 +580,15 @@
- dnl logind support
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
--	PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+  [enable_logind=$enableval],
-+  [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+  PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes ; then
-         AC_DEFINE(HAVE_LOGIND, 1, [logind support])


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-09  2:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-09  2:15 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon-screensaver/, gnome-extra/cinnamon-screensaver/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2018-05-26 11:32 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox