old

(Portage version: 2.1.3_rc6)

29 files changed, 0 insertions, 1044 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 @@
-     程式國際化設計:  謝崑中
- */
- 
-+#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)