Update dependency following package move of editor-wrapper. Use wrapper script for...

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

diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
index d3a87f781237441540ff9719ce5eb204298b1e61..aff5ca09c832b04c1e22024d93adb2f4c7d9c035 100644 (file)
--- a/mail-client/nmh/ChangeLog
+++ b/mail-client/nmh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/nmh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.28 2011/05/17 20:54:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.29 2011/08/11 11:04:01 ulm Exp $
+
+  11 Aug 2011; Ulrich Mueller <ulm@gentoo.org> nmh-1.3-r3.ebuild:
+  Update dependency following package move of editor-wrapper. Use wrapper
+  script for PAGER, too.
 
   17 May 2011; Markos Chandras <hwoarang@gentoo.org> -nmh-1.3-r2.ebuild:
   remove old

diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index b938aafe1e97e1784ad870aa436b84137f4dd741..97c147fede879f683a92467f4214dea2c71d2c8e 100644 (file)
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX nmh-1.3-db5.patch 568 RMD160 4ecedcf484147ba74c296bf8675419948b45c586 SHA1 e7706a77ea8d065e48147929aca71a02e1939663 SHA256 b139def59d1c5371bec1a3b5067698bbb7c320771f66a703c7b8c9eb2f1bdf78
 AUX nmh-1.3-inc-login.patch 602 RMD160 22cd9b4062810b1d30e7d451f3c54b8ad065ce53 SHA1 ddd7152870068b57926a35695b836cc782874d87 SHA256 6f9991f2cacc05d11495d92813fa8000d415e5bf58fc2d194094897ff16f9dd2
@@ -7,23 +7,13 @@ AUX nmh-1.3-install.patch 482 RMD160 db11b277c4c6e8ec124c94935405a035573eff76 SH
 AUX nmh-1.3-m_getfld.patch 624 RMD160 0723829e7a2138529f3e10df270c69e6f5ff6e80 SHA1 b84f27e4c7a84ce6260b0a8c857aff8997d6983d SHA256 733984fb6a763f1451e265c57aabb982cc788e13839497a3b5769875aa0cc2f5
 AUX nmh-1.3-parallelmake.patch 3121 RMD160 d743b48cb2c5bf7d5da9b2141ef0c0fd17221d54 SHA1 16943bc94e83c290ae9e7b7d2b3078a96c840a1a SHA256 befcdf3e2cec4eea23cccb3854cde3df8163282bfff84efce77c96fbdeae456c
 DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
-EBUILD nmh-1.3-r3.ebuild 2193 RMD160 e9f43c3ff55859241c1eb355785da8baa8571c05 SHA1 361f247eaca37128546cf9a5297660afddec1f12 SHA256 28c3a7396e050ad073fe687d58ec775ce6cba13fe53b3328b8e0ad8c0c2d4d7b
-MISC ChangeLog 890 RMD160 fcde1af65b618c78c88e2d76951a99fcecffb7b2 SHA1 81605c7acbf41e376be101735cbf6298f9bc978a SHA256 cb09e230def858b055e36e54345d04f386bd8e32f9ab01b5332cf57528658806
+EBUILD nmh-1.3-r3.ebuild 2066 RMD160 c55141e90cd4b4b598c2506f4a1a734dee77fb76 SHA1 b08251acf9da12e112c09eac8218f75395ecbc9e SHA256 f76815fd7f88269227daa4babbb327c614d411f2a34955dd57470a21b3e3ff6e
+MISC ChangeLog 1051 RMD160 8b808656221422ca2afb057ce7089ef65c0a17ba SHA1 47b43d4b69c2873f9ace229d2c230c545d575088 SHA256 f4a6ee8a522201fc13e46c691c6a6a601e3001016da2145823e1402a6f6443f7
 MISC metadata.xml 506 RMD160 3cc5b45fd02c8a18f9fa51228dac568b06fb54ec SHA1 02fe5dc0596c4fa104dd55f7b5a0e4511c3cb916 SHA256 16a088da180c52add3bad81ba2271bf80ec2436d663e856a731456274e1afe38
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN0uB0AAoJEPqDWhW0r/LCZFAQAKQxrOz5bpFY0QGLTupt2anU
-LRcVdEA2zVdg6FB47KyKRL5VA/dL3UszrlUEfj6jKRjfNzrDji7f8BRmXh+BP7fD
-vBAiEtrJNClVlFXjwio3bpzvNwDAOO/hzrzF+SQ7Kd7oLbR+j9fZafSs8lLEpPFo
-BL7MqKMtCSlFE/w+eea1tjvllQ9LOajgeLlyGj4ugUL4/nVJXv/Ynufley3q852U
-2wlMKVQch6WIYVUR51dJC7PWp8uAhJsbBpJsIYLj87sOJFm1CNF9iR3HvIuPX9MS
-HuxgUMKoinb+YUYRbu7pJuGO6280jhHeqUM/J6915X6SIpF3BPbWb3ITg1k7okxe
-cxpyB3VyBwjYmnDBosJQX4WpH2rSGcv2VvBQ+RRlM5g6i2AhQnalANRLfByyDA9W
-kZm7WAOwXjS3tKqONmwgCAGul0A7fCujQnN0a1fUtza87TwGYxMe373EQZA4VxQN
-/+ZpikuU7MCFjHcVnUqcLgwG8DY2n5rHzQhq2TaiEpio4ahCY8bRgINTR7h/+bcd
-G1FZMEiS1btAyiwPkQ9vZTUJB9zk1df+a9I83IHvFZqnWPomeFwsFIsGUtI+GQfL
-uamjNytnaqKK3X19rGN8wwJ5Sfnt5olULazR0L6/k4sO+ewRzfCRn+2OY3TdmpFs
-9gRqNQhvla0kAgGKrUxN
-=zFZ3
+iEYEARECAAYFAk5DuG4ACgkQOeoy/oIi7uxoVgCgo0tpdc61TXtD/kJzJJEM/h4i
+wOoAniqpzSKYC1w5+1ZxGOEN8nyZQAj8
+=K7g0
 -----END PGP SIGNATURE-----

diff --git a/mail-client/nmh/nmh-1.3-r3.ebuild b/mail-client/nmh/nmh-1.3-r3.ebuild
index dcac9a8708b852866f9ba27eff078aa7b51cfa3b..76f5742f270f83bcb8aadd02906d79a490a5f430 100644 (file)
--- a/mail-client/nmh/nmh-1.3-r3.ebuild
+++ b/mail-client/nmh/nmh-1.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.3-r3.ebuild,v 1.2 2010/12/29 15:55:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.3-r3.ebuild,v 1.3 2011/08/11 11:04:01 ulm Exp $
 
 EAPI="2"
 
@@ -19,7 +19,7 @@ DEPEND="gdbm? ( sys-libs/gdbm )
        !gdbm? ( sys-libs/db )
        >=sys-libs/ncurses-5.2
        net-libs/liblockfile
-       app-editors/gentoo-editor
+       >=app-misc/editor-wrapper-3
        !!media-gfx/pixie" # Bug #295996 media-gfx/pixie also uses show
 RDEPEND="${DEPEND}"
 
@@ -38,11 +38,6 @@ src_prepare() {
 }
 
 src_configure() {
-       [ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
-
-       # strip options from ${PAGER} (quoting not good enough) (Bug #262150)
-       PAGER=${PAGER%% *}
-
        # Bug 348816 & Bug 341741: The previous ebuild default of
        # /usr/bin caused unnecessary conflicts with other
        # packages. However, the default nmh libdir location causes
@@ -62,8 +57,9 @@ src_configure() {
                fi
        fi
 
-       # use gentoo-editor to avoid implicit dependencies (Bug #294762)
-       EDITOR=/usr/libexec/gentoo-editor
+       # use wrapper scripts to avoid implicit dependencies (Bug #294762)
+       EDITOR=/usr/libexec/editor
+       PAGER=/usr/libexec/pager
 
        econf \
                --prefix=/usr \