[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/

[Matt Turner]

commit:     8a3f7a2f99c04c6d43988d17b18f19c00cf1db0f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 19:51:19 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 19:51:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3f7a2f

media-libs/mesa: Update to use upstream glx-read-only-text flag.

Package-Manager: portage-2.2.20.1

 media-libs/mesa/mesa-9999.ebuild | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d166219..e7cf9a9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -191,10 +191,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # fix for hardened pax_kernel, bug 240956
-       [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-       eautoreconf
+       [[ ${PV} == 9999 ]] && eautoreconf
 }
 
 multilib_src_configure() {
@@ -268,11 +265,9 @@ multilib_src_configure() {
                fi
        fi
 
-       # x86 hardened pax_kernel needs glx-rts, bug 240956
+       # x86 hardened pax_kernel needs glx-read-only-text, bug 240956
        if use pax_kernel; then
-               myconf+="
-                       $(use_enable x86 glx-rts)
-               "
+               myconf+="$(use_enable x86 glx-read-only-text)"
        fi
 
        # on abi_x86_32 hardened we need to have asm disable