Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/awesome: awesome-3.4.9-r1.ebuild awesome-3.4.9.ebuild ChangeLog awesome-3.4.8.ebuild awesome-3.4.4.ebuild awesome-2.3.6.ebuild
Date: Wed, 27 Apr 2011 11:14:44
Message-Id: 20110427111434.AD33820054@flycatcher.gentoo.org
1 matsuu 11/04/27 11:14:34
2
3 Modified: awesome-3.4.9.ebuild ChangeLog awesome-3.4.8.ebuild
4 Added: awesome-3.4.9-r1.ebuild
5 Removed: awesome-3.4.4.ebuild awesome-2.3.6.ebuild
6 Log:
7 Fixed building with xcb-util >= 0.3.8 wrt #364987. Removed old versions..
8
9 (Portage version: 2.1.9.46/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.5 x11-wm/awesome/awesome-3.4.9.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild?rev=1.5&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild?rev=1.5&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild?r1=1.4&r2=1.5
17
18 Index: awesome-3.4.9.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v
21 retrieving revision 1.4
22 retrieving revision 1.5
23 diff -u -r1.4 -r1.5
24 --- awesome-3.4.9.ebuild 22 Feb 2011 14:10:46 -0000 1.4
25 +++ awesome-3.4.9.ebuild 27 Apr 2011 11:14:34 -0000 1.5
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2011 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.4 2011/02/22 14:10:46 wired Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.5 2011/04/27 11:14:34 matsuu Exp $
31
32 EAPI="3"
33 CMAKE_MIN_VERSION="2.8"
34 @@ -23,8 +23,8 @@
35 || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
36 >=x11-libs/libxcb-1.4
37 >=x11-libs/pango-1.19.3
38 - >=x11-libs/startup-notification-0.10
39 - >=x11-libs/xcb-util-0.3.6
40 + ~x11-libs/startup-notification-0.10
41 + ~x11-libs/xcb-util-0.3.6
42 dbus? ( >=sys-apps/dbus-1 )
43 elibc_FreeBSD? ( dev-libs/libexecinfo )"
44
45
46
47
48 1.120 x11-wm/awesome/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.120&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?rev=1.120&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/ChangeLog?r1=1.119&r2=1.120
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v
57 retrieving revision 1.119
58 retrieving revision 1.120
59 diff -u -r1.119 -r1.120
60 --- ChangeLog 30 Mar 2011 11:13:11 -0000 1.119
61 +++ ChangeLog 27 Apr 2011 11:14:34 -0000 1.120
62 @@ -1,6 +1,14 @@
63 # ChangeLog for x11-wm/awesome
64 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.119 2011/03/30 11:13:11 angelos Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.120 2011/04/27 11:14:34 matsuu Exp $
67 +
68 +*awesome-3.4.9-r1 (27 Apr 2011)
69 +
70 + 27 Apr 2011; MATSUU Takuto <matsuu@g.o>
71 + +files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch,
72 + -awesome-2.3.6.ebuild, -awesome-3.4.4.ebuild, awesome-3.4.8.ebuild,
73 + awesome-3.4.9.ebuild, +awesome-3.4.9-r1.ebuild:
74 + Fixed building with xcb-util >= 0.3.8 wrt #364987. Removed old versions..
75
76 30 Mar 2011; Christoph Mende <angelos@g.o> awesome-2.3.6.ebuild:
77 Fix gtk+ slot deps
78
79
80
81 1.12 x11-wm/awesome/awesome-3.4.8.ebuild
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?rev=1.12&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?rev=1.12&content-type=text/plain
85 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild?r1=1.11&r2=1.12
86
87 Index: awesome-3.4.8.ebuild
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v
90 retrieving revision 1.11
91 retrieving revision 1.12
92 diff -u -r1.11 -r1.12
93 --- awesome-3.4.8.ebuild 21 Mar 2011 16:38:21 -0000 1.11
94 +++ awesome-3.4.8.ebuild 27 Apr 2011 11:14:34 -0000 1.12
95 @@ -1,6 +1,6 @@
96 # Copyright 1999-2011 Gentoo Foundation
97 # Distributed under the terms of the GNU General Public License v2
98 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.11 2011/03/21 16:38:21 xarthisius Exp $
99 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.12 2011/04/27 11:14:34 matsuu Exp $
100
101 EAPI="3"
102 inherit cmake-utils eutils
103 @@ -22,8 +22,8 @@
104 || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
105 >=x11-libs/libxcb-1.4
106 >=x11-libs/pango-1.19.3
107 - >=x11-libs/startup-notification-0.10
108 - >=x11-libs/xcb-util-0.3.6
109 + ~x11-libs/startup-notification-0.10
110 + ~x11-libs/xcb-util-0.3.6
111 dbus? ( >=sys-apps/dbus-1 )
112 elibc_FreeBSD? ( dev-libs/libexecinfo )"
113
114
115
116
117 1.1 x11-wm/awesome/awesome-3.4.9-r1.ebuild
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild?rev=1.1&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild?rev=1.1&content-type=text/plain
121
122 Index: awesome-3.4.9-r1.ebuild
123 ===================================================================
124 # Copyright 1999-2011 Gentoo Foundation
125 # Distributed under the terms of the GNU General Public License v2
126 # $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild,v 1.1 2011/04/27 11:14:34 matsuu Exp $
127
128 EAPI="3"
129 CMAKE_MIN_VERSION="2.8"
130 inherit cmake-utils eutils
131
132 DESCRIPTION="A dynamic floating and tiling window manager"
133 HOMEPAGE="http://awesome.naquadah.org/"
134 SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2"
135
136 LICENSE="GPL-2"
137 SLOT="0"
138 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
139 IUSE="dbus doc elibc_FreeBSD"
140
141 COMMON_DEPEND=">=dev-lang/lua-5.1
142 dev-libs/libev
143 >=dev-libs/libxdg-basedir-1
144 media-libs/imlib2[png]
145 x11-libs/cairo[xcb]
146 || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
147 >=x11-libs/libxcb-1.6
148 >=x11-libs/pango-1.19.3
149 >=x11-libs/startup-notification-0.10_p20110426
150 >=x11-libs/xcb-util-0.3.8
151 dbus? ( >=sys-apps/dbus-1 )
152 elibc_FreeBSD? ( dev-libs/libexecinfo )"
153
154 # graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
155 DEPEND="${COMMON_DEPEND}
156 >=app-text/asciidoc-8.4.5
157 app-text/xmlto
158 dev-util/gperf
159 dev-util/pkgconfig
160 media-gfx/imagemagick[png]
161 >=x11-proto/xcb-proto-1.5
162 >=x11-proto/xproto-7.0.15
163 doc? (
164 app-doc/doxygen
165 dev-lua/luadoc
166 media-gfx/graphviz
167 )"
168
169 RDEPEND="${COMMON_DEPEND}
170 || (
171 x11-misc/gxmessage
172 x11-apps/xmessage
173 )"
174
175 # bug #321433: Need one of these to for awsetbg.
176 # imagemagick provides 'display' and is further down the default list, but
177 # listed here for completeness. 'display' however is only usable with
178 # x11-apps/xwininfo also present.
179 RDEPEND="${RDEPEND}
180 || (
181 ( x11-apps/xwininfo
182 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
183 )
184 x11-misc/habak
185 media-gfx/feh
186 x11-misc/hsetroot
187 media-gfx/qiv
188 media-gfx/xv
189 x11-misc/xsri
190 media-gfx/xli
191 x11-apps/xsetroot
192 )"
193
194 DOCS="AUTHORS BUGS PATCHES README STYLE"
195
196 src_prepare() {
197 epatch \
198 "${FILESDIR}/${PN}-3.4.2-backtrace.patch" \
199 "${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch" \
200 "${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch"
201 }
202
203 src_configure() {
204 mycmakeargs=(
205 -DPREFIX="${EPREFIX}"/usr
206 -DSYSCONFDIR="${EPREFIX}"/etc
207 $(cmake-utils_use_with dbus DBUS)
208 $(cmake-utils_use doc GENERATE_LUADOC)
209 )
210
211 cmake-utils_src_configure
212 }
213
214 src_compile() {
215 local myargs="all"
216
217 if use doc ; then
218 myargs="${myargs} doc"
219 fi
220 cmake-utils_src_make ${myargs}
221 }
222
223 src_install() {
224 cmake-utils_src_install
225
226 if use doc ; then
227 (
228 cd "${CMAKE_BUILD_DIR}"/doc
229 mv html doxygen
230 dohtml -r doxygen || die
231 )
232 mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
233 fi
234 rm -rf "${ED}"/usr/share/doc/${PN} || die
235
236 exeinto /etc/X11/Sessions
237 newexe "${FILESDIR}"/${PN}-session ${PN} || die
238 }
Report Message
Find on MARC Find on Google Groups