[gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/

["Louis Sautier" <sbraz@gentoo.org>]

commit:     91433e5fca89bb5281548d29e3c13278ad295425
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  5 09:49:01 2018 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Dec  5 09:52:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91433e5f

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 <sbraz <AT> gentoo.org>

 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 8d21ca2a30a..643a3a60ea9 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