commit:     278a53a178fe7f1c624f3b59bfe13b493e779122
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 16:23:13 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 17:10:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278a53a1

app-emulation/virtualbox-bin: [QA] Use relative symlink target(s)

 .../virtualbox-bin-5.0.16.105871-r1.ebuild         | 26 ++++++++++----------
 .../virtualbox-bin-5.0.40.115130.ebuild            | 28 +++++++++++-----------
 .../virtualbox-bin-5.1.24.117012.ebuild            | 28 +++++++++++-----------
 .../virtualbox-bin-5.1.26.117224.ebuild            | 28 +++++++++++-----------
 4 files changed, 55 insertions(+), 55 deletions(-)

diff --git 
a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild 
b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
index 161b15b0302..93a76156866 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
@@ -229,7 +229,7 @@ src_install() {
                doins vboxwebsrv
                fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
                fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+               dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
                newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
                newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
        fi
@@ -238,7 +238,7 @@ src_install() {
                doins rdesktop-vrdp
                doins -r rdesktop-vrdp-keymaps
                fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-               dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+               dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
        fi
 
        if ! use headless && use chm; then
@@ -266,11 +266,11 @@ src_install() {
        doins -r * || die
 
        # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so 
(setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so 
/opt/VirtualBox/components/VBoxXPCOM.so
+       dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+       dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+       dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+       dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+       dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
        local each
        for each in 
VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp};
 do
@@ -291,8 +291,8 @@ src_install() {
                        pax-mark -m "${D}"/opt/VirtualBox/${each}
                done
 
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+               dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+               dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
        else
                # Hardened build: Mark selected binaries 
set-user-ID-on-execution
                fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
@@ -305,10 +305,10 @@ src_install() {
        fowners root:vboxusers /opt/VirtualBox/VBox.sh
        fperms 0750 /opt/VirtualBox/VBox.sh
 
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+       dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
 
        # set an env-variable for 3rd party tools
        echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"

diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild 
b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
index 6d69cd21118..677f43a3cd8 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.40.115130.ebuild
@@ -115,7 +115,7 @@ src_install() {
                newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
 
                # set up symlinks (bug #572012)
-               dosym /opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
+               dosym ../../../../opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
 
                local size ico icofile
                for size in 16 24 32 48 64 72 96 128 256 ; do
@@ -160,7 +160,7 @@ src_install() {
                doins vboxwebsrv
                fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
                fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+               dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
                newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
                newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
        fi
@@ -169,7 +169,7 @@ src_install() {
                doins rdesktop-vrdp
                doins -r rdesktop-vrdp-keymaps
                fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-               dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+               dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
        fi
 
        if ! use headless && use chm; then
@@ -197,11 +197,11 @@ src_install() {
        doins -r * || die
 
        # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so 
(setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so 
/opt/VirtualBox/components/VBoxXPCOM.so
+       dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+       dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+       dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+       dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+       dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
        local each
        for each in 
VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp};
 do
@@ -222,8 +222,8 @@ src_install() {
                        pax-mark -m "${D}"/opt/VirtualBox/${each}
                done
 
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+               dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+               dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
        else
                # Hardened build: Mark selected binaries 
set-user-ID-on-execution
                fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
@@ -236,10 +236,10 @@ src_install() {
        fowners root:vboxusers /opt/VirtualBox/VBox.sh
        fperms 0750 /opt/VirtualBox/VBox.sh
 
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+       dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
 
        # set an env-variable for 3rd party tools
        echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"

diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.24.117012.ebuild 
b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.24.117012.ebuild
index 062ce860234..f8efe768803 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.24.117012.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.24.117012.ebuild
@@ -115,7 +115,7 @@ src_install() {
                newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
 
                # set up symlinks (bug #572012)
-               dosym /opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
+               dosym ../../../../opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
 
                local size ico icofile
                for size in 16 24 32 48 64 72 96 128 256 ; do
@@ -160,7 +160,7 @@ src_install() {
                doins vboxwebsrv
                fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
                fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+               dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
                newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
                newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
        fi
@@ -169,7 +169,7 @@ src_install() {
                doins rdesktop-vrdp
                doins -r rdesktop-vrdp-keymaps
                fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-               dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+               dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
        fi
 
        if ! use headless && use chm; then
@@ -197,11 +197,11 @@ src_install() {
        doins -r * || die
 
        # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so 
(setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so 
/opt/VirtualBox/components/VBoxXPCOM.so
+       dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+       dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+       dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+       dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+       dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
        local each
        for each in 
VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp};
 do
@@ -222,8 +222,8 @@ src_install() {
                        pax-mark -m "${D}"/opt/VirtualBox/${each}
                done
 
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+               dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+               dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
        else
                # Hardened build: Mark selected binaries 
set-user-ID-on-execution
                fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
@@ -236,10 +236,10 @@ src_install() {
        fowners root:vboxusers /opt/VirtualBox/VBox.sh
        fperms 0750 /opt/VirtualBox/VBox.sh
 
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+       dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
 
        # set an env-variable for 3rd party tools
        echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"

diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild 
b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
index 062ce860234..f8efe768803 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.26.117224.ebuild
@@ -115,7 +115,7 @@ src_install() {
                newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop
 
                # set up symlinks (bug #572012)
-               dosym /opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
+               dosym ../../../../opt/VirtualBox/virtualbox.xml 
/usr/share/mime/packages/virtualbox.xml
 
                local size ico icofile
                for size in 16 24 32 48 64 72 96 128 256 ; do
@@ -160,7 +160,7 @@ src_install() {
                doins vboxwebsrv
                fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
                fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
+               dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
                newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
                newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
        fi
@@ -169,7 +169,7 @@ src_install() {
                doins rdesktop-vrdp
                doins -r rdesktop-vrdp-keymaps
                fperms 0750 /opt/VirtualBox/rdesktop-vrdp
-               dosym /opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
+               dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp
        fi
 
        if ! use headless && use chm; then
@@ -197,11 +197,11 @@ src_install() {
        doins -r * || die
 
        # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so 
(setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so 
/opt/VirtualBox/components/VBoxXPCOM.so
+       dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
+       dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
+       dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
+       dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
+       dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
 
        local each
        for each in 
VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp};
 do
@@ -222,8 +222,8 @@ src_install() {
                        pax-mark -m "${D}"/opt/VirtualBox/${each}
                done
 
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
+               dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox
+               dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL
        else
                # Hardened build: Mark selected binaries 
set-user-ID-on-execution
                fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
@@ -236,10 +236,10 @@ src_install() {
        fowners root:vboxusers /opt/VirtualBox/VBox.sh
        fperms 0750 /opt/VirtualBox/VBox.sh
 
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP
+       dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless
+       dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
 
        # set an env-variable for 3rd party tools
        echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"

Reply via email to