summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-06-03 16:08:10 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-06-03 16:08:10 +0000
commitd5f59111421997e642ed43b61a005e815b355227 (patch)
tree32a3cfec8890187f2ce5fb62cd870ab79454f51a /x11-drivers
parentBump. (diff)
downloadgentoo-2-d5f59111421997e642ed43b61a005e815b355227.tar.gz
gentoo-2-d5f59111421997e642ed43b61a005e815b355227.tar.bz2
gentoo-2-d5f59111421997e642ed43b61a005e815b355227.zip
Import hardened kernel build fix from the x11 overlay by Emil Karlson, bug #471976.
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog7
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-13.4.ebuild4
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-13.6_beta.ebuild4
3 files changed, 10 insertions, 5 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/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"