Grab a bunch of patches from Fedora.

(Portage version: 2.0.51-r15)

9 files changed, 156 insertions, 5 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index 7377204d7098..4009c2325034 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/eject
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.28 2005/01/25 14:22:06 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.29 2005/02/13 05:12:21 vapier Exp $
+
+*eject-2.0.13-r1 (13 Feb 2005)
+
+  13 Feb 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/eject-2.0.13-autoclose.patch, +files/eject-2.0.13-finddev.patch,
+  +files/eject-2.0.13-header.patch,
+  files/eject-2.0.13-kernel25-support.patch,
+  +files/eject-2.0.13-use-mountpoints.patch, +eject-2.0.13-r1.ebuild:
+  Grab a bunch of patches from Fedora.
 
   25 Jan 2005; Mike Doty <kingtaco@gentoo.org> eject-2.0.13.ebuild:
   nls patch provided by seemant
diff --git a/sys-apps/eject/eject-2.0.13-r1.ebuild b/sys-apps/eject/eject-2.0.13-r1.ebuild
new file mode 100644
index 000000000000..83923cecd11a
--- /dev/null
+++ b/sys-apps/eject/eject-2.0.13-r1.ebuild
@@ -0,0 +1,38 @@
+# 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.1 2005/02/13 05:12:21 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 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+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.ebuild b/sys-apps/eject/eject-2.0.13.ebuild
index b2cf8b9cb2d1..c5d2da177a12 100644
--- a/sys-apps/eject/eject-2.0.13.ebuild
+++ b/sys-apps/eject/eject-2.0.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.ebuild,v 1.16 2005/01/25 14:22:06 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13.ebuild,v 1.17 2005/02/13 05:12:21 vapier Exp $
 
 inherit eutils
 
diff --git a/sys-apps/eject/files/digest-eject-2.0.13-r1 b/sys-apps/eject/files/digest-eject-2.0.13-r1
new file mode 100644
index 000000000000..3c64dc062a37
--- /dev/null
+++ b/sys-apps/eject/files/digest-eject-2.0.13-r1
@@ -0,0 +1 @@
+MD5 b796ad77beb4e7bdd08d6149701ab778 eject-2.0.13.tar.gz 59504
diff --git a/sys-apps/eject/files/eject-2.0.13-autoclose.patch b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
new file mode 100644
index 000000000000..9d3662b19c05
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.0.13-autoclose.patch
@@ -0,0 +1,28 @@
+Ripped from Fedora
+
+--- 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-finddev.patch b/sys-apps/eject/files/eject-2.0.13-finddev.patch
new file mode 100644
index 000000000000..8b12504907fa
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.0.13-finddev.patch
@@ -0,0 +1,16 @@
+Ripped from Fedora
+
+--- eject-2.0.13/eject.c.orig	2004-09-07 12:10:58.382649630 +0200
++++ eject-2.0.13/eject.c	2004-09-07 12:10:43.930067903 +0200
+@@ -326,6 +326,11 @@
+ 	if (FileExists(buf))
+ 		return buf;
+ 
++	strcpy(buf, "/media/");
++	strcat(buf, name);
++	if (FileExists(buf))
++		return buf;
++
+ 	/* for devfs under Linux */
+ 	strcpy(buf, "/dev/cdroms/");
+ 	strcat(buf, name);
diff --git a/sys-apps/eject/files/eject-2.0.13-header.patch b/sys-apps/eject/files/eject-2.0.13-header.patch
new file mode 100644
index 000000000000..044f9712798f
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.0.13-header.patch
@@ -0,0 +1,24 @@
+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-kernel25-support.patch b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
index 7cafe9e51759..a42f3f791c9e 100644
--- a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
+++ b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch
@@ -1,5 +1,7 @@
---- eject.c.orig	2002-12-09 22:28:08.000000000 +0000
-+++ eject.c	2003-11-08 17:06:43.000000000 +0000
+	# 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>
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
new file mode 100644
index 000000000000..9b12992a7c28
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch
@@ -0,0 +1,33 @@
+Ripped from Fedora
+
+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.
+
+diff --exclude=debian -Nur eject-2.0.13deb/eject.c eject-2.0.13deb.cw/eject.c
+--- eject-2.0.13deb/eject.c	2004-04-17 12:25:10.000000000 -0700
++++ eject-2.0.13deb.cw/eject.c	2004-04-17 12:26:55.000000000 -0700
+@@ -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