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 D395515810F for ; Sat, 10 Jun 2023 10:25:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFA27E09C1; Sat, 10 Jun 2023 10:25:27 +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 BA408E09C1 for ; Sat, 10 Jun 2023 10:25:27 +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 B0D6D335DCD for ; Sat, 10 Jun 2023 10:25:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29FE4A9C for ; Sat, 10 Jun 2023 10:25:23 +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: <1686392655.fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/xorg-3.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42 X-VCS-Branch: master Date: Sat, 10 Jun 2023 10:25:23 +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: d38a7a42-fe97-4639-8e74-f8b2e7d5de73 X-Archives-Hash: f97af943acd8e415eb0a107267d870b9 commit: fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42 Author: Sam James gentoo org> AuthorDate: Sat Jun 10 09:54:26 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 10 10:24:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae3e3b3 xorg-3.eclass: cleanup XORG_EAUTORECONF further The current/previous logic is: * if `XORG_EAUTORECONF` is explicitly no, just elibtoolize. * if `XORG_EAUTORECONF` is yes/unset, automagic it based on configure.{ac,in} presence * if `XORG_EAUTORECONF` is unset, autoreconf I don't see the point in the automagic, so clean it up. At best, it papered over broken ebuilds. (And it's also dangerous if the deps aren't guaranteed to be installed.) Closes: https://github.com/gentoo/gentoo/pull/31279 Signed-off-by: Sam James gentoo.org> eclass/xorg-3.eclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index 74ba29657e64..e0b26acca0b0 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -273,9 +273,11 @@ xorg-3_src_unpack() { xorg-3_reconf_source() { debug-print-function ${FUNCNAME} "$@" - [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e "./configure.in" ) ]] && XORG_EAUTORECONF=yes - [[ ${XORG_EAUTORECONF} != no ]] && eautoreconf - elibtoolize --patch-only + if [[ ${XORG_EAUTORECONF} != no ]] ; then + eautoreconf + else + elibtoolize --patch-only + fi } # @FUNCTION: xorg-3_src_prepare