Clean up.

Package-Manager: portage-2.1.4

4 files changed, 6 insertions, 67 deletions

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
-}