x11-drivers/xf86-video-ati: only install ati.xinf and r128.xinf with older drivers (fixes collision bug #245769)

(Portage version: 2.2_rc23/cvs/Linux x86_64)
 (Unsigned Manifest commit)

1 files changed, 5 insertions, 7 deletions

diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index f8f78ae17094..fbcc278a0dec 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -7,10 +7,8 @@ AUX 6.8.0/0006-radeon-Fix-typo-flagged-by-gcc-Wall.patch 947 RMD160 2d05797b7a20
 AUX 6.8.0/0007-ATOM-properly-set-up-DDIA-output-on-RS6xx-boards.patch 2905 RMD160 a751f52c11aa55a12ed950c9aeb1bb384163f50e SHA1 116e70eaf5525cecab15870749c60955129b0f4a SHA256 647d3f9a46da62ac5dc24ff2edfe3122aa00359127dfee0134b8e7eec350177c
 AUX 6.8.0/0008-RS6xx-fix-DDC-on-DDIA-output-usually-HDMI-port.patch 2135 RMD160 4ac5fb71fa37f55dbb801d81d26633fc4df1fc48 SHA1 159faea1bf1e07507bb4b744274df2bd191feb84 SHA256 b4180842b91c78ad97d93ed16a9a2e42b3fb1837e1588c5a150b9997931079f1
 AUX 6.8.0/0134-Disable-the-setting-of-HARDWARE_CURSOR_BIT_ORDER_MSB.patch 1048 RMD160 fd2a80e1f3ad197097135471074960fa9d6671ac SHA1 2b59254e490c36e40c6fc997b1e318595712c490 SHA256 e1651882ceebfad2fb88d7d0e7dc09b7962acd3013a8d1e50db55af958e3ead7
-AUX ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SHA1 51dc48aba9d3e2613d230837d369ebcab86b4c5c SHA256 79540e91ab1baf462ded22a5ef0f3cff0d95bef22db4ec13ea7101dbff29aa74
 AUX old_hw_data/ati.xinf 2028 RMD160 0f57c7452bbf9d2d8d0a96f6f480b98e8a5c6d5f SHA1 51dc48aba9d3e2613d230837d369ebcab86b4c5c SHA256 79540e91ab1baf462ded22a5ef0f3cff0d95bef22db4ec13ea7101dbff29aa74
 AUX old_hw_data/r128.xinf 2491 RMD160 02f5ae030596643bdc2ce4982ee47fdbdf656f95 SHA1 cee72fd687711845f4fc435cac00b715fc19b1d3 SHA256 d8f50f12b291d526353aa5d76c95137dafbff22bf47cbb751b686252d104279b
-AUX r128.xinf 2491 RMD160 02f5ae030596643bdc2ce4982ee47fdbdf656f95 SHA1 cee72fd687711845f4fc435cac00b715fc19b1d3 SHA256 d8f50f12b291d526353aa5d76c95137dafbff22bf47cbb751b686252d104279b
 AUX radeon.xinf 12504 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c SHA1 1f4d98536d013d3ac6999781578d381bbd94023f SHA256 f23555826bfce07dfaafba60957e347e36fdb694c71bc3ad39d172e3863e7c96
 DIST xf86-video-ati-6.10.0.tar.bz2 823540 RMD160 d3ad3696a68deba52c3aa28c0fe925109108e41a SHA1 ebcd64be211bc9d8853da420efa85196c3ddf157 SHA256 dd92bfff4e10d79f98844a9c2962ee9bb8d0cfd863e1e764941749aabe6d4ebd
 DIST xf86-video-ati-6.6.3.tar.bz2 723083 RMD160 a1c24c13ea88fa38f34e3f0540b53082ab2ae129 SHA1 b911df1f4b41ad37028c708e2c95e5a729a32ede SHA256 d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
@@ -18,10 +16,10 @@ DIST xf86-video-ati-6.7.197.tar.bz2 750653 RMD160 8852b45803d3c6ef4e29e737507dbb
 DIST xf86-video-ati-6.8.0.tar.bz2 901737 RMD160 8414af2de5f21f4106a25631cfb8a4a206f5b0dd SHA1 b6974237b6ae9b45b32fc37f31a3fee7358230d3 SHA256 3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
 DIST xf86-video-ati-6.9.0.tar.bz2 777455 RMD160 7c990dc8c770865d6c8a45e4861207c1dda07a13 SHA1 558f94b76e1b4c3c4429ab1fdc3e3c8523e414dc SHA256 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
 EBUILD xf86-video-ati-6.10.0.ebuild 1163 RMD160 546be9d741c3a3589f6ed2795050a17960708dc0 SHA1 41ede603ede63f084ba9690ddf23b733d4aae085 SHA256 8286eb80f1430ec20cb4a72fc36eb15519b7cb2ce59b7f395be5ab56e59db79a
-EBUILD xf86-video-ati-6.6.3.ebuild 764 RMD160 839b3f3f19dd6e63ef13bb67e260435e73a3ea34 SHA1 3c57ec26d0d8f59b2ae9e09273ac7f4ab269ccee SHA256 1d3d18a28699744ce66c1e7adaea6a3e6098ed6ddbd13067e70c5f757a007218
-EBUILD xf86-video-ati-6.7.197.ebuild 780 RMD160 08db587ea55ae4cc95fbe32b9f60735a58445e4b SHA1 75c8f65e8d1c2c5861e41dc895936818568acc3d SHA256 96eb402e48e075a606988d5b3ac66077257b17ac13c9abc04c1e29ca53d02325
-EBUILD xf86-video-ati-6.8.0-r1.ebuild 1452 RMD160 7aad092df6142940be2ce27a7327e1467d863f68 SHA1 acf5eec2ada1ccd0a80a200aa113c7e0568c00af SHA256 594ab0f8b6a8cfa302e02e4dad59625a4ade9d8e784511620e8f5b1072b61859
-EBUILD xf86-video-ati-6.8.0.ebuild 1460 RMD160 de3f07e57e60186f9808d3af203590f58237554b SHA1 e94cf4776c6c96fc9ad41a4601e9828fdf79f645 SHA256 dd1b1cc649de9e511a989441eb2d2bb9359ab5811f05e796afc4500ab666b2f3
+EBUILD xf86-video-ati-6.6.3.ebuild 926 RMD160 13db248aef6608e671274d690cf805be95f4b44d SHA1 fb76d9522eabde0a3c20ebb9615b2cf180beffc4 SHA256 6d1c4cfff15021ffae0f854107dbabf21f6cf38a6065029c45220ccc6481976d
+EBUILD xf86-video-ati-6.7.197.ebuild 942 RMD160 e9db3890dc08e8fa235b5f3be6bbfd604d7e2d06 SHA1 4146524817c1c3aa1728797abfed3d920cc52237 SHA256 6982e3d8caf6ca53cbda63fca24e44745f83ab72aab31a0fec4b9c0755dcff21
+EBUILD xf86-video-ati-6.8.0-r1.ebuild 1616 RMD160 797a31bc5b6956fa2aa62241673c07944dcbe3dd SHA1 f713b5efb006b80dd45c95fa96c0cb0807ea5dfa SHA256 3981e84a6cc58b20923eed67bca0e3678efa02e27025caece91b23fa5d90c533
+EBUILD xf86-video-ati-6.8.0.ebuild 1621 RMD160 a184ddc8e1a8d03ffade5ccd7d324b8d1c5612fe SHA1 16b79ac43bc0860fc21ce1be246a08a083acd644 SHA256 5a3af38c698efbd4affc04fbc159e68c3bfeaf9289115300e88401360ea88a3c
 EBUILD xf86-video-ati-6.9.0.ebuild 1162 RMD160 5aa049e3c75be8d0359900dcb6096ba83c15cae2 SHA1 09b273f132e810d8daa4625354e6f896103bc5bc SHA256 0113c5d4a36db38fb4996e62d5a9a54884558ed93edcdb7568efcf3572b4e5eb
-MISC ChangeLog 13707 RMD160 3c48be5f3a871b532ed51b9f1ca47a3269152c66 SHA1 424a038fd3f1d14b828610c1c605161b689bedd4 SHA256 71c1acf2914dbe2ada1ab37338131a16e1ddf3384e573ece10885a5c55e61448
+MISC ChangeLog 14006 RMD160 89fdcf3cc5623977e999a7a07035290f12155bf0 SHA1 b77e03f72a5c977e5cdbcfc676b1ea7ea704f5f9 SHA256 d2dc5147a0cf9e7498695542a27915d5294daf037d9bb18389865a232ab87bd7
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055