[gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/

[Michał Górny]

commit:     9a9e5f4d27279706ac968e459497a9bf8919d33c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 07:52:16 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 08:17:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9e5f4d

sys-fs/eudev: [QA] Fix invalid stubbing of eclass internals

 sys-fs/eudev/eudev-3.1.5.ebuild  | 7 +++----
 sys-fs/eudev/eudev-3.2.5.ebuild  | 7 +++----
 sys-fs/eudev/eudev-4.9999.ebuild | 7 +++----
 sys-fs/eudev/eudev-9999.ebuild   | 7 +++----
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 1a1aa6cc311..da80e0dc8c6 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
        hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed 
headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/udev.h
+)
 
 pkg_pretend() {
        ewarn

diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 26b5186f721..131f1a69a5d 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
        hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed 
headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/udev.h
+)
 
 pkg_pretend() {
        ewarn

diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index 8e32a0f959f..69dbc663bc0 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -48,10 +48,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
        hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed 
headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/udev.h
+)
 
 pkg_pretend() {
        ewarn

diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 4e3f3bb3c60..9cd4b44b46c 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
        hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed 
headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/udev.h
+)
 
 pkg_pretend() {
        ewarn