Gentoo Archives: gentoo-commits

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