summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew S. Turnbull <sparky@bluefang-logic.com>2020-12-24 01:49:22 -0500
committerSam James <sam@gentoo.org>2020-12-27 05:06:35 +0000
commit8dc9c7eb1db8915d81696b1413c9a085c47ba1ae (patch)
treef79d547d9e766d913adcdf9583454710a51ef2da /gnome-extra
parentgnome-extra/cinnamon: Remove old (diff)
downloadgentoo-8dc9c7eb1db8915d81696b1413c9a085c47ba1ae.tar.gz
gentoo-8dc9c7eb1db8915d81696b1413c9a085c47ba1ae.tar.bz2
gentoo-8dc9c7eb1db8915d81696b1413c9a085c47ba1ae.zip
gnome-extra/cinnamon-session: Remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Matthew S. Turnbull <sparky@bluefang-logic.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/cinnamon-session/Manifest1
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-4.4.1.ebuild72
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind.patch26
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.8.0-elogind2.patch25
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml3
5 files changed, 0 insertions, 127 deletions
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index ea833a17fd97..a153e88654fa 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,2 +1 @@
-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
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/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>