Clean up.

(Portage version: 2.1.4)

22 files changed, 11 insertions, 510 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 1077918d18c5..36bdaeaf741d 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-ati
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.57 2007/12/24 18:45:00 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.58 2008/01/31 03:56:13 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/6.7.196-fix_washed_color.patch, -xf86-video-ati-6.6.1.ebuild,
+  -xf86-video-ati-6.6.191.ebuild, -xf86-video-ati-6.6.192.ebuild,
+  -xf86-video-ati-6.6.193.ebuild, -xf86-video-ati-6.7.192.ebuild,
+  -xf86-video-ati-6.7.193.ebuild, -xf86-video-ati-6.7.194.ebuild,
+  -xf86-video-ati-6.7.195.ebuild, -xf86-video-ati-6.7.196.ebuild,
+  -xf86-video-ati-6.7.196-r1.ebuild:
+  Clean up.
 
 *xf86-video-ati-6.7.197 (24 Dec 2007)
 
diff --git a/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch b/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch
deleted file mode 100644
index 2bf48dc86211..000000000000
--- a/x11-drivers/xf86-video-ati/files/6.7.196-fix_washed_color.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From the fix for https://bugs.freedesktop.org/show_bug.cgi?id=12844 - "Display is washed out, too bright. No adjustment will correct for over bright display"
-Affecting mostly radeon IGP chips, such as the Radeon XPRESS
-Fixed by setting the TV DAC up correctly, etc
-
-diff --git a/src/radeon_output.c b/src/radeon_output.c
-index 599a89c..54c27cd 100644
---- a/src/radeon_output.c
-+++ b/src/radeon_output.c
-@@ -1039,11 +1039,12 @@ static void RADEONInitDACRegisters(xf86OutputPtr output, RADEONSavePtr save,
-     save->dac_macro_cntl = info->SavedReg.dac_macro_cntl;
- }
- 
--/* XXX: fix me */
- static void
--RADEONInitTvDacCntl(ScrnInfoPtr pScrn, RADEONSavePtr save)
-+RADEONInitTvDacCntl(xf86OutputPtr output, RADEONSavePtr save)
- {
-+    ScrnInfoPtr pScrn = output->scrn;
-     RADEONInfoPtr  info       = RADEONPTR(pScrn);
-+    RADEONOutputPrivatePtr radeon_output = output->driver_private;
- 
-     if (info->ChipFamily == CHIP_FAMILY_R420 ||
- 	info->ChipFamily == CHIP_FAMILY_RV410) {
-@@ -1064,10 +1065,11 @@ RADEONInitTvDacCntl(ScrnInfoPtr pScrn, RADEONSavePtr save)
- 			       RADEON_TV_DAC_GDACPD |
- 			       RADEON_TV_DAC_GDACPD);
-     }
--    /* FIXME: doesn't make sense, this just replaces the previous value... */
-+
-     save->tv_dac_cntl |= (RADEON_TV_DAC_NBLANK |
--			 RADEON_TV_DAC_NHOLD |
--			  RADEON_TV_DAC_STD_PS2);
-+			  RADEON_TV_DAC_NHOLD |
-+			  RADEON_TV_DAC_STD_PS2 |
-+			  radeon_output->tv_dac_adj);
- 
- }
- 
-@@ -1078,7 +1080,7 @@ static void RADEONInitDAC2Registers(xf86OutputPtr output, RADEONSavePtr save,
-     RADEONInfoPtr  info       = RADEONPTR(pScrn);
- 
-     /*0x0028023;*/
--    RADEONInitTvDacCntl(pScrn, save);
-+    RADEONInitTvDacCntl(output, save);
- 
-     if (IS_R300_VARIANT)
- 	save->gpiopad_a = info->SavedReg.gpiopad_a | 1;
-@@ -1671,9 +1673,13 @@ radeon_detect(xf86OutputPtr output)
- 	   * so we can get something on the screen
- 	   */
- 	  if (((radeon_output->type == OUTPUT_VGA || radeon_output->type == OUTPUT_DVI) &&
--	       radeon_output->DACType == DAC_TVDAC) ||
--	      (info->IsIGP && radeon_output->type == OUTPUT_DVI))
-+	       radeon_output->DACType == DAC_TVDAC)) {
-+	      radeon_output->MonType = MT_CRT;
- 	      return XF86OutputStatusUnknown;
-+	  } else if  (info->IsIGP && radeon_output->type == OUTPUT_DVI) {
-+	      radeon_output->MonType = MT_DFP; /* MT_LCD ??? */
-+	      return XF86OutputStatusUnknown;
-+	  }
-       }
- 
-       if (connected)
-@@ -2623,6 +2629,7 @@ void RADEONInitConnector(xf86OutputPtr output)
-     if (radeon_output->type == OUTPUT_STV ||
- 	radeon_output->type == OUTPUT_CTV) {
- 	RADEONGetTVInfo(output);
-+	RADEONGetTVDacAdjInfo(output);
-     }
- 
-     if (radeon_output->DACType == DAC_TVDAC) {
-diff --git a/src/radeon_tv.c b/src/radeon_tv.c
-index 3a26a0a..2a8873c 100644
---- a/src/radeon_tv.c
-+++ b/src/radeon_tv.c
-@@ -434,7 +434,7 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
- 
-     save->tv_vscaler_cntl2 = ((save->tv_vscaler_cntl2 & 0x00fffff0)
- 			      | (0x10 << 24)
--			      | RADEON_DITHER_MODE 
-+			      | RADEON_DITHER_MODE
- 			      | RADEON_Y_OUTPUT_DITHER_EN
- 			      | RADEON_UV_OUTPUT_DITHER_EN
- 			      | RADEON_UV_TO_BUF_DITHER_EN);
-@@ -444,10 +444,12 @@ void RADEONInitTVRegisters(xf86OutputPtr output, RADEONSavePtr save,
-     tmp = (tmp << RADEON_UV_OUTPUT_POST_SCALE_SHIFT) | 0x000b0000;
-     save->tv_timing_cntl = tmp;
- 
--    save->tv_dac_cntl = RADEON_TV_DAC_NBLANK | RADEON_TV_DAC_NHOLD | (8 << 16) | (6 << 20);
-+    save->tv_dac_cntl = (RADEON_TV_DAC_NBLANK |
-+			 RADEON_TV_DAC_NHOLD |
-+			 radeon_output->tv_dac_adj /*(8 << 16) | (6 << 20)*/);
- 
-     if (radeon_output->tvStd == TV_STD_NTSC ||
--        radeon_output->tvStd == TV_STD_NTSC_J)
-+	radeon_output->tvStd == TV_STD_NTSC_J)
- 	save->tv_dac_cntl |= RADEON_TV_DAC_STD_NTSC;
-     else
- 	save->tv_dac_cntl |= RADEON_TV_DAC_STD_PAL;
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1
deleted file mode 100644
index e6680c230c66..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.1
+++ /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 76445561906956fee384017e22d803ae xf86-video-ati-6.6.1.tar.bz2 675870
-RMD160 3b8a872261bbd85f85ffa1132a25dbc1efb00d65 xf86-video-ati-6.6.1.tar.bz2 675870
-SHA256 2bed11d2e49e9eff5d999e4c74b35906692e002ceca68887e4a5fbccac278f53 xf86-video-ati-6.6.1.tar.bz2 675870
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.191 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.191
deleted file mode 100644
index f0467c19c5a6..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.191
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 90049fe51aaef1806dcc2e03ff60858f xf86-video-ati-6.6.191.tar.bz2 764954
-RMD160 27ef5a28a78a8a9956035b377f62c6019e935452 xf86-video-ati-6.6.191.tar.bz2 764954
-SHA256 8f0c6103a41d058b964071c581c9b613c3746f2a0d716e6bf8cc76ab001ae231 xf86-video-ati-6.6.191.tar.bz2 764954
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.192 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.192
deleted file mode 100644
index 991ae057faf6..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.192
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 f34e42bec3913fe22c124547228d8dba xf86-video-ati-6.6.192.tar.bz2 768554
-RMD160 a0b55bf5a8660f47bb32ff584cdd68cc891e1a7c xf86-video-ati-6.6.192.tar.bz2 768554
-SHA256 853be8212e7274d0d81bad0b1ee95dafd649a5d979307afef21e7f2baae4fa68 xf86-video-ati-6.6.192.tar.bz2 768554
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.193 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.193
deleted file mode 100644
index f87b2c77bbc1..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.6.193
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 102b781f543213852401f3422b18ccc7 xf86-video-ati-6.6.193.tar.bz2 725021
-RMD160 fed14b6613771e0ecab4ed12dcfedcfb3e539ac9 xf86-video-ati-6.6.193.tar.bz2 725021
-SHA256 9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae xf86-video-ati-6.6.193.tar.bz2 725021
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.192 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.192
deleted file mode 100644
index 33cf8cbce2a0..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.192
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 b3207c1df5f6f8cf344efe4842bb2db7 xf86-video-ati-6.7.192.tar.bz2 730601
-RMD160 49661ba349478b4eb0b15bed4f7755cff1d8a379 xf86-video-ati-6.7.192.tar.bz2 730601
-SHA256 ea282de08e20a04df49e76970ec9944d95f5e8f1a40abe31e30eca11a7aa8263 xf86-video-ati-6.7.192.tar.bz2 730601
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.193 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.193
deleted file mode 100644
index 08758c76fbd8..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.193
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 316ebbe95834c5120c302cc004363f92 xf86-video-ati-6.7.193.tar.bz2 732848
-RMD160 a65d39fc0d906c585268b9089833d2e19eef321b xf86-video-ati-6.7.193.tar.bz2 732848
-SHA256 aa154bc22818baecfbd009ccf046a9eccfc789db95349439e754c76d6b35ed8a xf86-video-ati-6.7.193.tar.bz2 732848
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.194 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.194
deleted file mode 100644
index 6a030c4051a5..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.194
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 bac7c8da4d80503aeb53085e643e2dab xf86-video-ati-6.7.194.tar.bz2 732773
-RMD160 4e76a9c9df827c496567d202df235046d9fafe03 xf86-video-ati-6.7.194.tar.bz2 732773
-SHA256 540572177d1a1d9f9896972bd4ffbbd59efd9782964e957bf2d6cd6f306e91ce xf86-video-ati-6.7.194.tar.bz2 732773
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.195 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.195
deleted file mode 100644
index 43e56b323821..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.195
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 2f11b8e699fadd93e6932b07cc01bc64 xf86-video-ati-6.7.195.tar.bz2 734367
-RMD160 67954cdce3be5c0420fbaea9975fe288a45d5e7d xf86-video-ati-6.7.195.tar.bz2 734367
-SHA256 61bac4145d00c436434b98a7522a8bbc3ccdf16c9bc3aaa5cfc427eba0350e16 xf86-video-ati-6.7.195.tar.bz2 734367
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196
deleted file mode 100644
index 97f34ffcf0c4..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 06db625391c75c8be86c4dd5a5d713e6 xf86-video-ati-6.7.196.tar.bz2 787475
-RMD160 fae77f0f9e4acaed755617ce53214e73f53c10cf xf86-video-ati-6.7.196.tar.bz2 787475
-SHA256 8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9 xf86-video-ati-6.7.196.tar.bz2 787475
diff --git a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1 b/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1
deleted file mode 100644
index 97f34ffcf0c4..000000000000
--- a/x11-drivers/xf86-video-ati/files/digest-xf86-video-ati-6.7.196-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 56566e8c3fb4bb99791d1788d0a9a1a8 x11-driver-patches-4.tar.bz2 346
-RMD160 fcbd405de080d07612d46f455b927035fd8123a8 x11-driver-patches-4.tar.bz2 346
-SHA256 07069bbd072f2def50e83801a8f2a41a4c96495104f15cd6f56f7df7f89769bf x11-driver-patches-4.tar.bz2 346
-MD5 06db625391c75c8be86c4dd5a5d713e6 xf86-video-ati-6.7.196.tar.bz2 787475
-RMD160 fae77f0f9e4acaed755617ce53214e73f53c10cf xf86-video-ati-6.7.196.tar.bz2 787475
-SHA256 8923a08232255ceacf770ef767d86bbfb195dffa9559baa1b1de90f9c947a6d9 xf86-video-ati-6.7.196.tar.bz2 787475
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.ebuild
deleted file mode 100644
index 576f42a59e3a..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.1.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.6.1.ebuild,v 1.6 2006/10/11 00:27:00 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-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/glproto
-			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.191.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.191.ebuild
deleted file mode 100644
index 3b6b156b3ff9..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.191.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.191.ebuild,v 1.2 2007/03/28 00:07:51 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.192.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild
deleted file mode 100644
index 1ba550438f88..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.192.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.192.ebuild,v 1.1 2007/05/21 05:25:33 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.193.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.193.ebuild
deleted file mode 100644
index fb58a017ece7..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.6.193.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.193.ebuild,v 1.1 2007/08/04 20:45:16 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.7.192.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.192.ebuild
deleted file mode 100644
index 90d19b6af4b0..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.192.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.7.192.ebuild,v 1.1 2007/09/08 05:15:18 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.7.193.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.193.ebuild
deleted file mode 100644
index da0625d2e75d..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.193.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.7.193.ebuild,v 1.1 2007/09/21 01:15:43 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.7.194.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.194.ebuild
deleted file mode 100644
index f0784c320378..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.194.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.7.194.ebuild,v 1.1 2007/09/24 05:25:04 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.7.195.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.195.ebuild
deleted file mode 100644
index aa55263eb95c..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.195.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.7.195.ebuild,v 1.1 2007/10/06 00:54:17 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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.7.196-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild
deleted file mode 100644
index 31ddcadf14a6..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 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.7.196-r1.ebuild,v 1.2 2007/11/16 16:48:05 leio Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-PATCHES="${FILESDIR}/${PV}-fix_washed_color.patch"
-
-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.7.196.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196.ebuild
deleted file mode 100644
index 86e4cf00d835..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.7.196.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 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.7.196.ebuild,v 1.1 2007/11/13 04:53:45 dberkholz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="dri"
-
-RDEPEND=">=x11-base/xorg-server-1.2"
-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/glproto
-			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
-}