Respect AR, and avoid running sed.

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

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index 4d2015a2eb49128e9affc32ca853f59aeff765f3..aae3cde7f4f79e29ad0d5a8e40facd61dd38a4bf 100644 (file)
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.35 2010/06/26 16:58:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.36 2010/06/26 18:04:37 ssuominen Exp $
+
+  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> wmii-3.9.2-r1.ebuild:
+  Respect AR, and avoid running sed.
 
 *wmii-3.9.2-r1 (26 Jun 2010)
 

diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 102f41454022e15efe5c832b140bb88adeafcf7a..b1716fae996b810882b1a71c1be2ff4f5091b3a7 100644 (file)
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -3,6 +3,6 @@ AUX wmii.desktop 106 RMD160 e3b2042d2bf5a1eee8a317706f13dec7650f5b92 SHA1 85b1a8
 DIST wmii+ixp-3.9.2.tbz 432032 RMD160 8a401a5d0a033c0da254d15e7fe415ec40e7a332 SHA1 e85a2979a0bd0a1db7ed486fc709afe72bafd8b0 SHA256 0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
 DIST wmii-2.tar.bz2 67004 RMD160 80aaca41643e9632dc63341b63f80a6c1c92e6d8 SHA1 76c2bbe0970f57fa160f13c2ae37a009e84bf5b7 SHA256 d5025527bb04ce34e082f6298cbede72ff36f6a94f2e21582290bcf16b558767
 EBUILD wmii-2.ebuild 1725 RMD160 bfd1f0dd795e5005cc766754d59041a1b768c5e1 SHA1 2695753061c0df613464eacc7664cef8ae749dc3 SHA256 fba1bacd9169deee53dfe5906bb7f470075d56a3d5602122e95d928e71176e46
-EBUILD wmii-3.9.2-r1.ebuild 1401 RMD160 b90020bcc13bdf44f002554d363d68c9a7cf3879 SHA1 904db4a602d04980ce5f1f5cffd57cba3f100d91 SHA256 ca3e6269673c324cb8779a569640530bba1aeb812ff2d4c16bddda57e2016b2c
-MISC ChangeLog 5407 RMD160 c27df81de3a15c1cd4bf4d2445d9679792089504 SHA1 50c3680ed36ac87cea5653d3f0ef9fe9540eea2d SHA256 80b0825332d8749848bc2c61417f68d171d1d12e833f5a7ee48ecda9784c805a
+EBUILD wmii-3.9.2-r1.ebuild 1377 RMD160 8c3df6acc5ed2814fa2ac80546a40a08d41e6b7e SHA1 4b350fa4a764f751dea00bc7275c1fcdda654c1f SHA256 15214fb2daaefb5923e3428bb2c587c29fd255b228d1a2836e81561630b46b55
+MISC ChangeLog 5527 RMD160 6b91b83ac6e48825437d7c83a153fb2acd428315 SHA1 b738890eb84085bfe2475ee7f6f1bf981ca0d911 SHA256 0bd7e84a0840775f4b8e1a8a00e6cdbab179f27d0e6c7818fe8f51130d545e30
 MISC metadata.xml 596 RMD160 0393838f1da4a5783906f5dfb820201f7b1e21a6 SHA1 7af8ccb9f0a48904e923ab610f1fa7199fbad301 SHA256 dc4ec29b62ec8e8d41c91f30f34da4cce7f51ce898516ecd94428512676b059e

diff --git a/x11-wm/wmii/wmii-3.9.2-r1.ebuild b/x11-wm/wmii/wmii-3.9.2-r1.ebuild
index ebd9f540694c885b5af69ed60e8389a04994447e..397fa3b697ea78ea8328223c738743322b3dec02 100644 (file)
--- a/x11-wm/wmii/wmii-3.9.2-r1.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2-r1.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/wmii/wmii-3.9.2-r1.ebuild,v 1.1 2010/06/26 16:58:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2-r1.ebuild,v 1.2 2010/06/26 18:04:37 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic multilib toolchain-funcs
@@ -40,14 +40,13 @@ pkg_setup() {
                "DOC=/usr/share/doc/${PF}"
                "ETC=/etc"
                "LIBDIR=/usr/$(get_libdir)"
+               "CC=$(tc-getCC) -c"
+               "LD=$(tc-getCC)"
+               "AR=$(tc-getAR) crs"
                "DESTDIR=${D}"
                )
 }
 
-src_prepare() {
-       sed -i config.mk -e "/^\(CC\|LD\)/s|cc|$(tc-getCC)|g" || die "sed failed"
-}
-
 src_compile() {
        append-flags -I/usr/include/freetype2
        emake "${mywmiiconf[@]}" || die