--- /usr/portage/eclass/gnatbuild.eclass	2014-07-17 01:01:10.000000000 -0600
+++ gnatbuild.eclass	2014-08-28 21:07:57.580692854 -0600
@@ -338,6 +338,14 @@
 	case $1 in
 		base_unpack)
 			unpack ${A}
+
+			rm ${WORKDIR}/usr/lib/include/*intrin.h
+			rm ${WORKDIR}/usr/lib/include/cpuid.h
+			rm ${WORKDIR}/usr/lib/include/cross-stdarg.h
+			rm ${WORKDIR}/usr/lib/include/mm3dnow.h
+			rm ${WORKDIR}/usr/lib/include/mmintrin-common.h
+			rm ${WORKDIR}/usr/lib/include/mm_malloc.h
+
 			pax-mark E $(find ${GNATBOOT} -name gnat1)
 
 			cd "${S}"
@@ -541,7 +549,10 @@
 				fi
 
 				# set some specifics available in later versions
-				if version_is_at_least 4.3 ; then
+				if version_is_at_least 4.7 ; then
+					confgcc="${confgcc} --enable-threads=posix"
+					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"
+				elif version_is_at_least 4.3 ; then
 					einfo "setting gnat thread model"
 					confgcc="${confgcc} --enable-threads=gnat"
 					confgcc="${confgcc} --enable-shared=boehm-gc,ada,libada"