--- /usr/portage/media-gfx/zbar/zbar-0.20.1.ebuild	2018-11-25 20:09:28.000000000 +0200
+++ /usr/local/portage/media-gfx/zbar/zbar-0.20.1-r1.ebuild	2018-12-01 00:03:48.520374849 +0200
@@ -86,7 +86,13 @@
 		-i configure.ac || die
 	sed "s|javadir = \$(pkgdatadir)|javadir = /usr/$(get_libdir)/zbar|" \
 		-i java/Makefile.am || die
+	# Always include QT header files, so multilib_check_headers doesn't complain
+	sed -e '/if HAVE_QT/,/endif/{ /if HAVE_QT/d; /endif/d; }' \
+		-i include/Makefile.am.inc || die
 	eautoreconf
+
+	# Out of source builds doesn't work properly
+	multilib_copy_sources
 }
 
 multilib_src_configure() {
@@ -97,6 +103,8 @@
 		$(multilib_native_use_with graphicsmagick graphicsmagick)
 		$(multilib_native_use_with imagemagick)
 		$(multilib_native_use_with java)
+		$(multilib_native_use_with qt5 qt)
+		$(multilib_native_use_with qt5)
 		$(use_with jpeg)
 		$(multilib_native_use_with python python2)
 		$(use_enable static-libs static)
@@ -117,21 +125,10 @@
 				java-pkg_append_ CLASSPATH $(java-pkg_getjar --build-only hamcrest-core-1.3 hamcrest-core.jar)
 			fi
 		fi
-		if use qt5; then
-			myeconfargs+=(
-				$(use_with qt5 qt)
-				$(use_with qt5)
-			)
-		else
-			myeconfargs+=( --without-qt )
-		fi
 	fi
 
 	ECONF_SOURCE=${S} \
 		econf "${myeconfargs[@]}"
-
-	# work-around out-of-source build issue
-	mkdir gtk pygtk qt test || die
 }
 
 src_test() {