From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF4131382C5 for ; Sat, 3 Mar 2018 21:33:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8EE1E09AB; Sat, 3 Mar 2018 21:33:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0252E09AB for ; Sat, 3 Mar 2018 21:33:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67416335C2C for ; Sat, 3 Mar 2018 21:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C20A1F1 for ; Sat, 3 Mar 2018 21:33:24 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1520112756.fd215a94a75e0c9677f6b3c09c1c7b434bedec62.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/virtualbox-5.1.32.ebuild app-emulation/virtualbox/virtualbox-5.1.34.ebuild app-emulation/virtualbox/virtualbox-5.2.6.ebuild app-emulation/virtualbox/virtualbox-5.2.8.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: fd215a94a75e0c9677f6b3c09c1c7b434bedec62 X-VCS-Branch: master Date: Sat, 3 Mar 2018 21:33:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 328c9124-3639-41bf-93df-ac4b7063552d X-Archives-Hash: 6bc83b2d7d246e739d07933e69ef4470 commit: fd215a94a75e0c9677f6b3c09c1c7b434bedec62 Author: James Le Cuirot gentoo org> AuthorDate: Sat Mar 3 21:32:36 2018 +0000 Commit: James Le Cuirot gentoo 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