app-emulation/virtualbox: Fix broken Java VM dependencies

virtual/jdk must go in DEPEND only and virtual/jre must go in RDEPEND
only and subslot operators are not necessary.

Closes: https://bugs.gentoo.org/580552
Closes: https://bugs.gentoo.org/640214
Closes: https://bugs.gentoo.org/645074
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 e45e584a3a8f8caf7d7a7412080d366109543e34..de534c5671c7620d675bb084e8b2ee3935c953d9 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
                        x11-libs/libXinerama
                )
        )
-       java? ( >=virtual/jre-1.6:= )
        libressl? ( dev-libs/libressl:= )
        !libressl? ( dev-libs/openssl:0= )
        lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
                dev-texlive/texlive-fontsextra
        )
        !headless? ( x11-libs/libXinerama )
-       java? ( >=virtual/jre-1.6:= )
+       java? ( >=virtual/jdk-1.6 )
        pam? ( sys-libs/pam )
        pax_kernel? ( sys-apps/elfix )
        pulseaudio? ( media-sound/pulseaudio )
        qt5? ( dev-qt/linguist-tools:5 )
        vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
        ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxSDL.so

diff --git a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
index e933a7f1041a8ae86ac1b9f332f86774304ecccd..c23a8f3802a6c95c5ac66160b0ab6e4fd173668a 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.34.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
                        x11-libs/libXinerama
                )
        )
-       java? ( >=virtual/jre-1.6:= )
        libressl? ( dev-libs/libressl:= )
        !libressl? ( dev-libs/openssl:0= )
        lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
                dev-texlive/texlive-fontsextra
        )
        !headless? ( x11-libs/libXinerama )
-       java? ( >=virtual/jre-1.6:= )
+       java? ( >=virtual/jdk-1.6 )
        pam? ( sys-libs/pam )
        pax_kernel? ( sys-apps/elfix )
        pulseaudio? ( media-sound/pulseaudio )
        qt5? ( dev-qt/linguist-tools:5 )
        vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
        ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxSDL.so

diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
index b1b10dbd4119b25056b92cc5d3b0e375455a6787..e6601c30c85bce66c8105e9a5dd70984b436560a 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
                        x11-libs/libXinerama
                )
        )
-       java? ( >=virtual/jre-1.6:= )
        libressl? ( dev-libs/libressl:= )
        !libressl? ( dev-libs/openssl:0= )
        lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
                dev-texlive/texlive-fontsextra
        )
        !headless? ( x11-libs/libXinerama )
-       java? ( >=virtual/jre-1.6:= )
+       java? ( >=virtual/jdk-1.6 )
        pam? ( sys-libs/pam )
        pax_kernel? ( sys-apps/elfix )
        pulseaudio? ( media-sound/pulseaudio )
        qt5? ( dev-qt/linguist-tools:5 )
        vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
        ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxSDL.so

diff --git a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
index 608ae644b8f1d6fb8f2f3e795788564b04a860bb..40b4975b1e8cedb19df2f91b79b409bcdc30f363 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.8.ebuild
@@ -47,7 +47,6 @@ RDEPEND="!app-emulation/virtualbox-bin
                        x11-libs/libXinerama
                )
        )
-       java? ( >=virtual/jre-1.6:= )
        libressl? ( dev-libs/libressl:= )
        !libressl? ( dev-libs/openssl:0= )
        lvm? ( sys-fs/lvm2 )
@@ -71,13 +70,15 @@ DEPEND="${RDEPEND}
                dev-texlive/texlive-fontsextra
        )
        !headless? ( x11-libs/libXinerama )
-       java? ( >=virtual/jre-1.6:= )
+       java? ( >=virtual/jdk-1.6 )
        pam? ( sys-libs/pam )
        pax_kernel? ( sys-apps/elfix )
        pulseaudio? ( media-sound/pulseaudio )
        qt5? ( dev-qt/linguist-tools:5 )
        vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
        ${PYTHON_DEPS}"
+RDEPEND="${RDEPEND}
+       java? ( >=virtual/jre-1.6 )"
 
 QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
        usr/lib/virtualbox/VBoxSDL.so