bug #336492: qa: moved mycmakeargs to src_configure, removed cmake dep (handled by eclass)

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

3 files changed, 39 insertions, 10 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/Manifest b/x11-wm/awesome/Manifest
index d33dbcd837ca..7a40c1d582a6 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
@@ -12,6 +15,23 @@ EBUILD awesome-3.4.4.ebuild 2061 RMD160 23da71707c30c18fca8920be2ffda4fd42949458
 EBUILD awesome-3.4.5.ebuild 2041 RMD160 15be678ca4a6564ac91b7acbff7922256065a573 SHA1 3cb70d1f63e0dd72716bd0e4035a1f51fb3730d5 SHA256 e00d2a04d491a0d81ebc3255e4669c3528db1e1f02ed06e5f1bf0fa3e5d73ec5
 EBUILD awesome-3.4.6.ebuild 2064 RMD160 104628fba48c9e7f073050b4fb3d27eec4a24ec2 SHA1 4dfa1e87ef6da02b5198138e5c142777108bd000 SHA256 f7513f005f02886170aa36306e51eac22646c2eeb7b6c88afc33ab2fb01e7436
 EBUILD awesome-3.4.7.ebuild 2064 RMD160 68196bdc23350bbcba0eabf6980a5be5665d257d SHA1 da49d41e8c5641ad5124f73bd964b05fcbaaf5c9 SHA256 2288c02f793026463366a037275780fd55c44fbb4063be13aae1b9295b7fc7a6
-EBUILD awesome-3.4.8.ebuild 2595 RMD160 c2ac84c2e8c2196b8b12804fa3c2ca57b51caa64 SHA1 a55d7c373da2a843d67372e5e83334ae2738a05e SHA256 d111163aefcbd7d44455818d4407878ed2e27d6797be9f081aff77e56f2fa15b
-MISC ChangeLog 15860 RMD160 b6950800994474fd12566f04340ff6fd6a04b9b3 SHA1 b7d7ecead9a0ed2a9868fa5c644eb37c3f08c0e2 SHA256 a4094c473687c4fcd14a112e8fec972aaf0641ff1d815534ccd16378d0b78261
+EBUILD awesome-3.4.8.ebuild 2631 RMD160 0b8f10da2e9144ad89181d977cc5af2eb7c18986 SHA1 faeffd67243b064063522bf37f696626d03a9f31 SHA256 4b1c505ab8110071438debc3cffe4c2930cfe24ac71f6047239fdfa47c47b09d
+MISC ChangeLog 16025 RMD160 d4e08d84cc25bcd24665166b114324fe82d53df0 SHA1 20930c9272b349b134b4b4a9dd9061b01c65a9b4 SHA256 e919e4f0a47bc1482f8281609fca2d3100bf22bef1fd6d0d63b2baaa8bb5266f
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iQIcBAEBCAAGBQJMtZbqAAoJEDZF8K7rm0r6X4kQAIEFJE17EbvsIdM9n1ftGJuG
+YbyfMB1VJ5G3upNy9HmBecWOK87fvtl5lRCMuBID3WlIw1HPgo1uR9XvWlacB7mg
+cinPztn/79woEJnMLDuZ4Svmz+PcIGDf1jcweCf1ccLcbprhCP6rFaP0WybN6w8i
+4ZAduBEPJbJDrbGPcGR6w2e5btNiWIwnMalH82M1eKpOz/+KeweaeqwKa6gv6hXj
+b8xWllWqdfxx9D15ChESh8SJBP2tJKcVllw2P5/A97gVOaGB5PGq76WsZZKRQE00
+9NdYJ5nz7EaPH5UHIbb6EL3j4aDKndZe833uF0/gEBQu9lxLlcBjWehk+N71vrfr
+SZYQBuxsDFlsAEC5xKqalToIDolcoY1ZnPIpb3Hqmyz1plCPiplGj8ApAtRfzxOK
+3ToAY4vuHeKAljfflR0OcBUyKaHyE8mxhlAtdiKorEbBei2SYDDDZKhnW1hPg8Dc
+wsmEbkrg/gUGPakNFgo52AWuKoWOD0UsmcAtE+ByxqUKyIQT37cfB4b+CBsBSfgo
+REXJuS3GisGiaVS5cLMFAql8CLB/5Kk9dVuZQb8x3IvB+jlMRTMwGgX/vZjzphAA
+/0q1t8m9LKg13BPfy/u8nLhK5Jf2sedZXVguP080GNqDWR5NSQdOg/un+fJZera7
+4FTiztqMIPLvghCWnJs5
+=WQiK
+-----END PGP SIGNATURE-----
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"