From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1409490-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 D4F74158091
for <garchives@archives.gentoo.org>; Fri, 17 Jun 2022 20:25:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DA9D5E0AF8;
Fri, 17 Jun 2022 20:25:07 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B9C05E0AF8
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jun 2022 20:25:07 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 368F034147A
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jun 2022 20:25:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 533CD7F
for <gentoo-commits@lists.gentoo.org>; Fri, 17 Jun 2022 20:25:04 +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: <1655497489.e2fe286f2d5c0ae959cb6daa0f3695a08fe4f32b.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.2_rc1.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: e2fe286f2d5c0ae959cb6daa0f3695a08fe4f32b
X-VCS-Branch: master
Date: Fri, 17 Jun 2022 20:25:04 +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: 37b388d1-8da2-4a47-ae1f-ec956f00e9be
X-Archives-Hash: cd8f254de4525cea1f7af4462e9e04fc
commit: e2fe286f2d5c0ae959cb6daa0f3695a08fe4f32b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 17 20:21:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 20:24:49 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2fe286f
app-shells/bash: only dep on readline if is_release
To match reality.
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/bash/bash-5.2_rc1.ebuild | 7 ++++++-
app-shells/bash/bash-9999.ebuild | 16 ++++++++++++++--
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/app-shells/bash/bash-5.2_rc1.ebuild b/app-shells/bash/bash-5.2_rc1.ebuild
index af272883e190..30812eac26e8 100644
--- a/app-shells/bash/bash-5.2_rc1.ebuild
+++ b/app-shells/bash/bash-5.2_rc1.ebuild
@@ -75,8 +75,10 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
nls? ( virtual/libintl )
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
"
+if is_release ; then
+ DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
RDEPEND="
${DEPEND}
"
@@ -86,6 +88,9 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
S="${WORKDIR}/${MY_P}"
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS+="--disable-static"
+
PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index f36854ee07d4..30812eac26e8 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -65,7 +65,7 @@ if [[ -n ${GENTOO_PATCH_VER} ]] ; then
SRC_URI+=" https://dev.gentoo.org/~${GENTOO_PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${GENTOO_PATCH_VER}-patches.tar.xz"
fi
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
SLOT="0"
if is_release ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -75,8 +75,10 @@ IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
>=sys-libs/ncurses-5.2-r2:0=
nls? ( virtual/libintl )
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
"
+if is_release ; then
+ DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
+fi
RDEPEND="
${DEPEND}
"
@@ -86,6 +88,9 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-chetramey )"
S="${WORKDIR}/${MY_P}"
+# EAPI 8 tries to append it but it doesn't exist here
+QA_CONFIGURE_OPTIONS+="--disable-static"
+
PATCHES=(
#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
@@ -222,6 +227,13 @@ src_compile() {
fi
}
+src_test() {
+ # Used in test suite.
+ unset A
+
+ default
+}
+
src_install() {
local d f