old

Package-Manager: portage-2.1.3_rc6

45 files changed, 0 insertions, 2531 deletions

diff --git a/sys-apps/eject/eject-2.0.13-r1.ebuild b/sys-apps/eject/eject-2.0.13-r1.ebuild
deleted file mode 100644
index 400fa1b5ccc4..000000000000
--- a/sys-apps/eject/eject-2.0.13-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r1.ebuild,v 1.4 2005/07/25 20:05:51 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 sh sparc x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-kernel25-support.patch
-	epatch "${FILESDIR}"/${P}-autoclose.patch
-	epatch "${FILESDIR}"/${P}-finddev.patch
-	epatch "${FILESDIR}"/${P}-header.patch
-	epatch "${FILESDIR}"/${P}-use-mountpoints.patch
-
-	if ! use nls ; then
-		sed -i "s:SUBDIRS = po::" Makefile.in || die "sed nls failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.0.13-r2.ebuild b/sys-apps/eject/eject-2.0.13-r2.ebuild
deleted file mode 100644
index 1d306673c7e4..000000000000
--- a/sys-apps/eject/eject-2.0.13-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.12 2005/10/03 12:26:40 hardave Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-kernel25-support.patch
-	epatch "${FILESDIR}"/${P}-autoclose.patch
-	epatch "${FILESDIR}"/${P}-finddev.patch
-	epatch "${FILESDIR}"/${P}-header.patch
-	epatch "${FILESDIR}"/${P}-use-mountpoints.patch
-	epatch "${FILESDIR}"/${P}-close-check.patch
-	epatch "${FILESDIR}"/${P}-prefix-defaultdevice-with-dev.patch
-	epatch "${FILESDIR}"/${P}-xmalloc.patch
-	epatch "${FILESDIR}"/${P}-xregcomp.patch
-	epatch "${FILESDIR}"/${P}-no-umount.patch
-	epatch "${FILESDIR}"/${P}-toggle.patch
-	epatch "${FILESDIR}"/${P}-fstab-error.patch
-	epatch "${FILESDIR}"/${P}-pumount.patch
-	epatch "${FILESDIR}"/${P}-i18n-uclibc.patch
-
-	sed -i '/^AM_CFLAGS/s:-O3::' Makefile.in
-	if ! use nls ; then
-		sed -i "s:SUBDIRS = po::" Makefile.in || die "sed nls failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.1.0-r1.ebuild b/sys-apps/eject/eject-2.1.0-r1.ebuild
deleted file mode 100644
index af8928666301..000000000000
--- a/sys-apps/eject/eject-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.0-r1.ebuild,v 1.5 2006/03/09 23:52:17 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.13-autoclose.patch
-	epatch "${FILESDIR}"/${PN}-2.0.13-header.patch
-	epatch "${FILESDIR}"/${PN}-2.0.13-use-mountpoints.patch
-	epatch "${FILESDIR}"/${PN}-2.0.13-xmalloc.patch
-	epatch "${FILESDIR}"/${P}-regcomp-check.patch
-	epatch "${FILESDIR}"/${PN}-2.0.13-pumount.patch
-	epatch "${FILESDIR}"/${PN}-2.0.13-i18n-uclibc.patch
-	epatch "${FILESDIR}"/${P}-scsi-io-update.patch
-	epatch "${FILESDIR}"/${P}-toggle.patch
-
-	sed -i '/^AM_CFLAGS/s:-O3::' Makefile.in
-	if ! use nls ; then
-		sed -i "s:SUBDIRS = po::" Makefile.in || die "sed nls failed"
-	fi
-
-	# Fix busted timestamps in tarball
-	touch -r aclocal.m4 configure.in
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.1.4-r1.ebuild b/sys-apps/eject/eject-2.1.4-r1.ebuild
deleted file mode 100644
index 42b579e13642..000000000000
--- a/sys-apps/eject/eject-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.4-r1.ebuild,v 1.1 2006/04/23 22:46:09 uberlord Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}"-2.0.13-xmalloc.patch
-	epatch "${FILESDIR}/${PN}"-2.1.4-toggle.patch
-	epatch "${FILESDIR}/${PN}"-2.1.4-scsi-rdwr.patch
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.1.4.ebuild b/sys-apps/eject/eject-2.1.4.ebuild
deleted file mode 100644
index 0a3b453172cc..000000000000
--- a/sys-apps/eject/eject-2.1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.4.ebuild,v 1.2 2006/03/09 23:52:17 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.0.13-xmalloc.patch
-	epatch "${FILESDIR}"/${PN}-2.1.4-toggle.patch
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/eject-2.1.5.ebuild b/sys-apps/eject/eject-2.1.5.ebuild
deleted file mode 100644
index 31b81c40c904..000000000000
--- a/sys-apps/eject/eject-2.1.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.5.ebuild,v 1.9 2006/10/20 16:35:33 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A command to eject a disc from the CD-ROM drive"
-HOMEPAGE="http://eject.sourceforge.net/"
-SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
-	http://www.pobox.com/~tranter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls"
-
-DEPEND="!virtual/eject"
-PROVIDE="virtual/eject"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}"-2.0.13-xmalloc.patch
-	epatch "${FILESDIR}/${PN}"-2.1.4-scsi-rdwr.patch
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
-}
diff --git a/sys-apps/eject/files/digest-eject-2.0.13-r1 b/sys-apps/eject/files/digest-eject-2.0.13-r1
deleted file mode 100644
index 25169484a34b..000000000000
--- a/sys-apps/eject/files/digest-eject-2.0.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b796ad77beb4e7bdd08d6149701ab778 eject-2.0.13.tar.gz 59504
-RMD160 e558bdc3603047233601a6a0c0e445a10cd36b30 eject-2.0.13.tar.gz 59504
-SHA256 1fbdd2e6f153c596a14a759052bc8182b82b6d73ff2e929854d4e1e9142d5fbf eject-2.0.13.tar.gz 59504
diff --git a/sys-apps/eject/files/digest-eject-2.0.13-r2 b/sys-apps/eject/files/digest-eject-2.0.13-r2
deleted file mode 100644
index 25169484a34b..000000000000
--- a/sys-apps/eject/files/digest-eject-2.0.13-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b796ad77beb4e7bdd08d6149701ab778 eject-2.0.13.tar.gz 59504
-RMD160 e558bdc3603047233601a6a0c0e445a10cd36b30 eject-2.0.13.tar.gz 59504
-SHA256 1fbdd2e6f153c596a14a759052bc8182b82b6d73ff2e929854d4e1e9142d5fbf eject-2.0.13.tar.gz 59504
diff --git a/sys-apps/eject/files/digest-eject-2.1.0-r1 b/sys-apps/eject/files/digest-eject-2.1.0-r1
deleted file mode 100644
index 0257fd71f7cb..000000000000
--- a/sys-apps/eject/files/digest-eject-2.1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 82e3a7a4d7e3323018c6938015ff25f7 eject-2.1.0.tar.gz 66819
-RMD160 69fcc5159ba5ebb9ca30d39dfae0bbdb18da8bcb eject-2.1.0.tar.gz 66819
-SHA256 2b5563a49a4998954297649d7a3c24c849c9dcc70845d0b1c2d9a83abc098d0f eject-2.1.0.tar.gz 66819
diff --git a/sys-apps/eject/files/digest-eject-2.1.4 b/sys-apps/eject/files/digest-eject-2.1.4
deleted file mode 100644
index 0e32186fcbfb..000000000000
--- a/sys-apps/eject/files/digest-eject-2.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6cb457857318f733177f0c3a780138da eject-2.1.4.tar.gz 101025
-RMD160 dbba76eb84aef1c8c367090389058b7afcc9ad48 eject-2.1.4.tar.gz 101025
-SHA256 317e27f763884148781be189a4c5c779f25b9812dee8f5ae2d0e5de30a4b65be eject-2.1.4.tar.gz 101025
diff --git a/sys-apps/eject/files/digest-eject-2.1.4-r1 b/sys-apps/eject/files/digest-eject-2.1.4-r1
deleted file mode 100644
index 0e32186fcbfb..000000000000
--- a/sys-apps/eject/files/digest-eject-2.1.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6cb457857318f733177f0c3a780138da eject-2.1.4.tar.gz 101025
-RMD160 dbba76eb84aef1c8c367090389058b7afcc9ad48 eject-2.1.4.tar.gz 101025
-SHA256 317e27f763884148781be189a4c5c779f25b9812dee8f5ae2d0e5de30a4b65be eject-2.1.4.tar.gz 101025
diff --git a/sys-apps/eject/files/digest-eject-2.1.5 b/sys-apps/eject/files/digest-eject-2.1.5
deleted file mode 100644
index 3b1ec4380258..000000000000
--- a/sys-apps/eject/files/digest-eject-2.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b96a6d4263122f1711db12701d79f738 eject-2.1.5.tar.gz 123585
-RMD160 6e2f161e1399f9f01f376e56593d6ca586c4c8ea eject-2.1.5.tar.gz 123585
-SHA256 ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 eject-2.1.5.tar.gz 123585
diff --git a/sys-apps/eject/files/eject-2.0.13-autoclose.patch b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
deleted file mode 100644
index c6a13a4b66fc..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-autoclose.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Ripped from Fedora [has been merged upstream]
-
---- eject.c	Tue Jul  3 00:17:41 2001
-+++ eject.c	Tue Feb  5 05:50:58 2002
-@@ -361,8 +361,11 @@
- {
- 	int status;
- 
--	status = ioctl(fd, CDROMEJECT_SW, onOff);
--	if (status != 0) {
-+	if (onOff)
-+		status = ioctl(fd, CDROM_SET_OPTIONS, CDO_AUTO_EJECT);
-+	else
-+		status = ioctl(fd, CDROM_CLEAR_OPTIONS, CDO_AUTO_EJECT);
-+	if (status < 0) {
- 		fprintf(stderr, _("%s: CD-ROM auto-eject command failed: %s\n"), programName, strerror(errno));
- 		exit(1);
- 	}
---- volname.c	Tue Jul  3 00:17:41 2001
-+++ volname.c	Tue Feb  5 05:29:49 2002
-@@ -35,6 +35,7 @@
- 
- #include <unistd.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/sys-apps/eject/files/eject-2.0.13-close-check.patch b/sys-apps/eject/files/eject-2.0.13-close-check.patch
deleted file mode 100644
index 0a952e05404a..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-close-check.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Add pointless sanity checks.
-
-http://bugs.gentoo.org/91977
-
---- eject.c
-+++ eject.c
-@@ -69,6 +69,16 @@
- #include <scsi/sg.h>
- #include <scsi/scsi_ioctl.h>
- 
-+#define CLOSE(fd) if (close(fd)==-1) { \
-+    perror(programName); \
-+    exit(1); \
-+}
-+
-+#define FCLOSE(fd) if (fclose(fd)==-1) { \
-+    perror(programName); \
-+    exit(1); \
-+}
-+
- /* Global Variables */
- const char *version = VERSION; /* program version */
- int a_option = 0; /* command flags and arguments */
-@@ -627,7 +637,7 @@
- 			GetMajorMinor(s1, &mtabmaj, &mtabmin);
- 			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
- 				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
--				fclose(fp);
-+				FCLOSE(fp);
- 				*deviceName = strdup(s1);
- 				*mountName = strdup(s2);
- 				return 1;
-@@ -636,7 +646,7 @@
- 	}
- 	*deviceName = 0;
- 	*mountName = 0;
--	fclose(fp);
-+	FCLOSE(fp);
- 	return 0;
- }
- 
-@@ -663,13 +673,13 @@
- 	while (fgets(line, sizeof(line), fp) != 0) {
- 		rc = sscanf(line, "%1023s %1023s", s1, s2);
- 		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
--			fclose(fp);
-+			FCLOSE(fp);
- 			*deviceName = strdup(s1);
- 			*mountName = strdup(s2);
- 			return 1;
- 		}
- 	}
--	fclose(fp);
-+	FCLOSE(fp);
- 	return 0;
- }
- 
-@@ -708,7 +718,7 @@
- 			}
- 		}
- 	}
--	fclose(fp);
-+	FCLOSE(fp);
- }
- 
- 
-@@ -1018,7 +1028,7 @@
- 	}
- 
- 	/* cleanup */
--	close(fd);
-+	CLOSE(fd);
- 	free(device);
- 	free(deviceName);
- 	free(fullName);
diff --git a/sys-apps/eject/files/eject-2.0.13-finddev.patch b/sys-apps/eject/files/eject-2.0.13-finddev.patch
deleted file mode 100644
index 8006b1c84bd6..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-finddev.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Ripped from Fedora, updates from Ubuntu
-
-http://bugs.gentoo.org/91977
-
---- eject.1
-+++ eject.1
-@@ -34,8 +34,8 @@
- 
- The device corresponding to <name> is ejected. The name can be a
- device file or mount point, either a full path or with the leading
--"/dev" or "/mnt" omitted. If no name is specified, the default name
--"cdrom" is used.
-+"/dev", "/media" or "/mnt" omitted. If no name is specified, the 
-+default name "cdrom" is used.
- 
- There are four different methods of ejecting, depending on whether the
- device is a CD-ROM, SCSI device, removable floppy, or tape. By default
-@@ -257,11 +257,11 @@
- the name ends in a trailing slash, it is removed (this is to support
- filenames generated using shell file name completion). If the name
- starts with '.' or '/', it tries to open it as a device file or mount
--point. If that fails, it tries prepending '/dev/', '/mnt/', '/dev/cdroms',
--\&'/dev/rdsk/', '/dev/dsk/', and finally './' to the name, until a
--device file or mount point is found that can be opened. The program
--checks /etc/mtab for mounted devices. If that fails, it also checks
--/etc/fstab for mount points of currently unmounted devices.
-+point. If that fails, it tries prepending '/dev/', '/media/', '/mnt/', 
-+'/dev/cdroms', '/dev/rdsk/', '/dev/dsk/', and finally './' to the name, 
-+until a device file or mount point is found that can be opened. The 
-+program checks /etc/mtab for mounted devices. If that fails, it also 
-+checks /etc/fstab for mount points of currently unmounted devices.
- 
- Creating symbolic links such as /dev/cdrom or /dev/zip is recommended
- so that
---- eject.c
-+++ eject.c
-@@ -294,6 +294,7 @@
-  *
-  * foo (if foo starts with '.' or '/')
-  * /dev/foo
-+ * /media/foo
-  * /mnt/foo
-  * /dev/cdroms/foo
-  * /dev/cdroms/foo0
-@@ -321,6 +322,11 @@
- 	if (FileExists(buf))
- 		return buf;
- 
-+	strcpy(buf, "/media/");
-+	strcat(buf, name);
-+	if (FileExists(buf))
-+		return buf;
-+
- 	strcpy(buf, "/mnt/");
- 	strcat(buf, name);
- 	if (FileExists(buf))
diff --git a/sys-apps/eject/files/eject-2.0.13-fstab-error.patch b/sys-apps/eject/files/eject-2.0.13-fstab-error.patch
deleted file mode 100644
index d1fcca649d5e..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-fstab-error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Don't abort if we can't access /etc/fstab
-
-http://bugs.gentoo.org/91977
-
---- eject.c
-+++ eject.c
-@@ -656,8 +656,13 @@
- 
- 	fp = fopen("/etc/fstab", "r");
- 	if (fp == NULL) {
--		fprintf(stderr, _("%s: unable to open /etc/fstab: %s\n"), programName, strerror(errno));
--		exit(1);
-+		/*
-+		 * /etc/fstab may be unreadable in some situations due to passwords in the
-+		 * file.
-+		 */
-+		if (v_option)
-+			printf( _("%s: unable to open /etc/fstab: %s\n"), programName, strerror(errno));
-+		return -1;
- 	}
- 
- 	while (fgets(line, sizeof(line), fp) != 0) {
-@@ -890,7 +895,8 @@
- 	/* if not currently mounted, see if it is a possible mount point */
- 	if (!mounted) {
- 		mountable = MountableDevice(fullName, &mountName, &deviceName);
--		if (v_option) {
-+		/* if return value -1 then fstab could not be read */
-+		if (v_option && (mountable >= 0)) {
- 			if (mountable)
- 				printf(_("%s: `%s' can be mounted at `%s'\n"), programName, deviceName, mountName);
- 			else
diff --git a/sys-apps/eject/files/eject-2.0.13-header.patch b/sys-apps/eject/files/eject-2.0.13-header.patch
deleted file mode 100644
index 044f9712798f..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Ripped from Fedora
-
---- eject-2.0.13/Makefile.am.orig	2004-02-25 17:18:28.000000000 +0100
-+++ eject-2.0.13/Makefile.am	2004-02-25 17:18:42.000000000 +0100
-@@ -4,7 +4,7 @@
- 
- SUBDIRS = po
- 
--AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
-+AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
- AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS)
- 
- man_MANS = eject.1 volname.1
---- eject-2.0.13/Makefile.in.orig	2004-02-25 17:18:57.000000000 +0100
-+++ eject-2.0.13/Makefile.in	2004-02-25 17:19:28.000000000 +0100
-@@ -69,7 +69,7 @@
- 
- SUBDIRS = po
- 
--AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
-+AM_CPPFLAGS = -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG
- AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS)
- 
- man_MANS = eject.1 volname.1
diff --git a/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch b/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch
deleted file mode 100644
index 6e7348b101ea..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- i18n.h.orig	2005-07-23 10:40:55.000000000 -0400
-+++ i18n.h	2005-07-23 10:41:00.000000000 -0400
-@@ -7,9 +7,11 @@
-     µ{¦¡°ê»Ú¤Æ³]­p:  Á±X¤¤
- */
- 
-+#include <features.h>
- #ifndef __i18n__
--   #define __i18n__
-    #define PKG "eject"
-+ # ifndef __UCLIBC__
-+   #define __i18n__
-    #define LOCALEDIR "/usr/share/locale"
- 
-    #include <locale.h>
-@@ -17,7 +19,11 @@
-    #define _(str) gettext (str)
-    #define N_(str) (str)
-    #define I18NCODE setlocale(LC_ALL,""); textdomain(PKG); bindtextdomain(PKG,LOCALEDIR);
--
-+ #else
-+   #define _(str) (str)
-+   #define N_(str) (str)
-+   #define I18NCODE
-+ #endif
-    void i18n_init (void);
- #endif
- 
diff --git a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
deleted file mode 100644
index a42f3f791c9e..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-	# Get this puppy working with kernel 2.5.x
-	# <azarah@gentoo.org> (06 March 2003)
---- eject.c.orig
-+++ eject.c
-@@ -58,7 +58,13 @@
- #include <sys/ioctl.h>
- #include <sys/wait.h>
- #include <sys/mtio.h>
--#include <linux/types.h>
-+#ifndef __KERNEL__
-+# define __KERNEL__
-+# include <linux/types.h>
-+# undef __KERNEL__
-+#else
-+# include <linux/types.h>
-+#endif
- #include <linux/cdrom.h>
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
- #include <linux/ucdrom.h>
diff --git a/sys-apps/eject/files/eject-2.0.13-no-umount.patch b/sys-apps/eject/files/eject-2.0.13-no-umount.patch
deleted file mode 100644
index fac0e60cb965..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-no-umount.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Add a no unmount option to eject.
-
-http://bugs.gentoo.org/91977
-
---- eject.1
-+++ eject.1
-@@ -123,6 +123,13 @@
- also passes the -n option to umount(1).
- 
- .TP 0.5i
-+.B \-m
-+This option allows eject to work with device drivers which automatically
-+mount removable media and therefore must be always mount()ed.
-+The option tells eject to not try to unmount the given device,
-+even if it is mounted according to /etc/mtab or /proc/mounts.
-+
-+.TP 0.5i
- .B -V
- This option causes
- .B eject
---- eject.c
-+++ eject.c
-@@ -84,6 +84,7 @@
- int v_option = 0;
- int x_option = 0;
- int p_option = 0;
-+int m_option = 0;
- int a_arg = 0;
- int c_arg = 0;
- int x_arg = 0;
-@@ -128,7 +129,9 @@
- "  -s\t-- eject SCSI device\n"
- "  -f\t-- eject floppy\n"
- "  -q\t-- eject tape\n"
--"  -p\t-- use /proc/mounts instead of /etc/mtab\n")
-+"  -p\t-- use /proc/mounts instead of /etc/mtab\n"
-+"  -m\t-- do not unmount device even if it is mounted\n"
-+)
- , version);
- #ifdef GETOPTLONG
- 	fprintf(stderr,_(
-@@ -137,7 +140,7 @@
- "  -a --auto   -c --changerslot  -t --trayclose  -x --cdspeed\n"
- "  -r --cdrom  -s --scsi	 -f --floppy\n"
- "  -q --tape   -n --noop	 -V --version\n"
--"  -p --proc\n"));
-+"  -p --proc   -m --no-unmount\n"));
- #endif /* GETOPTLONG */
- 	fprintf(stderr,_(
- "Parameter <name> can be a device file or a mount point.\n"
-@@ -151,7 +154,7 @@
- /* Handle command line options. */
- static void parse_args(int argc, char **argv, char **device)
- {
--	const char *flags = "a:c:x:dfhnqrstvVp";
-+	const char *flags = "a:c:x:dfhnqrstvVpm";
- #ifdef GETOPTLONG
- 	static struct option long_options[] =
- 	{
-@@ -169,6 +172,7 @@
- 		{"tape",	no_argument,	   NULL, 'q'},
- 		{"version",	no_argument,	   NULL, 'V'},
- 		{"proc",	no_argument,	   NULL, 'p'},
-+		{"no-unmount",	no_argument,	   NULL, 'm'},
- 		{0, 0, 0, 0}
- 	};
- 	int option_index;
-@@ -231,6 +235,9 @@
- 			  usage();
- 			  exit(0);
- 			  break;
-+		  case 'm':
-+			  m_option = 1;
-+			  break;
- 		  case 'n':
- 			  n_option = 1;
- 			  break;
-@@ -933,7 +940,7 @@
- 	if (!c_option) HandleXOption(deviceName);
- 
- 	/* unmount device if mounted */
--	if (mounted) {
-+	if ((m_option != 1) && mounted) {
- 		if (v_option)
- 			printf(_("%s: unmounting `%s'\n"), programName, deviceName);
- 		Unmount(deviceName);
-@@ -942,7 +949,7 @@
- 	/* if it is a multipartition device, unmount any other partitions on
- 	   the device */
- 	pattern = MultiplePartitions(deviceName);
--	if (pattern != 0)
-+	if ((m_option != 1) && (pattern != 0))
- 		UnmountDevices(pattern);
- 
- 	/* handle -c option */
diff --git a/sys-apps/eject/files/eject-2.0.13-prefix-defaultdevice-with-dev.patch b/sys-apps/eject/files/eject-2.0.13-prefix-defaultdevice-with-dev.patch
deleted file mode 100644
index 0875bd69d25a..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-prefix-defaultdevice-with-dev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-make sure DEFAULTDEVICE starts with "/dev/"
-http://bugs.gentoo.org/91977
-
---- volname.c
-+++ volname.c
-@@ -39,6 +39,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- 
- int main(int argc, char *argv[])
- {
-@@ -52,7 +53,7 @@
-   if (argc == 2) {
-     device = argv[1];
-   } else if (argc == 1) {
--    device = DEFAULTDEVICE;
-+    device = "/dev/" DEFAULTDEVICE;
-   } else {
-     fprintf(stderr, _("usage: volname [<device-file>]\n"));
-     exit(1);
diff --git a/sys-apps/eject/files/eject-2.0.13-pumount.patch b/sys-apps/eject/files/eject-2.0.13-pumount.patch
deleted file mode 100644
index a0f0935b12c3..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-pumount.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Run pumount before umount so the hotplugging people will be happy.
-
-http://bugs.gentoo.org/91977
-
---- eject.c
-+++ eject.c
-@@ -540,11 +540,14 @@
- 	switch (fork()) {
- 	  case 0: /* child */
- 		  seteuid(getuid()); /* reduce likelyhood of security holes when running setuid */
--		  if(p_option)
--			  execl("/bin/umount", "/bin/umount", fullName, "-n", NULL);
--		  else
--			  execl("/bin/umount", "/bin/umount", fullName, NULL);
--		  fprintf(stderr, _("%s: unable to exec /bin/umount of `%s': %s\n"),
-+		  if(p_option) {
-+			  execlp("pumount", "pumount", fullName, "-n", NULL);
-+			  execlp("umount", "umount", fullName, "-n", NULL);
-+		  } else {
-+			  execlp("pumount", "pumount", fullName, NULL);
-+			  execlp("umount", "umount", fullName, NULL);
-+		  }
-+		  fprintf(stderr, _("%s: unable to exec umount of `%s': %s\n"),
- 				  programName, fullName, strerror(errno));
- 		  exit(1);
- 		  break;
diff --git a/sys-apps/eject/files/eject-2.0.13-toggle.patch b/sys-apps/eject/files/eject-2.0.13-toggle.patch
deleted file mode 100644
index 3e11d9060e69..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-toggle.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Add support for toggling the cdrom.
-
-Patch by Patrik Kullman.
-
-http://bugs.gentoo.org/62612
-
-Note: this requires the no-umount.patch be applied first 
-or the 4th and 5th hunks will fail.
-
---- eject.c
-+++ eject.c
-@@ -51,6 +51,7 @@
- #endif /* GETOPTLONG */
- #include <errno.h>
- #include <regex.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-@@ -79,6 +80,7 @@
- int r_option = 0;
- int s_option = 0;
- int t_option = 0;
-+int T_option = 0;
- int v_option = 0;
- int x_option = 0;
- int p_option = 0;
-@@ -118,11 +120,13 @@
- "  eject [-vn] -a on|off|1|0 [<name>]	-- turn auto-eject feature on or off\n"
- "  eject [-vn] -c <slot> [<name>]	-- switch discs on a CD-ROM changer\n"
- "  eject [-vn] -t [<name>]		-- close tray\n"
-+"  eject [-vn] -T [<name>]		-- toggle tray status (EXPERIMENTAL)\n"
- "  eject [-vn] -x <speed> [<name>]	-- set CD-ROM max speed\n"
- "Options:\n"
- "  -v\t-- enable verbose output\n"
- "  -n\t-- don't eject, just show device found\n"
- "  -r\t-- eject CD-ROM\n"
-+"  -T\t-- toggle tray status (EXPERIMENTAL)\n"
- "  -s\t-- eject SCSI device\n"
- "  -f\t-- eject floppy\n"
- "  -q\t-- eject tape\n"
-@@ -135,7 +139,7 @@
- "  -a --auto   -c --changerslot  -t --trayclose  -x --cdspeed\n"
- "  -r --cdrom  -s --scsi	 -f --floppy\n"
- "  -q --tape   -n --noop	 -V --version\n"
--"  -p --proc   -m --no-unmount\n"));
-+"  -p --proc   -m --no-unmount   -T --toggletray\n"));
- #endif /* GETOPTLONG */
- 	fprintf(stderr,_(
- "Parameter <name> can be a device file or a mount point.\n"
-@@ -149,7 +153,7 @@
- /* Handle command line options. */
- static void parse_args(int argc, char **argv, char **device)
- {
--	const char *flags = "a:c:x:dfhnqrstvVpm";
-+	const char *flags = "a:c:x:dfhnqrstTvVpm";
- #ifdef GETOPTLONG
- 	static struct option long_options[] =
- 	{
-@@ -159,6 +163,7 @@
- 		{"auto",	required_argument, NULL, 'a'},
- 		{"changerslot", required_argument, NULL, 'c'},
- 		{"trayclose",	no_argument,	   NULL, 't'},
-+		{"toggletray",	no_argument,	   NULL, 'T'},
- 		{"cdspeed",	required_argument, NULL, 'x'},
- 		{"noop",	no_argument,	   NULL, 'n'},
- 		{"cdrom",	no_argument,	   NULL, 'r'},
-@@ -247,6 +252,9 @@
- 		  case 't':
- 			  t_option = 1;
- 			  break;
-+		  case 'T':
-+			  T_option = 1;
-+			  break;
- 		  case 'v':
- 			  v_option = 1;
- 			  break;
-@@ -909,6 +917,23 @@
- 		exit(0);
- 	}
- 
-+	/* handle -T option */
-+	if (T_option) {
-+		struct timeval tv, tv2;
-+		if (v_option)
-+			printf(_("%s: trying to eject\n"), programName);
-+		fd = OpenDevice(deviceName);
-+		gettimeofday(&tv, NULL);
-+		EjectCdrom(fd);
-+		gettimeofday(&tv2, NULL);
-+		if ((tv2.tv_sec - tv.tv_sec) < 1) {
-+			if (v_option)
-+				printf(_("%s: tray seems open, trying to close\n"), programName);
-+			CloseTray(fd);
-+			HandleXOption(deviceName);
-+			exit(0);
-+		}
-+	}
- 	/* handle -t option */
- 	if (t_option) {
- 		if (v_option)
diff --git a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
deleted file mode 100644
index a508c8196749..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Ripped from Fedora [merged upstream]
-
-More recent kernels actually want to umount using the mount point and
-not the device name (this makes more sense, you can have the same
-device mounted in many places).
-
-This is a minor changes to do just that.
-
---- eject-2.0.13deb/eject.c
-+++ eject-2.0.13deb/eject.c
-@@ -718,8 +718,8 @@
- 			status = regexec(&preg, s1, 0, 0, 0);
- 			if (status == 0) {
- 				if (v_option)
--					printf(_("%s: unmounting `%s'\n"), programName, s1);
--				Unmount(s1);
-+					printf(_("%s: unmounting `%s'\n"), programName, s2);
-+				Unmount(s2);
- 				regfree(&preg);
- 			}
- 		}
-@@ -952,8 +952,8 @@
- 	/* unmount device if mounted */
- 	if (mounted) {
- 		if (v_option)
--			printf(_("%s: unmounting `%s'\n"), programName, deviceName);
--		Unmount(deviceName);
-+			printf(_("%s: unmounting device `%s' from `%s'\n"), programName, deviceName, mountName);
-+		Unmount(mountName);
- 	}
- 
- 	/* if it is a multipartition device, unmount any other partitions on
diff --git a/sys-apps/eject/files/eject-2.0.13-xregcomp.patch b/sys-apps/eject/files/eject-2.0.13-xregcomp.patch
deleted file mode 100644
index f9116dfce662..000000000000
--- a/sys-apps/eject/files/eject-2.0.13-xregcomp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Make sure the regcomp's work.
-
-http://bugs.gentoo.org/91977
-
---- eject.c
-+++ eject.c
-@@ -706,2 +706,11 @@
- 
-+int xregcomp(regex_t *preg, const char *regex, int cflags)
-+{
-+	if (regcomp(preg, regex, cflags) != 0) {
-+		fprintf(stderr, _("%s: regcomp failed: %s\n"), programName, strerror(errno));
-+		exit(1);
-+	}
-+	return 0;
-+}
-+
- 
-@@ -720,3 +729,3 @@
- 
--	regcomp(&preg, pattern, REG_EXTENDED);
-+	xregcomp(&preg, pattern, REG_EXTENDED);
- 
-@@ -799,3 +808,3 @@
- 		strcat(pattern, "[a-z]([0-9]?[0-9])?$");
--		regcomp(&preg, pattern, REG_EXTENDED|REG_NOSUB);
-+		xregcomp(&preg, pattern, REG_EXTENDED|REG_NOSUB);
- 		status = regexec(&preg, name, 1, 0, 0);
diff --git a/sys-apps/eject/files/eject-2.1.0-regcomp-check.patch b/sys-apps/eject/files/eject-2.1.0-regcomp-check.patch
deleted file mode 100644
index 3c225346caad..000000000000
--- a/sys-apps/eject/files/eject-2.1.0-regcomp-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Make sure the regcomp's work.
-
-http://bugs.gentoo.org/91977
-
---- eject.c
-+++ eject.c
-@@ -882,7 +882,10 @@ static char *MultiplePartitions(const ch
- 		strcpy(pattern, "^/dev/");
- 		strcat(pattern, partitionDevice[i]);
- 		strcat(pattern, "[a-z]([0-9]?[0-9])?$");
--		regcomp(&preg, pattern, REG_EXTENDED|REG_NOSUB);
-+		if (regcomp(&preg, pattern, REG_EXTENDED|REG_NOSUB) != 0) {
-+			perror(programName);
-+			exit(1);
-+		}
- 		status = regexec(&preg, name, 1, 0, 0);
- 		regfree(&preg);
- 		if (status == 0) {
diff --git a/sys-apps/eject/files/eject-2.1.0-scsi-io-update.patch b/sys-apps/eject/files/eject-2.1.0-scsi-io-update.patch
deleted file mode 100644
index cc449068b28e..000000000000
--- a/sys-apps/eject/files/eject-2.1.0-scsi-io-update.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-===================================================================
-RCS file: /cvsroot/eject/eject/eject/eject.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- eject/eject/eject/eject.c	2005/07/24 23:54:48	1.3
-+++ eject/eject/eject/eject.c	2005/08/24 00:39:38	1.4
-@@ -625,56 +625,51 @@
- 
- 
- /*
-- * Eject using SCSI commands. Return 1 if successful, 0 otherwise.
-+ * Eject using SCSI SG_IO commands. Return 1 if successful, 0 otherwise.
-  */
- static int EjectScsi(int fd)
- {
--	int status;
--	struct sdata {
--		int  inlen;
--		int  outlen;
--		char cmd[256];
--	} scsi_cmd;
--
--	scsi_cmd.inlen	= 0;
--	scsi_cmd.outlen = 0;
--	scsi_cmd.cmd[0] = ALLOW_MEDIUM_REMOVAL;
--	scsi_cmd.cmd[1] = 0;
--	scsi_cmd.cmd[2] = 0;
--	scsi_cmd.cmd[3] = 0;
--	scsi_cmd.cmd[4] = 0;
--	scsi_cmd.cmd[5] = 0;
--	status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
--	if (status != 0)
-+	int status, k;
-+	sg_io_hdr_t io_hdr;
-+	unsigned char allowRmBlk[6] = {ALLOW_MEDIUM_REMOVAL, 0, 0, 0, 0, 0};
-+	unsigned char startStop1Blk[6] = {START_STOP, 0, 0, 0, 1, 0};
-+	unsigned char startStop2Blk[6] = {START_STOP, 0, 0, 0, 2, 0};
-+	unsigned char inqBuff[2];
-+	unsigned char sense_buffer[32];
-+
-+	if ((ioctl(fd, SG_GET_VERSION_NUM, &k) < 0) || (k < 30000)) {
-+	  printf("not an sg device, or old sg driver\n");
-+	  return 0;
-+	}
-+
-+	memset(&io_hdr, 0, sizeof(sg_io_hdr_t));
-+	io_hdr.interface_id = 'S';
-+	io_hdr.cmd_len = 6;
-+	io_hdr.mx_sb_len = sizeof(sense_buffer);
-+	io_hdr.dxfer_direction = SG_DXFER_NONE;
-+	io_hdr.dxfer_len = 0;
-+	io_hdr.dxferp = inqBuff;
-+	io_hdr.sbp = sense_buffer;
-+	io_hdr.timeout = 2000;
-+
-+	io_hdr.cmdp = allowRmBlk;
-+	status = ioctl(fd, SG_IO, (void *)&io_hdr);
-+	if (status < 0)
- 		return 0;
- 
--	scsi_cmd.inlen	= 0;
--	scsi_cmd.outlen = 0;
--	scsi_cmd.cmd[0] = START_STOP;
--	scsi_cmd.cmd[1] = 0;
--	scsi_cmd.cmd[2] = 0;
--	scsi_cmd.cmd[3] = 0;
--	scsi_cmd.cmd[4] = 1;
--	scsi_cmd.cmd[5] = 0;
--	status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
--	if (status != 0)
-+	io_hdr.cmdp = startStop1Blk;
-+	status = ioctl(fd, SG_IO, (void *)&io_hdr);
-+	if (status < 0)
- 		return 0;
- 
--	scsi_cmd.inlen	= 0;
--	scsi_cmd.outlen = 0;
--	scsi_cmd.cmd[0] = START_STOP;
--	scsi_cmd.cmd[1] = 0;
--	scsi_cmd.cmd[2] = 0;
--	scsi_cmd.cmd[3] = 0;
--	scsi_cmd.cmd[4] = 2;
--	scsi_cmd.cmd[5] = 0;
--	status = ioctl(fd, SCSI_IOCTL_SEND_COMMAND, (void *)&scsi_cmd);
--	if (status != 0)
-+	io_hdr.cmdp = startStop2Blk;
-+	status = ioctl(fd, SG_IO, (void *)&io_hdr);
-+	if (status < 0)
- 		return 0;
- 
- 	/* force kernel to reread partition table when new disc inserted */
- 	status = ioctl(fd, BLKRRPART);
--	return (status == 0);
-+	return 1;
- }
- 
- 
-@@ -686,7 +681,7 @@
- 	int status;
- 
- 	status = ioctl(fd, FDEJECT);
--	return (status == 0);
-+	return (status >= 0);
- }
- 
- 
-@@ -701,7 +696,7 @@
- 	op.mt_op = MTOFFL; /* rewind and eject */
- 	op.mt_count = 0;   /* not used */
- 	status = ioctl(fd, MTIOCTOP, &op);
--	return (status == 0);
-+	return (status >= 0);
- }
- 
- 
diff --git a/sys-apps/eject/files/eject-2.1.0-toggle.patch b/sys-apps/eject/files/eject-2.1.0-toggle.patch
deleted file mode 100644
index 857622cd9a6a..000000000000
--- a/sys-apps/eject/files/eject-2.1.0-toggle.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Patch by Stuart W. Finlayson
-
-http://bugs.gentoo.org/122256
-
---- eject.c
-+++ eject.c
-@@ -1028,16 +1028,6 @@
- 		exit(0);
- 	}
- 
--	/* handle -T option */
--	if (T_option) {
--		if (v_option)
--			printf(_("%s: toggling tray\n"), programName);
--		fd = OpenDevice(deviceName);
--		ToggleTray(fd);
--		HandleXOption(deviceName);
--		exit(0);
--	}
--
- 	/* handle -x option only */
- 	if (!c_option) HandleXOption(deviceName);
- 
-@@ -1054,6 +1044,16 @@
- 	if ((m_option != 1) && (pattern != 0))
- 		UnmountDevices(pattern);
- 
-+	/* handle -T option */
-+	if (T_option) {
-+		if (v_option)
-+			printf(_("%s: toggling tray\n"), programName);
-+		fd = OpenDevice(deviceName);
-+		ToggleTray(fd);
-+		HandleXOption(deviceName);
-+		exit(0);
-+	}
-+	
- 	/* handle -c option */
- 	if (c_option) {
- 		if (v_option)
diff --git a/sys-apps/eject/files/eject-2.1.4-toggle.patch b/sys-apps/eject/files/eject-2.1.4-toggle.patch
deleted file mode 100644
index cc3237f32c5a..000000000000
--- a/sys-apps/eject/files/eject-2.1.4-toggle.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Patch by Stuart W. Finlayson
-
-http://bugs.gentoo.org/122256
-
---- eject.c
-+++ eject.c
-@@ -1225,16 +1225,6 @@
- 		exit(0);
- 	}
- 
--	/* handle -T option */
--	if (T_option) {
--		if (v_option)
--			printf(_("%s: toggling tray\n"), programName);
--		fd = OpenDevice(deviceName);
--		ToggleTray(fd);
--		HandleXOption(deviceName);
--		exit(0);
--	}
--	
- 	/* handle -X option */
- 	if (X_option) {
- 		if (v_option)
-@@ -1260,6 +1250,16 @@
- 	if ((m_option != 1) && (pattern != 0))
- 		UnmountDevices(pattern);
- 
-+	/* handle -T option */
-+	if (T_option) {
-+		if (v_option)
-+			printf(_("%s: toggling tray\n"), programName);
-+		fd = OpenDevice(deviceName);
-+		ToggleTray(fd);
-+		HandleXOption(deviceName);
-+		exit(0);
-+	}
-+
- 	/* handle -c option */
- 	if (c_option) {
- 		if (v_option)
diff --git a/sys-apps/findutils/files/digest-findutils-4.2.30 b/sys-apps/findutils/files/digest-findutils-4.2.30
deleted file mode 100644
index 0610d01b91f1..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.2.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c35ff6502e0b3514c99089cb5d333c25 findutils-4.2.30.tar.gz 1188123
-RMD160 bd0079088e65b90c16897f8f3a64ad8a0d1d040f findutils-4.2.30.tar.gz 1188123
-SHA256 344b9cbb4034907f80398c6a6d3724507ff4b519036f13bb811d12f702043af4 findutils-4.2.30.tar.gz 1188123
diff --git a/sys-apps/findutils/files/digest-findutils-4.3.4 b/sys-apps/findutils/files/digest-findutils-4.3.4
deleted file mode 100644
index 9b15373e463b..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 26914bd1d57cbe806bba9d3a1b9e544a findutils-4.3.4.tar.gz 1705441
-RMD160 be50a51b049a282b4ef14d2e61d2e35ec452bf2e findutils-4.3.4.tar.gz 1705441
-SHA256 086ab11c86818ba9c78c080b84c28e00f73d60dd1633f669bc6b01da8a8ccf32 findutils-4.3.4.tar.gz 1705441
diff --git a/sys-apps/findutils/files/digest-findutils-4.3.6-r1 b/sys-apps/findutils/files/digest-findutils-4.3.6-r1
deleted file mode 100644
index b503a9057ede..000000000000
--- a/sys-apps/findutils/files/digest-findutils-4.3.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21c054db0812a48b8f79f6449f55f77d findutils-4.3.6.tar.gz 1751567
-RMD160 c133485a18654054fb8f5bf715173e94bd3e250a findutils-4.3.6.tar.gz 1751567
-SHA256 8002e96c91c23c2424ec377442b4acaf0fa293dbfec6132db9b95f5d3559437b findutils-4.3.6.tar.gz 1751567
diff --git a/sys-apps/findutils/files/findutils-4.3.4-selinux.diff b/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
deleted file mode 100644
index 176c30cabc28..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.4-selinux.diff
+++ /dev/null
@@ -1,462 +0,0 @@
-diff -purN findutils-4.3.4.orig/find/Makefile.am findutils-4.3.4/find/Makefile.am
---- findutils-4.3.4.orig/find/Makefile.am	2007-03-07 17:55:47.000000000 -0500
-+++ findutils-4.3.4/find/Makefile.am	2007-05-12 22:07:47.498816252 -0400
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- 
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c version.c
-@@ -26,7 +27,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- 
-diff -purN findutils-4.3.4.orig/find/Makefile.in findutils-4.3.4/find/Makefile.in
---- findutils-4.3.4.orig/find/Makefile.in	2007-04-21 09:04:48.000000000 -0400
-+++ findutils-4.3.4/find/Makefile.in	2007-05-12 22:08:43.029980793 -0400
-@@ -273,7 +273,7 @@ CPPFLAGS = @CPPFLAGS@
- CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
- CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -502,7 +502,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- all: all-recursive
-diff -purN findutils-4.3.4.orig/find/defs.h findutils-4.3.4/find/defs.h
---- findutils-4.3.4.orig/find/defs.h	2007-04-15 09:09:58.000000000 -0400
-+++ findutils-4.3.4/find/defs.h	2007-05-12 22:06:42.675122161 -0400
-@@ -140,6 +140,10 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
- #if 1
- #include <stdbool.h>
- typedef bool boolean;
-@@ -357,6 +361,9 @@ struct predicate
-     struct dir_id   fileid;	/* samefile */
-     mode_t type;		/* type */
-     FILE *stream;		/* ls fls fprint0 */
-+#ifdef WITH_SELINUX
-+    security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
-     struct format_val printf_vec; /* printf fprintf fprint  */
-   } args;
- 
-@@ -520,6 +527,9 @@ boolean pred_used PARAMS((char *pathname
- boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
- boolean pred_writable PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
- boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
-+#ifdef WITH_SELINUX
-+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr));
-+#endif /* WITH_SELINUX */
- 
- 
- 
-@@ -642,6 +652,10 @@ struct options
-   /* Optimisation level.  One is the default. 
-    */
-   unsigned short optimisation_level;
-+
-+#ifdef WITH_SELINUX
-+  int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
- 
-diff -purN findutils-4.3.4.orig/find/find.1 findutils-4.3.4/find/find.1
---- findutils-4.3.4.orig/find/find.1	2007-04-15 15:02:19.000000000 -0400
-+++ findutils-4.3.4/find/find.1	2007-05-12 22:06:42.679122388 -0400
-@@ -641,6 +641,9 @@ links: if the \-H or \-P option was spec
- link to a file of type \fIc\fR; if the \-L option has been given, true
- if \fIc\fR is `l'.  In other words, for symbolic links, \-xtype checks
- the type of the file that \-type does not check.
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
- 
- .SS ACTIONS
- .IP "\-delete\fR"
-@@ -951,6 +954,8 @@ File's numeric user ID.
- File's type (like in ls \-l), U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.3.4.orig/find/find.c findutils-4.3.4/find/find.c
---- findutils-4.3.4.orig/find/find.c	2007-04-17 05:04:27.000000000 -0400
-+++ findutils-4.3.4/find/find.c	2007-05-12 22:06:42.679122388 -0400
-@@ -1250,7 +1250,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
--  int subdirs_left;		/* Number of unexamined subdirs in PATHNAME. */
-+  int subdirs_left=0;		/* Number of unexamined subdirs in PATHNAME. */
-   boolean subdirs_unreliable;	/* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
-   unsigned int idx;		/* Which entry are we on? */
-   struct stat stat_buf;
-diff -purN findutils-4.3.4.orig/find/parser.c findutils-4.3.4/find/parser.c
---- findutils-4.3.4.orig/find/parser.c	2007-04-15 09:04:26.000000000 -0400
-+++ findutils-4.3.4/find/parser.c	2007-05-12 22:23:07.675254119 -0400
-@@ -53,6 +53,13 @@
- /* We need <unistd.h> for isatty(). */
- #include <unistd.h> 
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -156,6 +163,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype         PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext      PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
- 
- boolean parse_print             PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- 
-@@ -314,6 +324,8 @@ static struct parser_table const parse_t
-   {ARG_TEST, "-help",                 parse_help,    NULL},       /* GNU */
-   {ARG_TEST, "version",               parse_version, NULL},	  /* GNU */
-   {ARG_TEST, "-version",              parse_version, NULL},	  /* GNU */
-+  {ARG_TEST, "context",               parse_scontext, pred_scontext},	/* SELinux */
-+  {ARG_TEST, "-context",              parse_scontext, pred_scontext},	/* SELinux */
-   {0, 0, 0, 0}
- };
- 
-@@ -383,10 +395,16 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_ALWAYS_DEREF:  /* -L */
- 	  options.xstat = optionl_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  break;
- 	  
- 	case SYMLINK_NEVER_DEREF:	/* -P (default) */
- 	  options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  /* Can't turn no_leaf_check off because the user might have specified 
- 	   * -noleaf anyway
- 	   */
-@@ -395,6 +413,9 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_DEREF_ARGSONLY: /* -H */
- 	  options.xstat = optionh_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- 	}
-     }
-   options.symlink_handling = opt;
-@@ -555,6 +576,94 @@ estimate_timestamp_success_rate(time_t w
-  
-    The predicate structure is updated with the new information. */
- 
-+#ifdef WITH_SELINUX
-+
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+  /* Our original getfilecon() call failed.  Perhaps we can't follow a
-+   * symbolic link.  If that might be the problem, lgetfilecon() the link. 
-+   * Otherwise, admit defeat. 
-+   */
-+  switch (errno)
-+    {
-+    case ENOENT:
-+    case ENOTDIR:
-+#ifdef DEBUG_STAT
-+      fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+      return lgetfilecon(name, p);
-+
-+    case EACCES:
-+    case EIO:
-+    case ELOOP:
-+    case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+    case EOVERFLOW:	    /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+    default:
-+      return prev_rv;	       
-+    }
-+}
-+
-+
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ * 
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links.  If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int 
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+  if (0 == state.curdepth) 
-+    {
-+      /* This file is from the command line; deference the link (if it
-+       * is a link).  
-+       */
-+      int rv = getfilecon(name, p);
-+      if (0 == rv)
-+	return 0;		/* success */
-+      else
-+	return fallback_getfilecon(name, p, rv);
-+    }
-+  else
-+    {
-+      /* Not a file on the command line; do not derefernce the link.
-+       */
-+      return lgetfilecon(name, p);
-+    }
-+}
-+
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect.  That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int 
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+  int rv = getfilecon(name, p);
-+  if (0 == rv)
-+    return 0;			/* normal case. */
-+  else
-+    return fallback_getfilecon(name, p, rv);
-+}
-+
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default).  That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int 
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+  return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- 
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -927,6 +1036,10 @@ tests (N can be +N or -N or N): -amin N 
-       -readable -writable -executable\n\
-       -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
-       -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+  puts (_("\
-+      -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
-   puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-       -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2130,6 +2243,29 @@ parse_version (const struct parser_table
-   exit (0);
- }
- 
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+  struct predicate *our_pred;
-+
-+  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+    return( false );
-+
-+  our_pred = insert_primary(entry);
-+  our_pred->need_stat = false;
-+#ifdef DEBUG
-+  our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+  our_pred->args.scontext = argv[*arg_ptr];;
-+
-+  (*arg_ptr)++;
-+  return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2387,7 +2523,11 @@ insert_fprintf (FILE *fp, const struct p
- 	  if (*scan2 == '.')
- 	    for (scan2++; ISDIGIT (*scan2); scan2++)
- 	      /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- 	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- 	    {
- 	      segmentp = make_segment (segmentp, format, scan2 - format,
- 				       KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.3.4.orig/find/pred.c findutils-4.3.4/find/pred.c
---- findutils-4.3.4.orig/find/pred.c	2007-04-15 11:48:31.000000000 -0400
-+++ findutils-4.3.4/find/pred.c	2007-05-12 22:06:42.683122616 -0400
-@@ -44,6 +44,14 @@
- #include "stat-time.h"
- #include "dircallback.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif  /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -226,6 +234,9 @@ struct pred_assoc pred_table[] =
-   {pred_user, "user    "},
-   {pred_writable, "writable "},
-   {pred_xtype, "xtype   "},
-+#ifdef WITH_SELINUX
-+  {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
-   {0, "none    "}
- };
- #endif
-@@ -929,6 +940,26 @@ do_fprintf(FILE *fp,
- 		     mode_to_filetype(stat_buf->st_mode & S_IFMT));
- 	  }
- 	  break;
-+#ifdef WITH_SELINUX
-+      case 'Z':               /* SELinux security context */
-+        {
-+          security_context_t scontext;
-+          int rv;
-+          rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+          if ( rv < 0 ) {
-+            (void) fprintf(stderr, "getfileconf(%s): %s",
-+                           pathname, strerror(errno));
-+            (void) fflush(stderr);
-+          }
-+          else {
-+	      segment->text[segment->text_len] = 's';
-+	      (void) fprintf (fp, segment->text, scontext);
-+	      freecon(scontext);
-+          }
-+        }
-+        break ;
-+#endif /* WITH_SELINUX */
- 	}
-       break;
-     }
-@@ -1705,6 +1736,34 @@ pred_xtype (char *pathname, struct stat 
-    */
-   return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+  
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext ( pathname, stat_buf, pred_ptr )
-+     char *pathname;
-+     struct stat *stat_buf;
-+     struct predicate *pred_ptr;
-+{
-+  int rv;
-+  security_context_t scontext;
-+
-+  rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+  if ( rv < 0 ) {
-+    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+    (void) fflush(stderr);
-+    return ( false );
-+  }
-+
-+  rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+  freecon(scontext);
-+  return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- 
- /*  1) fork to get a child; parent remembers the child pid
-     2) child execs the command requested
-diff -purN findutils-4.3.4.orig/find/tree.c findutils-4.3.4/find/tree.c
---- findutils-4.3.4.orig/find/tree.c	2007-03-31 14:11:29.000000000 -0400
-+++ findutils-4.3.4/find/tree.c	2007-05-12 22:06:42.687122844 -0400
-@@ -1285,6 +1285,10 @@ build_expression_tree(int argc, char *ar
-   const struct parser_table *entry_close, *entry_print, *entry_open;
-   int i, oldi;
- 
-+#ifdef WITH_SELINUX
-+  int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
-   predicates = NULL;
-   
-   /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1320,6 +1324,16 @@ build_expression_tree(int argc, char *ar
- 	}
- 
-       predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+      if (! is_selinux_enabled_flag) {
-+	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+	  error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+	}
-+      }
-+#endif
-+
-       parse_entry = find_parser (predicate_name);
-       if (parse_entry == NULL)
- 	{
-@@ -1518,6 +1532,9 @@ get_new_pred (const struct parser_table 
-   last_pred->need_stat = true;
-   last_pred->need_type = true;
-   last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+  last_pred->args.scontext = NULL;
-+#endif
-   last_pred->pred_next = NULL;
-   last_pred->pred_left = NULL;
-   last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/files/findutils-4.3.6-selinux.diff b/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
deleted file mode 100644
index ed2905b64ebf..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.6-selinux.diff
+++ /dev/null
@@ -1,463 +0,0 @@
-diff -purN findutils-4.3.6.orig/find/Makefile.am findutils-4.3.6/find/Makefile.am
---- findutils-4.3.6.orig/find/Makefile.am	2007-05-19 08:41:16.000000000 -0400
-+++ findutils-4.3.6/find/Makefile.am	2007-06-10 00:13:46.127258621 -0400
-@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = std-options
- localedir = $(datadir)/locale
- # noinst_PROGRAMS = regexprops
- # regexprops_SOURCES = regexprops.c
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- 
- noinst_LIBRARIES = libfindtools.a
- libfindtools_a_SOURCES = finddata.c fstype.c parser.c pred.c tree.c util.c version.c
-@@ -26,7 +27,7 @@ endif
- 
- EXTRA_DIST = defs.h $(man_MANS)
- INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- 
-diff -purN findutils-4.3.6.orig/find/Makefile.in findutils-4.3.6/find/Makefile.in
---- findutils-4.3.6.orig/find/Makefile.in	2007-05-21 17:45:37.000000000 -0400
-+++ findutils-4.3.6/find/Makefile.in	2007-06-10 00:13:46.129258259 -0400
-@@ -268,7 +268,7 @@ CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CYGPATH_W = @CYGPATH_W@
--DEFS = @DEFS@
-+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -501,7 +501,7 @@ libfindtools_a_SOURCES = finddata.c fsty
- @WITH_FTS_TRUE@oldfind_SOURCES = find.c
- @WITH_FTS_FALSE@ftsfind_SOURCES = ftsfind.c
- EXTRA_DIST = defs.h $(man_MANS)
--LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@
-+LDADD = ./libfindtools.a ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIB_CLOCK_GETTIME@ -lselinux
- man_MANS = find.1
- SUBDIRS = testsuite
- all: all-recursive
-diff -purN findutils-4.3.6.orig/find/defs.h findutils-4.3.6/find/defs.h
---- findutils-4.3.6.orig/find/defs.h	2007-05-07 07:10:14.000000000 -0400
-+++ findutils-4.3.6/find/defs.h	2007-06-10 00:18:00.769039629 -0400
-@@ -76,6 +76,9 @@ int get_statinfo PARAMS((const char *pat
- #define MODE_RWX	(S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW)
- #define MODE_ALL	(S_ISUID | S_ISGID | S_ISVTX | MODE_RWX)
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
- 
- struct predicate;
- struct options;
-@@ -300,6 +303,9 @@ struct predicate
-     struct samefile_file_id samefileid; /* samefile */
-     mode_t type;		/* type */
-     struct format_val printf_vec; /* printf fprintf fprint ls fls print0 fprint0 print */
-+#ifdef WITH_SELINUX
-+    security_context_t scontext; /* scontext */
-+#endif /*WITH_SELINUX*/
-   } args;
- 
-   /* The next predicate in the user input sequence,
-@@ -443,7 +449,9 @@ PREDICATEFUNCTION pred_used;
- PREDICATEFUNCTION pred_user;
- PREDICATEFUNCTION pred_writable;
- PREDICATEFUNCTION pred_xtype;
--
-+#ifdef WITH_SELINUX
-+PREDICATEFUNCTION pred_scontext;
-+#endif /* WITH_SELINUX */
- 
- 
- int launch PARAMS((const struct buildcmd_control *ctl,
-@@ -580,10 +588,13 @@ struct options
-    */
-   unsigned short optimisation_level;
- 
--
-   /* How should we quote filenames in error messages and so forth?
-    */
-   enum quoting_style err_quoting_style;
-+
-+#ifdef WITH_SELINUX
-+  int (*x_getfilecon)();
-+#endif /* WITH_SELINUX */
- };
- extern struct options options;
- 
-diff -purN findutils-4.3.6.orig/find/find.1 findutils-4.3.6/find/find.1
---- findutils-4.3.6.orig/find/find.1	2007-05-19 08:53:09.000000000 -0400
-+++ findutils-4.3.6/find/find.1	2007-06-10 00:13:46.132257714 -0400
-@@ -644,6 +644,9 @@ links: if the \-H or \-P option was spec
- link to a file of type \fIc\fR; if the \-L option has been given, true
- if \fIc\fR is `l'.  In other words, for symbolic links, \-xtype checks
- the type of the file that \-type does not check.
-+.IP "\-context \fIscontext\fR"
-+.IP "\--context \fIscontext\fR"
-+(SELinux only) File has the security context \fIscontext\fR.
- 
- .SS ACTIONS
- .IP "\-delete\fR"
-@@ -954,6 +957,8 @@ File's numeric user ID.
- File's type (like in ls \-l), U=unknown type (shouldn't happen)
- .IP %Y
- File's type (like %y), plus follow symlinks: L=loop, N=nonexistent
-+.IP %Z
-+(SELinux only) file's security context.
- .PP
- A `%' character followed by any other character is discarded, but the
- other character is printed (don't rely on this, as further format
-diff -purN findutils-4.3.6.orig/find/find.c findutils-4.3.6/find/find.c
---- findutils-4.3.6.orig/find/find.c	2007-04-30 18:57:02.000000000 -0400
-+++ findutils-4.3.6/find/find.c	2007-06-10 00:13:46.134257351 -0400
-@@ -1251,7 +1251,7 @@ process_path (char *pathname, char *name
- static void
- process_dir (char *pathname, char *name, int pathlen, const struct stat *statp, char *parent)
- {
--  int subdirs_left;		/* Number of unexamined subdirs in PATHNAME. */
-+  int subdirs_left=0;		/* Number of unexamined subdirs in PATHNAME. */
-   boolean subdirs_unreliable;	/* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */
-   unsigned int idx;		/* Which entry are we on? */
-   struct stat stat_buf;
-diff -purN findutils-4.3.6.orig/find/parser.c findutils-4.3.6/find/parser.c
---- findutils-4.3.6.orig/find/parser.c	2007-05-07 14:56:48.000000000 -0400
-+++ findutils-4.3.6/find/parser.c	2007-06-10 00:13:46.165251725 -0400
-@@ -55,6 +55,13 @@
- /* We need <unistd.h> for isatty(). */
- #include <unistd.h> 
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+int optionh_getfilecon(const char *name, security_context_t *p);
-+int optionl_getfilecon(const char *name, security_context_t *p);
-+int optionp_getfilecon(const char *name, security_context_t *p);
-+#endif /*WITH_SELINUX*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -158,6 +165,9 @@ static boolean parse_noignore_race PARAM
- static boolean parse_warn          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_xtype         PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- static boolean parse_quit          PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#ifdef WITH_SELINUX
-+static boolean parse_scontext      PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
-+#endif /*WITH_SELINUX*/
- 
- boolean parse_print             PARAMS((const struct parser_table*, char *argv[], int *arg_ptr));
- 
-@@ -324,6 +334,8 @@ static struct parser_table const parse_t
-   {ARG_TEST, "-help",                 parse_help,    NULL},       /* GNU */
-   {ARG_TEST, "version",               parse_version, NULL},	  /* GNU */
-   {ARG_TEST, "-version",              parse_version, NULL},	  /* GNU */
-+  {ARG_TEST, "context",               parse_scontext, pred_scontext},	/* SELinux */
-+  {ARG_TEST, "-context",              parse_scontext, pred_scontext},	/* SELinux */
-   {0, 0, 0, 0}
- };
- 
-@@ -393,10 +405,16 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_ALWAYS_DEREF:  /* -L */
- 	  options.xstat = optionl_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionl_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  break;
- 	  
- 	case SYMLINK_NEVER_DEREF:	/* -P (default) */
- 	  options.xstat = optionp_stat;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionp_getfilecon;
-+#endif /* WITH_SELINUX */
- 	  /* Can't turn no_leaf_check off because the user might have specified 
- 	   * -noleaf anyway
- 	   */
-@@ -405,6 +423,9 @@ set_follow_state(enum SymlinkOption opt)
- 	case SYMLINK_DEREF_ARGSONLY: /* -H */
- 	  options.xstat = optionh_stat;
- 	  options.no_leaf_check = true;
-+#ifdef WITH_SELINUX
-+	  options.x_getfilecon = optionh_getfilecon;
-+#endif /* WITH_SELINUX */
- 	}
-     }
-   options.symlink_handling = opt;
-@@ -604,6 +625,94 @@ collect_arg_stat_info(char **argv, int *
-  
-    The predicate structure is updated with the new information. */
- 
-+#ifdef WITH_SELINUX
-+
-+static int
-+fallback_getfilecon(const char *name, security_context_t *p, int prev_rv)
-+{
-+  /* Our original getfilecon() call failed.  Perhaps we can't follow a
-+   * symbolic link.  If that might be the problem, lgetfilecon() the link. 
-+   * Otherwise, admit defeat. 
-+   */
-+  switch (errno)
-+    {
-+    case ENOENT:
-+    case ENOTDIR:
-+#ifdef DEBUG_STAT
-+      fprintf(stderr, "fallback_getfilecon(): getfilecon(%s) failed; falling back on lgetfilecon()\n", name);
-+#endif
-+      return lgetfilecon(name, p);
-+
-+    case EACCES:
-+    case EIO:
-+    case ELOOP:
-+    case ENAMETOOLONG:
-+#ifdef EOVERFLOW
-+    case EOVERFLOW:	    /* EOVERFLOW is not #defined on UNICOS. */
-+#endif
-+    default:
-+      return prev_rv;	       
-+    }
-+}
-+
-+
-+/* optionh_getfilecon() implements the getfilecon operation when the
-+ * -H option is in effect.
-+ * 
-+ * If the item to be examined is a command-line argument, we follow
-+ * symbolic links.  If the getfilecon() call fails on the command-line
-+ * item, we fall back on the properties of the symbolic link.
-+ *
-+ * If the item to be examined is not a command-line argument, we
-+ * examine the link itself.
-+ */
-+int 
-+optionh_getfilecon(const char *name, security_context_t *p)
-+{
-+  if (0 == state.curdepth) 
-+    {
-+      /* This file is from the command line; deference the link (if it
-+       * is a link).  
-+       */
-+      int rv = getfilecon(name, p);
-+      if (0 == rv)
-+	return 0;		/* success */
-+      else
-+	return fallback_getfilecon(name, p, rv);
-+    }
-+  else
-+    {
-+      /* Not a file on the command line; do not derefernce the link.
-+       */
-+      return lgetfilecon(name, p);
-+    }
-+}
-+
-+/* optionl_getfilecon() implements the getfilecon operation when the
-+ * -L option is in effect.  That option makes us examine the thing the
-+ * symbolic link points to, not the symbolic link itself.
-+ */
-+int 
-+optionl_getfilecon(const char *name, security_context_t *p)
-+{
-+  int rv = getfilecon(name, p);
-+  if (0 == rv)
-+    return 0;			/* normal case. */
-+  else
-+    return fallback_getfilecon(name, p, rv);
-+}
-+
-+/* optionp_getfilecon() implements the stat operation when the -P
-+ * option is in effect (this is also the default).  That option makes
-+ * us examine the symbolic link itself, not the thing it points to.
-+ */
-+int 
-+optionp_getfilecon(const char *name, security_context_t *p)
-+{
-+  return lgetfilecon(name, p);
-+}
-+#endif /* WITH_SELINUX */
-+
- 
- static boolean
- parse_and (const struct parser_table* entry, char **argv, int *arg_ptr)
-@@ -1004,6 +1113,10 @@ tests (N can be +N or -N or N): -amin N 
-       -readable -writable -executable\n\
-       -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\
-       -used N -user NAME -xtype [bcdpfls]\n"));
-+#ifdef WITH_SELINUX
-+  puts (_("\
-+      -context CONTEXT\n"));
-+#endif /*WITH_SELINUX*/
-   puts (_("\
- actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\
-       -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\
-@@ -2349,6 +2462,29 @@ parse_version (const struct parser_table
-   exit (0);
- }
- 
-+#ifdef WITH_SELINUX
-+
-+static boolean
-+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr)
-+{
-+  struct predicate *our_pred;
-+
-+  if ( (argv == NULL) || (argv[*arg_ptr] == NULL) )
-+    return( false );
-+
-+  our_pred = insert_primary(entry);
-+  our_pred->need_stat = false;
-+#ifdef DEBUG
-+  our_pred->p_name = find_pred_name (pred_scontext);
-+#endif /*DEBUG*/
-+  our_pred->args.scontext = argv[*arg_ptr];;
-+
-+  (*arg_ptr)++;
-+  return( true );
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- static boolean
- parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
- {
-@@ -2598,7 +2734,11 @@ insert_fprintf (struct format_val *vec,
- 	  if (*scan2 == '.')
- 	    for (scan2++; ISDIGIT (*scan2); scan2++)
- 	      /* Do nothing. */ ;
-+#ifdef WITH_SELINUX
-+	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyYZ", *scan2))
-+#else
- 	  if (strchr ("abcdDfFgGhHiklmMnpPsStuUyY", *scan2))
-+#endif
- 	    {
- 	      segmentp = make_segment (segmentp, format, scan2 - format,
- 				       KIND_FORMAT, *scan2, 0,
-diff -purN findutils-4.3.6.orig/find/pred.c findutils-4.3.6/find/pred.c
---- findutils-4.3.6.orig/find/pred.c	2007-05-06 16:03:48.000000000 -0400
-+++ findutils-4.3.6/find/pred.c	2007-06-10 00:34:55.525855254 -0400
-@@ -46,6 +46,14 @@
- #include "dircallback.h"
- #include "error.h"
- 
-+#ifdef WITH_SELINUX
-+#include <selinux/selinux.h>
-+#endif /*WITH_SELINUX*/
-+
-+#ifndef FNM_CASEFOLD
-+#define FNM_CASEFOLD (1<<4)
-+#endif  /*FNM_CASEFOLD*/
-+
- #if ENABLE_NLS
- # include <libintl.h>
- # define _(Text) gettext (Text)
-@@ -228,6 +236,9 @@ struct pred_assoc pred_table[] =
-   {pred_user, "user    "},
-   {pred_writable, "writable "},
-   {pred_xtype, "xtype   "},
-+#ifdef WITH_SELINUX
-+  {pred_scontext, "context"},
-+#endif /*WITH_SELINUX*/
-   {0, "none    "}
- };
- #endif
-@@ -1003,6 +1014,26 @@ do_fprintf(struct format_val *dest,
- 			     mode_to_filetype(stat_buf->st_mode & S_IFMT));
- 	  }
- 	  break;
-+#ifdef WITH_SELINUX
-+      case 'Z':               /* SELinux security context */
-+        {
-+          security_context_t scontext;
-+          int rv;
-+          rv = (*options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+          if ( rv < 0 ) {
-+            fprintf(stderr, "getfileconf(%s): %s",
-+                           pathname, strerror(errno));
-+            fflush(stderr);
-+          }
-+          else {
-+	      segment->text[segment->text_len] = 's';
-+	      checked_fprintf (dest, segment->text, scontext);
-+	      freecon(scontext);
-+          }
-+        }
-+        break ;
-+#endif /* WITH_SELINUX */
- 	}
-       /* end of KIND_FORMAT case */
-       break;
-@@ -1780,6 +1811,31 @@ pred_xtype (const char *pathname, struct
-    */
-   return (pred_type (pathname, &sbuf, pred_ptr));
- }
-+  
-+
-+#ifdef WITH_SELINUX
-+
-+boolean
-+pred_scontext (const char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)
-+{
-+  int rv;
-+  security_context_t scontext;
-+
-+  rv = (* options.x_getfilecon)(state.rel_pathname, &scontext);
-+
-+  if ( rv < 0 ) {
-+    (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno));
-+    (void) fflush(stderr);
-+    return ( false );
-+  }
-+
-+  rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0);
-+  freecon(scontext);
-+  return rv;
-+}
-+
-+#endif /*WITH_SELINUX*/
-+
- 
- /*  1) fork to get a child; parent remembers the child pid
-     2) child execs the command requested
-diff -purN findutils-4.3.6.orig/find/tree.c findutils-4.3.6/find/tree.c
---- findutils-4.3.6.orig/find/tree.c	2007-05-06 07:17:23.000000000 -0400
-+++ findutils-4.3.6/find/tree.c	2007-06-10 00:13:46.176249729 -0400
-@@ -1195,6 +1195,10 @@ build_expression_tree(int argc, char *ar
-   const struct parser_table *entry_close, *entry_print, *entry_open;
-   int i, oldi;
- 
-+#ifdef WITH_SELINUX
-+  int is_selinux_enabled_flag = is_selinux_enabled()>0;
-+#endif /* WITH_SELINUX */
-+
-   predicates = NULL;
-   
-   /* Find where in ARGV the predicates begin by skipping the list of
-@@ -1230,6 +1234,16 @@ build_expression_tree(int argc, char *ar
- 	}
- 
-       predicate_name = argv[i];
-+
-+#ifdef WITH_SELINUX
-+      if (! is_selinux_enabled_flag) {
-+	if ((strncmp(predicate_name,"-context",strlen("-context"))==0) ||
-+	    (strncmp(predicate_name,"--context",strlen("--context"))==0)) {
-+	  error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name);
-+	}
-+      }
-+#endif
-+
-       parse_entry = find_parser (predicate_name);
-       if (parse_entry == NULL)
- 	{
-@@ -1433,6 +1447,9 @@ get_new_pred (const struct parser_table 
-   last_pred->need_stat = true;
-   last_pred->need_type = true;
-   last_pred->args.str = NULL;
-+#ifdef WITH_SELINUX
-+  last_pred->args.scontext = NULL;
-+#endif
-   last_pred->pred_next = NULL;
-   last_pred->pred_left = NULL;
-   last_pred->pred_right = NULL;
diff --git a/sys-apps/findutils/files/findutils-4.3.6-sv-bug-20005.patch b/sys-apps/findutils/files/findutils-4.3.6-sv-bug-20005.patch
deleted file mode 100644
index f002f00a655a..000000000000
--- a/sys-apps/findutils/files/findutils-4.3.6-sv-bug-20005.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-fix from upstream
-
-http://bugs.gentoo.org/180334
-
-Index: parser.c
-===================================================================
-RCS file: /sources/findutils/findutils/find/parser.c,v
-retrieving revision 1.122
-diff -u -p -r1.122 parser.c
---- find/parser.c	31 May 2007 08:15:05 -0000	1.122
-+++ find/parser.c	31 May 2007 09:01:07 -0000
-@@ -3175,19 +3175,22 @@ parse_time (const struct parser_table* e
-   struct predicate *our_pred;
-   struct time_val tval;
-   enum comparison_type comp;
--  const char *timearg;
-+  const char *timearg, *orig_timearg;
-   const char *errmsg = "arithmetic overflow while converting %s days to a number of seconds";
-   time_t origin;
- 
-   if (!collect_arg(argv, arg_ptr, &timearg))
-     return false;
-+  orig_timearg = timearg;
- 
-   /* Decide the origin by previewing the comparison type. */
-   origin = options.cur_day_start;
- 
-   if (get_comp_type(&timearg, &comp))
-     {
--      /* Remember, we invert the sense of the comparison, so this tests against COMP_LT instead of COMP_GT... */
-+      /* Remember, we invert the sense of the comparison, so this tests 
-+       * against COMP_LT instead of COMP_GT... 
-+       */
-       if (COMP_LT == tval.kind)      
- 	{
- 	  uintmax_t expected = origin + (DAYSECS-1);
-@@ -3198,11 +3201,14 @@ parse_time (const struct parser_table* e
- 		    _("arithmetic overflow when trying to calculate the end of today"));
- 	    }
- 	}
--      /* We discard the value of comp here, as get_relative_timestamp
--       * will set tval.kind. 
--       */
-     }
--  
-+  /* We discard the value of comp here, as get_relative_timestamp
-+   * will set tval.kind.  For that to work, we have to restore
-+   * timearg so that it points to the +/- prefix, if any.  get_comp_type()
-+   * will have advanced timearg, so we restore it.
-+   */
-+  timearg = orig_timearg;
-+
-   if (!get_relative_timestamp(timearg, &tval, origin, DAYSECS, errmsg))
-     return false;
- 
-@@ -3224,10 +3230,9 @@ parse_time (const struct parser_table* e
-       fprintf (stderr, "%ju %s", (uintmax_t) our_pred->args.reftime.ts.tv_sec, ctime (&t));
-       if (tval.kind == COMP_EQ)
- 	{
--	  t = our_pred->args.reftime.ts.tv_sec += DAYSECS;
-+	  t = our_pred->args.reftime.ts.tv_sec + DAYSECS;
- 	  fprintf (stderr, "                 <  %ju %s",
--		   (uintmax_t) our_pred->args.reftime.ts.tv_sec, ctime (&t));
--	  our_pred->args.reftime.ts.tv_sec -= DAYSECS;
-+		   (uintmax_t) t, ctime (&t));
- 	}
-     }
-   
-Index: pred.c
-===================================================================
-RCS file: /sources/findutils/findutils/find/pred.c,v
-retrieving revision 1.97
-diff -u -p -r1.97 pred.c
---- find/pred.c	27 May 2007 11:04:23 -0000	1.97
-+++ find/pred.c	31 May 2007 09:01:08 -0000
-@@ -2207,7 +2207,7 @@ print_list (FILE *fp, struct predicate *
-   cur = node;
-   while (cur != NULL)
-     {
--      fprintf (fp, "%s ", blank_rtrim (cur->p_name, name));
-+      fprintf (fp, "[%s] ", blank_rtrim (cur->p_name, name));
-       cur = cur->pred_next;
-     }
-   fprintf (fp, "\n");
diff --git a/sys-apps/findutils/findutils-4.2.30.ebuild b/sys-apps/findutils/findutils-4.2.30.ebuild
deleted file mode 100644
index 655e5afef2fa..000000000000
--- a/sys-apps/findutils/findutils-4.2.30.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.2.30.ebuild,v 1.9 2007/06/01 14:07:58 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-SELINUX_PATCH="findutils-4.2.24-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls build selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Patches for selinux
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-
-	if [[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]]; then
-		# Use the system-provided regex.h, bug #114747
-		echo "#include_next <regex.h>" > gnulib/lib/regex.h
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	[[ ${ELIBC} == "glibc" || ${ELIBC} == "uclibc" ]] && \
-		myconf="${myconf} --without-included-regex"
-
-	econf $(use_enable nls) ${myconf} || die "configure failed"
-	emake libexecdir=/usr/lib/find AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" libexecdir="${D}/usr/lib/find" install || die
-
-	rm -rf "${D}"/usr/var
-	use build \
-		&& rm -rf "${D}"/usr/share \
-		|| dodoc NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	ewarn "Please note that the locate and updatedb binaries"
-	ewarn "are now provided by slocate, not findutils."
-}
diff --git a/sys-apps/findutils/findutils-4.3.4.ebuild b/sys-apps/findutils/findutils-4.3.4.ebuild
deleted file mode 100644
index 87b47223ae34..000000000000
--- a/sys-apps/findutils/findutils-4.3.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.4.ebuild,v 1.11 2007/06/01 14:07:58 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SELINUX_PATCH="findutils-4.3.4-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Patches for selinux
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-
-	if ! has userpriv ${FEATURES} ; then
-		sed -i '/access.exp/d' find/testsuite/Makefile.in
-		rm -f find/testsuite/find.gnu/access.{exp,xo}
-	fi
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
-		myconf="${myconf} --without-included-regex"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--libexecdir=/usr/$(get_libdir)/find \
-		${myconf} \
-		|| die "configure failed"
-	emake AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README TODO ChangeLog
-}
diff --git a/sys-apps/findutils/findutils-4.3.6-r1.ebuild b/sys-apps/findutils/findutils-4.3.6-r1.ebuild
deleted file mode 100644
index 16b6e3ba7909..000000000000
--- a/sys-apps/findutils/findutils-4.3.6-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.3.6-r1.ebuild,v 1.3 2007/06/11 05:35:31 vapier Exp $
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-SELINUX_PATCH="findutils-4.3.6-selinux.diff"
-
-DESCRIPTION="GNU utilities for finding files"
-HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
-# SRC_URI="mirror://gnu/${PN}/${P}.tar.gz mirror://gentoo/${P}.tar.gz"
-SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls selinux static"
-
-RDEPEND="selinux? ( sys-libs/libselinux )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-sv-bug-20005.patch #180334
-	epatch "${FILESDIR}"/${P}-fprint-unwritable.patch #180412
-
-	# Don't build or install locate because it conflicts with slocate,
-	# which is a secure version of locate.  See bug 18729
-	sed -i '/^SUBDIRS/s/locate//' Makefile.in
-
-	# Patches for selinux
-	use selinux && epatch "${FILESDIR}/${SELINUX_PATCH}"
-}
-
-src_compile() {
-	use static && append-ldflags -static
-
-	local myconf
-	use userland_GNU || myconf=" --program-prefix=g"
-
-	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
-		myconf="${myconf} --without-included-regex"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		--libexecdir=/usr/$(get_libdir)/find \
-		${myconf} \
-		|| die "configure failed"
-	emake AR="$(tc-getAR)" || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README TODO ChangeLog
-}
diff --git a/sys-apps/grep/files/2.5.1-tests.patch b/sys-apps/grep/files/2.5.1-tests.patch
deleted file mode 100644
index 5d29d5924297..000000000000
--- a/sys-apps/grep/files/2.5.1-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-glibc has changed the error code it returns from '1' to '2'.  The 
-included grep regex library returns '1' still though, so spencer 
-test #55 incorrectly fails.  For now, we update the test to match 
-the glibc regex since that is what we're using ;).
-
-http://bugs.gentoo.org/show_bug.cgi?id=76192
-http://linuxfromscratch.org/pipermail/lfs-dev/2003-February/032543.html
-
-
-glibc has a sweet bug where it can go to town (and never come back) 
-with some complicated regex's.  this has been fixed in glibc cvs, 
-but our latest releases don't have the patch.  so let's add a simple 
-workaround from upstream grep cvs.
-
-http://bugs.gentoo.org/show_bug.cgi?id=76879
-
-Index: tests/spencer1.tests
-===================================================================
-RCS file: /cvsroot/grep/grep/tests/spencer1.tests,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- tests/spencer1.tests	3 Nov 1998 21:39:05 -0000	1.1
-+++ tests/spencer1.tests	12 Jun 2003 15:26:15 -0000	1.2
-@@ -52,3 +52,3 @@
- 0@$*@-
--1@(*)b@-
-+2@(*)b@-
- 1@$b@b
-Index: tests/backref.sh
-===================================================================
-RCS file: /cvsroot/grep/grep/tests/backref.sh,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- tests/backref.sh	23 Jul 2003 05:15:51 -0000	1.3
-+++ tests/backref.sh	19 Nov 2004 14:00:18 -0000	1.4
-@@ -14,5 +14,6 @@
- 
- # hit hard with the `Bond' tests
--echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1
-+# For now, remove the ``?'' in the last parentheses, so that new glibc can do it.  --Stepan
-+echo "civic" | ${GREP} -E -e '^(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.?)(.).?\9\8\7\6\5\4\3\2\1$' > /dev/null 2>&1
- if test $? -ne 0 ; then
-         echo "Options: Bond, test \#2 failed"
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r8 b/sys-apps/grep/files/digest-grep-2.5.1-r8
deleted file mode 100644
index 7fcc231ba042..000000000000
--- a/sys-apps/grep/files/digest-grep-2.5.1-r8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
-RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093
-SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/files/digest-grep-2.5.1-r9 b/sys-apps/grep/files/digest-grep-2.5.1-r9
deleted file mode 100644
index 7fcc231ba042..000000000000
--- a/sys-apps/grep/files/digest-grep-2.5.1-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85df024edc9f9689035f6b3de28c7731 grep-2.5.1.tar.gz 683093
-RMD160 96d1fda2297a03a11c7d2fcea16effff55d2cbd0 grep-2.5.1.tar.gz 683093
-SHA256 d2c068701afae914b9a0707f2af6c373556c7b761913169ae0a7afa9fd5b2442 grep-2.5.1.tar.gz 683093
diff --git a/sys-apps/grep/files/digest-grep-2.5.1a b/sys-apps/grep/files/digest-grep-2.5.1a
deleted file mode 100644
index 86f3e9144a79..000000000000
--- a/sys-apps/grep/files/digest-grep-2.5.1a
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52202fe462770fa6be1bb667bd6cf30c grep-2.5.1a.tar.bz2 527386
-RMD160 f02c36c5a1efe805eafb0b4c0171ddb7ff15fbeb grep-2.5.1a.tar.bz2 527386
-SHA256 38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132 grep-2.5.1a.tar.bz2 527386
diff --git a/sys-apps/grep/grep-2.5.1-r8.ebuild b/sys-apps/grep/grep-2.5.1-r8.ebuild
deleted file mode 100644
index 77c60d1892c9..000000000000
--- a/sys-apps/grep/grep-2.5.1-r8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r8.ebuild,v 1.15 2007/02/28 22:20:04 genstef Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="build nls static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix a weird sparc32 compiler bug
-	echo "" >> src/dfa.h
-
-	epatch "${FILESDIR}"/${P}-manpage.patch
-	epatch "${FILESDIR}"/${P}-fgrep.patch
-	epatch "${FILESDIR}"/${P}-bracket.patch
-	epatch "${FILESDIR}"/${P}-i18n.patch
-	epatch "${FILESDIR}"/${P}-oi.patch
-	epatch "${FILESDIR}"/${P}-restrict_arr.patch
-	epatch "${FILESDIR}"/${PV}-utf8-case.patch
-	epatch "${FILESDIR}"/${P}-perl-segv.patch #95495
-	epatch "${FILESDIR}"/${P}-libintl.patch #92586
-
-	# uclibc does not suffer from this glibc bug.
-	use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
-}
-
-src_compile() {
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		--disable-perl-regexp \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# Override the default shell scripts... grep knows how to act
-	# based on how it's called
-	ln -sfn grep "${D}"/bin/egrep || die "ln egrep failed"
-	ln -sfn grep "${D}"/bin/fgrep || die "ln fgrep failed"
-
-	if use build ; then
-		rm -r "${D}"/usr/share
-	else
-		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	fi
-}
diff --git a/sys-apps/grep/grep-2.5.1-r9.ebuild b/sys-apps/grep/grep-2.5.1-r9.ebuild
deleted file mode 100644
index 2168adf4f337..000000000000
--- a/sys-apps/grep/grep-2.5.1-r9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1-r9.ebuild,v 1.11 2007/02/28 22:20:04 genstef Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE="build nls static"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix a weird sparc32 compiler bug
-	echo "" >> src/dfa.h
-
-	epatch "${FILESDIR}"/${P}-manpage.patch
-	epatch "${FILESDIR}"/${P}-fgrep.patch
-	epatch "${FILESDIR}"/${P}-bracket.patch
-	epatch "${FILESDIR}"/${P}-i18n.patch
-	epatch "${FILESDIR}"/${P}-oi.patch
-	epatch "${FILESDIR}"/${P}-restrict_arr.patch
-	epatch "${FILESDIR}"/${PV}-utf8-case.patch
-	epatch "${FILESDIR}"/${P}-perl-segv.patch #95495
-	epatch "${FILESDIR}"/${P}-libintl.patch #92586
-	epatch "${FILESDIR}"/${P}-fix-devices-skip.patch #113640
-
-	# retarded
-	sed -i 's:__mempcpy:mempcpy:g' lib/*.c || die
-
-	# uclibc does not suffer from this glibc bug.
-	use elibc_uclibc || epatch "${FILESDIR}"/${PV}-tests.patch
-}
-
-src_compile() {
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		--disable-perl-regexp \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# Override the default shell scripts... grep knows how to act
-	# based on how it's called
-	ln -sfn grep "${D}"/bin/egrep || die "ln egrep failed"
-	ln -sfn grep "${D}"/bin/fgrep || die "ln fgrep failed"
-
-	if use build ; then
-		rm -r "${D}"/usr/share
-	else
-		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	fi
-}
-
-pkg_postinst() {
-	if has pcre ${USE} ; then
-		ewarn "This grep ebuild no longer supports pcre.  If you want this"
-		ewarn "functionality, please use 'pcregrep' from the libpcre package."
-	fi
-}
diff --git a/sys-apps/grep/grep-2.5.1a.ebuild b/sys-apps/grep/grep-2.5.1a.ebuild
deleted file mode 100644
index 3295f7916d6a..000000000000
--- a/sys-apps/grep/grep-2.5.1a.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.1a.ebuild,v 1.8 2007/02/28 22:20:04 genstef Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/grep.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
-IUSE="build nls static"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix a weird sparc32 compiler bug
-	echo "" >> src/dfa.h
-
-	epatch "${FILESDIR}"/${PN}-2.5.1-manpage.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-fgrep.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-color.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-bracket.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-i18n.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-oi.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-restrict_arr.patch
-	epatch "${FILESDIR}"/2.5.1-utf8-case.patch
-	epatch "${FILESDIR}"/${PN}-2.5.1-perl-segv.patch #95495
-	epatch "${FILESDIR}"/${PN}-2.5.1-fix-devices-skip.patch #113640
-	epatch "${FILESDIR}"/${P}-nls.patch
-
-	# retarded
-	sed -i 's:__mempcpy:mempcpy:g' lib/*.c || die
-}
-
-src_compile() {
-	if use static ; then
-		append-flags -static
-		append-ldflags -static
-	fi
-
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		--disable-perl-regexp \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# Override the default shell scripts... grep knows how to act
-	# based on how it's called
-	ln -sfn grep "${D}"/bin/egrep || die "ln egrep failed"
-	ln -sfn grep "${D}"/bin/fgrep || die "ln fgrep failed"
-
-	if use build ; then
-		rm -r "${D}"/usr/share
-	else
-		dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	fi
-}
-
-pkg_postinst() {
-	if has pcre ${USE} ; then
-		ewarn "This grep ebuild no longer supports pcre.  If you want this"
-		ewarn "functionality, please use 'pcregrep' from the libpcre package."
-	fi
-}