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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C1991382C5 for ; Sun, 6 Dec 2020 20:08:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E723BE0A07; Sun, 6 Dec 2020 20:08:27 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC6F8E0A02 for ; Sun, 6 Dec 2020 20:08:27 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id z3so8010100qtw.9 for ; Sun, 06 Dec 2020 12:08:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zbad9UjaLeWDdY/y/pNBHhFSP1IuPFBjsOuXb7G1IAA=; b=LIQ4cclXJiS9aT99OQ9ab4oMctids7hh6Fet5J2nsGvhteRJo7m/3/Y9u6bO0RdctP /sbn4lajpPllTVrHtH6FwkWWqHN3s/kg/wNfOH7NfSCtv9CzkAiOL1sDk0++lVK0WKZt ZicDfjF4HAwGQGmIvQ87ZnmXuc9KuEETdBDVxilLbm7RFg+We3z7FRq0fCmqKFuvvS0U 4BhfhCzE5yZ6jdUrYUKmgvgXGJ46IrPKgb2e4L5soteXnXetLehft0vzQgGFVy2hedOm PaYG8+iWILHcD8eiw4oBnC5Ul6/Q7YSjGLbnLYTIzOYIqEAfEWDNFlnpnTOvKQ1hJIeu oEQQ== X-Gm-Message-State: AOAM531ctvhAYTG4FXFp7ghTKVdhP303tr6S7M6pldsVbHPKWOG+6CS3 pvB4+RMqKQol48WCmxbRo0g6rM51A7dJ5w== X-Google-Smtp-Source: ABdhPJz4Czs83wQQTWr5PtcnjDGNAY6808P2zHcFvHoX0mWEMOa/wqfZpIVfx5TYlVySA/b5X9fW+g== X-Received: by 2002:a05:622a:1c3:: with SMTP id t3mr20644581qtw.378.1607285306669; Sun, 06 Dec 2020 12:08:26 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id q62sm10604567qkf.86.2020.12.06.12.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Dec 2020 12:08:25 -0800 (PST) From: Matt Turner To: gentoo-dev@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-dev] [PATCH] gnome2.eclass: Add EAPI=7 support Date: Sun, 6 Dec 2020 15:08:22 -0500 Message-Id: <20201206200822.1633279-1-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201206185707.1468546-1-mattst88@gentoo.org> References: <20201206185707.1468546-1-mattst88@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: 617f7559-b945-4bee-80c6-fc435238972a X-Archives-Hash: 0f93e580824cc2e791c1b0b63b418bdb Closes: https://bugs.gentoo.org/717100 Signed-off-by: Matt Turner --- leio noted that the previous patch would potentially change the installed .la files in EAPI 5 and 6 ebuilds. So just continue using ltprune in those EAPIs and ban GNOME2_LA_PUNT in EAPI 7. eclass/gnome2.eclass | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 341802f8c80..546438f289c 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -4,7 +4,7 @@ # @ECLASS: gnome2.eclass # @MAINTAINER: # gnome@gentoo.org -# @SUPPORTED_EAPIS: 5 6 +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: Provides phases for Gnome/Gtk+ based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the @@ -17,13 +17,14 @@ GNOME2_EAUTORECONF=${GNOME2_EAUTORECONF:-""} [[ ${GNOME2_EAUTORECONF} == 'yes' ]] && inherit autotools -inherit eutils libtool ltprune gnome.org gnome2-utils xdg +[[ ${EAPI} == [56] ]] && inherit eutils ltprune +inherit libtool gnome.org gnome2-utils xdg case ${EAPI:-0} in 5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; - 6) + 6|7) EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; *) die "EAPI=${EAPI} is not supported" ;; @@ -75,7 +76,14 @@ fi # - "no": will not clean any .la files # - "yes": will run prune_libtool_files --modules # - If it is not set, it will run prune_libtool_files -GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} +# Banned since eapi7. +if has ${EAPI} 5 6; then + GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} +elif [[ -n $GNOME_LA_PUNT ]]; then + die "GNOME2_LA_PUNT is banned since eapi7" +else + GNOME2_LA_PUNT="no" +fi # @FUNCTION: gnome2_src_unpack # @DESCRIPTION: @@ -85,7 +93,7 @@ gnome2_src_unpack() { unpack ${A} cd "${S}" else - die "gnome2_src_unpack is banned from eapi6" + die "gnome2_src_unpack is banned since eapi6" fi } -- 2.26.2