1 |
robbat2 10/10/04 17:48:57 |
2 |
|
3 |
Modified: ChangeLog awesome-3.4.8.ebuild |
4 |
Log: |
5 |
Bug #321433: update RDEPEND for all bg setters. Bug #314425: allow graphicsmagick as well as imagemagick. |
6 |
|
7 |
(Portage version: 2.2_rc88/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.108 x11-wm/awesome/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.108&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.108&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?r1=1.107&r2=1.108 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v |
19 |
retrieving revision 1.107 |
20 |
retrieving revision 1.108 |
21 |
diff -p -w -b -B -u -u -r1.107 -r1.108 |
22 |
--- ChangeLog 4 Oct 2010 17:31:44 -0000 1.107 |
23 |
+++ ChangeLog 4 Oct 2010 17:48:57 -0000 1.108 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for x11-wm/awesome |
26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.107 2010/10/04 17:31:44 robbat2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.108 2010/10/04 17:48:57 robbat2 Exp $ |
29 |
+ |
30 |
+ 04 Oct 2010; Robin H. Johnson <robbat2@g.o> awesome-3.4.8.ebuild: |
31 |
+ Bug #321433: update RDEPEND for all bg setters. Bug #314425: allow |
32 |
+ graphicsmagick as well as imagemagick. |
33 |
|
34 |
*awesome-3.4.8 (04 Oct 2010) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 x11-wm/awesome/awesome-3.4.8.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: awesome-3.4.8.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
51 |
--- awesome-3.4.8.ebuild 4 Oct 2010 17:31:44 -0000 1.1 |
52 |
+++ awesome-3.4.8.ebuild 4 Oct 2010 17:48:57 -0000 1.2 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.1 2010/10/04 17:31:44 robbat2 Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.2 2010/10/04 17:48:57 robbat2 Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
inherit cmake-utils eutils |
61 |
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND} |
62 |
>=dev-util/cmake-2.6 |
63 |
dev-util/gperf |
64 |
dev-util/pkgconfig |
65 |
- media-gfx/imagemagick[png] |
66 |
+ || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) |
67 |
>=x11-proto/xcb-proto-1.5 |
68 |
>=x11-proto/xproto-7.0.15 |
69 |
doc? ( |
70 |
@@ -50,6 +50,25 @@ RDEPEND="${RDEPEND} |
71 |
x11-apps/xmessage |
72 |
)" |
73 |
|
74 |
+# bug #321433: Need one of these to for awsetbg. |
75 |
+# imagemagick provides 'display' and is further down the default list, but |
76 |
+# listed here for completeness. 'display' however is only usable with |
77 |
+# x11-apps/xwininfo also present. |
78 |
+RDEPEND="${RDEPEND} |
79 |
+ || ( |
80 |
+ ( x11-apps/xwininfo |
81 |
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) |
82 |
+ ) |
83 |
+ x11-misc/habak |
84 |
+ media-gfx/feh |
85 |
+ x11-misc/hsetroot |
86 |
+ media-gfx/qiv |
87 |
+ media-gfx/xv |
88 |
+ x11-misc/xsri |
89 |
+ media-gfx/xli |
90 |
+ x11-apps/xsetroot |
91 |
+ )" |
92 |
+ |
93 |
DOCS="AUTHORS BUGS PATCHES README STYLE" |
94 |
|
95 |
mycmakeargs="-DPREFIX=${EPREFIX}/usr |