From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C50EB15827B for ; Sun, 17 Aug 2025 19:06:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id ACD57335DB6 for ; Sun, 17 Aug 2025 19:06:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A4087110280; Sun, 17 Aug 2025 19:06:06 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 93909110280 for ; Sun, 17 Aug 2025 19:06:06 +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 440B3335DB6 for ; Sun, 17 Aug 2025 19:06:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB3CA3365 for ; Sun, 17 Aug 2025 19:06:04 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1755457236.c74fc9aee7ab5777cf3fd2f2c3ed744dc79c0be8.ulm@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/eapi.sh bin/ebuild-helpers/domo X-VCS-Directories: bin/ bin/ebuild-helpers/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: c74fc9aee7ab5777cf3fd2f2c3ed744dc79c0be8 X-VCS-Branch: master Date: Sun, 17 Aug 2025 19:06:04 +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: d3fa8d57-f646-4364-b8d0-3db7207e5689 X-Archives-Hash: 309581ecc17f18c96dd03693f8104577 commit: c74fc9aee7ab5777cf3fd2f2c3ed744dc79c0be8 Author: Ulrich Müller gentoo org> AuthorDate: Mon Jun 9 08:02:11 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Aug 17 19:00:36 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c74fc9ae EAPI 9 bans domo Signed-off-by: Ulrich Müller gentoo.org> bin/eapi.sh | 1 + bin/ebuild-helpers/domo | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/eapi.sh b/bin/eapi.sh index 892742c5d1..272d9e4a74 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -30,6 +30,7 @@ ___eapi_has_dohard() [[ ${1-${EAPI-0}} == [0-3] ]] ___eapi_has_doheader() [[ ${1-${EAPI-0}} != [0-4] ]] ___eapi_has_dohtml() [[ ${1-${EAPI-0}} == [0-6] ]] ___eapi_has_dolib_libopts() [[ ${1-${EAPI-0}} == [0-6] ]] +___eapi_has_domo() [[ ${1-${EAPI-0}} == [0-8] ]] ___eapi_has_dosed() [[ ${1-${EAPI-0}} == [0-3] ]] ___eapi_has_dostrip() [[ ${1-${EAPI-0}} != [0-6] ]] ___eapi_has_eapply() [[ ${1-${EAPI-0}} != [0-5] ]] diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo index e261da955e..c95fc38009 100755 --- a/bin/ebuild-helpers/domo +++ b/bin/ebuild-helpers/domo @@ -1,9 +1,14 @@ #!/usr/bin/env bash -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:?}"/isolated-functions.sh || exit +if ! ___eapi_has_domo; then + die "'${0##*/}' has been banned for EAPI '${EAPI}'" + exit 1 +fi + mynum=${#} if [ ${mynum} -lt 1 ] ; then __helpers_die "${0}: at least one argument needed"