diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-31 15:33:04 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-03-31 15:33:04 +0000 |
commit | 4ff052c70973c50f0b31d25b35713d665bc0d45f (patch) | |
tree | 1d6fe4869bf57e2d2a1c419655d373f70cfbaeb7 /sys-apps | |
parent | Move sys-apps/eject to sys-block/eject. (diff) | |
download | gentoo-2-4ff052c70973c50f0b31d25b35713d665bc0d45f.tar.gz gentoo-2-4ff052c70973c50f0b31d25b35713d665bc0d45f.tar.bz2 gentoo-2-4ff052c70973c50f0b31d25b35713d665bc0d45f.zip |
Moved to sys-block/eject.
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/eject/ChangeLog | 317 | ||||
-rw-r--r-- | sys-apps/eject/Manifest | 19 | ||||
-rw-r--r-- | sys-apps/eject/eject-2.1.5-r2.ebuild | 41 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.0.13-xmalloc.patch | 28 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch | 21 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.1.5-handle-spaces.patch | 57 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.1.5-man-typo.patch | 18 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.1.5-toggle.patch | 27 | ||||
-rw-r--r-- | sys-apps/eject/metadata.xml | 5 |
9 files changed, 0 insertions, 533 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog deleted file mode 100644 index 7b198b304033..000000000000 --- a/sys-apps/eject/ChangeLog +++ /dev/null @@ -1,317 +0,0 @@ -# ChangeLog for sys-apps/eject -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.82 2010/09/12 21:15:31 abcd Exp $ - - 12 Sep 2010; Jonathan Callen <abcd@gentoo.org> eject-2.1.5-r2.ebuild: - Add prefix support and keywords, switch to EAPI=3, add missing dep on - sys-devel/gettext when USE=nls - - 01 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> eject-2.1.5-r2.ebuild: - Change SRC_URI to Gentoo mirrors wrt #303136, thanks to Juan Welthagen for - reporting. - - 16 Jan 2010; Raúl Porcel <armin76@gentoo.org> eject-2.1.5-r2.ebuild: - ia64/m68k/s390/sh/sparc stable wrt #296429 - - 01 Jan 2010; Tobias Klausmann <klausman@gentoo.org> eject-2.1.5-r2.ebuild: - Stable on alpha, bug #296429 - - 28 Dec 2009; Markus Meier <maekke@gentoo.org> eject-2.1.5-r2.ebuild: - arm/x86 stable, bug #296429 - - 28 Dec 2009; nixnut <nixnut@gentoo.org> eject-2.1.5-r2.ebuild: - ppc stable #296429 - - 16 Dec 2009; Jeroen Roovers <jer@gentoo.org> eject-2.1.5-r2.ebuild: - Stable for HPPA (bug #296429). - - 15 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> eject-2.1.5-r1.ebuild, - eject-2.1.5-r2.ebuild: - amd64 stable wrt #296429. Remove geocities from HOMEPAGE wrt #297028. - - 14 Dec 2009; Brent Baude <ranger@gentoo.org> eject-2.1.5-r2.ebuild: - stable ppc64, bug 296429 - -*eject-2.1.5-r2 (14 Mar 2009) - - 14 Mar 2009; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.5-toggle.patch, +eject-2.1.5-r2.ebuild: - Cleanup and apply fix from opensuse #261880 by Peter Tworek. - - 25 May 2007; Bryan Østergaard <kloeri@gentoo.org> eject-2.1.5-r1.ebuild: - Stable on Alpha, bug 165355. - - 13 Feb 2007; Markus Rothe <corsair@gentoo.org> eject-2.1.5-r1.ebuild: - Stable on ppc64; bug #165355 - - 06 Feb 2007; Joseph Jezak <josejx@gentoo.org> eject-2.1.5-r1.ebuild: - Marked ppc stable for bug #165355. - - 05 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> eject-2.1.5-r1.ebuild: - Stable on sparc wrt #165335 - - 05 Feb 2007; Andrej Kacian <ticho@gentoo.org> eject-2.1.5-r1.ebuild: - Stable on x86, bug #165355. - - 05 Feb 2007; Steve Dibb <beandog@gentoo.org> eject-2.1.5-r1.ebuild: - amd64 stable, bug 165355 - - 04 Feb 2007; Jeroen Roovers <jer@gentoo.org> eject-2.1.5-r1.ebuild: - Stable for HPPA (bug #165355). - - 04 Feb 2007; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.5-man-typo.patch, eject-2.1.5-r1.ebuild: - Fix typo in eject manpage #165248 by DoubleHP. - - 03 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> - eject-2.1.5-r1.ebuild: - Stable on MIPS; bug #164176 - - 20 Oct 2006; Aron Griffis <agriffis@gentoo.org> eject-2.1.5.ebuild: - Mark 2.1.5 stable on alpha - -*eject-2.1.5-r1 (16 Oct 2006) - - 16 Oct 2006; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.5-handle-spaces.patch, +eject-2.1.5-r1.ebuild: - Handle spaces in mounts #151257 by Adam Goossens. - - 23 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> eject-2.1.5.ebuild: - hppa stable, bug #148121 - - 21 Sep 2006; Tobias Scherbaum <dertobi123@gentoo.org> eject-2.1.5.ebuild: - ppc stable, bug #148121 - - 20 Sep 2006; <blubb@gentoo.org> eject-2.1.5.ebuild: - stable on amd64 - - 19 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> eject-2.1.5.ebuild: - Stable on sparc wrt #148121 - - 19 Sep 2006; Markus Rothe <corsair@gentoo.org> eject-2.1.5.ebuild: - Stable on ppc64; bug #148121 - - 19 Sep 2006; Michele Noberasco <s4t4n@gentoo.org> eject-2.1.5.ebuild: - stable for x86. See bug #148121. - -*eject-2.1.5 (01 Aug 2006) - - 01 Aug 2006; Roy Marples <uberlord@gentoo.org> +eject-2.1.5.ebuild: - Version bump thanks to Flameeyes. - - 27 Apr 2006; Alec Warner <antarus@gentoo.org> - files/digest-eject-2.0.13-r1, files/digest-eject-2.0.13-r2, Manifest: - Fixing SHA256 digest, pass four - -*eject-2.1.4-r1 (23 Apr 2006) - - 23 Apr 2006; Roy Marples <uberlord@gentoo.org> - +files/eject-2.1.4-scsi-rdwr.patch, +eject-2.1.4-r1.ebuild: - Patch to open device read/write when it's scsi, #116731. - Now iPod owners can eject their iPods when not root! - - 19 Feb 2006; Joshua Kinard <kumba@gentoo.org> eject-2.1.0-r1.ebuild: - Marked stable on mips. - -*eject-2.1.4 (18 Feb 2006) - - 18 Feb 2006; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.4-toggle.patch, +eject-2.1.4.ebuild: - Version bump by Daniel Walker #123174. - -*eject-2.1.0-r1 (11 Feb 2006) - - 11 Feb 2006; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.0-toggle.patch, -eject-2.1.0.ebuild, - +eject-2.1.0-r1.ebuild: - Fix by Stuart W. Finlayson for bug in toggle support #122256. - - 09 Feb 2006; Jeroen Roovers <jer@gentoo.org> eject-2.1.0.ebuild: - Stable on hppa (bug #122136). - - 09 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> eject-2.1.0.ebuild: - Stable on sparc wrt #122126 - - 09 Feb 2006; <deltacow@gentoo.org> eject-2.1.0.ebuild: - amd64 stable - - 09 Feb 2006; Michele Noberasco <s4t4n@gentoo.org> eject-2.1.0.ebuild: - Mark 2.1.0 stable on x86. See bug #122136. - - 08 Feb 2006; Aron Griffis <agriffis@gentoo.org> eject-2.1.0.ebuild: - Mark 2.1.0 stable on alpha - - 07 Feb 2006; Aron Griffis <agriffis@gentoo.org> eject-2.1.0.ebuild: - Mark 2.1.0 stable on ia64 - - 22 Jan 2006; Markus Rothe <corsair@gentoo.org> eject-2.1.0.ebuild: - Stable on ppc64 - - 25 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> eject-2.1.0.ebuild: - Stable on ppc because it adds the -t parameter which is very useful on newer - Apple computers, see bug 116703 and verified by myself. - - 03 Oct 2005; Hardave Riar <hardave@gentoo.org> eject-2.0.13-r2.ebuild: - Stable on mips. - - 02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> eject-2.0.13-r2.ebuild: - Alpha stable. - - 01 Oct 2005; Luis Medinas <metalgod@gentoo.org> eject-2.0.13-r2.ebuild: - Marked Stable on amd64. - - 24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> - eject-2.0.13-r2.ebuild: - Stable on ppc. - - 24 Sep 2005; Markus Rothe <corsair@gentoo.org> eject-2.0.13-r2.ebuild: - Stable on ppc64 - - 19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> - eject-2.0.13-r2.ebuild: - Stable on sparc - -*eject-2.1.0 (18 Sep 2005) - - 18 Sep 2005; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.1.0-regcomp-check.patch, - +files/eject-2.1.0-scsi-io-update.patch, +eject-2.1.0.ebuild: - Version bump #106356 by Surakshan Mendis. - - 25 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> eject-2.0.13.ebuild, - eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild: - Block virtual/eject else it conflicts with sys-block/unieject. - - 23 Jul 2005; <solar.@gentoo.org> +files/eject-2.0.13-i18n-uclibc.patch, - eject-2.0.13-r2.ebuild: - - handle uclibc minimal exceptions when i18n/nls/gettext is not active - - 28 May 2005; Diego Pettenò <flameeyes@gentoo.org> eject-2.0.13.ebuild, - eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild: - Added virtual provision for virtual/eject. - -*eject-2.0.13-r2 (21 May 2005) - - 21 May 2005; Mike Frysinger <vapier@gentoo.org> - +files/eject-2.0.13-close-check.patch, files/eject-2.0.13-finddev.patch, - +files/eject-2.0.13-fstab-error.patch, - +files/eject-2.0.13-no-umount.patch, - +files/eject-2.0.13-prefix-defaultdevice-with-dev.patch, - +files/eject-2.0.13-toggle.patch, +files/eject-2.0.13-xmalloc.patch, - +files/eject-2.0.13-xregcomp.patch, +eject-2.0.13-r2.ebuild, - +eject-2.0.13-pumount.patch: - Add toggle support by Patrik Kullman #62612 and a bunch of patches from - Debian #91977. - -*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 - - 03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> - eject-2.0.13.ebuild: - Masked eject-2.0.13.ebuild stable for ppc - - 29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> eject-2.0.13.ebuild: - depend on sed-4; error check sed; tidy install - - 13 May 2004; Stephen P. Becker <geoman@gentoo.org> eject-2.0.13.ebuild: - Stable on mips. - - 14 Mar 2004; Stephen P. Becker <geoman@gentoo.org> eject-2.0.13.ebuild: - Added ~mips keyword. - - 09 Mar 2004; <agriffis@gentoo.org> eject-2.0.13.ebuild: - stable on alpha and ia64 - - 26 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> eject-2.0.13.ebuild: - stable on sparc - - 25 Feb 2004; Guy Martin <gmsoft@gentoo.org> eject-2.0.13.ebuild: - Marked stable on hppa. - - 24 Feb 2004; <augustus@gentoo.org> eject-2.0.13.ebuild: - Made eject-2.0.13 stable on amd64. BUG #42720. - - 23 Feb 2004; Seemant Kulleen <seemant@gentoo.org> eject-2.0.13.ebuild: - moved 13 to stable, 12 is causing issues all over the place it seems - - 19 Feb 2004; Martin Schlemmer <azarah@gentoo.org> eject-2.0.13.ebuild: - Fix silly includes based on a patch by Ronald Hummelink - <gentoo-bugzilla@hummelink.xs4all.nl>, bug #41856. - - 05 Dec 2003; <plasmaroo@gentoo.org> - files/eject-2.0.12-kernel25-support.patch, - files/eject-2.0.13-kernel25-support.patch: - Fixed the patches to work happily with 2.6. kernels; closing bug #35088. - - 14 Nov 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12-r1.ebuild: - Stable on ia64. - -*eject-2.0.13 (08 Nov 2003) - - 08 Nov 2003; Martin Holzer <mholzer@gentoo.org> eject-2.0.13.ebuild, - files/eject-2.0.13-kernel25-support.patch: - Version bumped. Closes bug #32953. - - 06 Mar 2003; Martin Schlemmer <azarah@gentoo.org> eject-2.0.12-r1.ebuild : - Get eject to build with kernel-2.5.x. - - 03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> : - This update should not be classified as a security update. The advisory says that eject is only - vulnerable if it is install setuid root and in Gentoo it is not. However if someone decides to - make it setuid root the patch in -r1 will make it safer. - -*eject-2.0.12-r1 (03 Mar 2003) - - 04 Jul 2003; Guy Martin <gmsoft@gentoo.org> eject-2.0.12-r1.ebuild : - Added hppa to KEYWORDS. - - 03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> : - Security update. - - 25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> eject-2.0.12.ebuild : - Unmasked becuse of GLSA. - - 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords - -*eject-2.0.12 (05 Nov 2002) - - 21 Feb 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12.ebuild : - Mark stable on Alpha. - - 05 Dec 2002; Will Woods <wwoods@gentoo.org> eject-2.0.10.ebuild, eject-2.0.12.ebuild: - Added 'alpha' keyword. - - 06 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> : - Version bump. - -*eject-2.0.10 (9 May 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> eject-2.0.10.ebuild : - Added KEYWORDS, SLOT. - - 9 May 2002; D.Chamberlain <daybird@gentoo.org> Changelog: - - Updated to 2.0.10. This version is not sandbox friendly, so we only install the - binaries and docs. - -*eject-2.0.6 (1 Feb 2002) - - 14 Jul 2002; phoen][x <phoenix@gentoo.org> eject-2.0.6.ebuild : - Added KEYWORDS, SLOT. - - 1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : - - Added initial ChangeLog which should be updated whenever the package is - updated in any way. This changelog is targetted to users. This means that the - comments should well explained and written in clean English. The details about - writing correct changelogs are explained in the skel.ChangeLog file which you - can find in the root directory of the portage repository. diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest deleted file mode 100644 index 4e2103f8526a..000000000000 --- a/sys-apps/eject/Manifest +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX eject-2.0.13-xmalloc.patch 654 RMD160 4dedddfda351a07f3cd75641d3825cb1e874db99 SHA1 2601b7450e25196ca6635d39d0404ded96b671d7 SHA256 c7f214a2642c4cff5d67bdcf9d21aa6d55e4fd066b389c0c305ab58ec66205fc -AUX eject-2.1.4-scsi-rdwr.patch 466 RMD160 26f12f35132ba58f50f46f4b418687722cbd4e17 SHA1 2d724a3c87109a255f038b7771c5656d9c1c8d98 SHA256 4dcecbf1b33cfc98668ac710dfb62b06ae6fc3d45ff98e409caedea376d6f8da -AUX eject-2.1.5-handle-spaces.patch 1729 RMD160 3289afd3c47b9f599825bc6dcfd0290e2fb64096 SHA1 b47676bef37cd47f6ea4e704e69de2aee8fc4bf9 SHA256 12069029beb1390a50ef32b523a61cef1f19df28b6f6ad0813656d9af5f13f82 -AUX eject-2.1.5-man-typo.patch 700 RMD160 3d8e1cc9b532d233dc351fdcf35a91dd01b5157f SHA1 5261281d9d184dc9652fb9805c81b89b659e7e23 SHA256 2f83ea28ea71115d5b64a77f8e02a7788cbc089720fd58a0dd018b00a0171a60 -AUX eject-2.1.5-toggle.patch 660 RMD160 6cf98ca5da33238a313a10e0603e80bca223b33e SHA1 6f3807862930cff8d71e076573c12fc14a61dea5 SHA256 ee321229d6fadbb1222710b9c164e7e0e9add53c18d7cb4051db2652e89cf837 -DIST eject-2.1.5.tar.gz 123585 RMD160 6e2f161e1399f9f01f376e56593d6ca586c4c8ea SHA1 17986aa4732f1c33ecae15db32d1e379bbbd99f8 SHA256 ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 -EBUILD eject-2.1.5-r2.ebuild 1184 RMD160 e1402aa6ad928050e3eda717bd51773b34fe4a23 SHA1 faba7693fe94ef814d63284e9493294e094305e2 SHA256 bae8f53e029337f7790c5a80f3f6b6bd2e71bd4223098f691bf7e635662457ad -MISC ChangeLog 11307 RMD160 6fd5d5d12c7684decd44bf432b71ce8d755b9e87 SHA1 202a7e676c56c014044a172b8760ce0bb3f12101 SHA256 e682a6934924d50def9658436b72892ac800af072b5cd21719d037aa4de003cd -MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iF4EAREIAAYFAk2UQkoACgkQXkR9YqOcLPHX7wD9HICpVHxab7Xf6h+MFPZ72DFq -vMcP5HMSF1zYzEx78a0BAJsPcwf7u7guIHUdx3of+QqvqVCnca9B2pXrDpcLU63X -=IVSw ------END PGP SIGNATURE----- diff --git a/sys-apps/eject/eject-2.1.5-r2.ebuild b/sys-apps/eject/eject-2.1.5-r2.ebuild deleted file mode 100644 index 803c0f18bd32..000000000000 --- a/sys-apps/eject/eject-2.1.5-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2011 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-r2.ebuild,v 1.12 2011/03/31 08:58:04 ssuominen Exp $ - -EAPI="3" - -inherit eutils - -DESCRIPTION="A command to eject a disc from the CD-ROM drive" -HOMEPAGE="http://eject.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="nls" - -DEPEND="nls? ( sys-devel/gettext )" -RDEPEND="" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.13-xmalloc.patch - epatch "${FILESDIR}"/${PN}-2.1.4-scsi-rdwr.patch - epatch "${FILESDIR}"/${PN}-2.1.5-handle-spaces.patch #151257 - epatch "${FILESDIR}"/${PN}-2.1.5-man-typo.patch #165248 - epatch "${FILESDIR}"/${PN}-2.1.5-toggle.patch #261880 -} - -src_configure() { - econf \ - $(use_enable nls) -} - -src_install() { - # PREFIX for po/Makefile, which hardcodes a prefix of "$(DESTDIR)/usr" - # it is not used in the other makefiles - emake DESTDIR="${D}" PREFIX="${ED}/usr" install || die - dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS -} diff --git a/sys-apps/eject/files/eject-2.0.13-xmalloc.patch b/sys-apps/eject/files/eject-2.0.13-xmalloc.patch deleted file mode 100644 index f609da19d05f..000000000000 --- a/sys-apps/eject/files/eject-2.0.13-xmalloc.patch +++ /dev/null @@ -1,28 +0,0 @@ -Make sure the malloc's work. - -http://bugs.gentoo.org/91977 - ---- eject.c -+++ eject.c -@@ -304,2 +304,11 @@ - -+void *xmalloc(size_t size) -+{ -+ void *ret = malloc(size); -+ if (!ret) { -+ fprintf(stderr, _("%s: could not allocate memory\n"), programName); -+ exit(1); -+ } -+ return ret; -+} - -@@ -324,3 +333,3 @@ - -- buf = (char *) malloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */ -+ buf = (char *) xmalloc(strlen(name)+14); /* to allow for "/dev/cdroms/ + "0" + null */ - -@@ -794,3 +803,3 @@ - if (status == 0) { -- result = (char *) malloc(strlen(name) + 25); -+ result = (char *) xmalloc(strlen(name) + 25); - strcpy(result, name); diff --git a/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch b/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch deleted file mode 100644 index cd5e497b9d9a..000000000000 --- a/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/116731 - ---- eject-2.0.13/eject.c -+++ eject-2.0.13/eject.c -@@ -657,7 +657,15 @@ - /* Open a device file. */ - static int OpenDevice(const char *fullName) - { -- int fd = open(fullName, O_RDONLY|O_NONBLOCK); -+ int flags = O_NONBLOCK; -+ int fd; -+ -+ if (s_option) -+ flags |= O_RDWR; -+ else -+ flags |= O_RDONLY; -+ -+ fd = open(fullName, flags); - if (fd == -1) { - fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName); - exit(1); diff --git a/sys-apps/eject/files/eject-2.1.5-handle-spaces.patch b/sys-apps/eject/files/eject-2.1.5-handle-spaces.patch deleted file mode 100644 index 692368fa50b8..000000000000 --- a/sys-apps/eject/files/eject-2.1.5-handle-spaces.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://bugs.gentoo.org/151257 - ---- eject.c -+++ eject.c -@@ -370,6 +370,30 @@ static int FileExists(const char *name, - - - /* -+ * Linux mangles spaces in mount points by changing them to an octal string -+ * of '\040'. So lets scan the mount point and fix it up by replacing all -+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable -+ * string as input as we mangle in place. Some of this was taken from the -+ * util-linux package. -+ */ -+#define octalify(a) ((a) & 7) -+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) -+#define isoctal(a) (((a) & ~7) == '0') -+static char *DeMangleMount(char *s) -+{ -+ char *tmp = s; -+ while ((tmp = strchr(tmp, '\\')) != NULL) { -+ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { -+ tmp[0] = tooctal(tmp); -+ memmove(tmp+1, tmp+4, strlen(tmp)-3); -+ } -+ ++tmp; -+ } -+ return s; -+} -+ -+ -+/* - * Given name, such as foo, see if any of the following exist: - * - * foo (if foo starts with '.' or '/') -@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam - if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || - ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } -@@ -928,8 +952,8 @@ static int MountableDevice(const char *n - rc = sscanf(line, "%1023s %1023s", s1, s2); - if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } diff --git a/sys-apps/eject/files/eject-2.1.5-man-typo.patch b/sys-apps/eject/files/eject-2.1.5-man-typo.patch deleted file mode 100644 index 2fecb745ce0f..000000000000 --- a/sys-apps/eject/files/eject-2.1.5-man-typo.patch +++ /dev/null @@ -1,18 +0,0 @@ -http://bugs.gentoo.org/165248 - -Index: eject.1 -=================================================================== -RCS file: /cvsroot/eject/eject/eject/eject.1,v -retrieving revision 1.5 -diff -u -p -r1.5 eject.1 ---- eject.1 11 Dec 2005 00:21:06 -0000 1.5 -+++ eject.1 4 Feb 2007 23:11:15 -0000 -@@ -145,7 +145,7 @@ 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. -+mount removable media and therefore must be always mount(1)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. - diff --git a/sys-apps/eject/files/eject-2.1.5-toggle.patch b/sys-apps/eject/files/eject-2.1.5-toggle.patch deleted file mode 100644 index 30a96028fbd6..000000000000 --- a/sys-apps/eject/files/eject-2.1.5-toggle.patch +++ /dev/null @@ -1,27 +0,0 @@ -idea take from opensuse -http://bugs.gentoo.org/261880 - ---- a/eject.c -+++ b/eject.c -@@ -576,6 +576,21 @@ static void ToggleTray(int fd) - - #ifdef CDROMCLOSETRAY - -+ /* Ask the CDROM for info, otherwise fall back to manual */ -+ switch (ioctl(fd, CDROM_DRIVE_STATUS)) { -+ case CDS_TRAY_OPEN: -+ CloseTray(fd); -+ return; -+ -+ case CDS_NO_DISC: -+ case CDS_DISC_OK: -+ if (ioctl(fd, CDROMEJECT, 0) < 0) { -+ perror("ioctl"); -+ exit(1); -+ } -+ return; -+ } -+ - /* Try to open the CDROM tray and measure the time therefor - * needed. In my experience the function needs less than 0.05 - * seconds if the tray was already open, and at least 1.5 seconds diff --git a/sys-apps/eject/metadata.xml b/sys-apps/eject/metadata.xml deleted file mode 100644 index 96a2d586367d..000000000000 --- a/sys-apps/eject/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata> |