Also disable ASM_API on USE=hardened (Kevin F. Quinn).

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 21 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 9cbe75419857..e77f93b582c5 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.96 2006/06/30 23:42:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.97 2006/07/02 18:45:39 spyderous Exp $
+
+  02 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.4.2-r2.ebuild,
+  mesa-6.5-r3.ebuild:
+  Also disable ASM_API on USE=hardened (Kevin F. Quinn).
 
   30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.5-r3.ebuild:
   ppc/sparc/mips/alpha/arm/sh stable
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 5bc999c710f7..817627a4ce64 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 9380 RMD160 2c64b86b038747b034eb49c3a31190ecce4ac8d0 SHA1 788b94023ef254e222327037a33f1c8034f8b7b8 SHA256 825e56a583f415e4a49266070dd0fd60cbaab04f7f4b9a477dc28089b1f654ca
-MD5 33b66f6f550ccbc2f686d848f12a10e8 mesa-6.4.2-r2.ebuild 9380
-RMD160 2c64b86b038747b034eb49c3a31190ecce4ac8d0 mesa-6.4.2-r2.ebuild 9380
-SHA256 825e56a583f415e4a49266070dd0fd60cbaab04f7f4b9a477dc28089b1f654ca mesa-6.4.2-r2.ebuild 9380
-EBUILD mesa-6.5-r3.ebuild 9058 RMD160 c6629fb240e4b1f313a3b93522741305d2ff73ea SHA1 f40365e4c1b3f69b3ba0b9b02ef2d4c1e78ce97d SHA256 096d286503244230737ffe2df2144765afe264426f8bc9f0317145f97eefdc1c
-MD5 512af68bb1697ee57b42de85b2b65b89 mesa-6.5-r3.ebuild 9058
-RMD160 c6629fb240e4b1f313a3b93522741305d2ff73ea mesa-6.5-r3.ebuild 9058
-SHA256 096d286503244230737ffe2df2144765afe264426f8bc9f0317145f97eefdc1c mesa-6.5-r3.ebuild 9058
-MISC ChangeLog 18380 RMD160 c2a20221300bf21dc99e77818d71304eb6d6f773 SHA1 5a1e741b1c11340f2d3dc4a2fb30b93010978d7b SHA256 a99b514887c0bf097ae57996464850c75ed6a459cca5e30ef782279794ec86cb
-MD5 27803fa9ee116611e7fbe0d2e7d41811 ChangeLog 18380
-RMD160 c2a20221300bf21dc99e77818d71304eb6d6f773 ChangeLog 18380
-SHA256 a99b514887c0bf097ae57996464850c75ed6a459cca5e30ef782279794ec86cb ChangeLog 18380
+EBUILD mesa-6.4.2-r2.ebuild 9414 RMD160 f2090f7c27dd36fbc567ff800f69a8b3feed15ff SHA1 64c494e6666575610b4b806738f24cac474c81c0 SHA256 7923ab744f04676a39931b91a7c75ff3eb3dc4b8f7b20a18828a8415295ee247
+MD5 83aa78d4c498ae660ff82f981c02e5e9 mesa-6.4.2-r2.ebuild 9414
+RMD160 f2090f7c27dd36fbc567ff800f69a8b3feed15ff mesa-6.4.2-r2.ebuild 9414
+SHA256 7923ab744f04676a39931b91a7c75ff3eb3dc4b8f7b20a18828a8415295ee247 mesa-6.4.2-r2.ebuild 9414
+EBUILD mesa-6.5-r3.ebuild 9092 RMD160 92c7f26b815e177fb64c1618d5d477501e75a9b5 SHA1 12f25f781effbafff4cc8aeca8757b790e96f797 SHA256 81452951adf65f964116f428a2f1d3e64ab28580d59a5b59b108a6e7b0dea903
+MD5 c0f443c228a725407c319cf0314950af mesa-6.5-r3.ebuild 9092
+RMD160 92c7f26b815e177fb64c1618d5d477501e75a9b5 mesa-6.5-r3.ebuild 9092
+SHA256 81452951adf65f964116f428a2f1d3e64ab28580d59a5b59b108a6e7b0dea903 mesa-6.5-r3.ebuild 9092
+MISC ChangeLog 18537 RMD160 3779d06d666595a20e5469dcc4d7ec4c3cf6c9b7 SHA1 42f199aa9c5f6a10113282fec2228d9d65051c7c SHA256 ceb714f1dc3e8956898baa20798c5b0bc7280ea247c31b88ffb96be4bbf510eb
+MD5 3bea8ce68a4f75512681674150fa094a ChangeLog 18537
+RMD160 3779d06d666595a20e5469dcc4d7ec4c3cf6c9b7 ChangeLog 18537
+SHA256 ceb714f1dc3e8956898baa20798c5b0bc7280ea247c31b88ffb96be4bbf510eb ChangeLog 18537
 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 1e9d019551df..bfa85041d639 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.12 2006/06/30 23:39:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r2.ebuild,v 1.13 2006/07/02 18:45:39 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -195,6 +195,7 @@ src_unpack() {
 		einfo "Deactivating assembly code for hardened build"
 		echo "ASM_FLAGS =" >> ${HOSTCONF}
 		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_API =" >> ${HOSTCONF}
 	fi
 
 	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
diff --git a/media-libs/mesa/mesa-6.5-r3.ebuild b/media-libs/mesa/mesa-6.5-r3.ebuild
index f0922660b44e..16e9a75b6d37 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.5 2006/06/30 23:42:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.6 2006/07/02 18:45:39 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic portability
 
@@ -186,6 +186,7 @@ src_unpack() {
 		einfo "Deactivating assembly code for hardened build"
 		echo "ASM_FLAGS =" >> ${HOSTCONF}
 		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_API =" >> ${HOSTCONF}
 	fi
 
 	if use sparc; then