commit: fd215a94a75e0c9677f6b3c09c1c7b434bedec62 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Mar 3 21:32:36 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Mar 3 21:32:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd215a94
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 app-emulation/virtualbox/virtualbox-5.1.32.ebuild | 5 +++-- app-emulation/virtualbox/virtualbox-5.1.34.ebuild | 5 +++-- app-emulation/virtualbox/virtualbox-5.2.6.ebuild | 5 +++-- app-emulation/virtualbox/virtualbox-5.2.8.ebuild | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild index e45e584a3a8..de534c5671c 100644 --- 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 e933a7f1041..c23a8f3802a 100644 --- 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 b1b10dbd411..e6601c30c85 100644 --- 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 608ae644b8f..40b4975b1e8 100644 --- 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
