From 4b5a61a22263bba1a5119af1b9b61f80517d02fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 27 Nov 2022 01:15:54 +0000 Subject: gentoo auto-resync : 27:11:2022 - 01:15:53 --- app-shells/Manifest.gz | Bin 8807 -> 8805 bytes app-shells/zsh/Manifest | 9 +- ....8.1-non_interactive_shell_regression_fix.patch | 76 ------- .../zsh-5.8.1-performance_regression_fix.patch | 139 ------------ app-shells/zsh/zsh-5.8.1-r2.ebuild | 222 ------------------- app-shells/zsh/zsh-5.9-r3.ebuild | 238 +++++++++++++++++++++ app-shells/zsh/zsh-5.9.ebuild | 233 -------------------- app-shells/zsh/zsh-9999.ebuild | 6 +- 8 files changed, 243 insertions(+), 680 deletions(-) delete mode 100644 app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch delete mode 100644 app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch delete mode 100644 app-shells/zsh/zsh-5.8.1-r2.ebuild create mode 100644 app-shells/zsh/zsh-5.9-r3.ebuild delete mode 100644 app-shells/zsh/zsh-5.9.ebuild (limited to 'app-shells') diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index 11355f7e1706..846794298f1c 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index 0824e6a38b50..dee99004e372 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -1,16 +1,11 @@ AUX prompt_gentoo_setup-1 817 BLAKE2B 37f6f7eae4602ca62b8bd8a01c442712903b5b1823959a58ef3bee41701e64d372dcf21fc2aa37421751349769605acedcca60e7b63328d662c96c42f7771485 SHA512 16298741c01755108234b7a6d4f5bca98a5033fa390c1796129368e11067f3f3884a3cb34629172d0cb3cf7eff35912149022de0ff6ea429e5327a71fc9a0aea AUX zprofile-4 1314 BLAKE2B 8373d9f68613d5d44121c46a02dd7a5c988f4a3d948aa6bf96a9b0c5f67967f4b787b7ab346e7fabcdd8805321a89b63e6919d5abef082d24e4c46157c68e4db SHA512 5f87b4f0e59bb338f9aa8ec811424d37042ab5ad889aa00f6f912003b7aaaf8b3ea59746590c639a45facace0743deab89779ae5cee8ff6a39beda99864c9cf7 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd -AUX zsh-5.8.1-non_interactive_shell_regression_fix.patch 2277 BLAKE2B a670417a23ef05b616e32903f9ee26c746d98b5b927afad28b70b0c19a8f3841550d1a4476259cfffb848a4e2898bb8dcb6e5f00308dc2741f01ebb18d24cc7c SHA512 bb0f210d2759a9fef6971e654e44e813fcac69f4d430966295ad1da481d2d33584784c955a1a030407d23889c9ef2a33d7cc571beb0b6a8046832681bb43edb2 -AUX zsh-5.8.1-performance_regression_fix.patch 3900 BLAKE2B 3f6957468ac008970e3832bb4c3b06b7ace80c6fcdcda4e37a5728bbda643ef56996af8bdec36efc953b337d89fe8e6a6c2e060c1ab7793251454fad487cadce SHA512 98e19d5693571b3b492688cac2aa12b6b4e3e71b1d47613fb9a5334cc88758a8f88175cb9c3264f105159047085f3121d6032cd4468febfeff04ec523cbff145 AUX zsh-5.9-clang-15-configure.patch 16591 BLAKE2B 6ea7078eb0ab59c151626de20e3a27e392afee656d0baae7294b7c2bdd63263dc28e9ad81d14884b10fb496a198c458a00459d63b144c16bbdad2489e9c5ec2b SHA512 0fd193a92c24dfd3b97f6294469cad8c799c91c27bb1f298bb64dcd10982543e80ab9e63517915ff648096e85105044c9d2d4368977266f7e3f6b34e69277768 AUX zsh-5.9-musl-V09datetime-test-fix.patch 641 BLAKE2B 693f3caf1e98ba971d776f1afc40570eb9fedb95b0be9f676cc7aae0e4a2c60af1c95d90b7e675be5de5498d1b2e8af6e3bfb3410e3f4e81d3b6eabc0159fa01 SHA512 1a11e774b85b68065e49a3a9407f46c3fde1432ce5192a696aea66f5a6beb9a2430e71233d1c29b75f87ac0ba27173b450b8bc867f684eccd28db03b7dc71a09 -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 DIST zsh-5.9-doc.tar.xz 3130444 BLAKE2B 96b635b438f8a90bc1f3c15c8a287ab392ba830e975e49b7f1c09d12de44c250dcf33d1d6dc93b58693839af2e57eb5c9d4e874ca08dd82fe876cb5ca26e6508 SHA512 5cc6abcdcfb4f5ad7bc4a31364ca49dfd87ae03e0082d89cc2ba1f00570f6757266ee60894ad31b562408de91494c22f177b414b03cb78c31d92328686be9860 DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681ec533ce1039041d0e93143ebd7e0e73a9aed0789e27ca42d58a55f3b6e2c7d89113ab3ee99112dec46d1 SHA512 d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e -EBUILD zsh-5.8.1-r2.ebuild 6104 BLAKE2B 8b6f3bea5b870cb2f4a828d06dd18bd699560bdc43637260227acc1cf33f08e4e7b21144733d8a21b1d409afa1e13612d1261112b0d073a047924b89cdf39903 SHA512 3eb4418d9ea0df316a0e3684911f0811802bafd7e2ff4b2c74e67e3dc26184c42552b1f02560591f751c891df346d1b27f29d903311d6c946dfdfdd7ebbff44c EBUILD zsh-5.9-r1.ebuild 6477 BLAKE2B e5056ec62f5aa5a9ee2e53f02e68cd91a6080dbca1d8a96bc52b7f3dc18f5e9804017390c443d74324b898a19a57671022efef5f3234f96e0fec81ae6f3979f7 SHA512 d62f608777b9831da8d227eecd822b6510d2d67f3970e95fc428245e9668e1bf8787e4cd385b7ab45d3add9a36d3b21d1cd8f98404dc204898a6f6dca68b428b -EBUILD zsh-5.9.ebuild 6411 BLAKE2B 2b663f18398b1edd6d137f2a92fb66ca724013ab7308d3731f1f01c3c9e888322b4eecc98a61019692f6c3a34c961a1a363c4dbf21aa5c0e81368a7e146ff534 SHA512 abafb4b8a5e1db246670633784fccf10a185cf24e89899cf8ed417fc8c24748670b2f4b656748be68784323d053df2fbae6740e6ad848bccac12ec30fe0a90b9 -EBUILD zsh-9999.ebuild 5953 BLAKE2B f84a93496f80f43ad36ad44c2dcdd7cec5fa2322bfea9852506bda89b9f5122093ce267e972e9b02b9d742b73f27332e4dec693fdb7af789c8c174b5a0fc5010 SHA512 f04cad9744f1702f44d86321b898f7fb0344895b59dc1478e6702a078ef7b4c1246e5a12fd245e16355ed66ef9ad48b3303261c75d22e107c710a445e151d8bc +EBUILD zsh-5.9-r3.ebuild 6475 BLAKE2B ba1b514a41f3c93df8ad4d0d5525141251636dc4e0152a613178387bd3bb2661227e8ea1fd8e47502ba1eee582fb910dbcacd7b2235f7b399bb1d7afd2dc4e9e SHA512 12558bd32c49193264acc589d8cb735aacdb24e61ece54172e65a4a2daa3cc0026fbea80a954c3df695380ec45070896ee3e940b88b3f842a03bf6be064576bd +EBUILD zsh-9999.ebuild 5898 BLAKE2B a0343e0caa2b715c1d35060f6d907e48449e6163007f7cd944a9374174e3efbcc8c0599f29af409114f291beca97635db89ad2aba07595b1c48820f3bb7c1563 SHA512 75496f76a2146eae389d8ba1f4c6aea2dcc9bb1c38a2c5ef6844d14e6272c2f26eb0daa082780bd224457e20fc76b9c1ade64bbd7832909c221a1b9266080a82 MISC metadata.xml 659 BLAKE2B 659f50310f4925023da341663c06672715fee9853f56a4f538c54e5c5a38c6fc494a5f35cb144de7b0f2ae74402fe48eed4b1402c3fd718cde9017505f94b0d0 SHA512 fa1929d584f7c29e861f6e07e2c359400a4e725d5037837f1bcfdba1867b78c200bb583539b9e03bfc03a60d32893c75528c18a177497cfdaf88f42a190f4e7e diff --git a/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch b/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch deleted file mode 100644 index 6e202fa2fb24..000000000000 --- a/app-shells/zsh/files/zsh-5.8.1-non_interactive_shell_regression_fix.patch +++ /dev/null @@ -1,76 +0,0 @@ -From da8be06c2062ea02795bcba25172369ec68848cf Mon Sep 17 00:00:00 2001 -From: Peter Stephenson -Date: Thu, 3 Mar 2022 19:19:35 +0000 -Subject: [PATCH] 49792: Non-interative shell input is line buffered. - ---- - ChangeLog | 5 +++++ - Src/input.c | 21 ++++++++++++++------- - Test/A01grammar.ztst | 9 +++++++++ - 3 files changed, 28 insertions(+), 7 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index 8a5ad4941..cae2fc4e3 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2022-03-03 Peter Stephenson -+ -+ * 49792: Src/input.c, Test/A01grammar.ztst: Use line buffering -+ for non-interactive input. -+ - 2022-02-12 dana - - * unposted: Config/version.mk, Etc/FAQ.yo, README: Update -diff --git a/Src/input.c b/Src/input.c -index 18228b37d..caa8e23b0 100644 ---- a/Src/input.c -+++ b/Src/input.c -@@ -223,13 +223,20 @@ shingetchar(void) - return STOUC(*shinbufptr++); - - shinbufreset(); -- do { -- errno = 0; -- nread = read(SHIN, shinbuffer, SHINBUFSIZE); -- } while (nread < 0 && errno == EINTR); -- if (nread <= 0) -- return -1; -- shinbufendptr = shinbuffer + nread; -+ for (;;) { -+ errno = 0; -+ nread = read(SHIN, shinbufendptr, 1); -+ if (nread > 0) { -+ /* Use line buffering (POSIX requirement) */ -+ if (*shinbufendptr++ == '\n') -+ break; -+ if (shinbufendptr == shinbuffer + SHINBUFSIZE) -+ break; -+ } else if (nread == 0 || errno != EINTR) -+ break; -+ } -+ if (shinbufendptr == shinbuffer) -+ return -1; - return STOUC(*shinbufptr++); - } - -diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst -index 1e0e9a04e..adbf5f1d9 100644 ---- a/Test/A01grammar.ztst -+++ b/Test/A01grammar.ztst -@@ -932,3 +932,12 @@ F:Note that the behaviour of 'exit' inside try-list inside a function is unspeci - $ZTST_testdir/../Src/zsh -fc '{ ( ) } always { echo foo }' - -f:exec last command optimization inhibited for try/always - >foo -+ -+ ( -+ export VALUE=first -+ print -l 'echo Value is $VALUE' 'VALUE=second sh' 'echo Value is $VALUE' | -+ $ZTST_testdir/../Src/zsh -f -+ ) -+0:Non-interactive shell command input is line buffered -+>Value is first -+>Value is second --- -2.36.0.rc2 - diff --git a/app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch b/app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch deleted file mode 100644 index 14a3f38eb96d..000000000000 --- a/app-shells/zsh/files/zsh-5.8.1-performance_regression_fix.patch +++ /dev/null @@ -1,139 +0,0 @@ -From cbe8d2bcdc20682464217856aa48628804637f28 Mon Sep 17 00:00:00 2001 -From: Bart Schaefer -Date: Thu, 28 Apr 2022 21:06:51 -0700 -Subject: [PATCH] 50133: use read-ahead and lseek-rewind for efficient - line-buffered input - ---- - ChangeLog | 6 ++++++ - Src/input.c | 24 ++++++++++++++++++++- - configure.ac | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 88 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index cae2fc4e3..79c77741b 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,9 @@ -+2022-04-28 Bart Schaefer -+ -+ * 50133 (Bart, PWS, Jun-ichi): Src/input.c, configure.ac: when -+ lseek(2) is available, use it to check for and rewind read-ahead -+ for more efficient line-buffered input. -+ - 2022-03-03 Peter Stephenson - - * 49792: Src/input.c, Test/A01grammar.ztst: Use line buffering -diff --git a/Src/input.c b/Src/input.c -index caa8e23b0..6cc1b8a51 100644 ---- a/Src/input.c -+++ b/Src/input.c -@@ -217,12 +217,34 @@ shinbufrestore(void) - static int - shingetchar(void) - { -- int nread; -+ int nread, rsize = isset(SHINSTDIN) ? 1 : SHINBUFSIZE; - - if (shinbufptr < shinbufendptr) - return STOUC(*shinbufptr++); - - shinbufreset(); -+#ifdef USE_LSEEK -+ if (rsize == 1 && lseek(SHIN, 0, SEEK_CUR) != (off_t)-1) -+ rsize = SHINBUFSIZE; -+ if (rsize > 1) { -+ do { -+ errno = 0; -+ nread = read(SHIN, shinbuffer, rsize); -+ } while (nread < 0 && errno == EINTR); -+ if (nread <= 0) -+ return -1; -+ if (isset(SHINSTDIN) && -+ (shinbufendptr = memchr(shinbuffer, '\n', nread))) { -+ shinbufendptr++; -+ rsize = (shinbufendptr - shinbuffer); -+ if (nread > rsize && -+ lseek(SHIN, -(nread - rsize), SEEK_CUR) < 0) -+ zerr("lseek(%d, %d): %e", SHIN, -(nread - rsize), errno); -+ } else -+ shinbufendptr = shinbuffer + nread; -+ return STOUC(*shinbufptr++); -+ } -+#endif - for (;;) { - errno = 0; - nread = read(SHIN, shinbufendptr, 1); -diff --git a/configure.ac b/configure.ac -index af8c5bba8..42f2837cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2304,6 +2304,65 @@ if test x$zsh_cv_sys_fifo = xyes; then - AC_DEFINE(HAVE_FIFOS) - fi - -+dnl ----------- -+dnl check that lseek() correctly reports seekability. -+dnl ----------- -+AC_CACHE_CHECK(if lseek() correctly reports seekability, -+zsh_cv_sys_lseek, -+[AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#include -+#include -+#include -+#include -+#include -+#include -+int main() { -+ int pipefd[2], fd; -+ off_t ret; -+ char* tmpfile = "seekfiletest.tmp"; -+ if ((fd = open(tmpfile, O_CREAT, S_IRUSR)) < 0) { -+ fprintf(stderr, "creating file failed\n"); -+ return 1; -+ } -+ ret = lseek(fd, 0, SEEK_CUR); -+ close(fd); -+ unlink(tmpfile); -+ if (ret == (off_t)-1) { -+ fprintf(stderr, "lseek on regular file failed\n"); -+ return 1; -+ } -+ if (pipe(pipefd) < 0) { -+ fprintf(stderr, "creating pipe failed\n"); -+ return 1; -+ } -+ write(pipefd[1], "abcdefgh", 8); -+ ret = lseek(pipefd[0], 0, SEEK_CUR); -+ close(pipefd[0]); -+ close(pipefd[1]); -+ if (ret != (off_t)-1) { -+ fprintf(stderr, "lseek on pipe succeeded\n"); -+ return 1; -+ } -+ if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { -+ fprintf(stderr, "creating UNIX domain socket failed\n"); -+ return 1; -+ } -+ ret = lseek(fd, 0, SEEK_CUR); -+ close(fd); -+ if (ret != (off_t)-1) { -+ fprintf(stderr, "lseek on UNIX domain socket succeeded\n"); -+ return 1; -+ } -+ return 0; -+} -+]])],[zsh_cv_sys_lseek=yes],[zsh_cv_sys_lseek=no],[zsh_cv_sys_lseek=yes]) -+]) -+AH_TEMPLATE([USE_LSEEK], -+[Define to 1 if lseek() can be used for SHIN.]) -+if test x$zsh_cv_sys_lseek = xyes; then -+ AC_DEFINE(USE_LSEEK) -+fi -+ - dnl ----------- - dnl test for whether link() works - dnl for instance, BeOS R4.51 doesn't support hard links yet --- -2.36.0 - diff --git a/app-shells/zsh/zsh-5.8.1-r2.ebuild b/app-shells/zsh/zsh-5.8.1-r2.ebuild deleted file mode 100644 index 4aedba310b22..000000000000 --- a/app-shells/zsh/zsh-5.8.1-r2.ebuild +++ /dev/null @@ -1,222 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic prefix - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code" -else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://www.zsh.org/pub/${P}.tar.xz - https://www.zsh.org/pub/old/${P}.tar.xz - mirror://sourceforge/${PN}/${P}.tar.xz - doc? ( - https://www.zsh.org/pub/${P}-doc.tar.xz - mirror://sourceforge/${PN}/${P}-doc.tar.xz - )" -fi - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="https://www.zsh.org/" - -LICENSE="ZSH gdbm? ( GPL-2 )" -SLOT="0" -IUSE="caps debug doc examples gdbm maildir pcre static unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.1:0= - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) - caps? ( sys-libs/libcap ) - pcre? ( - >=dev-libs/libpcre-3.9 - static? ( >=dev-libs/libpcre-3.9[static-libs] ) - ) - gdbm? ( sys-libs/gdbm:= ) - ! Doc/zshall.1 || die - 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 - fi - eautoreconf -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}"/bin - --libdir="${EPREFIX}"/usr/$(get_libdir) - --enable-etcdir="${EPREFIX}"/etc/zsh - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions - --enable-function-subdirs - --with-tcsetpgrp - --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')" - $(use_enable maildir maildir-support) - $(use_enable pcre) - $(use_enable caps cap) - $(use_enable unicode multibyte) - $(use_enable gdbm) - ) - - if use static ; then - myconf+=( --disable-dynamic ) - append-ldflags -static - fi - if use debug ; then - myconf+=( - --enable-zsh-debug - --enable-zsh-mem-debug - --enable-zsh-mem-warning - --enable-zsh-secure-free - --enable-zsh-hash-debug - ) - fi - - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --enable-libs=-liconv ) - append-ldflags -Wl,-x - fi - - econf "${myconf[@]}" - - if use static ; then - # compile all modules statically, see Bug #27392 - # removed cap and curses because linking failes - sed -e "s,link=no,link=static,g" \ - -e "/^name=zsh\/cap/s,link=static,link=no," \ - -e "/^name=zsh\/curses/s,link=static,link=no," \ - -i "${S}"/config.modules || die - if ! use gdbm ; then - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ - "${S}"/config.modules || die - fi - fi -} - -src_compile() { - default - - if [[ ${PV} == *9999 ]] && use doc ; then - emake -C Doc everything - fi -} - -src_test() { - addpredict /dev/ptmx - local i - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do - rm "${S}"/Test/${i} || die - done - emake check -} - -src_install() { - emake DESTDIR="${D}" install $(usex doc "install.info" "") - - insinto /etc/zsh - 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 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup - - local i - - # install miscellaneous scripts (bug #54520) - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ - -i {Util,Misc}/* || die - for i in Util Misc ; do - insinto /usr/share/zsh/${PV%_*}/${i} - doins ${i}/* - done - - # install header files (bug #538684) - insinto /usr/include/zsh - doins config.h Src/*.epro - for i in Src/{zsh.mdh,*.h} ; do - sed -e 's@\.\./config\.h@config.h@' \ - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include @' \ - -i "${i}" - doins "${i}" - done - - dodoc ChangeLog* META-FAQ NEWS README config.modules - - if use doc ; then - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null - dodoc Doc/zsh.{dvi,pdf} - docinto html - dodoc Doc/*.html - popd >/dev/null - fi - - docinto StartupFiles - dodoc StartupFiles/z* -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you want to enable Portage completions and Gentoo prompt," - elog "emerge app-shells/gentoo-zsh-completions and add" - elog " autoload -U compinit promptinit" - elog " compinit" - elog " promptinit; prompt gentoo" - elog "to your ~/.zshrc" - echo - elog "Also, if you want to enable cache for the completions, add" - elog " zstyle ':completion::complete:*' use-cache 1" - elog "to your ~/.zshrc" - echo - elog "Note that a system zprofile startup file is installed. This will override" - elog "PATH and possibly other variables that a user may set in ~/.zshenv." - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile" - elog "or other user startup files that are sourced after the system zprofile." - echo - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells," - elog "one method is to use a separate path-setting file that is conditionally sourced" - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the" - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." - echo - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation." - echo - fi -} diff --git a/app-shells/zsh/zsh-5.9-r3.ebuild b/app-shells/zsh/zsh-5.9-r3.ebuild new file mode 100644 index 000000000000..d9080fa1236c --- /dev/null +++ b/app-shells/zsh/zsh-5.9-r3.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.zsh.org/pub/${P}.tar.xz + https://www.zsh.org/pub/old/${P}.tar.xz + mirror://sourceforge/${PN}/${P}.tar.xz + doc? ( + https://www.zsh.org/pub/${P}-doc.tar.xz + mirror://sourceforge/${PN}/${P}-doc.tar.xz + )" +fi + +DESCRIPTION="UNIX Shell similar to the Korn shell" +HOMEPAGE="https://www.zsh.org/" + +LICENSE="ZSH gdbm? ( GPL-2 )" +SLOT="0" +IUSE="caps debug doc examples gdbm maildir pcre static" + +RDEPEND=" + >=sys-libs/ncurses-5.1:0= + static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) + caps? ( sys-libs/libcap ) + pcre? ( + >=dev-libs/libpcre-3.9 + static? ( >=dev-libs/libpcre-3.9[static-libs] ) + ) + gdbm? ( + sys-libs/gdbm:= + static? ( sys-libs/gdbm:=[static-libs] ) + ) +" +DEPEND="sys-apps/groff + ${RDEPEND}" +PDEPEND=" + examples? ( app-doc/zsh-lovers ) +" +if [[ ${PV} == *9999 ]] ; then + DEPEND+=" app-text/yodl + doc? ( + sys-apps/texinfo + app-text/texi2html + virtual/latex-base + )" +fi + +PATCHES=( + # Add openrc specific options for init.d completion + "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff + # Please refer gentoo bug #833981 + "${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch + # bug #869539 + "${FILESDIR}"/${PN}-5.9-clang-15-configure.patch +) + +src_prepare() { + 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 + fi + + default + + hprefixify configure.ac + if [[ ${PV} == *9999 ]] ; then + sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die + fi + eautoreconf +} + +src_configure() { + local myconf=( + --bindir="${EPREFIX}"/bin + --libdir="${EPREFIX}"/usr/$(get_libdir) + --enable-etcdir="${EPREFIX}"/etc/zsh + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions + --enable-function-subdirs + --with-tcsetpgrp + --enable-multibyte + --with-term-lib='tinfow ncursesw' + $(use_enable maildir maildir-support) + $(use_enable pcre) + $(use_enable caps cap) + $(use_enable gdbm) + ) + + if use static ; then + myconf+=( --disable-dynamic ) + append-ldflags -static + fi + if use debug ; then + myconf+=( + --enable-zsh-debug + --enable-zsh-mem-debug + --enable-zsh-mem-warning + --enable-zsh-secure-free + --enable-zsh-hash-debug + ) + fi + + if [[ ${CHOST} == *-darwin* ]]; then + myconf+=( --enable-libs=-liconv ) + append-ldflags -Wl,-x + fi + + econf "${myconf[@]}" + + if use static ; then + # compile all modules statically, see Bug #27392 + # removed cap and curses because linking failes + sed -e "s,link=no,link=static,g" \ + -e "/^name=zsh\/cap/s,link=static,link=no," \ + -e "/^name=zsh\/curses/s,link=static,link=no," \ + -i "${S}"/config.modules || die + if ! use gdbm ; then + sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ + "${S}"/config.modules || die + fi + fi +} + +src_compile() { + default + + if [[ ${PV} == *9999 ]] && use doc ; then + emake -C Doc everything + fi +} + +src_test() { + # Fixes tests A03quoting.ztst B03print.ztst on musl + # Please refer: + # https://www.zsh.org/mla/workers/2021/msg00805.html + # Test E02xtrace fails on musl, so we are removing it. + # Closes: https://bugs.gentoo.org/833981 + if use elibc_musl ; then + unset LC_ALL + unset LC_COLLATE + unset LC_NUMERIC + unset LC_MESSAGES + unset LANG + rm "${S}"/Test/E02xtrace.ztst || die + fi + addpredict /dev/ptmx + local i + for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do + rm "${S}"/Test/${i} || die + done + emake check +} + +src_install() { + emake DESTDIR="${D}" install $(usex doc "install.info" "") + + insinto /etc/zsh + 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 + newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup + + local i + + # install miscellaneous scripts (bug #54520) + sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ + -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ + -i {Util,Misc}/* || die + for i in Util Misc ; do + insinto /usr/share/zsh/${PV%_*}/${i} + doins ${i}/* + done + + # install header files (bug #538684) + insinto /usr/include/zsh + doins config.h Src/*.epro + for i in Src/{zsh.mdh,*.h} ; do + sed -e 's@\.\./config\.h@config.h@' \ + -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include @' \ + -i "${i}" + doins "${i}" + done + + dodoc ChangeLog* META-FAQ NEWS README config.modules + + if use doc ; then + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null + dodoc Doc/zsh.{dvi,pdf} + docinto html + dodoc Doc/*.html + popd >/dev/null + fi + + docinto StartupFiles + dodoc StartupFiles/z* +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + echo + elog "If you want to enable Portage completions and Gentoo prompt," + elog "emerge app-shells/gentoo-zsh-completions and add" + elog " autoload -U compinit promptinit" + elog " compinit" + elog " promptinit; prompt gentoo" + elog "to your ~/.zshrc" + echo + elog "Also, if you want to enable cache for the completions, add" + elog " zstyle ':completion::complete:*' use-cache 1" + elog "to your ~/.zshrc" + echo + elog "Note that a system zprofile startup file is installed. This will override" + elog "PATH and possibly other variables that a user may set in ~/.zshenv." + elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile" + elog "or other user startup files that are sourced after the system zprofile." + echo + elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells," + elog "one method is to use a separate path-setting file that is conditionally sourced" + elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the" + elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." + echo + elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation." + echo + fi +} diff --git a/app-shells/zsh/zsh-5.9.ebuild b/app-shells/zsh/zsh-5.9.ebuild deleted file mode 100644 index 9cfcc3a75650..000000000000 --- a/app-shells/zsh/zsh-5.9.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic prefix - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code" -else - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://www.zsh.org/pub/${P}.tar.xz - https://www.zsh.org/pub/old/${P}.tar.xz - mirror://sourceforge/${PN}/${P}.tar.xz - doc? ( - https://www.zsh.org/pub/${P}-doc.tar.xz - mirror://sourceforge/${PN}/${P}-doc.tar.xz - )" -fi - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="https://www.zsh.org/" - -LICENSE="ZSH gdbm? ( GPL-2 )" -SLOT="0" -IUSE="caps debug doc examples gdbm maildir pcre static unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.1:0= - static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) - caps? ( sys-libs/libcap ) - pcre? ( - >=dev-libs/libpcre-3.9 - static? ( >=dev-libs/libpcre-3.9[static-libs] ) - ) - gdbm? ( sys-libs/gdbm:= ) -" -DEPEND="sys-apps/groff - ${RDEPEND}" -PDEPEND=" - examples? ( app-doc/zsh-lovers ) -" -if [[ ${PV} == *9999 ]] ; then - DEPEND+=" app-text/yodl - doc? ( - sys-apps/texinfo - app-text/texi2html - virtual/latex-base - )" -fi - -PATCHES=( - # add openrc specific options for init.d completion - "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff - # Please refer gentoo bug 833981 - "${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch -) - -src_prepare() { - 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 - fi - - default - - hprefixify configure.ac - if [[ ${PV} == *9999 ]] ; then - sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die - fi - eautoreconf -} - -src_configure() { - local myconf=( - --bindir="${EPREFIX}"/bin - --libdir="${EPREFIX}"/usr/$(get_libdir) - --enable-etcdir="${EPREFIX}"/etc/zsh - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions - --enable-function-subdirs - --with-tcsetpgrp - --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')" - $(use_enable maildir maildir-support) - $(use_enable pcre) - $(use_enable caps cap) - $(use_enable unicode multibyte) - $(use_enable gdbm) - ) - - if use static ; then - myconf+=( --disable-dynamic ) - append-ldflags -static - fi - if use debug ; then - myconf+=( - --enable-zsh-debug - --enable-zsh-mem-debug - --enable-zsh-mem-warning - --enable-zsh-secure-free - --enable-zsh-hash-debug - ) - fi - - if [[ ${CHOST} == *-darwin* ]]; then - myconf+=( --enable-libs=-liconv ) - append-ldflags -Wl,-x - fi - - econf "${myconf[@]}" - - if use static ; then - # compile all modules statically, see Bug #27392 - # removed cap and curses because linking failes - sed -e "s,link=no,link=static,g" \ - -e "/^name=zsh\/cap/s,link=static,link=no," \ - -e "/^name=zsh\/curses/s,link=static,link=no," \ - -i "${S}"/config.modules || die - if ! use gdbm ; then - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ - "${S}"/config.modules || die - fi - fi -} - -src_compile() { - default - - if [[ ${PV} == *9999 ]] && use doc ; then - emake -C Doc everything - fi -} - -src_test() { - # Fixes tests A03quoting.ztst B03print.ztst on musl - # Please refer: - # https://www.zsh.org/mla/workers/2021/msg00805.html - # Test E02xtrace fails on musl, so we are removing it. - # Closes: https://bugs.gentoo.org/833981 - if use elibc_musl ; then - unset LC_ALL - unset LC_COLLATE - unset LC_NUMERIC - unset LC_MESSAGES - unset LANG - rm "${S}"/Test/E02xtrace.ztst || die - fi - addpredict /dev/ptmx - local i - for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do - rm "${S}"/Test/${i} || die - done - emake check -} - -src_install() { - emake DESTDIR="${D}" install $(usex doc "install.info" "") - - insinto /etc/zsh - 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 - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup - - local i - - # install miscellaneous scripts (bug #54520) - sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \ - -i {Util,Misc}/* || die - for i in Util Misc ; do - insinto /usr/share/zsh/${PV%_*}/${i} - doins ${i}/* - done - - # install header files (bug #538684) - insinto /usr/include/zsh - doins config.h Src/*.epro - for i in Src/{zsh.mdh,*.h} ; do - sed -e 's@\.\./config\.h@config.h@' \ - -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include @' \ - -i "${i}" - doins "${i}" - done - - dodoc ChangeLog* META-FAQ NEWS README config.modules - - if use doc ; then - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null - dodoc Doc/zsh.{dvi,pdf} - docinto html - dodoc Doc/*.html - popd >/dev/null - fi - - docinto StartupFiles - dodoc StartupFiles/z* -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]] ; then - echo - elog "If you want to enable Portage completions and Gentoo prompt," - elog "emerge app-shells/gentoo-zsh-completions and add" - elog " autoload -U compinit promptinit" - elog " compinit" - elog " promptinit; prompt gentoo" - elog "to your ~/.zshrc" - echo - elog "Also, if you want to enable cache for the completions, add" - elog " zstyle ':completion::complete:*' use-cache 1" - elog "to your ~/.zshrc" - echo - elog "Note that a system zprofile startup file is installed. This will override" - elog "PATH and possibly other variables that a user may set in ~/.zshenv." - elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile" - elog "or other user startup files that are sourced after the system zprofile." - echo - elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells," - elog "one method is to use a separate path-setting file that is conditionally sourced" - elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the" - elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/." - echo - elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation." - echo - fi -} diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild index 3493b711314b..98399ff00b86 100644 --- a/app-shells/zsh/zsh-9999.ebuild +++ b/app-shells/zsh/zsh-9999.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="https://www.zsh.org/" LICENSE="ZSH gdbm? ( GPL-2 )" SLOT="0" -IUSE="caps debug doc examples gdbm maildir pcre static unicode" +IUSE="caps debug doc examples gdbm maildir pcre static" RDEPEND=" >=sys-libs/ncurses-5.1:0= @@ -79,12 +79,12 @@ src_configure() { --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions --enable-function-subdirs + --enable-multibyte --with-tcsetpgrp - --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')" + --with-term-lib='tinfow ncursesw' $(use_enable maildir maildir-support) $(use_enable pcre) $(use_enable caps cap) - $(use_enable unicode multibyte) $(use_enable gdbm) ) -- cgit v1.2.3