| 1 |
mgorny 15/01/01 15:51:23 |
| 2 |
|
| 3 |
Modified: eselect-opengl-1.3.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Warn about xorg.conf containing ModulePaths, bug #534128. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: eselect-opengl-1.3.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- eselect-opengl-1.3.1.ebuild 1 Jan 2015 12:39:44 -0000 1.3 |
| 23 |
+++ eselect-opengl-1.3.1.ebuild 1 Jan 2015 15:51:22 -0000 1.4 |
| 24 |
@@ -1,9 +1,11 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v 1.3 2015/01/01 12:39:44 mgorny Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v 1.4 2015/01/01 15:51:22 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
+inherit multilib |
| 33 |
+ |
| 34 |
DESCRIPTION="Utility to change the OpenGL interface being used" |
| 35 |
HOMEPAGE="http://www.gentoo.org/" |
| 36 |
|
| 37 |
@@ -32,6 +34,17 @@ |
| 38 |
|
| 39 |
S=${WORKDIR} |
| 40 |
|
| 41 |
+pkg_pretend() { |
| 42 |
+ if grep -q -s "ModulePath.*/usr/$(get_libdir)/xorg/modules" \ |
| 43 |
+ "${EROOT%/}"/etc/X11/xorg.conf |
| 44 |
+ then |
| 45 |
+ ewarn "Your /etc/X11/xorg.conf seems to set ModulePath to the standard Xorg" |
| 46 |
+ ewarn "module directory. This is going to break eselect-opengl-1.3*. If you" |
| 47 |
+ ewarn "need to add custom module paths, please move those definitions to" |
| 48 |
+ ewarn "/etc/X11/xorg.conf.d/99local.conf or a similar file." |
| 49 |
+ fi |
| 50 |
+} |
| 51 |
+ |
| 52 |
pkg_preinst() { |
| 53 |
# we may be moving the config file, so get it early |
| 54 |
OLD_IMPL=$(eselect opengl show) |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.133 app-admin/eselect-opengl/ChangeLog |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.133&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.133&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?r1=1.132&r2=1.133 |
| 63 |
|
| 64 |
Index: ChangeLog |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v |
| 67 |
retrieving revision 1.132 |
| 68 |
retrieving revision 1.133 |
| 69 |
diff -u -r1.132 -r1.133 |
| 70 |
--- ChangeLog 1 Jan 2015 12:39:44 -0000 1.132 |
| 71 |
+++ ChangeLog 1 Jan 2015 15:51:22 -0000 1.133 |
| 72 |
@@ -1,6 +1,9 @@ |
| 73 |
# ChangeLog for app-admin/eselect-opengl |
| 74 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 75 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.132 2015/01/01 12:39:44 mgorny Exp $ |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.133 2015/01/01 15:51:22 mgorny Exp $ |
| 77 |
+ |
| 78 |
+ 01 Jan 2015; Michał Górny <mgorny@g.o> eselect-opengl-1.3.1.ebuild: |
| 79 |
+ Warn about xorg.conf containing ModulePaths, bug #534128. |
| 80 |
|
| 81 |
01 Jan 2015; Michał Górny <mgorny@g.o> eselect-opengl-1.3.1.ebuild: |
| 82 |
Add a blocker on incompatible ati-drivers. |
Archives