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 7086C158089 for ; Thu, 14 Sep 2023 20:45:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E13B2BC013; Thu, 14 Sep 2023 20:45:51 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 748B02BC013 for ; Thu, 14 Sep 2023 20:45:51 +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 A7DE4335CEA for ; Thu, 14 Sep 2023 20:45:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3CD9A1113 for ; Thu, 14 Sep 2023 20:45:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1694724331.6545573120c2238469c76b383358f507bfab6e58.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlto/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/xmlto/xmlto-0.0.28-r10.ebuild app-text/xmlto/xmlto-0.0.28-r11.ebuild X-VCS-Directories: app-text/xmlto/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6545573120c2238469c76b383358f507bfab6e58 X-VCS-Branch: master Date: Thu, 14 Sep 2023 20:45:49 +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: b76cb5b8-7545-4f8a-9e6c-5d70a5ddcb5a X-Archives-Hash: bb16f86836c216af4b2d7a60844d7a48 commit: 6545573120c2238469c76b383358f507bfab6e58 Author: Mike Gilbert gentoo org> AuthorDate: Thu Sep 14 20:43:29 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Sep 14 20:45:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65455731 app-text/xmlto: pass BASH=/bin/bash to configure This ensures the same xmlto script can be used on merged-usr and split-usr systems. Closes: https://bugs.gentoo.org/912286 Signed-off-by: Mike Gilbert gentoo.org> .../xmlto/{xmlto-0.0.28-r10.ebuild => xmlto-0.0.28-r11.ebuild} | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app-text/xmlto/xmlto-0.0.28-r10.ebuild b/app-text/xmlto/xmlto-0.0.28-r11.ebuild similarity index 90% rename from app-text/xmlto/xmlto-0.0.28-r10.ebuild rename to app-text/xmlto/xmlto-0.0.28-r11.ebuild index 547cd6787bf8..bf44cdb5d846 100644 --- a/app-text/xmlto/xmlto-0.0.28-r10.ebuild +++ b/app-text/xmlto/xmlto-0.0.28-r11.ebuild @@ -15,6 +15,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv IUSE="latex text" RDEPEND=" + app-shells/bash:0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt @@ -48,9 +49,12 @@ src_prepare() { } src_configure() { - # We don't want the script to detect /bin/sh if it is bash. - export ac_cv_path_BASH="${BASH}" has_version sys-apps/util-linux || export GETOPT=getopt-long - econf + local args=( + # Ensure we always get a #!/bin/bash shebang in xmlto, bug 912286 + BASH="${EPREFIX}/bin/bash" + ) + + econf "${args[@]}" }