Clean up.

Package-Manager: portage-2.1.4

6 files changed, 7 insertions, 111 deletions

diff --git a/x11-drivers/xf86-video-tdfx/ChangeLog b/x11-drivers/xf86-video-tdfx/ChangeLog
index d564d3434878..734ff3a4ef05 100644
--- a/x11-drivers/xf86-video-tdfx/ChangeLog
+++ b/x11-drivers/xf86-video-tdfx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-tdfx
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.36 2007/08/07 12:55:49 gustavoz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.37 2008/01/31 04:06:37 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/tdfx_getsecs.patch, -xf86-video-tdfx-1.2.1-r1.ebuild,
+  -xf86-video-tdfx-1.2.2.ebuild:
+  Clean up.
 
   07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   xf86-video-tdfx-1.3.0.ebuild:
diff --git a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1-r1 b/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1-r1
deleted file mode 100644
index 29706ac2b605..000000000000
--- a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.1-r1
+++ /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 7513cf373d4ddbbf93651d9ae29ac7f3 xf86-video-tdfx-1.2.1.tar.bz2 269783
-RMD160 9d86f47b1eb5b921122a8c13d6e0335098fced3f xf86-video-tdfx-1.2.1.tar.bz2 269783
-SHA256 c237565a1703bdf01fa9208bf51439d2f36e9c586a5bf3f51ae0a39e8bf3959b xf86-video-tdfx-1.2.1.tar.bz2 269783
diff --git a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.2 b/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.2
deleted file mode 100644
index e03ce1faea1e..000000000000
--- a/x11-drivers/xf86-video-tdfx/files/digest-xf86-video-tdfx-1.2.2
+++ /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 68568ca1402d07046b08f82679aefb87 xf86-video-tdfx-1.2.2.tar.bz2 276785
-RMD160 9ebc5c0c5d67f110965c80759a44d82b1d098a8b xf86-video-tdfx-1.2.2.tar.bz2 276785
-SHA256 04abe62a0cb9280dcad6082eea12564468b5940b657795811ddd5d8e2c443ec6 xf86-video-tdfx-1.2.2.tar.bz2 276785
diff --git a/x11-drivers/xf86-video-tdfx/files/tdfx_getsecs.patch b/x11-drivers/xf86-video-tdfx/files/tdfx_getsecs.patch
deleted file mode 100644
index e96b1727a229..000000000000
--- a/x11-drivers/xf86-video-tdfx/files/tdfx_getsecs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- xf86-video-tdfx-1.2.1/src/tdfx_priv.c.getsecs	2006-04-04 08:06:58.000000000 -0400
-+++ xf86-video-tdfx-1.2.1/src/tdfx_priv.c	2006-06-07 13:36:32.000000000 -0400
-@@ -114,16 +114,16 @@
-   /* Toggle the reset bits */
-   oldValue=TDFXReadLongMMIO(pTDFX, MISCINIT0);
-   TDFXWriteLongMMIO(pTDFX, MISCINIT0, oldValue|0x23);
--  getsecs(&start_sec, &dummy);
-+  xf86getsecs(&start_sec, &dummy);
-   do {
--    getsecs(&end_sec, &dummy);
-+    xf86getsecs(&end_sec, &dummy);
-   } while (end_sec-start_sec<2);
-   TDFXWriteLongMMIO(pTDFX, MISCINIT0, oldValue);
-   oldValue=TDFXReadLongMMIO(pTDFX, MISCINIT1);
-   TDFXWriteLongMMIO(pTDFX, MISCINIT1, oldValue|BIT(19));
--  getsecs(&start_sec, &dummy);
-+  xf86getsecs(&start_sec, &dummy);
-   do {
--    getsecs(&end_sec, &dummy);
-+    xf86getsecs(&end_sec, &dummy);
-   } while (end_sec-start_sec<2);
-   TDFXWriteLongMMIO(pTDFX, MISCINIT1, oldValue);
-   InstallFifo(pScrn);
-@@ -158,9 +158,9 @@
-     cnt++;
-     if (cnt==1000) {
-       if (!start_sec) {
--	getsecs(&start_sec, &dummy);
-+	xf86getsecs(&start_sec, &dummy);
-       } else {
--	getsecs(&end_sec, &dummy);
-+	xf86getsecs(&end_sec, &dummy);
- 	if (end_sec-start_sec>3) {
- 	  dummy=TDFXReadLongMMIO(pTDFX, SST_FIFO_RDPTRL0);
- 	  if (dummy==readptr) {
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1-r1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1-r1.ebuild
deleted file mode 100644
index 15f4894c4e2b..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.1-r1.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-tdfx/xf86-video-tdfx-1.2.1-r1.ebuild,v 1.5 2006/10/13 23:15:49 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="alpha amd64 arm ia64 ppc 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/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-CONFIGURE_OPTIONS="$(use_enable dri)"
-PATCHES="${FILESDIR}/tdfx_getsecs.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-tdfx/xf86-video-tdfx-1.2.2.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.2.ebuild
deleted file mode 100644
index e15fac1e1dac..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.2.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-tdfx/xf86-video-tdfx-1.2.2.ebuild,v 1.1 2006/10/22 18:11:24 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~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/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	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
-}