From: Ulrich Müller <ulm@gentoo.org>
Date: Mon, 22 Aug 2011 22:33:54 +0000 (+0000)
Subject: Version bump, fixes bug 380285.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c239a27bf4a991006f8a802a422f3c512f8051d9;p=gentoo.git

Version bump, fixes bug 380285.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64
---

diff --git a/app-misc/editor-wrapper/ChangeLog b/app-misc/editor-wrapper/ChangeLog
index ce179c6f8461..0b9104e24d42 100644
--- a/app-misc/editor-wrapper/ChangeLog
+++ b/app-misc/editor-wrapper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/editor-wrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/ChangeLog,v 1.5 2011/08/21 13:19:41 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/ChangeLog,v 1.6 2011/08/22 22:33:54 ulm Exp $
+
+*editor-wrapper-4 (22 Aug 2011)
+
+  22 Aug 2011; Ulrich Mueller <ulm@gentoo.org> +editor-wrapper-4.ebuild,
+  +files/editor-wrapper-4.sh:
+  Version bump, fixes bug 380285.
 
   21 Aug 2011; nixnut <nixnut@gentoo.org> editor-wrapper-3.ebuild:
   ppc stable 379743
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 66b8501e5638..1e92170a04a3 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX editor-wrapper-2.sh 416 RMD160 92c36c7859dcf1900543f232653410b6fa5168bd SHA1 051a03ddabbc6934b64754f1c88ef8351f6cc0d0 SHA256 2fd601ef0fcbd2ad264b51eed1ae104f8b39c08817fca78b8196aa10f1eb642e
 AUX editor-wrapper-3.sh 401 RMD160 fcd4141fbbca0f40a1c5b97897ae1a256e5a09dc SHA1 bbeccc465761de6389984131e080273fabc5a974 SHA256 684f0e1e8bb650c79f3a113036f4ffb9e7d27a2e71520f19af2fdb63e66b70be
+AUX editor-wrapper-4.sh 405 RMD160 1633fcd246b57b8ab5705eeaf048369970203d32 SHA1 3a2d9b859b11a68791251d7ad650f4da64088847 SHA256 47ea2eb09201d5b8d018173faf9646a0a7c2cbbbbbe3a477766834ed6bdaecd0
 EBUILD editor-wrapper-2.ebuild 548 RMD160 cc6e51071542928a87c846da922c58b86c79ac1d SHA1 1f48025dbe5c273d3107ac3bcb46d66da420bfb9 SHA256 153418ee988626704fe804cd4de81806355c51dbe270c2c86acc8ac8dfc4db83
 EBUILD editor-wrapper-3.ebuild 778 RMD160 625a7cf9bf3d769238cd5693fbb0291f6950b746 SHA1 e1f3c9ea737fad94ad341d8c901214e032f363ce SHA256 e8365a5988373e4a0ea3d249ad58cac56fd93eb5ab23ea24d667e1ac29ff37fb
-MISC ChangeLog 2836 RMD160 52339cecb8eeb6ae60bbfbb50ae42d2e6971ba8d SHA1 80d842c244aced06edb628b5a2367bc0d8306cf0 SHA256 5e4a8423e9c0fdcf1a9f9c44e8039408eabcf110647e00ac10724abca11738c4
+EBUILD editor-wrapper-4.ebuild 778 RMD160 7915febc64a3349aa46e6a7eba9704af5b2bf7cd SHA1 e1ca4ec11074af30869bac04d496589b35eab182 SHA256 14fd4bcc1f6afc465a38a68468919658ae2c9252b61eb777e429046cd50378fd
+MISC ChangeLog 3004 RMD160 6e0ec6d8432a1cf32a7f28a44029a8ec8c974330 SHA1 0626854d67e83d52d929f9318a9c9c277144258c SHA256 9dfcf409e6547e41361bc466dd6707885ca51512af40747dbed50d9ecb8206dc
 MISC metadata.xml 183 RMD160 de889cdf3481996341cd4cee764cf5c72704cf10 SHA1 1f469d9815709d2c9875a251b48fb3f688cb6f19 SHA256 7d020057c52803e7181c769edb0883bb918daa3a6c4d7f5097ff49f808d14089
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5S2rIACgkQOeoy/oIi7uzuTgCaA35Sfezp90vnAcVu/6v8ELKX
+y1EAoJQ8zTN2TkLTVlREOuslidFPQvqD
+=8qWM
+-----END PGP SIGNATURE-----
diff --git a/app-misc/editor-wrapper/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
new file mode 100644
index 000000000000..10f6689a64b8
--- /dev/null
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.1 2011/08/22 22:33:54 ulm Exp $
+
+EAPI=4
+
+DESCRIPTION="Wrapper scripts that will execute EDITOR or PAGER"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	sed -e 's/@VAR@/EDITOR/g' "${FILESDIR}/${P}.sh" >editor || die
+	sed -e 's/@VAR@/PAGER/g'  "${FILESDIR}/${P}.sh" >pager  || die
+}
+
+src_install() {
+	exeinto /usr/libexec
+	doexe editor pager
+	# backwards compatibility
+	dosym editor /usr/libexec/gentoo-editor
+}
diff --git a/app-misc/editor-wrapper/files/editor-wrapper-4.sh b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
new file mode 100644
index 000000000000..b58f1a8b9eeb
--- /dev/null
+++ b/app-misc/editor-wrapper/files/editor-wrapper-4.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# Copyright 2009-2011 Gentoo Foundation
+# Distributed under the terms of the MIT/X11 license
+
+# Wrapper script, executes ${@VAR@} with arguments $@
+
+if [ -z "${@VAR@}" ]; then
+    # Try to get @VAR@ from system profile
+    @VAR@=$(. /etc/profile >/dev/null 2>&1; echo "${@VAR@}")
+fi
+
+if [ -z "${@VAR@}" ]; then
+    echo "$0: The @VAR@ variable must be set" >&2
+    exit 1
+fi
+
+exec ${@VAR@} "$@"