Avoid gcc-version test under non-hardened, stylistic change wrt #76512.

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

6 files changed, 27 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index dc3b540f60fa..34133f92009f 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.184 2009/06/08 17:16:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.185 2009/07/05 20:57:15 gengor Exp $
+
+  05 Jul 2009; Gordon Malm <gengor@gentoo.org> postfix-2.4.11.ebuild,
+  postfix-2.5.5.ebuild, postfix-2.5.7.ebuild, postfix-2.6.2.ebuild:
+  Avoid gcc-version test under non-hardened, stylistic change wrt #76512.
 
 *postfix-2.6.2 (08 Jun 2009)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index c10be074ded0..3e86bac380d1 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -9,9 +9,9 @@ DIST postfix-2.5.5-vda-ng.patch.gz 12537 RMD160 992a20b897f7c62707f08bb19788b2c0
 DIST postfix-2.5.5.tar.gz 3157877 RMD160 2118fa61710bdb266d4fb8b7a0f60cf0f633c801 SHA1 7240be9e362b991bacfcf7e3771ab611e872ac12 SHA256 8c12c4d539818433d2a65019d44c802c06d0d18667cd069a5b313db06f4bc832
 DIST postfix-2.5.7.tar.gz 3159263 RMD160 5fa24140e4888fa32f4e01d4021ae37a60b523dd SHA1 1a7620b703a24cd7eef56daddff605cace184a60 SHA256 b758684dadbf01fcfe964400151788cf54cb1f4b90d2e8ede87f81f9fbc635c4
 DIST postfix-2.6.2.tar.gz 3323255 RMD160 a86c829c3c17746986a0ea013674b6bec49d74ea SHA1 a3b349df60bca947f3b94ff484b699d176777b4a SHA256 025acf080bbe279cbc6e8e6806ecd0f99af41c8ca384fcb2f7631988f73d5f7c
-EBUILD postfix-2.4.11.ebuild 11840 RMD160 045c021ff8847b17e83bad03b4b57765b85e6306 SHA1 55a314d157aca112f4cc3f32d84d87e51421409f SHA256 ee05b6dbdadd01f4c12a08d68a7c0e855491cd26c41b0505eeaa8c1aac074419
-EBUILD postfix-2.5.5.ebuild 11987 RMD160 6537549f0cd9aac49f41c5cb4c916b5013f066f9 SHA1 2e66204f3bc6a830eced420d3f4fe680ea14fd37 SHA256 91b4d2e4eb37820d333e4cf01667b3c46304b1959a89843fa25b18bf2a7e6803
-EBUILD postfix-2.5.7.ebuild 12002 RMD160 a408aa1b8963e2f78f79e7ab05b572da1882b882 SHA1 4327edecb9ed2959b8be0785bb3a799ed02ee371 SHA256 c1aec8ca3fca64f45c2bd5429d0a3f4870ba9b627e2557d7bb536dc83fe872cd
-EBUILD postfix-2.6.2.ebuild 11131 RMD160 b7a030c8bd206c24786d4b2cfcc85686dd382c72 SHA1 bea71b1c62d10a591a958cecb6b8a944771183b5 SHA256 c9505a8e7286553413b01995913369c752f099018caeaaab335ba6fe514b27ee
-MISC ChangeLog 53835 RMD160 ff92986e7cab3fe20d51501b7fc956f5c25f66ff SHA1 9ba6e33fdda25352ea7d6db501bd6aaf8b808a0e SHA256 cfc30dd83a7420c9bee6ed2cfdca9492879dcb64630ce6e6c300a703927c016c
+EBUILD postfix-2.4.11.ebuild 11849 RMD160 381980f7ae2ac7af4c5bb1d95eef7c7bc16e01ab SHA1 b0593f77b78647da2d1eddf2671fb76ddf904892 SHA256 6268651bede416c9c8ecee780cdb5d8601efb323857785ec7afdfb3ab584fc37
+EBUILD postfix-2.5.5.ebuild 12000 RMD160 b399d7402ff12f2c6de655cd07069b95399dea83 SHA1 3894dbd43ced3a6e35db528c7fff115900f9d1a1 SHA256 693fa1d2b263b2d0264f1e2d9b38a2e4a4815e332f0328d84a424e443a844ce4
+EBUILD postfix-2.5.7.ebuild 12011 RMD160 3176af3695c1cd0ed0c1605bb16963fff26719b8 SHA1 021df81c63a3d09fb8990494d90f879aab9e1713 SHA256 36035cf633be5361b1557bb8bcc6741ab0cfaf0558ff08407a55f210bc855bd2
+EBUILD postfix-2.6.2.ebuild 11140 RMD160 dd3dcc4e18b1372afb423ace2a8b07017a85bdcd SHA1 97febaefabbf78f0aadf1cad0b3ced2014f4ddaf SHA256 08bd5802694b00da457543ba101268796e2fe7daba9657738abf5ba158d88f21
+MISC ChangeLog 54044 RMD160 c2a31863a3ac80fc801a4712680a31761e56ea6b SHA1 76e56cb4b494cddb04199138b2fa5011a3f16915 SHA256 43c6be8638fd00fc9c73b418874dbdaccff690ae13fc53222300b201ecaa8683
 MISC metadata.xml 388 RMD160 9081cc3e1f3c8c56c257a9a525277eb3d3dff496 SHA1 7a266976e60e25df9769df606a9ebfe3bf79b96a SHA256 b2d51b2d3d8eaa9a3e3bbaa3bd21d2c5841abfd73d6338fa833dae7b7df6202f
diff --git a/mail-mta/postfix/postfix-2.4.11.ebuild b/mail-mta/postfix/postfix-2.4.11.ebuild
index 41bdd01374c0..6343b3580802 100644
--- a/mail-mta/postfix/postfix-2.4.11.ebuild
+++ b/mail-mta/postfix/postfix-2.4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.11.ebuild,v 1.1 2009/05/15 17:16:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.11.ebuild,v 1.2 2009/07/05 20:57:15 gengor Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -250,7 +250,9 @@ src_compile() {
 	einfo "CC=${my_cc:=gcc}"
 
 	# Workaround for bug #76512
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
 
 	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		makefiles || die "configure problem"
diff --git a/mail-mta/postfix/postfix-2.5.5.ebuild b/mail-mta/postfix/postfix-2.5.5.ebuild
index 08ab93d66e51..929dfd2b089d 100644
--- a/mail-mta/postfix/postfix-2.5.5.ebuild
+++ b/mail-mta/postfix/postfix-2.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.5.ebuild,v 1.6 2008/11/09 12:19:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.5.ebuild,v 1.7 2009/07/05 20:57:15 gengor Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -250,7 +250,9 @@ src_compile() {
 	einfo "CC=${my_cc:=gcc}"
 
 	# Workaround for bug #76512
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
 
 	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		makefiles || die "configure problem"
diff --git a/mail-mta/postfix/postfix-2.5.7.ebuild b/mail-mta/postfix/postfix-2.5.7.ebuild
index 35694231e21e..523d4abcc5e5 100644
--- a/mail-mta/postfix/postfix-2.5.7.ebuild
+++ b/mail-mta/postfix/postfix-2.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.7.ebuild,v 1.1 2009/05/15 17:16:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.7.ebuild,v 1.2 2009/07/05 20:57:15 gengor Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -250,7 +250,9 @@ src_compile() {
 	einfo "CC=${my_cc:=gcc}"
 
 	# Workaround for bug #76512
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
 
 	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		makefiles || die "configure problem"
diff --git a/mail-mta/postfix/postfix-2.6.2.ebuild b/mail-mta/postfix/postfix-2.6.2.ebuild
index b0213093acac..cc40d655b3ca 100644
--- a/mail-mta/postfix/postfix-2.6.2.ebuild
+++ b/mail-mta/postfix/postfix-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.2.ebuild,v 1.1 2009/06/08 17:16:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.6.2.ebuild,v 1.2 2009/07/05 20:57:15 gengor Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -247,7 +247,9 @@ src_compile() {
 	einfo "CC=${my_cc:=gcc}"
 
 	# Workaround for bug #76512
-	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
 
 	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		makefiles || die "configure problem"