Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-session/
Date: Sat, 30 Mar 2019 22:21:11
Message-Id: 1553983098.9da873c7c6b9079a43bee52fc645a88c5938cd42.leio@gentoo
1 commit: 9da873c7c6b9079a43bee52fc645a88c5938cd42
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 30 21:58:18 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 30 21:58:18 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da873c7
7
8 gnome-base/gnome-session: remove old
9
10 Package-Manager: Portage-2.3.52, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 gnome-base/gnome-session/Manifest | 2 -
14 .../gnome-session/gnome-session-3.26.1.ebuild | 126 ---------------------
15 .../gnome-session/gnome-session-3.28.1.ebuild | 120 --------------------
16 3 files changed, 248 deletions(-)
17
18 diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
19 index 1fce49bb03b..0e0b9578f86 100644
20 --- a/gnome-base/gnome-session/Manifest
21 +++ b/gnome-base/gnome-session/Manifest
22 @@ -1,5 +1,3 @@
23 DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
24 DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
25 -DIST gnome-session-3.26.1.tar.xz 782676 BLAKE2B 68ffae002910f827dca372402b8e014298b12fc892d6e6c477ff8ba0f793c98cd28f4a974c5665ac8bf7d61f485e4c662ba2f96cb3fd9bdec4a6218e86a797db SHA512 a4c2e82306ae044c56b857c8f7347dc5d5235231e702d2ac38c8c433e21efc75ca3911ee029af01754685f64000a0e6f5d17408192208b19d7dc367079ee7b0a
26 -DIST gnome-session-3.28.1.tar.xz 480196 BLAKE2B 37bd2138c0610f5cbaa77d558a02f025e2df3105d1b07a3e41f06078215c06c01d47fd6803cb72ee05ccc98765b46221fc618e2b7c3e091398c4420d5be8a015 SHA512 ceeacb3cb4729d4b0a646220097a49359d1eb85ec20cd5d5a44c273b661d41ee83caaf6598def06c4e89b5f785f9317b1171b5550bf8f5634bc882a21e5e685b
27 DIST gnome-session-3.30.1.tar.xz 485996 BLAKE2B 6882aa9f6004dc6da5070a484d92450bd1e8f61885492edf11260d9834fcae700f113a8ddeb1d905171432400ad9e94fba99ed6eaa49f08efd2d0ec2dffd9c5a SHA512 b6bc98da0245cdefa7e462b1f4e2c9198ee0da1f15a426d377331f79aec2f637bef27b093780c77f7ffbe7eb62c6829acdbd9f9e25cac5a4f6ed0da6ab96359a
28
29 diff --git a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
30 deleted file mode 100644
31 index b7c49fd1645..00000000000
32 --- a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
33 +++ /dev/null
34 @@ -1,126 +0,0 @@
35 -# Copyright 1999-2018 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -GNOME2_EAUTORECONF="yes"
40 -inherit gnome2
41 -
42 -DESCRIPTION="Gnome session manager"
43 -HOMEPAGE="https://git.gnome.org/browse/gnome-session"
44 -
45 -LICENSE="GPL-2 LGPL-2 FDL-1.1"
46 -SLOT="0"
47 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
48 -IUSE="doc elibc_FreeBSD ipv6 systemd"
49 -
50 -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
51 -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
52 -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
53 -# gdk-pixbuf used in the inhibit dialog
54 -COMMON_DEPEND="
55 - >=dev-libs/glib-2.46.0:2
56 - x11-libs/gdk-pixbuf:2
57 - >=x11-libs/gtk+-3.18.0:3
58 - >=dev-libs/json-glib-0.10
59 - >=gnome-base/gnome-desktop-3.18:3=
60 - elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
61 -
62 - media-libs/mesa[egl,gles2]
63 -
64 - media-libs/libepoxy
65 - x11-libs/libSM
66 - x11-libs/libICE
67 - x11-libs/libXau
68 - x11-libs/libX11
69 - x11-libs/libXcomposite
70 - x11-libs/libXext
71 - x11-libs/libXrender
72 - x11-libs/libXtst
73 - x11-misc/xdg-user-dirs
74 - x11-misc/xdg-user-dirs-gtk
75 - x11-apps/xdpyinfo
76 -
77 - systemd? ( >=sys-apps/systemd-183:0= )
78 -"
79 -# Pure-runtime deps from the session files should *NOT* be added here
80 -# Otherwise, things like gdm pull in gnome-shell
81 -# gnome-themes-standard is needed for the failwhale dialog themeing
82 -# sys-apps/dbus[X] is needed for session management.
83 -# gnome-settings-daemon is assumed to be >3.25.4, but this is about
84 -# removed components, so no need to strictly require it (older just
85 -# won't have those daemons loaded by gnome-session)
86 -RDEPEND="${COMMON_DEPEND}
87 - >=gnome-base/gnome-settings-daemon-3.23.2
88 - >=gnome-base/gsettings-desktop-schemas-0.1.7
89 - x11-themes/adwaita-icon-theme
90 - sys-apps/dbus[X]
91 - !systemd? (
92 - sys-auth/consolekit
93 - >=dev-libs/dbus-glib-0.76
94 - )
95 -"
96 -DEPEND="${COMMON_DEPEND}
97 - dev-libs/libxslt
98 - >=dev-util/intltool-0.40.6
99 - >=sys-devel/gettext-0.10.40
100 - virtual/pkgconfig
101 - !<gnome-base/gdm-2.20.4
102 - doc? (
103 - app-text/xmlto
104 - dev-libs/libxslt )
105 - gnome-base/gnome-common
106 -"
107 -# gnome-common needed for eautoreconf
108 -# gnome-base/gdm does not provide gnome.desktop anymore
109 -
110 -src_configure() {
111 - # 1. Avoid automagic on old upower releases
112 - # 2. xsltproc is always checked due to man configure
113 - # switch, even if USE=-doc
114 - # 3. Disable old gconf support as other distributions did long time
115 - # ago
116 - gnome2_src_configure \
117 - --disable-deprecation-flags \
118 - --disable-gconf \
119 - --enable-session-selector \
120 - $(use_enable doc docbook-docs) \
121 - $(use_enable ipv6) \
122 - $(use_enable systemd) \
123 - $(use_enable !systemd consolekit) \
124 - UPOWER_CFLAGS="" \
125 - UPOWER_LIBS=""
126 - # gnome-session-selector pre-generated man page is missing
127 - #$(usex !doc XSLTPROC=$(type -P true))
128 -}
129 -
130 -src_install() {
131 - gnome2_src_install
132 -
133 - dodir /etc/X11/Sessions
134 - exeinto /etc/X11/Sessions
135 - doexe "${FILESDIR}/Gnome"
136 -
137 - insinto /usr/share/applications
138 - newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
139 -
140 - dodir /etc/X11/xinit/xinitrc.d/
141 - exeinto /etc/X11/xinit/xinitrc.d/
142 - newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
143 -
144 - # This should be done here as discussed in bug #270852
145 - newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
146 -
147 - # Set XCURSOR_THEME from current dconf setting instead of installing
148 - # default cursor symlink globally and affecting other DEs (bug #543488)
149 - # https://bugzilla.gnome.org/show_bug.cgi?id=711703
150 - newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
151 -}
152 -
153 -pkg_postinst() {
154 - gnome2_pkg_postinst
155 -
156 - if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
157 - ewarn "If you use a custom .xinitrc for your X session,"
158 - ewarn "make sure that the commands in the xinitrc.d scripts are run."
159 - fi
160 -}
161
162 diff --git a/gnome-base/gnome-session/gnome-session-3.28.1.ebuild b/gnome-base/gnome-session/gnome-session-3.28.1.ebuild
163 deleted file mode 100644
164 index 8674fec66da..00000000000
165 --- a/gnome-base/gnome-session/gnome-session-3.28.1.ebuild
166 +++ /dev/null
167 @@ -1,120 +0,0 @@
168 -# Copyright 1999-2019 Gentoo Authors
169 -# Distributed under the terms of the GNU General Public License v2
170 -
171 -EAPI=6
172 -inherit gnome.org gnome2-utils meson xdg
173 -
174 -DESCRIPTION="Gnome session manager"
175 -HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
176 -
177 -LICENSE="GPL-2+"
178 -SLOT="0"
179 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
180 -IUSE="consolekit doc systemd"
181 -
182 -COMMON_DEPEND="
183 - >=dev-libs/glib-2.46.0:2
184 - >=x11-libs/gtk+-3.18.0:3
185 - x11-libs/libICE
186 - x11-libs/libSM
187 - x11-libs/libX11
188 - >=gnome-base/gnome-desktop-3.18:3=
189 - >=dev-libs/json-glib-0.10
190 - media-libs/mesa[egl,gles2]
191 - media-libs/libepoxy
192 - x11-libs/libXcomposite
193 -
194 - systemd? ( >=sys-apps/systemd-183:0= )
195 - consolekit? ( >=dev-libs/dbus-glib-0.76 )
196 -"
197 -
198 -# Pure-runtime deps from the session files should *NOT* be added here
199 -# Otherwise, things like gdm pull in gnome-shell.
200 -# gnome-settings-daemon is assumed to be >=3.27.90, but this is about
201 -# removed components, so no need to strictly require it (older just
202 -# won't have those daemons loaded by gnome-session).
203 -# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
204 -# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
205 -# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
206 -# sys-apps/dbus[X] is needed for session management.
207 -# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
208 -RDEPEND="${COMMON_DEPEND}
209 - >=gnome-base/gnome-settings-daemon-3.23.2
210 - >=gnome-base/gsettings-desktop-schemas-0.1.7
211 - sys-apps/dbus[X]
212 - consolekit? ( sys-auth/consolekit )
213 -
214 - x11-misc/xdg-user-dirs
215 - x11-misc/xdg-user-dirs-gtk
216 -"
217 -DEPEND="${COMMON_DEPEND}
218 - dev-libs/libxslt
219 - dev-util/gdbus-codegen
220 - >=sys-devel/gettext-0.19.8
221 - x11-libs/xtrans
222 - virtual/pkgconfig
223 - doc? ( app-text/xmlto
224 - app-text/docbook-xml-dtd:4.1.2 )
225 -"
226 -
227 -src_prepare() {
228 - xdg_src_prepare
229 - # Install USE=doc in $PF if enabled
230 - sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
231 -}
232 -
233 -src_configure() {
234 - local emesonargs=(
235 - -Ddeprecation_flags=false
236 - -Dsession_selector=true # gnome-custom-session
237 - $(meson_use systemd)
238 - $(meson_use systemd systemd_journal)
239 - $(meson_use consolekit)
240 - $(meson_use doc docbook)
241 - -Dman=true
242 - )
243 - meson_src_configure
244 -}
245 -
246 -src_install() {
247 - meson_src_install
248 -
249 - dodir /etc/X11/Sessions
250 - exeinto /etc/X11/Sessions
251 - doexe "${FILESDIR}/Gnome"
252 -
253 - insinto /usr/share/applications
254 - newins "${FILESDIR}/defaults.list-r4" gnome-mimeapps.list
255 -
256 - dodir /etc/X11/xinit/xinitrc.d/
257 - exeinto /etc/X11/xinit/xinitrc.d/
258 - newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
259 -
260 - # This should be done here as discussed in bug #270852
261 - newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
262 -
263 - # Set XCURSOR_THEME from current dconf setting instead of installing
264 - # default cursor symlink globally and affecting other DEs (bug #543488)
265 - # https://bugzilla.gnome.org/show_bug.cgi?id=711703
266 - newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
267 -}
268 -
269 -pkg_postinst() {
270 - xdg_pkg_postinst
271 - gnome2_schemas_update
272 -
273 - if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
274 - ewarn "If you use a custom .xinitrc for your X session,"
275 - ewarn "make sure that the commands in the xinitrc.d scripts are run."
276 - fi
277 -
278 - if ! use systemd && ! use consolekit; then
279 - ewarn "You are building without systemd and/or consolekit support."
280 - ewarn "gnome-session won't be able to correctly track and manage your session."
281 - fi
282 -}
283 -
284 -pkg_postrm() {
285 - xdg_pkg_postinst
286 - gnome2_schemas_update
287 -}