Expire pie/ssp/specs hardening in older versions to help clean up eclass logic.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

4 files changed, 10 insertions, 39 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 9644e2cc59e3..fca395c7eeb8 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1078 2015/05/27 16:01:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1079 2015/06/01 14:48:13 vapier Exp $
+
+  01 Jun 2015; Mike Frysinger <vapier@gentoo.org> gcc-4.3.6-r1.ebuild,
+  gcc-4.4.7.ebuild, gcc-4.5.4.ebuild:
+  Expire pie/ssp/specs hardening in older versions to help clean up eclass
+  logic.
 
   27 May 2015; Mike Frysinger <vapier@gentoo.org> gcc-4.6.4.ebuild,
   gcc-4.7.4.ebuild, gcc-4.8.4.ebuild, gcc-4.9.2.ebuild, gcc-5.1.0.ebuild:
diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index bdf654767f04..ea4ecbf281bf 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -1,23 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.20 2015/05/05 06:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.6-r1.ebuild,v 1.21 2015/06/01 14:48:13 vapier Exp $
 
 EAPI="5"
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
 
-# Hardened gcc 4 stuff
-PIE_VER="10.1.5"
-SPECS_VER="0.9.4"
-
-# arch/libc configurations known to be stable or untested with {PIE,SSP,FORTIFY}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm sparc"
-PIE_UCLIBC_STABLE="x86 arm"
-#SSP_STABLE="amd64 x86 ppc ppc64 ~arm ~sparc"
-#SSP_UCLIBC_STABLE=""
-
-inherit eutils toolchain
+inherit toolchain
 
 KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 
diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 76845e2d3dc9..dae17ae011c4 100644
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -1,24 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.7.ebuild,v 1.22 2015/05/05 06:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.7.ebuild,v 1.23 2015/06/01 14:48:13 vapier Exp $
 
 EAPI="5"
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
-# Hardened gcc 4 stuff
-PIE_VER="0.4.5"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-SSP_UCLIBC_STABLE=""
-#end Hardened stuff
-
 inherit eutils toolchain
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index 8dc17946f9fe..e578509ac1ee 100644
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -1,24 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.4.ebuild,v 1.21 2015/05/05 06:53:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.5.4.ebuild,v 1.22 2015/06/01 14:48:13 vapier Exp $
 
 EAPI="5"
 
 PATCH_VER="1.2"
 UCLIBC_VER="1.0"
 
-# Hardened gcc 4 stuff
-PIE_VER="0.4.7"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 ppc ppc64"
-SSP_STABLE="amd64 x86 ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-SSP_UCLIBC_STABLE=""
-#end Hardened stuff
-
 inherit eutils toolchain
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"