summaryrefslogtreecommitdiff
path: root/app-shells/dash
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-12-28 07:37:55 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-12-28 07:37:55 +0000
commitd46d1d3a5897cade51811b3848c7bf27969da625 (patch)
tree0dabb04db53e3fe66abe43df0a3cdff5d3b664db /app-shells/dash
parente67d5b4ba05349b3bf4229d0cf7d069809c4420e (diff)
gentoo auto-resync : 28:12:2023 - 07:37:55
Diffstat (limited to 'app-shells/dash')
-rw-r--r--app-shells/dash/Manifest3
-rw-r--r--app-shells/dash/dash-0.5.11.5.ebuild58
-rw-r--r--app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch46
3 files changed, 0 insertions, 107 deletions
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 0da2479378cf..d6135ae8f9b7 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,6 +1,3 @@
-AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4
-DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf
DIST dash-0.5.12.tar.gz 246054 BLAKE2B f4c5e7088d7b591e0890a0e1363ef4f70074f4033ae34d3f82d71379cee78876e1e89b5d8e4afa3ce9380f8d94c3e8970c480a21257f87706112dd883667893e SHA512 13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17
-EBUILD dash-0.5.11.5.ebuild 1638 BLAKE2B ae720706fe9989501e310fe0908e5f5213f4cbb9dcb5c3a22afea29c4e161d5b8c497b26b3ef73b4f87b9c2541b34ff6f82c8022cc4755fc28d101842ca0e67d SHA512 acbc23a813b604f46da2eff5f12ae9fa7179b0ab0f7108e7d4bb5fcab3111bebcbe6714003b757eb61e64b5382aa562a16886533395af73a9896ed70ce065223
EBUILD dash-0.5.12.ebuild 1572 BLAKE2B 49a5d3f5ba87c66aa4ab23dce943e42b55936dcd819edf994b77b2d0147db86289228fd10f663e14e7f6432e33e8080ca652f1480515e74f4a2a8270cbf5ae2d SHA512 1ba449544c5df35be0969556aad44597339845a6073ae5ff63168d63e3a3264c884ae1b0f34fd05912aeaba3a0035ed40f17e8080fcce29cff5670da615c0fb3
MISC metadata.xml 491 BLAKE2B 3d08132186e59ebe99a373e66213bfbba27182568e7eecbf508746d0906f980e3ebfdf216435a92b5493c13d40046dae037792258386d37f3eebcaa153fb3bf3 SHA512 8b441641d69c13cc5aeb93ad447c387b85d4b1958b67673df6ac5867073e4f204e6e06e35f3b92083266539bf3a0b1ee568aa2aa502ff8b27b9e54bed18b4d84
diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild
deleted file mode 100644
index f1053e616242..000000000000
--- a/app-shells/dash/dash-0.5.11.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Debian Almquist Shell"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="libedit static"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
-)
-
-src_prepare() {
- default
-
- # Fix the invalid sort
- sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
- # Use pkg-config for libedit linkage
- sed -i \
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
- configure || die
-}
-
-src_configure() {
- if [[ ${CHOST} == *-solaris* ]] ; then
- # don't redefine stat, open, dirent, etc. on Solaris
- export ac_cv_func_stat64=yes
- export ac_cv_func_open64=yes
- fi
- if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
- sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+= snprintf(s, \2, "%s", \1)/' \
- src/jobs.c || die
- fi
- append-cppflags -DJOBS=$(usex libedit 1 0)
- use static && append-ldflags -static
- # Do not pass --enable-glob due to #443552.
- local myeconfargs=(
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
- --bindir="${EPREFIX}"/bin
- --enable-fnmatch
- $(use_with libedit)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch b/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
deleted file mode 100644
index 94740223fc8e..000000000000
--- a/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 29d6f2148f10213de4e904d515e792d2cf8c968e Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-Date: Thu, 4 Jun 2020 21:53:55 +1000
-Subject: eval: Check nflag in evaltree instead of cmdloop
-
-This patch moves the nflag check from cmdloop into evaltree. This
-is so that nflag will be in force even if we enter the shell via a
-path other than cmdloop, e.g., through sh -c.
-
-Reported-by: Joey Hess <id@joeyh.name>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- src/eval.c | 3 +++
- src/main.c | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/eval.c b/src/eval.c
-index d10be38..9476fbb 100644
---- a/src/eval.c
-+++ b/src/eval.c
-@@ -213,6 +213,9 @@ evaltree(union node *n, int flags)
-
- setstackmark(&smark);
-
-+ if (nflag)
-+ goto out;
-+
- if (n == NULL) {
- TRACE(("evaltree(NULL) called\n"));
- goto out;
-diff --git a/src/main.c b/src/main.c
-index 7a28534..5c49fdc 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -233,7 +233,7 @@ cmdloop(int top)
- out2str("\nUse \"exit\" to leave shell.\n");
- }
- numeof++;
-- } else if (nflag == 0) {
-+ } else {
- int i;
-
- job_warning = (job_warning == 2) ? 1 : 0;
---
-cgit 1.2.3-1.el7
-