diff options
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/Manifest | 12 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild (renamed from app-emulation/virtualbox/virtualbox-6.0.14.ebuild) | 5 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-6.1.4-r1.ebuild (renamed from app-emulation/virtualbox/virtualbox-5.2.34.ebuild) | 129 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-6.1.4.ebuild (renamed from app-emulation/virtualbox/virtualbox-6.1.0.ebuild) | 0 |
4 files changed, 76 insertions, 70 deletions
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 66877c6daa36..79599224299b 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -10,23 +10,19 @@ AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e -DIST VirtualBox-5.2.34.tar.bz2 118268064 BLAKE2B 2ac0359e35012662e850e16e6ee74c4c00898a02eaa9a3dcf4299c444efaf56c17e02b33f165c37a22598ab3967169d32c03c383ca253aaaaa3d9d5bafc9b50f SHA512 a5f8771ddcdf2271006f2ce7de497cfb73cee46c51b0c761c9e79d03bbdf44441e3f1e4ce569967de5c33c469b7b664901c998ca9107acee7fe0ea83896bf0c2 DIST VirtualBox-5.2.36.tar.bz2 118253892 BLAKE2B 6b54a8c4aa996bc595b163bce501b97d543d4335507723cf3f6f9fd723f1d9ed42bddc90a8d3028688c0ac4918bbd4a32ab94f81daa867b99d0f0ce9cc9a4c59 SHA512 3437ef3300a706c2b4a4cdabdb3b100786f727e2052659d74cde955a88363052bce48820aa92f2eea9029c08bd23a2473ff080a754dfe0671ab0a6392d887071 -DIST VirtualBox-6.0.14.tar.bz2 154236138 BLAKE2B 18cd508269b2a809ec03b5bacc197131ebd775354e16b9141573ddd037de9ba180e3186347e77067a1767169d2ab1e9ff21590a2702b7705c87cf326204d3424 SHA512 e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d DIST VirtualBox-6.0.16.tar.bz2 154406073 BLAKE2B 8d0c9c1e6c675c5e2c7f01802072370fded7c5d7f7f581c6570b111c4aa4ac327fb74370ac36e4a4e31c6627640f8eb697a43b32fd2818f78e6b119f063d560f SHA512 ff9b726a5a865ed3fc5436e778da434ce532113898ed50434e2a561150410eabeee7194320eb115552542ecfd7c332f46f2d04fba782509dda8e66511e2a1a61 -DIST VirtualBox-6.1.0.tar.bz2 165322453 BLAKE2B ecd15bf1f454dd975562ce27fec9c87d266fcb509952492bd98e77101318149efbcf46b1e025157d569cf511e66b7b8d83dd0cfe5ff288b67010796064dd7685 SHA512 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618 DIST VirtualBox-6.1.2.tar.bz2 165400546 BLAKE2B 38eec6064896a250f4b7079f4bd52f23e43a6482d94bd8bba0a1102bd1cfaf00bd227f8dd2cc8382194c7d18509c6412440b8deb0d283e1e26550eb8a4cc96cc SHA512 476dedd9dd7a213bd70920f4cdf594b5336555f31e5becb15b5c01d88fa7bed917258831af31600514362384401fd7040cb748a7c76896e4a027bef05026b585 +DIST VirtualBox-6.1.4.tar.bz2 165450190 BLAKE2B acb99e64b095d414556d129ee96ef00d59900d8bb4f20f4fdfd4415d027eb0b1df9656b56940656c19074ea088dcca2e6e13372d38bcc30fb3a8372293a36117 SHA512 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450 -DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994 SHA512 25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9 DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff09444c68f86f82a360e9dbb44fa6072d6c28120f3c23cff8c15bacbd38bce8b69b3d8f35c4d3d493684df962ea6e353eec413dcc38 SHA512 3cf2526d209a54e94cd94840793769fd96fa988e21555d76eda2207a7f87e04b446a28ac6c8a2954e7c00a35107c144cadaec276d171214acdcc2900eb41306c -DIST virtualbox-6.0.14-patches-01.tar.xz 2972 BLAKE2B 80f6c6774323add039675e4b372c824610ac312d01ff7de6ae546764e61e8b5cca7f96a6ed71c90337911dd4fa4ad7425072f453454358969d46f5acf2dff80a SHA512 38941fc8f09419f8a2ee251580c5b3cd5e4993db536b33f43ff1454d053e856ba4d0d96cee87f0399e5c63e6bbb930ab7c04ccedb13cef83db512cabb0592ee5 DIST virtualbox-6.0.16-patches-01.tar.xz 3520 BLAKE2B 1ca10c5902ece4657c6a9a03fe28c80a364d999e181cc46fc52d7dac0f0272faca6d6b19cb12d126bb0f4f6014b8c391b2b0f82ca016625410287fcc0c240778 SHA512 33b14fa1ce5526be88d6d5b72b5c86c68c37f565074a764b9d7a65f5c0a39e3d81533f9923087add71783556c1e51e816b674ce46d2800eb678846f65226fb69 DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B 5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c SHA512 31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42 EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1 -EBUILD virtualbox-5.2.34.ebuild 14425 BLAKE2B af138f1129ae76cc015215d9b8246eca2ab3bbb0e7407e302514335844b58a271396970af3be0ec3127baa20507867458d9e4814488fdd0b576f267b0fe5a2f2 SHA512 97cac7fcac7e4e82370a3fdff345c46fa501f1f99f9e095f36d2b84eeee459931062f5b7afbd3570191a0f9525adf83e7c78f50b4f9494614f02294ff3930665 EBUILD virtualbox-5.2.36.ebuild 14437 BLAKE2B 8d6b0a578456bd9ce3371dcb38660640ea71ef4146d32f03afd4c5780a6c270039bbbe06beba93d46633a9c3c15ac956830048ebfd60665f1ae8e422f38a848e SHA512 d49947d3528796ec8789fb5818da6b9802398535bdc66334471cdb7bcdcb9c29560e80f3536e9159a6c4d1b10643a8a84bc28b04aaff64d28634eda051a98dc7 -EBUILD virtualbox-6.0.14.ebuild 14573 BLAKE2B dd3d0dbd005dd2838c02d80b1078e2fb0eeaefe8408ceded1e63128331edf1ff095e11fce8dd1fc2c45a9fec2e8130da39c7a367eb1883dbc5fde6e6de37c8b0 SHA512 a7eca2ecf50ba2ec0b088189a14a3bb5ede941df3e1f0e8f64942d47e603dccd7e90a84db37fd5f4f2f3d702f8a8a0f2e8da5fe225341c3e9949b371edde8c98 +EBUILD virtualbox-6.0.16-r1.ebuild 14597 BLAKE2B 41b401627936df95add918202877f30ad40df76d99084c6c50210e4be7b2b733ae45f553c3ad4deead23f5f1f852d2bbf5068e2ec132fb6be5506a008a384e01 SHA512 8cc1904470925a6fbc1d0150e25694f70a482c83d133ce92c4b5504203d68c0ac80ca2b03114040cccdc30fab5c25702dd717f4f8119cf869e526e4d43b6792a EBUILD virtualbox-6.0.16.ebuild 14575 BLAKE2B 4263cae26e3e074a225f6dd9dd679f3e8e613a3d64d77398e1473127d54c89ae9ee922fe58cd4c2e440d87ee75b65bcfe44f745d399e38b6f9ea25771f2d4f00 SHA512 c18a567b68fad1a32495909cf3e95f0075f15be7d314743368baff90656c992a5b3513e7812b1b57db5281461fed3412c2ecd24b1f87763f01f9cfd477e805f6 -EBUILD virtualbox-6.1.0.ebuild 14350 BLAKE2B f86ba667c91a014a86210f11d85a16c5f55d6ef0d53fead5da8ac660a8329f1bdd393da43d28409e1b3e032fbcd08fd1f6173b0e32d569fb362a2705f64d266b SHA512 a1cba77b6701fe99b533d9fb88f558b52da85c0989081f764c67761d2c057a6b5616073e88fec4102a75e585bb9e0ba1c512c6b7e6ef53cfc1313f844588151a EBUILD virtualbox-6.1.2.ebuild 14350 BLAKE2B f86ba667c91a014a86210f11d85a16c5f55d6ef0d53fead5da8ac660a8329f1bdd393da43d28409e1b3e032fbcd08fd1f6173b0e32d569fb362a2705f64d266b SHA512 a1cba77b6701fe99b533d9fb88f558b52da85c0989081f764c67761d2c057a6b5616073e88fec4102a75e585bb9e0ba1c512c6b7e6ef53cfc1313f844588151a +EBUILD virtualbox-6.1.4-r1.ebuild 14372 BLAKE2B d7aee0bc42412f1c7902a42e14e6d27c0ec696f4be4f31d651c41732bea6a9ff7a87277592c59214ecf79dd2bf7dd7abed72e67e1f0080a300dfa382be8c0048 SHA512 6dd0e1691744d81eb08c873c762b07e07c3d4b210b207380e77226e3ef5b64a22bb74d7e078a84df6e9ecd476a7c2ca52eaab6ce50d4b34b220dd1c159802753 +EBUILD virtualbox-6.1.4.ebuild 14350 BLAKE2B f86ba667c91a014a86210f11d85a16c5f55d6ef0d53fead5da8ac660a8329f1bdd393da43d28409e1b3e032fbcd08fd1f6173b0e32d569fb362a2705f64d266b SHA512 a1cba77b6701fe99b533d9fb88f558b52da85c0989081f764c67761d2c057a6b5616073e88fec4102a75e585bb9e0ba1c512c6b7e6ef53cfc1313f844588151a MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549 diff --git a/app-emulation/virtualbox/virtualbox-6.0.14.ebuild b/app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild index 0f494bcecb23..9e588603a0d2 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.14.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg MY_PV="${PV/beta/BETA}" @@ -13,7 +13,7 @@ MY_P=VirtualBox-${MY_PV} DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" HOMEPAGE="https://www.virtualbox.org/" SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.14-patches-01.tar.xz" + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.16-patches-01.tar.xz" LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0" @@ -24,6 +24,7 @@ IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel puls CDEPEND=" ${PYTHON_DEPS} !app-emulation/virtualbox-bin + acct-group/vboxusers ~app-emulation/virtualbox-modules-${PV} dev-libs/libIDL >=dev-libs/libxslt-1.1.19 diff --git a/app-emulation/virtualbox/virtualbox-5.2.34.ebuild b/app-emulation/virtualbox/virtualbox-6.1.4-r1.ebuild index 99e428abb937..6106edde19fa 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.34.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.4-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg MY_PV="${PV/beta/BETA}" MY_PV="${MY_PV/rc/RC}" @@ -13,14 +13,18 @@ MY_P=VirtualBox-${MY_PV} DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" HOMEPAGE="https://www.virtualbox.org/" SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.34-patches-01.tar.xz" + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.0_rc1-patches-01.tar.xz" LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" - -RDEPEND="!app-emulation/virtualbox-bin +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" + +CDEPEND=" + ${PYTHON_DEPS} + !app-emulation/virtualbox-bin + acct-group/vboxusers ~app-emulation/virtualbox-modules-${PV} dev-libs/libIDL >=dev-libs/libxslt-1.1.19 @@ -28,7 +32,6 @@ RDEPEND="!app-emulation/virtualbox-bin dev-libs/libxml2 media-libs/libpng:0= media-libs/libvpx:0= - media-libs/opus sys-libs/zlib:= !headless? ( media-libs/libsdl:0[X,video] @@ -52,17 +55,28 @@ RDEPEND="!app-emulation/virtualbox-bin libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) lvm? ( sys-fs/lvm2 ) + opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) vnc? ( >=net-libs/libvncserver-0.9.9 ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} +" +DEPEND=" + ${CDEPEND} + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + !headless? ( x11-libs/libXinerama ) + pam? ( sys-libs/pam ) + pax_kernel? ( sys-apps/elfix ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( dev-qt/linguist-tools:5 ) + vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) +" +BDEPEND=" + ${PYTHON_DEPS} >=dev-util/kbuild-0.1.9998.3127 >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-libs/libcap sys-power/iasl virtual/pkgconfig - alsa? ( >=media-libs/alsa-lib-1.0.13 ) doc? ( app-text/docbook-sgml-dtd:4.4 dev-texlive/texlive-basic @@ -72,16 +86,12 @@ DEPEND="${RDEPEND} dev-texlive/texlive-fontsrecommended dev-texlive/texlive-fontsextra ) - !headless? ( x11-libs/libXinerama ) java? ( >=virtual/jdk-1.6 ) - pam? ( sys-libs/pam ) - pax_kernel? ( sys-apps/elfix ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( dev-qt/linguist-tools:5 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - java? ( >=virtual/jre-1.6 )" +" +RDEPEND=" + ${CDEPEND} + java? ( >=virtual/jre-1.6 ) +" QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so usr/lib/virtualbox/VBoxSDL.so @@ -157,7 +167,7 @@ src_prepare() { # Replace pointless GCC version check with something less stupid. # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \ + sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \ -i configure || die # Disable things unused or split into separate ebuilds @@ -188,7 +198,7 @@ src_prepare() { fi # Only add nopie patch when we're on hardened - if gcc-specs-pie ; then + if gcc-specs-pie ; then eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" fi @@ -197,7 +207,6 @@ src_prepare() { eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch fi - rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die eapply "${WORKDIR}/patches" eapply_user @@ -219,6 +228,7 @@ src_configure() { $(usex doc '' --disable-docs) $(usex java '' --disable-java) $(usex lvm '' --disable-devmapper) + $(usex opus '' --disable-libopus) $(usex pulseaudio '' --disable-pulse) $(usex python '' --disable-python) $(usex vboxwebsrv --enable-webservice '') @@ -261,18 +271,16 @@ src_compile() { } src_install() { - local binpath="release" - use debug && binpath="debug" - cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die + cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile + local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile vbox_inst() { local binary="${1}" local perms="${2:-0750}" local path="${3:-${vbox_inst_path}}" - [[ -n "${binary}" ]] || die "vbox_inst: No binray given!" + [[ -n "${binary}" ]] || die "vbox_inst: No binary given!" [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." insinto ${path} @@ -288,11 +296,11 @@ 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} - newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox" + newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" fowners root:vboxusers ${vbox_inst_path}/VBox fperms 0750 ${vbox_inst_path}/VBox @@ -300,12 +308,7 @@ src_install() { insinto ${vbox_inst_path} doins -r components - # *.rc files for x86_64 are only available on multilib systems - local rcfiles="*.rc" - if use amd64 && ! has_multilib_profile ; then - rcfiles="" - fi - for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 iPxeBaseBin ; do vbox_inst ${each} done @@ -315,20 +318,18 @@ src_install() { done # Install EFI Firmware files (bug #320757) - pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die - for fwfile in VBoxEFI{32,64}.fd ; do - vbox_inst ${fwfile} 0644 + for each in VBoxEFI{32,64}.fd ; do + vbox_inst ${each} 0644 done - popd &>/dev/null || die # 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 - for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do + for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} done dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl @@ -343,23 +344,27 @@ src_install() { doenvd "${T}/90virtualbox" 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} done if use qt5 ; then - vbox_inst VirtualBox 4750 - pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox + vbox_inst VirtualBox + vbox_inst VirtualBoxVM 4750 + for each in VirtualBox{,VM} ; do + 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 VirtualBox ; do + for each in virtualbox{,vm} VirtualBox{,VM} ; do dosym ${vbox_inst_path}/VBox /usr/bin/${each} done @@ -367,7 +372,7 @@ src_install() { doins -r nls doins -r UnattendedTemplates - newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop + domenu ${PN}.desktop fi pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die @@ -399,8 +404,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 @@ -430,13 +435,15 @@ src_install() { | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ || die + local extensions_dir="${vbox_inst_path}/ExtensionPacks" + if use vnc ; then - insinto ${vbox_inst_path}/ExtensionPacks + insinto ${extensions_dir} doins -r ExtensionPacks/VNC fi if use dtrace ; then - insinto ${vbox_inst_path}/ExtensionPacks + insinto ${extensions_dir} doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack fi @@ -447,9 +454,12 @@ src_install() { newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf } +pkg_preinst() { + xdg_pkg_preinst +} + pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst if use udev ; then udevadm control --reload-rules \ @@ -483,14 +493,13 @@ 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 } pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postrm } diff --git a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild b/app-emulation/virtualbox/virtualbox-6.1.4.ebuild index fb112b9e937c..fb112b9e937c 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.4.ebuild |