mate-base/mate-session-manager: Drop consolekit support and drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

4 files changed, 9 insertions, 107 deletions

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild
index aadf1b4..2491c14 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="debug elogind gnome-keyring ipv6 systemd +xtrans"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -38,10 +38,7 @@ COMMON_DEPEND="
 	x11-libs/libXtst
 	x11-libs/pango
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
+	elogind? ( sys-auth/elogind )
 	xtrans? ( x11-libs/xtrans )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild
deleted file mode 100644
index f30b9cf..0000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="https://mate-desktop.org/"
-
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="debug elogind gnome-keyring ipv6 systemd +xtrans"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.50:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
-	xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	!<gnome-base/gdm-2.20.4"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		$(use_with elogind) \
-		$(use_with systemd) \
-		$(use_with xtrans)  \
-		$(use_enable debug) \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild
index 0e8125a..5e56cea 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -39,10 +39,7 @@ COMMON_DEPEND="
 	x11-libs/pango
 	gles2? ( media-libs/mesa[egl,gles2] )
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
+	elogind? ( sys-auth/elogind )
 	xtrans? ( x11-libs/xtrans )
 "
 
diff --git a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
index 0e8125a..5e56cea 100644
--- a/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="^^ ( elogind systemd )"
 
 # x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
 # create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -39,10 +39,7 @@ COMMON_DEPEND="
 	x11-libs/pango
 	gles2? ( media-libs/mesa[egl,gles2] )
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		elogind? ( sys-auth/elogind )
-		!elogind? ( >=sys-auth/consolekit-0.9.2 )
-	)
+	elogind? ( sys-auth/elogind )
 	xtrans? ( x11-libs/xtrans )
 "