fixing MAKEOPTS='-j# -O' issue with permission from PolyC, removing live ebuild under...
authorRichard Farina <zerochaos@gentoo.org>
Sun, 29 Mar 2015 20:58:26 +0000 (20:58 +0000)
committerRichard Farina <zerochaos@gentoo.org>
Sun, 29 Mar 2015 20:58:26 +0000 (20:58 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

app-emulation/virtualbox/ChangeLog
app-emulation/virtualbox/Manifest
app-emulation/virtualbox/virtualbox-4.3.18.ebuild
app-emulation/virtualbox/virtualbox-4.3.24.ebuild
app-emulation/virtualbox/virtualbox-4.3.26.ebuild
app-emulation/virtualbox/virtualbox-9999.ebuild [deleted file]

index 31b8ee9d91110b1694cb3e041179d05507f676c6..c0ac488e8176b65210bcf879a3453d3b3f9cf588 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.198 2015/03/17 08:01:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.199 2015/03/29 20:58:20 zerochaos Exp $
+
+  29 Mar 2015; Rick Farina <zerochaos@gentoo.org> -virtualbox-9999.ebuild,
+  virtualbox-4.3.18.ebuild, virtualbox-4.3.24.ebuild, virtualbox-4.3.26.ebuild:
+  fixing MAKEOPTS='-j# -O' issue with permission from PolyC, removing live
+  ebuild under direction of PolyC, and fixing minor repoman warnings
 
 *virtualbox-4.3.26 (17 Mar 2015)
 
index b4b59c04fc6748e2f8487ed914eb4e30abdd884f..18938b71986311bd538cfe575fafb53af6ec2c67 100644 (file)
@@ -13,26 +13,25 @@ DIST VirtualBox-4.3.18.tar.bz2 98022191 SHA256 9798acbc78b2645f2a02446ef6be181ed
 DIST VirtualBox-4.3.24.tar.bz2 102647661 SHA256 e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc SHA512 e9a5be9f95c83b832bdecf0f56c01e4e16574455b8583d20d2ce26bf771747d5139fec4117706316b89862771fbe3d21a3c124fcd7cc2d04338de1b08b2c34f0 WHIRLPOOL c7ca87f3b2dd0d44beb154ce9753620cc60ea5a10f9b2afa1dbc50cefa223f239d116977f08520e53d57a51e7e5d72de2db6589bd7548ad74b32bf8ba6b71e84
 DIST VirtualBox-4.3.26.tar.bz2 102676804 SHA256 e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 SHA512 fb55169b7fc8d003746285d6008b70048e83c4245ba41ff7919956696846a8f566c71699c72bbe2c6650e608450fc39990442e0c69782e7dd265596c0efd8cfc WHIRLPOOL 53e175e5581b3a8af7f18ec5c5718789cabec4b6916acb439f5db211059755fcec08e8563ab3d6bcacc625d1c1ff4617f8a8cf83e263fa97ceb9d83cc51d4147
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
-EBUILD virtualbox-4.3.18.ebuild 12364 SHA256 604691432387fa22efa12c255c6789d8b48068e5f11436069cfb21ca5c4b49b1 SHA512 3c12b84212e56d8136452621b0a0978217b72ed7f040be38ec001c297378048584ff0be94c1f91fe263887c9099c672cf2f48308e3c550188af2283cd96a5392 WHIRLPOOL 1f2da4265af27faee68871453fef763a649a0056b04c79cef73f84b6df93c87f01dcbd70617c09b2202e4e695b27e29257b683b27b1f5f62d5c4ccde454650ef
-EBUILD virtualbox-4.3.24.ebuild 12613 SHA256 2d30c2d3254d83c86363bcaf4981c30005dc62af456686a33ce3119aed8d5df2 SHA512 ae399a822171778d4d3c424cb0347c27cb73a00adf2fd72b09b363af6d1c308e9899e87d8ef0f43b7495920fc44fad02a815b42e6fb7fbc1122413eb5bcd8480 WHIRLPOOL 78d11db9f03a0101494b419437274b372c2f8c544d1fdd1ceae805594b10a9fa4e1b70e9262afab54cd0bc500875644dd0d3a2e23667e74f1a72e7bd3f973c77
-EBUILD virtualbox-4.3.26.ebuild 12613 SHA256 e8d78de8b17685bb38bcedcea46d896cdfdbbfef6041284461acf675ff820e6a SHA512 8677b0dbbef52e27625eed8313142977102938033903cd8db1d9e6a904d229f858a567b693b3dcea17d4810d020247ed6ff5c82cc7520e00aeae95bffbf56bf3 WHIRLPOOL af20988fa4be50cc0908c551bf8301e00f74894242b3ad49b43e9aafcc883faf72962cd04747f44830d54614e5f90e3c00e0c282f215576b21028e69c9415403
-EBUILD virtualbox-9999.ebuild 5124 SHA256 c21419dc6df355c61f544776b629659c9b40521eefff5af888cf432e005e81ab SHA512 c4e371d91b4a72cf1da5d20fbc4f627ee04e45f41ab967807590ef09dfae8e05b1f8914d496278a460154842ae071114e429acfe8b0984a87b8274b3fa0d6e47 WHIRLPOOL f811044a3d31354ecba0db9bd7daba4293d66c5a551c8d36aca38dffd0a3ae016eb8265d139ec5f708fcb9132420cc66ec2f104ca21005336faf3fdedc1aa24d
-MISC ChangeLog 29750 SHA256 839e9a68373074ee4b59a7a3e83449ffe8b0093d13731dfee3aa693efa87e515 SHA512 64490a6f55ea258152a6f466f5fb10ae991cd8ec187eb89b5a01fcf998edaf51b07a268ad39c8afc179a15a26cd80adb3cfce25acedc9d758e17177e3b1e08a4 WHIRLPOOL bd2a3c64cbdede782c25631ad227d38c49e1c29ce394c428b561338ad82f20ed81584855890bfe588dafcf1bdfa3e3c3d9f956bb6da9c07fe20b499d6c19b51c
+EBUILD virtualbox-4.3.18.ebuild 12585 SHA256 70c9d2f585c77670e27737a171f8b4347d8ba0d36e58cf450eaafefc244d4bf3 SHA512 80bf75e22b3724544b16e81856251b92e3516ee1254c08af5bc64b65369403e7b673eab0b3e179321163b66df175fbfa35ae8345e38d1ed9fc3f242f6de04839 WHIRLPOOL d0cb5d06ee5e39f2a5a50f177eac1395016342a021eec70114e714bfc876880ea2eaca1fcd96931b937672a02280d0267b8a2d90d99e3dfebf879cf49ae151b8
+EBUILD virtualbox-4.3.24.ebuild 12834 SHA256 f1eedbc687c64581b985357edfbd85698da459bdee8303387948d30c4315e057 SHA512 7f8f59470d0a91dad0029f03dde96f42584224289cc1f7bbd5d9681ff7e0a21b4edcb9eb6b8875dec49130a3130a14683ce3e2544866b27174424d7bcce72dd0 WHIRLPOOL 4c879536059ca9d73b35c7e9aa6a1131016a32a1da16d6dc5fd302d790a2111a32a6ae5ecc86c1fdfc611cd41466a4e8e20d268567934a1b2ae173d491d3198e
+EBUILD virtualbox-4.3.26.ebuild 12834 SHA256 862d3d53cfe3661b34168acb23b199a77ca04227e8683d9a909666162c57e632 SHA512 124ea78091a9f535f3b70274772ffc29a070818cfee45fc4191649907361654ddb8be92bf54f213c38c1cec18ab70e9ec2d64587a54389cbb6a61c3583f13abc WHIRLPOOL 75f38e40a89ffdfb3c96fc2454edf7eebd338266880d7df7d57bb9284d1eca57411a608a8c81785faf09b33e88e89ca239dd3b7ec0188aef0b558f5a6d1e5d74
+MISC ChangeLog 30047 SHA256 3deac37cec34b89215ff37614f374f25b042bb96e70043d41a5115349a43f223 SHA512 c58a79810d3fd691d555980894320d2b5a21589a72fe6a911c1ac987657952c1c3419bb14dfeb28e26efe6ee5abbc4352dcf04d19c701042b2ff2abbd8d9d765 WHIRLPOOL a56f8749f27e015a0f87acc6d31aa6d5cc0c3e4d4dcc671f3f438197d1888d204e79bcd625e23d6fd8454537f9fa3e2aa52f2f15c112aad0965dbd7f347044bc
 MISC metadata.xml 748 SHA256 66bd437f8361756fc1face65daddb2665d37eea729f54f3af991ab7b18bb9677 SHA512 5f520970ef34c8926d7729f27fe9abad8574b81c68052440f807fe0a6c71a3cd929d2c5a82c37b791f25efd5276ed617347027463faae1cb6b15c1a667c4aca2 WHIRLPOOL bda4439eb6bbcab61d17b6d76e7c342ff7e2008c298c57962448ae5f45338971be8b1a88a5bb4e64dae2048d49ebe5937aa883297e69e02eaa329de51c765d7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVB99nAAoJEPiazRVxLXTFYKYQAMAfWUSP9szEbXjMMo8oDGoO
-wGNXpaLj8YviCjSoIke1RcfkDMm489Vu2AwYPbVNKT1khvjm2ItMA1kL69/px1xo
-EyZzlCZtmFHBIwoniGTzjHDnnD7lYSZYzrWDKry55fSvBIyc51OzWMribC4avUFx
-zzgTHxpBZLGVFAsCPndJRD031KHqJ4hNc9gFz/OuPGsCunlHeLLFEoBtBEO7Mag+
-3T1RC2gKh+LQEVR/R/no1mXb6FOXqY16E6GQTW/xe4VagwoLzYq24mFyP+ara0yZ
-GUidG0YZns09T5Tuu4cwJetQzpceG9MvVILFOEJL2omUcMgq+p+XgapdW2rEpcjV
-abGPxf7MrqLaHA7XG6w6vuIzGSgEk+GmOdzL4VofxYoiWORvE/aBJhvDrLcs3OdI
-+B/GuID/I5or1b5inpqA1sUw7Wr+ZJkeEx94prdd8G4GkZWk95jIH6lUJFu+G/Dn
-gldawnTUAK5fSCWfftHQ1MoVyTo+MA+rxlwB/bhww/iAlVHwnEQu0TiqqSn9pz/Z
-JSTpmH+qLzEoU29oHhWcH7njMKcu0hODbbXy7DSDScr+OnuHl15NJ9qHzFT0KUjr
-nOCVzAW0RdX2xJtfxwwqaSkvwPFWmdjQI5pB/reB9muWwh3ReKWA83ueO/VnLb33
-skYFpW/Bb62MDP3tOjjS
-=n+Wm
+iQIcBAEBCAAGBQJVGGdxAAoJEKXdFCfdEflKPrQP/1Em1L/T9K2UGnUUVkCRDJBG
+MI1BiSjk8gNvWdEu+PL3tXEmW0Kbk2VfSpt/KGQTtRxsqgCxWBqbeLsHgWdsSwj8
+yDfX4RdAMogjZY53vDgZQlTWZ89ezL3lOc7NNWRFHwa68fWOTRwPt1E61fZzi2mu
+zw+bA8ZW8uf4YfjBXuWuZQoCu0g3EfS2tllZ8JphH98d6AM+BgoY1eOx5IdsebDx
+ZcSuR5mQNyvr4g+ByAtM+u+vzOPvPA4loTkRcryeWDWw/WPmWGEKeR/Z4nzn63FK
+leYGaHGU8MwHqhf+rx74DOGoE45t4jycsF2VGvSmzOw/nByr3lOwaqED5Wb576v2
+YkGIvygK8D/JIaU7IxBtgGHVBCTDiBdTZwQal84DiuurofwakF9Gd9cHY3aokhU3
+I0LhstfFyKtSfQoZI04cinaT8/dSAUjYJ+10IG4PufndfLTl9j2pR+ixeCzzjlnd
+/nreFhIInguFAryg9m4y4Q6hdGiVZnLm+GDWgKY+KiJVdPuunDJjyGkuku0DOnDy
+YRuUXKpMtEmE3vQirYckkG5e8XKSvAl68uMib/s60PP2SggZsRCey9EWbjjCel89
+rtKef4vNvDvzhUZ9cyCWsAM56ga0Ro4J8lTSRu+HMv4G0MJmhftMuqXHGJCzHVR8
+w8l8wpmuCB7zB2PkPuRv
+=U36r
 -----END PGP SIGNATURE-----
index d1f504a9de015f227f89313b7a251ab796188c42..970ec1a968f5a6a29937cbc166771822982d544b 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.18.ebuild,v 1.2 2014/12/22 13:11:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.18.ebuild,v 1.3 2015/03/29 20:58:20 zerochaos Exp $
 
 EAPI=5
 
@@ -27,9 +27,9 @@ RDEPEND="!app-emulation/virtualbox-bin
        dev-libs/libIDL
        >=dev-libs/libxslt-1.1.19
        net-misc/curl
-       dev-libs/openssl
+       dev-libs/openssl:0=
        dev-libs/libxml2
-       media-libs/libpng
+       media-libs/libpng:0=
        media-libs/libvpx
        sys-libs/zlib
        >=virtual/udev-171
@@ -214,6 +214,9 @@ src_compile() {
        # and strip all flags
        # strip-flags
 
+       MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
        MAKE="kmk" emake \
                VBOX_BUILD_PUBLISHER=_Gentoo \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
index 5429e0a2b6a67a0de00323849345164aed29595f..1cb5c72065b711c226bfa86b61278434e31508f1 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.24.ebuild,v 1.1 2015/03/04 07:10:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.24.ebuild,v 1.2 2015/03/29 20:58:20 zerochaos Exp $
 
 EAPI=5
 
@@ -27,9 +27,9 @@ RDEPEND="!app-emulation/virtualbox-bin
        dev-libs/libIDL
        >=dev-libs/libxslt-1.1.19
        net-misc/curl
-       dev-libs/openssl
+       dev-libs/openssl:0=
        dev-libs/libxml2
-       media-libs/libpng
+       media-libs/libpng:0=
        media-libs/libvpx
        sys-libs/zlib
        !headless? (
@@ -215,6 +215,9 @@ src_compile() {
        # and strip all flags
        # strip-flags
 
+       MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
        MAKE="kmk" emake \
                VBOX_BUILD_PUBLISHER=_Gentoo \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
index 75f184fe5936f20656eb5d5bd25750b35e4af63a..55080eca33f2584d942e78322de4bdf43bf6f11c 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.26.ebuild,v 1.1 2015/03/17 08:01:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.26.ebuild,v 1.2 2015/03/29 20:58:20 zerochaos Exp $
 
 EAPI=5
 
@@ -27,9 +27,9 @@ RDEPEND="!app-emulation/virtualbox-bin
        dev-libs/libIDL
        >=dev-libs/libxslt-1.1.19
        net-misc/curl
-       dev-libs/openssl
+       dev-libs/openssl:0=
        dev-libs/libxml2
-       media-libs/libpng
+       media-libs/libpng:0=
        media-libs/libvpx
        sys-libs/zlib
        !headless? (
@@ -215,6 +215,9 @@ src_compile() {
        # and strip all flags
        # strip-flags
 
+       MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+')
+       MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
        MAKE="kmk" emake \
                VBOX_BUILD_PUBLISHER=_Gentoo \
                TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
deleted file mode 100644 (file)
index f407497..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.34 2014/07/30 19:25:45 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-mod pax-utils qt4-r2 subversion toolchain-funcs user
-
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="alsa headless pulseaudio python +qt4 sdk"
-
-# The VBoxSDL frontend needs media-libs/libsdl[X] (bug #177335)
-RDEPEND="!app-emulation/virtualbox-bin
-       !app-emulation/virtualbox-additions
-       !app-emulation/virtualbox-modules
-       app-arch/makeself
-       app-cdr/cdrtools
-       dev-libs/libIDL
-       >=dev-libs/libxslt-1.1.19
-       dev-libs/xalan-c
-       dev-libs/xerces-c
-       net-misc/curl
-       sys-libs/libcap
-       !headless? (
-               qt4? (
-                       dev-qt/qtgui:4
-                       dev-qt/qtcore:4
-                       dev-qt/qtopengl:4
-               )
-               x11-libs/libXcursor
-               x11-libs/libXinerama
-               media-libs/libsdl[X]
-               x11-libs/libXt
-               media-libs/mesa )
-       sys-apps/usermode-utilities
-       net-misc/bridge-utils"
-DEPEND="${RDEPEND}
-       >dev-util/kbuild-0.1.5
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-devel/dev86
-       sys-power/iasl
-       media-libs/libpng
-       >=media-libs/alsa-lib-1.0.13
-       pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3[threads] )"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
-
-pkg_setup() {
-       linux-mod_pkg_setup
-       BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-
-       # Add the vboxusers group before src_install
-       # see (bug #184504)
-       enewgroup vboxusers
-}
-
-src_configure() {
-
-       local myconf
-       # Don't build vboxdrv kernel module
-       myconf="--disable-kmods"
-       if ! use pulseaudio; then
-                       myconf="${myconf} --disable-pulse"
-       fi
-       if ! use python; then
-                       myconf="${myconf} --disable-python"
-       fi
-       if ! use alsa; then
-                       myconf="${myconf} --disable-alsa"
-       fi
-       if ! use headless; then
-                       if ! use qt4; then
-                                       myconf="${myconf} --disable-qt4"
-                       fi
-       else
-                       myconf="${myconf} --build-headless"
-       fi
-
-       ./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \
-       ${myconf} || die "configure failed"
-}
-
-src_compile() {
-       source ./env.sh
-
-       # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-       # and strip all flags
-       strip-flags
-
-       MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-               TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-               TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-               TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-               TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-               all || die "kmk failed"
-
-       linux-mod_src_compile
-}
-
-src_install() {
-       linux-mod_src_install
-
-       cd "${S}"/out/linux.${ARCH}/release/bin
-
-       # create configuration files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-ose-3-config" vbox.cfg
-
-       # symlink binaries to the shipped wrapper
-       exeinto /usr/lib/${PN}
-       newexe "${FILESDIR}/${PN}-ose-3-wrapper" "VBox" || die
-       fowners root:vboxusers /usr/lib/${PN}/VBox
-       fperms 0750 /usr/lib/${PN}/VBox
-
-       dosym /usr/lib/${PN}/VBox /usr/bin/VBoxManage
-       dosym /usr/lib/${PN}/VBox /usr/bin/VBoxVRDP
-       dosym /usr/lib/${PN}/VBox /usr/bin/VBoxHeadless
-       dosym /usr/lib/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-       # install binaries and libraries
-       insinto /usr/lib/${PN}
-       doins -r components
-
-       if use sdk; then
-               doins -r sdk
-       fi
-
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do
-               doins $each
-               fowners root:vboxusers /usr/lib/${PN}/${each}
-               fperms 0750 /usr/lib/${PN}/${each}
-       done
-
-       if use amd64; then
-               doins VBoxREM2.rel
-               fowners root:vboxusers /usr/lib/${PN}/VBoxREM2.rel
-               fperms 0750 /usr/lib/${PN}/VBoxREM2.rel
-       fi
-
-       if ! use headless; then
-                       for each in VBox{SDL,Headless} ; do
-                               doins $each
-                               fowners root:vboxusers /usr/lib/${PN}/${each}
-                               fperms 4750 /usr/lib/${PN}/${each}
-                               pax-mark -m "${D}"/usr/lib/${PN}/${each}
-                       done
-
-                       dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL
-
-                       if use qt4; then
-                               doins VirtualBox
-                               fowners root:vboxusers /usr/lib/${PN}/VirtualBox
-                               fperms 4750 /usr/lib/${PN}/VirtualBox
-                               pax-mark -m "${D}"/usr/lib/${PN}/VirtualBox
-
-                               dosym /usr/lib/${PN}/VBox /usr/bin/VirtualBox
-                       fi
-
-                       newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-                       domenu "${FILESDIR}"/${PN}.desktop
-       else
-                       doins VBoxHeadless
-                       fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless
-                       fperms 4750 /usr/lib/${PN}/VBoxHeadless
-                       pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless
-       fi
-
-       insinto /usr/share/${PN}
-       doins -r nls
-
-}
-
-pkg_postinst() {
-       linux-mod_pkg_postinst
-       fdo-mime_desktop_database_update
-       elog "To launch VirtualBox just type: \"VirtualBox\""
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "The last user manual is available for download at:"
-       elog "http://www.virtualbox.org/download/UserManual.pdf"
-       elog ""
-       elog "Due to the nature of the build process, there are not"
-       elog "additions available for the live ebuild"
-       elog ""
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}