| 1 |
commit: 860077aebfe165cacf8d0804830ba9a91f5b4111 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 14:33:48 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 14:33:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860077ae |
| 7 |
|
| 8 |
app-emulation/virtualbox: [QA] Remove unnecessary slash strip |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild | 18 +++++++++--------- |
| 14 |
1 file changed, 9 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild |
| 17 |
index cd27d90f6c4..a451933cccb 100644 |
| 18 |
--- a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild |
| 19 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild |
| 20 |
@@ -296,7 +296,7 @@ src_install() { |
| 21 |
# Set the correct libdir |
| 22 |
sed \ |
| 23 |
-e "s@MY_LIBDIR@$(get_libdir)@" \ |
| 24 |
- -i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" |
| 25 |
+ -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" |
| 26 |
|
| 27 |
# Install the wrapper script |
| 28 |
exeinto ${vbox_inst_path} |
| 29 |
@@ -330,7 +330,7 @@ src_install() { |
| 30 |
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453) |
| 31 |
# VBoxXPCOMIPCD (bug #524202) |
| 32 |
for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do |
| 33 |
- pax-mark -m "${ED%/}"${vbox_inst_path}/${each} |
| 34 |
+ pax-mark -m "${ED}"${vbox_inst_path}/${each} |
| 35 |
done |
| 36 |
|
| 37 |
# Symlink binaries to the shipped wrapper |
| 38 |
@@ -351,7 +351,7 @@ src_install() { |
| 39 |
if ! use headless ; then |
| 40 |
vbox_inst rdesktop-vrdp |
| 41 |
vbox_inst VBoxSDL 4750 |
| 42 |
- pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL |
| 43 |
+ pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL |
| 44 |
|
| 45 |
for each in vboxsdl VBoxSDL ; do |
| 46 |
dosym ${vbox_inst_path}/VBox /usr/bin/${each} |
| 47 |
@@ -361,12 +361,12 @@ src_install() { |
| 48 |
vbox_inst VirtualBox |
| 49 |
vbox_inst VirtualBoxVM 4750 |
| 50 |
for each in VirtualBox{,VM} ; do |
| 51 |
- pax-mark -m "${ED%/}"${vbox_inst_path}/${each} |
| 52 |
+ pax-mark -m "${ED}"${vbox_inst_path}/${each} |
| 53 |
done |
| 54 |
|
| 55 |
if use opengl ; then |
| 56 |
vbox_inst VBoxTestOGL |
| 57 |
- pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL |
| 58 |
+ pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL |
| 59 |
fi |
| 60 |
|
| 61 |
for each in virtualbox{,vm} VirtualBox{,VM} ; do |
| 62 |
@@ -409,8 +409,8 @@ src_install() { |
| 63 |
doins -r sdk |
| 64 |
|
| 65 |
if use java ; then |
| 66 |
- java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" |
| 67 |
- java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so" |
| 68 |
+ java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" |
| 69 |
+ java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so" |
| 70 |
fi |
| 71 |
fi |
| 72 |
|
| 73 |
@@ -498,9 +498,9 @@ pkg_postinst() { |
| 74 |
elog "" |
| 75 |
elog "WARNING!" |
| 76 |
elog "Without USE=udev, USB devices will likely not work in ${PN}." |
| 77 |
- elif [[ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then |
| 78 |
+ elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then |
| 79 |
elog "" |
| 80 |
- elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\"" |
| 81 |
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" |
| 82 |
elog "or else USB in ${PN} won't work." |
| 83 |
fi |
| 84 |
} |
Archives