diff --git a/media-video/olive/metadata.xml b/media-video/olive/metadata.xml
index daa4ab4..c0cfa55 100644
--- a/media-video/olive/metadata.xml
+++ b/media-video/olive/metadata.xml
@@ -8,7 +8,4 @@
   <upstream>
     <remote-id type="github">olive-editor/olive</remote-id>
   </upstream>  
-  <use>
-    <flag name="doxygen">Build and install source code documentation</flag>
-  </use>
 </pkgmetadata>
diff --git a/media-video/olive/olive-9999.ebuild b/media-video/olive/olive-9999.ebuild
index 0fb4319..8dd5ddb 100644
--- a/media-video/olive/olive-9999.ebuild
+++ b/media-video/olive/olive-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit xdg cmake
 
@@ -16,47 +16,46 @@ else
 	KEYWORDS="~amd64"
 fi
 
+RESTRICT="!test? ( test )"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doxygen"
+IUSE="doc test"
 
-COMMON_DEPEND="
+#media-video/opentimelineio : The CMakeFile tries to find it, but doesnt do anything yet.
+DEPEND="
+	>=dev-qt/qtconcurrent-5.6.0
 	>=dev-qt/qtcore-5.6.0
 	>=dev-qt/qtgui-5.6.0
-	>=dev-qt/qtmultimedia-5.6.0
 	>=dev-qt/qtopengl-5.6.0
 	>=dev-qt/qtsvg-5.6.0
 	>=dev-qt/qtwidgets-5.6.0
 	>=media-libs/opencolorio-2.0.0
-	media-libs/openexr
+	media-libs/openexr:*
 	>=media-libs/openimageio-2.1.12
+	media-libs/portaudio
 	>=media-video/ffmpeg-3.0.0
 	virtual/opengl
 "
-#media-video/opentimelineio : The CMakeFile tries to find it, but doesnt do anything yet.
-
-DEPEND="
-	"${COMMON_DEPEND}"
-	>=dev-qt/qtconcurrent-5.6.0
+RDEPEND="${DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools
-	doxygen? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	"${COMMON_DEPEND}"
-	dev-qt/qtnetwork
+	doc? (
+		app-doc/doxygen[dot]
+	)
 "
 
 src_configure() {
 	local mycmakeargs=(
-#		-DUPDATE_TS=
-		-DBUILD_DOXYGEN="$(usex doxygen)"
+		-DBUILD_DOXYGEN="$(usex doc)"
+		-DBUILD_TESTS="$(usex test)"
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	if use doxygen; then
+	if use doc; then
 		docinto html
 		dodoc -r "${BUILD_DIR}"/docs/html/*
 	fi