| 1 |
Switch to using the patches provided through the app-portage/elt-patches |
| 2 |
package, like libtool.eclass. Since epunt-cxx is no longer implicit |
| 3 |
eutils API but a dedicated eclass, we do not have to worry about |
| 4 |
the extra dependency. |
| 5 |
--- |
| 6 |
eclass/epunt-cxx.eclass | 16 ++-------------- |
| 7 |
1 file changed, 2 insertions(+), 14 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass |
| 10 |
index b7c944e281df..30802af340b0 100644 |
| 11 |
--- a/eclass/epunt-cxx.eclass |
| 12 |
+++ b/eclass/epunt-cxx.eclass |
| 13 |
@@ -14,19 +14,7 @@ if [[ -z ${_EPUNT_CXX_ECLASS} ]]; then |
| 14 |
# eutils for eqawarn |
| 15 |
inherit eutils |
| 16 |
|
| 17 |
-# If an overlay has eclass overrides, but doesn't actually override the |
| 18 |
-# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's |
| 19 |
-# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So |
| 20 |
-# add a check to locate the ELT-patches/ regardless of what's going on. |
| 21 |
-# Note: Duplicated in libtool.eclass. |
| 22 |
-_EUTILS_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} |
| 23 |
-eutils_elt_patch_dir() { |
| 24 |
- local d="${ECLASSDIR}/ELT-patches" |
| 25 |
- if [[ ! -d ${d} ]] ; then |
| 26 |
- d="${_EUTILS_ECLASSDIR_LOCAL}/ELT-patches" |
| 27 |
- fi |
| 28 |
- echo "${d}" |
| 29 |
-} |
| 30 |
+DEPEND=">=app-portage/elt-patches-20170317" |
| 31 |
|
| 32 |
# @FUNCTION: epunt_cxx |
| 33 |
# @USAGE: [dir to scan] |
| 34 |
@@ -41,7 +29,7 @@ epunt_cxx() { |
| 35 |
ebegin "Removing useless C++ checks" |
| 36 |
local f p any_found |
| 37 |
while IFS= read -r -d '' f; do |
| 38 |
- for p in "$(eutils_elt_patch_dir)"/nocxx/*.patch ; do |
| 39 |
+ for p in "${EPREFIX}/usr/share/elt-patches"/nocxx/*.patch ; do |
| 40 |
if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then |
| 41 |
any_found=1 |
| 42 |
break |
| 43 |
-- |
| 44 |
2.12.2 |
Archives