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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C077D158087 for ; Fri, 21 Jan 2022 23:50:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 190DB2BC01C; Fri, 21 Jan 2022 23:50:09 +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 ED4962BC01C for ; Fri, 21 Jan 2022 23:50:08 +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 21FD2342BED for ; Fri, 21 Jan 2022 23:50:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07C5A24E for ; Fri, 21 Jan 2022 23:50:02 +0000 (UTC) From: "Sam James" 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" Message-ID: <1642808979.d2ccfa6c9af38d82d01fe63a73faa4f14a7ba18e.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_alpha.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d2ccfa6c9af38d82d01fe63a73faa4f14a7ba18e X-VCS-Branch: master Date: Fri, 21 Jan 2022 23:50:02 +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: 9653b821-3972-41b4-a1ae-b9bbd0ff7c08 X-Archives-Hash: ee8d916ea344f5506bee76cf1ec8d1df commit: d2ccfa6c9af38d82d01fe63a73faa4f14a7ba18e Author: Sam James gentoo org> AuthorDate: Fri Jan 21 23:49:39 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 21 23:49:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ccfa6c app-shells/bash: use system readline 8.2_alpha for 5.2_alpha Added a note to tidy up the logic in future too. Signed-off-by: Sam James gentoo.org> app-shells/bash/bash-5.2_alpha.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app-shells/bash/bash-5.2_alpha.ebuild b/app-shells/bash/bash-5.2_alpha.ebuild index 61a2aecd2b7c..99181307ddc7 100644 --- a/app-shells/bash/bash-5.2_alpha.ebuild +++ b/app-shells/bash/bash-5.2_alpha.ebuild @@ -3,6 +3,12 @@ EAPI=7 +# TODO on release: +# - check READLINE_VER, obviously +# - remove autotools/eautoreconf from readline ebuild +# - tidy up is_release check in this ebuild for using system readline +# (presumably there weren't always readline releases for bash RCs etc) + inherit flag-o-matic toolchain-funcs prefix # Official patchlevel @@ -154,7 +160,8 @@ src_configure() { # is at least what's in the DEPEND up above. export ac_cv_rl_version=${READLINE_VER%%_*} - if is_release ; then + # TODO: Clean this up before 5.2 release + if [[ ${PV} == 5.2_alpha ]] || is_release ; then # Use system readline only with released versions. myconf+=( --with-installed-readline=. ) fi