Do not install xorg modules on non-native ABIs since this breaks new eselect-opengl, bug #532574.

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

3 files changed, 30 insertions, 21 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/Manifest b/x11-drivers/ati-drivers/Manifest
index 58cf4aaac573..cb707169871f 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -34,30 +34,30 @@ EBUILD ati-drivers-13.12.ebuild 20247 SHA256 253b3a23afc94c54bbd14b4a67cff2822fc
 EBUILD ati-drivers-13.1_pre897.ebuild 20021 SHA256 3dd2f798898fb28e1a7e9e5827bac02f9a113ae8de27924eada6bdb8419aa982 SHA512 5e2fb809e83fb35a170a1562d9b952d847e47f028b3423924bb761ea0e2f4184c10a34f51efc3dab0e581f33aa69ac7f353094fa1cf1cb44cf41860911d75db4 WHIRLPOOL 434a619b8ee8574c3082dabf342539e244ea5dfb4bddb513c76648d27a5f00314ee68b4244b4dbafc5a2609df1874f7c8ac54cc83993f4bf64a7923d77e4d5a4
 EBUILD ati-drivers-13.4.ebuild 20534 SHA256 c6b7fd243db98708e02ca9a7234b17b6c10be8da7eee4de75257c70836c1ff15 SHA512 6f1f4cc4bf0d13f3c9f69f1036c39286fdd335de114f03efa76c75c6988b273d0dd6b3293fd1bebfdca033c21b32b2d1bdf0a6ad273ab4fc33cf270882e9669f WHIRLPOOL 94a234a7abdc434fd7980cfd7e0ce27e2ba4d7fe5f9d51dec748d0f8966eb87d40d5295ea9e443af1b8d2e21fda809091b0e9ab79262968cac1538c3f85b0a33
 EBUILD ati-drivers-13.9.ebuild 19910 SHA256 2a566cbf5a61e2a1bfba73608aeb366bd28dec1064ae6c61aa6f22b2bd81c60d SHA512 f7720b9e79290136fdcacdd574a9bc4befa88e25cbbdbcb1f600230471f4848aa40e221877603168d5dd9877a4617ed2c45c04c8a85b96f9ff6e8dba8ab2ef6c WHIRLPOOL 8fb8811496b053297f7235cf78a3e44cde5d7ebeace56878d2e234ee79660881ed9678b501250d9e74ebfd8162dc0650476cf74f057779c24d57079a859517e9
-EBUILD ati-drivers-14.12.ebuild 20023 SHA256 4390ded4cfdd22a6a43f3478339d73eb83fd4c843badb1b8b09a349295a75d85 SHA512 a16e9241f961152dee2e17b7e8ac36e88be55cf6353c6a13cf3ceedfb7229beafe62409d2a5b44ee15d78e7b965e94105d765f8107a4078abe547f342ecc0700 WHIRLPOOL 5a305ad7940424c89570f11f09b34e43845f9a82aa2e346b462fc4d465d06dd0f89dd0626fada4f2d255121fa8fa789d89ee7bc076512d2e8f2100460f15380f
+EBUILD ati-drivers-14.12-r1.ebuild 20066 SHA256 a7d1f618b471d16b790939768345c63e08f07f5cece93af48c204cf1958ac256 SHA512 772b685a541215da7fce0155bdd17fe79db23cce8336dd47f7e98e8d058d9f3b9126c3ffebe9dba4244b4dfdd59723052d301e473b49ec0de9fae3db80f50218 WHIRLPOOL 2f4d1a90c498bfe77d0fac92e4038908de57c4fb437fcf512cc238de5e815ea7e893602d232559d5fa9bb5f7c6c8411f71e5bb144cfba329b02c40b82683e9d8
 EBUILD ati-drivers-14.4_p1.ebuild 20362 SHA256 8834adb4d90edac9b4c79f6b95f2e4ba508fa201c524663ea80041cb63eb4d62 SHA512 604697ba73ebb27f788b69273b36213cde78521f2d46c2967ee6ce68b4ec684e47fd2b3e23e25ad264e0adeb59a677a54f86dc633834e0fbe9b95207df973741 WHIRLPOOL 3213dc6b3e00073f4f8b4821c16cbecf5f690cade7d6176ca6d12488113d01674853ffa8512500b98079da649f3efe4f32206fefaabf54cb94abe1ca3cdde0ea
 EBUILD ati-drivers-14.6_beta1.ebuild 20342 SHA256 15938003337f78211469aebcbf6f0822dc0cfb39296ad5c411eed365f7a2f6e1 SHA512 7aa1b2af43fa67fd9f52e4e889adfc374182d2be07650a326f960b480e708638bdd523b008671be02d7d436728ebaf609aec0200598de29a042b407b780eb1a0 WHIRLPOOL 79fc8c92bbc4da8b9159add6d77765b2bbb7508ec9bafecca5d4660914a3b71ce4a27d27e5216cecda8ea967099f4e187bac01dd8376b7bb72e5dd53e960af19
 EBUILD ati-drivers-14.6_beta2.ebuild 20295 SHA256 cfe2d28104690a1756e5071eb4723ccc43ce9da0a6a794cf20ecfab63030995d SHA512 7b424047acd59b0161c19fabe210dde11f8a19104d1db0bf52fda21dab4f6db1e5455a45ec5b4b8e6b8071649b7ad90cc050d06cc7fe139a92cd3939b5b5177a WHIRLPOOL 7a5208f68f0f2eb35e14d89f8389a334a19544e17a54379dc9575efe869189ab82d51383cfbad97e40db22949c5bd5979ac0cb7a8f733916eb0742deeee67df3
 EBUILD ati-drivers-14.9-r1.ebuild 20014 SHA256 680fadf021b2423cca2c2f542e5e6cdbcc644471fc987c8e44e2b7bc4a723c58 SHA512 0963aab36c7fa625d712a6f32d7014d2a94bf5f41fc27fae31347b4faab8aa8c6e9f0f575214980ed7170dcc5e8c1d405712340ae5b66857377e99fa721a00a1 WHIRLPOOL fd5cef000ed3bdc794650317a9e37a901253776b0a0df4465ded288aedd286da9affc6e01c377d103f6132bc8b4ee5f49cec1b9fcbaabb3812238a14c04aebc6
 EBUILD ati-drivers-14.9.ebuild 20281 SHA256 cc1c206a4384bf1d975e1a97df42021cd995c6ecf390c2f715c759659d9da95d SHA512 4476abba5a9778a9a0c3160e88d6c8327469ac2c056bc75c72e64ca89f9f6a8101094fefc6fa6a5815c1d4f2fd501b537cbef79bd74b807aa547f622bf39c8c5 WHIRLPOOL 49ef5eea86e06994137251d5c5ea99e133ac6d72de640e27209dc41aa45d66383261c3a0bb11a97dd89ac2d2bfb07b01be77dfa9aeacb7b46bab07315bc13ad8
-MISC ChangeLog 94777 SHA256 506172888ccbe2704ad9f178800eb780e967292fbc25dbc97d97abe17b32b968 SHA512 1340213ed312def00aa43c821c4bb37e6a9d080146d4baeb78047874df9bddf1bef45cf0ca3bf4a2947cc640a5c58476ace392b7a55b5fc6384504c2cd8c97c1 WHIRLPOOL b3f041c56921f13ecf4f7bc0c3bfdc922ce71cc2e09cfe3c76236565b7b3edff9482dd91dff76916465cbb1fc6850eae883c62d382a4cf6a3c6b7186a401e4c1
+MISC ChangeLog 95027 SHA256 e14b6080cf2846a409c9e594005cdeded285c08991d87e855aeae8efc11f68ac SHA512 6a5b68ab1eaec96e8fd2f776cc3ed5fa806472e0164b348994a7dbae12d3e1299d374a3c1b735d227b7961d4e43e3bfc90d1ef564c60002e3f659067412a7038 WHIRLPOOL 115a68951aaabc133a0f60dc172678d2a01e6e91c3cecd3bf18cc5395b8258dc58ee03e50636967ceeba5cc6c76dd12dbef59f316228eae2d621594faf3d19fd
 MISC metadata.xml 775 SHA256 827539e024f84e38b06ca3ef03d2c1938a14f27f1556efc76bc747a006764c76 SHA512 87a8b404a33c29a63a685482026ffdfbb92556f1548a2940918569a3d0272d68d06496dbbbe414e4c8d42c5b9e51c32f55609fa9cf209a4e9ddb7d1613e34a79 WHIRLPOOL a69a2f49a3879d349947a399b306b084328daa025d95976e6223c2e2269b1e5f302a68f3e299733073aaf6b2743a2ef7f81bbe5f4016cf8897bc4226c9b3d477
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUpTp9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUpT9nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOFGkP/1iNF4G0Un0Z6M5OmtId+55c
-KKR3FrgiTA8xvJ0NEHzFklNrMOrY9zCvn4OXpO4wFExel1uggekPUTNQ/tGWb7cH
-pfs3Y2jeWjQ2L3AhEA6beMZ/JOWg0ySzc1ACXZ0xcDIjq9TzmENK9YCX9ppBTbh5
-idHShQjitYYOjEZuviDYjjfybNURTGCa1d5YGh9Z6RcbubTz+FGVohaLd6ll5T/4
-keqoimTqtiPqufQmUQ41OBifSBgjDudFExJcJmTRvDxb+rcJC8oj0oYgPwge3pX6
-/5jPG9XS5s9UN0Nz8inBKoCuxnxuM3iaRwXxjiZ7VIoMyYMpYlym+jJa0HUeFcqX
-8rEFSKaypLPEQdsflOFxprE+LR3X+PY1rRnAICiZrHJUKuEZYB4tMPjcUUBYBWjh
-DY5PsCLIyetkzbAd860DzGyw6++qofnNVV4hwGvegsm/yvT/TtBkRIF3O+Zkqszu
-7h/x2AZqQutNME3N5wn0n3Pv9Hn0kprg9Dbn0bHlCgQ93NYmau4W0ZoeQT7Ed3EO
-kLwmehciExgECAnwW/dQhaRtqUYQxR4QIja0zU377QBriGR9hKXOzy41rQhOnu6b
-L0bbRBcmQLefM0txASk3OGXqT/7WIhGT1leHh4ZeWPtoaEq+/n8s6biFxUjRljbV
-Vi4rBGxRCU4/8FKhX9/5
-=695T
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO6ZMQAMZMMchFPs//AuuLnfu9E9/h
+0j8hOK0NnmQXiT5ygxET1PuG5yXOh0brjFKNl7ON339BNxruQN4FXS/BotZ/Eipe
+URb27GLEt5r0vVhJWbFuk2Mbcbqi6dsooOjlxa+OqlnKnDBG7JisfMldaJes97gv
+HKj7+HxSI9zY1vChKps7qPkOEzLymSD4gGHvk9pojidj7/4K3th6l0YupIqy/ZGK
+w7IBB630r2VBiAnW7smaSG+Y7J8eVIYNFcGPGIhf3MRHEwtONnxmsLA4AceO6QVG
+zSshyqn9KOv13VhjsLw+VVuDRDx6EHss2ZrVZzW5k1AxNaKlUx1m3WocCGLgkIfa
+le8yC/+N0Nd6PYL6NaW/0A9X2PYdRDCG6p6EnDDqWkSIVMwaSaZ1KiRlE77bg1VI
+P1wzB58wg11eQVENYEZvhsV66cC71GYZUa/MFGWikyAlxiWSTR1FiIE+9DR26rNc
+OVYeVX3Cf7pZhRCj2W7h+AnZe+vW2aFREmVpAkLjMppPJDWC2SkaYCWRnHhWtQPS
+jigb49x0AcQejlgHCUCiPm788Jo5RoPS+PKj61KPqMdKBL8t9ZQM2GpykrrfdBJA
+BTahSKHBpSyhKGtpuyuYuW6MjHhRRs6x6LdokDJLy20nHi66d3MS32+4o6yW7PCu
+IDJlKmMeY7QLV/KzfGqi
+=sVCx
 -----END PGP SIGNATURE-----
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)