From 91433e5fca89bb5281548d29e3c13278ad295425 Mon Sep 17 00:00:00 2001 From: Louis Sautier Date: Wed, 5 Dec 2018 10:49:01 +0100 Subject: [PATCH] media-gfx/zbar: fix build failures on multilib systems * Explicitly disable QT on non-native ABIs, otherwise it is implicitly enabled by upstream's build system. * Wrap QT-related headers that are only included for native ABI builds. Closes: https://bugs.gentoo.org/672500 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Louis Sautier --- media-gfx/zbar/zbar-0.20.1.ebuild | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild index 8d21ca2a30aa..643a3a60ea9d 100644 --- a/media-gfx/zbar/zbar-0.20.1.ebuild +++ b/media-gfx/zbar/zbar-0.20.1.ebuild @@ -125,6 +125,8 @@ multilib_src_configure() { else myeconfargs+=( --without-qt ) fi + else + myeconfargs+=( --without-qt ) fi ECONF_SOURCE=${S} \ @@ -138,6 +140,16 @@ src_test() { virtx multilib-minimal_src_test } +src_install() { + if use qt5; then + local MULTILIB_WRAPPED_HEADERS=( + /usr/include/zbar/QZBar.h + /usr/include/zbar/QZBarImage.h + ) + fi + multilib-minimal_src_install +} + multilib_src_install_all() { einstalldocs find "${D}" -name '*.la' -delete || die -- 2.26.2