summaryrefslogtreecommitdiff
path: root/app-shells
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells')
-rw-r--r--app-shells/Manifest.gzbin7453 -> 7451 bytes
-rw-r--r--app-shells/bash/Manifest5
-rw-r--r--app-shells/bash/bash-4.4_p23.ebuild260
-rw-r--r--app-shells/fish/Manifest2
-rw-r--r--app-shells/fish/fish-2.7.1.ebuild2
-rw-r--r--app-shells/mpv-bash-completion/Manifest2
-rw-r--r--app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild51
-rw-r--r--app-shells/pdsh/Manifest4
-rw-r--r--app-shells/pdsh/pdsh-2.18-r1.ebuild61
-rw-r--r--app-shells/pdsh/pdsh-2.26-r1.ebuild2
-rw-r--r--app-shells/yash/Manifest2
-rw-r--r--app-shells/yash/yash-2.47.ebuild2
-rw-r--r--app-shells/zsh/Manifest5
-rw-r--r--app-shells/zsh/files/zprofile-442
-rw-r--r--app-shells/zsh/zsh-5.5.1-r1.ebuild (renamed from app-shells/zsh/zsh-5.5.1.ebuild)2
-rw-r--r--app-shells/zsh/zsh-9999.ebuild11
16 files changed, 372 insertions, 81 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e90173a37dce..90d9a1b2952c 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
Binary files differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 832aaec73930..88549d4123fa 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -357,6 +357,10 @@ DIST bash44-016 2069 BLAKE2B 5ac613c450d018edff4f82740655ed0e460e49b57ce1a817f0b
DIST bash44-017 1143 BLAKE2B 64da515637109cd87b95e5f55857f25c2758b4a5c2620cd21250287e00767d5ca7a14fe331603cdef1ba02f622d97ee120bc0bfba463bccb113f16ebee56159f SHA512 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac
DIST bash44-018 1319 BLAKE2B abfd87f2cb5e9aeb0352bb0efbfd3ad95cbb26445e09edaa762cf1ea1fa01a00ab57c96d912ae5eaf653b66169bc54bba39fdf1d62ad45301c6599d21979ff14 SHA512 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1
DIST bash44-019 1671 BLAKE2B 3d917b1c2618b92d7a79d64a8282cda84098d7d83b8ab3e62c49ab259d6976ef953ab1bde98b9d2cd925cfbdff94b5fd5910876e8de85d40466cf5f3ceb377c4 SHA512 59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893
+DIST bash44-020 5156 BLAKE2B 6f2bba1fe03eb49401af3925420ff5c090d0e7d83010c34e086f5da48fc2078ef649d775b45e3368e73fc1ebdd6f1860b33bf7021898cae158d478aa1dd18bca SHA512 e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978
+DIST bash44-021 1810 BLAKE2B ce3f98e31aaa7db402cf2a2e571a72b9b91fad4571b35a5e8f59678485a631acf3885a19ee09ebdc6f79b39dbdafe72cc2cd91bf3c3b31ad7d3a65b5bc4bd9b3 SHA512 43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec
+DIST bash44-022 1818 BLAKE2B 66c6e5fd33f0649ff886d1fd944cb10a06de06f0724c0cb7343c3afd50034821f1a4eeccbe9bc5c6815ce9bcdfacf5e6a83098fbd3712efc15e870928b3aa80e SHA512 385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb
+DIST bash44-023 1557 BLAKE2B 95a21ade7e4be68d66f3862f26b574c5897055822471c8d2801b8e1f866d1d11ddd4000e967b567c3ef7949af8a88ca918ea066d52a67fc5fd4b266135f0dbbb SHA512 442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd
EBUILD bash-2.05b_p13.ebuild 4613 BLAKE2B c9eae8a532057dab41ca20640f7b85e9f0d8b11eacd84c91b0dc478dcc906cd14976e02b086e2fbc1786661f27ddfce0b8631211461ed77cced2037058e99338 SHA512 f933883acba8f96a5f0390b11650981291c8048211e832a6d3bcc6f41cafe9372380051f804e22958934803c4d8cac83d1bdb604689c313bddeb67446106bff8
EBUILD bash-3.0_p22.ebuild 4746 BLAKE2B f8840c82f5cfbcf224d1504d3cbadc3eabe015d991a8c41de978562cc0c806b6baed999d085774594deb620dd714fb8d020ccc89d65c3e622745875528b61b57 SHA512 c39a3f5b22a8b462e6b2abf63a13454559b358002e0efb16640fb9caa04cbd9b416640cf25df98b9fdcaaca465bbf083c0687dc08e122c8b965e2761b01b37f6
EBUILD bash-3.1_p23.ebuild 4427 BLAKE2B baf534ac2cf5a872673b355532b0b9ea8d4836df331f7e50425733815862435ffa44eb9cd95b1dbdd53a29010638b516deb16c8e72a44d5fa135eaea23c34bf5 SHA512 40e91cad8af0682565d4eed7ad2f6184e1624746a8f6ea1ce21bed459e45bcdc8157aa45cc7f89d1ce5c7f1f827707a839bc89a513956b827a50a5e3bc877959
@@ -369,4 +373,5 @@ EBUILD bash-4.4_p12-r1.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59
EBUILD bash-4.4_p12.ebuild 7161 BLAKE2B a91c473aed8cc403559edb09eecb315ea1cc72d408411190c64f9ccf76b6c841ab4a41d317534bc9cecd13f85a881afe9880b1e83e1ccb28ea82c2e63faa160a SHA512 fbbe64caa19d373008b9bbced1d2b3578e4d3515f5e4e8b05e43ffa167470544af3dd11076876a7dbee299e9948c8a956565cd0e6f38dcdf42bbd5b56fbd1c13
EBUILD bash-4.4_p18.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
EBUILD bash-4.4_p19.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
+EBUILD bash-4.4_p23.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c
MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p23.ebuild b/app-shells/bash/bash-4.4_p23.ebuild
new file mode 100644
index 000000000000..c11c5b32237a
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p23.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs multilib prefix
+
+# Official patchlevel
+# See ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/
+PLEVEL=${PV##*_p}
+MY_PV=${PV/_p*}
+MY_PV=${MY_PV/_/-}
+MY_P=${PN}-${MY_PV}
+is_release() {
+ case ${PV} in
+ *_alpha*|*_beta*|*_rc*) return 1 ;;
+ *) return 0 ;;
+ esac
+}
+[[ ${PV} != *_p* ]] && PLEVEL=0
+patches() {
+ local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
+ [[ ${plevel} -eq 0 ]] && return 1
+ eval set -- {1..${plevel}}
+ set -- $(printf "${pn}${pv/\.}-%03d " "$@")
+ if [[ ${opt} == -s ]] ; then
+ echo "${@/#/${DISTDIR}/}"
+ else
+ local u
+ for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
+ printf "${u}/${pn}-${pv}-patches/%s " "$@"
+ done
+ fi
+}
+
+# The version of readline this bash normally ships with.
+READLINE_VER="7.0"
+
+DESCRIPTION="The standard GNU Bourne again shell"
+HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
+if is_release ; then
+ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
+else
+ SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
+
+DEPEND="
+ >=sys-libs/ncurses-5.2-r2:0=
+ readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
+ nls? ( virtual/libintl )
+"
+RDEPEND="
+ ${DEPEND}
+ !<sys-apps/portage-2.1.6.7_p1
+ !<sys-apps/paludis-0.26.0_alpha5
+"
+# we only need yacc when the .y files get patched (bash42-005)
+#DEPEND+=" virtual/yacc"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if is-flag -malign-double ; then #7332
+ eerror "Detected bad CFLAGS '-malign-double'. Do not use this"
+ eerror "as it breaks LFS (struct stat64) on x86."
+ die "remove -malign-double from your CFLAGS mr ricer"
+ fi
+ if use bashlogger ; then
+ ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
+ ewarn "This will log ALL output you enter into the shell, you have been warned."
+ fi
+}
+
+src_unpack() {
+ unpack ${MY_P}.tar.gz
+}
+
+src_prepare() {
+ # Include official patches
+ [[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
+
+ eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+
+ # Clean out local libs so we know we use system ones w/releases.
+ if is_release ; then
+ rm -rf lib/{readline,termcap}/*
+ touch lib/{readline,termcap}/Makefile.in # for config.status
+ sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
+ fi
+
+ # Prefixify hardcoded path names. No-op for non-prefix.
+ hprefixify pathnames.h.in
+
+ # Avoid regenerating docs after patches #407985
+ sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
+ touch -r . doc/*
+
+ eapply_user
+}
+
+src_configure() {
+ local myconf=(
+ --disable-profiling
+ --docdir='$(datarootdir)'/doc/${PF}
+ --htmldir='$(docdir)/html'
+ --with-curses
+ $(use_enable mem-scramble)
+ $(use_enable net net-redirections)
+ $(use_enable readline)
+ $(use_enable readline bang-history)
+ $(use_enable readline history)
+ $(use_with afs)
+ $(use_with mem-scramble bash-malloc)
+ )
+
+ # For descriptions of these, see config-top.h
+ # bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
+ append-cppflags \
+ -DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
+ -DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
+ -DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
+ -DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
+ -DNON_INTERACTIVE_LOGIN_SHELLS \
+ -DSSH_SOURCE_BASHRC \
+ $(use bashlogger && echo -DSYSLOG_HISTORY)
+
+ # Don't even think about building this statically without
+ # reading Bug 7714 first. If you still build it statically,
+ # don't come crying to us with bugs ;).
+ #use static && export LDFLAGS="${LDFLAGS} -static"
+ use nls || myconf+=( --disable-nls )
+
+ # Historically, we always used the builtin readline, but since
+ # our handling of SONAME upgrades has gotten much more stable
+ # in the PM (and the readline ebuild itself preserves the old
+ # libs during upgrades), linking against the system copy should
+ # be safe.
+ # Exact cached version here doesn't really matter as long as it
+ # is at least what's in the DEPEND up above.
+ export ac_cv_rl_version=${READLINE_VER%%_*}
+
+ # Force linking with system curses ... the bundled termcap lib
+ # sucks bad compared to ncurses. For the most part, ncurses
+ # is here because readline needs it. But bash itself calls
+ # ncurses in one or two small places :(.
+
+ if is_release ; then
+ # Use system readline only with released versions.
+ myconf+=( --with-installed-readline=. )
+ fi
+
+ if use plugins; then
+ append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
+ else
+ # Disable the plugins logic by hand since bash doesn't
+ # provide a way of doing it.
+ export ac_cv_func_dl{close,open,sym}=no \
+ ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
+ sed -i \
+ -e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
+ configure || die
+ fi
+ tc-export AR #444070
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake
+
+ if use plugins ; then
+ emake -C examples/loadables all others
+ fi
+}
+
+src_install() {
+ local d f
+
+ default
+
+ dodir /bin
+ mv "${ED%/}"/usr/bin/bash "${ED%/}"/bin/ || die
+ dosym bash /bin/rbash
+
+ insinto /etc/bash
+ doins "${FILESDIR}"/bash_logout
+ doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
+ keepdir /etc/bash/bashrc.d
+ insinto /etc/skel
+ for f in bash{_logout,_profile,rc} ; do
+ newins "${FILESDIR}"/dot-${f} .${f}
+ done
+
+ local sed_args=(
+ -e "s:#${USERLAND}#@::"
+ -e '/#@/d'
+ )
+ if ! use readline ; then
+ sed_args+=( #432338
+ -e '/^shopt -s histappend/s:^:#:'
+ -e 's:use_color=true:use_color=false:'
+ )
+ fi
+ sed -i \
+ "${sed_args[@]}" \
+ "${ED%/}"/etc/skel/.bashrc \
+ "${ED%/}"/etc/bash/bashrc || die
+
+ if use plugins ; then
+ exeinto /usr/$(get_libdir)/bash
+ doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
+ insinto /usr/include/bash-plugins
+ doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
+ fi
+
+ if use examples ; then
+ for d in examples/{functions,misc,scripts,startup-files} ; do
+ exeinto /usr/share/doc/${PF}/${d}
+ insinto /usr/share/doc/${PF}/${d}
+ for f in ${d}/* ; do
+ if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
+ doexe ${f}
+ else
+ doins ${f}
+ fi
+ done
+ done
+ fi
+
+ doman doc/*.1
+ newdoc CWRU/changelog ChangeLog
+ dosym bash.info /usr/share/info/bashref.info
+}
+
+pkg_preinst() {
+ if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
+ mkdir -p "${EROOT}"/etc/bash
+ mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
+ fi
+
+ if [[ -L ${EROOT}/bin/sh ]] ; then
+ # rewrite the symlink to ensure that its mtime changes. having /bin/sh
+ # missing even temporarily causes a fatal error with paludis.
+ local target=$(readlink "${EROOT}"/bin/sh)
+ local tmp=$(emktemp "${EROOT}"/bin)
+ ln -sf "${target}" "${tmp}"
+ mv -f "${tmp}" "${EROOT}"/bin/sh
+ fi
+}
+
+pkg_postinst() {
+ # If /bin/sh does not exist, provide it
+ if [[ ! -e ${EROOT}/bin/sh ]] ; then
+ ln -sf bash "${EROOT}"/bin/sh
+ fi
+}
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e49699840b90..f1844491d53c 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,5 @@
DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
EBUILD fish-2.6.0.ebuild 2089 BLAKE2B 93e47993b0fbf6efad4f3a3e8bd961e9975285c7fe4b46d54d9d65646f92a3f3079cb220150b930675863a334bcb0c096c5a860d45d7de7e1d0a4ef95a9f31f8 SHA512 f4aa8a54f89a8d5bb0a41dba319f75a713ce52681ca1631b06d96e39f4b52f5f5c441ea7420a3e3ea4049e82aef7dc562bfe45955d51644b8abc6c668633fd88
-EBUILD fish-2.7.1.ebuild 2156 BLAKE2B 56438cf7613d8ce7a12d1388874c8ff5885017006e3e7224d9113b6c570ec3870e641e058e4f47514bb07f03d10b2b87e3a6fe1cf1427cf3915d1b5fa89b5fe5 SHA512 8796b05552790f937a9b62beb436bf59fd587e9f70138bba72f2fc7fb1d9890f5acf62a86c57274910e0edc1749df70c141a8b94cc5c32ed1c9902f7c8570028
+EBUILD fish-2.7.1.ebuild 2163 BLAKE2B 4dd296054fa3fd0830a94906d881fd57ae735951b089b340b25b4347cf5ac8e2c8989e10bd3bb7dd0ab1a838319d53beeab85fd46a5a7b2aca54635b2be09e5f SHA512 2f646f6a7ed16b33a474c99227d55dd7035fe97a9cb944570af2eca8d1a4041d2b64fbbaa633609d91a6c92f4cecf5e31edb8ee23785228eb1eacda86ab1a4c1
MISC metadata.xml 733 BLAKE2B 5397b2e1714a6089ff4c263025499d5231a179946a913db582309b52aff118a3a853399107da99f2469ad3fa80b1b9129a4eeaa5293b4430b0f08abbe1f48f75 SHA512 92cba131da5b8684008868f6fcecc62b91ede3ea2271ae2af5e501728b90c63a0227743d59e255ba16dc0d4ef2d8ac70b702be184db6f91ba4b335ce04be3be6
diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index d69c93f70246..657ee7b3e84c 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$
LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" = *_* ]] || \
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="nls test"
RDEPEND="
diff --git a/app-shells/mpv-bash-completion/Manifest b/app-shells/mpv-bash-completion/Manifest
index 2ecbe5dd891b..871a40d76257 100644
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@@ -1,3 +1,5 @@
DIST mpv-bash-completion-3.3.16.tar.gz 20125 BLAKE2B 1350445ea05474e553ade334c1f11e97828df11143021920a25787a295d6e870595e35dda6ccd048ed4e01e0e85443a5902893fed1aa1525e875649a93ef632d SHA512 d962cc911d571b0345ddee22ecae6faef307f2da44642d6db5223fb0e51d2b2087b038e1964cf8f1ed683bb95a3268a8ffc1fff2759561100b23921406a0e31f
+DIST mpv-bash-completion-3.3.17.tar.gz 20873 BLAKE2B 5e44b315a4f148c27768a3b0c29d609b679e3d489dd79803795a75a9289816ed13797cc04c748410ba3302a2619dedad21772f2d914b2c3ff5c73189e4e348df SHA512 a0b1ae4b07bd3e5fc95fea135aa5391d0efb0d2c1e4ccbb712cf0911b9e07b23a7bfb27d43b615988610f545f1bc62226998295573480ab657e3b18966d48991
EBUILD mpv-bash-completion-3.3.16.ebuild 1120 BLAKE2B d0f980a20b970ba099c0d06ded70aab17730eb127a65649f603a66a45bd17381299bfcf2c21effd2eeb5a318245400a54dc0fa9719782164e23ae1b700870c68 SHA512 f57a73c90eb63618b9690ef7a79346db3f1ffc8778a2fa4040470567073ed7ab38622e21201c188dac57ec646a722ae64b30555c8e66f7e6de856e6047c0bb57
+EBUILD mpv-bash-completion-3.3.17.ebuild 1122 BLAKE2B c0d40d8b06256e52105994764f91e2ad852e4ab0df58e6942bbe067d44c79d8b2bec4df093b40e4afa7f314a896722f9e089f6c611c4d4eaa2646b9ace819c8b SHA512 8a0cf0749c3cb61bf9e5ac3bbc67e9036dfbb400455d3a3ea0e55a07b1c66ec3f68a2331ede97e41ec5f900db68aa2a9d7434ef48cd3ce0d9c0e8ea330395eed
MISC metadata.xml 533 BLAKE2B f2896156a0988c66549245ff93ebb7599d006b41cb1731d0e7bc720a62680575feb02cfd8b0d1eb35a9472308a31711f9731a9dd41c7d5da673050c7a8994f8d SHA512 6ecdf8effd7f09950473e954cb401c848f46a93ae8b7f0c9ba601fa9e11bfb75114f32fa13e1a77d4dc2d19377ae35a61493cf4cedcb359ea319e02df8538ebc
diff --git a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
new file mode 100644
index 000000000000..2aca0b8cc661
--- /dev/null
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.17.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="Bash completion for the mpv video player"
+HOMEPAGE="https://2ion.github.io/mpv-bash-completion/"
+SRC_URI="https://github.com/2ion/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+COMMON_DEPEND=">=media-video/mpv-0.25.0[cli]"
+RDEPEND="${COMMON_DEPEND}
+ >=app-shells/bash-completion-2.3-r1
+"
+DEPEND="${COMMON_DEPEND}
+ !luajit? ( dev-lang/lua:* )
+ luajit? ( dev-lang/luajit:2 )
+"
+
+src_prepare() {
+ default_src_prepare
+ # Avoid 'mpv' make target that supports lua only.
+ sed -i -e 's|check: mpv|check:|' Makefile || die
+}
+
+src_compile() {
+ # Prevent access violations from completion generation.
+ # See Gentoo bug 656086.
+ addpredict /dev/dri
+
+ $(usex luajit 'luajit' 'lua') gen.lua > mpv || die
+}
+
+src_install() {
+ dobashcomp mpv
+ einstalldocs
+}
+
+pkg_postinst() {
+ if ! has_version 'x11-apps/xrandr'; then
+ elog
+ elog "If you want completion of window sizes, please install 'x11-apps/xrandr'."
+ elog
+ fi
+}
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index 50c066fb8046..407dc48281bf 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,6 +1,4 @@
AUX pdsh-2.18-unbundle-libtool.patch 1738 BLAKE2B dff39459032013b770cfab19407475c06b246369092aac77c071f0654f89f9874f1883068542a606b88cc83fd735ec4091c4f9b6b0ce6c1df677b1ec6fe346ba SHA512 e36e284cc9fde9cedc9d2daac31dd1c272c306b1b84d2ee6a55430ad755ced23d6bd5e5a50bf4f6621fcebe96cb105cf49e70c6d4c5cf5913deb66ba0d86491f
-DIST pdsh-2.18.tar.bz2 453729 BLAKE2B 1907bd8a368d062a356b513ac50696f5f9fbe52253470005f9690d886ae3b93e76cb66f517a40a4c5f1aa01190624da078d132a82a5285b66b3e9bc8f528b5f4 SHA512 20cd9be5fc38add69f61620f528dd952296615ef099d6288be2ce908ab04cc7a9585387d93936462a1fb577aa6495789ae201f838131623d8f4f01bf904f7b5a
DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
-EBUILD pdsh-2.18-r1.ebuild 1609 BLAKE2B 5c5f0b9c57bae957a771330b3012e8e274ee7039ed8c691cefc197c81cf2318bee27813da5d71e769dc2774259a533fd0ff193689337500762c68be2db431501 SHA512 0c114901331e290ce61c60a7519672d62a572ee804573b702c2869a3972ad57842fbd5ac2ce12113aec1f8555346b21a8ae953f55cc3ae45ef58e9cbad64204c
-EBUILD pdsh-2.26-r1.ebuild 1289 BLAKE2B da484e8208f7f5ff2846f796e4594fc5080d46bef9b8acad5a044a173bc9cd0df98cc68a224baa2efdf28260f3631fe6d0d30dd6a931b2c3ba0e22edaa67091d SHA512 8bd15e08c9839a647311db418fbc2cdd47551bac3527fb42e7a63cb1ff8f681c45885c98f5c47341bf10c10bd6778c2e5877e51f1671b7c81e5c4eae7c264bc5
+EBUILD pdsh-2.26-r1.ebuild 1287 BLAKE2B 4acd78fedf0a8ec33a223502d0c93d0038d912ddea66fa0513a018f2e8ca3a437c17566feee8c63f3cd527a50c2b1968354c7940764bb3c1e49366f5411c266e SHA512 5af633bc908bb1176ffbe79c8ca69689807315aac079a0ba80cfedd08bce905ec7dbb2c97e2aab564db47db9a7139459fbfab995624e6b9780388407514ca20a
MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752
diff --git a/app-shells/pdsh/pdsh-2.18-r1.ebuild b/app-shells/pdsh/pdsh-2.18-r1.ebuild
deleted file mode 100644
index 3ac352ca84ae..000000000000
--- a/app-shells/pdsh/pdsh-2.18-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A high-performance, parallel remote shell utility"
-HOMEPAGE="https://computing.llnl.gov/linux/pdsh.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt readline rsh"
-RDEPEND="crypt? ( net-misc/openssh )
- rsh? ( net-misc/netkit-rsh )
- readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}"
-
-# Feel free to debug the test suite. Running the tests
-# by hand instead of using pdsh.exp seems to print out
-# what is expected, so the error is most likely in the
-# testsuite itself.
-# You'll also need dev-util/dejagnu
-RESTRICT="test"
-
-pkg_setup() {
- local m
- local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
-
- PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
- MODULE_CONFIG=""
- for m in ${PDSH_MODULE_LIST}; do
- if [[ "${valid_modules}" == *:${m}:* ]]; then
- MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
- fi
- done
-
- elog "Building ${PF} with the following modules:"
- elog " ${PDSH_MODULE_LIST}"
- elog "This list can be changed in /etc/portage/make.conf by setting"
- elog "PDSH_MODULE_LIST=\"module1 module2...\""
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/pdsh-2.18-unbundle-libtool.patch
- eautoreconf
-}
-
-src_configure() {
- econf ${MODULE_CONFIG} \
- --with-machines \
- $(use_with crypt ssh) \
- $(use_with rsh) \
- $(use_with readline) \
- || die "configure failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-shells/pdsh/pdsh-2.26-r1.ebuild b/app-shells/pdsh/pdsh-2.26-r1.ebuild
index f9e973342634..cd2b214c3640 100644
--- a/app-shells/pdsh/pdsh-2.26-r1.ebuild
+++ b/app-shells/pdsh/pdsh-2.26-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="crypt readline rsh static-libs test"
RDEPEND="
diff --git a/app-shells/yash/Manifest b/app-shells/yash/Manifest
index da5634261398..00594b1d0787 100644
--- a/app-shells/yash/Manifest
+++ b/app-shells/yash/Manifest
@@ -1,3 +1,3 @@
DIST yash-2.47.tar.gz 1161675 BLAKE2B 8491d5f977b9e23071098016443e8384bc584b8b1160e84b725a2965d032d8b8f5a7ac8b16b1a1e62d808b0543650e0bc42ddc52806c5475a7ca9e26640e84aa SHA512 c9607990a1cf947f9cf294f818d9c6de314dca92a9f106dc65e8d0fdeb6ac91b21a394c711c4b8aabae33b60fc70b72dc9483b6ac48d4e3be3019501ebc26332
-EBUILD yash-2.47.ebuild 733 BLAKE2B 30f2b1de177c23ab1804dc10949bf4c1b7445ff972e372d41658e573dd6645bbebe0b79ff72ce31df924d657f49b9a96b133a10bbc5f5e8e13afa7ac1cb3f2a7 SHA512 b54d6071533e2c378b9799e0d110d434adccdfca735c05d75152654afb72705e577d4380ddf424f25283d9397de2cf54c644b65d8347b0dfc636d934a2fa1feb
+EBUILD yash-2.47.ebuild 733 BLAKE2B 688783dea182e8cb56cd1aa110f83bbab06bf6c7904d73b3a679404a499bce145f62d691b826ab7974ac8f5fa1fba4c76b28821f67ce4dfdc104f9ca6df3cbf5 SHA512 d08d976a08aabe64e96daf90c7e75aea0fb89dab160aa3d2a1922a260e1d91e7a7f672da508abe56c4a02be2bd16707065d41bcf8f3a1bcd426c875439ba5312
MISC metadata.xml 1043 BLAKE2B a83b4a65aace09de65f4c1f44b99711171ffe1d5abc453f0c616fc02d0dfb63828ca7dc7ca431641c6c87d4aab15c5160802ee534de055e0f53bc0350a4110d5 SHA512 004f1faa56032de6e2f37af8199f165c4394a4f7a3c2e2eebd79254a5155bf429e0e0d1e97e7b025037d7a3fbcf91d14b67e37dbe0313fe1ca38a2a7d56ec9f4
diff --git a/app-shells/yash/yash-2.47.ebuild b/app-shells/yash/yash-2.47.ebuild
index 475398b44422..ae2eee4bca5b 100644
--- a/app-shells/yash/yash-2.47.ebuild
+++ b/app-shells/yash/yash-2.47.ebuild
@@ -7,7 +7,7 @@ PLOCALES="en ja"
inherit flag-o-matic l10n toolchain-funcs
DESCRIPTION="Yash is a POSIX-compliant command line shell"
-HOMEPAGE="https://yash.osnd.jp/"
+HOMEPAGE="https://yash.osdn.jp/"
SRC_URI="mirror://sourceforge.jp/${PN}/69353/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index e27167392f53..ee50fbfaee94 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,6 +2,7 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0
AUX zprofile-1 1663 BLAKE2B aef86216bd8436fc550e4b440cf23fb1367d1ebb158695cb0b9fdd39af89a920995750a65199e8ff327ccd9f7e2efedf8dc42c624c3030617a2f0fec6ee17003 SHA512 d0baf1d4ed78a1d2f4e2bfcf5f038fbf6fe39d61e4ae3bfda0f6c073bf43260143a9b674935e4cf1436006450f641e22823ce853cfef774cd89f1912691c853f
AUX zprofile-2 1555 BLAKE2B bcbc98b7d40f3578ae9596b65dea00de029e310a1f85fcaf42ebd751e909cc3b794b992a1e60e995a5676c7df943dcaff9f9d76d4d2e6d02c1f99304ab47a7dd SHA512 cfc0a9a8b0c01a9c87d02216800b7245bfd98ea5f43cefdd30c902d4bd2318c9b6f7f1ad299672b693734e7014514fce0fb9c4b1321508305a6d0137ee02d966
AUX zprofile-3 1130 BLAKE2B cfd0f5bcc9409cb2bd133ad1511356602c110b8f1d106ac16cf3812ea57c818902a7eacb061dabd08fdc8040d6deed088c13304b2176c2488fb886c8d2a2c8bf SHA512 d1059e427450e03d3e638e96ff4f43548cee5a385c4d4f00701023570ef6490b15cd01d738bd97e0e8d003aa7e375c51a80a2b841066c22d0910966a54c2cc2f
+AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e
AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee04741ad8f8a0f8d40bd1f8658261569722b156a075d7b723f2d38d41fc725e227c995eefebde433ea172399b90210 SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c
DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304
@@ -13,7 +14,7 @@ DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b
DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
EBUILD zsh-5.3.1.ebuild 5981 BLAKE2B 7bb0e3b81104e115c0ffc9ac593440b9ab61cf89cc33842a3df467ace612573c1f069a9032a8cc1d58f92f47b64900ce042b23a4273a435ab96cf0cc3ad46c1d SHA512 b1173c76320d9c615793c65fa214320f6ef02cac834233e69d242e01834012ab1b32a886666955bc49720874557cdaf14ac5734bd29c04578bc74e87526e2afa
EBUILD zsh-5.4.2-r1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
-EBUILD zsh-5.5.1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58
+EBUILD zsh-5.5.1-r1.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
EBUILD zsh-5.5.ebuild 5809 BLAKE2B bc7175e593de89a97c11d613881fe269417b5f2ef9a0cb131292dc3299c45041a87e03572620156723194bb24fbe77245b0fc64bedf6a9c9cea98dfbfb33a0e5 SHA512 5fe29eeafee8b5de30e8a606aa8b6b7950740cd0b1f6852955ff4f4cca30f9cf1be28a74adf760189f9a010334408ab3eddec1243a6faee335296efb39e08ed3
-EBUILD zsh-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2
+EBUILD zsh-9999.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b
MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4
new file mode 100644
index 000000000000..6402ca718d38
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-4
@@ -0,0 +1,42 @@
+# /etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e /etc/profile.env ] ; then
+ . /etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings. For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+ # Check to make sure ROOTPATH is sane before we use it.
+ # https://bugs.gentoo.org/656400
+ if [[ :${ROOTPATH}: == *:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:* ]]; then
+ PATH="${ROOTPATH}"
+ fi
+fi
+export PATH
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in /etc/profile.d/*.sh ; do
+ [ -r "$sh" ] && . "$sh"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.5.1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild
index 4c17da09db4a..9f6dc303d882 100644
--- a/app-shells/zsh/zsh-5.5.1.ebuild
+++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild
@@ -139,7 +139,7 @@ src_install() {
insinto /etc/zsh
export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
- newins "$(prefixify_ro "${FILESDIR}"/zprofile-3)" zprofile
+ newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
keepdir /usr/share/zsh/site-functions
insinto /usr/share/zsh/${PV%_*}/functions/Prompts
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index f53a6be7a4d6..9f6dc303d882 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -57,14 +57,6 @@ src_prepare() {
eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
fi
- cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die
- eprefixify "${T}"/zprofile || die
- if use prefix ; then
- sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
- else
- sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
- fi
-
eapply_user
if [[ ${PV} == 9999* ]] ; then
@@ -146,7 +138,8 @@ src_install() {
emake DESTDIR="${D}" install $(usex doc "install.info" "")
insinto /etc/zsh
- doins "${T}"/zprofile
+ export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+ newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
keepdir /usr/share/zsh/site-functions
insinto /usr/share/zsh/${PV%_*}/functions/Prompts
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 16:48:52 +0000