1 |
commit: 68f3096fbb5c987b2a2dcb65377595256ad3742f |
2 |
Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 12 12:55:08 2018 +0000 |
4 |
Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 12 12:55:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=68f3096f |
7 |
|
8 |
gnome-base/gnome-session: drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
.../gnome-session/gnome-session-3.20.0.ebuild | 123 --------------------- |
13 |
gnome-base/gnome-session/gnome-session-9999.ebuild | 3 +- |
14 |
gnome-base/gnome-session/metadata.xml | 12 +- |
15 |
3 files changed, 5 insertions(+), 133 deletions(-) |
16 |
|
17 |
diff --git a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild b/gnome-base/gnome-session/gnome-session-3.20.0.ebuild |
18 |
deleted file mode 100644 |
19 |
index 016129fc..00000000 |
20 |
--- a/gnome-base/gnome-session/gnome-session-3.20.0.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,123 +0,0 @@ |
23 |
-# Copyright 1999-2016 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI="5" |
28 |
-GCONF_DEBUG="yes" |
29 |
- |
30 |
-inherit gnome2 |
31 |
- |
32 |
-DESCRIPTION="Gnome session manager" |
33 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-session" |
34 |
- |
35 |
-LICENSE="GPL-2 LGPL-2 FDL-1.1" |
36 |
-SLOT="0" |
37 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
38 |
-IUSE="doc elibc_FreeBSD ipv6 systemd" |
39 |
- |
40 |
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and |
41 |
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* |
42 |
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). |
43 |
-# gdk-pixbuf used in the inhibit dialog |
44 |
-COMMON_DEPEND=" |
45 |
- >=dev-libs/glib-2.46.0:2[dbus] |
46 |
- x11-libs/gdk-pixbuf:2 |
47 |
- >=x11-libs/gtk+-3.18.0:3 |
48 |
- >=dev-libs/json-glib-0.10 |
49 |
- >=gnome-base/gnome-desktop-3.18:3= |
50 |
- elibc_FreeBSD? ( dev-libs/libexecinfo ) |
51 |
- |
52 |
- virtual/opengl |
53 |
- x11-libs/libSM |
54 |
- x11-libs/libICE |
55 |
- x11-libs/libXau |
56 |
- x11-libs/libX11 |
57 |
- x11-libs/libXcomposite |
58 |
- x11-libs/libXext |
59 |
- x11-libs/libXrender |
60 |
- x11-libs/libXtst |
61 |
- x11-misc/xdg-user-dirs |
62 |
- x11-misc/xdg-user-dirs-gtk |
63 |
- x11-apps/xdpyinfo |
64 |
- |
65 |
- systemd? ( >=sys-apps/systemd-183:0= ) |
66 |
-" |
67 |
-# Pure-runtime deps from the session files should *NOT* be added here |
68 |
-# Otherwise, things like gdm pull in gnome-shell |
69 |
-# gnome-themes-standard is needed for the failwhale dialog themeing |
70 |
-# sys-apps/dbus[X] is needed for session management |
71 |
-RDEPEND="${COMMON_DEPEND} |
72 |
- gnome-base/gnome-settings-daemon |
73 |
- >=gnome-base/gsettings-desktop-schemas-0.1.7 |
74 |
- >=x11-themes/gnome-themes-standard-2.91.92 |
75 |
- sys-apps/dbus[X] |
76 |
- !systemd? ( |
77 |
- sys-auth/consolekit |
78 |
- >=dev-libs/dbus-glib-0.76 |
79 |
- ) |
80 |
-" |
81 |
-DEPEND="${COMMON_DEPEND} |
82 |
- >=dev-lang/perl-5 |
83 |
- >=sys-devel/gettext-0.10.40 |
84 |
- dev-libs/libxslt |
85 |
- >=dev-util/intltool-0.40.6 |
86 |
- virtual/pkgconfig |
87 |
- !<gnome-base/gdm-2.20.4 |
88 |
- doc? ( |
89 |
- app-text/xmlto |
90 |
- dev-libs/libxslt ) |
91 |
-" |
92 |
-# gnome-common needed for eautoreconf |
93 |
-# gnome-base/gdm does not provide gnome.desktop anymore |
94 |
- |
95 |
-src_configure() { |
96 |
- # 1. Avoid automagic on old upower releases |
97 |
- # 2. xsltproc is always checked due to man configure |
98 |
- # switch, even if USE=-doc |
99 |
- # 3. Disable old gconf support as other distributions did long time |
100 |
- # ago |
101 |
- gnome2_src_configure \ |
102 |
- --disable-deprecation-flags \ |
103 |
- --disable-gconf \ |
104 |
- --enable-session-selector \ |
105 |
- $(use_enable doc docbook-docs) \ |
106 |
- $(use_enable ipv6) \ |
107 |
- $(use_enable systemd) \ |
108 |
- $(use_enable !systemd consolekit) \ |
109 |
- UPOWER_CFLAGS="" \ |
110 |
- UPOWER_LIBS="" |
111 |
- # gnome-session-selector pre-generated man page is missing |
112 |
- #$(usex !doc XSLTPROC=$(type -P true)) |
113 |
-} |
114 |
- |
115 |
-src_install() { |
116 |
- gnome2_src_install |
117 |
- |
118 |
- dodir /etc/X11/Sessions |
119 |
- exeinto /etc/X11/Sessions |
120 |
- doexe "${FILESDIR}/Gnome" |
121 |
- |
122 |
- insinto /usr/share/applications |
123 |
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list |
124 |
- |
125 |
- dodir /etc/X11/xinit/xinitrc.d/ |
126 |
- exeinto /etc/X11/xinit/xinitrc.d/ |
127 |
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome |
128 |
- |
129 |
- # This should be done here as discussed in bug #270852 |
130 |
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome |
131 |
- |
132 |
- # Set XCURSOR_THEME from current dconf setting instead of installing |
133 |
- # default cursor symlink globally and affecting other DEs (bug #543488) |
134 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703 |
135 |
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome |
136 |
-} |
137 |
- |
138 |
-pkg_postinst() { |
139 |
- gnome2_pkg_postinst |
140 |
- |
141 |
- if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then |
142 |
- ewarn "If you use a custom .xinitrc for your X session," |
143 |
- ewarn "make sure that the commands in the xinitrc.d scripts are run." |
144 |
- fi |
145 |
-} |
146 |
|
147 |
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild |
148 |
index f4f5ad62..1c0186cc 100644 |
149 |
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild |
150 |
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild |
151 |
@@ -1,6 +1,5 @@ |
152 |
-# Copyright 1999-2016 Gentoo Foundation |
153 |
+# Copyright 1999-2018 Gentoo Foundation |
154 |
# Distributed under the terms of the GNU General Public License v2 |
155 |
-# $Id$ |
156 |
|
157 |
EAPI="5" |
158 |
GCONF_DEBUG="yes" |
159 |
|
160 |
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml |
161 |
index 06d13a57..996e7cac 100644 |
162 |
--- a/gnome-base/gnome-session/metadata.xml |
163 |
+++ b/gnome-base/gnome-session/metadata.xml |
164 |
@@ -1,12 +1,8 @@ |
165 |
<?xml version="1.0" encoding="UTF-8"?> |
166 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
167 |
<pkgmetadata> |
168 |
-<maintainer type="project"> |
169 |
- <email>gnome@g.o</email> |
170 |
- <name>Gentoo GNOME Desktop</name> |
171 |
-</maintainer> |
172 |
-<use> |
173 |
- <flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg> |
174 |
- configuration storage system</flag> |
175 |
-</use> |
176 |
+ <maintainer type="project"> |
177 |
+ <email>gnome@g.o</email> |
178 |
+ <name>Gentoo GNOME Desktop</name> |
179 |
+ </maintainer> |
180 |
</pkgmetadata> |