diff options
| author | Lars Wendler <polynomial-c@gentoo.org> | 2015-08-30 13:32:10 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2015-08-30 13:32:10 +0200 |
| commit | 0c47a8b7329b0c71443d382b203bd96c67b84764 (patch) | |
| tree | e19096e174962ea5a3fda01faf61a0eb71d961cc /app-emulation/virtualbox | |
| parent | 02947e97a7b9c2a35d82405e3b3e8a6b7ad9489c (diff) | |
| download | gentoo-0c47a8b7329b0c71443d382b203bd96c67b84764.tar.gz gentoo-0c47a8b7329b0c71443d382b203bd96c67b84764.tar.xz | |
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
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-5.0.2.ebuild | 25 |
1 files 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 3b49c094928..ffd4b84f24b 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) |