[gentoo-commits] repo/gentoo:master commit in: app-shells/ksh/, app-shells/ksh/files/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     8690ad4324d9e8c2cfd33f28c0238d54cef57ece
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 06:31:12 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 06:31:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8690ad43

app-shells/ksh: drop 1.0.0_beta2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/ksh/Manifest                           |  1 -
 app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch | 63 -------------------
 app-shells/ksh/ksh-1.0.0_beta2.ebuild             | 75 -----------------------
 3 files changed, 139 deletions(-)

diff --git a/app-shells/ksh/Manifest b/app-shells/ksh/Manifest
index 6b1143d68816..a9111f06f4fe 100644
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@@ -1,2 +1 @@
-DIST ksh-v1.0.0-beta.2.tar.gz 2238224 BLAKE2B b4eb8e116d0dd8fda498fb8d2805613a73291be628ce87ebc1c47c9bc8c49b236b285accaf35b4c9e411df23b99c6a949b672edeea1f1f317fc85a2b4db48779 SHA512 c2cd5a4b442bcff1dd2c1c054ee79c4cb131dce28d811dcd3476164d6cb7e88e6b317a094b16f227564a1266708ef0cfeca2af0929c00a19497cf1b67c647cf2
 DIST ksh-v1.0.3.tar.gz 2110771 BLAKE2B 4316c78f7889fb2e4630a83dd0f1c5c4c4b418a822e8f7d3d9415a83bbef6e993cbd21b4842c7f56cd8647305c4bdddc04562b8788f2ee6e14698a9cb090f386 SHA512 9d6e664bc6c8d102ba09e692d057b9546b07ba3ecb060449df6648e7c99f8dfd670401e6fcf34f6f3de13338a3c31c09596344931ccfdf4cd4e49eabdf005c23

diff --git a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch b/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch
deleted file mode 100644
index 1d46cc3b3f5e..000000000000
--- a/app-shells/ksh/files/ksh-1.0.0-beta.2-gcc12.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4a1dbcbaa04b6edf4c8c5d950031c6d853acf358 Mon Sep 17 00:00:00 2001
-From: Vincent Mihalkovic <vmihalko@redhat.com>
-Date: Wed, 11 May 2022 14:27:35 +0200
-Subject: [PATCH] Mamfile: add -lm flag where needed
-
----
- src/cmd/builtin/Mamfile | 2 +-
- src/cmd/ksh93/Mamfile   | 8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile
-index 16974ae54ad2..f6e726105e43 100644
---- a/src/cmd/builtin/Mamfile
-+++ b/src/cmd/builtin/Mamfile
-@@ -50,7 +50,7 @@ make install
- 			exec - ${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -D_PACKAGE_ast -DCMD_STANDALONE=b_pty -c pty.c
- 		done pty.o generated
- 		bind -lutil dontcare
--		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd}
-+		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o pty pty.o ${mam_libutil} ${mam_libast} ${mam_libcmd} -lm
- 	done pty generated
- 	make ${INSTALLROOT}/bin
- 		exec - if silent test ! -d ${INSTALLROOT}/bin
-diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile
-index 3936ff926902..e2899523b634 100644
---- a/src/cmd/ksh93/Mamfile
-+++ b/src/cmd/ksh93/Mamfile
-@@ -1219,7 +1219,7 @@ make install
- 							make data/math.tab implicit
- 							done data/math.tab
- 						done features/math.sh dontcare
--						exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab
-+						exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} -lm : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab
- 						make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit
- 						done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare
- 						make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit
-@@ -1386,7 +1386,7 @@ make install
- 		prev +li
- 		prev ${mam_libsocket}
- 		prev ${mam_libsecdb}
--		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast}
-+		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm
- 	done ksh generated
- 	make shcomp
- 		make shcomp.o
-@@ -1408,7 +1408,7 @@ make install
- 		prev +li
- 		prev ${mam_libsocket}
- 		prev ${mam_libsecdb}
--		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast}
-+		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} -lm
- 	done shcomp generated
- 	make suid_exec
- 		make suid_exec.o
-@@ -1429,7 +1429,7 @@ make install
- 		prev +li
- 		prev ${mam_libsocket}
- 		prev ${mam_libsecdb}
--		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} -lm ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast}
-+		exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libnsl} ${mam_libast} -lm
- 	done suid_exec generated
- 	make shell
- 		prev libshell.a archive

diff --git a/app-shells/ksh/ksh-1.0.0_beta2.ebuild b/app-shells/ksh/ksh-1.0.0_beta2.ebuild
deleted file mode 100644
index 297d09947372..000000000000
--- a/app-shells/ksh/ksh-1.0.0_beta2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The Original ATT Korn Shell"
-HOMEPAGE="http://www.kornshell.com/"
-
-MY_PV=$(ver_rs 3 - 4 .)
-SRC_URI="https://github.com/ksh93/${PN}/archive/v${MY_PV}/ksh-v${MY_PV}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/ksh-1.0.0-beta.2-gcc12.patch"
-)
-
-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"
-		"-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
-}