changed hardened-gcc flags

5 files changed, 16 insertions, 51 deletions

diff --git a/sys-fs/devfsd/ChangeLog b/sys-fs/devfsd/ChangeLog
index 9b266a1afd78..0cc5f328cbe0 100644
--- a/sys-fs/devfsd/ChangeLog
+++ b/sys-fs/devfsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/devfsd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.3 2003/10/09 19:51:36 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/ChangeLog,v 1.4 2003/10/10 18:49:04 pappy Exp $
+
+  10 Oct 2003; Alexander Gabert <pappy@gentoo.org> devfsd-1.3.25-r3.ebuild,
+  devfsd-1.3.25-r4.ebuild, devfsd-1.3.25-r5.ebuild:
+  changed hardened-gcc flags
 
   09 Oct 2003; Alexander Gabert <pappy@gentoo.org> devfsd-1.3.25-r3.ebuild,
   devfsd-1.3.25-r4.ebuild, devfsd-1.3.25-r5.ebuild:
diff --git a/sys-fs/devfsd/Manifest b/sys-fs/devfsd/Manifest
index a5b5832dd21a..ced2de0645e0 100644
--- a/sys-fs/devfsd/Manifest
+++ b/sys-fs/devfsd/Manifest
@@ -1,8 +1,8 @@
-MD5 69224337b4af9c0513d165e049711bde devfsd-1.3.25-r4.ebuild 1224
-MD5 f153cd5e1070c96950228a977cf59eef devfsd-1.3.25-r3.ebuild 1214
+MD5 3e43056834a481fd2add79770532e56d devfsd-1.3.25-r4.ebuild 1224
+MD5 c1ab699ef984fd8192f134de8a2b761d devfsd-1.3.25-r3.ebuild 1214
 MD5 31cb9c2bfe7cfa9604edbfba5539258d devfsd-1.3.24.ebuild 999
-MD5 9996829ddc826dad921aee60ed49d2f4 devfsd-1.3.25-r5.ebuild 1221
-MD5 9fd756f711d990730a7152b6ad1d9eaf ChangeLog 3584
+MD5 b028e0aa870d9f719681f2025982f607 devfsd-1.3.25-r5.ebuild 1221
+MD5 5ae5a5e064224f9f22d20c479841ae03 ChangeLog 3584
 MD5 b64f47136c8298cec42e00df32c4276f files/devfsd-1.3.25-kernel-2.5.patch.bz2 1556
 MD5 d580e9efc3658a0e71a165b3b531d415 files/devfsd 245
 MD5 f59c1fb784ac9e8f41530ecd2036e33e files/digest-devfsd-1.3.24 65
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
index 19fb03b5d892..a126e52a4b2f 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild,v 1.2 2003/10/09 19:51:36 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r3.ebuild,v 1.3 2003/10/10 18:49:04 pappy Exp $
 
 IUSE=""
 
@@ -21,21 +21,8 @@ src_unpack() {
 	unpack ${A}
 
     # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
-    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
-    then
-        append-flags "-yet_exec -fstack-protector"
-    fi
-
-    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
-
-    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
-	
+	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
+
 	cd ${S}
 	cp GNUmakefile GNUmakefile.orig
 	sed -e "s:-O2:${CFLAGS}:g" \
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
index bace95e7ddf3..8871cf5c5339 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild,v 1.3 2003/10/09 19:51:36 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r4.ebuild,v 1.4 2003/10/10 18:49:04 pappy Exp $
 
 IUSE=""
 
@@ -21,20 +21,7 @@ src_unpack() {
 	unpack ${A}
 
     # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
-    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
-    then
-        append-flags "-yet_exec -fstack-protector"
-    fi
-
-    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
-
-    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
+	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch.bz2
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
index 20b2290383ac..880567763ac8 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild,v 1.2 2003/10/09 19:51:36 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r5.ebuild,v 1.3 2003/10/10 18:49:04 pappy Exp $
 
 IUSE=""
 
@@ -21,20 +21,7 @@ src_unpack() {
 	unpack ${A}
 
     # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
-    if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc"
-    then
-        append-flags "-yet_exec -fstack-protector"
-    fi
-
-    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
-
-    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        append-flags "-yet_exec"
-    fi
+	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-kernel-2.5.patch