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 24222139694 for ; Fri, 14 Apr 2017 19:35:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CB2C21C0A0; Fri, 14 Apr 2017 19:32:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CECDE21C09C for ; Fri, 14 Apr 2017 19:32:31 +0000 (UTC) Received: from localhost.localdomain (d202-252.icpnet.pl [109.173.202.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id B5E623416A4; Fri, 14 Apr 2017 19:32:24 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 3/4] epunt-cxx.eclass: Switch to using patches from elt-patches pkg Date: Fri, 14 Apr 2017 21:32:14 +0200 Message-Id: <20170414193215.12952-3-mgorny@gentoo.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170414193215.12952-1-mgorny@gentoo.org> References: <20170414193215.12952-1-mgorny@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-Archives-Salt: f4986508-b8ab-463e-888f-de65906ed5c0 X-Archives-Hash: 636739558bff90bdfeb042c024f51e25 Switch to using the patches provided through the app-portage/elt-patches package, like libtool.eclass. Since epunt-cxx is no longer implicit eutils API but a dedicated eclass, we do not have to worry about the extra dependency. --- eclass/epunt-cxx.eclass | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass index b7c944e281df..30802af340b0 100644 --- a/eclass/epunt-cxx.eclass +++ b/eclass/epunt-cxx.eclass @@ -14,19 +14,7 @@ if [[ -z ${_EPUNT_CXX_ECLASS} ]]; then # eutils for eqawarn inherit eutils -# If an overlay has eclass overrides, but doesn't actually override the -# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's -# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So -# add a check to locate the ELT-patches/ regardless of what's going on. -# Note: Duplicated in libtool.eclass. -_EUTILS_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} -eutils_elt_patch_dir() { - local d="${ECLASSDIR}/ELT-patches" - if [[ ! -d ${d} ]] ; then - d="${_EUTILS_ECLASSDIR_LOCAL}/ELT-patches" - fi - echo "${d}" -} +DEPEND=">=app-portage/elt-patches-20170317" # @FUNCTION: epunt_cxx # @USAGE: [dir to scan] @@ -41,7 +29,7 @@ epunt_cxx() { ebegin "Removing useless C++ checks" local f p any_found while IFS= read -r -d '' f; do - for p in "$(eutils_elt_patch_dir)"/nocxx/*.patch ; do + for p in "${EPREFIX}/usr/share/elt-patches"/nocxx/*.patch ; do if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then any_found=1 break -- 2.12.2