diff --git a/sys-devel/base-gcc/Manifest b/sys-devel/base-gcc/Manifest
index b715a00ee..fbb4495b2 100644
--- a/sys-devel/base-gcc/Manifest
+++ b/sys-devel/base-gcc/Manifest
@@ -16,6 +16,6 @@ DIST gcc-4.6.2-patches-1.0.tar.bz2 12374 RMD160 84aa2e55a8762e2d38161943e1661fd7
 DIST gcc-4.6.2-piepatches-v0.4.5.tar.bz2 14156 RMD160 101546367ae798f9080d111e4f9ccc0914ec74c8 SHA1 2ad14aa580d65cbc7dd35b5d05977890e9fb1679 SHA256 a18bea1bc2cad2efde5481a5777a97cf539d206dcbca33758d56d7fbdb43a554
 DIST gcc-4.6.2-uclibc-patches-1.0.tar.bz2 3019 RMD160 7e991775c15d4126bd8d85aceb677c675559606f SHA1 0d316aaf94966cc52b1582282723a932ac065639 SHA256 25e902a6d2db7181394df5ad11fafaad064bf28a6ffebd889033f744613ac201
 DIST gcc-4.6.2.tar.bz2 71995338 RMD160 e7041933b39629f9524848dcf81a1a4c02a225c6 SHA1 691974613b1c1f15ed0182ec539fa54a12dd6f93 SHA256 60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
-EBUILD base-gcc-4.5.3-r1.ebuild 5286 RMD160 661e46379cebd6e0e26c068e3a3f7faa8f067a1e SHA1 8cd0983ae9d18f7035596453c2c20091e6ead8c0 SHA256 112c425eed4bce144a2b966b5b6ac320b2a5e1dd44de6599ceeff78caf61aac2
-EBUILD base-gcc-4.6.2.ebuild 5122 RMD160 e4dc6914eba83c25cac3fe90b5cb4f42266d13a7 SHA1 a1fb66a00e1c9f90e59b2a36362573b8abb7950d SHA256 b782ef6db805fe14ee41c329891224f7f17871f66b47704c6cae04df9dfc2375
+EBUILD base-gcc-4.5.3-r1.ebuild 4791 RMD160 f6565c06a4ddb60d291c256d28479fb3036f0408 SHA1 f1cf48b78a093123e7c3e2804d479eeef78437a5 SHA256 37998ce20c159590d86755b0f3d210e8041ef3c379dfbfac330915dda65ecf5a
+EBUILD base-gcc-4.6.2.ebuild 4627 RMD160 fefc29a25c49a416be2cea32047a5e71184fad16 SHA1 f165f921a3206008764e51b453f8d738646f512f SHA256 4527155ea4e3185dd73f9537783f69c92ce8e648ac603a8a71758d2880809e3a
 MISC metadata.xml 1780 RMD160 0fa658c47436e17235cd03b5a9a3cbd8448e474b SHA1 127adff4704c040ee42d43bd9ea8218b408203cf SHA256 57d7428c3d0ef34e72e780a3cfa7a059202b5c80f2d61cc12f90f0d1e8f5f12e
diff --git a/sys-devel/base-gcc/base-gcc-4.5.3-r1.ebuild b/sys-devel/base-gcc/base-gcc-4.5.3-r1.ebuild
index 4e44d254a..1bbb727c6 100644
--- a/sys-devel/base-gcc/base-gcc-4.5.3-r1.ebuild
+++ b/sys-devel/base-gcc/base-gcc-4.5.3-r1.ebuild
@@ -132,21 +132,6 @@ src_install() {
 	dodir /etc/env.d/gcc
 	create_gcc_env_entry
 
-	if want_split_specs ; then
-		if use hardened ; then
-			create_gcc_env_entry vanilla
-		fi
-		! use hardened && hardened_gcc_works && create_gcc_env_entry hardened
-		if hardened_gcc_works || hardened_gcc_works pie ; then
-			create_gcc_env_entry hardenednossp
-		fi
-		if hardened_gcc_works || hardened_gcc_works ssp ; then
-			create_gcc_env_entry hardenednopie
-		fi
-		create_gcc_env_entry hardenednopiessp
-		insinto ${LIBPATH}
-		doins "${WORKDIR}"/build/*.specs || die "failed to install specs"
-	fi
 	# Setup the gcc_env_entry for hardened gcc 4 with minispecs
 	if want_minispecs ; then
 		copy_minispecs_gcc_specs
diff --git a/sys-devel/base-gcc/base-gcc-4.6.2.ebuild b/sys-devel/base-gcc/base-gcc-4.6.2.ebuild
index 3b3a07240..ad4b42e6a 100644
--- a/sys-devel/base-gcc/base-gcc-4.6.2.ebuild
+++ b/sys-devel/base-gcc/base-gcc-4.6.2.ebuild
@@ -132,21 +132,6 @@ src_install() {
 	dodir /etc/env.d/gcc
 	create_gcc_env_entry
 
-	if want_split_specs ; then
-		if use hardened ; then
-			create_gcc_env_entry vanilla
-		fi
-		! use hardened && hardened_gcc_works && create_gcc_env_entry hardened
-		if hardened_gcc_works || hardened_gcc_works pie ; then
-			create_gcc_env_entry hardenednossp
-		fi
-		if hardened_gcc_works || hardened_gcc_works ssp ; then
-			create_gcc_env_entry hardenednopie
-		fi
-		create_gcc_env_entry hardenednopiessp
-		insinto ${LIBPATH}
-		doins "${WORKDIR}"/build/*.specs || die "failed to install specs"
-	fi
 	# Setup the gcc_env_entry for hardened gcc 4 with minispecs
 	if want_minispecs ; then
 		copy_minispecs_gcc_specs