commit: ca665c564691160550d0a0f37da4b530594477f5 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Wed Oct 7 17:56:37 2020 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Wed Oct 7 17:57:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca665c56
gnome-base/gnome-session: remove consolekit support Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> gnome-base/gnome-session/gnome-session-3.34.2.ebuild | 11 ++++------- gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild | 11 ++++------- gnome-base/gnome-session/gnome-session-3.36.0.ebuild | 11 ++++------- gnome-base/gnome-session/metadata.xml | 1 - 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild index 98e279b1100..c3fc08de2a0 100644 --- a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"; LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="consolekit doc elogind systemd" +IUSE="doc elogind systemd" # There is a null backend available, thus ?? not ^^ -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -30,7 +29,6 @@ DEPEND=" systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) - consolekit? ( >=dev-libs/dbus-glib-0.76 ) " # Pure-runtime deps from the session files should *NOT* be added here. @@ -46,7 +44,6 @@ RDEPEND="${DEPEND} >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] - consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk @@ -80,8 +77,8 @@ src_configure() { $(meson_use systemd) -Dsystemd_session=$(usex systemd default disable) $(meson_use systemd systemd_journal) - $(meson_use consolekit) $(meson_use doc docbook) + -Dconsolekit=false -Dman=true ) meson_src_configure @@ -119,8 +116,8 @@ pkg_postinst() { ewarn "make sure that the commands in the xinitrc.d scripts are run." fi - if ! use systemd && ! use elogind && ! use consolekit; then - ewarn "You are building without systemd, elogind and/or consolekit support." + if ! use systemd && ! use elogind; then + ewarn "You are building without systemd or elogind support." ewarn "gnome-session won't be able to correctly track and manage your session." fi } diff --git a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild index 44a8e800324..0feb7789d56 100644 --- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"; LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="consolekit doc elogind systemd" +IUSE="doc elogind systemd" # There is a null backend available, thus ?? not ^^ -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -30,7 +29,6 @@ DEPEND=" systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) - consolekit? ( >=dev-libs/dbus-glib-0.76 ) " # Pure-runtime deps from the session files should *NOT* be added here. @@ -44,7 +42,6 @@ RDEPEND="${DEPEND} >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] - consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk @@ -78,8 +75,8 @@ src_configure() { $(meson_use systemd) -Dsystemd_session=$(usex systemd default disable) $(meson_use systemd systemd_journal) - $(meson_use consolekit) $(meson_use doc docbook) + -Dconsolekit=false -Dman=true ) meson_src_configure @@ -117,8 +114,8 @@ pkg_postinst() { ewarn "make sure that the commands in the xinitrc.d scripts are run." fi - if ! use systemd && ! use elogind && ! use consolekit; then - ewarn "You are building without systemd, elogind and/or consolekit support." + if ! use systemd && ! use elogind; then + ewarn "You are building without systemd or elogind support." ewarn "gnome-session won't be able to correctly track and manage your session." fi } diff --git a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild index 4f42ede4e06..cabaad73f1e 100644 --- a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild +++ b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"; LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="consolekit doc elogind systemd" +IUSE="doc elogind systemd" # There is a null backend available, thus ?? not ^^ -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback REQUIRED_USE="?? ( elogind systemd )" DEPEND=" @@ -30,7 +29,6 @@ DEPEND=" systemd? ( >=sys-apps/systemd-183:0= ) elogind? ( >=sys-auth/elogind-239.4 ) - consolekit? ( >=dev-libs/dbus-glib-0.76 ) " # Pure-runtime deps from the session files should *NOT* be added here. @@ -44,7 +42,6 @@ RDEPEND="${DEPEND} >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] - consolekit? ( sys-auth/consolekit ) x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk @@ -78,8 +75,8 @@ src_configure() { $(meson_use systemd) -Dsystemd_session=$(usex systemd default disable) $(meson_use systemd systemd_journal) - $(meson_use consolekit) $(meson_use doc docbook) + -Dconsolekit=false -Dman=true ) meson_src_configure @@ -117,8 +114,8 @@ pkg_postinst() { ewarn "make sure that the commands in the xinitrc.d scripts are run." fi - if ! use systemd && ! use elogind && ! use consolekit; then - ewarn "You are building without systemd, elogind and/or consolekit support." + if ! use systemd && ! use elogind; then + ewarn "You are building without systemd or elogind support." ewarn "gnome-session won't be able to correctly track and manage your session." fi } diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml index 0a5d0e69d17..7b4ca44a660 100644 --- a/gnome-base/gnome-session/metadata.xml +++ b/gnome-base/gnome-session/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> - <flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag> <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag> </use> </pkgmetadata>
