Import hardened kernel build fix from the x11 overlay by Emil Karlson, bug #471976.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

4 files changed, 13 insertions, 8 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 3cc5cafd4fee..66bff3c09865 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.331 2013/05/31 21:51:06 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.332 2013/06/03 16:08:10 chithanh Exp $
+
+  03 Jun 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  ati-drivers-13.4.ebuild, ati-drivers-13.6_beta.ebuild:
+  Import hardened kernel build fix from the x11 overlay by Emil Karlson, bug
+  #471976.
 
   31 May 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   ati-drivers-13.6_beta.ebuild:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 050ade2819b0..68c8a70943df 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -17,7 +17,7 @@ DIST amd-driver-installer-catalyst-13.1-linux-x86.x86_64.zip 114850263 SHA256 67
 DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
 EBUILD ati-drivers-13.1.ebuild 19758 SHA256 ddf468e9cf1cda7faf536b34b635c4619e37314064b081a941bbb6a37064396e SHA512 9cf16a5822e6695285c6ff747918ed16a87e03059fc91404ad8b157d9f9ed1d653adf6c47fe9cb13dd1f2dfa167464abb0ac670b89d39c23896b2ac6ef80fb82 WHIRLPOOL 03c7b4d8db05543a1cf6d21b20e7a81be0bb21e206a368108cc7f74f380aa22208ec3c6161ad6bfa96e57534f7a338e2a1ae0e1b85722e75fbbe16c4fec910be
 EBUILD ati-drivers-13.1_pre897.ebuild 19983 SHA256 dbf0a906eb785394f26d7ab29f7403372755aca22a95400884225aaa892395c5 SHA512 116397a7cb8bd80aca875c3997f09435b1b2973d89a5425c04b33201beb91be9a470e2955d6e5f43aec9981c8b16fdb83ecf8b4fafb46ee066a89e3218a0cfaf WHIRLPOOL ea176bc46f5beb41a1efdca3b3cf70f3a01ddc44d25137a5e782eb238164cf22dcac24499255dea8ba251ff7e6326d2e772c6fb4115cddf33eada12bfa140c19
-EBUILD ati-drivers-13.4.ebuild 20936 SHA256 584ad93af2bdd956d1c9e59e0dbbf49a3a6dad5b898b136483647de8b49edf86 SHA512 67f51e0e5e7628177cd8a8dbfc111f7aa04d239c2e1fab104fe123d0cd228dd50bdc016fe44a07236c1fda3fc2596bfab64687e6912b1cfc6a8328b672578518 WHIRLPOOL 8bc6cbab7ad807c22f90617d2f5dbd234bc4882566a3aa9c9645b6a1ac9aabe23118a95942f2e538d4c32fc3960c91425aef4fafdf119f24cc3a3f6d5f46ff06
-EBUILD ati-drivers-13.6_beta.ebuild 20944 SHA256 60fb69589e349729577758dcd44138f3ccf22da664d135c895e946ef0930c86a SHA512 95148f3cda57984d9b2d0d746b605e7e27a81988ed34f98622a578c0a8b2abcf75ce3d32dc6e898f7654dfc3dfdd9c0b2eefcdd8f9e64f4d1b80cea0d810db30 WHIRLPOOL db421c441ab0b7681c24568785a1ed84b4ea0e2f335cbe8e420178572f0bbb5059d38527d3cc03f1d1a49bdaa3f0383f9f322c9661f401a5173f3084418521c2
-MISC ChangeLog 87294 SHA256 90f4618e6859d5d519b35eb70c242beef1eaae3f135b16c29751d432b8731dae SHA512 acbb1940d9fb3f596846ca54b9d89774bd2ad0f74af296d6b7e1d71d9761f14a24a2d0df9b2ead78c342164958223e59d46778c27912528b9dd43ab932b43eb9 WHIRLPOOL f255a50fc7d164665d4ecc1b163cfd0d7106db118e17c3580f37464a40fa7f96c78479884c408e92336dfb8db8ac6645cccafb36a34eca933697891cbb811ac7
+EBUILD ati-drivers-13.4.ebuild 20940 SHA256 6efb339000b71d740cc3907363bf5e8f485ed80254e9dc88f645fd7f7d47ee67 SHA512 49a2ce413bd012d37edee3247e5c2db26d5f96e0ef2d9428a67ca7d665046a4bdc916b7c0b49ad8be67a824a3d63a4cfc1be3d2cde6ab48fc669124488682022 WHIRLPOOL f415723dd6bce33735ea8593e936d929b4de57c964c4d803c08b00f068ec2cee65bd96c8476355184906ec462cf209fa720d18a647e325a0f09de044bbd5a39e
+EBUILD ati-drivers-13.6_beta.ebuild 20948 SHA256 ca2ed2e7b00d9ef53b97ee68aacdda17d042c02e60b79c26391a5986b5007ba4 SHA512 c4c2ab7cb1193da311d5c2bf96e05622cf77160343209e59d5624455bfb8adc3ab95b4b65767b7b5b3d5c16a68d51ecd5d912aa0db49da239918587ad8517b55 WHIRLPOOL f1825904664229d9f046a1212f4e774fb5a0e3afab5b6ce03feacd88c6d77d27ba20a44f2796c1cfa9039470046b84e874b8f92310cdb44999b9b24137b46be4
+MISC ChangeLog 87509 SHA256 063e61030e2d6826bf948125456d2936d87619ffb8f0c401bccb87b92a0fd029 SHA512 2b58796822adcf1bde66028cfabf1f61de8f14142a671e619dcc9d55c99fbde69bc491e51cf33ddbe857d75343647b96b863461b597f2205f22064929bcee200 WHIRLPOOL 250ab32f898c80632f3bd967de582689d341a2e5ea98ddb162d4921ef6ab4556c9af0dc350c3f90661c1abe8569f1b6bf760f7d5a0c1610dd7710c6412cfbf3c
 MISC metadata.xml 731 SHA256 4eb1b53d7a0484614a57c7907c5f5411961bd8aae1d71fda50e21cf587f77b46 SHA512 89a2efca45077eed7151fc712b1e14be152559a33f186a0cb9dca7f678c45260be038e41a2e74a6bb5c780e0b37ea12d42a3a4889c29c92f312dc8be8711d54c WHIRLPOOL 24ef38f432b632e2957ad084e9e0ba5ab227ca52c612a108bc9d14c474922f1a979bda614ab984d94e8879c582b580bc25bee4cabefa21308529600bb5776e19
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
index c6d861e19bdb..70ed93c9bb58 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild,v 1.2 2013/05/20 17:41:02 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild,v 1.3 2013/06/03 16:08:10 chithanh Exp $
 
 EAPI=5
 
@@ -193,7 +193,7 @@ pkg_pretend() {
 		require_configured_kernel
 		_check_kernel_config
 
-		if [[ "${KV_EXTRA}" != -hardened ]] && use pax_kernel; then
+		if ! [[ "${KV_EXTRA}" =~ -hardened.* ]] && use pax_kernel; then
 			eerror "USE pax_kernel enabled for a non-hardened kernel."
 			eerror "If you know this kernel supports pax_kernel, open a bug at"
 			eerror "https://bugs.gentoo.org"
diff --git a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild
index a3988b2c1bb6..17fa82afc09c 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild,v 1.2 2013/05/31 21:51:06 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild,v 1.3 2013/06/03 16:08:10 chithanh Exp $
 
 EAPI=5
 
@@ -193,7 +193,7 @@ pkg_pretend() {
 		require_configured_kernel
 		_check_kernel_config
 
-		if [[ "${KV_EXTRA}" != -hardened ]] && use pax_kernel; then
+		if ! [[ "${KV_EXTRA}" =~ -hardened.* ]] && use pax_kernel; then
 			eerror "USE pax_kernel enabled for a non-hardened kernel."
 			eerror "If you know this kernel supports pax_kernel, open a bug at"
 			eerror "https://bugs.gentoo.org"