1 |
commit: b716da62a3e09bf4917b269af5d225897e81d309 |
2 |
Author: Joonas Niilola <juippis <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 17 04:43:47 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 18 06:59:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b716da62 |
7 |
|
8 |
x11-wm/enlightenment: drop old 0.21.* |
9 |
|
10 |
Package-Manager: Portage[mgorny]-2.3.43.3 |
11 |
|
12 |
x11-wm/enlightenment/Manifest | 2 - |
13 |
.../enlightenment/enlightenment-0.21.11-r1.ebuild | 139 -------------------- |
14 |
x11-wm/enlightenment/enlightenment-0.21.7.ebuild | 140 --------------------- |
15 |
x11-wm/enlightenment/metadata.xml | 2 - |
16 |
4 files changed, 283 deletions(-) |
17 |
|
18 |
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest |
19 |
index 49d83eda3d5..fe91a567097 100644 |
20 |
--- a/x11-wm/enlightenment/Manifest |
21 |
+++ b/x11-wm/enlightenment/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST enlightenment-0.21.11.tar.xz 25313532 BLAKE2B 3128137fe81a5b3dccc909eee8aac6845648c088b4cc8de9965408445579ed6aa01bdd879b726d21449c674f07a78386348525d61c0c0d786493d638ec4ae2b4 SHA512 3dee0f7a49fff992a81ce82a730cf8f0cec52a9805dcdd643a35a0bb8c7a27c6af82c136219553684c24c8e2ee2e8623f04858fddab56cdff7477ed2c9cc0ddf |
24 |
-DIST enlightenment-0.21.7.tar.xz 25307500 BLAKE2B 54b0bb7f76390d46f7eec40aecafb1b8769ba659acaffe8ade61ef9cd6fcb28d843bc185a3cc6c478fa30f917946d331569a394132c3351215a3d1d051d7d2ac SHA512 9d10116990f83b6a2f066b81fab08a9b49779df22d92b5823bf579d786a3f4602094cf8c4d08b3e23a1cfc0cd7032004b2e389e234a189fb2479d23287bf1277 |
25 |
DIST enlightenment-0.22.3.tar.xz 25648576 BLAKE2B 1abb1fab18c5932b65f1183875bbe0955ce1d608758af0855c550f5581c774bd19dd0b6c8dd8c724b668ff843e1ed4928531f30b60436d9182a07a65fa2af9e3 SHA512 01a9386ee009c76c46cee7176cdeb7f4e97977bdd5014caa51cceeff228ad72f97a362d1eff7e0240e3e2df8b24a6c9d1516c8ab05bd82d288abcfde0d171abd |
26 |
DIST enlightenment-0.22.4.tar.xz 25656972 BLAKE2B 5e24e226e5f9295d27658656aefaf39cc80ad3634ba1937ef1a3c8e1adeba8cf3cbab2c43cb9e80ac298107a7a64e248ff252084b19c26a974ffff9eb9e6c3fa SHA512 9f4366bfed4d65e7baaeffd4f5b8ba6febf6f9888e6156dd3e100c9fca42c377f76f156f3dd1f6ab97745ffcb69e1e8d320937e41333797580624a9b74d298ba |
27 |
|
28 |
diff --git a/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index 69a4add8967..00000000000 |
31 |
--- a/x11-wm/enlightenment/enlightenment-0.21.11-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,139 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit xdg-utils |
40 |
- |
41 |
-DESCRIPTION="Enlightenment window manager" |
42 |
-HOMEPAGE="https://www.enlightenment.org/" |
43 |
-SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz" |
44 |
- |
45 |
-LICENSE="BSD-2" |
46 |
-SLOT="0.17/${PV%%_*}" |
47 |
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
48 |
- |
49 |
-E_CONF_MODS=( |
50 |
- applications bindings dialogs display |
51 |
- interaction intl menus paths |
52 |
- performance randr shelves theme |
53 |
- window-manipulation window-remembers |
54 |
-) |
55 |
- |
56 |
-E_NORM_MODS=( |
57 |
- appmenu backlight battery bluez4 |
58 |
- clock conf cpufreq everything |
59 |
- fileman fileman-opinfo gadman geolocation |
60 |
- ibar ibox lokker mixer |
61 |
- msgbus music-control notification packagekit |
62 |
- pager pager-plain quickaccess shot |
63 |
- start syscon systray tasks |
64 |
- teamwork temperature tiling time |
65 |
- winlist wireless wizard wl-desktop-shell |
66 |
- wl-drm wl-text-input wl-weekeyboard wl-wl |
67 |
- wl-x11 xkbswitch xwayland |
68 |
-) |
69 |
- |
70 |
-IUSE_E_MODULES=( |
71 |
- ${E_CONF_MODS[@]/#/enlightenment_modules_conf-} |
72 |
- ${E_NORM_MODS[@]/#/enlightenment_modules_} |
73 |
-) |
74 |
- |
75 |
-IUSE="acpi connman doc egl nls pam static-libs systemd udisks wayland ${IUSE_E_MODULES[@]/#/+}" |
76 |
- |
77 |
-RDEPEND=" |
78 |
- >=dev-libs/efl-1.20.0[eet,X] |
79 |
- virtual/udev |
80 |
- x11-libs/libXext |
81 |
- x11-libs/libxcb |
82 |
- x11-libs/xcb-util-keysyms |
83 |
- x11-misc/xkeyboard-config |
84 |
- acpi? ( sys-power/acpid ) |
85 |
- connman? ( net-misc/connman ) |
86 |
- egl? ( =dev-libs/efl-1.20*[egl,wayland] ) |
87 |
- pam? ( sys-libs/pam ) |
88 |
- systemd? ( sys-apps/systemd ) |
89 |
- udisks? ( sys-fs/udisks:2 ) |
90 |
- wayland? ( |
91 |
- =dev-libs/efl-1.20*[drm,wayland] |
92 |
- >=dev-libs/wayland-1.11.0 |
93 |
- x11-libs/libxkbcommon |
94 |
- x11-libs/pixman |
95 |
- ) |
96 |
-" |
97 |
-DEPEND=" |
98 |
- ${RDEPEND} |
99 |
- sys-devel/automake:1.15 |
100 |
- virtual/pkgconfig |
101 |
- nls? ( sys-devel/gettext ) |
102 |
-" |
103 |
- |
104 |
-src_prepare() { |
105 |
- default |
106 |
- |
107 |
- eapply "${FILESDIR}"/"${P}"-quickstart.diff |
108 |
- |
109 |
- xdg_environment_reset |
110 |
- |
111 |
- sed -i 's/Categories=Audio/Categories=AudioVideo/g' src/modules/mixer/emixer.desktop || die |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- local myconf=( |
116 |
- --disable-install-sysactions |
117 |
- --disable-policy-mobile |
118 |
- --enable-device-udev |
119 |
- $(use_enable connman) |
120 |
- $(use_enable egl wayland-egl) |
121 |
- $(use_enable nls) |
122 |
- $(use_enable pam) |
123 |
- $(use_enable static-libs static) |
124 |
- $(use_enable systemd) |
125 |
- $(use_enable udisks mount-udisks) |
126 |
- $(use_enable wayland) |
127 |
- ) |
128 |
- |
129 |
- local u c |
130 |
- for u in ${IUSE_E_MODULES[@]} ; do |
131 |
- c=${u#enlightenment_modules_} |
132 |
- |
133 |
- case ${c} in |
134 |
- wl-*|xwayland) |
135 |
- if ! use wayland ; then |
136 |
- myconf+=( --disable-${c} ) |
137 |
- continue |
138 |
- fi |
139 |
- |
140 |
- ;; |
141 |
- esac |
142 |
- |
143 |
- myconf+=( $(use_enable ${u} ${c}) ) |
144 |
- |
145 |
- done |
146 |
- |
147 |
- econf "${myconf[@]}" |
148 |
-} |
149 |
- |
150 |
-src_install() { |
151 |
- insinto /etc/enlightenment |
152 |
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf |
153 |
- |
154 |
- if use doc ; then |
155 |
- local HTML_DOCS=( doc/. ) |
156 |
- fi |
157 |
- |
158 |
- einstalldocs |
159 |
- V=1 emake install DESTDIR="${D}" || die |
160 |
- |
161 |
- find "${D}" -name '*.la' -delete || die |
162 |
-} |
163 |
- |
164 |
-pkg_postinst() { |
165 |
- xdg_desktop_database_update |
166 |
- xdg_mimeinfo_database_update |
167 |
-} |
168 |
- |
169 |
-pkg_postrm() { |
170 |
- xdg_desktop_database_update |
171 |
- xdg_mimeinfo_database_update |
172 |
-} |
173 |
|
174 |
diff --git a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild b/x11-wm/enlightenment/enlightenment-0.21.7.ebuild |
175 |
deleted file mode 100644 |
176 |
index 6b17730274f..00000000000 |
177 |
--- a/x11-wm/enlightenment/enlightenment-0.21.7.ebuild |
178 |
+++ /dev/null |
179 |
@@ -1,140 +0,0 @@ |
180 |
-# Copyright 1999-2018 Gentoo Foundation |
181 |
-# Distributed under the terms of the GNU General Public License v2 |
182 |
- |
183 |
-EAPI="5" |
184 |
- |
185 |
-MY_P=${P/_/-} |
186 |
- |
187 |
-if [[ ${PV} == *9999 ]] ; then |
188 |
- EGIT_SUB_PROJECT="core" |
189 |
- EGIT_URI_APPEND="${PN}" |
190 |
-else |
191 |
- SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${MY_P}.tar.xz" |
192 |
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" |
193 |
-fi |
194 |
- |
195 |
-inherit enlightenment xdg-utils |
196 |
- |
197 |
-DESCRIPTION="Enlightenment DR17 window manager" |
198 |
- |
199 |
-LICENSE="BSD-2" |
200 |
-SLOT="0.17/${PV%%_*}" |
201 |
- |
202 |
-__CONF_MODS=( |
203 |
- applications bindings dialogs display |
204 |
- interaction intl menus |
205 |
- paths performance randr shelves theme |
206 |
- window-manipulation window-remembers |
207 |
-) |
208 |
-__NORM_MODS=( |
209 |
- appmenu backlight bluez4 battery |
210 |
- clock conf connman cpufreq everything |
211 |
- fileman fileman-opinfo gadman geolocation |
212 |
- ibar ibox lokker |
213 |
- mixer msgbus music-control notification |
214 |
- pager packagekit pager-plain quickaccess |
215 |
- shot start syscon systray tasks teamwork temperature tiling time |
216 |
- winlist wireless wizard wl-desktop-shell wl-drm wl-text-input |
217 |
- wl-weekeyboard wl-wl wl-x11 xkbswitch xwayland |
218 |
-) |
219 |
-IUSE_E_MODULES=( |
220 |
- ${__CONF_MODS[@]/#/enlightenment_modules_conf-} |
221 |
- ${__NORM_MODS[@]/#/enlightenment_modules_} |
222 |
-) |
223 |
- |
224 |
-IUSE="pam spell static-libs systemd ukit wayland ${IUSE_E_MODULES[@]/#/+}" |
225 |
- |
226 |
-RDEPEND=" |
227 |
- pam? ( sys-libs/pam ) |
228 |
- systemd? ( sys-apps/systemd ) |
229 |
- wayland? ( |
230 |
- dev-libs/efl[wayland] |
231 |
- >=dev-libs/wayland-1.10.0 |
232 |
- >=x11-libs/pixman-0.31.1 |
233 |
- >=x11-libs/libxkbcommon-0.3.1 |
234 |
- ) |
235 |
- >=dev-libs/efl-1.18[X] |
236 |
- x11-libs/xcb-util-keysyms" |
237 |
-DEPEND=" |
238 |
- ${RDEPEND} |
239 |
- sys-devel/automake:1.15 |
240 |
-" |
241 |
- |
242 |
-S=${WORKDIR}/${MY_P} |
243 |
- |
244 |
-src_prepare() { |
245 |
- epatch "${FILESDIR}"/quickstart.diff |
246 |
- enlightenment_src_prepare |
247 |
-} |
248 |
- |
249 |
-# Sanity check to make sure module lists are kept up-to-date. |
250 |
-check_modules() { |
251 |
- local detected=$( |
252 |
- awk -F'[\\[\\](, ]' '$1 == "AC_E_OPTIONAL_MODULE" { print $3 }' \ |
253 |
- configure.ac | sed 's:_:-:g' | LC_COLLATE=C sort |
254 |
- ) |
255 |
- local sorted=$( |
256 |
- printf '%s\n' ${IUSE_E_MODULES[@]/#enlightenment_modules_} | \ |
257 |
- LC_COLLATE=C sort |
258 |
- ) |
259 |
- if [[ ${detected} != "${sorted}" ]] ; then |
260 |
- local out new old |
261 |
- eerror "The ebuild needs to be kept in sync." |
262 |
- echo "${sorted}" > ebuild-iuse |
263 |
- echo "${detected}" > configure-detected |
264 |
- out=$(diff -U 0 ebuild-iuse configure-detected | sed -e '1,2d' -e '/^@@/d') |
265 |
- new=$(echo "${out}" | sed -n '/^+/{s:^+::;p}') |
266 |
- old=$(echo "${out}" | sed -n '/^-/{s:^-::;p}') |
267 |
- eerror "Add these modules: $(echo ${new})" |
268 |
- eerror "Drop these modules: $(echo ${old})" |
269 |
- die "please update the ebuild" |
270 |
- fi |
271 |
-} |
272 |
- |
273 |
-src_configure() { |
274 |
- # sanity check fails after commit e25cf18ca19463a7d05519aa843cc76a189ab75c |
275 |
- # see #648896. Can be restored with future release |
276 |
- # check_modules |
277 |
- |
278 |
- E_ECONF=( |
279 |
- --disable-install-sysactions |
280 |
- $(use_enable doc) |
281 |
- $(use_enable nls) |
282 |
- $(use_enable pam) |
283 |
- $(use_enable systemd) |
284 |
- --enable-device-udev |
285 |
- $(use_enable ukit mount-udisks) |
286 |
- $(use_enable wayland) |
287 |
- ) |
288 |
- local u c |
289 |
- for u in ${IUSE_E_MODULES[@]} ; do |
290 |
- c=${u#enlightenment_modules_} |
291 |
- # Disable modules by hand since we default to enabling them all. |
292 |
- case ${c} in |
293 |
- wl-*|xwayland) |
294 |
- if ! use wayland ; then |
295 |
- E_ECONF+=( --disable-${c} ) |
296 |
- continue |
297 |
- fi |
298 |
- ;; |
299 |
- esac |
300 |
- E_ECONF+=( $(use_enable ${u} ${c}) ) |
301 |
- done |
302 |
- enlightenment_src_configure |
303 |
-} |
304 |
- |
305 |
-src_install() { |
306 |
- enlightenment_src_install |
307 |
- insinto /etc/enlightenment |
308 |
- newins "${FILESDIR}"/gentoo-sysactions.conf sysactions.conf |
309 |
-} |
310 |
- |
311 |
-pkg_postinst() { |
312 |
- xdg_desktop_database_update |
313 |
- xdg_mimeinfo_database_update |
314 |
-} |
315 |
- |
316 |
-pkg_postrm() { |
317 |
- xdg_desktop_database_update |
318 |
- xdg_mimeinfo_database_update |
319 |
-} |
320 |
|
321 |
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml |
322 |
index 8af72188ab2..f29f0f98962 100644 |
323 |
--- a/x11-wm/enlightenment/metadata.xml |
324 |
+++ b/x11-wm/enlightenment/metadata.xml |
325 |
@@ -9,9 +9,7 @@ |
326 |
<name>Proxy Maintainers</name> |
327 |
</maintainer> |
328 |
<use> |
329 |
- <flag name="egl">Enable EGL rendering</flag> |
330 |
<flag name="packagekit">Enable module for package manager integration</flag> |
331 |
- <flag name="ukit">Use upower/udisks to automount devices</flag> |
332 |
</use> |
333 |
<longdescription> |
334 |
Enlightenment is classed as a "desktop shell" as it provides everything you need to |