From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1107943-garchives=archives.gentoo.org@lists.gentoo.org>
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 E5953138335
for <garchives@archives.gentoo.org>; Wed, 28 Aug 2019 14:34:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CA578E0849;
Wed, 28 Aug 2019 14:34:31 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 A6012E0849
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 14:34:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 8FA5734A527
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 14:34:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4831E77A
for <gentoo-commits@lists.gentoo.org>; Wed, 28 Aug 2019 14:34:28 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1567002828.860077aebfe165cacf8d0804830ba9a91f5b4111.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
X-VCS-Directories: app-emulation/virtualbox/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: 860077aebfe165cacf8d0804830ba9a91f5b4111
X-VCS-Branch: master
Date: Wed, 28 Aug 2019 14:34:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 67b14434-6832-40b0-9458-815abac04ebe
X-Archives-Hash: b2f8d5633aa7de9352c722a1bb5f1db9
commit: 860077aebfe165cacf8d0804830ba9a91f5b4111
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 28 14:33:48 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 14:33:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860077ae
app-emulation/virtualbox: [QA] Remove unnecessary slash strip
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: David Seifert <soap <AT> gentoo.org>
app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
index cd27d90f6c4..a451933cccb 100644
--- a/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.10-r2.ebuild
@@ -296,7 +296,7 @@ src_install() {
# Set the correct libdir
sed \
-e "s@MY_LIBDIR@$(get_libdir)@" \
- -i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+ -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
# Install the wrapper script
exeinto ${vbox_inst_path}
@@ -330,7 +330,7 @@ src_install() {
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
# VBoxXPCOMIPCD (bug #524202)
for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
- pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+ pax-mark -m "${ED}"${vbox_inst_path}/${each}
done
# Symlink binaries to the shipped wrapper
@@ -351,7 +351,7 @@ src_install() {
if ! use headless ; then
vbox_inst rdesktop-vrdp
vbox_inst VBoxSDL 4750
- pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL
+ pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
for each in vboxsdl VBoxSDL ; do
dosym ${vbox_inst_path}/VBox /usr/bin/${each}
@@ -361,12 +361,12 @@ src_install() {
vbox_inst VirtualBox
vbox_inst VirtualBoxVM 4750
for each in VirtualBox{,VM} ; do
- pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
+ pax-mark -m "${ED}"${vbox_inst_path}/${each}
done
if use opengl ; then
vbox_inst VBoxTestOGL
- pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
+ pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
fi
for each in virtualbox{,vm} VirtualBox{,VM} ; do
@@ -409,8 +409,8 @@ src_install() {
doins -r sdk
if use java ; then
- java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so"
+ java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+ java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
fi
fi
@@ -498,9 +498,9 @@ pkg_postinst() {
elog ""
elog "WARNING!"
elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [[ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
+ elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
elog ""
- elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
+ elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
elog "or else USB in ${PN} won't work."
fi
}