From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1626435-garchives=archives.gentoo.org@lists.gentoo.org>
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 (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F0228158064
for <garchives@archives.gentoo.org>; Tue, 30 Apr 2024 02:37:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0ECFBE2A1F;
Tue, 30 Apr 2024 02:37:26 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 DC546E2A1F
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Apr 2024 02:37:25 +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 F085F3430AC
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Apr 2024 02:37:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 864D21785
for <gentoo-commits@lists.gentoo.org>; Tue, 30 Apr 2024 02:37:22 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1714444603.f7e98e17da6c3a9ddecad45d4d6ca5d51261db8a.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-shells/bash/bash-5.1_p16-r10.ebuild app-shells/bash/bash-5.2_p26-r3.ebuild app-shells/bash/bash-5.3_alpha-r2.ebuild app-shells/bash/bash-9999.ebuild
X-VCS-Directories: app-shells/bash/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: f7e98e17da6c3a9ddecad45d4d6ca5d51261db8a
X-VCS-Branch: master
Date: Tue, 30 Apr 2024 02:37:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0ae50a7b-fa8d-4ba1-82ff-5e143f74a113
X-Archives-Hash: 870dc9d8f90dd162d603218f9a6350c0
commit: f7e98e17da6c3a9ddecad45d4d6ca5d51261db8a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 02:25:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 02:36:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e98e17
app-shells/bash: drop shellcheck annotations; fix readline version
* Drop shellcheck annotations. We don't use them in ::gentoo right now.
We might revisit that once shellcheck gains proper ebuild support, but right
now, they serve as noise.
* Fix readline version for <5.3_alpha.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/bash/bash-5.1_p16-r10.ebuild | 6 +-----
app-shells/bash/bash-5.2_p26-r3.ebuild | 6 +-----
app-shells/bash/bash-5.3_alpha-r2.ebuild | 4 ----
app-shells/bash/bash-9999.ebuild | 4 ----
4 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/app-shells/bash/bash-5.1_p16-r10.ebuild b/app-shells/bash/bash-5.1_p16-r10.ebuild
index 617706099afe..2f4a6284d0a0 100644
--- a/app-shells/bash/bash-5.1_p16-r10.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
EAPI=8
@@ -31,7 +30,7 @@ esac
# The version of readline this bash normally ships with. Note that we only use
# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
+READLINE_VER="8.1"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
@@ -168,7 +167,6 @@ src_configure() {
# may misbehave at runtime.
unset -v YACC
- # shellcheck disable=2207
myconf=(
--disable-profiling
@@ -189,7 +187,6 @@ src_configure() {
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- # shellcheck disable=2046
append-cppflags \
-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
@@ -277,7 +274,6 @@ src_install() {
doexe "${@%.o}"
insinto /usr/include/bash-plugins
- # shellcheck disable=2035
doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
fi
diff --git a/app-shells/bash/bash-5.2_p26-r3.ebuild b/app-shells/bash/bash-5.2_p26-r3.ebuild
index b4517186c6a1..3e1775504a62 100644
--- a/app-shells/bash/bash-5.2_p26-r3.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
EAPI=8
@@ -31,7 +30,7 @@ esac
# The version of readline this bash normally ships with. Note that we only use
# the bundled copy of readline for pre-releases.
-READLINE_VER="8.3_alpha"
+READLINE_VER="8.2_p1"
DESCRIPTION="The standard GNU Bourne again shell"
HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
@@ -175,7 +174,6 @@ src_configure() {
# may misbehave at runtime.
unset -v YACC
- # shellcheck disable=2207
myconf=(
--disable-profiling
@@ -196,7 +194,6 @@ src_configure() {
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- # shellcheck disable=2046
append-cppflags \
-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
@@ -327,7 +324,6 @@ src_install() {
doexe "${@%.o}"
insinto /usr/include/bash-plugins
- # shellcheck disable=2035
doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
fi
diff --git a/app-shells/bash/bash-5.3_alpha-r2.ebuild b/app-shells/bash/bash-5.3_alpha-r2.ebuild
index aea9789a7642..f33bf717eac6 100644
--- a/app-shells/bash/bash-5.3_alpha-r2.ebuild
+++ b/app-shells/bash/bash-5.3_alpha-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
EAPI=8
@@ -174,7 +173,6 @@ src_configure() {
# upstream to Chet by email.
filter-lto
- # shellcheck disable=2207
myconf=(
--disable-profiling
@@ -195,7 +193,6 @@ src_configure() {
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- # shellcheck disable=2046
append-cppflags \
-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
@@ -326,7 +323,6 @@ src_install() {
doexe "${@%.o}"
insinto /usr/include/bash-plugins
- # shellcheck disable=2035
doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
fi
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index 0acd12385e07..5c1278219ddb 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# shellcheck shell=bash disable=2015,2034
EAPI=8
@@ -174,7 +173,6 @@ src_configure() {
# upstream to Chet by email.
filter-lto
- # shellcheck disable=2207
myconf=(
--disable-profiling
@@ -195,7 +193,6 @@ src_configure() {
# For descriptions of these, see config-top.h.
# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
- # shellcheck disable=2046
append-cppflags \
-DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \
-DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \
@@ -326,7 +323,6 @@ src_install() {
doexe "${@%.o}"
insinto /usr/include/bash-plugins
- # shellcheck disable=2035
doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
fi