From 88eb655aafe09dd8feeb92952d27520a8ae56ac2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@rogentos.ro>
Date: Sun, 12 Jul 2015 12:50:47 +0100
Subject: prevent removal of headers...from now on it's self sustaining

---
 sys-devel/gcc/gcc-4.8.4.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sys-devel/gcc')

diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild
index e3a121f7..9b3359b3 100644
--- a/sys-devel/gcc/gcc-4.8.4.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4.ebuild
@@ -49,15 +49,15 @@ src_prepare() {
 src_install() {
 		toolchain_src_install
 		# drop base gcc libraries, they're provided by sys-devel/base-gcc-${PV}
-		#
-		# TODO , prevent dropping of headers
-		#
 		export local libdir="${D}usr/lib/gcc/$(uname -m)-pc-linux-gnu/${PV}"
 		if use multilib ; then
 			export local multilibdir="${D}usr/lib/gcc/$(uname -m)-pc-linux-gnu/${PV}/32"
 		fi
-
-		rm -rf "$libdir"
+		
+		# if we remove whole libdir, headers are gone, so remove only libs and their symlinks
+		find "$libdir" -maxdepth 1 -type f -delete
+		find "$libdir" -maxdepth 1 -type l -delete
+		# however, removing multilibdir as a whole doesn't cause any problems
 		if use multilib ; then
 			rm -rf "$multilibdir"
 		fi
-- 
cgit v1.2.3