diff options
Diffstat (limited to 'app-shells/zsh')
| -rw-r--r-- | app-shells/zsh/Manifest | 11 | ||||
| -rw-r--r-- | app-shells/zsh/files/zprofile-4 | 4 | ||||
| -rw-r--r-- | app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch | 37 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-5.8.1.ebuild (renamed from app-shells/zsh/zsh-5.8.ebuild) | 24 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-9999.ebuild | 20 |
5 files changed, 27 insertions, 69 deletions
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index bb2e7b3fa958..11dad7c3e597 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -1,9 +1,8 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0e85c04d653bed9c1f1c28a07621fffd22819d62050cf019f3d6d4c127088055bc69a0cc0cb990e8435f2be SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0 -AUX zprofile-4 1285 BLAKE2B 15bfee359925ee6a3377f99548d11ac045c558ad4b5647e9ee83511f9b73a5f30585b0470697e258cda7846c335ea26adf29ad266493830e2efbfec0def76e2c SHA512 20a5e39993f43a349f48083d8644b579d66f9b8e9d18f64d9121157e001cdcfb2535ae2440cc1bb14e961ba993c413303a8b703f9d8bad4a855fa08b05bc7ead +AUX zprofile-4 1314 BLAKE2B 8373d9f68613d5d44121c46a02dd7a5c988f4a3d948aa6bf96a9b0c5f67967f4b787b7ab346e7fabcdd8805321a89b63e6919d5abef082d24e4c46157c68e4db SHA512 5f87b4f0e59bb338f9aa8ec811424d37042ab5ad889aa00f6f912003b7aaaf8b3ea59746590c639a45facace0743deab89779ae5cee8ff6a39beda99864c9cf7 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd -AUX zsh-5.7.1-ncurses_colors.patch 1379 BLAKE2B dafadc92d84237182f44accfe0ff4e76f664d5a203af4b4f160ef86751e582cd6475f25666b252296c0d579b055e35721866872ea869726a6c934184c24c3f67 SHA512 6e8a4e41dacf9464435726e8a7db65ff02c104c6328f4acdf24963d08786051ea6845558beb102f47ab7ffc3116f572d1f6b3263a69e7673653f80bd2280d5e2 -DIST zsh-5.8-doc.tar.xz 3088696 BLAKE2B f738bf15b137e84df91fff8500b6c309884d8a1777e3158807f6028a411ae3f345e6ccba49bdff04c6607c4eb06fc2913313e84e1f78be0a0f92d23e46ba87db SHA512 38cc549818eb9c6952051b714dd2008d99605aba4ca4f614e62b033c9b067dd2031fff766ac5c1efe5bb52eae32bd482dea5df2b2d46decb7ecdb458f3da9d52 -DIST zsh-5.8.tar.xz 3193284 BLAKE2B b1186dd27aede3318763d7c42253e919e60d00a018d085b2de7e8d985c872e9756a3ce112f623a088ec0878abd7a38d04dfa5ec552ef0f0a72e623191a7ba5e3 SHA512 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533 -EBUILD zsh-5.8.ebuild 6023 BLAKE2B 25d506e437e6c74e1de10e38a6ece9c88d6074805c41d0f65c22494bdf59efe8a4f8b60ce12f328a88c29bce47464d06385c43faa679144452288448a1e8dc0e SHA512 e6bbc6cec85b428d585df118fbdb94eb76c77d57ca69ecd54a3e1ec816f2f29a465400ad54b4d6a634c96725203766ea4a8977a9f8f8f625a2872d1845bdf93a -EBUILD zsh-9999.ebuild 5969 BLAKE2B 58043861512152f227a417f85979a573be5fce35b31cc8c7bf4d145ade9856ebb2dc00469fc3b2363a9703e95ecebc242a9c09f9a06ded2e1d243dc2d6bb7d81 SHA512 6dbd1849039bb29ab0e2af1c31aa3776cb1bcfce811a84fb12069e2587aef03f2874c8470a4a42e09c771f5c3181636fa6fb367f9d71e67ba324a81e531fd44c +DIST zsh-5.8.1-doc.tar.xz 3088728 BLAKE2B c7f62f50a8fce483d2946ac550fa0996e5749a9040cf9424a61d591024292a2f1eb0fc2401824104c6ef0fff2a4b38e07269a0069cde1b0bff6e8a7b09daf160 SHA512 0d8ca4c54c10e8a471ba7d53f1371ee057f7df4b710fc01194833f29a61b5465133432b891b0b891b6cc5235a928a783bf99f39c67314e29e3d161ca5abf3219 +DIST zsh-5.8.1.tar.xz 3200540 BLAKE2B 19981d0cc208fb590af8e034bde66bda36a4a20abe76ff71ba9222d7150b7d53573e1f5b81ddb2cdd29f6aa0611071a35d8b48250e6bd4b196f0428b776c4af8 SHA512 f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d +EBUILD zsh-5.8.1.ebuild 5960 BLAKE2B 483c7a38c38c5e2664774f29407a81c502b1916b6238ab0eb26accea3e00da8f6f35363c40b82bc0dd409d04810f589a9d52fdb0e006d81932e613c15304768a SHA512 a87a1d52204bd2d3ea4276e55eea3c0bd475a47757c604e4efa042488dd65591f445d0e38a055b025e5d3ecccd5af0764faed1cd2b6fcd86d033c22af73fdd84 +EBUILD zsh-9999.ebuild 5967 BLAKE2B bcbabf0168e0b2893a06ca41f56ad85fc6719995cf153ecd9922a24db0576eaa0d4dc0b826e026253d1cbc92ec474ac36e5da3a7f0f9ec7667d08e66c42cdb14 SHA512 04f76d62147882ccf81a0a876e53177825b73bf41ad8ac829e534ebdb98def903234819e0ddfda30042b5d78041c2ae9f74661316ec64328eebb8a66959c22d8 MISC metadata.xml 515 BLAKE2B d5fee9e19a273c932a4d1c8b8b58a816126eb22ae18d7cfdeacd49fcf8e2a5ffaf6dca653761c3389e69e476c65afbc9c90352066e50d129a4eaedc87b6834e9 SHA512 0966e2915ce21c9c34bbc75fa0cd9981227c8e7f78ed2f0d01dcbccacd1038859008a12611b5a2037ad8b1137a6c0f08fdf35e100a6162df3a0f8bbb9c0da353 diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4 index b92c245784dd..9155aae3fc58 100644 --- a/app-shells/zsh/files/zprofile-4 +++ b/app-shells/zsh/files/zprofile-4 @@ -22,10 +22,10 @@ umask 022 # 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 +if [[ "${EUID}" = "0" ]] || [[ "${USER}" = "root" ]] ; then # Check to make sure ROOTPATH is sane before we use it. # https://bugs.gentoo.org/656400 - if [[ :${ROOTPATH}: == *:/usr/sbin:* ]]; then + if [[ -n ${ROOTPATH} ]] && [[ :${ROOTPATH}: == *:/usr/sbin:* ]] ; then PATH="${ROOTPATH}" fi fi diff --git a/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch b/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch deleted file mode 100644 index 3dc2a7d5a1af..000000000000 --- a/app-shells/zsh/files/zsh-5.7.1-ncurses_colors.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7ce49801cc8ebc6f3a343ee5b829007f8cfb2bce Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Wed, 11 Dec 2019 14:56:25 +0100 -Subject: [PATCH] configure.ac: check for has_colors symbol in curses lib - -Otherwise zsh/curses module won't get built if ncurses was built with -separate tinfo lib. -One could still force-build the module but loading it later yields the -following error message: - - failed to load module `zsh/curses': /usr/lib64/zsh/5.7.1/zsh/curses.so: - undefined symbol: COLORS - -That is because the final linker call requires -lncurses(w) but it only -contains -ltinfo(w). - -Reported-by: Tetja Rediske <tetja@tetja.de> -Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 5513e25f1..792ad4db0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -814,6 +814,7 @@ AC_SEARCH_LIBS(tgetent, [$termcap_curses_order], - This is probably a library called 'curses' or 'ncurses'. You may - need to install a package called 'curses-devel' or 'ncurses-devel' on your - system."], 255)) -+AC_SEARCH_LIBS(has_colors, [$termcap_curses_order]) - AC_CHECK_HEADERS(curses.h, [], - [AC_CACHE_CHECK(for Solaris 8 curses.h mistake, ac_cv_header_curses_solaris, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[]])],[ac_cv_header_curses_h=yes --- -2.24.1 - diff --git a/app-shells/zsh/zsh-5.8.ebuild b/app-shells/zsh/zsh-5.8.1.ebuild index 3a3a006e2559..e44079087473 100644 --- a/app-shells/zsh/zsh-5.8.ebuild +++ b/app-shells/zsh/zsh-5.8.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic prefix @@ -42,7 +42,7 @@ DEPEND="sys-apps/groff PDEPEND=" examples? ( app-doc/zsh-lovers ) " -if [[ ${PV} == 9999* ]] ; then +if [[ ${PV} == *9999 ]] ; then DEPEND+=" app-text/yodl doc? ( sys-apps/texinfo @@ -51,26 +51,22 @@ if [[ ${PV} == 9999* ]] ; then )" fi -PATCHES=( - "${FILESDIR}/${PN}-5.7.1-ncurses_colors.patch" -) - src_prepare() { - if [[ ${PV} != 9999* ]]; then + if [[ ${PV} != *9999 ]]; then # fix zshall problem with soelim ln -s Doc man1 || die mv Doc/zshall.1 Doc/zshall.1.soelim || die soelim Doc/zshall.1.soelim > Doc/zshall.1 || die - - # add openrc specific options for init.d completion - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff fi + # add openrc specific options for init.d completion + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff + default hprefixify configure.ac - if [[ ${PV} == 9999* ]] ; then - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die + if [[ ${PV} == *9999 ]] ; then + sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die fi eautoreconf } @@ -131,7 +127,7 @@ src_configure() { src_compile() { default - if [[ ${PV} == 9999* ]] && use doc ; then + if [[ ${PV} == *9999 ]] && use doc ; then emake -C Doc everything fi } diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild index 455373830a74..1e2235175665 100644 --- a/app-shells/zsh/zsh-9999.ebuild +++ b/app-shells/zsh/zsh-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic prefix @@ -42,7 +42,7 @@ DEPEND="sys-apps/groff PDEPEND=" examples? ( app-doc/zsh-lovers ) " -if [[ ${PV} == 9999* ]] ; then +if [[ ${PV} == *9999 ]] ; then DEPEND+=" app-text/yodl doc? ( sys-apps/texinfo @@ -52,21 +52,21 @@ if [[ ${PV} == 9999* ]] ; then fi src_prepare() { - if [[ ${PV} != 9999* ]]; then + if [[ ${PV} != *9999 ]]; then # fix zshall problem with soelim ln -s Doc man1 || die mv Doc/zshall.1 Doc/zshall.1.soelim || die soelim Doc/zshall.1.soelim > Doc/zshall.1 || die - - # add openrc specific options for init.d completion - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff fi + # add openrc specific options for init.d completion + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff + default hprefixify configure.ac - if [[ ${PV} == 9999* ]] ; then - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die + if [[ ${PV} == *9999 ]] ; then + sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die fi eautoreconf } @@ -127,7 +127,7 @@ src_configure() { src_compile() { default - if [[ ${PV} == 9999* ]] && use doc ; then + if [[ ${PV} == *9999 ]] && use doc ; then emake -C Doc everything fi } |