1 |
commit: 6ca5a1809bbea1eeeb6ca6edd558896f0e53990a |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 29 02:52:20 2013 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 29 02:52:20 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=6ca5a180 |
7 |
|
8 |
x11-wm/awesome: lost interest in pushing awesome through |
9 |
|
10 |
Package-Manager: portage-2.1.11.62 |
11 |
RepoMan-Options: --force |
12 |
Manifest-Sign-Key: 0xF52D4BBA |
13 |
|
14 |
--- |
15 |
x11-wm/awesome/awesome-3.4.11-r99.ebuild | 121 --------------------- |
16 |
.../files/awesome-3.4.11-convert-path.patch | 18 --- |
17 |
.../files/awesome-3.4.11-remove-backtrace.patch | 22 ---- |
18 |
x11-wm/awesome/files/awesome-3.4.2-backtrace.patch | 18 --- |
19 |
x11-wm/awesome/files/awesome-glib-fix.patch | 13 --- |
20 |
.../awesome/files/awesome-gnome-xsession.desktop | 7 -- |
21 |
x11-wm/awesome/files/awesome-gnome.desktop | 7 -- |
22 |
x11-wm/awesome/files/awesome-gnome.session | 6 - |
23 |
x11-wm/awesome/files/awesome-session | 90 --------------- |
24 |
x11-wm/awesome/files/awesome.desktop | 8 -- |
25 |
x11-wm/awesome/metadata.xml | 13 --- |
26 |
11 files changed, 323 deletions(-) |
27 |
|
28 |
diff --git a/x11-wm/awesome/awesome-3.4.11-r99.ebuild b/x11-wm/awesome/awesome-3.4.11-r99.ebuild |
29 |
deleted file mode 100644 |
30 |
index 9c9d769..0000000 |
31 |
--- a/x11-wm/awesome/awesome-3.4.11-r99.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,121 +0,0 @@ |
34 |
-# Copyright 1999-2012 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.11.ebuild,v 1.10 2012/05/11 07:29:16 ago Exp $ |
37 |
- |
38 |
-EAPI="3" |
39 |
-CMAKE_MIN_VERSION="2.8" |
40 |
-inherit cmake-utils eutils |
41 |
- |
42 |
-DESCRIPTION="A dynamic floating and tiling window manager" |
43 |
-HOMEPAGE="http://awesome.naquadah.org/" |
44 |
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2" |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 x86" |
49 |
-IUSE="dbus doc elibc_FreeBSD" |
50 |
- |
51 |
-COMMON_DEPEND=">=dev-lang/lua-5.1 |
52 |
- dev-libs/libev |
53 |
- >=dev-libs/libxdg-basedir-1 |
54 |
- media-libs/imlib2[png] |
55 |
- x11-libs/cairo[xcb] |
56 |
- || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) |
57 |
- >=x11-libs/libxcb-1.6 |
58 |
- >=x11-libs/pango-1.19.3 |
59 |
- >=x11-libs/startup-notification-0.10_p20110426 |
60 |
- >=x11-libs/xcb-util-0.3.8 |
61 |
- dbus? ( >=sys-apps/dbus-1 ) |
62 |
- elibc_FreeBSD? ( dev-libs/libexecinfo )" |
63 |
- |
64 |
-# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282 |
65 |
-DEPEND="${COMMON_DEPEND} |
66 |
- >=app-text/asciidoc-8.4.5 |
67 |
- app-text/xmlto |
68 |
- dev-util/gperf |
69 |
- virtual/pkgconfig |
70 |
- media-gfx/imagemagick[png] |
71 |
- >=x11-proto/xcb-proto-1.5 |
72 |
- >=x11-proto/xproto-7.0.15 |
73 |
- doc? ( |
74 |
- app-doc/doxygen |
75 |
- dev-lua/luadoc |
76 |
- media-gfx/graphviz |
77 |
- )" |
78 |
- |
79 |
-RDEPEND="${COMMON_DEPEND} |
80 |
- || ( |
81 |
- x11-misc/gxmessage |
82 |
- x11-apps/xmessage |
83 |
- )" |
84 |
- |
85 |
-# bug #321433: Need one of these to for awsetbg. |
86 |
-# imagemagick provides 'display' and is further down the default list, but |
87 |
-# listed here for completeness. 'display' however is only usable with |
88 |
-# x11-apps/xwininfo also present. |
89 |
-RDEPEND="${RDEPEND} |
90 |
- || ( |
91 |
- ( x11-apps/xwininfo |
92 |
- || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) |
93 |
- ) |
94 |
- x11-misc/habak |
95 |
- media-gfx/feh |
96 |
- x11-misc/hsetroot |
97 |
- media-gfx/qiv |
98 |
- media-gfx/xv |
99 |
- x11-misc/xsri |
100 |
- media-gfx/xli |
101 |
- x11-apps/xsetroot |
102 |
- )" |
103 |
- |
104 |
-DOCS="AUTHORS BUGS PATCHES README STYLE" |
105 |
- |
106 |
-src_prepare() { |
107 |
- epatch \ |
108 |
- "${FILESDIR}/${PN}-3.4.2-backtrace.patch" |
109 |
- |
110 |
- # bug #396417 |
111 |
- epatch "${FILESDIR}/${PN}-glib-fix.patch" |
112 |
- |
113 |
- # bug #408025 |
114 |
- epatch "${FILESDIR}/${P}-convert-path.patch" |
115 |
- |
116 |
- epatch "${FILESDIR}/${P}-remove-backtrace.patch" |
117 |
-} |
118 |
- |
119 |
-src_configure() { |
120 |
- mycmakeargs=( |
121 |
- -DPREFIX="${EPREFIX}"/usr |
122 |
- -DSYSCONFDIR="${EPREFIX}"/etc |
123 |
- $(cmake-utils_use_with dbus DBUS) |
124 |
- $(cmake-utils_use doc GENERATE_LUADOC) |
125 |
- ) |
126 |
- |
127 |
- cmake-utils_src_configure |
128 |
-} |
129 |
- |
130 |
-src_compile() { |
131 |
- local myargs="all" |
132 |
- |
133 |
- if use doc ; then |
134 |
- myargs="${myargs} doc" |
135 |
- fi |
136 |
- cmake-utils_src_make ${myargs} |
137 |
-} |
138 |
- |
139 |
-src_install() { |
140 |
- cmake-utils_src_install |
141 |
- |
142 |
- if use doc ; then |
143 |
- ( |
144 |
- cd "${CMAKE_BUILD_DIR}"/doc |
145 |
- mv html doxygen |
146 |
- dohtml -r doxygen || die |
147 |
- ) |
148 |
- mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die |
149 |
- fi |
150 |
- rm -rf "${ED}"/usr/share/doc/${PN} || die |
151 |
- |
152 |
- exeinto /etc/X11/Sessions |
153 |
- newexe "${FILESDIR}"/${PN}-session ${PN} || die |
154 |
-} |
155 |
|
156 |
diff --git a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch b/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch |
157 |
deleted file mode 100644 |
158 |
index f06739c..0000000 |
159 |
--- a/x11-wm/awesome/files/awesome-3.4.11-convert-path.patch |
160 |
+++ /dev/null |
161 |
@@ -1,18 +0,0 @@ |
162 |
-From: Julian Ospald <hasufell@g.o> |
163 |
-Date: Tue Mar 13 12:55:00 UTC 2012 |
164 |
-Subject: build system |
165 |
- |
166 |
-https://bugs.gentoo.org/show_bug.cgi?id=408025 |
167 |
-fix compilation when dev-libs/libee is installed |
168 |
- |
169 |
---- awesomeConfig.cmake |
170 |
-+++ awesomeConfig.cmake |
171 |
-@@ -57,7 +57,7 @@ |
172 |
- a_find_program(LUA_EXECUTABLE lua FALSE) |
173 |
- a_find_program(LUADOC_EXECUTABLE luadoc FALSE) |
174 |
- # theme graphics |
175 |
--a_find_program(CONVERT_EXECUTABLE convert TRUE) |
176 |
-+a_find_program(CONVERT_EXECUTABLE bin/convert TRUE) |
177 |
- # doxygen |
178 |
- include(FindDoxygen) |
179 |
- # pkg-config |
180 |
|
181 |
diff --git a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch |
182 |
deleted file mode 100644 |
183 |
index e5ee561..0000000 |
184 |
--- a/x11-wm/awesome/files/awesome-3.4.11-remove-backtrace.patch |
185 |
+++ /dev/null |
186 |
@@ -1,22 +0,0 @@ |
187 |
-diff -Naur awesome-3.4.11.orig/awesomeConfig.cmake awesome-3.4.11/awesomeConfig.cmake |
188 |
---- awesome-3.4.11.orig/awesomeConfig.cmake 2012-10-27 21:02:13.000000000 -0400 |
189 |
-+++ awesome-3.4.11/awesomeConfig.cmake 2012-10-27 21:02:47.000000000 -0400 |
190 |
-@@ -192,12 +192,12 @@ |
191 |
- endif() |
192 |
- |
193 |
- # Check for backtrace |
194 |
--include(CheckFunctionExists) |
195 |
--CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) |
196 |
--if(NOT HAVE_BACKTRACE) |
197 |
-- a_find_library(LIB_EXECINFO execinfo) |
198 |
-- set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO}) |
199 |
--endif() |
200 |
-+#include(CheckFunctionExists) |
201 |
-+#CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) |
202 |
-+#if(NOT HAVE_BACKTRACE) |
203 |
-+# a_find_library(LIB_EXECINFO execinfo) |
204 |
-+# set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO}) |
205 |
-+#endif() |
206 |
- |
207 |
- # Error check |
208 |
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug |
209 |
|
210 |
diff --git a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch b/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch |
211 |
deleted file mode 100644 |
212 |
index 4d481ea..0000000 |
213 |
--- a/x11-wm/awesome/files/awesome-3.4.2-backtrace.patch |
214 |
+++ /dev/null |
215 |
@@ -1,18 +0,0 @@ |
216 |
-diff -Naur awesome-3.4.2.orig/awesomeConfig.cmake awesome-3.4.2/awesomeConfig.cmake |
217 |
---- awesome-3.4.2.orig/awesomeConfig.cmake 2009-11-27 04:03:25.000000000 +0900 |
218 |
-+++ awesome-3.4.2/awesomeConfig.cmake 2009-11-28 01:17:01.639797168 +0900 |
219 |
-@@ -167,6 +167,14 @@ |
220 |
- # Check for libev |
221 |
- a_find_library(LIB_EV ev) |
222 |
- |
223 |
-+# Check for backtrace |
224 |
-+include(CheckFunctionExists) |
225 |
-+CHECK_FUNCTION_EXISTS(backtrace HAVE_BACKTRACE) |
226 |
-+if(NOT HAVE_BACKTRACE) |
227 |
-+ a_find_library(LIB_EXECINFO execinfo) |
228 |
-+ set(AWESOME_REQUIRED_LIBRARIES ${AWESOME_REQUIRED_LIBRARIES} ${LIB_EXECINFO}) |
229 |
-+endif() |
230 |
-+ |
231 |
- # Error check |
232 |
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug |
233 |
- message(FATAL_ERROR "lua library not found") |
234 |
|
235 |
diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch b/x11-wm/awesome/files/awesome-glib-fix.patch |
236 |
deleted file mode 100644 |
237 |
index e3e6fcf..0000000 |
238 |
--- a/x11-wm/awesome/files/awesome-glib-fix.patch |
239 |
+++ /dev/null |
240 |
@@ -1,13 +0,0 @@ |
241 |
->=glib-2.31 build fix |
242 |
- |
243 |
---- a/spawn.c |
244 |
-+++ b/spawn.c |
245 |
-@@ -24,7 +24,7 @@ |
246 |
- #include <sys/types.h> |
247 |
- #include <sys/wait.h> |
248 |
- |
249 |
--#include <glib/gspawn.h> |
250 |
-+#include <glib.h> |
251 |
- |
252 |
- #include "spawn.h" |
253 |
- #include "screen.h" |
254 |
|
255 |
diff --git a/x11-wm/awesome/files/awesome-gnome-xsession.desktop b/x11-wm/awesome/files/awesome-gnome-xsession.desktop |
256 |
deleted file mode 100644 |
257 |
index 9f3d67b..0000000 |
258 |
--- a/x11-wm/awesome/files/awesome-gnome-xsession.desktop |
259 |
+++ /dev/null |
260 |
@@ -1,7 +0,0 @@ |
261 |
-[Desktop Entry] |
262 |
-Encoding=UTF-8 |
263 |
-Name=Awesome GNOME |
264 |
-Comment=GNOME with highly configurable window manager awesome |
265 |
-TryExec=gnome-session |
266 |
-Exec=gnome-session --session=awesome-gnome |
267 |
-Type=XSession |
268 |
|
269 |
diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop |
270 |
deleted file mode 100644 |
271 |
index ec2f237..0000000 |
272 |
--- a/x11-wm/awesome/files/awesome-gnome.desktop |
273 |
+++ /dev/null |
274 |
@@ -1,7 +0,0 @@ |
275 |
-[Desktop Entry] |
276 |
-Version=1.0 |
277 |
-Type=Application |
278 |
-Name=Awesome |
279 |
-Comment=The awesome launcher! |
280 |
-TryExec=awesome |
281 |
-Exec=awesome |
282 |
|
283 |
diff --git a/x11-wm/awesome/files/awesome-gnome.session b/x11-wm/awesome/files/awesome-gnome.session |
284 |
deleted file mode 100644 |
285 |
index dd0c01b..0000000 |
286 |
--- a/x11-wm/awesome/files/awesome-gnome.session |
287 |
+++ /dev/null |
288 |
@@ -1,6 +0,0 @@ |
289 |
-[GNOME Session] |
290 |
-Name=Awesome session |
291 |
-RequiredComponents=gnome-settings-daemon; |
292 |
-RequiredProviders=windowmanager;notifications; |
293 |
-DefaultProvider-windowmanager=awesome-gnome |
294 |
-DefaultProvider-notifications=notification-daemon |
295 |
|
296 |
diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session |
297 |
deleted file mode 100644 |
298 |
index fe76946..0000000 |
299 |
--- a/x11-wm/awesome/files/awesome-session |
300 |
+++ /dev/null |
301 |
@@ -1,90 +0,0 @@ |
302 |
-#!/bin/sh |
303 |
-# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1 |
304 |
- |
305 |
-# redirect errors to a file in user's home directory if we can |
306 |
-for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER" |
307 |
-do |
308 |
- if ( cp /dev/null "$errfile" 2> /dev/null ) |
309 |
- then |
310 |
- chmod 600 "$errfile" |
311 |
- exec > "$errfile" 2>&1 |
312 |
- break |
313 |
- fi |
314 |
-done |
315 |
- |
316 |
-userresources=$HOME/.Xresources |
317 |
-usermodmap=$HOME/.Xmodmap |
318 |
-userxkbmap=$HOME/.Xkbmap |
319 |
- |
320 |
-sysresources=/etc/X11/Xresources |
321 |
-sysmodmap=/etc/X11/Xmodmap |
322 |
-sysxkbmap=/etc/X11/Xkbmap |
323 |
- |
324 |
-rh6sysresources=/etc/X11/xinit/Xresources |
325 |
-rh6sysmodmap=/etc/X11/xinit/Xmodmap |
326 |
- |
327 |
- |
328 |
-# merge in defaults |
329 |
-if [ -f "$rh6sysresources" ]; then |
330 |
- xrdb -merge "$rh6sysresources" |
331 |
-fi |
332 |
- |
333 |
-if [ -f "$sysresources" ]; then |
334 |
- xrdb -merge "$sysresources" |
335 |
-fi |
336 |
- |
337 |
-if [ -f "$userresources" ]; then |
338 |
- xrdb -merge "$userresources" |
339 |
-fi |
340 |
- |
341 |
-# merge in keymaps |
342 |
-if [ -f "$sysxkbmap" ]; then |
343 |
- setxkbmap `cat "$sysxkbmap"` |
344 |
- XKB_IN_USE=yes |
345 |
-fi |
346 |
- |
347 |
-if [ -f "$userxkbmap" ]; then |
348 |
- setxkbmap `cat "$userxkbmap"` |
349 |
- XKB_IN_USE=yes |
350 |
-fi |
351 |
- |
352 |
-# |
353 |
-# Eeek, this seems like too much magic here |
354 |
-# |
355 |
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then |
356 |
- if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then |
357 |
- xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` |
358 |
- if [ -n "$xkbsymbols" ]; then |
359 |
- setxkbmap -symbols "$xkbsymbols" |
360 |
- XKB_IN_USE=yes |
361 |
- fi |
362 |
- fi |
363 |
-fi |
364 |
- |
365 |
-# xkb and xmodmap don't play nice together |
366 |
-if [ -z "$XKB_IN_USE" ]; then |
367 |
- if [ -f "$rh6sysmodmap" ]; then |
368 |
- xmodmap "$rh6sysmodmap" |
369 |
- fi |
370 |
- |
371 |
- if [ -f "$sysmodmap" ]; then |
372 |
- xmodmap "$sysmodmap" |
373 |
- fi |
374 |
- |
375 |
- if [ -f "$usermodmap" ]; then |
376 |
- xmodmap "$usermodmap" |
377 |
- fi |
378 |
-fi |
379 |
- |
380 |
-unset XKB_IN_USE |
381 |
- |
382 |
-# run all system xinitrc shell scripts. |
383 |
-if [ -d /etc/X11/xinit/xinitrc.d ]; then |
384 |
- for i in /etc/X11/xinit/xinitrc.d/* ; do |
385 |
- if [ -x "$i" ]; then |
386 |
- . "$i" |
387 |
- fi |
388 |
- done |
389 |
-fi |
390 |
- |
391 |
-exec /usr/bin/awesome |
392 |
|
393 |
diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop |
394 |
deleted file mode 100644 |
395 |
index 2341f83..0000000 |
396 |
--- a/x11-wm/awesome/files/awesome.desktop |
397 |
+++ /dev/null |
398 |
@@ -1,8 +0,0 @@ |
399 |
-[Desktop Entry] |
400 |
-Encoding=UTF-8 |
401 |
-Name=awesome |
402 |
-Comment=awesome the window manager |
403 |
-Exec=/etc/X11/Sessions/awesome |
404 |
-TryExec=awesome |
405 |
-Icon= |
406 |
-Type=Application |
407 |
|
408 |
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml |
409 |
deleted file mode 100644 |
410 |
index 355ff77..0000000 |
411 |
--- a/x11-wm/awesome/metadata.xml |
412 |
+++ /dev/null |
413 |
@@ -1,13 +0,0 @@ |
414 |
-<?xml version="1.0" encoding="UTF-8"?> |
415 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
416 |
-<pkgmetadata> |
417 |
- <maintainer> |
418 |
- <email>matsuu@g.o</email> |
419 |
- <name>MATSUU Takuto</name> |
420 |
- </maintainer> |
421 |
- <maintainer> |
422 |
- <email>wired@g.o</email> |
423 |
- <name>Alex Alexander</name> |
424 |
- </maintainer> |
425 |
-</pkgmetadata> |
426 |
- |