Backport the non-native module removal to 14.9 to match Funtoo.

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

3 files changed, 29 insertions, 21 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 8818c6f979c6..6b1beb98115f 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # 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.369 2015/01/01 12:36:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.370 2015/01/01 18:29:56 mgorny Exp $
+
+*ati-drivers-14.9-r2 (01 Jan 2015)
+
+  01 Jan 2015; Michał Górny <mgorny@gentoo.org> +ati-drivers-14.9-r2.ebuild,
+  -ati-drivers-14.9-r1.ebuild:
+  Backport the non-native module removal to 14.9 to match Funtoo.
 
 *ati-drivers-14.12-r1 (01 Jan 2015)
 
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index cb707169871f..7c276e59855a 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -38,26 +38,26 @@ EBUILD ati-drivers-14.12-r1.ebuild 20066 SHA256 a7d1f618b471d16b790939768345c63e
 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-r2.ebuild 20054 SHA256 d9edd870543c6151415ec367df57b0c5d11a8ee5487da6e2fbe83d4a371402ea SHA512 f371541cb326ed183e3b21313c58228f250666451171dcf8f1e3410704d85e17ecaa03cdacf03cde4d67ca6046e9d811ead59bf0365d2ab7ce7a2056a8d9bf51 WHIRLPOOL 6e6bc41a39305d4046510acf865e722c724b0f041cb3bafc07c99507eb735a19927814d7609fb1e38cf15e4794a0d1f35e14e8011b0a39267ecc9ab5d96b4ec0
 EBUILD ati-drivers-14.9.ebuild 20281 SHA256 cc1c206a4384bf1d975e1a97df42021cd995c6ecf390c2f715c759659d9da95d SHA512 4476abba5a9778a9a0c3160e88d6c8327469ac2c056bc75c72e64ca89f9f6a8101094fefc6fa6a5815c1d4f2fd501b537cbef79bd74b807aa547f622bf39c8c5 WHIRLPOOL 49ef5eea86e06994137251d5c5ea99e133ac6d72de640e27209dc41aa45d66383261c3a0bb11a97dd89ac2d2bfb07b01be77dfa9aeacb7b46bab07315bc13ad8
-MISC ChangeLog 95027 SHA256 e14b6080cf2846a409c9e594005cdeded285c08991d87e855aeae8efc11f68ac SHA512 6a5b68ab1eaec96e8fd2f776cc3ed5fa806472e0164b348994a7dbae12d3e1299d374a3c1b735d227b7961d4e43e3bfc90d1ef564c60002e3f659067412a7038 WHIRLPOOL 115a68951aaabc133a0f60dc172678d2a01e6e91c3cecd3bf18cc5395b8258dc58ee03e50636967ceeba5cc6c76dd12dbef59f316228eae2d621594faf3d19fd
+MISC ChangeLog 95240 SHA256 1eddf36041b65df30d9b82ac518cdc20f0c4806b676be6343c2c2b154d8aabe5 SHA512 a46ec4c7148ed6fb22ceb1cc0fc244c99377047e83ef9bbf64fc02b5f75410d9f0b381e5a52d0c8b7d4c16005369d3ab5add2dc36bb2ce9ebe449bf305db80df WHIRLPOOL 5c4208dcd062e6892432c9907ff7d21ad441c977f9d18252c7c3839fd1e2a6c614035940b85d0742b13296ea157ca1a837997b394d456da0cf701c89ed2ce222
 MISC metadata.xml 775 SHA256 827539e024f84e38b06ca3ef03d2c1938a14f27f1556efc76bc747a006764c76 SHA512 87a8b404a33c29a63a685482026ffdfbb92556f1548a2940918569a3d0272d68d06496dbbbe414e4c8d42c5b9e51c32f55609fa9cf209a4e9ddb7d1613e34a79 WHIRLPOOL a69a2f49a3879d349947a399b306b084328daa025d95976e6223c2e2269b1e5f302a68f3e299733073aaf6b2743a2ef7f81bbe5f4016cf8897bc4226c9b3d477
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUpT9nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUpZInXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-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
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2z8QAJ0BD4/oznDkM1wgWkjaobBp
+sJSohF38/djaSd6jjgg4AJk00/R5lmZid9zfoyfxRNqH25sMXgJ/9ARaOpFJM+XM
+1LD0ugtc7mOgQpS9X+gR8H6KkWmq3ow/Vl4lKwmWqW0+qr07HAnrBNYhe6LWAquI
+CuYdcX/OanHqCvm5uyG1pylNvo1MCgusiR2y3jx9cgog3Ll/DIvWEsocgoIvftpn
+sLNFnIkxwAR9rlpNWAH0DPmEywO8dyKUoTf+/X201u3xxxzeL+EMP/khSML1ARN2
+5E21dpplEt5CFUzd/fDp+oyZMe65tKARnJCB473AlcLkQVMMH36B8rjom58MlqhU
+f1HY8vJm+F9MC1AnUO6Cn6wjgVuJd8BE7APg+/O7rzZlQwHWoz1xkXvd/8t8Qcy4
+81gHz+7xMiaKkG0ibGNMHVXte6luoksiq7nBVwT+Z7I7A+PX5xAPKeOTgBsd6KcY
+aHbX1agP6gqVwG8f94MFz6ypwU1patco3CHtV6uecyE4WXDferuhRibjh6kosdKu
+8QIPbhCYfTPs2zhRjpjFFrAouLaN6lig8pFtaXHvNC+8jPsXIzfoC3bJhIHusBZf
+1CWwpVOblkl42drUtHuLYv0vguUQEQHBl3HnG7j6n2bsLuzsf+ok7PzGvXl6xD07
+xs9ovByBA+0OoR1WpNi7
+=08P0
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild
index 3b101ccb4d40..0d2e33debd21 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r2.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.9-r1.ebuild,v 1.2 2015/01/01 12:15:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-14.9-r2.ebuild,v 1.1 2015/01/01 18:29:56 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)