Remove old. Drop backwards compatibility symlink.

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

diff --git a/app-misc/editor-wrapper/ChangeLog b/app-misc/editor-wrapper/ChangeLog
index e30f53464b38eb9064567b18aad4f0c86c4f8bb0..b500e2c57a89f28bf108c793dffd8e48ac71f6bc 100644 (file)
--- a/app-misc/editor-wrapper/ChangeLog
+++ b/app-misc/editor-wrapper/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2011/12/29 20:51:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/ChangeLog,v 1.12 2011/12/29 21:37:29 ulm Exp $
+
+  29 Dec 2011; Ulrich Mueller <ulm@gentoo.org> -editor-wrapper-2.ebuild,
+  -files/editor-wrapper-2.sh, -editor-wrapper-3.ebuild,
+  -files/editor-wrapper-3.sh, editor-wrapper-4.ebuild:
+  Remove old. Drop backwards compatibility symlink.
 
   29 Dec 2011; Mark Loeser <halcy0n@gentoo.org> editor-wrapper-4.ebuild:
   Stable for ppc/ppc64; bug #379095

diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index 1e1f2d9aba2276b14018d80344ac674f5626b3e6..b2988dec78390133cee8dfb851272174fc101ba1 100644 (file)
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,28 +1,14 @@
 -----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
-EBUILD editor-wrapper-4.ebuild 770 RMD160 8ae50a6b85713860fd3401ef4f3d121350e073b5 SHA1 79bc1839955f89a9339f016785a206a57625d55e SHA256 b8b5d2a7d80c571a80491b15847b08f483ca6a643adb79ee33eb5a5f0d9aa3a6
-MISC ChangeLog 3568 RMD160 69d5ceacf55a842938ec82e8bd4e7aaf72ab49f6 SHA1 5a795b686fbb3dcc13baa99556ddd1a6c5d24a24 SHA256 a728b83982f9dcada03fe4586cd046b2544a749d8c97a54a1c5439a6d1afb7a2
+EBUILD editor-wrapper-4.ebuild 698 RMD160 5c8905716924e66aec2aa61d5d6179896fbc6acd SHA1 69219fbb5767abf7524eb2cc0aacaa99a871dc2c SHA256 91547597d3f2494d1539397c5b79613ae3e41c38c0c1e2ba25b59fe76c4b772d
+MISC ChangeLog 3801 RMD160 1bfcec5123569911e22e764ad9263301fd803c2b SHA1 f549a33d1b873fb252569e9698a29ace8b3c3b32 SHA256 55cd0821c3a6b56d4538baa46972681b5819497ecec9f45431e2f764a31de2e8
 MISC metadata.xml 183 RMD160 de889cdf3481996341cd4cee764cf5c72704cf10 SHA1 1f469d9815709d2c9875a251b48fb3f688cb6f19 SHA256 7d020057c52803e7181c769edb0883bb918daa3a6c4d7f5097ff49f808d14089
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/NLzAAoJEPTTRK0uRVaNU4YQAI6/hT/KTB+cIRjdCQdH0eCX
-6UOl4ywXJXrbu5yIKBuUHu2K+0WULqqksitGIqjmm9rYvsPFq2ngD1aJWtZpTM/p
-oCmFVb1sJlodKKEWb3o5xIQANy/ZbxEDRSd9fxAmArOtKvaGD4crxlZWGrAEHvHK
-qK9di1iR8HooFia7+W397q2dVnwJH/CbEIPliVkqqnSR28d8KoF/53X8ItpJFiN5
-Ri5DjvX5wJOr9VQ7NPC2gkvnGwoAgYh9J6Hr46IsLUrO0uyfGPMSnHCudWc4dDS0
-v2aCt3AkJuAT/GkxIjQmgg6xMMxwieYeGDBCjoq44SI6rJ6Uox4c7vgZcPp4ZjxS
-6cuPMkWvS5rBjTT5CDIPlmSnfg+Gw+8F3Vnh8zlCUH4KVAoUguZ/FjRU/IvLX0HG
-pCYTcL9raJAOUf8Q9kcASU0woDolKy82zTWd5Z4FCF7GEylGjsSQx0U3riNGsCFx
-dtFmjcBui5q1hQ6YfGmPBN3L21WJKMk/7qAXRQcWmf4SYjtlu3a5WAbVYDMfDseR
-vsxvE7mVlL0kAr6PzLgkPkrbMLTSZwBrj3hFSznjDXBEKwsp89jdDLy+INFSyvnM
-173JOlCjeWVtFZSk6f14A7JwDNnzVCQxXmF+HusxkEg19qyyO98JjHZleHo3e0js
-l7Y9mYQ3Neu4INnzWtlo
-=9L3M
+iEYEARECAAYFAk784BQACgkQOeoy/oIi7ux1KgCeIWfIpJzY7IIygpFIFDqatEHj
+/kEAoNsKDG367/hV57Kzx8wMlKbI1uNS
+=ye6a
 -----END PGP SIGNATURE-----

diff --git a/app-misc/editor-wrapper/editor-wrapper-2.ebuild b/app-misc/editor-wrapper/editor-wrapper-2.ebuild
deleted file mode 100644 (file)
index bb342d7..0000000
--- a/app-misc/editor-wrapper/editor-wrapper-2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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-2.ebuild,v 1.1 2011/08/11 10:40:41 ulm Exp $
-
-DESCRIPTION="Wrapper script that will execute EDITOR"
-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=""
-
-src_install() {
-       exeinto /usr/libexec
-       newexe "${FILESDIR}/${P}.sh" gentoo-editor || die
-}

diff --git a/app-misc/editor-wrapper/editor-wrapper-3.ebuild b/app-misc/editor-wrapper/editor-wrapper-3.ebuild
deleted file mode 100644 (file)
index 5d23db1..0000000
--- a/app-misc/editor-wrapper/editor-wrapper-3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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-3.ebuild,v 1.4 2011/08/21 13:19:41 nixnut 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/editor-wrapper-4.ebuild b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
index 1e3d2bbfbf541cd87992da1f6c6e48419f622dee..2a00bf913b71231a1bf64f8cd15e65ebaa75c70c 100644 (file)
--- a/app-misc/editor-wrapper/editor-wrapper-4.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2011/12/29 20:51:57 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/editor-wrapper/editor-wrapper-4.ebuild,v 1.7 2011/12/29 21:37:29 ulm Exp $
 
 EAPI=4
 
@@ -23,6 +23,4 @@ src_prepare() {
 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-2.sh b/app-misc/editor-wrapper/files/editor-wrapper-2.sh
deleted file mode 100644 (file)
index dc8e065..0000000
--- a/app-misc/editor-wrapper/files/editor-wrapper-2.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Copyright 2009-2011 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-misc/editor-wrapper/files/editor-wrapper-3.sh b/app-misc/editor-wrapper/files/editor-wrapper-3.sh
deleted file mode 100644 (file)
index 34520ff..0000000
--- a/app-misc/editor-wrapper/files/editor-wrapper-3.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/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; echo "${@VAR@}")
-fi
-
-if [ -z "${@VAR@}" ]; then
-    echo "$0: The @VAR@ variable must be set" >&2
-    exit 1
-fi
-
-exec ${@VAR@} "$@"