From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B16631384C0 for ; Sun, 30 Aug 2015 11:32:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 058E8E08E0; Sun, 30 Aug 2015 11:32:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D62FE08E0 for ; Sun, 30 Aug 2015 11:32:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3346734087C for ; Sun, 30 Aug 2015 11:32:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8918D153 for ; Sun, 30 Aug 2015 11:32:33 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1440934330.0c47a8b7329b0c71443d382b203bd96c67b84764.polynomial-c@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.0.2.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0c47a8b7329b0c71443d382b203bd96c67b84764 X-VCS-Branch: master Date: Sun, 30 Aug 2015 11:32:33 +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: 08cd89ed-50e3-4c1d-860c-8c73463bd6f5 X-Archives-Hash: 9279bf9b6d0b72d4d2e50eba4fb08b90 commit: 0c47a8b7329b0c71443d382b203bd96c67b84764 Author: Lars Wendler gentoo org> AuthorDate: Sun Aug 30 11:32:10 2015 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Aug 30 11:32:10 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c47a8b7 app-emulation/virtualbox: Warn on pax-mark failure (bug #558510) instead of failing. Added subslot dependencies to the virtual/jre dep. Package-Manager: portage-2.2.20.1 app-emulation/virtualbox/virtualbox-5.0.2.ebuild | 25 ++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild b/app-emulation/virtualbox/virtualbox-5.0.2.ebuild index 3b49c09..ffd4b84 100644 --- a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.0.2.ebuild @@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin media-libs/libsdl:0[X,video] ) - java? ( >=virtual/jre-1.6 ) + java? ( >=virtual/jre-1.6:= ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 )" DEPEND="${RDEPEND} @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) - java? ( >=virtual/jre-1.6 ) + java? ( >=virtual/jre-1.6:= ) virtual/pkgconfig alsa? ( >=media-libs/alsa-lib-1.0.13 ) !headless? ( x11-libs/libXinerama ) @@ -288,20 +288,26 @@ src_install() { # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) # VBoxXPCOMIPCD (bug #524202) for each in VBox{Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die + if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then + ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}" + fi done if ! use headless ; then doins VBoxSDL fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL - pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL || die + if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then + ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL" + fi if use opengl && use qt4 ; then doins VBoxTestOGL fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL - pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL || die + if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then + ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL" + fi fi dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL @@ -310,8 +316,9 @@ src_install() { doins VirtualBox fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox - pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \ - || die + if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then + ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox" + fi dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox @@ -330,7 +337,9 @@ src_install() { doins VBoxHeadless fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless - pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die + if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then + ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless" + fi insinto /usr/$(get_libdir)/${PN} # Install EFI Firmware files (bug #320757)