From 122f33c0da35fc854f938e7a4077764d0dc1914c Mon Sep 17 00:00:00 2001
From: Travis Tilley <lv@gentoo.org>
Date: Sun, 21 Nov 2004 00:13:41 +0000
Subject: [PATCH] sillie fix to the split-spec ebuild handling logic

---
 sys-devel/gcc/Manifest         |  2 +-
 sys-devel/gcc/gcc-3.4.3.ebuild | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 3723cbd61267..ac4b33520ade 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -10,6 +10,7 @@ MD5 ee95564bedb8cace16469a654758fed4 gcc-3.4.1.ebuild 30323
 MD5 9451c01d4755a9f08026d9377a34eb38 gcc-3.4.2-r2.ebuild 13507
 MD5 86a6507162bd04b5677e8ffd24c4e786 gcc-3.3.5.ebuild 11495
 MD5 df018d326fbb6d74cbd690f088d130b2 ChangeLog 73407
+MD5 54d0501c7e302c80ac54ff53e729a25d gcc-3.4.3.ebuild 13587
 MD5 4bcf46d8a3f5509cf09f23017408095d gcc-2.95.3-r8.ebuild 8407
 MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274
 MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754
@@ -23,7 +24,6 @@ MD5 638023a605f75bd0b58558ea92d8cff9 gcc-3.3.4-r1.ebuild 24863
 MD5 1011668da4153e33c8e69808381d96f4 gcc-3.3.4-r2.ebuild 24671
 MD5 eaccd73f2955ff6549a0f6e29dded1b3 gcc-3.4.1-r2.ebuild 31259
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 e556cb0a11bce3261d71fa440cdf1eee gcc-3.4.3.ebuild 13611
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
diff --git a/sys-devel/gcc/gcc-3.4.3.ebuild b/sys-devel/gcc/gcc-3.4.3.ebuild
index bfe055c010bf..ecabb160fd58 100644
--- a/sys-devel/gcc/gcc-3.4.3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.9 2004/11/18 22:23:43 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.3.ebuild,v 1.10 2004/11/21 00:13:41 lv Exp $
 
 inherit eutils flag-o-matic libtool gnuconfig toolchain
 
@@ -196,10 +196,6 @@ src_install() {
 		[ -r ${D}${BINPATH}/gcc ] || die "gcc not found in ${D}"
 	fi
 
-	if [ "${SPLIT_SPECS}" == "true" ] ; then
-		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
-	fi
-
 	# Because GCC 3.4 installs into the gcc directory and not the gcc-lib
 	# directory, we will have to rename it in order to keep compatibility
 	# with our current libtool check and gcc-config (which would be a pain
@@ -212,13 +208,15 @@ src_install() {
 	dodir /etc/env.d/gcc
 	create_gcc_env_entry
 
-	if [ "${SPLIT_SPECS}" == "true" ] && use !boundschecking && hardened_gcc_works; then
+	if [ "${SPLIT_SPECS}" == "true" ] && [ -n "${PIE_CORE}" ] && use !boundschecking && hardened_gcc_works; then
 		if use hardened ; then
 			create_gcc_env_entry vanilla
 		else
 			create_gcc_env_entry hardened
 		fi
 		create_gcc_env_entry hardenednossp
+
+		cp ${WORKDIR}/build/*.specs ${D}/${LIBPATH}
 	fi
 
 	# Make sure we dont have stuff lying around that
-- 
2.26.2