1 |
commit: 39980236e18ef296c8dccc9335a2c1f941c6b676 |
2 |
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 8 22:09:49 2021 +0000 |
4 |
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 8 22:09:49 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=39980236 |
7 |
|
8 |
mate-base/mate-session-manager: Drop consolekit support and drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org> |
12 |
|
13 |
.../mate-session-manager-1.24.0-r4.ebuild | 9 +-- |
14 |
.../mate-session-manager-1.24.0.ebuild | 89 ---------------------- |
15 |
.../mate-session-manager-1.24.1.ebuild | 9 +-- |
16 |
3 files changed, 6 insertions(+), 101 deletions(-) |
17 |
|
18 |
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild |
19 |
index aadf1b4..2491c14 100644 |
20 |
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild |
21 |
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.0-r4.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2020 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=6 |
28 |
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+" |
29 |
SLOT="0" |
30 |
IUSE="debug elogind gnome-keyring ipv6 systemd +xtrans" |
31 |
|
32 |
-REQUIRED_USE="?? ( elogind systemd )" |
33 |
+REQUIRED_USE="^^ ( elogind systemd )" |
34 |
|
35 |
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and |
36 |
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* |
37 |
@@ -38,10 +38,7 @@ COMMON_DEPEND=" |
38 |
x11-libs/libXtst |
39 |
x11-libs/pango |
40 |
systemd? ( sys-apps/systemd ) |
41 |
- !systemd? ( |
42 |
- elogind? ( sys-auth/elogind ) |
43 |
- !elogind? ( >=sys-auth/consolekit-0.9.2 ) |
44 |
- ) |
45 |
+ elogind? ( sys-auth/elogind ) |
46 |
xtrans? ( x11-libs/xtrans )" |
47 |
|
48 |
RDEPEND="${COMMON_DEPEND} |
49 |
|
50 |
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild |
51 |
deleted file mode 100644 |
52 |
index f30b9cf..0000000 |
53 |
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.0.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,89 +0,0 @@ |
56 |
-# Copyright 1999-2020 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI=6 |
60 |
- |
61 |
-inherit mate |
62 |
- |
63 |
-if [[ ${PV} != 9999 ]]; then |
64 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
65 |
-fi |
66 |
- |
67 |
-DESCRIPTION="MATE session manager" |
68 |
-HOMEPAGE="https://mate-desktop.org/" |
69 |
- |
70 |
-LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+" |
71 |
-SLOT="0" |
72 |
-IUSE="debug elogind gnome-keyring ipv6 systemd +xtrans" |
73 |
- |
74 |
-REQUIRED_USE="?? ( elogind systemd )" |
75 |
- |
76 |
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and |
77 |
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* |
78 |
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). |
79 |
- |
80 |
-COMMON_DEPEND=" |
81 |
- >=dev-libs/dbus-glib-0.76 |
82 |
- >=dev-libs/glib-2.50:2 |
83 |
- dev-libs/libxslt |
84 |
- sys-apps/dbus |
85 |
- x11-libs/gdk-pixbuf:2 |
86 |
- >=x11-libs/gtk+-3.22:3 |
87 |
- x11-libs/libICE |
88 |
- x11-libs/libSM |
89 |
- x11-libs/libX11 |
90 |
- x11-libs/libXau |
91 |
- x11-libs/libXext |
92 |
- x11-libs/libXrender |
93 |
- x11-libs/libXtst |
94 |
- x11-libs/pango |
95 |
- systemd? ( sys-apps/systemd ) |
96 |
- !systemd? ( |
97 |
- elogind? ( sys-auth/elogind ) |
98 |
- !elogind? ( >=sys-auth/consolekit-0.9.2 ) |
99 |
- ) |
100 |
- xtrans? ( x11-libs/xtrans )" |
101 |
- |
102 |
-RDEPEND="${COMMON_DEPEND} |
103 |
- virtual/libintl |
104 |
- x11-apps/xdpyinfo |
105 |
- x11-misc/xdg-user-dirs |
106 |
- x11-misc/xdg-user-dirs-gtk |
107 |
- gnome-keyring? ( gnome-base/gnome-keyring ) |
108 |
- !<gnome-base/gdm-2.20.4" |
109 |
- |
110 |
-DEPEND="${COMMON_DEPEND} |
111 |
- >=dev-lang/perl-5 |
112 |
- dev-util/glib-utils |
113 |
- >=sys-devel/gettext-0.19.8:* |
114 |
- virtual/pkgconfig" |
115 |
- |
116 |
-MATE_FORCE_AUTORECONF=true |
117 |
- |
118 |
-src_configure() { |
119 |
- mate_src_configure \ |
120 |
- $(use_with elogind) \ |
121 |
- $(use_with systemd) \ |
122 |
- $(use_with xtrans) \ |
123 |
- $(use_enable debug) \ |
124 |
- $(use_enable ipv6) |
125 |
-} |
126 |
- |
127 |
-src_install() { |
128 |
- mate_src_install |
129 |
- |
130 |
- dodir /etc/X11/Sessions/ |
131 |
- exeinto /etc/X11/Sessions/ |
132 |
- doexe "${FILESDIR}"/MATE |
133 |
- |
134 |
- dodir /usr/share/mate/applications/ |
135 |
- insinto /usr/share/mate/applications/ |
136 |
- doins "${FILESDIR}"/defaults.list |
137 |
- |
138 |
- dodir /etc/X11/xinit/xinitrc.d/ |
139 |
- exeinto /etc/X11/xinit/xinitrc.d/ |
140 |
- doexe "${FILESDIR}"/15-xdg-data-mate |
141 |
- |
142 |
- # This should be done in MATE too, see Gentoo bug #270852 |
143 |
- doexe "${FILESDIR}"/10-user-dirs-update-mate |
144 |
-} |
145 |
|
146 |
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild |
147 |
index 0e8125a..5e56cea 100644 |
148 |
--- a/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild |
149 |
+++ b/mate-base/mate-session-manager/mate-session-manager-1.24.1.ebuild |
150 |
@@ -1,4 +1,4 @@ |
151 |
-# Copyright 1999-2020 Gentoo Authors |
152 |
+# Copyright 1999-2021 Gentoo Authors |
153 |
# Distributed under the terms of the GNU General Public License v2 |
154 |
|
155 |
EAPI=6 |
156 |
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ GPL-3+ HPND LGPL-2+ LGPL-2.1+" |
157 |
SLOT="0" |
158 |
IUSE="debug elogind gles2 gnome-keyring ipv6 systemd +xtrans" |
159 |
|
160 |
-REQUIRED_USE="?? ( elogind systemd )" |
161 |
+REQUIRED_USE="^^ ( elogind systemd )" |
162 |
|
163 |
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and |
164 |
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* |
165 |
@@ -39,10 +39,7 @@ COMMON_DEPEND=" |
166 |
x11-libs/pango |
167 |
gles2? ( media-libs/mesa[egl,gles2] ) |
168 |
systemd? ( sys-apps/systemd ) |
169 |
- !systemd? ( |
170 |
- elogind? ( sys-auth/elogind ) |
171 |
- !elogind? ( >=sys-auth/consolekit-0.9.2 ) |
172 |
- ) |
173 |
+ elogind? ( sys-auth/elogind ) |
174 |
xtrans? ( x11-libs/xtrans ) |
175 |
" |