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 00116158083 for ; Wed, 25 Sep 2024 11:12:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C82A8E2A3C; Wed, 25 Sep 2024 11:12:34 +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 AEB19E2A3C for ; Wed, 25 Sep 2024 11:12:34 +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 95912343085 for ; Wed, 25 Sep 2024 11:12:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0410E1F46 for ; Wed, 25 Sep 2024 11:12:32 +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: <1727262732.4c3f798d2394f8c4b6e7e8fc5e8cc4a35c0f8ed5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/xdg.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4c3f798d2394f8c4b6e7e8fc5e8cc4a35c0f8ed5 X-VCS-Branch: master Date: Wed, 25 Sep 2024 11:12:32 +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: c6b06df7-09ea-4b00-9a2b-ef873a3f48a5 X-Archives-Hash: 93463de6c6ec5047b5f11f89ba00e50b commit: 4c3f798d2394f8c4b6e7e8fc5e8cc4a35c0f8ed5 Author: Sam James gentoo org> AuthorDate: Wed Sep 25 11:12:12 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Sep 25 11:12:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c3f798d xdg.eclass: fix EclassExportFuncsBeforeInherit Bug: https://github.com/pkgcore/pkgcheck/issues/702 Bug: https://github.com/pkgcore/pkgcheck/issues/703 Signed-off-by: Sam James gentoo.org> eclass/xdg.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass index 6af4b91875fc..2e16a438d840 100644 --- a/eclass/xdg.eclass +++ b/eclass/xdg.eclass @@ -45,8 +45,6 @@ case ${EAPI} in default } - EXPORT_FUNCTIONS src_prepare - DEPEND="${_XDG_DEPEND}" ;; *) @@ -131,4 +129,12 @@ xdg_pkg_postrm() { fi +case ${EAPI} in + 6|7) + EXPORT_FUNCTIONS src_prepare + ;; + *) + ;; +esac + EXPORT_FUNCTIONS pkg_preinst pkg_postinst pkg_postrm