Add hardened USE flag to deactivate assembly code.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 33 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index b76270380ea3..ce46d6374af7 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.89 2006/06/21 06:07:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.90 2006/06/30 06:16:05 spyderous Exp $
+
+  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2-r2.ebuild,
+  mesa-6.5-r3.ebuild:
+  Add hardened USE flag to deactivate assembly code.
 
   21 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.5-r3.ebuild:
   (#130951) Fix libGLU symlink (Torsten Veller).
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 21441d90a029..67b8c0477bc4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -44,18 +44,18 @@ RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb files/radeon-texture-problem.pat
 SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/radeon-texture-problem.patch 363
 DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-EBUILD mesa-6.4.2-r2.ebuild 9220 RMD160 58a09b0285d20b787a719cebd7cff128cbe19d25 SHA1 1707e41a19c0d7605a76735952895b559c74ed15 SHA256 a3be322589684896ba569a523cf20a85b9670548f4993089e279cdce035d93b5
-MD5 1bf9154411daa9ca57f3c45f59b13140 mesa-6.4.2-r2.ebuild 9220
-RMD160 58a09b0285d20b787a719cebd7cff128cbe19d25 mesa-6.4.2-r2.ebuild 9220
-SHA256 a3be322589684896ba569a523cf20a85b9670548f4993089e279cdce035d93b5 mesa-6.4.2-r2.ebuild 9220
-EBUILD mesa-6.5-r3.ebuild 8897 RMD160 8c5399a04fa262517ee2a9685394046e4369e3d4 SHA1 f6b7b7b5e8904c4fff4edfa83df9188a7febd8c7 SHA256 e5028b91184b634d4abfd636c38831678cba3457d63140c895a0dea2de9e07c2
-MD5 16162b59e4f93f2308d2e81c3d573bf9 mesa-6.5-r3.ebuild 8897
-RMD160 8c5399a04fa262517ee2a9685394046e4369e3d4 mesa-6.5-r3.ebuild 8897
-SHA256 e5028b91184b634d4abfd636c38831678cba3457d63140c895a0dea2de9e07c2 mesa-6.5-r3.ebuild 8897
-MISC ChangeLog 17633 RMD160 2abfc549f59b8496dd956d2ac74114aa297b1a32 SHA1 cf4f3c2e54792d986fd8e8cd91a527d9e63f7cc4 SHA256 a9d5e77210c968713b82f26384906ba1e1d401ae3bb2c7566e69aa5996e27513
-MD5 c6bed270cef64a1986d55784b1c61ba4 ChangeLog 17633
-RMD160 2abfc549f59b8496dd956d2ac74114aa297b1a32 ChangeLog 17633
-SHA256 a9d5e77210c968713b82f26384906ba1e1d401ae3bb2c7566e69aa5996e27513 ChangeLog 17633
+EBUILD mesa-6.4.2-r2.ebuild 9388 RMD160 561e135874e110685d4e84279b21ff4ab0a558be SHA1 34acc5ca1042f22aad4db97364e396c9ff900a0f SHA256 f40dcee0af81925e6032ab518eac6cb5e20ebcd3aca1cd7853c7d4bd941c5a1a
+MD5 e65e0bfb3a05d808ff74ced93f49d6ea mesa-6.4.2-r2.ebuild 9388
+RMD160 561e135874e110685d4e84279b21ff4ab0a558be mesa-6.4.2-r2.ebuild 9388
+SHA256 f40dcee0af81925e6032ab518eac6cb5e20ebcd3aca1cd7853c7d4bd941c5a1a mesa-6.4.2-r2.ebuild 9388
+EBUILD mesa-6.5-r3.ebuild 9065 RMD160 629db0207b30df56b5035ab45e0d4ffa2a40abe1 SHA1 2d867ed90341562962febb03c0f643d35e2a1af4 SHA256 e82e3f7e11ddd9bd61cb36120dcf1aab27d2e555c9c16a963a43342f9e5d2475
+MD5 d903149f5f6687d2a4352444f0e303cd mesa-6.5-r3.ebuild 9065
+RMD160 629db0207b30df56b5035ab45e0d4ffa2a40abe1 mesa-6.5-r3.ebuild 9065
+SHA256 e82e3f7e11ddd9bd61cb36120dcf1aab27d2e555c9c16a963a43342f9e5d2475 mesa-6.5-r3.ebuild 9065
+MISC ChangeLog 17786 RMD160 b44816b675cfa584ecc6ebaa4bbd3ee764b06327 SHA1 7a776570774502ace5803cecf2724d06a1bb18a3 SHA256 56dd293f7365710f34a741cac507fe31af4e4506fa09ee332060bbe63a9ff6cb
+MD5 1298b2676225f5a295b3129480626817 ChangeLog 17786
+RMD160 b44816b675cfa584ecc6ebaa4bbd3ee764b06327 ChangeLog 17786
+SHA256 56dd293f7365710f34a741cac507fe31af4e4506fa09ee332060bbe63a9ff6cb ChangeLog 17786
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/media-libs/mesa/mesa-6.4.2-r2.ebuild b/media-libs/mesa/mesa-6.4.2-r2.ebuild
index f90bf8c03cf0..1594536b4cf0 100644
--- a/media-libs/mesa/mesa-6.4.2-r2.ebuild
+++ b/media-libs/mesa/mesa-6.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.7 2006/04/16 20:21:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.8 2006/06/30 06:16:05 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -31,6 +31,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_via"
 IUSE="${IUSE_VIDEO_CARDS}
 	debug
+	hardened
 	motif"
 
 RDEPEND="dev-libs/expat
@@ -190,6 +191,12 @@ src_unpack() {
 		echo "ASM_SOURCES =" >> ${HOSTCONF}
 	fi
 
+	if use hardened; then
+		einfo "Deactivating assembly code for hardened build"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+	fi
+
 	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
 	# build.
 	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
index c022cb04595c..baf721980887 100644
--- a/media-libs/mesa/mesa-6.5-r3.ebuild
+++ b/media-libs/mesa/mesa-6.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.2 2006/06/21 06:07:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.3 2006/06/30 06:16:05 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -31,6 +31,7 @@ IUSE_VIDEO_CARDS="
 	video_cards_via"
 IUSE="${IUSE_VIDEO_CARDS}
 	debug
+	hardened
 	motif
 	nptl"
 
@@ -181,6 +182,12 @@ src_unpack() {
 	# Set drivers to everything on which we ran add_drivers()
 	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
 
+	if use hardened; then
+		einfo "Deactivating assembly code for hardened build"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+	fi
+
 	if use sparc; then
 		einfo "Sparc assembly code is not working; deactivating"
 		echo "ASM_FLAGS =" >> ${HOSTCONF}