diff options
Diffstat (limited to 'app-shells/ksh')
| -rw-r--r-- | app-shells/ksh/Manifest | 10 | ||||
| -rw-r--r-- | app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch | 30 | ||||
| -rw-r--r-- | app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch | 36 | ||||
| -rw-r--r-- | app-shells/ksh/ksh-2020.0.0_alpha1.ebuild | 33 | ||||
| -rw-r--r-- | app-shells/ksh/ksh-2020.0.0_beta1.ebuild (renamed from app-shells/ksh/ksh-2020.0.0.ebuild) | 17 |
5 files changed, 39 insertions, 87 deletions
diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest index c1161dff95d5..17dcebcc0fc9 100644 --- a/app-shells/ksh/Manifest +++ b/app-shells/ksh/Manifest @@ -1,6 +1,8 @@ -AUX ksh-2020.0.0-ensure-user-set.patch 1017 BLAKE2B 8a0d9fd9fd8940969741214f6ba9251ae1b404bae80385d79428ab7231a5809bafcaa5033084af0582872171666e89b590b7c2cfba1ded740da49c77b1751888 SHA512 bea76ef4350d2813395bbfaa682b97a34548292efe9986a1d63dde2476bbfbfd21dc9b10ccb7ac3bcf33e9aeb3c0eebdcffb22a3b6472302597473ac994b2493 -AUX ksh-2020.0.0-skip-api-test.patch 1394 BLAKE2B bcf521012bb197d234b119dc56ddc068f8ec3e46b6f4c6d82e1043629368bfcabd1a5d360bae702777e5b01914ac70c9edbdce5ee0bba7e9f69916a3c38b1820 SHA512 e4314599821b3f654b4c87900aa696930953a96b984f43ca00fd17aa91b968ed8f277944c6736ebddae4ee7086e9806f84e3432b24450565d1c679bdbb39e01a -DIST ksh-2020.0.0.tar.gz 2022880 BLAKE2B cb952c4febe88a3ccf8fd48f511a30a73bfc812ebf0b7a5fe799470b29ee13ca61004fd34e367d836940a88214da2aa05b7cb96f173a1b8d57c8e644c8c3a2a6 SHA512 7d6da3af341a62718d691ddc52e10bdf3b7290d74f1cd01610093c587af47b6d6d04b74b210eb31f93a3559855a5bc5155f9b188d2f8bb4444042c26bfaf1792 -EBUILD ksh-2020.0.0.ebuild 1033 BLAKE2B b930755c2170d179ce1537efbf45606b79392444b0307eb95d119e56accf91b7a0c4511933e4594c6957f261daaef71331ddf1e2f5932c66d8b913a0e1688f4a SHA512 e0005f7021cc75f96e6e89a19c384c18def298d53b63a3a45a49d9498d94824bfaaa993f9e6dca4a02a03f3913a530ca02ff104ba2c7a935c246d492cd4ce882 +DIST ksh-2020.0.0-alpha1-conftab.patch 118773 BLAKE2B 63466e18a77cb86af80d6f6b4af74e3ac1edbfa735decfcd772633808a4593f6d4b057a99547482d17b22445e68c6d3e2becdf68516f913c73550da718f2abc3 SHA512 b29a70e8e31a259ac5bf556ddcdb5d4742a8dac4d11c06e4b5fc3043012e08b26d136cce8c18e9e8a1fe751044699d2258388d618408b09379732bea89a51765 +DIST ksh-2020.0.0-alpha1-solaris.patch 12317 BLAKE2B 90681bde2f3bad0e097a9367ea5a3f1d4c95f70c6e0c872dad769609f97a6332328e21399a3b9ba20f3840b3387a02370831ae4663457728bd8e41b7471c675b SHA512 5a0b818f44a860210e2a7795335d0edec01c61dd5ad04670bb2ca505690ff1b111dbda12d0d15e8b264113d4e7a5a42a49f64c9aba0cff809c2ce3185921acad +DIST ksh-2020.0.0-alpha1.tar.gz 2041308 BLAKE2B 542f7936b7042485c0279c9b79f2d61f9580f0ae654abf60a8044254ed5fe228fa14d48dc7dd835201c32a9448182ca4cb702aac894a74bf5f92a4b866d1de70 SHA512 56c805bebe963dee7c27ba0357e26957fd8439f42c26f290ab32488ddde99f4b824e403c5dc097194eaf600e7379a010b1be4bf1e70bee76402e84909b38d981 +DIST ksh-2020.0.0-beta1.tar.gz 2022254 BLAKE2B 650ad8ea1140bdbe1fb9fc3e2ecbceedb4605525523584d9ac8a067511ed385f1c83d284c781b31140760500f3de13d1ad8fc695c9c553a3285d5c286a99c7ea SHA512 6f54cdc3c59b44055cc6b670b38ce1685463c841a093a28c5f974dd153eaec3b8924308b353ed7c29a0ec3917ee87cfe57b6cabaca9841633d3599d9c6731330 +EBUILD ksh-2020.0.0_alpha1.ebuild 897 BLAKE2B 1443fede77e9081c7365dfcc875d551c3a044906cb655eca8fc09b5a71b26158ffc0bf4f30ae0341ad207bf2f70d3f7eb8f9180a7179136d07f321ea210c7ec2 SHA512 7a4bb61849e9f76d10afe299bee4c25594fa0547006bbbf2636d28c19f264631847bbd5159a690d2a40da9179ef3d761d213c2f341b0373428dcf0739942bbd3 +EBUILD ksh-2020.0.0_beta1.ebuild 700 BLAKE2B f402dd243201aed831b1f6dd097e58fe108a0f5f75d31446c22cbf8750b6757e186abf564dd18498b8a35918cde04f3680d34d8546a25e145deb8a37cc5e8a1f SHA512 496e89142f08dde07852dc6d6db8756b2e0b3cadce077a2ad53e5d680265a7774fd21460acd6e744a583a8896f2e3c492986fcf759210ae72d97604695e11682 EBUILD ksh-9999.ebuild 700 BLAKE2B f402dd243201aed831b1f6dd097e58fe108a0f5f75d31446c22cbf8750b6757e186abf564dd18498b8a35918cde04f3680d34d8546a25e145deb8a37cc5e8a1f SHA512 496e89142f08dde07852dc6d6db8756b2e0b3cadce077a2ad53e5d680265a7774fd21460acd6e744a583a8896f2e3c492986fcf759210ae72d97604695e11682 MISC metadata.xml 1371 BLAKE2B ab655b6d15894748f8125dcc0d25fd15aee57623de8b643793b1ca456025ee35db091b500f91b59ca0801778eb65798162b732778c56b80adff4f0402b299638 SHA512 b74fe4a12ce5868839cd32fe9c4f88c216a0703a3f477b005dcf7b47f697d129c695a011a9b37894c39716b5d47ddc9abeb5bd4946ba6b6849707a73b5901810 diff --git a/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch b/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch deleted file mode 100644 index 9f5d70f4d33c..000000000000 --- a/app-shells/ksh/files/ksh-2020.0.0-ensure-user-set.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cb9f6d3498622b46de021a7f4798512d203747e9 Mon Sep 17 00:00:00 2001 -From: Kurtis Rader <krader@skepticism.us> -Date: Sun, 1 Sep 2019 15:44:40 -0700 -Subject: [PATCH] Ensure USER is set when unit tests run - -Related #1391 ---- - src/cmd/ksh93/tests/util/run_test.sh | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/cmd/ksh93/tests/util/run_test.sh b/src/cmd/ksh93/tests/util/run_test.sh -index 20d24ed1fda..ebc74770cae 100644 ---- a/src/cmd/ksh93/tests/util/run_test.sh -+++ b/src/cmd/ksh93/tests/util/run_test.sh -@@ -62,6 +62,15 @@ fi - # - export OS_NAME=$(uname -s | tr '[A-Z]' '[a-z]') - -+# -+# Make sure $USER is set. A CI/CB environment might not set it. -+# See https://github.com/att/ast/issues/1391 -+# -+if [[ -z $USER ]] -+then -+ export USER=$(id -un) -+fi -+ - # TODO: Enable the `io` test on Travis macOS once we understand why it dies from an abort(). - # I'm not seeing that failure happen on either of my macOS 10.12 or 10.13 systems. - if [[ $test_name == io && $OS_NAME == darwin && $CI == true ]] diff --git a/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch b/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch deleted file mode 100644 index f832d175454e..000000000000 --- a/app-shells/ksh/files/ksh-2020.0.0-skip-api-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d89753b5d38482f4a3f17ba3b7d09ab07cfe7419 Mon Sep 17 00:00:00 2001 -From: Kurtis Rader <krader@skepticism.us> -Date: Sun, 1 Sep 2019 13:47:40 -0700 -Subject: [PATCH] Skip API test if build type != debug - -Fixes #1390 ---- - src/lib/libast/tests/misc/meson.build | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/lib/libast/tests/misc/meson.build b/src/lib/libast/tests/misc/meson.build -index 67a178762fa..a4c864428d8 100644 ---- a/src/lib/libast/tests/misc/meson.build -+++ b/src/lib/libast/tests/misc/meson.build -@@ -10,6 +10,12 @@ tests_to_skip = [ - ['freebsd', 'debug'], - ] - -+# Non-debug build types affect the behavior of `backtrace()`. Which means it will almost certainly -+# break the "debug" test. See https://github.com/att/ast/issues/1390. -+if get_option('buildtype') != 'debug' -+ tests_to_skip += [['*', 'debug']] -+endif -+ - foreach test_name: tests - # If the platform doesn't have an execinfo.h header there is no point in trying to run the - # debug.c unit test. -@@ -18,7 +24,7 @@ foreach test_name: tests - endif - skip_test = false - foreach skip : tests_to_skip -- if system == skip[0] and test_name == skip[1] -+ if ('*' == skip[0] or system == skip[0]) and test_name == skip[1] - warning('skipping ' + test_name + ' on ' + system) - skip_test = true - # break # Not until meson 0.49 diff --git a/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild new file mode 100644 index 000000000000..3c91825f17c5 --- /dev/null +++ b/app-shells/ksh/ksh-2020.0.0_alpha1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)" +HOMEPAGE="https://github.com/att/ast" + +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" +SRC_URI="https://github.com/att/ast/releases/download/${MY_PV}/${MY_P}.tar.gz + https://github.com/att/ast/commit/db7fe39b744d071bb0428c91e2eb84877f068dac.patch -> ${MY_P}-solaris.patch + https://github.com/att/ast/commit/63e9edcb6084d4b164439065e2d71f3e900ec3c7.patch -> ${MY_P}-conftab.patch" +S="${WORKDIR}/${MY_P}" + +LICENSE="CPL-1.0 EPL-1.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + +RDEPEND="!app-shells/pdksh" + +PATCHES=( + "${DISTDIR}"/${MY_P}-solaris.patch + "${DISTDIR}"/${MY_P}-conftab.patch +) + +src_install() { + meson_src_install + dodir /bin + mv "${ED}/usr/bin/ksh" "${ED}/bin/ksh" || die +} diff --git a/app-shells/ksh/ksh-2020.0.0.ebuild b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild index c2f9bb7797eb..2ccad3528bf3 100644 --- a/app-shells/ksh/ksh-2020.0.0.ebuild +++ b/app-shells/ksh/ksh-2020.0.0_beta1.ebuild @@ -24,23 +24,6 @@ SLOT="0" RDEPEND="!app-shells/pdksh" -PATCHES=( - "${FILESDIR}"/ksh-2020.0.0-ensure-user-set.patch - "${FILESDIR}"/ksh-2020.0.0-skip-api-test.patch -) - -src_test() { - local cmd=( - meson test - -C "${BUILD_DIR}" - --num-processes "$(makeopts_jobs ${NINJAOPTS:-${MAKEOPTS}})" - ) - - echo "${cmd[@]}" >&2 - # https://github.com/att/ast/issues/1392 - env -u T "${cmd[@]}" || die -} - src_install() { meson_src_install dodir /bin |