diff options
| author |   Alex Alexander <wired@gentoo.org> | 2010-10-13 11:19:59 +0000 |
|---|---|---|
| committer | Alex Alexander <wired@gentoo.org> | 2010-10-13 11:19:59 +0000 |
| commit | 1c0d564ae5737af88df85f37af55d83f4bc6bfec (patch) | |
| tree | 663ca8ed442d9b5d55eeeac4d3e14dd2e8e74199 /x11-wm | |
| parent | Stable on amd64 wrt bug #339698 (diff) | |
| download | gentoo-2-1c0d564ae5737af88df85f37af55d83f4bc6bfec.tar.gz gentoo-2-1c0d564ae5737af88df85f37af55d83f4bc6bfec.tar.bz2 gentoo-2-1c0d564ae5737af88df85f37af55d83f4bc6bfec.zip | |
bug #336492: qa: moved mycmakeargs to src_configure, removed cmake dep (handled by eclass)
(Portage version: 2.2_rc89/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/awesome/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/awesome/awesome-3.4.8.ebuild | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog index fa9082d8774d..09dbc86884bf 100644 --- a/x11-wm/awesome/ChangeLog +++ b/x11-wm/awesome/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/awesome # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.108 2010/10/04 17:48:57 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.109 2010/10/13 11:19:59 wired Exp $ + + 13 Oct 2010; Alex Alexander <wired@gentoo.org> awesome-3.4.8.ebuild: + bug #336492: qa: moved mycmakeargs to src_configure, removed cmake dep + (handled by eclass) 04 Oct 2010; Robin H. Johnson <robbat2@gentoo.org> awesome-3.4.8.ebuild: Bug #321433: update RDEPEND for all bg setters. Bug #314425: allow diff --git a/x11-wm/awesome/awesome-3.4.8.ebuild b/x11-wm/awesome/awesome-3.4.8.ebuild index 0e030e065d24..5ebe86c3ff15 100644 --- a/x11-wm/awesome/awesome-3.4.8.ebuild +++ b/x11-wm/awesome/awesome-3.4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.4 2010/10/05 04:24:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.5 2010/10/13 11:19:59 wired Exp $ EAPI="3" inherit cmake-utils eutils @@ -30,7 +30,6 @@ RDEPEND=">=dev-lang/lua-5.1[deprecated] DEPEND="${RDEPEND} >=app-text/asciidoc-8.4.5 app-text/xmlto - >=dev-util/cmake-2.6 dev-util/gperf dev-util/pkgconfig || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) @@ -71,15 +70,21 @@ RDEPEND="${RDEPEND} DOCS="AUTHORS BUGS PATCHES README STYLE" -mycmakeargs="-DPREFIX=${EPREFIX}/usr - -DSYSCONFDIR=${EPREFIX}/etc - $(cmake-utils_use_with dbus DBUS) - $(cmake-utils_use doc GENERATE_LUADOC)" - src_prepare() { epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch" } +src_configure() { + mycmakeargs=( + -DPREFIX="${EPREFIX}"/usr + -DSYSCONFDIR="${EPREFIX}"/etc + $(cmake-utils_use_with dbus DBUS) + $(cmake-utils_use doc GENERATE_LUADOC) + ) + + cmake-utils_src_configure +} + src_compile() { local myargs="all" |