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 B0BC4158099 for ; Sun, 26 Nov 2023 18:34:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7BAB2BC074; Sun, 26 Nov 2023 18:34:57 +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 C4F6B2BC074 for ; Sun, 26 Nov 2023 18:34:57 +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 C3CEC340A6A for ; Sun, 26 Nov 2023 18:34:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 298DE13E7 for ; Sun, 26 Nov 2023 18:34:55 +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: <1701023401.b1a0b09303cb2f1e8001591199cd08f07dcc610f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/aspell-dict-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b1a0b09303cb2f1e8001591199cd08f07dcc610f X-VCS-Branch: master Date: Sun, 26 Nov 2023 18:34:55 +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: 00290932-61d1-4d98-b1ea-bee7dc4af39f X-Archives-Hash: a978427a88082acb7754c7f55f10cc38 commit: b1a0b09303cb2f1e8001591199cd08f07dcc610f Author: Sam James gentoo org> AuthorDate: Sun Nov 26 18:29:14 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 26 18:30:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a0b093 aspell-dict-r1.eclass: drop usage of which The configure script uses are all the same. Go for a sed instead of many patches for all of aspell-*. Bug: https://bugs.gentoo.org/844094 Signed-off-by: Sam James gentoo.org> eclass/aspell-dict-r1.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass index 170edb4cacde..1a3bd0b21b24 100644 --- a/eclass/aspell-dict-r1.eclass +++ b/eclass/aspell-dict-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: aspell-dict-r1.eclass @@ -58,7 +58,6 @@ SLOT="0" RDEPEND="app-text/aspell" DEPEND="${RDEPEND}" -BDEPEND="sys-apps/which" _ASPELL_MAJOR_VERSION=${ASPELL_VERSION:-6} [[ ${_ASPELL_MAJOR_VERSION} != [56] ]] && die "Unsupported ASPELL_VERSION=${ASPELL_VERSION}" @@ -68,6 +67,10 @@ unset _ASPELL_MAJOR_VERSION # @DESCRIPTION: # The aspell-dict-r1 src_configure function which is exported. aspell-dict-r1_src_configure() { + # configure generates lines like: + # `echo "ASPELL = `which $ASPELL`" > Makefile` + sed -i -e '/.* = `which/ s:`which:`command -v:' configure || die + # Since it's a non-autoconf based script, 'econf' cannot be used. ./configure || die }