gentoo auto-resync : 23:11:2022 - 07:07:57

3 files changed, 81 insertions, 1 deletions

diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index bc8e3acafed2..10c75f90db25 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,4 +1,6 @@
 DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23
+DIST ksh-v1.0.4.tar.gz 2127036 BLAKE2B c3bd7f8d8c86e8bf4f7482c99890f025365334b7ab826261b03f9a2f6bf72b4112ba0cec09c7d5388cbba4541a4e99a24e3b95a98e386b941a39f549c5c21525 SHA512 ca6ff4625a48a991d07a34c8d28656c131124e6cccbb495d8fbc2922db9f94a83c1df2be17a7fa7aa39ce5b9243573b0b806eef87d11c5a2936e7af564d2f5e6
 EBUILD ksh-1.0.3.ebuild 1646 BLAKE2B 4d78b22a8600e0e910f6edc172307e26194b48bd7be4389506ca2d14454df615ddcb14720d8b17aeb8cc224fe75edc22a971b100204ae93700a1e72963f8b6df SHA512 804f7b355fd6d7365a97499c4856d6a7c03fca45c13f0c7f589e325ae28c544a7b798fb1c4e7eed9f13b8dfc640d258fff2c4b02a818425c8666f5d28623bf09
-EBUILD ksh-9999.ebuild 1592 BLAKE2B 5908cdc2e7465da096d99df41cc95ee983a0896d3633b44a7debaee9b10c944ff6e50728d115b468c7f9da228fca60dd469ede03f59f7cc08984c76a8615e6d4 SHA512 031f2c6798ea4148798c8ee3d6296bdbf4faf6d4d03542e24a8395b5ab6dacf407cb678f25f4e14ad414699f411565caba9f7d2470e8f7530cbf10961681b72a
+EBUILD ksh-1.0.4.ebuild 1646 BLAKE2B 4d78b22a8600e0e910f6edc172307e26194b48bd7be4389506ca2d14454df615ddcb14720d8b17aeb8cc224fe75edc22a971b100204ae93700a1e72963f8b6df SHA512 804f7b355fd6d7365a97499c4856d6a7c03fca45c13f0c7f589e325ae28c544a7b798fb1c4e7eed9f13b8dfc640d258fff2c4b02a818425c8666f5d28623bf09
+EBUILD ksh-9999.ebuild 1646 BLAKE2B 4d78b22a8600e0e910f6edc172307e26194b48bd7be4389506ca2d14454df615ddcb14720d8b17aeb8cc224fe75edc22a971b100204ae93700a1e72963f8b6df SHA512 804f7b355fd6d7365a97499c4856d6a7c03fca45c13f0c7f589e325ae28c544a7b798fb1c4e7eed9f13b8dfc640d258fff2c4b02a818425c8666f5d28623bf09
 MISC metadata.xml 1489 BLAKE2B 8e0c5934f79c12702985656ddc95d5051c59f053c94bab595d3ec08aa336b9ab50de5e87aab7b47991c02aa6924932e59ab6fb4d3e38c60b139478a210d62cad SHA512 fa4422e4dbd25daed7ed21e66d06fb678ccbb3c37a62a090eddc9c3281e0d17310f5df5f172267f7a91935db4059b8dcdf78b88cd902d8f10f4f798e6264b0dc
diff --git a/app-shells/ksh/ksh-1.0.4.ebuild b/app-shells/ksh/ksh-1.0.4.ebuild
new file mode 100644
index 000000000000..dd729029724d
--- /dev/null
+++ b/app-shells/ksh/ksh-1.0.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ksh93/ksh"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	MY_PV=$(ver_rs 3 - 4 .)
+	SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+DESCRIPTION="The Original ATT Korn Shell"
+HOMEPAGE="http://www.kornshell.com/"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	# disable register for debugging
+	sed -i 1i"#define register" src/lib/libast/include/ast.h || die
+}
+
+src_compile() {
+	local extraflags=(
+		"-Wno-unknown-pragmas"
+		"-Wno-missing-braces"
+		"-Wno-unused-result"
+		"-Wno-return-type"
+		"-Wno-int-to-pointer-cast"
+		"-Wno-parentheses"
+		"-Wno-unused"
+		"-Wno-unused-but-set-variable"
+		"-Wno-cpp"
+		"-Wno-maybe-uninitialized"
+		"-Wno-lto-type-mismatch"
+		"-Wno-error=int-conversion"
+		"-Wno-int-conversion"
+		"-P"
+	)
+	append-cflags $(test-flags-CC ${extraflags[@]})
+	filter-flags '-fdiagnostics-color=always' # https://github.com/ksh93/ksh/issues/379
+	export CCFLAGS="${CFLAGS} -fno-strict-aliasing"
+
+	tc-export AR CC LD NM
+
+	sh bin/package make SHELL="${BROOT}"/bin/sh || die
+}
+
+src_test() {
+	# test tries to catch IO error
+	addwrite /proc/self/mem
+
+	# arith.sh uses A for tests
+	unset A
+
+	sh bin/shtests --compile || die
+}
+
+src_install() {
+	local myhost="$(sh bin/package host)"
+	cd "arch/${myhost}" || die
+
+	into /
+	dobin bin/ksh
+	dosym ksh /bin/rksh
+
+	newman man/man1/sh.1 ksh.1
+}
diff --git a/app-shells/ksh/ksh-9999.ebuild b/app-shells/ksh/ksh-9999.ebuild
index 8fb7af0f3c4b..dd729029724d 100644
--- a/app-shells/ksh/ksh-9999.ebuild
+++ b/app-shells/ksh/ksh-9999.ebuild
@@ -41,6 +41,8 @@ src_compile() {
 		"-Wno-cpp"
 		"-Wno-maybe-uninitialized"
 		"-Wno-lto-type-mismatch"
+		"-Wno-error=int-conversion"
+		"-Wno-int-conversion"
 		"-P"
 	)
 	append-cflags $(test-flags-CC ${extraflags[@]})