diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-01 19:24:10 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-01 19:24:10 +0100 |
| commit | b052fbf151106a4f47cac7fdf0ffff983decb773 (patch) | |
| tree | 5d21279a4eeaf4076caee87654b610a0fe8a4051 /app-shells | |
| parent | c3b55a6be7da027d97d8aef00ef88c3011121a42 (diff) | |
gentoo auto-resync : 01:09:2022 - 19:24:10
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/Manifest.gz | bin | 8796 -> 8796 bytes | |||
| -rw-r--r-- | app-shells/zsh/Manifest | 3 | ||||
| -rw-r--r-- | app-shells/zsh/files/zsh-5.9-musl-V09datetime-test-fix.patch | 15 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-5.9.ebuild | 23 |
4 files changed, 37 insertions, 4 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex 9efb4b411ba5..c5306914141c 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index 1f5593a9889b..3c6a25818a04 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -3,11 +3,12 @@ AUX zprofile-4 1314 BLAKE2B 8373d9f68613d5d44121c46a02dd7a5c988f4a3d948aa6bf96a9 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-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.ebuild 5938 BLAKE2B 936c9c4de6420ef84565dfc98ea22b0c96d59a14dc5776fffb1af825ab29d1883e026f6601c79d66a442f329429ae7712f29e5ceff9b3da6c09b94b446d1ccd0 SHA512 5dc7794de99d318b79a131b96438413957af5ec2935a5eec17ef08cd7168ee066cf6e330d62662f74a67201ad359e00718cc4b253e3c1affa69f395bb6dd7dd8 +EBUILD zsh-5.9.ebuild 6411 BLAKE2B 2b663f18398b1edd6d137f2a92fb66ca724013ab7308d3731f1f01c3c9e888322b4eecc98a61019692f6c3a34c961a1a363c4dbf21aa5c0e81368a7e146ff534 SHA512 abafb4b8a5e1db246670633784fccf10a185cf24e89899cf8ed417fc8c24748670b2f4b656748be68784323d053df2fbae6740e6ad848bccac12ec30fe0a90b9 EBUILD zsh-9999.ebuild 5953 BLAKE2B f84a93496f80f43ad36ad44c2dcdd7cec5fa2322bfea9852506bda89b9f5122093ce267e972e9b02b9d742b73f27332e4dec693fdb7af789c8c174b5a0fc5010 SHA512 f04cad9744f1702f44d86321b898f7fb0344895b59dc1478e6702a078ef7b4c1246e5a12fd245e16355ed66ef9ad48b3303261c75d22e107c710a445e151d8bc MISC metadata.xml 657 BLAKE2B 47e7fd953c64cbcd20850420719e02bbb7f9cb01cb772a02493b270630d1fc3bbbc5f8424c965d411a7c357b49de74ce15f78489c0d4097827647f589f7e462a SHA512 b4da7f405b95feb74f9f96100dfc4e68202c36a9146cbf055b09a4d3bd5e6b2ab60bf0711a95b52d78cd88081f1947af333107b6ada3bd5c0097b3c55b17b69b diff --git a/app-shells/zsh/files/zsh-5.9-musl-V09datetime-test-fix.patch b/app-shells/zsh/files/zsh-5.9-musl-V09datetime-test-fix.patch new file mode 100644 index 000000000000..6f9fa4458a29 --- /dev/null +++ b/app-shells/zsh/files/zsh-5.9-musl-V09datetime-test-fix.patch @@ -0,0 +1,15 @@ +# On musl strftime '%@' returns new line, so we include to check for that too +# Closes: https://bugs.gentoo.org/833981 +--- a/Test/V09datetime.ztst ++++ b/Test/V09datetime.ztst +@@ -79,8 +79,8 @@ + >1973^@03^@03 + + # We assume '%@' is not a valid format on any OSs. +-# The result can be '%@' (Linux), '@' (BSDs) or an error (Cygwin). +- [[ $(strftime '%@' 0 2> /dev/null) == (%|)@ || $? != 0 ]] ++# The result can be '%@' (Linux), '\n' (Linux with musl libc) '@', (BSDs) or an error (Cygwin). ++ [[ $(strftime '%@' 0 2> /dev/null) == (%|)@ || $? != 0 || $'\n' ]] + 0:bad format specifier + + # This test may fail at 23:59:59.xxx on New Year's Eve :/ diff --git a/app-shells/zsh/zsh-5.9.ebuild b/app-shells/zsh/zsh-5.9.ebuild index a2940a5c435e..9cfcc3a75650 100644 --- a/app-shells/zsh/zsh-5.9.ebuild +++ b/app-shells/zsh/zsh-5.9.ebuild @@ -50,6 +50,13 @@ if [[ ${PV} == *9999 ]] ; then )" 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 @@ -58,9 +65,6 @@ src_prepare() { soelim Doc/zshall.1.soelim > 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 @@ -132,6 +136,19 @@ src_compile() { } 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 |