One more change: Do not force -O2 in CFLAGS to allow user override

Package-Manager: portage-2.1.9.14/cvs/Linux i686

4 files changed, 44 insertions, 5 deletions

diff --git a/x11-plugins/gkrellm-mailwatch/ChangeLog b/x11-plugins/gkrellm-mailwatch/ChangeLog
index 7156d5231bc8..f34a0f60db27 100644
--- a/x11-plugins/gkrellm-mailwatch/ChangeLog
+++ b/x11-plugins/gkrellm-mailwatch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/gkrellm-mailwatch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/ChangeLog,v 1.29 2010/11/01 13:10:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/ChangeLog,v 1.30 2010/11/01 14:19:46 lack Exp $
+
+  01 Nov 2010; Jim Ramsay <lack@gentoo.org>
+  gkrellm-mailwatch-2.4.3-r1.ebuild,
+  +files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch:
+  One more change: Do not force -O2 in CFLAGS to allow user override
 
 *gkrellm-mailwatch-2.4.3-r1 (01 Nov 2010)
 
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index 6082d280727e..351391a0c75a 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -1,8 +1,9 @@
 AUX 2.4.3-0001-Respect-LDFLAGS.patch 998 RMD160 4d65ff8890378c241e401de9a503c65783e3ced2 SHA1 13f8b5b5ad33c5f5775f10b071e8e7ac3b85bd88 SHA256 61826ba4d27f0148a599b5b78087312781b9baad7138a234b0479a96256a1b20
 AUX 2.4.3-0002-Use-gkrellm_gkd_string_width.patch 914 RMD160 05f7c1825fcd00fe02dc69403f5f509d5949b5f6 SHA1 9e6204887005f1846052450b88f2937e2af04b98 SHA256 5fc8937277e985d90bc4ef73070ca653f4558de953c065044788ff27caa547c5
 AUX 2.4.3-0003-Remove-a-few-more-GCC-warnings.patch 1227 RMD160 8c69d46f30a97346d5511c533356a408f431daec SHA1 ca69505702d0d6d86b7835a68bc2c139b280105d SHA256 7757284b182e92fa2527afe2c681c4392eec4ecd632958da370a12fd6db1dfb4
+AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 761 RMD160 275dabe6b43057f22ba22994cec93c8420d377d6 SHA1 ddb7a582990e2d2ebeb9db039f8bc3157ec79bbb SHA256 fa04f6bd124e266cedc834b13a6c745607f126bdb52287471f8c0320f0a98dfe
 DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 RMD160 38e6d9339735add13481994f180e3ccdf2d1560f SHA1 695c85342e96fa23c17d27f19510d2d633ccb27d SHA256 d492d7e494800c80abc2410d4266071132da23b06ae9d903ac4bf279b2b3a4b0
-EBUILD gkrellm-mailwatch-2.4.3-r1.ebuild 632 RMD160 64439025165bc0d32ebfefc9598d38b4e1e95e39 SHA1 8ebbdd1a125b152910a33dc9e4bcdc3480d83aef SHA256 82f35cc6551051fbfa9c857612ba2aa6176e666ffd18ff0846589fc01d799e98
+EBUILD gkrellm-mailwatch-2.4.3-r1.ebuild 702 RMD160 a230bd1f4b08a82bf9935700678a2d256fe1b23e SHA1 ce9390da5e5bdfb64ca76f33c221cdc94e803784 SHA256 a44daf3411b0a8cee018290640efc140d5e390582790a7e38fafffd974407ecd
 EBUILD gkrellm-mailwatch-2.4.3.ebuild 561 RMD160 3a3e2b81bc7a3d309cfd96958dcad5707c6e7488 SHA1 0e06335d724cc1988b0ff11a7aa491c78f03f261 SHA256 392f6196ec71ccdd4a4fdb7158f7758e9b88f7ca72b5aa0baef64d452ea6613e
-MISC ChangeLog 3996 RMD160 45c5d2e416485898489cf5990caa9c88dc6accf3 SHA1 8b88548336bb80465d06ba162a211fa633a64cbf SHA256 7d0307a2b0ec67d2878bf311262fb710bc2fb5b8f778418a7ec5b3aeaf9c6620
+MISC ChangeLog 4200 RMD160 08665fd3e79187ad62736baa9612bf8e49129efd SHA1 aa0a3f8edfb39b3a3fe575c94940c781a96b8ff8 SHA256 eadab173a406d2e68b035b090f9eca27448923083a87a6e85335a61e76c5acc8
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
new file mode 100644
index 000000000000..828c9dd2d5f4
--- /dev/null
+++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
@@ -0,0 +1,28 @@
+From 68bd98eb4144ce1f784e9c7aee4735a3f668453e Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <jim_ramsay@dell.com>
+Date: Mon, 1 Nov 2010 10:11:30 -0400
+Subject: [PATCH 4/4] Do not force -O2 in CFLAGS
+
+Only uses -O2 if the user has not specified any CFLAGS in the
+environment.
+---
+ Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 02ca376..c4ca35c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include
+ 
+ INSTALL=install -c -m 755
+ 
+-CFLAGS += -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
++CFLAGS ?= -O2
++CFLAGS += -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB) $(IMLIB_LIB)
+ LDFLAGS += -shared
+ 
+-- 
+1.7.3.1
+
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild
index 8212d6e4d350..8bbe2cc7b610 100644
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild,v 1.1 2010/11/01 13:10:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r1.ebuild,v 1.2 2010/11/01 14:19:46 lack Exp $
 
 EAPI="3"
-inherit gkrellm-plugin eutils
+inherit gkrellm-plugin toolchain-funcs eutils
 
 IUSE=""
 S=${WORKDIR}/${PN}
@@ -20,3 +20,8 @@ PLUGIN_SO=mailwatch.so
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-*
 }
+
+src_compile() {
+	tc-export CC
+	default_src_compile
+}