Clean up.

(Portage version: 2.1.2_pre2)
 (Unsigned Manifest commit)

8 files changed, 4 insertions, 503 deletions

diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index f04f2868fabc..607ce1b6222b 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -10,64 +10,36 @@ AUX radeon.xinf 12504 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c SHA1 1f4d9
 MD5 c6d461a6bc57ca3b478e57e2981b22be files/radeon.xinf 12504
 RMD160 48b32c2d4acc1edff0e814a173ecce1b6026ba7c files/radeon.xinf 12504
 SHA256 f23555826bfce07dfaafba60957e347e36fdb694c71bc3ad39d172e3863e7c96 files/radeon.xinf 12504
-AUX xf86-video-ati-6.5.7.3-hangup-ppc.patch 12572 RMD160 1a87228c3b9be623b7af32c394fce68b4636f28b SHA1 d7cafdec8b1119afde30a2ec4eea101491581db5 SHA256 780b2551ded8b2ea780bc83dcff9b8bd9330f7417bf1c4b98fefe1d5839e68e0
-MD5 f2eaf0713b34e9ca2bd0abdce756d50e files/xf86-video-ati-6.5.7.3-hangup-ppc.patch 12572
-RMD160 1a87228c3b9be623b7af32c394fce68b4636f28b files/xf86-video-ati-6.5.7.3-hangup-ppc.patch 12572
-SHA256 780b2551ded8b2ea780bc83dcff9b8bd9330f7417bf1c4b98fefe1d5839e68e0 files/xf86-video-ati-6.5.7.3-hangup-ppc.patch 12572
 DIST x11-driver-patches-1.tar.bz2 389 RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d SHA1 6e2ac0cd255d3c4dc97d35092fe3ef64a71d7ac5 SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e
-DIST xf86-video-ati-6.5.7.3.tar.bz2 700284 RMD160 e1b69448989cca8a958fc4ce0da8a55aea2677fd SHA1 4b0f2fefb322aba849280d6962f454e1e25764b9 SHA256 f424a7ab8129a8898fb7916e73bb3232d3e9d92a7259696eb178364b44895f72
 DIST xf86-video-ati-6.5.8.0.tar.bz2 683625 RMD160 f774fc0a4e49481278ab220d454cf7bd8fad85cb SHA1 d0f7c9e7447e0219ea8616bb65a9e23d9ce5eb7c SHA256 564efc8f8e9b46bb0f8ae49d91d2a51a572f0294e571cc9d91dc6ed253ba119d
-DIST xf86-video-ati-6.6.0.tar.bz2 723687 RMD160 ac58673f76c6693f35cb515731c2d7250b8c88b8 SHA1 f6b4eda4e4ee542afd16c2be33e651a91519b0cb SHA256 23027b52d5b82c47201ac7471c545162149a6c6d38ec9c090469f6698e83eb21
 DIST xf86-video-ati-6.6.1.tar.bz2 675870 RMD160 3b8a872261bbd85f85ffa1132a25dbc1efb00d65 SHA1 ebf4bc27313a87a6ea5c91c4c0777de9a6e04b80 SHA256 2bed11d2e49e9eff5d999e4c74b35906692e002ceca68887e4a5fbccac278f53
-DIST xf86-video-ati-6.6.2.tar.bz2 722892 RMD160 064ef873c17e9947dc2dbf6cb795d090f31e0063 SHA1 ecb8d83c8bbc1507b7d38b0f110f5264099473b1 SHA256 e069e61b45a81d42bfc0b067345e45d02e712ee385d77b222a4839a6b800aa50
 DIST xf86-video-ati-6.6.3.tar.bz2 723083 RMD160 a1c24c13ea88fa38f34e3f0540b53082ab2ae129 SHA1 b911df1f4b41ad37028c708e2c95e5a729a32ede SHA256 d08a429e1fb1620ae81839181a4dc6cd579d52fc440d44d7bba36d19be355780
-EBUILD xf86-video-ati-6.5.7.3.ebuild 929 RMD160 e6d064153e21f7a3c60375befca244eb4651e387 SHA1 9d5f447a73868cf1bca0480644a78660ffed6849 SHA256 474838bf62deb9235fe1e8c4baa61845ad9598a94166dc3327472cdb2b59f058
-MD5 4cd26d38921b392baf0230990d7df5dc xf86-video-ati-6.5.7.3.ebuild 929
-RMD160 e6d064153e21f7a3c60375befca244eb4651e387 xf86-video-ati-6.5.7.3.ebuild 929
-SHA256 474838bf62deb9235fe1e8c4baa61845ad9598a94166dc3327472cdb2b59f058 xf86-video-ati-6.5.7.3.ebuild 929
 EBUILD xf86-video-ati-6.5.8.0.ebuild 881 RMD160 bb366761ec6d587ba14af4e51d02c1122d038027 SHA1 d6539e07ef62cfe9a4957c330116154b97df24a2 SHA256 5d87a308b03dfe47404d7c151625dbc5d63f2ef9886d51704aac2460c5e3e1eb
 MD5 f38d08aca37eb3c9400b8c0cf91ce151 xf86-video-ati-6.5.8.0.ebuild 881
 RMD160 bb366761ec6d587ba14af4e51d02c1122d038027 xf86-video-ati-6.5.8.0.ebuild 881
 SHA256 5d87a308b03dfe47404d7c151625dbc5d63f2ef9886d51704aac2460c5e3e1eb xf86-video-ati-6.5.8.0.ebuild 881
-EBUILD xf86-video-ati-6.6.0.ebuild 892 RMD160 953f5b6baaed0338771f65ec4b0e0dfbec62b63d SHA1 a0751a3efc3f1aacd64228df322dfe3334e2173e SHA256 2eba986a17aadb36b83e207cfe8bae4a0b4d31b7733a2ed31d70dff6e00aac6a
-MD5 c665442a8b757035f71cd37c1c7c2724 xf86-video-ati-6.6.0.ebuild 892
-RMD160 953f5b6baaed0338771f65ec4b0e0dfbec62b63d xf86-video-ati-6.6.0.ebuild 892
-SHA256 2eba986a17aadb36b83e207cfe8bae4a0b4d31b7733a2ed31d70dff6e00aac6a xf86-video-ati-6.6.0.ebuild 892
 EBUILD xf86-video-ati-6.6.1.ebuild 884 RMD160 5d4a006e7cb0ca6a2160d45f7272f8cb4099f3d2 SHA1 2a179f4206f0987aa79409b7d88d3d255f3696d4 SHA256 652413fa82641bb7c0e50a7c851031936f138b351b573778a1c3d8d08a24d64f
 MD5 6e4c0e2d560f8dd1ac9454be175c568f xf86-video-ati-6.6.1.ebuild 884
 RMD160 5d4a006e7cb0ca6a2160d45f7272f8cb4099f3d2 xf86-video-ati-6.6.1.ebuild 884
 SHA256 652413fa82641bb7c0e50a7c851031936f138b351b573778a1c3d8d08a24d64f xf86-video-ati-6.6.1.ebuild 884
-EBUILD xf86-video-ati-6.6.2.ebuild 896 RMD160 6d2d38ea6ba7409e19419dcb3244745e86a89389 SHA1 5aa6b16d2928018da64f3828fe62a63dea5a1cf9 SHA256 d0f0913d6475dcbc44055b36900962008f1ae928b828cdbcc335c26c9bd167b4
-MD5 1db964bd6da2954fa4730ed3e61256d8 xf86-video-ati-6.6.2.ebuild 896
-RMD160 6d2d38ea6ba7409e19419dcb3244745e86a89389 xf86-video-ati-6.6.2.ebuild 896
-SHA256 d0f0913d6475dcbc44055b36900962008f1ae928b828cdbcc335c26c9bd167b4 xf86-video-ati-6.6.2.ebuild 896
 EBUILD xf86-video-ati-6.6.3.ebuild 892 RMD160 3467a4a976f389dfb1fa30badb2a8367fdb81ae1 SHA1 0b72f3edc1b9a345d82eeda34a509ec971c22e56 SHA256 0a6ec712f33df207668bc7121f763bbd2e858825f11928d2b9f805545ce7ae77
 MD5 1d012bafad2c3a0327246fafa98b0459 xf86-video-ati-6.6.3.ebuild 892
 RMD160 3467a4a976f389dfb1fa30badb2a8367fdb81ae1 xf86-video-ati-6.6.3.ebuild 892
 SHA256 0a6ec712f33df207668bc7121f763bbd2e858825f11928d2b9f805545ce7ae77 xf86-video-ati-6.6.3.ebuild 892
-MISC ChangeLog 5616 RMD160 5e7df4c80bea6a6fed3b96d5df8fdb11ee5dc645 SHA1 9378c263d99a15469ef20571874813884b205a95 SHA256 c439c885bd6b4b4bec9fbf5a0013e44200495963ffecf8a98cf5fe46d51e26d3
-MD5 19c53cbce210f784ac3cb0967c565f6a ChangeLog 5616
-RMD160 5e7df4c80bea6a6fed3b96d5df8fdb11ee5dc645 ChangeLog 5616
-SHA256 c439c885bd6b4b4bec9fbf5a0013e44200495963ffecf8a98cf5fe46d51e26d3 ChangeLog 5616
+MISC ChangeLog 5830 RMD160 994398e5b96d17d5ff7330f30275139ea407e9fe SHA1 2891daa42c2f82d4ff762aeabdd9224f47e5cba8 SHA256 57fde9200212a5456c84f9d1a70601f607dfb5597ff12492995c829a84407549
+MD5 bce365ac10524e7d4f4530cfb32c8d8c ChangeLog 5830
+RMD160 994398e5b96d17d5ff7330f30275139ea407e9fe ChangeLog 5830
+SHA256 57fde9200212a5456c84f9d1a70601f607dfb5597ff12492995c829a84407549 ChangeLog 5830
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 a3756f2cde2a844ddf1fcd3ce37881b2 files/digest-xf86-video-ati-6.5.7.3 527
-RMD160 afbd297818f213f2e871ff314af265ddd53a703e files/digest-xf86-video-ati-6.5.7.3 527
-SHA256 9f025ca8599f4c508fcaaa8e54373d9ef0dc1d033d177a48b9ad615240718986 files/digest-xf86-video-ati-6.5.7.3 527
 MD5 9faed29310a3324108fa498f86106e45 files/digest-xf86-video-ati-6.5.8.0 527
 RMD160 605aa390d1786b15c389363cb54129756718fb06 files/digest-xf86-video-ati-6.5.8.0 527
 SHA256 5ab2e6e336a7534869abb3d01bc5d02583a4391f447835b9cacf8a488b5e35a3 files/digest-xf86-video-ati-6.5.8.0 527
-MD5 9fe6428e15bc57a8c214106d89faf3b2 files/digest-xf86-video-ati-6.6.0 521
-RMD160 7cffbddf1bddbe5b4aad06400497e3168bbd3e1e files/digest-xf86-video-ati-6.6.0 521
-SHA256 2fbb6985c2ce484bf327f8734882a6e0e47524ef219617eea9c5793cf22957a8 files/digest-xf86-video-ati-6.6.0 521
 MD5 033f99355337e422bf3de08a2712a0ea files/digest-xf86-video-ati-6.6.1 521
 RMD160 daa896a9721c996182ee78799d83e5633aacee5b files/digest-xf86-video-ati-6.6.1 521
 SHA256 014d984f30bd1bba438837bb7ed7263e23791f883d417c56240979abff0c1b0b files/digest-xf86-video-ati-6.6.1 521
-MD5 08cab63f97fab6836cbc49e5d0fce4aa files/digest-xf86-video-ati-6.6.2 521
-RMD160 9f108d5bb37ca95c4657c33b5e5f796c442b11a9 files/digest-xf86-video-ati-6.6.2 521
-SHA256 20bb7187e2b0f0680d7695ea84229f060d9628fcf1ab4abb21cc1d0de851e005 files/digest-xf86-video-ati-6.6.2 521
 MD5 369c667080f0c9a3a0e65e51ca6aa3a4 files/digest-xf86-video-ati-6.6.3 521
 RMD160 894c71494ff0f9a494ed2587db6214822a7bd70d files/digest-xf86-video-ati-6.6.3 521
 SHA256 d9617e668c1b1d805d2087ada6de81ff2379dffa9b99aa29e0458343240ce9ca files/digest-xf86-video-ati-6.6.3 521
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.7.3 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.7.3
deleted file mode 100644
index cbebe7e8b4a0..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.5.7.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 a87420414681c53681a330b55ffb04ea xf86-video-ati-6.5.7.3.tar.bz2 700284
-RMD160 e1b69448989cca8a958fc4ce0da8a55aea2677fd xf86-video-ati-6.5.7.3.tar.bz2 700284
-SHA256 f424a7ab8129a8898fb7916e73bb3232d3e9d92a7259696eb178364b44895f72 xf86-video-ati-6.5.7.3.tar.bz2 700284
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.0 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.0
deleted file mode 100644
index 328add6d864b..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 fbf04977d41239d55387122a4de6bd16 xf86-video-ati-6.6.0.tar.bz2 723687
-RMD160 ac58673f76c6693f35cb515731c2d7250b8c88b8 xf86-video-ati-6.6.0.tar.bz2 723687
-SHA256 23027b52d5b82c47201ac7471c545162149a6c6d38ec9c090469f6698e83eb21 xf86-video-ati-6.6.0.tar.bz2 723687
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2
deleted file mode 100644
index 97c18a6af5a3..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
-RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
-SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
-MD5 f295ceb5d9317c8a0e8e212974b1b05a xf86-video-ati-6.6.2.tar.bz2 722892
-RMD160 064ef873c17e9947dc2dbf6cb795d090f31e0063 xf86-video-ati-6.6.2.tar.bz2 722892
-SHA256 e069e61b45a81d42bfc0b067345e45d02e712ee385d77b222a4839a6b800aa50 xf86-video-ati-6.6.2.tar.bz2 722892
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.5.7.3-hangup-ppc.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.5.7.3-hangup-ppc.patch
deleted file mode 100644
index 85e32737872a..000000000000
--- a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.5.7.3-hangup-ppc.patch
+++ /dev/null
@@ -1,359 +0,0 @@
---- xserver-xorg-driver-ati-6.5.7.3.orig/src/radeon.h
-+++ xserver-xorg-driver-ati-6.5.7.3/src/radeon.h
-@@ -147,10 +147,16 @@
-     CARD32            cap0_trig_cntl;
-     CARD32            cap1_trig_cntl;
-     CARD32            bus_cntl;
--    CARD32            surface_cntl;
-     CARD32            bios_4_scratch;
-     CARD32            bios_5_scratch;
-     CARD32            bios_6_scratch;
-+    CARD32            surface_cntl;
-+    CARD32            surfaces[8][3];
-+    CARD32            mc_agp_location;
-+    CARD32            mc_fb_location;
-+    CARD32            display_base_addr;
-+    CARD32            display2_base_addr;
-+    CARD32            ov0_base_addr;
- 
- 				/* Other registers to save for VT switches */
-     CARD32            dp_datatype;
-@@ -158,8 +164,6 @@
-     CARD32            clock_cntl_index;
-     CARD32            amcgpio_en_reg;
-     CARD32            amcgpio_mask;
--    
--    CARD32            surfaces[8][3];
- 
- 				/* CRTC registers */
-     CARD32            crtc_gen_cntl;
---- xserver-xorg-driver-ati-6.5.7.3.orig/src/radeon_driver.c
-+++ xserver-xorg-driver-ati-6.5.7.3/src/radeon_driver.c
-@@ -129,6 +129,7 @@
- static int RADEONValidateMergeModes(ScrnInfoPtr pScrn);
- static void RADEONSetDynamicClock(ScrnInfoPtr pScrn, int mode);
- static void RADEONUpdatePanelSize(ScrnInfoPtr pScrn);
-+static void RADEONSaveMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save);
- 
- /* psuedo xinerama support */
- 
-@@ -2253,81 +2254,56 @@
- }
- 
- /* Set up MC_FB_LOCATION and related registers */
--static void
--RADEONSetFBLocation(ScrnInfoPtr pScrn)
-+static void RADEONInitMemMapRegisters(ScrnInfoPtr pScrn,RADEONSavePtr save,
-+				      RADEONInfoPtr info)
- {
--    RADEONInfoPtr  info = RADEONPTR(pScrn);
-     RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
-     unsigned char *RADEONMMIO = info->MMIO;
--    CARD32 mc_fb_location;
--    CARD32 mc_agp_location = INREG(RADEON_MC_AGP_LOCATION);
--    CARD32 bus_cntl = INREG(RADEON_BUS_CNTL);
--    
--    OUTREG (RADEON_BUS_CNTL, bus_cntl | RADEON_BUS_MASTER_DIS);
--    RADEONWaitForIdleMMIO(pScrn);
- 
--    /* This function has many problems with newer cards.
--     * Even with older cards, all registers changed here are not
--     * restored properly when X quits, this will also cause 
--     * various problems, especially with radeonfb.
--     * Since we don't have DRI support for R300 and above cards, 
--     * we just hardcode these values for now.
--     * Need to revisit this whole function!!!
--     */
-+    /* Default to existing values */
-+    save->mc_fb_location = INREG(RADEON_MC_FB_LOCATION);
-+    save->mc_agp_location = INREG(RADEON_MC_AGP_LOCATION);
- 
-+    /*
-+     * Warning: A lot of the stuff down there is fairly bogus. For example,
-+     * we use CONFIG_APER_SIZE which is only _half_ of the PCI exposed area
-+     * since we might expose our VRAM in 2 different non overlapping apertures
-+     * depending on how the card is bootstrapped.
-+     *
-+     * This will have to be fixed some day ...
-+     */
-     if (info->IsIGP) {
--	mc_fb_location = INREG(RADEON_NB_TOM);
-+	save->mc_fb_location = INREG(RADEON_NB_TOM);
- 
-+	/* Hack ... FIXME or at least move elsewhere*/
- 	OUTREG(RADEON_GRPH2_BUFFER_CNTL,
- 	       INREG(RADEON_GRPH2_BUFFER_CNTL) & ~0x7f0000);
- 
-     } else
- #ifdef XF86DRI
-     if ( info->directRenderingEnabled && info->drmMinor < 10 ) {
--	mc_fb_location = (INREG(RADEON_CONFIG_APER_SIZE) - 1) & 0xffff0000U;
-+	save->mc_fb_location = (INREG(RADEON_CONFIG_APER_SIZE) - 1) & 0xffff0000U;
-     } else
- #endif
-     {
- 	CARD32 aper0_base = INREG(RADEON_CONFIG_APER_0_BASE);
- 
--	mc_fb_location = (aper0_base >> 16)
--		       | ((aper0_base + (INREG(RADEON_CONFIG_APER_SIZE) - 1)
--			   ) & 0xffff0000U);
-+	save->mc_fb_location = (aper0_base >> 16)
-+		| ((aper0_base + (INREG(RADEON_CONFIG_APER_SIZE) - 1)
-+		    ) & 0xffff0000U);
-     }
- 
--    info->fbLocation = (mc_fb_location & 0xffff) << 16;
-+    info->fbLocation = (save->mc_fb_location & 0xffff) << 16;
- 
--    if (((mc_agp_location & 0xffff) << 16) !=
--	((mc_fb_location & 0xffff0000U) + 0x10000)) {
--	mc_agp_location = mc_fb_location & 0xffff0000U;
--	mc_agp_location |= (mc_agp_location + 0x10000) >> 16;
-+    if (((save->mc_agp_location & 0xffff) << 16) !=
-+	((save->mc_fb_location & 0xffff0000U) + 0x10000)) {
-+	save->mc_agp_location = save->mc_fb_location & 0xffff0000U;
-+	save->mc_agp_location |= (save->mc_agp_location + 0x10000) >> 16;
-     }
- 
--    RADEONWaitForIdleMMIO(pScrn);
--
--    OUTREG(RADEON_MC_FB_LOCATION, mc_fb_location);
--    OUTREG(RADEON_MC_AGP_LOCATION, mc_agp_location);
--    OUTREG(RADEON_DISPLAY_BASE_ADDR, info->fbLocation);
--    if (info->HasCRTC2)
--	OUTREG(RADEON_DISPLAY2_BASE_ADDR, info->fbLocation);
--    OUTREG(RADEON_OV0_BASE_ADDR, info->fbLocation);
--
--    OUTREG (RADEON_BUS_CNTL, bus_cntl);
--    RADEONWaitForIdleMMIO(pScrn);
--
--    /* Set display0/1 priority up on r3/4xx in the memory controller for 
--     * high res modes if the user specifies HIGH for displaypriority 
--     * option.
--     */
--    if ((info->DispPriority == 2) && IS_R300_VARIANT) {
--        CARD32 mc_init_misc_lat_timer = INREG(R300_MC_INIT_MISC_LAT_TIMER);
--	if (info->MergedFB || pRADEONEnt->HasSecondary) {
--	    mc_init_misc_lat_timer |= 0x1100; /* display 0 and 1 */
--	} else {
--	    mc_init_misc_lat_timer |= 0x0100; /* display 0 only */
--	}
--	OUTREG(R300_MC_INIT_MISC_LAT_TIMER, mc_init_misc_lat_timer);
--    }
-+    save->display_base_addr = info->fbLocation;
-+    save->display2_base_addr = info->fbLocation;
-+    save->ov0_base_addr = info->fbLocation;
- 
- }
- 
-@@ -5518,6 +5494,8 @@
- 	unsigned char *RADEONMMIO = info->MMIO;
- 
- 	if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) return FALSE;
-+	RADEONSaveMemMapRegisters(pScrn, &info->ModeReg);
-+	info->fbLocation = (info->ModeReg.mc_fb_location & 0xffff) << 16;
- 	info->ModeReg.surface_cntl = INREG(RADEON_SURFACE_CNTL);
-     } else {
- 	if (!RADEONModeInit(pScrn, pScrn->currentMode)) return FALSE;
-@@ -5605,8 +5583,6 @@
-     hasDRI = info->directRenderingEnabled;
- #endif
- 
--    RADEONSetFBLocation(pScrn);
--
-     if (!fbScreenInit(pScreen, info->FB,
- 		      pScrn->virtualX, pScrn->virtualY,
- 		      pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
-@@ -5837,7 +5813,66 @@
-     return TRUE;
- }
- 
--/* Write common registers (initialized to 0) */
-+/* Write memory mapping registers */
-+static void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn,
-+					 RADEONSavePtr restore)
-+{
-+    RADEONInfoPtr  info       = RADEONPTR(pScrn);
-+    unsigned char *RADEONMMIO = info->MMIO;
-+    int i;
-+
-+    /* Write memory mapping registers only if their value change
-+     * since we must ensure no access is done while they are
-+     * reprogrammed
-+     */
-+    if (INREG(RADEON_MC_FB_LOCATION) != restore->mc_fb_location ||
-+	INREG(RADEON_MC_AGP_LOCATION) != restore->mc_agp_location) {
-+	CARD32 tmp;
-+
-+	/* Make sure engine is idle. We assume the CCE is stopped
-+	 * at this point
-+	 */
-+	RADEONWaitForIdleMMIO(pScrn);
-+
-+	/* Stop display & memory access */
-+	tmp = INREG(RADEON_CRTC_EXT_CNTL);
-+	OUTREG(RADEON_CRTC_EXT_CNTL, tmp | RADEON_CRTC_DISPLAY_DIS);
-+	tmp = INREG(RADEON_CRTC_GEN_CNTL);
-+	tmp &= ~RADEON_CRTC_CUR_EN;
-+	tmp |= RADEON_CRTC_DISP_REQ_EN_B;
-+	OUTREG(RADEON_CRTC_GEN_CNTL, tmp);
-+	if (info->HasCRTC2) {
-+		tmp = INREG(RADEON_CRTC2_GEN_CNTL);
-+		tmp &= ~RADEON_CRTC2_CUR_EN;
-+		tmp |= RADEON_CRTC2_DISP_DIS | RADEON_CRTC2_DISP_REQ_EN_B;
-+		OUTREG(RADEON_CRTC2_GEN_CNTL, tmp);
-+	}
-+	tmp = INREG(RADEON_OV0_SCALE_CNTL);
-+	tmp &= ~RADEON_SCALER_ENABLE;
-+
-+	/* Clear all surfaces */
-+	for (i = 0; i < 8; i++) {
-+	    OUTREG(RADEON_SURFACE0_INFO + 16 * i, 0);
-+	    OUTREG(RADEON_SURFACE0_LOWER_BOUND + 16 * i, 0);
-+	    OUTREG(RADEON_SURFACE0_UPPER_BOUND + 16 * i, 0);
-+	}
-+
-+	/* Make sure the chip settles down and set new map*/ 
-+	usleep(100000);
-+	OUTREG(RADEON_MC_FB_LOCATION, restore->mc_fb_location);
-+ 	OUTREG(RADEON_MC_AGP_LOCATION, restore->mc_agp_location);
-+	/* Make sure map fully reached the chip */
-+	(void)INREG(RADEON_MC_FB_LOCATION);
-+
-+    }
-+    
-+    /* Restore base addresses */
-+    OUTREG(RADEON_DISPLAY_BASE_ADDR, restore->display_base_addr);
-+    OUTREG(RADEON_DISPLAY2_BASE_ADDR, restore->display2_base_addr);
-+    OUTREG(RADEON_OV0_BASE_ADDR, restore->ov0_base_addr);
-+}
-+
-+/* Write common registers */
- static void RADEONRestoreCommonRegisters(ScrnInfoPtr pScrn,
- 					 RADEONSavePtr restore)
- {
-@@ -6457,6 +6492,7 @@
- 
-     /* For Non-dual head card, we don't have private field in the Entity */
-     if (!info->HasCRTC2) {
-+	RADEONRestoreMemMapRegisters(pScrn, restore);
- 	RADEONRestoreCommonRegisters(pScrn, restore);
- 	RADEONRestoreCrtcRegisters(pScrn, restore);
- 	RADEONRestoreFPRegisters(pScrn, restore);
-@@ -6474,10 +6510,12 @@
-      * order. Regardless the order of X server issuing the calls, we
-      * have to ensure we set registers in the right order!!!  Otherwise
-      * we may get a blank screen.
-+     *
-+     * We always restore MemMap first, the saverec should be up to date
-+     * in all cases
-      */
-     if (info->IsSecondary) {
--	if (!pRADEONEnt->RestorePrimary  && !info->IsSwitching)
--	    RADEONRestoreCommonRegisters(pScrn, restore);
-+	RADEONRestoreMemMapRegisters(pScrn, restore);
- 	RADEONRestoreCrtc2Registers(pScrn, restore);
- 	RADEONRestorePLL2Registers(pScrn, restore);
- 
-@@ -6488,15 +6526,14 @@
- 	if (pRADEONEnt->RestorePrimary) {
- 	    pRADEONEnt->RestorePrimary = FALSE;
- 
-+	    RADEONRestoreCommonRegisters(pScrn, &restore0);
- 	    RADEONRestoreCrtcRegisters(pScrn, &restore0);
- 	    RADEONRestoreFPRegisters(pScrn, &restore0);
- 	    RADEONRestorePLLRegisters(pScrn, &restore0);
- 	    pRADEONEnt->IsSecondaryRestored = FALSE;
- 	}
-     } else {
--	if (!pRADEONEnt->IsSecondaryRestored)
--	    RADEONRestoreCommonRegisters(pScrn, restore);
--
-+	RADEONRestoreMemMapRegisters(pScrn, restore);
- 	if (info->MergedFB) {
- 	    RADEONRestoreCrtc2Registers(pScrn, restore);
- 	    RADEONRestorePLL2Registers(pScrn, restore);
-@@ -6506,6 +6543,7 @@
- 	    info->IsSwitching) {
- 	    pRADEONEnt->IsSecondaryRestored = FALSE;
- 
-+	    RADEONRestoreCommonRegisters(pScrn, restore);
- 	    RADEONRestoreCrtcRegisters(pScrn, restore);
- 	    RADEONRestoreFPRegisters(pScrn, restore);
- 	    RADEONRestorePLLRegisters(pScrn, restore);
-@@ -6520,6 +6558,19 @@
- #endif
- }
- 
-+/* Read memory map */
-+static void RADEONSaveMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
-+{
-+    RADEONInfoPtr  info       = RADEONPTR(pScrn);
-+    unsigned char *RADEONMMIO = info->MMIO;
-+
-+    save->mc_fb_location     = INREG(RADEON_MC_FB_LOCATION);
-+    save->mc_agp_location    = INREG(RADEON_MC_AGP_LOCATION);
-+    save->display_base_addr  = INREG(RADEON_DISPLAY_BASE_ADDR);
-+    save->display2_base_addr = INREG(RADEON_DISPLAY2_BASE_ADDR);
-+    save->ov0_base_addr      = INREG(RADEON_OV0_BASE_ADDR);
-+}
-+
- /* Read common registers */
- static void RADEONSaveCommonRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
- {
-@@ -6703,6 +6754,7 @@
-     RADEONInfoPtr  info = RADEONPTR(pScrn);
- 
-     RADEONTRACE(("RADEONSaveMode(%p)\n", save));
-+    RADEONSaveMemMapRegisters(pScrn, save);
-     RADEONSaveCommonRegisters(pScrn, save);
-     if (info->IsSecondary) {
- 	RADEONSaveCrtc2Registers(pScrn, save);
-@@ -6731,6 +6783,7 @@
- 
-     RADEONTRACE(("RADEONSave\n"));
-     if (info->FBDev) {
-+	RADEONSaveMemMapRegisters(pScrn, save);
- 	fbdevHWSave(pScrn);
- 	return;
-     }
-@@ -6914,6 +6967,22 @@
-     int stop_req, max_stop_req;
-     float read_return_rate, time_disp1_drop_priority;
- 
-+    /* 
-+     * Set display0/1 priority up on r3/4xx in the memory controller for 
-+     * high res modes if the user specifies HIGH for displaypriority 
-+     * option.
-+     */
-+    if ((info->DispPriority == 2) && IS_R300_VARIANT) {
-+        CARD32 mc_init_misc_lat_timer = INREG(R300_MC_INIT_MISC_LAT_TIMER);
-+	if (info->MergedFB || pRADEONEnt->HasSecondary) {
-+	    mc_init_misc_lat_timer |= 0x1100; /* display 0 and 1 */
-+	} else {
-+	    mc_init_misc_lat_timer |= 0x0100; /* display 0 only */
-+	}
-+	OUTREG(R300_MC_INIT_MISC_LAT_TIMER, mc_init_misc_lat_timer);
-+    }
-+
-+
-     /* R420 family not supported yet */
-     if (info->ChipFamily == CHIP_FAMILY_R420) return; 
- 
-@@ -8016,6 +8085,7 @@
- 
-     info->Flags = mode->Flags;
- 
-+    RADEONInitMemMapRegisters(pScrn, save, info);
-     RADEONInitCommonRegisters(save, info);
-     if (info->IsSecondary) {
- 	if (!RADEONInitCrtc2Registers(pScrn, save, mode, info))
-@@ -8396,7 +8466,6 @@
-     } else
- 	if (!RADEONModeInit(pScrn, pScrn->currentMode)) return FALSE;
- 
--    RADEONSetFBLocation(pScrn);
-     if (!info->IsSecondary)
- 	RADEONRestoreSurfaces(pScrn, &info->ModeReg);
- #ifdef XF86DRI
-
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.7.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.7.3.ebuild
deleted file mode 100644
index d0ac3517c818..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.7.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.5.7.3.ebuild,v 1.8 2006/04/16 14:05:42 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ati cards"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND="x11-base/xorg-server"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-PATCHES="${FILESDIR}/${P}-hangup-ppc.patch"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild
deleted file mode 100644
index 84024a2afd30..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.0.ebuild,v 1.2 2006/06/05 21:38:07 flameeyes Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ati cards"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild
deleted file mode 100644
index 4006d02dd937..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.2.ebuild,v 1.1 2006/08/25 03:29:19 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org driver for ati cards"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xf86miscproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-
-pkg_setup() {
-	if use dri && ! built_with_use x11-base/xorg-server dri; then
-		die "Build x11-base/xorg-server with USE=dri."
-	fi
-}