From 6bcb0ae811832030fafd77812de353bf30ce3cd3 Mon Sep 17 00:00:00 2001 From: layman Date: Sat, 19 Jan 2013 17:36:13 +0100 Subject: Bump zshrc-mv, auto-fu-zsh, zsh-syntax-highlighting --- app-shells/auto-fu-zsh/ChangeLog | 7 +- .../auto-fu-zsh/auto-fu-zsh-0.0.1.12-r2.ebuild | 1 - .../auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild | 1 + .../auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild | 112 +++++++++++++++++++++ app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild | 112 --------------------- app-shells/zsh-syntax-highlighting/ChangeLog | 7 +- .../zsh-syntax-highlighting-0.1.2-r1.ebuild | 1 + .../zsh-syntax-highlighting-0.1.2.ebuild | 1 - .../zsh-syntax-highlighting-99999999-r1.ebuild | 51 ++++++++++ .../zsh-syntax-highlighting-99999999.ebuild | 50 --------- app-shells/zshrc-mv/ChangeLog | 5 + app-shells/zshrc-mv/Manifest | 2 +- app-shells/zshrc-mv/zshrc-mv-1.3.ebuild | 37 ------- app-shells/zshrc-mv/zshrc-mv-1.4.ebuild | 37 +++++++ 14 files changed, 220 insertions(+), 204 deletions(-) delete mode 120000 app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r2.ebuild create mode 120000 app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild create mode 100644 app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild delete mode 100644 app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild create mode 120000 app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2-r1.ebuild delete mode 120000 app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2.ebuild create mode 100644 app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild delete mode 100644 app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild delete mode 100644 app-shells/zshrc-mv/zshrc-mv-1.3.ebuild create mode 100644 app-shells/zshrc-mv/zshrc-mv-1.4.ebuild (limited to 'app-shells') diff --git a/app-shells/auto-fu-zsh/ChangeLog b/app-shells/auto-fu-zsh/ChangeLog index 714cb7b8..e8bbcd77 100644 --- a/app-shells/auto-fu-zsh/ChangeLog +++ b/app-shells/auto-fu-zsh/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for app-shells/auto-fu-zsh -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*auto-fu-zsh-0.0.1.12-r3, auto-fu-zsh-99999999-r1 (10 Jan 2012) + + 10 Jan 2013; Martin Väth + Change install location, remove old ebuilds + *auto-fu-zsh-99999999 (04 Nov 2012) 17 Nov 2012; Martin Väth diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r2.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r2.ebuild deleted file mode 120000 index fe5fb670..00000000 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r2.ebuild +++ /dev/null @@ -1 +0,0 @@ -auto-fu-zsh-99999999.ebuild \ No newline at end of file diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild new file mode 120000 index 00000000..ecbfcdbe --- /dev/null +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-0.0.1.12-r3.ebuild @@ -0,0 +1 @@ +auto-fu-zsh-99999999-r1.ebuild \ No newline at end of file diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild new file mode 100644 index 00000000..61572f8a --- /dev/null +++ b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +inherit eutils + +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" + [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true + inherit git-2 + PROPERTIES="live" + SRC_URI="" + KEYWORDS="";; +*) + LIVE=false + RESTRICT="mirror" + inherit vcs-snapshot + SRC_URI="http://github.com/hchbaw/${mPN}/tarball/v${PV} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86";; +esac + +DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion" +HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/" + +LICENSE="HPND" +SLOT="0" +IUSE="+compile +kill-line" + +DEPEND="compile? ( app-shells/zsh )" + +DESTPATH="/usr/share/zsh/site-contrib/${mPN}" + +generate_example() { + echo "# Put something like the following into your ~/.zshrc + +# First, we set sane options for the standard completion system: + +autoload -Uz compinit is-at-least +compinit -D -u +zstyle ':completion:*' completer _complete +zstyle ':completion:*' list-colors \${(s.:.)LS_COLORS} +zstyle ':completion:*' menu select=1 # interactive +zstyle ':completion:*' accept-exact-dirs true +zstyle ':completion:*' path-completion false +if is-at-least 4.3.10 +then zstyle ':completion:*' format \"%B%F{yellow}%K{blue}%d%k%f%b\" +else zstyle ':completion:*' format \"%B%d%b\" +fi + +# Now we source ${PN}" + if use compile + then echo ". ${DESTPATH}/${pPN} +auto-fu-install" + else echo ". ${DESTPATH}/${pPN}.zsh" + fi + echo " +# Finally, we configure ${PN} + +zstyle ':auto-fu:highlight' input +zstyle ':auto-fu:highlight' completion bold,fg=blue +zstyle ':auto-fu:highlight' completion/one fg=blue +zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-' +#zstyle ':auto-fu:var' enable all +#zstyle ':auto-fu:var' track-keymap-skip opp +#zstyle ':auto-fu:var' disable magic-space +zle-line-init() auto-fu-init +zle -N zle-line-init +zle -N zle-keymap-select auto-fu-zle-keymap-select" +} + +src_prepare() { + ( + umask 022 + generate_example >"${S}"/zshrc-example + ) + 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 + epatch_user +} + +src_compile() { + ! use compile || mPN="${mPN}" \ + zsh -c 'source ${mPN} && auto-fu-zcompile ${PWD}/${mPN} ${PWD}' || die +} + +src_install() { + insinto "${DESTPATH}" + doins "${mPN}" + ! use compile || doins "${pPN}" "${pPN}.zwc" + dodoc zshrc-example README* +} diff --git a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild b/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild deleted file mode 100644 index 60f49b90..00000000 --- a/app-shells/auto-fu-zsh/auto-fu-zsh-99999999.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -inherit eutils - -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" - [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true - inherit git-2 - PROPERTIES="live" - SRC_URI="" - KEYWORDS="";; -*) - LIVE=false - RESTRICT="mirror" - inherit vcs-snapshot - SRC_URI="http://github.com/hchbaw/${mPN}/tarball/v${PV} -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86";; -esac - -DESCRIPTION="zsh automatic complete-word and list-choices: incremental completion" -HOMEPAGE="https://github.com/hchbaw/auto-fu.zsh/" - -LICENSE="HPND" -SLOT="0" -IUSE="+compile +kill-line" - -DEPEND="compile? ( app-shells/zsh )" - -DESTPATH="/usr/share/zsh/site-contrib/${pPN}" - -generate_example() { - echo "# Put something like the following into your ~/.zshrc - -# First, we set sane options for the standard completion system: - -autoload -Uz compinit is-at-least -compinit -D -u -zstyle ':completion:*' completer _complete -zstyle ':completion:*' list-colors \${(s.:.)LS_COLORS} -zstyle ':completion:*' menu select=1 # interactive -zstyle ':completion:*' accept-exact-dirs true -zstyle ':completion:*' path-completion false -if is-at-least 4.3.10 -then zstyle ':completion:*' format \"%B%F{yellow}%K{blue}%d%k%f%b\" -else zstyle ':completion:*' format \"%B%d%b\" -fi - -# Now we source ${PN}" - if use compile - then echo ". ${DESTPATH}/${pPN} -auto-fu-install" - else echo ". ${DESTPATH}/${pPN}.zsh" - fi - echo " -# Finally, we configure ${PN} - -zstyle ':auto-fu:highlight' input -zstyle ':auto-fu:highlight' completion bold,fg=blue -zstyle ':auto-fu:highlight' completion/one fg=blue -zstyle ':auto-fu:var' postdisplay # \$'\\n-azfu-' -#zstyle ':auto-fu:var' enable all -#zstyle ':auto-fu:var' track-keymap-skip opp -#zstyle ':auto-fu:var' disable magic-space -zle-line-init() auto-fu-init -zle -N zle-line-init -zle -N zle-keymap-select auto-fu-zle-keymap-select" -} - -src_prepare() { - ( - umask 022 - generate_example >"${S}"/zshrc-example - ) - 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 - epatch_user -} - -src_compile() { - ! use compile || mPN="${mPN}" \ - zsh -c 'source ${mPN} && auto-fu-zcompile ${PWD}/${mPN} ${PWD}' || die -} - -src_install() { - insinto "${DESTPATH}" - doins "${mPN}" - ! use compile || doins "${pPN}" "${pPN}.zwc" - dodoc zshrc-example README* -} diff --git a/app-shells/zsh-syntax-highlighting/ChangeLog b/app-shells/zsh-syntax-highlighting/ChangeLog index 79132ffb..96609d68 100644 --- a/app-shells/zsh-syntax-highlighting/ChangeLog +++ b/app-shells/zsh-syntax-highlighting/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for app-shells/zsh-syntax-highlighting -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zsh-syntax-highlighting-0.1.2-r1, -99999999-r1 (19 Jan 2013) + + 19 Jan 2013; Martin Väth + Change install location, remove old ebuilds. + *zsh-syntax-highlighting-0.1.2 (17 Aug 2012) 28 Sep 2012; Martin Väth diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2-r1.ebuild new file mode 120000 index 00000000..c2b56b38 --- /dev/null +++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2-r1.ebuild @@ -0,0 +1 @@ +zsh-syntax-highlighting-99999999-r1.ebuild \ No newline at end of file diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2.ebuild deleted file mode 120000 index 54239a6c..00000000 --- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-0.1.2.ebuild +++ /dev/null @@ -1 +0,0 @@ -zsh-syntax-highlighting-99999999.ebuild \ No newline at end of file diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild new file mode 100644 index 00000000..fecce927 --- /dev/null +++ b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils + +case ${PV} in +99999999*) + EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git" + [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true + inherit git-2 + PROPERTIES="live" + SRC_URI="" + KEYWORDS="";; +*) + RESTRICT="mirror" + inherit vcs-snapshot + SRC_URI="http://github.com/zsh-users/${PN}/tarball/${PV} -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86";; +esac + +DESCRIPTION="Fish shell like syntax highlighting for zsh" +HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting" + +LICENSE="HPND" +SLOT="0" +IUSE="" + +RDEPEND="app-shells/zsh" +DEPEND="" + +src_prepare() { + epatch_user +} + +src_install() { + dodoc *.md + insinto /usr/share/zsh/site-contrib/${PN} + doins *.zsh + doins -r highlighters +} + +pkg_postinst() { + [ -n "${REPLACING_VERSIONS}" ] && return + elog "In order to use ${CATEGORY}/${PN} add" + elog ". /usr/share/zsh/site-contrib/${PN}/zsh-syntax-highlighting.zsh" + elog "at the end of your ~/.zshrc" + elog "For testing, you can also execute the above command in your zsh." +} diff --git a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild b/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild deleted file mode 100644 index 7fb092c3..00000000 --- a/app-shells/zsh-syntax-highlighting/zsh-syntax-highlighting-99999999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils - -case ${PV} in -99999999*) - EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git" - [ -n "${EVCS_OFFLINE}" ] || EGIT_REPACK=true - inherit git-2 - PROPERTIES="live" - SRC_URI="" - KEYWORDS="";; -*) - RESTRICT="mirror" - inherit vcs-snapshot - SRC_URI="http://github.com/zsh-users/${PN}/tarball/${PV} -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86";; -esac - -DESCRIPTION="Fish shell like syntax highlighting for zsh" -HOMEPAGE="https://github.com/zsh-users/zsh-syntax-highlighting" - -LICENSE="HPND" -SLOT="0" -IUSE="" - -RDEPEND="app-shells/zsh" -DEPEND="" - -src_prepare() { - epatch_user -} - -src_install() { - dodoc *.md - insinto /usr/share/zsh/site-contrib - doins *.zsh - doins -r highlighters -} - -pkg_postinst() { - elog "In order to use ${CATEGORY}/${PN} add" - elog ". /usr/share/zsh/site-contrib/zsh-syntax-highlighting.zsh" - elog "at the end of your ~/.zshrc" - elog "For testing, you can also execute the above command in your zsh." -} diff --git a/app-shells/zshrc-mv/ChangeLog b/app-shells/zshrc-mv/ChangeLog index 9e45c48c..9cedc7ba 100644 --- a/app-shells/zshrc-mv/ChangeLog +++ b/app-shells/zshrc-mv/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zshrc-1.4 (19 Jan 2013) + + 19 Jan 2013; Martin Väth + Version bump, remove old ebuild. + *zshrc-1.3 (14 Jan 2013) 14 Jan 2013; Martin Väth diff --git a/app-shells/zshrc-mv/Manifest b/app-shells/zshrc-mv/Manifest index 2dc002d9..c855db3f 100644 --- a/app-shells/zshrc-mv/Manifest +++ b/app-shells/zshrc-mv/Manifest @@ -1 +1 @@ -DIST zshrc-mv-1.3.tar.gz 7213 SHA256 9ca19f89a10b5f5c4d646f9d8fd5a7925a9eaf207df43122f34d126520374755 SHA512 9fa91ed26d73c749ea714dad2a4c89804c43888d2117bc7e9a27d2cb50d39e6478c7222c9acb943eb9fb34ddd43a0f04b0c680a77340fffab9a0dfaa89e5bfd5 WHIRLPOOL 090b25b4f0568af4545e2e9b1792aa3eb6cd7239f90e3901106dc15b4efbac8e7e8d94f72a20258f440bf4db8c99fe1756a86a75aea6ad6d16223ba9b9e5c5ed +DIST zshrc-mv-1.4.tar.gz 7480 SHA256 15eac4a1999e10800e6c7f8e7e922d24906cf757aa15fd901c1a234a634da449 SHA512 2690c6a75a1f291803d98a61a720c409fef3d84d2b7942a3a2af45396a56615f8b7b1d950b1be0aa936d269ab8611b4dd30f229811b79c1c45e7866aa2040a28 WHIRLPOOL 774eee66cbc681e715880410101116028626fee2fd8694725f17ca37c47a03c7cb5d7e71c0a1c0ccab687996cea7dd2f6b1b2034884eb615b7bb61d2eb1b6ef8 diff --git a/app-shells/zshrc-mv/zshrc-mv-1.3.ebuild b/app-shells/zshrc-mv/zshrc-mv-1.3.ebuild deleted file mode 100644 index 0fe73a15..00000000 --- a/app-shells/zshrc-mv/zshrc-mv-1.3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 -RESTRICT="mirror" -inherit eutils vcs-snapshot - -DESCRIPTION="A zshrc file initializing zsh specific interactive features" -HOMEPAGE="https://github.com/vaeth/zshrc-mv/" -SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_prepare() { - epatch_user -} - -src_install() { - dodoc README - insinto /etc/zsh - doins zshrc -} - -pkg_postinst() { - local i - for i in \ - '>=app-shells/auto-fu-zsh-0.0.1.13' \ - 'app-shells/zsh-syntax-highlighting' \ - 'app-shells/set_prompt' \ - 'app-shells/termcolors-mv' - do has_version "${i}" || elog "It is recommended to install ${i}" - done -} diff --git a/app-shells/zshrc-mv/zshrc-mv-1.4.ebuild b/app-shells/zshrc-mv/zshrc-mv-1.4.ebuild new file mode 100644 index 00000000..0fe73a15 --- /dev/null +++ b/app-shells/zshrc-mv/zshrc-mv-1.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 +RESTRICT="mirror" +inherit eutils vcs-snapshot + +DESCRIPTION="A zshrc file initializing zsh specific interactive features" +HOMEPAGE="https://github.com/vaeth/zshrc-mv/" +SRC_URI="http://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +src_prepare() { + epatch_user +} + +src_install() { + dodoc README + insinto /etc/zsh + doins zshrc +} + +pkg_postinst() { + local i + for i in \ + '>=app-shells/auto-fu-zsh-0.0.1.13' \ + 'app-shells/zsh-syntax-highlighting' \ + 'app-shells/set_prompt' \ + 'app-shells/termcolors-mv' + do has_version "${i}" || elog "It is recommended to install ${i}" + done +} -- cgit v1.2.3-65-gdbad