1 |
commit: 737abb404f372b9ad7c28e3e8b6ec261f7df4f56 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 17 10:47:32 2023 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 17 10:50:16 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737abb40 |
7 |
|
8 |
xfce-base/xfce4-session: Remove old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
xfce-base/xfce4-session/Manifest | 2 - |
13 |
...4-session-4.10.1-alock_support_to_xflock4.patch | 15 ----- |
14 |
.../xfce4-session/xfce4-session-4.16.0.ebuild | 76 --------------------- |
15 |
.../xfce4-session/xfce4-session-4.17.2.ebuild | 77 ---------------------- |
16 |
4 files changed, 170 deletions(-) |
17 |
|
18 |
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest |
19 |
index 778a263eb7dc..ff7fea36668d 100644 |
20 |
--- a/xfce-base/xfce4-session/Manifest |
21 |
+++ b/xfce-base/xfce4-session/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad |
24 |
-DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B be74ee215d687b2f01c39e73ece464544cfa7acfb687c1d6cf1d585f53be3cbc96f22271d5b6d35e572667370fc9a6f928878d5cb98c6b7dad53845e54a55ca2 SHA512 dab9b155f1e0368680a2e8429394baef2e2f4890cf7aa0cc4d7d0a01df8cee4605848b9aaae5073d9fa13df8f9a08a5f2311c834590f9d3c3909d17d446b123c |
25 |
DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c |
26 |
DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973 |
27 |
|
28 |
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch |
29 |
deleted file mode 100644 |
30 |
index 0582ecd020a3..000000000000 |
31 |
--- a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch |
32 |
+++ /dev/null |
33 |
@@ -1,15 +0,0 @@ |
34 |
-http://bugs.gentoo.org/501370 |
35 |
-http://bugzilla.xfce.org/show_bug.cgi?id=10679 |
36 |
- |
37 |
---- a/scripts/xflock4 |
38 |
-+++ b/scripts/xflock4 |
39 |
-@@ -35,7 +35,8 @@ |
40 |
- # else run another access locking utility, if installed |
41 |
- for lock_cmd in \ |
42 |
- "xlock -mode blank" \ |
43 |
-- "slock" |
44 |
-+ "slock" \ |
45 |
-+ "alock -bg blank -auth pam" |
46 |
- do |
47 |
- set -- $lock_cmd |
48 |
- if command -v -- $1 >/dev/null 2>&1; then |
49 |
|
50 |
diff --git a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild |
51 |
deleted file mode 100644 |
52 |
index 81dfb2da9544..000000000000 |
53 |
--- a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,76 +0,0 @@ |
56 |
-# Copyright 1999-2022 Gentoo Authors |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI=7 |
60 |
- |
61 |
-inherit xdg-utils |
62 |
- |
63 |
-DESCRIPTION="A session manager for the Xfce desktop environment" |
64 |
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start" |
65 |
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" |
66 |
- |
67 |
-LICENSE="GPL-2+" |
68 |
-SLOT="0" |
69 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" |
70 |
-IUSE="nls policykit +xscreensaver" |
71 |
- |
72 |
-DEPEND=">=dev-libs/glib-2.50 |
73 |
- >=x11-libs/gtk+-3.22:3 |
74 |
- x11-libs/libSM |
75 |
- x11-libs/libwnck:3 |
76 |
- x11-libs/libX11 |
77 |
- >=xfce-base/libxfce4util-4.15.2:= |
78 |
- >=xfce-base/libxfce4ui-4.15.1:= |
79 |
- >=xfce-base/xfconf-4.12:= |
80 |
- policykit? ( >=sys-auth/polkit-0.102 )" |
81 |
-RDEPEND="${DEPEND} |
82 |
- x11-apps/iceauth |
83 |
- x11-apps/xrdb |
84 |
- nls? ( x11-misc/xdg-user-dirs ) |
85 |
- xscreensaver? ( || ( |
86 |
- xfce-extra/xfce4-screensaver |
87 |
- >=x11-misc/xscreensaver-5.26 |
88 |
- >=x11-misc/xlockmore-5.43 |
89 |
- x11-misc/slock |
90 |
- x11-misc/alock[pam] |
91 |
- ) )" |
92 |
-BDEPEND=" |
93 |
- dev-util/intltool |
94 |
- sys-devel/gettext |
95 |
- virtual/pkgconfig" |
96 |
- |
97 |
-PATCHES=( |
98 |
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch |
99 |
-# TODO: this patch needs updating for the new version, and finding |
100 |
-# upstream bug. |
101 |
-# "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch |
102 |
-) |
103 |
- |
104 |
-src_configure() { |
105 |
- local myconf=( |
106 |
- $(use_enable policykit polkit) |
107 |
- --with-xsession-prefix="${EPREFIX}"/usr |
108 |
- ICEAUTH="${EPREFIX}"/usr/bin/iceauth |
109 |
- ) |
110 |
- |
111 |
- econf "${myconf[@]}" |
112 |
-} |
113 |
- |
114 |
-src_install() { |
115 |
- default |
116 |
- find "${ED}" -name '*.la' -delete || die |
117 |
- |
118 |
- local sessiondir=/etc/X11/Sessions |
119 |
- echo startxfce4 > "${T}"/Xfce4 || die |
120 |
- exeinto ${sessiondir} |
121 |
- doexe "${T}"/Xfce4 |
122 |
- dosym Xfce4 ${sessiondir}/Xfce |
123 |
-} |
124 |
- |
125 |
-pkg_postinst() { |
126 |
- xdg_icon_cache_update |
127 |
-} |
128 |
- |
129 |
-pkg_postrm() { |
130 |
- xdg_icon_cache_update |
131 |
-} |
132 |
|
133 |
diff --git a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild |
134 |
deleted file mode 100644 |
135 |
index 62d5619295d1..000000000000 |
136 |
--- a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild |
137 |
+++ /dev/null |
138 |
@@ -1,77 +0,0 @@ |
139 |
-# Copyright 1999-2022 Gentoo Authors |
140 |
-# Distributed under the terms of the GNU General Public License v2 |
141 |
- |
142 |
-EAPI=8 |
143 |
- |
144 |
-inherit xdg-utils |
145 |
- |
146 |
-DESCRIPTION="A session manager for the Xfce desktop environment" |
147 |
-HOMEPAGE=" |
148 |
- https://docs.xfce.org/xfce/xfce4-session/start |
149 |
- https://gitlab.xfce.org/xfce/xfce4-session |
150 |
-" |
151 |
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" |
152 |
- |
153 |
-LICENSE="GPL-2+" |
154 |
-SLOT="0" |
155 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" |
156 |
-IUSE="nls policykit +xscreensaver" |
157 |
- |
158 |
-DEPEND=" |
159 |
- >=dev-libs/glib-2.50 |
160 |
- >=x11-libs/gtk+-3.22:3 |
161 |
- x11-libs/libSM |
162 |
- x11-libs/libwnck:3 |
163 |
- x11-libs/libX11 |
164 |
- >=xfce-base/libxfce4util-4.15.2:= |
165 |
- >=xfce-base/libxfce4ui-4.15.1:= |
166 |
- >=xfce-base/xfconf-4.12:= |
167 |
- policykit? ( >=sys-auth/polkit-0.102 ) |
168 |
-" |
169 |
-RDEPEND=" |
170 |
- ${DEPEND} |
171 |
- x11-apps/iceauth |
172 |
- x11-apps/xrdb |
173 |
- nls? ( x11-misc/xdg-user-dirs ) |
174 |
- xscreensaver? ( |
175 |
- || ( |
176 |
- xfce-extra/xfce4-screensaver |
177 |
- >=x11-misc/xscreensaver-5.26 |
178 |
- x11-misc/light-locker |
179 |
- ) |
180 |
- ) |
181 |
-" |
182 |
-BDEPEND=" |
183 |
- dev-util/intltool |
184 |
- sys-devel/gettext |
185 |
- virtual/pkgconfig |
186 |
-" |
187 |
- |
188 |
-src_configure() { |
189 |
- local myconf=( |
190 |
- $(use_enable policykit polkit) |
191 |
- --with-xsession-prefix="${EPREFIX}"/usr |
192 |
- ICEAUTH="${EPREFIX}"/usr/bin/iceauth |
193 |
- ) |
194 |
- |
195 |
- econf "${myconf[@]}" |
196 |
-} |
197 |
- |
198 |
-src_install() { |
199 |
- default |
200 |
- find "${ED}" -name '*.la' -delete || die |
201 |
- |
202 |
- exeinto /etc/X11/Sessions |
203 |
- newexe - Xfce4 <<-EOF |
204 |
- startxfce4 |
205 |
- EOF |
206 |
- dosym Xfce4 /etc/X11/Sessions/Xfce |
207 |
-} |
208 |
- |
209 |
-pkg_postinst() { |
210 |
- xdg_icon_cache_update |
211 |
-} |
212 |
- |
213 |
-pkg_postrm() { |
214 |
- xdg_icon_cache_update |
215 |
-} |