Warn about xorg.conf containing ModulePaths, bug #534128.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 34 insertions, 18 deletions

diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 634aafa1cafa..3b34e3a42f1e 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -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 <mgorny@gentoo.org> eselect-opengl-1.3.1.ebuild:
+  Warn about xorg.conf containing ModulePaths, bug #534128.
 
   01 Jan 2015; Michał Górny <mgorny@gentoo.org> eselect-opengl-1.3.1.ebuild:
   Add a blocker on incompatible ati-drivers.
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index 49495fc2dba8..75fc67b18918 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -6,25 +6,25 @@ DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533
 EBUILD eselect-opengl-1.2.7.ebuild 1741 SHA256 abf94132d991a53adac42284456b8225dc69a5da639bfb80aa2b846cb7a17eff SHA512 1c52b5c51559d75bf666cb50f01678c4adceeed7f75b63a4849928164b85956393bda4b0a86066fbd801ca3c99f1d5c0247eaf5ef9752922fa6a9f5e71e2969c WHIRLPOOL 3549df8d269f81a2fa926a75038e6139297f45a7426f08f7632c10c6e5517a1422c135625244273a00aea7d213b9dc248c22a6be692392a7d6fbade1298caffa
-EBUILD eselect-opengl-1.3.1.ebuild 1759 SHA256 9acb84e47371c2bf883f8b7b06ee0b0d9631eca9be1b1604c8725c8abb13d3f6 SHA512 462b783682ecf4703e065b23d9e1d84e279d37122df58cc83543a12d1ac8676578fd6b7a24789e0459b4b492e6bbb6d81e59b586ffe333e416369c08b4a9ba39 WHIRLPOOL dc115aa0c517af243bb524ed81d0f5e9c467b2651a93069681f3eb819be18cf4fd547213f3eafba44c105012aa796f1fa5ec5f3daeb3b5b72289e6f19882f76a
-MISC ChangeLog 19478 SHA256 ee524651b9c339fd47a9a36fbe22653d1dc4aad06a55b2f3fba8e05c3d371d0d SHA512 e5d740b341ab8341530028fd070686e7fb7fe02eac85e6b8029c8ab9336f393dafe879ac3b095c426afc5800ca95dd057758508ab4155105eb861ef7f0a5f5ce WHIRLPOOL c21d2cd1e660878d9248036ec7bec441f9c3eacc4b7b59d4539bac4883006c56047d08de676aee50719107d61aa94db896fb81f3826c7fb7a89c217ee042360a
+EBUILD eselect-opengl-1.3.1.ebuild 2199 SHA256 156749293a80702d3c99e14284857f5c5ba1dd6fde4f4a1c9475e4667c6b5d23 SHA512 ca2dfa00815239d512b098227f836ad8c74f935bbeb1ecf732e88f3e3c3a33e3292bc0a22bc68cab3e3711e79c70a7c93a4e102ecd363375833a7f5d02b38d8f WHIRLPOOL ba910a8c7ed468d2f2b01d45291acf87abf95b31ec4f3d7251d758355e2b749f589c380a8db3b078d5c03d58a6b3af1ee5e49d0691005edbaeffe85c09abda36
+MISC ChangeLog 19618 SHA256 4be04073d871cf7a67e4ca1e1badc6a8c7613f32c19b9b5c126d60750bdf1184 SHA512 871036ac32009121ad39d8660e87f3d476037f3f20f85ba349f94f2a07458ea187747a6a0338df00792ad4046fa0c479e936e357b45c6d5042a1391c5b118f06 WHIRLPOOL 6fb9446f791616a06420897d23c617a723dfa8868a4b13e693cde34d048d75854a3cf52ca6ccb1344f32534a2fd4c131ec9d3f6971903715c52f736f420833b1
 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUpUARXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUpWz8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtBwP/0R+e6UJ+Yu+rtR0O7ct3pFW
-R0Q+/54L1psKdjqSbRKJCBQmVEB7zmq7SE9KaWpBBp5nFJYGaJmPtEs7b50bkXxk
-ejAdhCUixbZ8v3qG1b66190Lto/TeKiqqvvR00LhRV9q8kAssdGNxfjhna/EUy0A
-LEtz69kwWiT/W31C+yYI0nJQusDk13Tvwmvwmkelq58uOKSLFjKwidxIB3w3obN0
-VySDoBb1eq7x1W3FZVnhllB2mG0BsDfKCytWzLiDc7bbjkxvbWuZ7KpZOLiegOS+
-A6rW/DL7S+KTDta+P8fLsDk6JXcJV1bKKgUm5kQF0lFFSn0utK86UkEqRl07vyMZ
-Np9eIlVGAlK+gECVSyREtneoZ+0XckQFK0J4T9MoIgpDbmqiGhLr9x+/7/Hdzgj6
-zoulQ/Kl3f9WRat97PCWC+gEDbduuLMWpRkfF4M5Z/pd8JtLgPFxxbNKsH3HXY6Z
-GUvr4d2EPE9T/fxjL8jg3uwy6lhIwN7vUlnqzX6WH9OAemRdeFYBGVeMmFB3v4zp
-ikplwnL4ipwtvc3XKln3jlLZP4rqtLiCYnp/7j8y6ErsTKoC+EWq9fn4VPuyMwuV
-nyqpQtiQ5q+J6YNvnnNaZxmMTpWwE2OulLRpPNSbkAI7zilx9Ys4LEKP09i+211l
-Ac/A2+VRXSNQhRxE8GMZ
-=KQaS
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOu7gP+wXh8XE6mqfvStaqGhnZEVzw
+BcuF3WuPPmsb/iy5n8qNFQCl3h2LBZyOwtmxifIugTuHYshtn5WDhqKwcvtnUluH
+gCIxjmOHkVcjF7diopRCAkoa6zkPSRfHswExkUVJPmFy2Nlr/2cNfgujd2TEdEID
+qB5HdJOfBpODVmpUze/uaO9V6rmjfkXDAJvcx7fl9UpvYbru0UeFiKiaxN5hH8JY
+GJyFvy8siI0/51kGutEto5FtkextXlfD3HZaiHlL/8ajp7BeVdA+eVbna5GbjzD7
+4DGvbujtyI4t+LM/zZAEozhkn8NeMJkYTj6/dI6wZdFGtjzYnxPsmaDeoLr6hu3C
+osxb14Lm8iu538L4e979gGU8ulC+7P2PM5RFTqvYfHsFatLfCpHH5igqOrUKScDi
+5w/eph1wWQdc2uPeorzRP/IfkAaDO/sHLjaSlcixcSqTUDGxgYAATSUjdKasTk5D
+GDqHtbSuwf7lLYDOQjDRJh06gZh/hSCE+4SBRIkWe4yA1C46wGiqqyX7TSOpiLhM
+4xl3YBdvE6JdL1NwfOlQHg1O4IBCou6qvSFtogsf6QMqXBjYz+MN27v7S0+0m0P6
+75zbuj0oiVadGKOmtuL/9vjuTBLg9x2ZgyZcnvQWyOxbhWwJY2WRj8ljFmHqVdtN
+opG4oJte+k6I1HLxQBBi
+=hvED
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
index b1e484305b58..542370f6f2b5 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.3.1.ebuild
@@ -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 @@ RDEPEND=">=app-admin/eselect-1.2.4
 
 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)