public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/, sys-auth/consolekit/files/
@ 2016-08-02 15:15 Jason Zaman
  0 siblings, 0 replies; 2+ messages in thread
From: Jason Zaman @ 2016-08-02 15:15 UTC (permalink / raw
  To: gentoo-commits

commit:     f9e388bc278bd56c96fbf193ba36947092b4489c
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 14:39:34 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 15:14:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e388bc

sys-auth/consolekit: Remove root restrictions, bug 585688

Package-Manager: portage-2.2.28

 sys-auth/consolekit/consolekit-1.1.0-r1.ebuild     | 119 +++++++++++++++++++++
 ...ove-the-root-restriction-for-runtime-dirs.patch |  57 ++++++++++
 2 files changed, 176 insertions(+)

diff --git a/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
new file mode 100644
index 0000000..61010e4
--- /dev/null
+++ b/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit linux-info pam
+
+MY_PN=ConsoleKit2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
+HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
+	>=sys-devel/gettext-0.19
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	acl? (
+		sys-apps/acl:=
+		>=virtual/udev-200
+		)
+	cgroups? (
+		app-admin/cgmanager
+		>=sys-libs/libnih-1.0.2[dbus]
+		)
+	pam? ( virtual/pam )
+	policykit? ( >=sys-auth/polkit-0.110 )"
+# pm-utils: bug 557432
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( sys-apps/coreutils[acl?] )
+	pm-utils? ( sys-power/pm-utils )
+	selinux? ( sec-policy/selinux-consolekit )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
+
+PATCHES=( "${FILESDIR}/${P}-Remove-the-root-restriction-for-runtime-dirs.patch" )
+
+pkg_setup() {
+	if use kernel_linux; then
+		# This is from https://bugs.gentoo.org/376939
+		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
+		# This is required to get login-session-id string with pam_ck_connector.so
+		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
+
+	default
+}
+
+src_configure() {
+	econf \
+		XMLTO_FLAGS='--skip-validation' \
+		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable pam pam-module) \
+		$(use_enable doc docbook-docs) \
+		$(use_enable test docbook-docs) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable acl udev-acl) \
+		$(use_enable cgroups) \
+		$(use_enable test tests) \
+		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
+		--with-pam-module-dir="$(getpam_mod_dir)" \
+		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
+		--without-systemdsystemunitdir
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
+
+	dodoc AUTHORS HACKING NEWS README TODO
+
+	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
+
+	keepdir /usr/lib/ConsoleKit/run-seat.d
+	keepdir /usr/lib/ConsoleKit/run-session.d
+	keepdir /etc/ConsoleKit/run-session.d
+	keepdir /var/log/ConsoleKit
+
+	exeinto /etc/X11/xinit/xinitrc.d
+	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
+
+	if use kernel_linux; then
+		# bug 571524
+		exeinto /usr/lib/ConsoleKit/run-session.d
+		doexe "${FILESDIR}"/pam-foreground-compat.ck
+	fi
+
+	prune_libtool_files --all # --all for pam_ck_connector.la
+
+	rm -rf "${ED}"/var/run || die # let the init script create the directory
+}

diff --git a/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch b/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch
new file mode 100644
index 0000000..301c68f
--- /dev/null
+++ b/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch
@@ -0,0 +1,57 @@
+From 664d2fdbd966764836b1f4da2dbc5750c7f01f0f Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Sun, 10 Apr 2016 11:20:24 +0300
+Subject: [PATCH] Remove the root restriction for runtime dirs
+
+---
+ src/ck-sysdeps-unix.c       |  5 -----
+ tools/ck-remove-directory.c | 10 ----------
+ 2 files changed, 15 deletions(-)
+
+diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c
+index 67d8eac..ecd176a 100644
+--- a/src/ck-sysdeps-unix.c
++++ b/src/ck-sysdeps-unix.c
+@@ -409,11 +409,6 @@ ck_generate_runtime_dir_for_user (guint uid)
+ 
+         TRACE ();
+ 
+-        if (uid < 1) {
+-                g_debug ("We do not create runtime dirs for root");
+-                return NULL;
+-        }
+-
+         errno = 0;
+         pwent = getpwuid (uid);
+         if (pwent == NULL) {
+diff --git a/tools/ck-remove-directory.c b/tools/ck-remove-directory.c
+index cf44fd6..b1a5722 100644
+--- a/tools/ck-remove-directory.c
++++ b/tools/ck-remove-directory.c
+@@ -51,11 +51,6 @@ become_user (uid_t uid, const gchar* dest)
+         int            res;
+         struct passwd *pwent;
+ 
+-        if (uid < 1) {
+-                g_critical ("invalid UID");
+-                exit (1);
+-        }
+-
+         if (dest == NULL) {
+                 g_critical ("invalid dest");
+                 exit (1);
+@@ -148,11 +143,6 @@ main (int    argc,
+                 exit (1);
+         }
+ 
+-        if (user_id < 1) {
+-                g_warning ("Invalid UID");
+-                exit (1);
+-        }
+-
+         /* Ensure we have a dest and that it starts with the correct prefix
+          * so we don't remove something important.
+          */
+-- 
+2.7.3
+


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

* [gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/, sys-auth/consolekit/files/
@ 2020-10-04 14:39 Mikle Kolyada
  0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2020-10-04 14:39 UTC (permalink / raw
  To: gentoo-commits

commit:     39ece3ff2467f0c1a3dc946767f3896d31055198
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 14:33:57 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 14:39:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ece3ff

sys-auth/consolekit: remove last-rited pkg

Bug: https://bugs.gentoo.org/727730
Closes: https://bugs.gentoo.org/644550
Closes: https://bugs.gentoo.org/667912
Closes: https://bugs.gentoo.org/644548
Closes: https://bugs.gentoo.org/601878
Closes: https://bugs.gentoo.org/699592
Closes: https://bugs.gentoo.org/651788
Closes: https://bugs.gentoo.org/614658
Closes: https://bugs.gentoo.org/593306

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sys-auth/consolekit/Manifest                       |   6 -
 sys-auth/consolekit/consolekit-0.4.6.ebuild        | 125 -------------------
 sys-auth/consolekit/consolekit-1.1.0-r1.ebuild     | 120 -------------------
 sys-auth/consolekit/consolekit-1.1.2.ebuild        | 131 --------------------
 sys-auth/consolekit/consolekit-1.2.0.ebuild        | 132 ---------------------
 sys-auth/consolekit/consolekit-1.2.1.ebuild        | 132 ---------------------
 sys-auth/consolekit/consolekit-9999.ebuild         | 128 --------------------
 sys-auth/consolekit/files/90-consolekit-3          |  32 -----
 sys-auth/consolekit/files/consolekit-0.2.rc        |  25 ----
 .../files/consolekit-0.4.5-polkit-automagic.patch  |  30 -----
 sys-auth/consolekit/files/consolekit-1.0.0.initd   |  16 ---
 ...ove-the-root-restriction-for-runtime-dirs.patch |  57 ---------
 .../files/consolekit-cleanup_console_tags.patch    |  67 -----------
 ...nsolekit-shutdown-reboot-without-policies.patch |  26 ----
 .../files/consolekit-udev-acl-install_to_usr.patch |  28 -----
 sys-auth/consolekit/files/pam-foreground-compat.ck |  17 ---
 sys-auth/consolekit/metadata.xml                   |  22 ----
 17 files changed, 1094 deletions(-)

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
deleted file mode 100644
index 06205e253cd..00000000000
--- a/sys-auth/consolekit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ConsoleKit-0.4.6.tar.xz 366572 BLAKE2B ab4c277fd47b8f99ce8c5a67de86e89b1bdd8d6a5a8682dd436feefec76f7902e71c05d9d22d52c297d3294a945f057d53f18c9c9b7d29c84aa7c26665b05fee SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d
-DIST ConsoleKit2-1.1.0.tar.bz2 630178 BLAKE2B 20d1994a19fbe03d411ac5437f77b75571fbdc19478100676e51e2a1232c643f4b0c86125b5bf1d42aeb5cfb7c8b34601221d674ac27d9bf3112fcd8a83afacb SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df
-DIST ConsoleKit2-1.1.2.tar.bz2 1125567 BLAKE2B 1b7c60d224ea4197687c566d324a302aa2f5ed92ed0cfc563ba4d42f78af2999d1693e4587208e5412d042fb0cff99919dfa02ca5b5a43bda3310c17b39ca5d6 SHA512 fadca85e05c176b06ead40fba5c068d497bf69bcc322287363d0c27cdd6627b758295db1ef534b908c0e6240486430d8cb36660b4d71216a60d19a52d6d0db39
-DIST ConsoleKit2-1.2.0.tar.bz2 1125402 BLAKE2B c2119287ff173783c377a1353f8ce59432f8aa3e64f654716c895fadb5d07462069e457aae7925a6c44bc48bfd4147fc10e9f488a39714386fb6c14bced09f36 SHA512 c0f6e629b7229c2ffaafe8da899970b48c8372402447af18560fffd8804d9ab91a4ad2eb82c8f648a14807f8ccc5fb1ab4366de14faa8a2d5fb3767a6a4253f7
-DIST ConsoleKit2-1.2.1.tar.bz2 1182946 BLAKE2B f76f99008c78bd3a318c918776129072944e4c3ac18348960e3a725179d3ce4dc2cfb4d04ec5c143bb998f23f63cf36c0f88d8296dc3d0a382a138f3a0a2fecc SHA512 31befe89f7fa604138bfb0722fc6cf12f0934bac004f98fc331004eb5a7f466ed7bd0dc9adc9869da739974208f9a3bc125068ff8a60d4b2badb58ef70a3eb10
-DIST consolekit_0.4.6-4.debian.tar.gz 12192 BLAKE2B e88ed907ea3ceecb9ac399618614b1aa5d7eb2c46a706451d78e4ec1598dee5a02d6c5a1b0dd678f6bed4c25277884ec6969a23f8181ef3d8ede94452b6570db SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f

diff --git a/sys-auth/consolekit/consolekit-0.4.6.ebuild b/sys-auth/consolekit/consolekit-0.4.6.ebuild
deleted file mode 100644
index e190382dadf..00000000000
--- a/sys-auth/consolekit/consolekit-0.4.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils linux-info ltprune pam systemd
-
-MY_PN=ConsoleKit
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://www.freedesktop.org/software/${MY_PN}/dist/${MY_P}.tar.xz
-	https://launchpad.net/debian/+archive/primary/+files/${PN}_${PV}-4.debian.tar.gz" # for logrotate file
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug doc kernel_linux pam policykit selinux systemd-units test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
-	>=dev-libs/glib-2.38.2-r1:2=
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-cleanup_console_tags.patch \
-		"${FILESDIR}"/${PN}-shutdown-reboot-without-policies.patch \
-		"${FILESDIR}"/${PN}-udev-acl-install_to_usr.patch \
-		"${FILESDIR}"/${PN}-0.4.5-polkit-automagic.patch
-
-	if ! use systemd-units; then
-		sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use systemd-units; then
-		myconf="$(systemd_with_unitdir)"
-	else
-		myconf="--with-systemdsystemunitdir=/tmp"
-	fi
-
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/${MY_PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		${myconf}
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/${MY_PN} /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-0.2.rc consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	exeinto /usr/lib/ConsoleKit/run-session.d
-	doexe "${FILESDIR}"/pam-foreground-compat.ck
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	use systemd-units || rm -rf "${ED}"/tmp
-
-	rm -rf "${ED}"/var/run # let the init script create the directory
-
-	insinto /etc/logrotate.d
-	newins "${WORKDIR}"/debian/${PN}.logrotate ${PN} #374513
-}

diff --git a/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
deleted file mode 100644
index 6cfe969c795..00000000000
--- a/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool linux-info ltprune pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-PATCHES=( "${FILESDIR}/${P}-Remove-the-root-restriction-for-runtime-dirs.patch" )
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}

diff --git a/sys-auth/consolekit/consolekit-1.1.2.ebuild b/sys-auth/consolekit/consolekit-1.1.2.ebuild
deleted file mode 100644
index 9eb051c9c37..00000000000
--- a/sys-auth/consolekit/consolekit-1.1.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool linux-info ltprune pam xdg-utils
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	# patch needs autoreconf, so dont need libtoolize
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups libcgmanager) \
-		$(use_enable selinux libselinux) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}

diff --git a/sys-auth/consolekit/consolekit-1.2.0.ebuild b/sys-auth/consolekit/consolekit-1.2.0.ebuild
deleted file mode 100644
index 853ffde3539..00000000000
--- a/sys-auth/consolekit/consolekit-1.2.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool linux-info ltprune pam xdg-utils
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	# patch needs autoreconf, so dont need libtoolize
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups libcgmanager) \
-		$(use_enable selinux libselinux) \
-		$(use_enable udev libdrm) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}

diff --git a/sys-auth/consolekit/consolekit-1.2.1.ebuild b/sys-auth/consolekit/consolekit-1.2.1.ebuild
deleted file mode 100644
index cc3e4dc331d..00000000000
--- a/sys-auth/consolekit/consolekit-1.2.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool linux-info ltprune pam xdg-utils
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	# patch needs autoreconf, so dont need libtoolize
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups libcgmanager) \
-		$(use_enable selinux libselinux) \
-		$(use_enable udev libdrm) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}

diff --git a/sys-auth/consolekit/consolekit-9999.ebuild b/sys-auth/consolekit/consolekit-9999.ebuild
deleted file mode 100644
index cec91280e66..00000000000
--- a/sys-auth/consolekit/consolekit-9999.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool git-r3 linux-info ltprune pam xdg-utils
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( sys-libs/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups libcgmanager) \
-		$(use_enable selinux libselinux) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}

diff --git a/sys-auth/consolekit/files/90-consolekit-3 b/sys-auth/consolekit/files/90-consolekit-3
deleted file mode 100644
index 358fc24f1a7..00000000000
--- a/sys-auth/consolekit/files/90-consolekit-3
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- sh -*-
-# Xsession.d script for ck-launch-session.
-#
-#
-# This file is sourced by Xsession(5), not executed.
-
-CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
-
-is_on_console() {
-	session=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		/org/freedesktop/ConsoleKit/Manager \
-		org.freedesktop.ConsoleKit.Manager.GetCurrentSession \
-		| grep path | awk '{print $3}' | sed s/\"//g)
-	x11_display=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \
-		--type=method_call --print-reply --reply-timeout=2000 \
-		$session org.freedesktop.ConsoleKit.Session.GetX11Display \
-		| grep string | awk '{print $2}' | sed s/\"//g)
-
-	if [ -z "$x11_display" ] ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-# gdm already creates a CK session for us, so do not run the expensive D-Bus
-# calls if we have $GDMSESSION
-if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \
- ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then
-    command="$CK_LAUNCH_SESSION $command"
-fi

diff --git a/sys-auth/consolekit/files/consolekit-0.2.rc b/sys-auth/consolekit/files/consolekit-0.2.rc
deleted file mode 100644
index e2be0de6e1a..00000000000
--- a/sys-auth/consolekit/files/consolekit-0.2.rc
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need dbus
-	use logger
-}
-
-start() {
-	ebegin "Starting ConsoleKit daemon"
-
-	checkpath -q -d -m 0755 /var/run/ConsoleKit
-
-	start-stop-daemon --start -q \
-		--pidfile /var/run/ConsoleKit/pid \
-		--exec /usr/sbin/console-kit-daemon -- 
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ConsoleKit daemon"
-	start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid 
-	eend $?
-}

diff --git a/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch b/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch
deleted file mode 100644
index b896089d448..00000000000
--- a/sys-auth/consolekit/files/consolekit-0.4.5-polkit-automagic.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.freedesktop.org/show_bug.cgi?id=47587
-
---- configure.ac
-+++ configure.ac
-@@ -56,10 +56,21 @@
-   gthread-2.0 >= $GLIB_REQUIRED_VERSION
- )
- 
--PKG_CHECK_MODULES(POLKIT,
--  polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
--  have_polkit=yes,
--  have_polkit=no)
-+AC_ARG_ENABLE([polkit],
-+  AC_HELP_STRING([--enable-polkit], [Enable PolicyKit support (default auto)]),
-+  enable_polkit=$enableval,
-+  enable_polkit=auto)
-+
-+if test "x$enable_polkit" != "xno"; then
-+  PKG_CHECK_MODULES(POLKIT,
-+    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
-+    have_polkit=yes,
-+    have_polkit=no)
-+  if test "x$enable_polkit"  = "xyes" -a "x$have_polkit" = "xno"; then
-+    AC_MSG_ERROR([PolicyKit support explicitly requested but dependencies not found])
-+  fi
-+fi
-+
- if test "x$have_polkit" = "xyes" ; then
-        AC_DEFINE(HAVE_POLKIT, [], [Define if we have polkit])
- fi

diff --git a/sys-auth/consolekit/files/consolekit-1.0.0.initd b/sys-auth/consolekit/files/consolekit-1.0.0.initd
deleted file mode 100644
index 4fd1140fe20..00000000000
--- a/sys-auth/consolekit/files/consolekit-1.0.0.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-description="consolekit - tracks login sessions and seats"
-pidfile="/run/ConsoleKit/pid"
-command="/usr/sbin/console-kit-daemon"
-
-depend() {
-	need dbus
-	use logger
-}
-
-start_pre() {
-	checkpath -q -d -m 0755 /run/ConsoleKit
-}

diff --git a/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch b/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch
deleted file mode 100644
index 301c68f5d90..00000000000
--- a/sys-auth/consolekit/files/consolekit-1.1.0-Remove-the-root-restriction-for-runtime-dirs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 664d2fdbd966764836b1f4da2dbc5750c7f01f0f Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Sun, 10 Apr 2016 11:20:24 +0300
-Subject: [PATCH] Remove the root restriction for runtime dirs
-
----
- src/ck-sysdeps-unix.c       |  5 -----
- tools/ck-remove-directory.c | 10 ----------
- 2 files changed, 15 deletions(-)
-
-diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c
-index 67d8eac..ecd176a 100644
---- a/src/ck-sysdeps-unix.c
-+++ b/src/ck-sysdeps-unix.c
-@@ -409,11 +409,6 @@ ck_generate_runtime_dir_for_user (guint uid)
- 
-         TRACE ();
- 
--        if (uid < 1) {
--                g_debug ("We do not create runtime dirs for root");
--                return NULL;
--        }
--
-         errno = 0;
-         pwent = getpwuid (uid);
-         if (pwent == NULL) {
-diff --git a/tools/ck-remove-directory.c b/tools/ck-remove-directory.c
-index cf44fd6..b1a5722 100644
---- a/tools/ck-remove-directory.c
-+++ b/tools/ck-remove-directory.c
-@@ -51,11 +51,6 @@ become_user (uid_t uid, const gchar* dest)
-         int            res;
-         struct passwd *pwent;
- 
--        if (uid < 1) {
--                g_critical ("invalid UID");
--                exit (1);
--        }
--
-         if (dest == NULL) {
-                 g_critical ("invalid dest");
-                 exit (1);
-@@ -148,11 +143,6 @@ main (int    argc,
-                 exit (1);
-         }
- 
--        if (user_id < 1) {
--                g_warning ("Invalid UID");
--                exit (1);
--        }
--
-         /* Ensure we have a dest and that it starts with the correct prefix
-          * so we don't remove something important.
-          */
--- 
-2.7.3
-

diff --git a/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
deleted file mode 100644
index c02411ebded..00000000000
--- a/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://bugs.gentoo.org/257761
-http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/
-
---- src/main.c
-+++ src/main.c
-@@ -148,6 +148,43 @@
-         unlink (CONSOLE_KIT_PID_FILE);
- }
- 
-+#define CONSOLE_TAGS_DIR "/var/run/console"
-+
-+static void
-+delete_console_tags (void)
-+{
-+	GDir *dir;
-+	GError *error = NULL;
-+	const gchar *name;
-+
-+	g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
-+
-+	dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
-+	if (dir == NULL) {
-+		g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
-+		           error->message);
-+		g_error_free (error);
-+		return;
-+	}
-+	while ((name = g_dir_read_name (dir)) != NULL) {
-+		gchar *file;
-+		file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
-+
-+		g_debug ("Removing tag file: %s", file);
-+		if (unlink (file) == -1) {
-+			g_warning ("Couldn't delete tag file: %s", file);
-+		}
-+		g_free (file);
-+	}
-+}
-+
-+static void
-+cleanup (void)
-+{
-+	delete_console_tags ();
-+	delete_pid ();
-+}
-+
- /* copied from nautilus */
- static int debug_log_pipes[2];
- 
-@@ -228,7 +265,7 @@
-                 snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
-                 written = write (pf, pid, strlen (pid));
-                 close (pf);
--                g_atexit (delete_pid);
-+                g_atexit (cleanup);
-         } else {
-                 g_warning ("Unable to write pid file %s: %s",
-                            CONSOLE_KIT_PID_FILE,
-@@ -317,6 +354,8 @@
-                 goto out;
-         }
- 
-+	delete_console_tags ();
-+
-         create_pid_file ();
- 
-         loop = g_main_loop_new (NULL, FALSE);

diff --git a/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch b/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch
deleted file mode 100644
index 6a46649f758..00000000000
--- a/sys-auth/consolekit/files/consolekit-shutdown-reboot-without-policies.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Sat, 24 Oct 2009 18:43:43 +0200
-Subject: [PATCH] Be able to shutdown or reboot even without polkit or RBAC supports
-
-Ck does NOTHING at the origin if its built without polkit or RBAC supports, except
-display a warning using g_warning() (which does not make sense).
-The trick is to to call do_stop()/do_restart() in the #else directive :)
-
---- src/ck-manager.c
-+++ src/ck-manager.c
-@@ -1131,6 +1131,7 @@
-         check_rbac_permissions (manager, context, RBAC_SHUTDOWN_KEY, do_restart);
- #else
-         g_warning ("Compiled without PolicyKit or RBAC support!");
-+        do_restart(manager, context);
- #endif
- 
-         return TRUE;
-@@ -1207,6 +1208,7 @@
-         check_rbac_permissions (manager, context, RBAC_SHUTDOWN_KEY, do_stop);
- #else
-         g_warning ("Compiled without PolicyKit or RBAC support!");
-+        do_stop(manager, context);
- #endif
- 
-         return TRUE;

diff --git a/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch b/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch
deleted file mode 100644
index 3ef39873dbd..00000000000
--- a/sys-auth/consolekit/files/consolekit-udev-acl-install_to_usr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/398049
-
---- tools/Makefile.am
-+++ tools/Makefile.am
-@@ -144,11 +144,10 @@
- 	$(NULL)
- 
- if ENABLE_UDEV_ACL
--udevdir = $(UDEVDIR)
- udevrulesdir = $(UDEVDIR)/rules.d
- 
- dist_udevrules_DATA = 70-udev-acl.rules
--udev_PROGRAMS = udev-acl
-+libexec_PROGRAMS = udev-acl
- 
- udev_acl_SOURCES = udev-acl.c
- udev_acl_LDADD = $(UDEV_ACL_LIBS)
-@@ -156,7 +155,9 @@
- 
- install-exec-hook:
- 	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
--	ln -sf $(UDEVDIR)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-+	mkdir -p $(DESTDIR)$(UDEVDIR)
-+	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-+	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(UDEVDIR)/udev-acl
- endif
- 
- EXTRA_DIST =				\

diff --git a/sys-auth/consolekit/files/pam-foreground-compat.ck b/sys-auth/consolekit/files/pam-foreground-compat.ck
deleted file mode 100644
index 0697ca81ba4..00000000000
--- a/sys-auth/consolekit/files/pam-foreground-compat.ck
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-TAGDIR=/var/run/console
-
-[ -n "$CK_SESSION_USER_UID" ] || exit 1
-
-TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
-
-if [ "$1" = "session_added" ]; then
-	mkdir -p "$TAGDIR"
-	echo "$CK_SESSION_ID" >> "$TAGFILE"
-fi
-
-if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
-	sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
-	[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
-fi
-

diff --git a/sys-auth/consolekit/metadata.xml b/sys-auth/consolekit/metadata.xml
deleted file mode 100644
index 3aa5069e61c..00000000000
--- a/sys-auth/consolekit/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>perfinion@gentoo.org</email>
-		<name>Jason Zaman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="cgroups">Use the kernel to track processes instead of the session cookie.</flag>
-		<flag name="evdev">For handling VT switching with a session controller.</flag>
-		<flag name="pm-utils">Adds support for suspend/resume using <pkg>sys-power/pm-utils</pkg></flag>
-		<flag name="policykit">Use the PolicyKit framework (<pkg>sys-auth/polkit</pkg>) to get authorization for suspend/shutdown.</flag>
-		<flag name="systemd-units">Install systemd unit files to replace the modern functionality of logind in <pkg>sys-apps/systemd</pkg>. Not recommended.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ConsoleKit2/ConsoleKit2</remote-id>
-		<remote-id type="launchpad">debian</remote-id>
-	</upstream>
-</pkgmetadata>


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

end of thread, other threads:[~2020-10-04 14:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-02 15:15 [gentoo-commits] repo/gentoo:master commit in: sys-auth/consolekit/, sys-auth/consolekit/files/ Jason Zaman
  -- strict thread matches above, loose matches on Subject: below --
2020-10-04 14:39 Mikle Kolyada

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