app-emulation/virtualbox: Some ebuild improvements.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
index 698f0b56ddabdad0715a47c809871aaba68413b8..08304b19cae9f4005ecdc168c22b938aef66c551 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -204,21 +204,26 @@ src_configure() {
                --with-g++="$(tc-getCXX)"
                --disable-dbus
                --disable-kmods
+               $(usex alsa '' --disable-alsa)
+               $(usex debug --build-debug '')
+               $(usex doc '' --disable-docs)
+               $(usex java '' --disable-java)
+               $(usex lvm '' --disable-devmapper)
+               $(usex pulseaudio '' --disable-pulse)
+               $(usex python '' --disable-python)
+               $(usex vboxwebsrv --enable-webservice '')
+               $(usex vnc --enable-vnc '')
        )
-       use alsa       || myconf+=( --disable-alsa )
-       use debug      && myconf+=( --build-debug )
-       use doc        || myconf+=( --disable-docs )
-       use java       || myconf+=( --disable-java )
-       use lvm        || myconf+=( --disable-devmapper )
-       use opengl     || myconf+=( --disable-opengl )
-       use pulseaudio || myconf+=( --disable-pulse )
-       use python     || myconf+=( --disable-python )
-       use vboxwebsrv && myconf+=( --enable-webservice )
-       use vnc        && myconf+=( --enable-vnc )
        if ! use headless ; then
-               use qt5 || myconf+=( --disable-qt )
+               myconf+=(
+                       $(usex opengl '' --disable-opengl)
+                       $(usex qt5 '' --disable-qt)
+               )
        else
-               myconf+=( --build-headless --disable-opengl )
+               myconf+=(
+                       --build-headless
+                       --disable-opengl
+               )
        fi
        if use amd64 && ! has_multilib_profile ; then
                myconf+=( --disable-vmmraw )

diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
index 46c3c3cba7a01d43f0e3c6e90b8c070798640007..7133045118bfd7c119210ad89a71f9166e57edc7 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
@@ -204,21 +204,26 @@ src_configure() {
                --with-g++="$(tc-getCXX)"
                --disable-dbus
                --disable-kmods
+               $(usex alsa '' --disable-alsa)
+               $(usex debug --build-debug '')
+               $(usex doc '' --disable-docs)
+               $(usex java '' --disable-java)
+               $(usex lvm '' --disable-devmapper)
+               $(usex pulseaudio '' --disable-pulse)
+               $(usex python '' --disable-python)
+               $(usex vboxwebsrv --enable-webservice '')
+               $(usex vnc --enable-vnc '')
        )
-       use alsa       || myconf+=( --disable-alsa )
-       use debug      && myconf+=( --build-debug )
-       use doc        || myconf+=( --disable-docs )
-       use java       || myconf+=( --disable-java )
-       use lvm        || myconf+=( --disable-devmapper )
-       use opengl     || myconf+=( --disable-opengl )
-       use pulseaudio || myconf+=( --disable-pulse )
-       use python     || myconf+=( --disable-python )
-       use vboxwebsrv && myconf+=( --enable-webservice )
-       use vnc        && myconf+=( --enable-vnc )
        if ! use headless ; then
-               use qt5 || myconf+=( --disable-qt )
+               myconf+=(
+                       $(usex opengl '' --disable-opengl)
+                       $(usex qt5 '' --disable-qt)
+               )
        else
-               myconf+=( --build-headless --disable-opengl )
+               myconf+=(
+                       --build-headless
+                       --disable-opengl
+               )
        fi
        if use amd64 && ! has_multilib_profile ; then
                myconf+=( --disable-vmmraw )