flags not needed any more, hardened-gcc propolice behaviour will be changed in 2.4.3

3 files changed, 9 insertions, 35 deletions

diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index c04760bf969e..2763a8f6c269 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,7 +1,7 @@
 MD5 098f4346f266cf8ae5c08ae6eca79c1c svgalib-1.9.17-r2.ebuild 2656
-MD5 796030d67cce84b50acd1768249b8b1f ChangeLog 3457
-MD5 30fdb6eb16292629e9e7aace39d991e2 svgalib-1.4.3-r4.ebuild 2437
-MD5 f9b095f753d2297a9c016ef00c9baf25 svgalib-1.9.17-r3.ebuild 2921
+MD5 b1f8fe15e6eaf4c42d6069e5ebb63c2b ChangeLog 3457
+MD5 543a3c2823405631390fbdf4c570546e svgalib-1.4.3-r4.ebuild 2438
+MD5 f7447457dd0a1ea3330ed1333e689b00 svgalib-1.9.17-r3.ebuild 2921
 MD5 19b74fedfd6953bd3537a803abecc4d3 files/svgalib-1.4.3-gentoo.diff 10364
 MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r2 66
 MD5 e4ead3e3192f5a945ff177331122d7ae files/digest-svgalib-1.9.17-r3 66
diff --git a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild b/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
index d4da67d52de0..0b957ce8061a 100644
--- a/media-libs/svgalib/svgalib-1.4.3-r4.ebuild
+++ b/media-libs/svgalib/svgalib-1.4.3-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/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.9 2003/10/09 19:33:28 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.4.3-r4.ebuild,v 1.10 2003/10/10 18:33:04 pappy Exp $
 
 inherit eutils
 
@@ -27,21 +27,8 @@ src_unpack() {
 }
 
 src_compile() {
-    # 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
+	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+	has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
 
 	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || die
 	# Build the gl stuff tpp
diff --git a/media-libs/svgalib/svgalib-1.9.17-r3.ebuild b/media-libs/svgalib/svgalib-1.9.17-r3.ebuild
index c0ceffa7918c..2a963dc0264d 100644
--- a/media-libs/svgalib/svgalib-1.9.17-r3.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.17-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/media-libs/svgalib/svgalib-1.9.17-r3.ebuild,v 1.6 2003/10/09 19:33:28 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.17-r3.ebuild,v 1.7 2003/10/10 18:33:04 pappy Exp $
 
 inherit eutils
 
@@ -32,21 +32,8 @@ src_unpack() {
 }
 
 src_compile() {
-    # 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
-        CC="${CC} -yet_exec -fstack-protector"
-    fi
-
-    if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc'
-    then
-        CC="${CC} -yet_exec"
-    fi
-
-    if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc'
-    then
-		CC="${CC} -yet_exec"
-    fi
+	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode
+	has_version "sys-devel/hardened-gcc" && CC="${CC} -yet_exec"
 
 	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || \
 		die "Failed to build libraries and utils!"