Pass arguments to editor transparently.

Package-Manager: portage-2.2_rc51/cvs/Linux i686

5 files changed, 33 insertions, 41 deletions

diff --git a/app-editors/gentoo-editor/ChangeLog b/app-editors/gentoo-editor/ChangeLog
index fb37410f4b23..b1f868ca5f49 100644
--- a/app-editors/gentoo-editor/ChangeLog
+++ b/app-editors/gentoo-editor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gentoo-editor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gentoo-editor/ChangeLog,v 1.2 2009/11/24 09:25:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gentoo-editor/ChangeLog,v 1.3 2009/11/24 18:26:37 ulm Exp $
+
+*gentoo-editor-2 (24 Nov 2009)
+
+  24 Nov 2009; Ulrich Mueller <ulm@gentoo.org> -gentoo-editor-1.ebuild,
+  -files/gentoo-editor-1.sh, +gentoo-editor-2.ebuild,
+  +files/gentoo-editor-2.sh:
+  Pass arguments to editor transparently.
 
   24 Nov 2009; Alexis Ballier <aballier@gentoo.org> gentoo-editor-1.ebuild:
   keyword ~x86-fbsd, bug #293985
diff --git a/app-editors/gentoo-editor/Manifest b/app-editors/gentoo-editor/Manifest
index 99f5680082a3..aa12f8c5d255 100644
--- a/app-editors/gentoo-editor/Manifest
+++ b/app-editors/gentoo-editor/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gentoo-editor-1.sh 767 RMD160 17f17b158970d07360d4dd24bae232e46ec394e7 SHA1 388f09bfea81131f953ba82e26b4ddbf6da6962e SHA256 3ae98fa24cc00ecb9cc9297ba7ac54e3d904f0d4b2ef37e4ff7a871e7f6c0fde
-EBUILD gentoo-editor-1.ebuild 499 RMD160 96ed99358f6156a91c14f365eff1f02e751dc921 SHA1 ba58954ae45a03024da14ef9fc0cc3befb4fc15f SHA256 6f3cb3b4b5640b1de22c316edf3461b0bb59aa3d498ac68f4cf124ff17f4791e
-MISC ChangeLog 582 RMD160 1dea85dca986f31b26f805f8842d55e5860d6cc4 SHA1 b1643fcebf03cde46ce2c077af4848cf6012a087 SHA256 d0d3df8cd5acaef4e9955202a18d99072311b81388051e1924b6940b75856e92
+AUX gentoo-editor-2.sh 411 RMD160 dd51e5cba9a39a6e78a954ff2bef8028933e5e97 SHA1 d2a349ff0d71e65f32f3c9d6abb11aa1325ccc7d SHA256 bc73e390396c0e14624ff93ef8549bcf426250aac1bf848606b5a719fff2db32
+EBUILD gentoo-editor-2.ebuild 468 RMD160 5b50f9d438b19a785463c8386faf138467235a18 SHA1 272c29d7e4352d6091377e6fcc3fc61d556bbe66 SHA256 c7e05ed62941b25001e3d4535f3efbbff057363fcd683d8e15721c80c143fac5
+MISC ChangeLog 807 RMD160 5ec7d2d31be07d7b653c6e9e7bc0bba73f7ef92a SHA1 bdcd54fc4157509ad294f8124c4305d599d41eb6 SHA256 e245238a25ffe52f258b9efbe68e0575c6b0af6b5a4784cd97be350ca12661fb
 MISC metadata.xml 183 RMD160 de889cdf3481996341cd4cee764cf5c72704cf10 SHA1 1f469d9815709d2c9875a251b48fb3f688cb6f19 SHA256 7d020057c52803e7181c769edb0883bb918daa3a6c4d7f5097ff49f808d14089
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
-iEYEARECAAYFAksLpnUACgkQvFcC4BYPU0ouowCgkNxExxHV0DhO5iCdDDC72G02
-JDoAoLsmrMPrjIcGUbREWvpr+nQAtrJW
-=B9GG
+iEYEARECAAYFAksMJfYACgkQOeoy/oIi7uyGbgCguEPLs8pUX0TgjmS4Vh2QIZ5J
+uEwAoMIVfAiONlxqLe0mJHaTVrBzaDXs
+=X5FX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gentoo-editor/files/gentoo-editor-1.sh b/app-editors/gentoo-editor/files/gentoo-editor-1.sh
deleted file mode 100644
index 5bce592ff7b2..000000000000
--- a/app-editors/gentoo-editor/files/gentoo-editor-1.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Copyright 2009 Gentoo Foundation
-# Distributed under the terms of the MIT/X11 license
-
-# Editor wrapper script, executes ${EDITOR} on file $1.
-# We disallow options and multiple file name arguments on purpose, so
-# that packages' configure scripts cannot sniff out the type of editor.
-
-if [ $# -ne 1 ]; then
-    echo "$0: Exactly one argument required" >&2
-    exit 1
-fi
-
-file=$1
-if [ "${file#-}" != "${file}" ]; then
-    # Argument is supposed to be a file name, not an option
-    file=./${file}
-fi
-
-if [ -z "${EDITOR}" ]; then
-    # Try to get EDITOR from system profile
-    EDITOR=$(. /etc/profile &>/dev/null; echo "${EDITOR}")
-fi
-
-if [ -z "${EDITOR}" ]; then
-    echo "$0: The EDITOR variable must be set" >&2
-    exit 1
-fi
-
-exec ${EDITOR} "${file}"
diff --git a/app-editors/gentoo-editor/files/gentoo-editor-2.sh b/app-editors/gentoo-editor/files/gentoo-editor-2.sh
new file mode 100644
index 000000000000..6f1dd4a50590
--- /dev/null
+++ b/app-editors/gentoo-editor/files/gentoo-editor-2.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the MIT/X11 license
+
+# Editor wrapper script, executes ${EDITOR} with arguments $@
+
+if [ -z "${EDITOR}" ]; then
+    # Try to get EDITOR from system profile
+    EDITOR=$(. /etc/profile &>/dev/null; echo "${EDITOR}")
+fi
+
+if [ -z "${EDITOR}" ]; then
+    echo "$0: The EDITOR variable must be set" >&2
+    exit 1
+fi
+
+exec ${EDITOR} "$@"
diff --git a/app-editors/gentoo-editor/gentoo-editor-1.ebuild b/app-editors/gentoo-editor/gentoo-editor-2.ebuild
index 44bf6a5e36ca..d6425ae142cf 100644
--- a/app-editors/gentoo-editor/gentoo-editor-1.ebuild
+++ b/app-editors/gentoo-editor/gentoo-editor-2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gentoo-editor/gentoo-editor-1.ebuild,v 1.3 2009/11/24 09:25:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gentoo-editor/gentoo-editor-2.ebuild,v 1.1 2009/11/24 18:26:37 ulm Exp $
 
 DESCRIPTION="Auxiliary editor script"
 HOMEPAGE="http://www.gentoo.org/"
@@ -11,8 +11,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND="virtual/editor"
-
 src_install() {
 	exeinto /usr/libexec
 	newexe "${FILESDIR}/${P}.sh" gentoo-editor || die