diff options
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/Manifest.gz | bin | 16334 -> 16341 bytes | |||
| -rw-r--r-- | app-emulation/plus42/Manifest | 6 | ||||
| -rw-r--r-- | app-emulation/plus42/plus42-1.1.11.ebuild (renamed from app-emulation/plus42/plus42-1.1.9.ebuild) | 0 | ||||
| -rw-r--r-- | app-emulation/plus42/plus42-1.1.3.ebuild | 50 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/Manifest | 2 | ||||
| -rw-r--r-- | app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild | 3 | ||||
| -rw-r--r-- | app-emulation/virtualbox/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/virtualbox/metadata.xml | 11 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild | 741 | ||||
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-9999.ebuild | 35 |
10 files changed, 774 insertions, 79 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex da8101fc964c..70564f2276f4 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/plus42/Manifest b/app-emulation/plus42/Manifest index 2ab5a2154908..10e672b3046b 100644 --- a/app-emulation/plus42/Manifest +++ b/app-emulation/plus42/Manifest @@ -1,9 +1,7 @@ AUX plus42-1.0.12-fix-build-intel-lib.patch 2435 BLAKE2B d95d31e0322454b0578f52a1e1ad50213786c14cba8e91bb440fd44397184021da3ce6813eb82114820d9649c8e33969ff5dcfb454c72d7f89b4785564139533 SHA512 7376289f5ed760e48c3c00ee9d1135532cb0aca9ee1eb8116a284925f00d59434544c10de612acaa14f8fd2af409091a19aaf03b01ae80fa185ae3beb70c85cf AUX plus42-1.0.9-fix-makefile.patch 713 BLAKE2B fb8ca302a324122cee89d7f3ddab2a0521c8dee1e910ae50efe7ee74ed3781ac7e3c017cc7afbd601cf41527afd61d979396400a5e6dc8e1714ff853ba25a4eb SHA512 532c8b2d88324e3b38ab568beb1ed9b7fce6e91c894c6438657a800ccd32759c82ce9bcbea3828a04985eef18c278004e0a068b88695da5f0e75bd996c6d2fd3 DIST plus42-upstream-1.1.10.tgz 7612969 BLAKE2B feeab01d4161f0f8cc183cf3c494290469c968d89670610a8848103a8ae64f81816d4456477d1900f94b0e6c5ef3ae3dbd36aa9edb3644f5ed099954fb692664 SHA512 38b263d71464b891a4dc9d32a38b8d32d96e2c1ce352348ff33348b23749ae45d341f6d36b76609b40e863e058ec2c0e5c6be394c041f27f6caba1b261d7422c -DIST plus42-upstream-1.1.3.tgz 7610112 BLAKE2B 6c55a8c2acebbc0e442308e0f078d2ac86f9866d9dbe808a17007a3c3729114f24379401267787107d11e4f3559e14c86f39051da3a956928a7c4c97c1867c31 SHA512 05fd0fb3f330ad0842d28df46ec89d3347cbfca776c6e73092261a96f860677d8f9a6de96ee98adfed4abe5d950a45cec6e6056bb97dd471204d644cbdb82d10 -DIST plus42-upstream-1.1.9.tgz 7612675 BLAKE2B d6b05221b11705c553be2cabe8adc81b892861b86aeb3b234e7fef44bb79551b74f94caaa563f3fa55bc62f988545493d118bab488818cc835ccbfd309c95874 SHA512 bbfd519006c3f24de469a0c928271edb9a2ee92c32bf1eccb313fffb4e13e461875f608561149b8d8de57565cb835c407c7ee2bcf959b198a728669160ff85f6 +DIST plus42-upstream-1.1.11.tgz 7613219 BLAKE2B edd390be71318fbe351e997e3cedb2bf145fea89ed39ac91726c712d1906a28860f515de5bb657d0447d496d7469c6c01b185f6396c9227e120cbb8ea078bca3 SHA512 082042319ee9f58fc6c3fe86e9b15d03e17ae6e3d30441df2e953d71fe670f8004ff25da8986fb6f89fd4f6823a473fbfa620560e6051aa2a3bfebd9fbbd67a2 EBUILD plus42-1.1.10.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb -EBUILD plus42-1.1.3.ebuild 1019 BLAKE2B ccf4a99b5dffc61a9f27f9552acfbe4770ea190d4496a503356208f0bdfc31b67719b3af7aee75d070d543d3b77faa47a1c6d2044783ba9637a22a076858db76 SHA512 cb0fa04d06be909a7a907f521c613abe1871913554a18c5ba7b364e3f9bdc6886c6985b6ac2d15bcf7ddcd15d8c93719ee1784f518dd1fb0c49816a969517df5 -EBUILD plus42-1.1.9.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb +EBUILD plus42-1.1.11.ebuild 1016 BLAKE2B 32fa68d9374bd10884b0ed9a3d2d3a71cfda2f383656abd8a61923ba3e2bdd4faa99efe4d8bc7d1950392dbd9dcd73542c17e52fe4ad17f74d0ad770003adc5f SHA512 40b740dc3e4eef760b14d6a88248c814250349a86a5ff8b521959f1ee918fa7f576b1caaf2e67c588d07f4a24f91b03e54344ab3c9146aca865cc4d10c2e3acb MISC metadata.xml 353 BLAKE2B 62d2057ed40527ddee3b747c7d702009bba223521e3264af5905506515fc67a6baf27938ae03d664eeb713aaeac898b7a1eee0682b69f3659b4dbc6e7eddaef8 SHA512 9633917e4a226c142672cd8bb91d3ca5ec40a2b4600bc8ba60ea959dc871f54881dc331ca5ed0030a4afcbad426c7528667b61289e4ed77e19aa3e9d1c816ce2 diff --git a/app-emulation/plus42/plus42-1.1.9.ebuild b/app-emulation/plus42/plus42-1.1.11.ebuild index 3916a804001b..3916a804001b 100644 --- a/app-emulation/plus42/plus42-1.1.9.ebuild +++ b/app-emulation/plus42/plus42-1.1.11.ebuild diff --git a/app-emulation/plus42/plus42-1.1.3.ebuild b/app-emulation/plus42/plus42-1.1.3.ebuild deleted file mode 100644 index b779379a5982..000000000000 --- a/app-emulation/plus42/plus42-1.1.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_PV="${PN}-upstream-${PV}" - -DESCRIPTION="An Enhanced HP-42S Calculator Simulator" -HOMEPAGE="https://thomasokken.com/plus42/" -SRC_URI="https://thomasokken.com/plus42/upstream/${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+alsa" - -DEPEND="app-accessibility/at-spi2-core - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - alsa? ( media-libs/alsa-lib )" - -RDEPEND="${DEPEND}" - -DOCS=( CREDITS HISTORY README ) -S="${WORKDIR}/${MY_PV}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.9-fix-makefile.patch" - "${FILESDIR}/${PN}-1.0.12-fix-build-intel-lib.patch" -) - -src_prepare() { - default -} - -src_compile() { - local myconf - use alsa && myconf="AUDIO_ALSA=yes" - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk - emake -C gtk clean - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk -} - -src_install() { - default - dobin gtk/plus42bin gtk/plus42dec -} diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest index 78af15e66140..4ff41bc3330b 100644 --- a/app-emulation/qemu-guest-agent/Manifest +++ b/app-emulation/qemu-guest-agent/Manifest @@ -16,5 +16,5 @@ EBUILD qemu-guest-agent-7.1.0.ebuild 1762 BLAKE2B 0a87ea22d6d01dbbe283b95e1b6022 EBUILD qemu-guest-agent-8.0.0.ebuild 1692 BLAKE2B 532b0091aa62e1aa1001ca1b2711654926208e27c20b3a3d32c4a416c7f174fced871445e9314fa08011e30d9bf1630d8a32a659dc57d2633cbbc2811592a17f SHA512 0f466650cc3551c199f1d66cbf0b85e8ff5f59f3a59cdd4814f367e13c7bb67f21b5b4615b8f18dd8e9be7a958c8fe4b72814d3a05ecf3d91eb33ca6992badde EBUILD qemu-guest-agent-8.0.2.ebuild 1694 BLAKE2B f6d8b5dc02434de24cf7bb3ba4ed66db623f911202b6341528d92f4b37415965beaccac21b97d427e73c1bf91f1623a651b64bca3529251d218b9d55d9349f93 SHA512 c96dd712b1693c6db2e9602fedb4da9833c7e47abe79d25e8b7e9871c88de0f0a3d38db92238265038eeac0cb544aac2c81bf29ec4a3aa6c40a68039bdfb04cb EBUILD qemu-guest-agent-8.0.3.ebuild 1721 BLAKE2B 3404b4e71345caf4b6ef1737dabfc060a139bce7c65379476a154cc15d8a9c5d861ed8c7eee4702b8228de2dbad7ec528cbd406752ed5a990d405da44806fa78 SHA512 e07bf60e0d4d0370abbc1c7227759e46f99c0fc7dab6a7647f6ca3abbf483e76e2a965e7461701a94416d265d1f0b6e168b00ebeb1b9bba900b125f2e186f7c7 -EBUILD qemu-guest-agent-8.2.0.ebuild 1922 BLAKE2B 86ca3a2629ac426e2b8cda9da9e303df0ba27ad8a715fc87a013a3cdb8ab1ac64a8bebeab2a2d403160f7b73c87d3f6cea514820e8ddc068a1751408284d779b SHA512 4aaddf52c97968f4ade9dc3160c97094af0032ae0e2147f38720d3658dfa503d5cc93bdaae228d26924bc20b832d382e59c3632643f93b45d4aa82efe47d9f00 +EBUILD qemu-guest-agent-8.2.0.ebuild 2050 BLAKE2B 83c1d2be1d0210d84a378d011e00cf0a350304979f849d792b228e42451cf72f0a162ea84d3a11c788cacf1779a50708f5dada298e107319bdbd7469f0eb29eb SHA512 c350c1d5920f14d26e9489fb6b86a3cc56ad8b5a89965359908406cd724562ec4d91684110eb41510443e633a148e47c5713495e81644fc30c0777d9247fc752 MISC metadata.xml 588 BLAKE2B 32aa23e19bdc88885534d8b58c9ad1aeabbcb94b4deb064c8cb10c72bc57999a677c8cdf9dd0fd389bd64a9b1a5dc379a20235a191e58f67ea671b5a7b92a1a8 SHA512 aee2dc28a40e0a68196eb4cff9450e6bc940565ee37d4405690e943c63ca9c05b66dcd6af69dbbdd6274cd4ac1c1b833ff15af4f3071ed0a2cd07358ac985866 diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild index 7426f9441f2a..3002f6df679d 100644 --- a/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild +++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-8.2.0.ebuild @@ -52,6 +52,9 @@ src_configure() { --host-cc="$(tc-getBUILD_CC)" ) + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && myconf+=( --cross-prefix="${CHOST}-" ) + edo ./configure "${myconf[@]}" } diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 0a7b0fd38efa..98b50e680bb9 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -24,6 +24,7 @@ DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d DIST virtualbox-patches-7.1.0_pre20240419.tar.bz2 5316 BLAKE2B 1a890b7d19cb252c7801b68c299676e2cd7a209a57a03cb39025e1a969a1c73142eb96154dae8469405f93d61969154428ea0fe3950a00d8a0a69dc8aefb4fc9 SHA512 ce4f850ce87652ef4eab039332048333949c94f0627bec8eb00d9689d7f8edcce372e2185ef8bbda9aef97781a2008b7c6464468cc38f3454dee862efc0ecdc9 EBUILD virtualbox-6.1.50-r2.ebuild 18981 BLAKE2B 9265541084623c006ae3322a61bf31388bfc3d77f40550ec6383d93aa2759008003be18afa0ae6d240b542904d3c21ca9380cd4d54617ecbbb3a4f5b51099f07 SHA512 22dccdc3bcadf542181d3704174968a02240b67b2bf75206c455b2328f9eb907faf7a0bd7e2abde248dd491c88af46c2f0041ff93e4f9530aea63b4ba71e5797 EBUILD virtualbox-7.0.14-r2.ebuild 20784 BLAKE2B 371f4187b624e402d1de061c61e935abaab1901bd260449e57d0566e73e6578e23dfe3430ecff1906fe1e0f1a314c8990294a08cd6bb144bd330835cfb71e174 SHA512 237c0e6140d13a87ebcdeb32412d7da0885cc8d0814344cd7d194463c312214173ffc3c5b1064ac8076d6934c239bafc19f4fe4d9cf1dd073855c8b43298c706 +EBUILD virtualbox-7.0.18-r1.ebuild 20831 BLAKE2B e02e28f033aa9e199f8638871f4f57e9535a201f71c5406b06e540260fa5cd416a639d3ea3741cbf36f00eb643da66531449bf7747f867047a2c73d6e386c7e3 SHA512 92ae0a03b26092f8ace7d4dda0ed30301767e84e1bbe44840cfe75349946e6c3448b67cdd04dce2f466f1297d54c36ca854894bdb62b7d93ff57ef6ac62889b9 EBUILD virtualbox-7.0.18.ebuild 20836 BLAKE2B fc5a6c5796354b3eecf4e5a2f6e11f363b3cfd6753f5e73a885d78e39783eab2102358886fd08aac2aff2e1e79405a854e564251458703f6576efa2d4b00280e SHA512 dcdc6a069c3a0f88d1257d7606a8a9a3d7b009e413dbb2a45c9c0b98722d3ffa1ce7b34dcd1ee48f3993be86a123e243964235ef50e28bfdcbd427a469ec45b5 -EBUILD virtualbox-9999.ebuild 21624 BLAKE2B a6f313a7d558bff32016cd0d9c268a755e09fd58375b56eb93e524f672b07245398ee9655054e166b467da837c833bd28ed574b7ffba26219b9c8c1ca079900d SHA512 e0bace5e08b17f69cc077d27100aeea6409cbac648b8c80494333f4a24352fe9e046c3d8bb502d050899bfd9d3500a8464752e19e0bd1ed6ca46a5ba22de1445 -MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33 +EBUILD virtualbox-9999.ebuild 21626 BLAKE2B 001008613b2f24006cff0ddf9f5758d37d248541edb6a20c1d8942129987a82a3eafb4db19a2e7a32daae7b4de03d82b0a7a6b78b119f15201e64b783ea5531f SHA512 d42bed323f570e022f75c579e92fc220e8c5a344d9289d83a7b3f1a9a92cb8905935bd6e486e5bf29143fcdea13dc7b30adb74a5d4bf6759b193fea1523bfa4c +MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9 diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml index 0a281e0f998b..04d0c63679f3 100644 --- a/app-emulation/virtualbox/metadata.xml +++ b/app-emulation/virtualbox/metadata.xml @@ -6,13 +6,14 @@ <name>Viorel Munteanu</name> </maintainer> <use> - <flag name="dtrace">Install dtrace Extension Pack</flag> - <flag name="headless">Build without any graphic frontend</flag> + <flag name="dtrace">Install dtrace Extension Pack.</flag> + <flag name="headless">Build without any graphic frontend.</flag> <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag> <flag name="pax-kernel">Apply patch needed for pax enabled kernels.</flag> - <flag name="sdk">Enable building of SDK</flag> + <flag name="sdk">Enable building of SDK.</flag> <flag name="udev">Controls installation of special USB udev rules.</flag> - <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag> - <flag name="vde">Support for VDE networking via <pkg>net-misc/vde</pkg></flag> + <flag name="vboxwebsrv">Build and install the VirtualBox webservice.</flag> + <flag name="vde">Support for VDE networking via <pkg>net-misc/vde</pkg>.</flag> + <flag name="vmmraw">Enable 32-bit support on a 64-bit kernel.</flag> </use> </pkgmetadata> diff --git a/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild b/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild new file mode 100644 index 000000000000..625c260d0476 --- /dev/null +++ b/app-emulation/virtualbox/virtualbox-7.0.18-r1.ebuild @@ -0,0 +1,741 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# To add a new Python here: +# 1. Patch src/libs/xpcom18a4/python/Makefile.kmk (copy the previous impl's logic) +# Do NOT skip this part. It'll end up silently not-building the Python extension +# or otherwise misbehaving if you do. +# +# 2. Then update PYTHON_COMPAT & set PYTHON_SINGLE_TARGET for testing w/ USE=python. +# +# May need to look at other distros (e.g. Arch Linux) to find patches for newer +# Python versions as upstream tends to lag. Upstream may have patches on their +# trunk branch but not release branch. +# +# See bug #785835, bug #856121. +PYTHON_COMPAT=( python3_{10..11} ) + +inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \ + python-single-r1 tmpfiles toolchain-funcs udev xdg + +MY_PN="VirtualBox" +MY_P=${MY_PN}-${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/${PV}/${MY_P}.tar.bz2 + https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.16.tar.bz2 + gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${PV}.tar.xz ) ) +" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" +IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc" + +unset WATCOM #856769 + +COMMON_DEPEND=" + acct-group/vboxusers + ~app-emulation/virtualbox-modules-${PV} + dev-libs/libtpms + dev-libs/libxml2 + dev-libs/openssl:0= + media-libs/libpng:0= + media-libs/libvpx:0= + net-misc/curl + sys-libs/zlib + dbus? ( sys-apps/dbus ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + x11-libs/libX11 + x11-libs/libXt + opengl? ( dev-qt/qtopengl:5 ) + ) + lvm? ( sys-fs/lvm2 ) + opengl? ( + media-libs/libglvnd[X] + media-libs/vulkan-loader + x11-libs/libX11 + x11-libs/libXt + ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + sdl? ( + media-libs/libsdl2[X,video] + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXt + ) + vboxwebsrv? ( net-libs/gsoap[-gnutls(-),debug?] ) + vde? ( net-misc/vde ) + vnc? ( >=net-libs/libvncserver-0.9.9 ) +" +# We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport +# with USE="vboxwebsrv java". Note that we have to put things in DEPEND, +# not (only, anyway) BDEPEND, as the eclass magic to set the environment variables +# based on *DEPEND doesn't work for BDEPEND at least right now. +# +# There's a comment in Config.kmk about it +# ("With Java 11 wsimport was removed, usually part of a separate install now.") +# but it needs more investigation. +# +# See bug #878299 to track this issue. +DEPEND=" + ${COMMON_DEPEND} + >=dev-libs/libxslt-1.1.19 + virtual/libcrypt:= + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + gui? ( + x11-base/xorg-proto + x11-libs/libxcb:= + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrandr + ) + java? ( virtual/jdk:1.8 ) + opengl? ( + x11-base/xorg-proto + x11-libs/libXcursor + x11-libs/libXinerama + x11-libs/libXmu + x11-libs/libXrandr + virtual/glu + ) + sdl? ( x11-libs/libXinerama ) + pulseaudio? ( media-libs/libpulse ) + udev? ( >=virtual/udev-171 ) +" +RDEPEND=" + ${COMMON_DEPEND} + gui? ( x11-libs/libxcb:= ) + java? ( virtual/jre:1.8 ) +" +BDEPEND=" + ${PYTHON_DEPS} + >=app-arch/tar-1.34-r2 + >=dev-lang/yasm-0.6.2 + dev-libs/libIDL + dev-util/glslang + >=dev-build/kbuild-0.1.9998.3592 + sys-apps/which + sys-devel/bin86 + sys-libs/libcap + sys-power/iasl + virtual/pkgconfig + doc? ( + app-text/docbook-sgml-dtd:4.4 + app-text/docbook-xsl-ns-stylesheets + dev-texlive/texlive-basic + dev-texlive/texlive-latex + dev-texlive/texlive-latexrecommended + dev-texlive/texlive-latexextra + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-fontsextra + dev-qt/qthelp:5 + ) + gui? ( dev-qt/linguist-tools:5 ) + nls? ( dev-qt/linguist-tools:5 ) + java? ( virtual/jdk:1.8 ) +" + +QA_FLAGS_IGNORED=" + usr/lib64/virtualbox/VBoxDDR0.r0 + usr/lib64/virtualbox/VMMR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug +" + +QA_TEXTRELS=" + usr/lib64/virtualbox/VMMR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0 +" + +QA_EXECSTACK=" + usr/lib64/virtualbox/iPxeBaseBin + usr/lib64/virtualbox/VMMR0.r0 + usr/lib64/virtualbox/VBoxDDR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.debug +" + +QA_WX_LOAD=" + usr/lib64/virtualbox/iPxeBaseBin +" + +QA_PRESTRIPPED=" + usr/lib64/virtualbox/VMMR0.r0 + usr/lib64/virtualbox/VBoxDDR0.r0 + usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.amd64/VBoxDTraceR0.r0 +" + +REQUIRED_USE=" + java? ( sdk ) + python? ( sdk ${PYTHON_REQUIRED_USE} ) + vboxwebsrv? ( java ) +" + +PATCHES=( + # Downloaded patchset + "${WORKDIR}"/virtualbox-patches-7.0.16/patches +) + +pkg_pretend() { + if ! use gui; then + einfo "No USE=\"gui\" selected, this build will not include any Qt frontend." + fi + + if ! use opengl; then + einfo "No USE=\"opengl\" selected, this build will lack" + einfo "the OpenGL feature." + fi + if ! use nls && use gui; then + einfo "USE=\"gui\" also selects USE=\"nls\". This build" + einfo "will have NLS support." + fi + + # 749273 + local d=${ROOT} + for i in usr "$(get_libdir)"; do + d="${d}/$i" + if [[ "$(stat -L -c "%g %u" "${d}")" != "0 0" ]]; then + die "${d} should be owned by root, VirtualBox will not start otherwise" + fi + done +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Only add nopie patch when we're on hardened + if gcc-specs-pie; then + eapply "${FILESDIR}"/050_virtualbox-5.2.8-nopie.patch + fi + + # Remove shipped binaries (kBuild, yasm) and tools, see bug #232775 + rm -r kBuild/bin || die + # Remove everything in tools except kBuildUnits + find tools -mindepth 1 -maxdepth 1 -name kBuildUnits -prune -o -exec rm -r {} \+ || die + + # Disable things unused or split into separate ebuilds + sed -e "s@MY_LIBDIR@$(get_libdir)@" \ + "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + + if ! use pch; then + # bug #753323 + printf '\n%s\n' "VBOX_WITHOUT_PRECOMPILED_HEADERS=1" \ + >> LocalConfig.kmk || die + fi + + # bug #916002, #488176 + tc-ld-force-bfd + + # Respect LDFLAGS + sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ + -i Config.kmk src/libs/xpcom18a4/Config.kmk || die + + # Do not use hard-coded ld (related to bug #488176) + sed -e '/QUIET)ld /s@ld @$(LD) @' \ + -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die + + # Use PAM only when pam USE flag is enbaled (bug #376531) + if ! use pam; then + einfo "Disabling PAM removes the possibility to use the VRDP features." + sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die + sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ + src/VBox/HostServices/Makefile.kmk || die + echo -e "\nIPRT_WITHOUT_PAM=1" >> LocalConfig.kmk || die + fi + + # add correct java path + if use java; then + sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ + -i "${S}"/Config.kmk || die + java-pkg-opt-2_src_prepare + fi + + #856811 #864274 + # cannot filter out only one flag, some combinations of these flags produce buggy executables + for i in abm avx avx2 bmi bmi2 fma fma4 popcnt; do + append-cflags $(test-flags-CC -mno-$i) + append-cxxflags $(test-flags-CXX -mno-$i) + done + + # bug #908814 + filter-lto + + # bug #843437 + cat >> LocalConfig.kmk <<-EOF || die + CXXFLAGS=${CXXFLAGS} + CFLAGS=${CFLAGS} + EOF + + if use sdl; then + sed -i 's/sdl-config/sdl2-config/' configure || die + echo -e "\nVBOX_WITH_VBOXSDL=1" >> LocalConfig.kmk || die + fi + + #443830 + echo -e "\nVBOX_WITH_VBOX_IMG=1" >> LocalConfig.kmk || die + + if tc-is-clang; then + # clang assembler chokes on comments starting with / + sed -i -e '/^\//d' src/libs/xpcom18a4/nsprpub/pr/src/md/unix/os_Linux_x86_64.s || die + + # clang does not support this extension + eapply "${FILESDIR}"/${PN}-7.0.8-disable-rebuild-iPxeBiosBin.patch + fi + + # fix doc generation + echo -e "\nVBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-ns-stylesheets" >> LocalConfig.kmk || die + # replace xhtml names with numeric equivalents + find doc/manual -name \*.xml -exec sed -i \ + -e 's/ /\ /g' \ + -e 's/–/\–/g' \ + -e 's/←/\←/g' \ + -e 's/→/\→/g' \ + -e 's/↔/\↔/g' {} \+ || die + + # fix help path #891879 + echo -e "\nVBOX_PATH_PACKAGE_DOCS=/usr/share/doc/${PF}" >> LocalConfig.kmk || die + + # 489208 + # Cannot patch the whole text, many translations. Use sed instead to replace the command + find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \ + 's/'[^&]*\(vboxdrv setup\|vboxconfig\)'/\'emerge -1 virtualbox-modules\'/' {} \+ || die + sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \ + src/VBox/Frontends/VirtualBox/src/main.cpp \ + src/VBox/VMM/VMMR3/VM.cpp || die + + # 890561 + echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die + + if ! use nls && ! use gui; then + cat >> LocalConfig.kmk <<-EOF || die + VBOX_WITH_NLS := + VBOX_WITH_MAIN_NLS := + VBOX_WITH_PUEL_NLS := + VBOX_WITH_VBOXMANAGE_NLS := + EOF + fi +} + +src_configure() { + tc-export AR CC CXX LD RANLIB + export HOST_CC="$(tc-getBUILD_CC)" + + local myconf=( + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + + --disable-kmods + + $(usev !alsa --disable-alsa) + $(usev !dbus --disable-dbus) + $(usev debug --build-debug) + $(usev !doc --disable-docs) + $(usev !java --disable-java) + $(usev !lvm --disable-devmapper) + $(usev !pulseaudio --disable-pulse) + $(usev !python --disable-python) + $(usev vboxwebsrv --enable-webservice) + $(usev vde --enable-vde) + $(usev !vmmraw --disable-vmmraw) + $(usev vnc --enable-vnc) + ) + + if use gui || use sdl || use opengl; then + myconf+=( + $(usev !opengl --disable-opengl) + $(usev !gui --disable-qt) + $(usev !sdl --disable-sdl) + ) + else + myconf+=( + --build-headless + ) + fi + + if use amd64 && ! has_multilib_profile; then + myconf+=( --disable-vmmraw ) + fi + + # not an autoconf script + edo ./configure "${myconf[@]}" + + # Force usage of chosen Python implementation + # bug #856121, bug #785835 + sed -i \ + -e '/VBOX_WITH_PYTHON.*=/d' \ + -e '/VBOX_PATH_PYTHON_INC.*=/d' \ + -e '/VBOX_LIB_PYTHON.*=/d' \ + AutoConfig.kmk || die + + if use python; then + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON=$(usev python 1) + VBOX_PATH_PYTHON_INC=$(python_get_includedir) + VBOX_LIB_PYTHON=$(python_get_library_path) + EOF + + local mangled_python="${EPYTHON#python}" + mangled_python="${mangled_python/.}" + + # Stub out the script which defines what the Makefile ends up + # building for. gen_python_deps.py gets called by the Makefile + # with some args and it spits out a bunch of paths for a hardcoded + # list of Pythons. We just override it with what we're actually using. + # This minimises the amount of patching we have to do for new Pythons. + cat > src/libs/xpcom18a4/python/gen_python_deps.py <<-EOF || die + print("VBOX_PYTHON${mangled_python}_INC=$(python_get_includedir)") + print("VBOX_PYTHON${mangled_python}_LIB=$(python_get_library_path)") + print("VBOX_PYTHONDEF_INC=$(python_get_includedir)") + print("VBOX_PYTHONDEF_LIB=$(python_get_library_path)") + EOF + + chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die + else + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON:= + EOF + fi +} + +src_compile() { + source ./env.sh || die + + # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) + MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) + MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" + + local myemakeargs=( + VBOX_BUILD_PUBLISHER=_Gentoo + VBOX_WITH_VBOXIMGMOUNT=1 + + KBUILD_VERBOSE=2 + + AS="$(tc-getCC)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + + TOOL_GCC3_CC="$(tc-getCC)" + TOOL_GCC3_LD="$(tc-getCC)" + TOOL_GCC3_AS="$(tc-getCC)" + TOOL_GCC3_AR="$(tc-getAR)" + TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" + + TOOL_GXX3_CC="$(tc-getCC)" + TOOL_GXX3_CXX="$(tc-getCXX)" + TOOL_GXX3_LD="$(tc-getCXX)" + TOOL_GXX3_AS="$(tc-getCXX)" + TOOL_GXX3_AR="$(tc-getAR)" + TOOL_GXX3_OBJCOPY="$(tc-getOBJCOPY)" + + TOOL_GCC3_CFLAGS="${CFLAGS}" + TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" + VBOX_GCC_OPT="${CXXFLAGS}" + VBOX_NM="$(tc-getNM)" + + TOOL_YASM_AS=yasm + ) + + if use amd64 && has_multilib_profile; then + myemakeargs+=( + CC32="$(tc-getCC) -m32" + CXX32="$(tc-getCXX) -m32" + + TOOL_GCC32_CC="$(tc-getCC) -m32" + TOOL_GCC32_CXX="$(tc-getCXX) -m32" + TOOL_GCC32_LD="$(tc-getCC) -m32" + TOOL_GCC32_AS="$(tc-getCC) -m32" + TOOL_GCC32_AR="$(tc-getAR)" + TOOL_GCC32_OBJCOPY="$(tc-getOBJCOPY)" + + TOOL_GXX32_CC="$(tc-getCC) -m32" + TOOL_GXX32_CXX="$(tc-getCXX) -m32" + TOOL_GXX32_LD="$(tc-getCXX) -m32" + TOOL_GXX32_AS="$(tc-getCXX) -m32" + TOOL_GXX32_AR="$(tc-getAR)" + TOOL_GXX32_OBJCOPY="$(tc-getOBJCOPY)" + ) + fi + + MAKE="kmk" emake "${myemakeargs[@]}" all +} + +src_install() { + cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die + + 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 binary given!" + [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." + + insinto ${path} + doins ${binary} + fowners root:vboxusers ${path}/${binary} + fperms ${perms} ${path}/${binary} + } + + # Create configuration files + insinto /etc/vbox + newins "${FILESDIR}/${PN}-4-config" vbox.cfg + + # Set the correct libdir + sed \ + -e "s@MY_LIBDIR@$(get_libdir)@" \ + -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" + + # Install the wrapper script + exeinto ${vbox_inst_path} + newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" + fowners root:vboxusers ${vbox_inst_path}/VBox + fperms 0750 ${vbox_inst_path}/VBox + + # Install binaries and libraries + insinto ${vbox_inst_path} + doins -r components + + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \ + vboximg-mount vbox-img *so *r0; do + vbox_inst ${each} + done + + # These binaries need to be suid root. + for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do + vbox_inst ${each} 4750 + done + + # Install EFI Firmware files (bug #320757) + for each in VBoxEFI{32,64}.fd ; do + vbox_inst ${each} 0644 + done + + # 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} + done + + # Symlink binaries to the shipped wrapper + 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}/vboximg-mount /usr/bin/vboximg-mount + dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img + + if use pam; then + # VRDPAuth only works with this (bug #351949) + dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so + fi + + # set an env-variable for 3rd party tools + echo "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" + # environment variables used during SDK binding installation + echo "VBOX_SDK_PATH=${vbox_inst_path}/sdk" >> "${T}/90virtualbox" + echo "VBOX_INSTALL_PATH=${vbox_inst_path}" >> "${T}/90virtualbox" + doenvd "${T}/90virtualbox" + + if use sdl; then + vbox_inst VBoxSDL 4750 + pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL + + for each in vboxsdl VBoxSDL ; do + dosym ${vbox_inst_path}/VBox /usr/bin/${each} + done + fi + + if use gui; then + 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 + fi + + for each in virtualbox{,vm} VirtualBox{,VM} ; do + dosym ${vbox_inst_path}/VBox /usr/bin/${each} + done + + insinto /usr/share/${PN} + doins -r nls + doins -r UnattendedTemplates + + domenu ${PN}.desktop + + pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die + for size in 16 32 48 64 128 ; do + newicon -s ${size} ${PN}-${size}px.png ${PN}.png + done + newicon ${PN}-48px.png ${PN}.png + doicon -s scalable ${PN}.svg + popd &>/dev/null || die + pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die + for size in 16 24 32 48 64 72 96 128 256 512 ; do + for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do + icofile="${PN}-${ico}-${size}px.png" + if [[ -f "${icofile}" ]]; then + newicon -s ${size} ${icofile} ${PN}-${ico}.png + fi + done + done + popd &>/dev/null || die + fi + + if use lvm; then + vbox_inst VBoxVolInfo 4750 + dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo + fi + + if use sdk; then + insinto ${vbox_inst_path} + 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" + fi + fi + + if use udev; then + local udevdir="$(get_udevdir)" + local udev_file="VBoxCreateUSBNode.sh" + local rules_file="10-virtualbox.rules" + + insinto ${udevdir} + doins ${udev_file} + fowners root:vboxusers ${udevdir}/${udev_file} + fperms 0750 ${udevdir}/${udev_file} + + insinto ${udevdir}/rules.d + sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/${rules_file} \ + > "${T}"/${rules_file} || die + doins "${T}"/${rules_file} + fi + + if use vboxwebsrv; then + vbox_inst vboxwebsrv + dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv + newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv + newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv + fi + + # Remove dead symlinks (bug #715338) + find "${ED}"/usr/$(get_libdir)/${PN} -xtype l -delete || die + + # Fix version string in extensions or else they don't get accepted + # by the virtualbox host process (see bug #438930) + find ExtensionPacks -type f -name "ExtPack.xml" -exec sed -i '/Version/s@_Gentoo@@' {} \+ || die + + local extensions_dir="${vbox_inst_path}/ExtensionPacks" + + if use vnc; then + insinto ${extensions_dir} + doins -r ExtensionPacks/VNC + fi + + if use dtrace; then + insinto ${extensions_dir} + doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack + fi + + if use doc; then + dodoc UserManual.pdf UserManual.q{ch,hc} + docompress -x /usr/share/doc/${PF} + elif use gui; then + dodoc "${WORKDIR}"/${PN}-help-${PV}/UserManual.q{ch,hc} + docompress -x /usr/share/doc/${PF} + fi + + if use python; then + local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython3.so" + if [[ ! -x "${python_path_ext}" ]]; then + eerror "Couldn't find ${python_path_ext}! Bindings were requested with USE=python" + eerror "but none were installed. This may happen if support for a Python target" + eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles." + die "Incomplete installation of Python bindings! File a bug with Gentoo!" + fi + + # 378871 + local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer" + pushd "${installer_dir}" &> /dev/null || die + sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \ + -e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \ + -i vboxapi/__init__.py || die + # insert shebang, the files come without one + find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die + python_domodule vboxapi + popd &> /dev/null || die + sed -e "1 i\#! ${PYTHON}" -i vboxshell.py || die + python_doscript vboxshell.py + + # do not install the installer + rm -r "${installer_dir}" || die + fi + + newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf +} + +pkg_postinst() { + xdg_pkg_postinst + + if use udev; then + udev_reload + udevadm trigger --subsystem-match=usb + fi + + tmpfiles_process virtualbox-vboxusb.conf + + if use gui; then + elog "To launch VirtualBox just type: \"virtualbox\"." + fi + + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The latest user manual is available for download at:" + elog "https://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" + elog "" + + optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities + optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle + optfeature "Guest additions ISO" app-emulation/virtualbox-additions + + if ! use udev; then + ewarn "Without USE=udev, USB devices will likely not work in ${PN}." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + + use udev && udev_reload +} diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild index 7c503c7ea1c8..4877f03e927f 100644 --- a/app-emulation/virtualbox/virtualbox-9999.ebuild +++ b/app-emulation/virtualbox/virtualbox-9999.ebuild @@ -44,12 +44,11 @@ S="${WORKDIR}/trunk" LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" -IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc" +IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde +vmmraw vnc" unset WATCOM #856769 COMMON_DEPEND=" - ${PYTHON_DEPS} acct-group/vboxusers app-arch/xz-utils dev-libs/libtpms @@ -75,6 +74,7 @@ COMMON_DEPEND=" x11-libs/libXt ) pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) sdl? ( media-libs/libsdl2[X,video] x11-libs/libX11 @@ -191,9 +191,8 @@ QA_PRESTRIPPED=" REQUIRED_USE=" java? ( sdk ) - python? ( sdk ) + python? ( sdk ${PYTHON_REQUIRED_USE} ) vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} " PATCHES=( @@ -214,10 +213,6 @@ pkg_pretend() { einfo "No USE=\"opengl\" selected, this build will lack" einfo "the OpenGL feature." fi - if ! use python; then - einfo "You have disabled the \"python\" USE flag. This will only" - einfo "disable the python bindings being installed." - fi if ! use nls && use gui; then einfo "USE=\"gui\" also selects USE=\"nls\". This build" einfo "will have NLS support." @@ -235,7 +230,7 @@ pkg_pretend() { pkg_setup() { java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup + use python && python-single-r1_pkg_setup linux-mod-r1_pkg_setup } @@ -267,6 +262,9 @@ src_prepare() { >> LocalConfig.kmk || die fi + # bug #916002, #488176 + tc-ld-force-bfd + # Respect LDFLAGS sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die @@ -358,8 +356,6 @@ src_prepare() { } src_configure() { - tc-ld-disable-gold # bug #488176 - tc-export AR CC CXX LD RANLIB export HOST_CC="$(tc-getBUILD_CC)" @@ -379,6 +375,7 @@ src_configure() { $(usev !python --disable-python) $(usev vboxwebsrv --enable-webservice) $(usev vde --enable-vde) + $(usev !vmmraw --disable-vmmraw) $(usev vnc --enable-vnc) ) @@ -409,13 +406,13 @@ src_configure() { -e '/VBOX_LIB_PYTHON.*=/d' \ AutoConfig.kmk || die - cat >> AutoConfig.kmk <<-EOF || die - VBOX_WITH_PYTHON=$(usev python 1) - VBOX_PATH_PYTHON_INC=$(python_get_includedir) - VBOX_LIB_PYTHON=$(python_get_library_path) - EOF - if use python; then + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON=$(usev python 1) + VBOX_PATH_PYTHON_INC=$(python_get_includedir) + VBOX_LIB_PYTHON=$(python_get_library_path) + EOF + local mangled_python="${EPYTHON#python}" mangled_python="${mangled_python/.}" @@ -432,6 +429,10 @@ src_configure() { EOF chmod +x src/libs/xpcom18a4/python/gen_python_deps.py || die + else + cat >> AutoConfig.kmk <<-EOF || die + VBOX_WITH_PYTHON:= + EOF fi } |