[gentoo-dev] [PATCH 1/4] eutils.eclass: Remove implicit epunt-cxx inherit

[gentoo-dev] [PATCH 1/4] eutils.eclass: Remove implicit epunt-cxx inherit

[Michał Górny]

Stop inheriting the epunt-cxx eclass in eutils implicitly. All the uses
in ::gentoo are fixed already, and this lets us add extra dependencies
in the eclass without affecting most of the packages out there.
---
 eclass/eutils.eclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index ea2a76200f09..d5dbffabf295 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -20,8 +20,7 @@ _EUTILS_ECLASS=1
 # implicitly inherited (now split) eclasses
 case ${EAPI:-0} in
 0|1|2|3|4|5|6)
-	# note: we want to remove epunt-cxx retroactively for #566424
-	inherit epatch epunt-cxx estack ltprune multilib toolchain-funcs
+	inherit epatch estack ltprune multilib toolchain-funcs
 	;;
 esac
 
-- 
2.12.2

[gentoo-dev] [PATCH 2/4] epunt-cxx.eclass: Inherit eutils for eqawarn

[Michał Górny]

Now that eutils does not inherit epunt-cxx implicitly, we can reverse
the inherit without having circular dependencies.
---
 eclass/epunt-cxx.eclass | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/eclass/epunt-cxx.eclass b/eclass/epunt-cxx.eclass
index 660b1d138fac..b7c944e281df 100644
--- a/eclass/epunt-cxx.eclass
+++ b/eclass/epunt-cxx.eclass
@@ -11,14 +11,8 @@
 
 if [[ -z ${_EPUNT_CXX_ECLASS} ]]; then
 
-# TODO: replace this with 'inherit eutils' once eutils stops inheriting
-# us
-if ! declare -F eqawarn >/dev/null ; then
-	eqawarn() {
-		has qa ${PORTAGE_ELOG_CLASSES} && ewarn "$@"
-		:
-	}
-fi
+# 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
-- 
2.12.2

[gentoo-dev] [PATCH 3/4] epunt-cxx.eclass: Switch to using patches from elt-patches pkg

[Michał Górny]

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

[gentoo-dev] [PATCH 4/4] eclass/ELT-patches: remove the remaining (nocxx) patches

[Michał Górny]

Now that epunt-cxx.eclass is using the patches from
app-portage/elt-patches, remove the remaining patches from
the repository.
---
 eclass/ELT-patches/nocxx/nocxx-2.64.patch | 13 -------------
 eclass/ELT-patches/nocxx/nocxx.patch      | 15 ---------------
 2 files changed, 28 deletions(-)
 delete mode 100644 eclass/ELT-patches/nocxx/nocxx-2.64.patch
 delete mode 100644 eclass/ELT-patches/nocxx/nocxx.patch

diff --git a/eclass/ELT-patches/nocxx/nocxx-2.64.patch b/eclass/ELT-patches/nocxx/nocxx-2.64.patch
deleted file mode 100644
index 4b10e4697185..000000000000
--- a/eclass/ELT-patches/nocxx/nocxx-2.64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5148,8 +5148,8 @@
- else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
-+$as_echo "See \`config.log' for more details." >&5;
-+$ac_echo "C++ sucks, ignoring ..." >&5; }
- fi
- 
- ac_ext=c
diff --git a/eclass/ELT-patches/nocxx/nocxx.patch b/eclass/ELT-patches/nocxx/nocxx.patch
deleted file mode 100644
index 4b326924e18f..000000000000
--- a/eclass/ELT-patches/nocxx/nocxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -5148,10 +5148,8 @@
-   :
- else
-   { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." >&5;}
-+   { echo "C++ sucks, ignoring ..." >&5; }; }
- fi
- 
- ac_ext=cc
-- 
2.12.2

Re: [gentoo-dev] [PATCH 1/4] eutils.eclass: Remove implicit epunt-cxx inherit

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

On pią, 2017-04-14 at 21:32 +0200, Michał Górny wrote:
> Stop inheriting the epunt-cxx eclass in eutils implicitly. All the uses
> in ::gentoo are fixed already, and this lets us add extra dependencies
> in the eclass without affecting most of the packages out there.
> ---
>  eclass/eutils.eclass | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 

Merged.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]