| 1 |
commit: 0c47a8b7329b0c71443d382b203bd96c67b84764 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 11:32:10 2015 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 11:32:10 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c47a8b7 |
| 7 |
|
| 8 |
app-emulation/virtualbox: Warn on pax-mark failure (bug #558510) |
| 9 |
|
| 10 |
instead of failing. Added subslot dependencies to the virtual/jre dep. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.20.1 |
| 13 |
|
| 14 |
app-emulation/virtualbox/virtualbox-5.0.2.ebuild | 25 ++++++++++++++++-------- |
| 15 |
1 file changed, 17 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild b/app-emulation/virtualbox/virtualbox-5.0.2.ebuild |
| 18 |
index 3b49c09..ffd4b84 100644 |
| 19 |
--- a/app-emulation/virtualbox/virtualbox-5.0.2.ebuild |
| 20 |
+++ b/app-emulation/virtualbox/virtualbox-5.0.2.ebuild |
| 21 |
@@ -48,7 +48,7 @@ RDEPEND="!app-emulation/virtualbox-bin |
| 22 |
media-libs/libsdl:0[X,video] |
| 23 |
) |
| 24 |
|
| 25 |
- java? ( >=virtual/jre-1.6 ) |
| 26 |
+ java? ( >=virtual/jre-1.6:= ) |
| 27 |
udev? ( >=virtual/udev-171 ) |
| 28 |
vnc? ( >=net-libs/libvncserver-0.9.9 )" |
| 29 |
DEPEND="${RDEPEND} |
| 30 |
@@ -66,7 +66,7 @@ DEPEND="${RDEPEND} |
| 31 |
dev-texlive/texlive-fontsrecommended |
| 32 |
dev-texlive/texlive-fontsextra |
| 33 |
) |
| 34 |
- java? ( >=virtual/jre-1.6 ) |
| 35 |
+ java? ( >=virtual/jre-1.6:= ) |
| 36 |
virtual/pkgconfig |
| 37 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
| 38 |
!headless? ( x11-libs/libXinerama ) |
| 39 |
@@ -288,20 +288,26 @@ src_install() { |
| 40 |
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453) |
| 41 |
# VBoxXPCOMIPCD (bug #524202) |
| 42 |
for each in VBox{Manage,SVC,XPCOMIPCD} ; do |
| 43 |
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die |
| 44 |
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} ; then |
| 45 |
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/${each}" |
| 46 |
+ fi |
| 47 |
done |
| 48 |
|
| 49 |
if ! use headless ; then |
| 50 |
doins VBoxSDL |
| 51 |
fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL |
| 52 |
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL |
| 53 |
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL || die |
| 54 |
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL ; then |
| 55 |
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxSDL" |
| 56 |
+ fi |
| 57 |
|
| 58 |
if use opengl && use qt4 ; then |
| 59 |
doins VBoxTestOGL |
| 60 |
fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL |
| 61 |
fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL |
| 62 |
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL || die |
| 63 |
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxTestOGL ; then |
| 64 |
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxTestOGL" |
| 65 |
+ fi |
| 66 |
fi |
| 67 |
|
| 68 |
dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL |
| 69 |
@@ -310,8 +316,9 @@ src_install() { |
| 70 |
doins VirtualBox |
| 71 |
fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox |
| 72 |
fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox |
| 73 |
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \ |
| 74 |
- || die |
| 75 |
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox ; then |
| 76 |
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VirtualBox" |
| 77 |
+ fi |
| 78 |
|
| 79 |
dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox |
| 80 |
|
| 81 |
@@ -330,7 +337,9 @@ src_install() { |
| 82 |
doins VBoxHeadless |
| 83 |
fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless |
| 84 |
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless |
| 85 |
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die |
| 86 |
+ if ! pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless ; then |
| 87 |
+ ewarn "Couldn't pax-mark /usr/$(get_libdir)/${PN}/VBoxHeadless" |
| 88 |
+ fi |
| 89 |
|
| 90 |
insinto /usr/$(get_libdir)/${PN} |
| 91 |
# Install EFI Firmware files (bug #320757) |
Archives