Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/
Date: Wed, 07 Oct 2020 17:57:54
Message-Id: 1602093467.ca665c564691160550d0a0f37da4b530594477f5.zlogene@gentoo
1 commit: ca665c564691160550d0a0f37da4b530594477f5
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 7 17:56:37 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 7 17:57:47 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca665c56
7
8 gnome-base/gnome-session: remove consolekit support
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 gnome-base/gnome-session/gnome-session-3.34.2.ebuild | 11 ++++-------
14 gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild | 11 ++++-------
15 gnome-base/gnome-session/gnome-session-3.36.0.ebuild | 11 ++++-------
16 gnome-base/gnome-session/metadata.xml | 1 -
17 4 files changed, 12 insertions(+), 22 deletions(-)
18
19 diff --git a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
20 index 98e279b1100..c3fc08de2a0 100644
21 --- a/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
22 +++ b/gnome-base/gnome-session/gnome-session-3.34.2.ebuild
23 @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
24 LICENSE="GPL-2+"
25 SLOT="0"
26 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
27 -IUSE="consolekit doc elogind systemd"
28 +IUSE="doc elogind systemd"
29 # There is a null backend available, thus ?? not ^^
30 -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
31 REQUIRED_USE="?? ( elogind systemd )"
32
33 DEPEND="
34 @@ -30,7 +29,6 @@ DEPEND="
35
36 systemd? ( >=sys-apps/systemd-183:0= )
37 elogind? ( >=sys-auth/elogind-239.4 )
38 - consolekit? ( >=dev-libs/dbus-glib-0.76 )
39 "
40
41 # Pure-runtime deps from the session files should *NOT* be added here.
42 @@ -46,7 +44,6 @@ RDEPEND="${DEPEND}
43 >=gnome-base/gnome-settings-daemon-3.23.2
44 >=gnome-base/gsettings-desktop-schemas-0.1.7
45 sys-apps/dbus[X]
46 - consolekit? ( sys-auth/consolekit )
47
48 x11-misc/xdg-user-dirs
49 x11-misc/xdg-user-dirs-gtk
50 @@ -80,8 +77,8 @@ src_configure() {
51 $(meson_use systemd)
52 -Dsystemd_session=$(usex systemd default disable)
53 $(meson_use systemd systemd_journal)
54 - $(meson_use consolekit)
55 $(meson_use doc docbook)
56 + -Dconsolekit=false
57 -Dman=true
58 )
59 meson_src_configure
60 @@ -119,8 +116,8 @@ pkg_postinst() {
61 ewarn "make sure that the commands in the xinitrc.d scripts are run."
62 fi
63
64 - if ! use systemd && ! use elogind && ! use consolekit; then
65 - ewarn "You are building without systemd, elogind and/or consolekit support."
66 + if ! use systemd && ! use elogind; then
67 + ewarn "You are building without systemd or elogind support."
68 ewarn "gnome-session won't be able to correctly track and manage your session."
69 fi
70 }
71
72 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
73 index 44a8e800324..0feb7789d56 100644
74 --- a/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
75 +++ b/gnome-base/gnome-session/gnome-session-3.36.0-r1.ebuild
76 @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
77 LICENSE="GPL-2+"
78 SLOT="0"
79 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
80 -IUSE="consolekit doc elogind systemd"
81 +IUSE="doc elogind systemd"
82 # There is a null backend available, thus ?? not ^^
83 -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
84 REQUIRED_USE="?? ( elogind systemd )"
85
86 DEPEND="
87 @@ -30,7 +29,6 @@ DEPEND="
88
89 systemd? ( >=sys-apps/systemd-183:0= )
90 elogind? ( >=sys-auth/elogind-239.4 )
91 - consolekit? ( >=dev-libs/dbus-glib-0.76 )
92 "
93
94 # Pure-runtime deps from the session files should *NOT* be added here.
95 @@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
96 >=gnome-base/gnome-settings-daemon-3.35.91
97 >=gnome-base/gsettings-desktop-schemas-0.1.7
98 sys-apps/dbus[X]
99 - consolekit? ( sys-auth/consolekit )
100
101 x11-misc/xdg-user-dirs
102 x11-misc/xdg-user-dirs-gtk
103 @@ -78,8 +75,8 @@ src_configure() {
104 $(meson_use systemd)
105 -Dsystemd_session=$(usex systemd default disable)
106 $(meson_use systemd systemd_journal)
107 - $(meson_use consolekit)
108 $(meson_use doc docbook)
109 + -Dconsolekit=false
110 -Dman=true
111 )
112 meson_src_configure
113 @@ -117,8 +114,8 @@ pkg_postinst() {
114 ewarn "make sure that the commands in the xinitrc.d scripts are run."
115 fi
116
117 - if ! use systemd && ! use elogind && ! use consolekit; then
118 - ewarn "You are building without systemd, elogind and/or consolekit support."
119 + if ! use systemd && ! use elogind; then
120 + ewarn "You are building without systemd or elogind support."
121 ewarn "gnome-session won't be able to correctly track and manage your session."
122 fi
123 }
124
125 diff --git a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
126 index 4f42ede4e06..cabaad73f1e 100644
127 --- a/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
128 +++ b/gnome-base/gnome-session/gnome-session-3.36.0.ebuild
129 @@ -11,9 +11,8 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
130 LICENSE="GPL-2+"
131 SLOT="0"
132 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
133 -IUSE="consolekit doc elogind systemd"
134 +IUSE="doc elogind systemd"
135 # There is a null backend available, thus ?? not ^^
136 -# consolekit can be enabled alone, or together with a logind provider; in latter case CK is used as fallback
137 REQUIRED_USE="?? ( elogind systemd )"
138
139 DEPEND="
140 @@ -30,7 +29,6 @@ DEPEND="
141
142 systemd? ( >=sys-apps/systemd-183:0= )
143 elogind? ( >=sys-auth/elogind-239.4 )
144 - consolekit? ( >=dev-libs/dbus-glib-0.76 )
145 "
146
147 # Pure-runtime deps from the session files should *NOT* be added here.
148 @@ -44,7 +42,6 @@ RDEPEND="${DEPEND}
149 >=gnome-base/gnome-settings-daemon-3.35.91
150 >=gnome-base/gsettings-desktop-schemas-0.1.7
151 sys-apps/dbus[X]
152 - consolekit? ( sys-auth/consolekit )
153
154 x11-misc/xdg-user-dirs
155 x11-misc/xdg-user-dirs-gtk
156 @@ -78,8 +75,8 @@ src_configure() {
157 $(meson_use systemd)
158 -Dsystemd_session=$(usex systemd default disable)
159 $(meson_use systemd systemd_journal)
160 - $(meson_use consolekit)
161 $(meson_use doc docbook)
162 + -Dconsolekit=false
163 -Dman=true
164 )
165 meson_src_configure
166 @@ -117,8 +114,8 @@ pkg_postinst() {
167 ewarn "make sure that the commands in the xinitrc.d scripts are run."
168 fi
169
170 - if ! use systemd && ! use elogind && ! use consolekit; then
171 - ewarn "You are building without systemd, elogind and/or consolekit support."
172 + if ! use systemd && ! use elogind; then
173 + ewarn "You are building without systemd or elogind support."
174 ewarn "gnome-session won't be able to correctly track and manage your session."
175 fi
176 }
177
178 diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
179 index 0a5d0e69d17..7b4ca44a660 100644
180 --- a/gnome-base/gnome-session/metadata.xml
181 +++ b/gnome-base/gnome-session/metadata.xml
182 @@ -6,7 +6,6 @@
183 <name>Gentoo GNOME Desktop</name>
184 </maintainer>
185 <use>
186 - <flag name="consolekit">Support <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
187 <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
188 </use>
189 </pkgmetadata>
Report Message
Find on MARC Find on Google Groups