Cleanup and apply fix from opensuse #261880 by Peter Tworek.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

4 files changed, 88 insertions, 3 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index a2792750c7e0..526c35039a07 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/eject
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.72 2007/05/25 22:04:59 kloeri Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.73 2009/03/14 12:24:33 vapier Exp $
+
+*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.
diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index 1882fff36d4c..9e2e7e489052 100644
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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-r1.ebuild 1160 RMD160 059261be60418904aa9c575d65d6eb75b9a327dc SHA1 1cd34aaf1f998c18ae75f5afbdf3344e96fe4f52 SHA256 64ff2adddd4cc7f52a55ed2c00d431d7366afbab9913e0c7255a7b72f674d4ea
-MISC ChangeLog 9966 RMD160 f2432bc09f6b40a4fffc0faef7ebe66f9a36c79a SHA1 d7be6410a2aa244bfb1ad5f31b1423b2451c3a89 SHA256 65b4cd6da29d09a3fa817ba2f4816a31056c0802cfadca4a7926889fb905e2dc
+EBUILD eject-2.1.5-r2.ebuild 1227 RMD160 ca9f53899e461259b9fb38bd28d472f81c74c520 SHA1 388fd1f593e267d9bd5dca8a12950db94d96b92e SHA256 3d33448f6077965fdb1778c91a0d6b50c9a3a4c65ebc63ab223c2d6418dbace8
+MISC ChangeLog 10170 RMD160 759d97cb9aa0aa3f637239c20cdd899dde205595 SHA1 27928d1d02b822f1fa49ed748f96aade4ee20363 SHA256 95d902ef3e4bc6ac9c81ca52b58c6aaca5260753f89ea7aeb49d4b8c8c475be1
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm7ogcACgkQn/5bYzqsSmFS2ACgy4BHaZ1EIb7b9YMpyzi9reEX
+ircAoLRIRT06Qlp1JB4SOswbJ9Tv6hlr
+=cBWB
+-----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
new file mode 100644
index 000000000000..f635065ba8eb
--- /dev/null
+++ b/sys-apps/eject/eject-2.1.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 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.1 2009/03/14 12:24:33 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A command to eject a disc from the CD-ROM drive"
+HOMEPAGE="http://eject.sourceforge.net/ http://ca.geocities.com/jefftranter@rogers.com/eject.html"
+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
+	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_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
+}
diff --git a/sys-apps/eject/files/eject-2.1.5-toggle.patch b/sys-apps/eject/files/eject-2.1.5-toggle.patch
new file mode 100644
index 000000000000..30a96028fbd6
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.1.5-toggle.patch
@@ -0,0 +1,27 @@
+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