mgorny 15/01/01 15:51:23 Modified: eselect-opengl-1.3.1.ebuild ChangeLog Log: Warn about xorg.conf containing ModulePaths, bug #534128. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.4 app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild?rev=1.4&view=markup 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 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 Index: eselect-opengl-1.3.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eselect-opengl-1.3.1.ebuild 1 Jan 2015 12:39:44 -0000 1.3 +++ eselect-opengl-1.3.1.ebuild 1 Jan 2015 15:51:22 -0000 1.4 @@ -1,9 +1,11 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=5 +inherit multilib + DESCRIPTION="Utility to change the OpenGL interface being used" HOMEPAGE="http://www.gentoo.org/"; @@ -32,6 +34,17 @@ S=${WORKDIR} +pkg_pretend() { + if grep -q -s "ModulePath.*/usr/$(get_libdir)/xorg/modules" \ + "${EROOT%/}"/etc/X11/xorg.conf + then + ewarn "Your /etc/X11/xorg.conf seems to set ModulePath to the standard Xorg" + ewarn "module directory. This is going to break eselect-opengl-1.3*. If you" + ewarn "need to add custom module paths, please move those definitions to" + ewarn "/etc/X11/xorg.conf.d/99local.conf or a similar file." + fi +} + pkg_preinst() { # we may be moving the config file, so get it early OLD_IMPL=$(eselect opengl show) 1.133 app-admin/eselect-opengl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.133&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?rev=1.133&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/eselect-opengl/ChangeLog?r1=1.132&r2=1.133 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- ChangeLog 1 Jan 2015 12:39:44 -0000 1.132 +++ ChangeLog 1 Jan 2015 15:51:22 -0000 1.133 @@ -1,6 +1,9 @@ # ChangeLog for app-admin/eselect-opengl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.132 2015/01/01 12:39:44 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.133 2015/01/01 15:51:22 mgorny Exp $ + + 01 Jan 2015; Michał Górny <[email protected]> eselect-opengl-1.3.1.ebuild: + Warn about xorg.conf containing ModulePaths, bug #534128. 01 Jan 2015; Michał Górny <[email protected]> eselect-opengl-1.3.1.ebuild: Add a blocker on incompatible ati-drivers.
