(#89235) Use has_hardened instead of hardened USE flag, because it checks the active toolchain. Also looks like part of the last commit was missed from 6.8.99.5.

3 files changed, 22 insertions, 11 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 76806ab24070..613a4798fd3e 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.385 2005/05/24 02:28:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.386 2005/05/24 02:34:32 spyderous Exp $
+
+  24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
+  (#89235) Use has_hardened instead of hardened USE flag, because it checks
+  the active toolchain. Also looks like part of the last commit was missed
+  from 6.8.99.5.
 
   24 May 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.5.ebuild:
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index 79a2b5c42a10..5811e7b94de6 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.10 2005/05/24 02:28:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.11 2005/05/24 02:34:32 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -45,7 +45,7 @@ inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib
 RESTRICT="nostrip"
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
+IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 	insecure-drivers ipv6 minimal mmx nls opengl pam sdk sse static
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
@@ -356,7 +356,7 @@ cflag_setup() {
 		# according to ciaranm
 		# And hardened compiler must be softened. -- fmccor, 20.viii.04
 		sparc)	filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-			if use hardened && ! use dlloader; then
+			if has_hardened && ! use dlloader; then
 				einfo "Softening gcc for sparc."
 				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
 				append-flags -fno-pie -fno-PIE
@@ -635,7 +635,7 @@ host_def_setup() {
 			if use dlloader; then
 				einfo "Setting MakeDllModules to YES."
 				echo "#define MakeDllModules    YES" >> ${HOSTCONF}
-				if use hardened; then
+				if has_hardened; then
 					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
 				fi
 			else
@@ -742,7 +742,7 @@ host_def_setup() {
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
-			if use hardened && ! use dlloader; then
+			if has_hardened && ! use dlloader; then
 				einfo "Softening the assembler so cfb modules will play nice with sunffb."
 				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
 				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
index 8ee09dcdcb1f..792df46e7904 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.6 2005/05/24 02:28:07 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.5.ebuild,v 1.7 2005/05/24 02:34:32 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -45,7 +45,7 @@ inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib
 RESTRICT="nostrip"
 
 # IUSE="gatos" disabled because gatos is broken on ~4.4 now (31 Jan 2004)
-IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
+IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 	insecure-drivers ipv6 minimal mmx nls opengl pam sdk sse static
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
@@ -357,7 +357,7 @@ cflag_setup() {
 		# according to ciaranm
 		# And hardened compiler must be softened. -- fmccor, 20.viii.04
 		sparc)	filter-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-			if use hardened && ! use dlloader; then
+			if has_hardened && ! use dlloader; then
 				einfo "Softening gcc for sparc."
 				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
 				append-flags -fno-pie -fno-PIE
@@ -422,6 +422,11 @@ check_use_combos() {
 		die "The minimal and doc USE flags are temporarily incompatible and result in a dead build."
 	fi
 
+	# (#77949)
+	if use minimal && use doc; then
+		die "The minimal and doc USE flags are temporarily incompatible and result in a dead build."
+	fi
+
 	if use xv && ! use opengl; then
 		eerror "See http://bugs.gentoo.org/show_bug.cgi?id=67996"
 		eerror "The xv USE flag currently requires the opengl flag."
@@ -633,7 +638,7 @@ host_def_setup() {
 			if use dlloader; then
 				einfo "Setting MakeDllModules to YES."
 				echo "#define MakeDllModules    YES" >> ${HOSTCONF}
-				if use hardened; then
+				if has_hardened; then
 					echo "#define HardenedGccSpecs YES" >> ${HOSTCONF}
 				fi
 			else
@@ -740,7 +745,7 @@ host_def_setup() {
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
-			if use hardened && ! use dlloader; then
+			if has_hardened && ! use dlloader; then
 				einfo "Softening the assembler so cfb modules will play nice with sunffb."
 				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
 				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}