public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
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	[thread overview]
Message-ID: <20170414193215.12952-3-mgorny@gentoo.org> (raw)
In-Reply-To: <20170414193215.12952-1-mgorny@gentoo.org>

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



  parent reply	other threads:[~2017-04-14 19:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-14 19:32 [gentoo-dev] [PATCH 1/4] eutils.eclass: Remove implicit epunt-cxx inherit Michał Górny
2017-04-14 19:32 ` [gentoo-dev] [PATCH 2/4] epunt-cxx.eclass: Inherit eutils for eqawarn Michał Górny
2017-04-14 19:32 ` Michał Górny [this message]
2017-04-14 19:32 ` [gentoo-dev] [PATCH 4/4] eclass/ELT-patches: remove the remaining (nocxx) patches Michał Górny
2017-04-25 18:45 ` [gentoo-dev] [PATCH 1/4] eutils.eclass: Remove implicit epunt-cxx inherit Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170414193215.12952-3-mgorny@gentoo.org \
    --to=mgorny@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox