13 files changed, 17 insertions, 213 deletions
diff --git a/x11-apps/xf86dga/ChangeLog b/x11-apps/xf86dga/ChangeLog
index b15722869426..4d4e7e0b2e39 100644
--- a/x11-apps/xf86dga/ChangeLog
+++ b/x11-apps/xf86dga/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xf86dga
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.18 2008/01/21 14:26:09 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.19 2008/01/31 03:44:58 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/xf86dga-1.0.1-setuid.diff, -xf86dga-1.0.1-r1.ebuild:
+  Clean up.
 
   21 Jan 2008; Samuli Suominen <drac@gentoo.org> xf86dga-1.0.2.ebuild:
   amd64 stable.
diff --git a/x11-apps/xf86dga/files/digest-xf86dga-1.0.1-r1 b/x11-apps/xf86dga/files/digest-xf86dga-1.0.1-r1
deleted file mode 100644
index a1da0aab41b7..000000000000
--- a/x11-apps/xf86dga/files/digest-xf86dga-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0ee496f720bc98fee43108c88bb7f398 xf86dga-1.0.1.tar.bz2 75183
-RMD160 0689834c32f3bc20dafca299f135a3658bb79614 xf86dga-1.0.1.tar.bz2 75183
-SHA256 eded486132f243a7eed82859895bc23190e462b90d456d9580d649b771837245 xf86dga-1.0.1.tar.bz2 75183
diff --git a/x11-apps/xf86dga/files/xf86dga-1.0.1-setuid.diff b/x11-apps/xf86dga/files/xf86dga-1.0.1-setuid.diff
deleted file mode 100644
index f923cd92a5b9..000000000000
--- a/x11-apps/xf86dga/files/xf86dga-1.0.1-setuid.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: dga.c
-===================================================================
-RCS file: /cvs/xorg/app/xf86dga/dga.c,v
-retrieving revision 1.2
-diff -u -r1.2 dga.c
---- dga.c	23 Apr 2004 19:54:47 -0000	1.2
-+++ dga.c	19 Jun 2006 21:31:33 -0000
-@@ -16,6 +16,7 @@
- #include <X11/Xmd.h>
- #include <X11/extensions/xf86dga.h>
- #include <ctype.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <signal.h>
-@@ -141,7 +142,10 @@
- 
- #ifndef __UNIXOS2__
-    /* Give up root privs */
--   setuid(getuid());
-+   if (setuid(getuid()) == -1) {
-+      fprintf(stderr, "Unable to change uid: %s\n", strerror(errno));
-+      exit(2);
-+   }
- #endif
- 
-    XF86DGASetViewPort(dis, DefaultScreen(dis), 0, 0);
diff --git a/x11-apps/xf86dga/xf86dga-1.0.1-r1.ebuild b/x11-apps/xf86dga/xf86dga-1.0.1-r1.ebuild
deleted file mode 100644
index 9ecab0586110..000000000000
--- a/x11-apps/xf86dga/xf86dga-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-1.0.1-r1.ebuild,v 1.5 2008/01/13 09:36:13 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="test program for the XFree86-DGA extension"
-KEYWORDS="amd64 ~arm ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXxf86dga"
-DEPEND="${RDEPEND}
-	x11-proto/xf86dgaproto"
-
-PATCHES="${FILESDIR}/${P}-setuid.diff"
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index f954522616fe..3e8d345e4369 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xfs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.49 2007/11/20 05:11:01 kumba Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.50 2008/01/31 03:46:00 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>; -xfs-1.0.4.ebuild,
+  -xfs-1.0.4-r1.ebuild:
+  Clean up.
 
   20 Nov 2007; Joshua Kinard <kumba@gentoo.org> xfs-1.0.5.ebuild:
   Stable on mips, per #194606.
diff --git a/x11-apps/xfs/files/digest-xfs-1.0.4 b/x11-apps/xfs/files/digest-xfs-1.0.4
deleted file mode 100644
index 60d6bd79234a..000000000000
--- a/x11-apps/xfs/files/digest-xfs-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f43cb64d623b748208dfd9012d17b654 xfs-1.0.4.tar.bz2 149414
-RMD160 389c4c9ebd5242c76585ffefe2fd507e1d7fb09d xfs-1.0.4.tar.bz2 149414
-SHA256 452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b xfs-1.0.4.tar.bz2 149414
diff --git a/x11-apps/xfs/files/digest-xfs-1.0.4-r1 b/x11-apps/xfs/files/digest-xfs-1.0.4-r1
deleted file mode 100644
index 60d6bd79234a..000000000000
--- a/x11-apps/xfs/files/digest-xfs-1.0.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f43cb64d623b748208dfd9012d17b654 xfs-1.0.4.tar.bz2 149414
-RMD160 389c4c9ebd5242c76585ffefe2fd507e1d7fb09d xfs-1.0.4.tar.bz2 149414
-SHA256 452dde2923c7ae5a2b8cb4b9735507c579c1c55a0e5e45a34210e52574ee641b xfs-1.0.4.tar.bz2 149414
diff --git a/x11-apps/xfs/xfs-1.0.4-r1.ebuild b/x11-apps/xfs/xfs-1.0.4-r1.ebuild
deleted file mode 100644
index ab082af63f21..000000000000
--- a/x11-apps/xfs/xfs-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-1.0.4-r1.ebuild,v 1.9 2007/12/11 10:55:35 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X font server"
-
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6"
-
-RDEPEND="x11-apps/ttmkfdir
-	x11-libs/libFS
-	x11-libs/libXfont"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6) --libdir=/etc"
-
-pkg_setup() {
-	enewgroup xfs 33
-	enewuser xfs 33 -1 /etc/X11/fs xfs
-}
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \
-		"${S}"/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	insinto /etc/X11/fs
-	newins "${FILESDIR}"/xfs.config config
-	newinitd "${FILESDIR}"/xfs.start xfs
-	newconfd "${FILESDIR}"/xfs.conf.d xfs
-}
diff --git a/x11-apps/xfs/xfs-1.0.4.ebuild b/x11-apps/xfs/xfs-1.0.4.ebuild
deleted file mode 100644
index 6701ec4bd8b3..000000000000
--- a/x11-apps/xfs/xfs-1.0.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-1.0.4.ebuild,v 1.10 2007/08/07 13:28:56 gustavoz Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X font server"
-
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 s390 sh sparc x86"
-IUSE="ipv6"
-
-RDEPEND="x11-apps/ttmkfdir
-	x11-libs/libFS
-	x11-libs/libXfont"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6) --libdir=/etc"
-
-pkg_setup() {
-	enewgroup xfs 33
-	enewuser xfs 33 -1 /etc/X11/fs xfs
-}
-
-src_unpack() {
-	x-modular_unpack_source
-	x-modular_patch_source
-
-	sed -i -e "s:^configdir =.*:configdir = \$(sysconfdir)/X11/fs:g" \
-		"${S}"/Makefile.am
-
-	x-modular_reconf_source
-}
-
-src_install() {
-	x-modular_src_install
-
-	insinto /etc/X11/fs
-	newins "${FILESDIR}"/xfs.config config
-	newinitd "${FILESDIR}"/xfs.start xfs
-	newconfd "${FILESDIR}"/xfs.conf.d xfs
-}
diff --git a/x11-apps/xload/ChangeLog b/x11-apps/xload/ChangeLog
index 9a14aa478999..b6d45994ebc0 100644
--- a/x11-apps/xload/ChangeLog
+++ b/x11-apps/xload/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xload
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.26 2007/07/03 12:44:48 pylon Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.27 2008/01/31 03:47:29 dberkholz Exp $
+
+  31 Jan 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  -files/xload-1.0.1-setuid.diff, -xload-1.0.1-r1.ebuild:
+  Clean up.
 
   03 Jul 2007; Lars Weiler <pylon@gentoo.org> xload-1.0.2.ebuild:
   Stable on ppc; bug #175465.
diff --git a/x11-apps/xload/files/digest-xload-1.0.1-r1 b/x11-apps/xload/files/digest-xload-1.0.1-r1
deleted file mode 100644
index 4ac282ada8b6..000000000000
--- a/x11-apps/xload/files/digest-xload-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ba013813f9c21eb015559466f8d02a44 xload-1.0.1.tar.bz2 87468
-RMD160 9179267c9ab8eb64f36eccaa55ed7428c944f6c5 xload-1.0.1.tar.bz2 87468
-SHA256 8d51184d6b18eea2f64e0c5b88cd95edff8353ce6529e780f95b1f2347babbf2 xload-1.0.1.tar.bz2 87468
diff --git a/x11-apps/xload/files/xload-1.0.1-setuid.diff b/x11-apps/xload/files/xload-1.0.1-setuid.diff
deleted file mode 100644
index da776c8d1435..000000000000
--- a/x11-apps/xload/files/xload-1.0.1-setuid.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: xload.c
-===================================================================
-RCS file: /cvs/xorg/app/xload/xload.c,v
-retrieving revision 1.2
-diff -u -r1.2 xload.c
---- xload.c	23 Apr 2004 19:54:57 -0000	1.2
-+++ xload.c	19 Jun 2006 21:32:20 -0000
-@@ -34,7 +34,7 @@
-  * xload - display system load average in a window
-  */
- 
--
-+#include <errno.h>
- #include <stdio.h> 
- #include <stdlib.h>
- #include <unistd.h>
-@@ -162,8 +162,17 @@
-     /* For security reasons, we reset our uid/gid after doing the necessary
-        system initialization and before calling any X routines. */
-     InitLoadPoint();
--    setgid(getgid());		/* reset gid first while still (maybe) root */
--    setuid(getuid());
-+    /* reset gid first while still (maybe) root */
-+    if (setgid(getgid()) == -1) {
-+	    fprintf(stderr, "%s: setgid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
-+    if (setuid(getuid()) == -1) {
-+	    fprintf(stderr, "%s: setuid failed: %s\n", 
-+		ProgramName, strerror(errno));
-+	    exit(1);
-+    }
- 
-     XtSetLanguageProc(NULL, (XtLanguageProc) NULL, NULL);
- 
diff --git a/x11-apps/xload/xload-1.0.1-r1.ebuild b/x11-apps/xload/xload-1.0.1-r1.ebuild
deleted file mode 100644
index 970c634ea7ac..000000000000
--- a/x11-apps/xload/xload-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-1.0.1-r1.ebuild,v 1.9 2007/06/24 22:45:01 vapier Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="system load average display for X"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE="xprint"
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-
-CONFIGURE_OPTIONS="$(use_enable xprint)"
-
-PATCHES="${FILESDIR}/${P}-setuid.diff"
-
-pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
-		die "Build x11-libs/libXaw with USE=xprint."
-	fi
-}