Merge pull request #1 from Rogentos/master

Database Update

1 files changed, 10 insertions, 94 deletions

diff --git a/sys-devel/gcc/gcc-4.8.4.ebuild b/sys-devel/gcc/gcc-4.8.4.ebuild
index 131c48ad..5fd5c365 100644
--- a/sys-devel/gcc/gcc-4.8.4.ebuild
+++ b/sys-devel/gcc/gcc-4.8.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.8.4.ebuild,v 1.15 2015/05/27 16:01:17 vapier Exp $
 
 EAPI="4"
 
-PATCH_VER="1.5"
+PATCH_VER="1.6"
 UCLIBC_VER="1.0"
 
 # Hardened gcc 4 stuff
@@ -12,67 +12,28 @@ PIE_VER="0.6.1"
 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"
+PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
+PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
+SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
 # uclibc need tls and nptl support for SSP support
 # uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 ppc ppc64 arm"
+SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 #end Hardened stuff
 
 inherit eutils toolchain
 
-DESCRIPTION="The GNU Compiler Collection"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-## Make sure we share all the USE flags in sys-devel/base-gcc
-BASE_GCC_USE="fortran gcj mudflap multilib nls nptl openmp altivec
-	bootstrap build doc fixed-point graphite hardened
-	multislot cxx nopie nossp objc objc++ objc-gc test vanilla"
-for base_use in ${BASE_GCC_USE}; do
-	RDEPEND+=" ~sys-devel/base-gcc-${PV}[${base_use}?]"
-done
-IUSE="${BASE_GCC_USE}"
-
-RDEPEND="~sys-devel/base-gcc-${PV} ${RDEPEND}"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	elibc_glibc? ( >=sys-libs/glibc-2.8 )
 	>=${CATEGORY}/binutils-2.20"
-## Should this be moved to base-gcc?
-## I guess the cross-* thing is now utterly broken
+
 if [[ ${CATEGORY} != cross-* ]] ; then
 	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
 fi
 
-## Check for valid gcc profile.
 src_prepare() {
-	# Since Sabayon's gcc ebuild are split into two parts, we have to
-	# build gcc with a different version of gcc, or terrible breakage
-	# will occur after sys-devel/base-gcc is installed, but the
-	# partner sys-devel/gcc still needs to be built.
-
-	# While it is possible to rebuild Sabayon's split gcc from
-	# the same version, we have to disallow this also since
-	# we have no way of discerning if a configuration change
-	# is significant enough to cause breakage.
-
-	GCC_PROFILE_VER=$(cat ${ROOT}/etc/env.d/gcc/config-$CHOST | awk -F- '{ print $NF }')
-	einfo "Checking for valid gcc profile to build ${P}"
-
-	# Construct the Slot of the gcc version in the active profile.
-	GCC_PROFILE_SLOT_MAJOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $1 }')
-	GCC_PROFILE_SLOT_MINOR=$(echo ${GCC_PROFILE_VER} | awk -F. '{ print $2 }')
-	GCC_PROFILE_SLOT="${GCC_PROFILE_SLOT_MAJOR}.${GCC_PROFILE_SLOT_MINOR}"
-	einfo "Current gcc profile version Slot is: ${GCC_PROFILE_SLOT}"
-	if [[ "${GCC_PROFILE_SLOT}" = "${SLOT}" ]] ; then
-		eerror "Error!"
-		eerror "The active gcc-profile is for sys-devel/gcc slot ${SLOT}."
-		eerror "Sabayon's split sys-devel/gcc package MUST be built"
-		eerror "with another slotted version of sys-devel/gcc active."
-		ebeep 10
-	fi
-
 	if has_version '<sys-libs/glibc-2.12' ; then
 		ewarn "Your host glibc is too old; disabling automatic fortify."
 		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
@@ -82,51 +43,6 @@ src_prepare() {
 	toolchain_src_prepare
 
 	use vanilla && return 0
-
 	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-
-	#virtualbox-guest-addition fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49718
-	epatch "${FILESDIR}/${P}-no_instrument_function.patch"
-}
-
-## Just install libgcc stuff
-src_install() {
-	toolchain_src_install
-
-	# now drop what's provided by sys-devel/base-gcc-${PV}:${SLOT}
-	base_gcc_libs="libgfortran.so* libgcc_s.so* libobjc.so*
-		libobjc_gc.so* libmudflap.so* libmudflapth.so* libgomp.so* libstdc++.so* libquadmath.so*
-		crtprec80.o crtbeginP.o crtfastmath.o crtprec32.o crtbeginT.o
-		crtbeginS.o crtbegin.o crtend.o crtendS.o crtprec64.o"
-	base_multilib_gcc_libs="32/libgfortran.so* 32/libobjc.so* 32/libobjc_gc.so*
-		32/libgcc_s.so* 32/libgomp.so* 32/libmudflap.so*
-		32/libmudflapth.so* 32/libstdc++.so* 32/libquadmath.so*
-		32/crtprec80.o 32/crtbeginP.o 32/crtfastmath.o 32/crtprec32.o 32/crtbeginT.o
-		32/crtbeginS.o 32/crtbegin.o 32/crtend.o 32/crtendS.o 32/crtprec64.o"
-	for gcc_lib in ${base_gcc_libs}; do
-		# -f is used because the file might not be there
-		rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}"
-		debug_dir="${D}"/usr/lib/debug
-		if [ -d "${debug_dir}" ]; then
-			rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug"
-		fi
-	done
-	if use multilib; then
-		for gcc_lib in ${base_multilib_gcc_libs}; do
-			# -f is used because the file might not be there
-			rm "${D}"${LIBPATH}/${gcc_lib} -rf || die "cannot execute rm on ${gcc_lib}"
-			debug_dir="${D}"/usr/lib/debug
-			if [ -d "${debug_dir}" ]; then
-				rm "${debug_dir}"${LIBPATH}/${gcc_lib}.debug -rf || die "cannot execute rm on ${gcc_lib}.debug"
-			fi
-		done
-	fi
-	# then .mo files provided by sys-devel/base-gcc-${PV}:${SLOT}
-	find "${D}"${DATAPATH}/locale -name libstdc++.mo -delete
-	find "${D}"${DATAPATH}/info -name libgomp.info* -delete
-	find "${D}"${DATAPATH}/info -name libquadmath.info* -delete
-
-	# drop stuff from env.d, provided by sys-devel/base-gcc-${PV}:${SLOT}
-	rm "${D}"/etc/env.d -rf
 }