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 4D55C1581FB for ; Tue, 27 Aug 2024 15:26:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 356F7E2BDB; Tue, 27 Aug 2024 15:16:54 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC576E2BD8 for ; Tue, 27 Aug 2024 15:16:53 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 40/50] udev.eclass: drop support for EAPI 5 and 6 Date: Tue, 27 Aug 2024 17:15:25 +0200 Message-ID: <20240827151553.210835-40-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 66ac8075-1ee8-405f-977f-a468c0b435fe X-Archives-Hash: d703f26334876a57e219a2a304767336 Signed-off-by: David Seifert --- eclass/udev.eclass | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/eclass/udev.eclass b/eclass/udev.eclass index ac94f98221aa..ba1ac00e51ed 100644 --- a/eclass/udev.eclass +++ b/eclass/udev.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: udev.eclass # @MAINTAINER: # systemd@gentoo.org -# @SUPPORTED_EAPIS: 5 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Default eclass for determining udev directories. # @DESCRIPTION: # Default eclass for determining udev directories. @@ -37,7 +37,7 @@ # @CODE case ${EAPI} in - 5|6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -46,11 +46,7 @@ _UDEV_ECLASS=1 inherit toolchain-funcs -if [[ ${EAPI} == [56] ]]; then - DEPEND="virtual/pkgconfig" -else - BDEPEND="virtual/pkgconfig" -fi +BDEPEND="virtual/pkgconfig" # @FUNCTION: _udev_get_udevdir # @INTERNAL @@ -122,7 +118,7 @@ udev_newrules() { # Should be called from pkg_postinst and pkg_postrm in packages which install # udev rules or hwdb data. udev_reload() { - if [[ -n ${ROOT%/} ]]; then + if [[ -n ${ROOT} ]]; then return 0 fi -- 2.46.0