diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-02-11 04:16:14 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-02-11 04:16:14 +0000 |
| commit | 3b06ae21289c22ae7764277180c06540fcebbfda (patch) | |
| tree | 3ce092215e2769c7c0146072fca63d41640a0135 /sys-apps | |
| parent | Fix modular X dependencies (bug #122234, Alexey Maximov). (diff) | |
| download | gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.tar.gz gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.tar.bz2 gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.zip | |
Fix by Stuart W. Finlayson for bug in toggle support #122256.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/eject/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/eject/eject-2.1.0-r1.ebuild (renamed from sys-apps/eject/eject-2.1.0.ebuild) | 2 | ||||
| -rw-r--r-- | sys-apps/eject/files/digest-eject-2.1.0-r1 (renamed from sys-apps/eject/files/digest-eject-2.1.0) | 0 | ||||
| -rw-r--r-- | sys-apps/eject/files/eject-2.1.0-toggle.patch | 40 |
4 files changed, 49 insertions, 2 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog index 2f57f463c81e..b1b3f5f7c8aa 100644 --- a/sys-apps/eject/ChangeLog +++ b/sys-apps/eject/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/eject # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.49 2006/02/09 17:04:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.50 2006/02/11 04:16:14 vapier Exp $ + +*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). diff --git a/sys-apps/eject/eject-2.1.0.ebuild b/sys-apps/eject/eject-2.1.0-r1.ebuild index 86d1ea8c195b..c4fa7620b680 100644 --- a/sys-apps/eject/eject-2.1.0.ebuild +++ b/sys-apps/eject/eject-2.1.0-r1.ebuild @@ -1,6 +1,6 @@ # 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.ebuild,v 1.9 2006/02/09 17:04:11 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.0-r1.ebuild,v 1.1 2006/02/11 04:16:14 vapier Exp $ inherit eutils diff --git a/sys-apps/eject/files/digest-eject-2.1.0 b/sys-apps/eject/files/digest-eject-2.1.0-r1 index 0257fd71f7cb..0257fd71f7cb 100644 --- a/sys-apps/eject/files/digest-eject-2.1.0 +++ b/sys-apps/eject/files/digest-eject-2.1.0-r1 diff --git a/sys-apps/eject/files/eject-2.1.0-toggle.patch b/sys-apps/eject/files/eject-2.1.0-toggle.patch new file mode 100644 index 000000000000..857622cd9a6a --- /dev/null +++ b/sys-apps/eject/files/eject-2.1.0-toggle.patch @@ -0,0 +1,40 @@ +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) |