--- a/gentoo/dev-util/apitrace/apitrace-8.0.ebuild	2019-05-08 20:09:47.000000000 +0300
+++ b/gentoo/dev-util/apitrace/apitrace-8.0.ebuild	2019-05-09 14:16:23.615646226 +0300
@@ -18,12 +18,20 @@
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}
-	app-arch/brotli:=
 	media-libs/libpng:0=
 	media-libs/mesa[egl?,${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
 	sys-process/procps:=
 	x11-libs/libX11
+	cli? (
+		app-arch/brotli:=[${MULTILIB_USEDEP}]
+		sys-libs/zlib[${MULTILIB_USEDEP}]
+		system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
+	)
+	!cli? (
+		app-arch/brotli:=
+		sys-libs/zlib
+		system-snappy? ( >=app-arch/snappy-1.1.1 )
+	)
 	egl? (
 		>=media-libs/mesa-8.0[gles1,gles2]
 		media-libs/waffle[egl]
@@ -34,7 +42,6 @@
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5[-gles2]
 	)
-	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
 "
 RDEPEND="${DEPEND}"
 
@@ -64,37 +71,44 @@
 	my_configure() {
 		local mycmakeargs=(
 			-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
+			-DENABLE_CLI=$(usex cli)
 			-DENABLE_EGL=$(usex egl)
 			-DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
 		)
 		if multilib_is_native_abi ; then
 			mycmakeargs+=(
-				-DENABLE_CLI=$(usex cli)
 				-DENABLE_GUI=$(usex qt5)
 			)
 		else
 			mycmakeargs+=(
 				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
 				-DENABLE_GUI=OFF
 			)
 		fi
 		cmake-utils_src_configure
 	}
 
-	multilib_parallel_foreach_abi my_configure
+	multilib_foreach_abi my_configure
 }
 
 src_install() {
+	local MULTILIB_CHOST_TOOLS=()
+	if use cli; then
+		MULTILIB_CHOST_TOOLS=(
+			/usr/bin/apitrace$(get_exeext)
+		)
+	fi
+
 	cmake-multilib_src_install
 
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+	make_libgl_symlinks() {
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
+		dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
+	}
+
+	multilib_foreach_abi make_libgl_symlinks
 
 	rm docs/INSTALL.markdown || die
 	dodoc docs/* README.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
 }