From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8F197158042 for ; Fri, 18 Oct 2024 17:54:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D91C2E0866; Fri, 18 Oct 2024 17:54:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCEABE0869 for ; Fri, 18 Oct 2024 17:54:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 060613430D2 for ; Fri, 18 Oct 2024 17:54:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B48E1E15 for ; Fri, 18 Oct 2024 17:54:48 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1729274076.bdbfb27cb533f12a0c68f9d03cd838beca95bc76.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/mksh/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/mksh/mksh-59c.ebuild app-shells/mksh/mksh-9999.ebuild X-VCS-Directories: app-shells/mksh/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: bdbfb27cb533f12a0c68f9d03cd838beca95bc76 X-VCS-Branch: master Date: Fri, 18 Oct 2024 17:54:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18b16454-e61d-45e5-8d89-af6f6edcb283 X-Archives-Hash: a343a71836721c61ebf1a98a5574b35e commit: bdbfb27cb533f12a0c68f9d03cd838beca95bc76 Author: Ulrich Müller gentoo org> AuthorDate: Mon Oct 14 10:53:10 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Oct 18 17:54:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbfb27c app-shells/mksh: Restore live ebuild Closes: https://bugs.gentoo.org/911450 Signed-off-by: Ulrich Müller gentoo.org> app-shells/mksh/mksh-59c.ebuild | 6 +++--- app-shells/mksh/{mksh-59c.ebuild => mksh-9999.ebuild} | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild index 09bf32351049..2921a6d7f5c8 100644 --- a/app-shells/mksh/mksh-59c.ebuild +++ b/app-shells/mksh/mksh-59c.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,6 +10,7 @@ if [[ ${PV} == *9999 ]] ; then ECVS_MODULE="mksh" ECVS_USER="_anoncvs" ECVS_AUTH="ext" + ECVS_SSH_EXTRA_OPTS=( "-oHostKeyAlgorithms=+ssh-rsa" ) inherit cvs else SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" @@ -19,6 +20,7 @@ fi DESCRIPTION="MirBSD Korn Shell" # Host is TLSv1.0-only, keep to http for compatibility with modern browsers HOMEPAGE="http://mirbsd.de/mksh" +S="${WORKDIR}/${PN}" # See http://www.mirbsd.org/TaC-mksh.txt or ${S}/www/files/TaC-mksh.txt # MirOS for most of it @@ -37,8 +39,6 @@ DEPEND=" ) " -S="${WORKDIR}/${PN}" - src_prepare() { default if use lksh; then diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-9999.ebuild similarity index 89% copy from app-shells/mksh/mksh-59c.ebuild copy to app-shells/mksh/mksh-9999.ebuild index 09bf32351049..5c43ce0c33a5 100644 --- a/app-shells/mksh/mksh-59c.ebuild +++ b/app-shells/mksh/mksh-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -10,15 +10,17 @@ if [[ ${PV} == *9999 ]] ; then ECVS_MODULE="mksh" ECVS_USER="_anoncvs" ECVS_AUTH="ext" + ECVS_SSH_EXTRA_OPTS=( "-oHostKeyAlgorithms=+ssh-rsa" ) inherit cvs else SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="MirBSD Korn Shell" # Host is TLSv1.0-only, keep to http for compatibility with modern browsers HOMEPAGE="http://mirbsd.de/mksh" +S="${WORKDIR}/${PN}" # See http://www.mirbsd.org/TaC-mksh.txt or ${S}/www/files/TaC-mksh.txt # MirOS for most of it @@ -37,8 +39,6 @@ DEPEND=" ) " -S="${WORKDIR}/${PN}" - src_prepare() { default if use lksh; then