summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-01-01 12:36:54 +0000
committerMichał Górny <mgorny@gentoo.org>2015-01-01 12:36:54 +0000
commit48d1af8aa5be08439a9199b07778c41881d5d83f (patch)
tree32caaa52d634e32561fb567ebac60a285ceb482e /x11-drivers/ati-drivers
parentRestrict multilib ABIs to those actually supported. (diff)
downloadgentoo-2-48d1af8aa5be08439a9199b07778c41881d5d83f.tar.gz
gentoo-2-48d1af8aa5be08439a9199b07778c41881d5d83f.tar.bz2
gentoo-2-48d1af8aa5be08439a9199b07778c41881d5d83f.zip
Do not install xorg modules on non-native ABIs since this breaks new eselect-opengl, bug #532574.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'x11-drivers/ati-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog9
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-14.12-r1.ebuild (renamed from x11-drivers/ati-drivers/ati-drivers-14.12.ebuild)10
2 files changed, 14 insertions, 5 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 3c686aaa2a05..8818c6f979c6 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.368 2015/01/01 12:15:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.369 2015/01/01 12:36:54 mgorny Exp $
+
+*ati-drivers-14.12-r1 (01 Jan 2015)
+
+ 01 Jan 2015; Michał Górny <mgorny@gentoo.org> +ati-drivers-14.12-r1.ebuild,
+ -ati-drivers-14.12.ebuild:
+ Do not install xorg modules on non-native ABIs since this breaks new eselect-
+ opengl, bug #532574.
01 Jan 2015; Michał Górny <mgorny@gentoo.org> ati-drivers-14.12.ebuild,
ati-drivers-14.9-r1.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r1.ebuild
index 7bf8239b5d43..eb719025f819 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12.ebuild,v 1.2 2015/01/01 12:15:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.12-r1.ebuild,v 1.1 2015/01/01 12:36:54 mgorny Exp $
EAPI=5
@@ -494,9 +494,11 @@ src_install-libs() {
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so
- exeinto ${ATI_ROOT}/extensions
- doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
- mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+ if multilib_is_native_abi; then
+ exeinto ${ATI_ROOT}/extensions
+ doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so
+ mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so
+ fi
# other libs
exeinto /usr/$(get_libdir)