summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2012-11-09 22:10:44 +0100
committerMartin Väth <martin@mvath.de>2015-10-11 10:48:31 +0200
commitc3078b300a6bef6d449ff2ebbb22c10d56ab6073 (patch)
treeaaf81baca4180a981b8f364a647cd29d921986fa
parentAdd auto-fu-zsh git. Fix duplicate inherit in aufs (diff)
downloadmv-c3078b300a6bef6d449ff2ebbb22c10d56ab6073.tar.gz
mv-c3078b300a6bef6d449ff2ebbb22c10d56ab6073.tar.bz2
mv-c3078b300a6bef6d449ff2ebbb22c10d56ab6073.zip
Bump less. Update auto-fu-zsh-99999999. Update checksums
-rw-r--r--app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild27
-rw-r--r--app-shells/auto-fu-zsh/files/kill-line-live.patch35
-rw-r--r--sys-apps/less/ChangeLog7
-rw-r--r--sys-apps/less/Manifest2
-rw-r--r--sys-apps/less/less-456.ebuild (renamed from sys-apps/less/less-452.ebuild)0
5 files changed, 59 insertions, 12 deletions
diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
index e1cff87e..de05bdc0 100644
--- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
+++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild
@@ -9,6 +9,7 @@ pPN=${PN%-zsh}
mPN="${pPN}.zsh"
case ${PV} in
99999999*)
+ LIVE=:
EGIT_REPO_URI="git://github.com/hchbaw/${mPN}.git"
EGIT_PROJECT="${PN}.git"
EGIT_BRANCH="pu"
@@ -18,6 +19,7 @@ case ${PV} in
SRC_URI=""
KEYWORDS="";;
*)
+ LIVE=false
RESTRICT="mirror"
inherit vcs-snapshot
SRC_URI="http://github.com/hchbaw/${mPN}/tarball/v${PV} -> ${P}.tar.gz"
@@ -29,7 +31,6 @@ HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="+compile +kill-line"
DEPEND="compile? ( app-shells/zsh )"
@@ -79,16 +80,22 @@ src_prepare() {
umask 022
generate_example >"${S}"/zshrc-example
)
- # Make Ctrl-D return correctly.
- # In case of nonempty buffer act like kill-line or kill-whole-line.
- if use kill-line
- then epatch "${FILESDIR}"/kill-line.patch
- else epatch "${FILESDIR}"/exit.patch
+ if ${LIVE}
+ then if use kill-line
+ then epatch "${FILESDIR}"/kill-line-live.patch
+ fi
+ else
+ # Make Ctrl-D return correctly.
+ # In case of nonempty buffer act like kill-line or kill-whole-line.
+ if use kill-line
+ then epatch "${FILESDIR}"/kill-line.patch
+ else epatch "${FILESDIR}"/exit.patch
+ fi
+ # Reset color with "return":
+ epatch "${FILESDIR}"/reset-color.patch
+ # Make it work with older zsh versions:
+ epatch "${FILESDIR}"/zsh-compatibility.patch
fi
- # Reset color with "return":
- epatch "${FILESDIR}"/reset-color.patch
- # Make it work with older zsh versions:
- epatch "${FILESDIR}"/zsh-compatibility.patch
epatch_user
}
diff --git a/app-shells/auto-fu-zsh/files/kill-line-live.patch b/app-shells/auto-fu-zsh/files/kill-line-live.patch
new file mode 100644
index 00000000..c341e898
--- /dev/null
+++ b/app-shells/auto-fu-zsh/files/kill-line-live.patch
@@ -0,0 +1,35 @@
+--- auto-fu.zsh
++++ auto-fu.zsh
+@@ -386,19 +386,21 @@
+ }
+ }
+
+-afu-eof-maybe () {
+- local eof="$1"; shift
+- [[ -z $BUFFER ]] && { $eof; return }
+- "$@"
+-}
+-
+ afu-ignore-eof () { zle -M "zsh: use 'exit' to exit." }
+
+-afu-register-zle-eof () {
+- local fun="$1"
+- local then="$2"
+- local else="${3:-delete-char-or-list}"
+- eval "$fun () { afu-eof-maybe $then zle $else }; zle -N $fun"
++afu-kill-line() {
++if (($#BUFFER > CURSOR))
++then zle kill-line
++else zle kill-whole-line
++fi
++}
++afu-register-zle-eof() {
++eval $1'() { [[ -z $BUFFER ]] && { '$2'
++return
++}
++afu-kill-line
++}'
++zle -N $1
+ }
+ afu-register-zle-eof afu+orf-ignoreeof-deletechar-list afu-ignore-eof
+ afu-register-zle-eof afu+orf-exit-deletechar-list exit
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index a31000b5..18bbfe3c 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -2,9 +2,14 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*less-456.ebuild (09 Nov 2012)
+
+ 09 Nov 2012; Martin Väth <martin@mvath.de>
+ Bump less version.
+
*less-452.ebuild (23 Oct 2012)
- 23 Jul 2012; Martin Väth <martin@mvath.de>
+ 23 Oct 2012; Martin Väth <martin@mvath.de>
Bump less version. Add USE=sources
*less-451.ebuild (23 Jul 2012)
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 19c5af1d..d0e85062 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,3 +1,3 @@
DIST code2color 199875 SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d SHA512 d9cf24434bf105a138ee82652867aedb83dfe6bfea14d20337f97cf9d37ff9f370a4a7dd58bc7eb69de0f3b944d47c7d7e075f50098b0966e753f42b1b35c22f WHIRLPOOL cdb748e04663a6a109310da454ff5a245e6562ec8cdae03a35ca93095e40511707662c4743dcd922049838cac646d930e6b2d2878f26c328916bb3c9c60c5e8c
-DIST less-452.tar.gz 310592 SHA256 bde4cd1f3cc157de365fce5e40cdcb72ac95fefec1ac52935370fc73f8b4ed1c SHA512 0b8524bac9692cc28f6bc2a020af89ba6fa2cb142c25682ecb97f9856858f0eaf35e58cd12a17c9d2a42f68aa9b31653e9de6a3007f4df45cc65f050c4ebbc82 WHIRLPOOL df2902a76d24a672b510f284db40a7a2c603f9b7e5c6c3dbf8a35ba6ac6258bf5e9ec84e310076cb4568289d08e37cd4501d572ee8b32fb33d967b039cbcc938
+DIST less-456.tar.gz 310727 SHA256 fa3ec8a2b790ea369cb1994571e909c3bb39426f375ab5803233b961ff004677 SHA512 88a7097c12b5f3b30279bcdb95743946a516def239619cfc7f2fa34ab965368b1b64535727e07aae9f2afd9af4f602e40ed22c7721c5ba83904111262078722b WHIRLPOOL 17bd5b5e71c40a522520e9d054db165aba704df954aebeceeb28cc85139bbbf7be6c2d5f0cacf6ebcaca4356bb378267c5f6275bc4dd2e2e5b97715ab537fb25
DIST less-select-2.2.tar.gz 25047 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f SHA512 5ce36fa4e404ae626f9c96ffcf58b9188e0f12c6db0321d3f0ed8fe47593951d072e1da53b874e80fc39041ae8aa85d06d646215d7ad63c611cb096ff5ca9136 WHIRLPOOL ec5341dbb4292f3e776e32ba996ef2efe2aa89438d4f0907efecdcf234d27b2b0e149d43ebd6dee089365c20f2a0796497e5cceebf3f25b846c14e8f0d9e762e
diff --git a/sys-apps/less/less-452.ebuild b/sys-apps/less/less-456.ebuild
index e4fec4a3..e4fec4a3 100644
--- a/sys-apps/less/less-452.ebuild
+++ b/sys-apps/less/less-456.ebuild