diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 15:27:23 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-15 15:27:23 +0100 |
commit | 4214d835b45f0047c644e43c7fa70f1bbdb2e8b3 (patch) | |
tree | 6c4b141c9c1dbed5037a41825d113dccffa410b6 /app-emulation | |
parent | 4f064d2f2d61a575a6e418623bd2dc3c8599ad13 (diff) |
gentoo auto-resync : 15:08:2023 - 15:27:23
Diffstat (limited to 'app-emulation')
30 files changed, 10 insertions, 3236 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 60b87814897c..cbffde7a3609 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index 6284eca0fbf5..4fc0a089b6de 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,9 +1,5 @@ -DIST VBoxGuestAdditions_6.1.44.iso 63952896 BLAKE2B afbcf9e3d648b4314cdee8ef008a4e0ca34d071bf4aa819f157c4414072ef341c1996b67a497b31b903c9e9f984a7800f1cd8caf7d1ccf54cddbadb499fc2a6e SHA512 19bc732f47883867ff3822eacf8d7cf88fa17e994b7b2d8d8081068be464d27402e2ca6ee0f1584d7fe9b2e8aa02c654827f353cb8ad1bb339d885b08367090e DIST VBoxGuestAdditions_6.1.46.iso 64032768 BLAKE2B cc0181861802822e3887cd821edc687db081993e01e24ac0139ffd29b76aaabf3be20c9394e0ee02748359a7127ed5522418c2c5523ba77c3a8c483aad596c00 SHA512 e31e9cad72132d0f683b8135b5e91bcd42e6cb532fc9e0e9a463347c29053799f51b9d0730a9de4096557010c6ca341715e72515811b87d0df41343510cad55e DIST VBoxGuestAdditions_7.0.10.iso 53497856 BLAKE2B 8577cd44c4564f205e65d955f3cca33084215c4e2b777d944cb14240a47b6a6196cd9e40acbfbec9e915bda55f676627c1819ca2c881f8d0945c334df4e1d242 SHA512 5148823cc3bfd5145bff4ecfb6e0f3f068e0e3a9f1021161122b89dd01197e64345a73efdda6259134a35cbb0b6cd8361f235c2c996ef6a4dbf03d452b3ae9db -DIST VBoxGuestAdditions_7.0.8.iso 53485568 BLAKE2B 6aed8e745d2c17899decdf40e7c5c5115be89f394bc59d824e3503c795ef935cae541c7f5959cb1c116dabc30fe7db3deb3acf47345159da5327f29d2ab00396 SHA512 6333f14da57e9d460b8866d58ab4adaefc8b673859ab2e62ededdcba2d14f46723d64d90c8f0bde3c321adfe887249ef043d137b25f9fc0bc5b663770ddf2205 -EBUILD virtualbox-additions-6.1.44.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4 EBUILD virtualbox-additions-6.1.46.ebuild 567 BLAKE2B dc91227571c02c0556289d93bf3d862c6a06493cbeb92938c56f1ba5b47541f99726aa626b383c23d477d915c2d99e01b8014c3d0f807b22929aad8116886dfe SHA512 950099b0c5918477d47e74deeb4c1501e2f110b3cbbd9c132b71e1ea792bd59197d0d23f1dc0d93b87d98998210f77fcefeab620136e17fcfe2d8dd545acb0b4 -EBUILD virtualbox-additions-7.0.10.ebuild 556 BLAKE2B 3369e6ed0e925e9826072a8cbfd67a39406f8276c6d4f88a1fe0cdd5a2221a99e60e703224ebc15be632096f8cc44bc208224371dcf321ebf07a0086ef2194fe SHA512 b9705f2ae8963aa0576b477d6405be5ced09b23d63f3e29f05e5eb56f1cf2b281d74a66a1e4ece0973102d85e47b8ebc71b4b8d5771f6ce33c22a4a8568b489a -EBUILD virtualbox-additions-7.0.8.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e +EBUILD virtualbox-additions-7.0.10.ebuild 555 BLAKE2B 2825d0a87644c02f55a5b0cc1cf70850309ae5e0db3f94dad42f8157a170abb09242bb7336c1a0ec600387141903c4d9fb7fc61c54bddca459931d6c8a9a9dac SHA512 a1c8d1d38d6e27b78019456acdaf3fe47c6863eb03391c1c1670015637d40320d24bc90f9f4d865e7d989a47e6d9b72d9150f716afe4bd2c8ad4c220f174fd3e MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.44.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.44.ebuild deleted file mode 100644 index b2792ebc0e51..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.44.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=VBoxGuestAdditions -MY_P=${MY_PN}_${PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso" -S="${WORKDIR}" - -LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.10.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.10.ebuild index 65d20c161bc1..eef28dee0709 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.10.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.10.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}" LICENSE="GPL-3 || ( GPL-3 CDDL )" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" +KEYWORDS="amd64" src_unpack() { return 0 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-7.0.8.ebuild deleted file mode 100644 index eef28dee0709..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-7.0.8.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=VBoxGuestAdditions -MY_P=${MY_PN}_${PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso" -S="${WORKDIR}" - -LICENSE="GPL-3 || ( GPL-3 CDDL )" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index 7691454703b4..7b81e24e2872 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1,9 +1,5 @@ -DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.44.tar.gz 11233400 BLAKE2B 8e0046204956a86194f36a7e790956f1da8362f0c97e5c8c5f1c8965475255a42e1459a49004ebe0137124b23f7605200ef6a481169b684f7433803599982f35 SHA512 12b3cea7f3c54cf9f755bcc191d093ee2fd6a843626a2a5f8deb17bd0c1595492e16164bd5044795b9cc3ef6469d017ab575ca82269d76c7f5e47793313a0c3e DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.46.tar.gz 11175297 BLAKE2B 00c99036cb34579da811f0a2e3e46ac49b5588af3d8effa44132c496375c87c0778dc6650591a7e1bb11d3b3a459f775de94a8a06ae2bd42ce08385250db00d9 SHA512 9efdb746e5ef63872cde3adafb9e5c45c65183f59b7b2c2d3424588909c85ce3574e65c5bf1a2e0471028051e29ec010b4ed1968fcf4637d81d8f8d6547a24c7 DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.10.tar.gz 18259331 BLAKE2B 0afcd918243cd52e90278df63a8bb7aa1415a3662ad8bc2d49c19dd9a1cfe3ab9f810d8d66b4be2c1742361e000c547f9cdd88ad215b764a80991e0b7ea44c50 SHA512 fd5dc7577467d54d170c325be27dbb67eee16860e0b876bca1afa023c33a45c356cb77303b0c26fa7ca2057908b9acd7ebc41dbc68a0a9bc3253a797cc9ccb55 -DIST Oracle_VM_VirtualBox_Extension_Pack-7.0.8.tar.gz 18678513 BLAKE2B b29edba975a71acbe2602221c7cc3ee349e4b530589568a879223edfa25137b7cb1e821b0273e1f622065d035b1832ce211df44d0832815482a3638e68475d8c SHA512 a128ebb9e318a7bfb0ff54902bc4e93cbdfbe4469921db30e45631ffc5c35c5f489a88efa1c1eb9fcc44abcbfc46bd0746b2f4a0c61f344a49b34890834d6e31 -EBUILD virtualbox-extpack-oracle-6.1.44.ebuild 742 BLAKE2B fa5331bfc4b311de2623b66c5379e1760a90f1b584bf42c8f53eaa7c7b46f51b2156ea4983e032eb70128ceba675f786410a5245157fc61402cb2b64f0948da6 SHA512 e6c936f477c19c6589844df4cb26a193d6b431ffcbc05379ab3b327f5f6a0096b5d48795fa34a675a2fea0929c40d2c7a4742717993fd5d9ab722b56def21266 EBUILD virtualbox-extpack-oracle-6.1.46.ebuild 742 BLAKE2B fa5331bfc4b311de2623b66c5379e1760a90f1b584bf42c8f53eaa7c7b46f51b2156ea4983e032eb70128ceba675f786410a5245157fc61402cb2b64f0948da6 SHA512 e6c936f477c19c6589844df4cb26a193d6b431ffcbc05379ab3b327f5f6a0096b5d48795fa34a675a2fea0929c40d2c7a4742717993fd5d9ab722b56def21266 -EBUILD virtualbox-extpack-oracle-7.0.10.ebuild 743 BLAKE2B e69ef2bac32a14cb5deae43c7a3888bbb984567c8ba7172c81cbd6ddd641f6064128f2a0bebd827e5f9cbd46d264a6d9d39413e6a03459cbe9654e3c8daa2823 SHA512 763bff27532b48cb1509d50e74f108dd1fc02719d065fa2f08b919c328be39e249c4ecf15673215ae251073a691d00752b6a9baf1c290d81138bbd4e1e47e26c -EBUILD virtualbox-extpack-oracle-7.0.8.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345 +EBUILD virtualbox-extpack-oracle-7.0.10.ebuild 742 BLAKE2B 9d21636185a31f656ec1ea779b7e5ebf475c39256b94541af1d8d32ecf0b33fc703d461054957441bb9b2e22a403a90fc7555acb06e06a798d4047da66d12ccc SHA512 75928ea546071159bddd68cd585d5821d8ceb179db21b5722cc68b7323181e600825117409e051399b86c2d1b7f471c7246dbbda74dbbc84aef351cf48fa1345 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.44.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.44.ebuild deleted file mode 100644 index 103374f36aab..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.44.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="$(ver_cut 1-3)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" -S="${WORKDIR}" - -LICENSE="PUEL-11" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" -RESTRICT="bindist mirror strip" - -RDEPEND=">=app-emulation/virtualbox-${MY_PV}" - -QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.10.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.10.ebuild index 18a227280590..d7b777f8a797 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.10.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.10.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}" LICENSE="PUEL-11" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" +KEYWORDS="amd64" RESTRICT="bindist mirror strip" RDEPEND="=app-emulation/virtualbox-${MY_PV}*" diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild deleted file mode 100644 index d7b777f8a797..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="$(ver_cut 1-3)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" -S="${WORKDIR}" - -LICENSE="PUEL-11" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" -RESTRICT="bindist mirror strip" - -RDEPEND="=app-emulation/virtualbox-${MY_PV}*" - -QA_PREBUILT="usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 827e94638bcb..217fc8f620ee 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -2,22 +2,13 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947 AUX vboxguest-6.1.36-log-use-c99.patch 288 BLAKE2B 7a869ea9c46d91b64e6f062173bce10db25581b2390dad517016eb35cdae0727579e374318afdf749c3118436c667dacaf670f93698894b972b3badc60a80a43 SHA512 c66d75e77d84f081095de91248f236606b5e0bcc50a5525918fce979c97d84dddf6d10fc2a21832db74b5ef632949d9dee8ec30b4f1ab05bcec1aa75da681971 AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40 AUX virtualbox-guest-additions-7.0.8-fix-gcc13.patch 753 BLAKE2B 2c42f0d370d5be3c02278389a103dec8d7ee3515b61147aaccb4b47285329fa0b87edea392031c856b14c2527544c1ddccd1a3a23522d10fb60f40f4dbdac941 SHA512 76766339012cc60a5c360caf17d92547718d67c670a498085f30b99be7541b69ed3f9acc6e7916dfb131facc4343fdd0db27b981755250189c16df215a6aee15 -AUX virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch 849 BLAKE2B 82985553b39c7ebc91fc9e807d3193b97ab37d788ba5466e3abb47956f8d2f62d6c264d88442d6fc429de4c453eb88d8aef1c4209ad6093c92904e135892d59a SHA512 17f7f808ea6ff9ed8261d3c16517b273ea571a57ee98c44d63ceb65f8d546026a30648469b47b6cfbbb984d403bc368043955e0cfb81810d89990e600e1dbe15 -AUX virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch 1263 BLAKE2B 66e9c45d96732c28446056f0a46af47558eece39036be7e82c22010381fd6db9c7d6a8dec715d9009ee27c054b0ebb21dff98e3d07a2484966c350164de315ab SHA512 1003be144da3444e19a139dba05723d7bd61f51e81e274df56cdd00785c2e5a866ccd040706b400d5752760f5bfee6d84db652056a8f372fdce64f14452d8870 -AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944 AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 -DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d81119cedc7f4df1822b71ca10b85d44d5cd1dacd999e7867a0bef8579ea715ef732b990cef63f3325fff0c139abe394d88ad7 SHA512 49c3baa1a40dcafcc6b31d0abcfecfcb24305de44e5efd3f68ba4443574e21b8cc34d7288e0fbc56730bc3be2bee07089b7dfed14848a88dc38a1433b6dda8af DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd -DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf -EBUILD virtualbox-guest-additions-6.1.44-r1.ebuild 7661 BLAKE2B 05b21743b164d482c78baeb66642afe6ebb07d33a1f1e5bc50a994235ebe3595cf59c9ba8eab23ec0bc79f5f5e9f08a0998016c31d7e51bd84c59df470f79005 SHA512 037f3f3408c7a2e89405b0abb8e3a1e94563c7ef49a08ab8c00b5e7024650ceb37e8689a6f1072fd0862d3f54f4631ba9e1d0dc1fe05915d476c2bd9561a1f0e -EBUILD virtualbox-guest-additions-6.1.44.ebuild 8052 BLAKE2B c9016e7cf9d7203d42a6f4f04fb8ae0e148ee1897168af717f540621e9e773a3154193847bf40b9681f7857499ace96a28ead243d81ee2e151dda43ddd2c910e SHA512 aef00dc9471868ebaddb213f3376388ded2c703018fa28aa8ab8a1a06ce8339c4b0580b4a0fa7392016a2aba6ce4d9630a3d249e790b1764bd62c4e6e04ea884 EBUILD virtualbox-guest-additions-6.1.46.ebuild 7513 BLAKE2B 03710cc1587aef146cecde50915f7181e7251956605c5f84e069265c9918a583a8ac3d12af5ca9ce88f7e025a55327dddd779c8f8fb94dc12097d45db96ae5a1 SHA512 7ffb5b6e835519b566612a040301b1aae87d5542c65d6c5ff6b6d647fe85c585ba3e24c380dba9f26dbbf06404c182bdbb332e77adf78f6084f7ce7219812268 -EBUILD virtualbox-guest-additions-7.0.10.ebuild 7838 BLAKE2B c62c645855f9b1bb1276bc2c2ae376ae6c59df37e85c8265a64ac7a4c299752984d4201e1ba2ea102f5e4ab15d539b1cff123e8a36ee258690ce09b76f93b01f SHA512 e65858b6aca557f60bc4abc7e0d47a0d70b07eacdeb23d5720c882dd9bddde1cc335f84f62d2208dc1263c43f5c823d9e17bcd48568651dff4e5967866f4fc85 -EBUILD virtualbox-guest-additions-7.0.8-r1.ebuild 8561 BLAKE2B db90a5d48e39708d9e0ace1cd1d71140b1c57bef9d7512d6848404ee5c86d8af3ef004d3bd4617a9a2c43d5fcb994c19d2c48d1f68d2bba5cc0f83ca89d68b96 SHA512 57f48b19df665d1c1a36eff32d7a10dbdbcb76c0eeca710df6341e2b7851cf1f96ded9ca70ebb16d711b9b051e08b0df1ce59ec5485ddc51660b766e2d64b9d6 -EBUILD virtualbox-guest-additions-7.0.8-r2.ebuild 7986 BLAKE2B d4fc6a09aa6d28193555d626a21bd8d20dc1bbb4f80c407cb00c15cc38740ae96fd20df2439a509dc3894121e9da441f0ab089e60a82d3b6e5e7c2229dc57ebf SHA512 6708624d1098bf23d69f34360bf8379999223a031a42788f2150a7442f54afef4ac2844a101237815ca83bb3c7b2916913bca37fa782c35652254f69d17e0619 +EBUILD virtualbox-guest-additions-7.0.10.ebuild 7837 BLAKE2B 8635995d24c5257a9e635c90ff33204a5d12e1ed57bf48b31e41bdbf87c5b06be31907188fe08a73d92462d94b380aa26ed45ea4d7fc03c19adb9ce1eafc1d84 SHA512 a8555e77239e78d8480be113826ad0ba60ad343dbf14b967d8c606924b6d3b07424e02d7235556b9f4234c53ae711a32d49dde354a7bb67957b082bac556427c MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch deleted file mode 100644 index c13d57ee4503..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch +++ /dev/null @@ -1,25 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99666/vbox - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -75,4 +75,11 @@ - #if RTLNX_VER_MAX(2,5,12) - # define PageUptodate(a_pPage) Page_Uptodate(a_pPage) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBOX_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBOX_ITER_IOV(_iter) iter->iov - #endif - -@@ -2400,5 +2407,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = iter->iov; -+ const struct iovec *pCurIov = VBOX_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch deleted file mode 100644 index b390c2f5e48a..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch +++ /dev/null @@ -1,38 +0,0 @@ -Initial support for kernel 6.4 -https://www.virtualbox.org/changeset/99667/vbox - ---- a/src/VBox/Additions/linux/sharedfolders/regops.c -+++ b/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -77,11 +77,4 @@ - #endif - --/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field. */ --#if RTLNX_VER_MIN(6,4,0) --# define VBOX_ITER_IOV(_iter) iter_iov(_iter) --#else --# define VBOX_ITER_IOV(_iter) iter->iov --#endif -- - - /********************************************************************************************************************************* -@@ -94,4 +87,12 @@ - #else - # define VBSF_GET_ITER_TYPE(a_pIter) ((a_pIter)->type) -+#endif -+ -+/** Starting from 6.4.0, iter_iov() macro should be used in order to access to iov field -+ * of struct iov_iter. */ -+#if RTLNX_VER_MIN(6,4,0) -+# define VBSF_GET_ITER_IOV(_iter) iter_iov(_iter) -+#else -+# define VBSF_GET_ITER_IOV(_iter) iter->iov - #endif - -@@ -2407,5 +2408,5 @@ - if (iter_is_iovec(iter) || (VBSF_GET_ITER_TYPE(iter) & ITER_KVEC)) { - # endif -- const struct iovec *pCurIov = VBOX_ITER_IOV(iter); -+ const struct iovec *pCurIov = VBSF_GET_ITER_IOV(iter); - size_t cLeft = iter->nr_segs; - size_t cPagesSpan = 0; - diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd deleted file mode 100644 index 3af22dbfa49e..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pidfile="/var/run/vboxguest-service.pid" -command="/usr/sbin/vboxguest-service" -command_args="--foreground" -command_background="true" - -depend() { - need dbus localmount - before xdm -} - -start_pre() { - einfo "Loading kernel modules" - /sbin/modprobe vboxguest 2>&1 - /sbin/modprobe vboxsf 2>&1 -} - -stop_post() { - einfo "Removing kernel modules" - /sbin/modprobe -r vboxsf 2>&1 - /sbin/modprobe -r vboxguest 2>&1 -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild deleted file mode 100644 index a40865cf1fec..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44-r1.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo linux-mod-r1 systemd toolchain-funcs udev - -MY_PN="VirtualBox" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -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-6.1.36.tar.bz2" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="X +dbus" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - sys-libs/pam - sys-libs/zlib - dbus? ( sys-apps/dbus ) - X? ( - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) -" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - ) -" -BDEPEND=" - >=dev-util/kbuild-0.1.9998.3127 - <=dev-util/kbuild-0.1.9998.3500 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-power/iasl -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" - -PATCHES=( - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch -) - -DOCS=() # Don't install the default README file during einstalldocs - -VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" -CONFIG_CHECK="DRM_TTM" - -src_prepare() { - eapply "${PATCHES[@]}" - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null - eend $? || die - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - # Respect LDFLAGS (bug #759100) - sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk - - eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches" - eapply_user -} - -src_configure() { - tc-export AR CC CXX LD RANLIB - - # Build the user-space tools, warnings are harmless - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - $(usev !dbus --disable-dbus) - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - - # bug #843437 - # Respect LDFLAGS (bug #759100) - # Cannot use LDFLAGS here because they also get passed to $(LD) - cat >> LocalConfig.kmk <<-EOF || die - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - CCLDFLAGS=${LDFLAGS} - EOF - - edo ./configure "${myconf[@]}" -} - -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_ONLY_ADDITIONS=1 - - KBUILD_VERBOSE=2 - - AS="$(tc-getCC)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LD="$(tc-getCC)" - - TOOL_GCC3_CC="$(tc-getCC)" - TOOL_GCC3_CXX="$(tc-getCXX)" - TOOL_GCC3_LD="$(tc-getCC)" - TOOL_GCC3_AS="$(tc-getCC)" - TOOL_GCC3_AR="$(tc-getAR)" - TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" - - 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_GXX3_LD_SYSMOD="$(tc-getCXX)" - - TOOL_GCC3_CFLAGS="${CFLAGS}" - TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" - VBOX_GCC_OPT="${CXXFLAGS}" - VBOX_NM="$(tc-getNM)" - TOOL_YASM_AS=yasm - ) - - MAKE="kmk" emake "${myemakeargs[@]}" - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - # Move this here for bug 836037 - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - local modlist=( vboxguest vboxsf ) - use X && modlist+=( vboxvideo ) - modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - - insinto /etc/modprobe.d # 485996 - newins - vboxsf.conf <<-EOF - # modprobe.d configuration file for VBOXSF - - # Internal Aliases - Do not edit - # ------------------------------ - alias fs-vboxsf vboxsf - EOF - - cd out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - if use dbus; then - newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} - else - newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} - fi - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - doins VBoxDRMClient - fperms 4755 /usr/bin/VBoxDRMClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} - -pkg_postrm() { - udev_reload -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44.ebuild deleted file mode 100644 index 701a2a12df22..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.44.ebuild +++ /dev/null @@ -1,297 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo linux-mod systemd toolchain-funcs udev - -MY_PN="VirtualBox" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -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-6.1.36.tar.bz2" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 x86" -IUSE="X +dbus" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - sys-libs/pam - sys-libs/zlib - dbus? ( sys-apps/dbus ) - X? ( - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) -" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - ) -" -BDEPEND=" - >=dev-util/kbuild-0.1.9998.3127 - <=dev-util/kbuild-0.1.9998.3500 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-power/iasl -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" -MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996 -CONFIG_CHECK="DRM_TTM" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) - vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" - - linux-mod_pkg_setup -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null - eend $? || die - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - # Respect LDFLAGS (bug #759100) - sed -i -e '/TEMPLATE_VBOXR3EXE_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk - - eapply "${WORKDIR}/virtualbox-patches-6.1.36/patches" - eapply_user -} - -src_configure() { - tc-export AR CC CXX LD RANLIB - - # Build the user-space tools, warnings are harmless - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - $(usev !dbus --disable-dbus) - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - - # bug #843437 - # Respect LDFLAGS (bug #759100) - # Cannot use LDFLAGS here because they also get passed to $(LD) - cat >> LocalConfig.kmk <<-EOF || die - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - CCLDFLAGS=${LDFLAGS} - EOF - - edo ./configure "${myconf[@]}" -} - -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_ONLY_ADDITIONS=1 - - KBUILD_VERBOSE=2 - - AS="$(tc-getCC)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LD="$(tc-getCC)" - - TOOL_GCC3_CC="$(tc-getCC)" - TOOL_GCC3_CXX="$(tc-getCXX)" - TOOL_GCC3_LD="$(tc-getCC)" - TOOL_GCC3_AS="$(tc-getCC)" - TOOL_GCC3_AR="$(tc-getAR)" - TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" - - 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_GXX3_LD_SYSMOD="$(tc-getCXX)" - - TOOL_GCC3_CFLAGS="${CFLAGS}" - TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" - VBOX_GCC_OPT="${CXXFLAGS}" - VBOX_NM="$(tc-getNM)" - TOOL_YASM_AS=yasm - ) - - MAKE="kmk" emake "${myemakeargs[@]}" - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - # Move this here for bug 836037 - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=/lib/modules/${KV_FULL}/build \ - KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers" - if linux_chkconfig_present CC_IS_CLANG; then - ewarn "Warning: building ${PN} with a clang-built kernel is experimental." - - BUILD_PARAMS+=' CC=${CHOST}-clang' - if linux_chkconfig_present LD_IS_LLD; then - BUILD_PARAMS+=' LD=ld.lld' - if linux_chkconfig_present LTO_CLANG_THIN; then - # kernel enables cache by default leading to sandbox violations - BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir=' - fi - fi - fi - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - if use dbus; then - newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} - else - newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} - fi - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - doins VBoxDRMClient - fperms 4755 /usr/bin/VBoxDRMClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} - -pkg_postrm() { - linux-mod_pkg_postrm - udev_reload -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10.ebuild index ab92a9358764..d1bff79dd254 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.10.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" # Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="+dbus gui" # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r1.ebuild deleted file mode 100644 index 8fa75a02eb76..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r1.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo linux-mod systemd toolchain-funcs udev - -MY_PN="VirtualBox" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}a.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2" -S="${WORKDIR}/${MY_PN}-${PV}" - -# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild -LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 x86" -IUSE="+dbus gui" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -# TODO: find out what this is, remove comment if obsolete - -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - sys-libs/pam - sys-libs/zlib - dbus? ( sys-apps/dbus ) - gui? ( - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) -" -# some libs here are indirect dependencies, and also needed at compile time. -# keeping them in DEPEND to avoid warnings from qa-vdb. -DEPEND=" - ${RDEPEND} - gui? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - x11-base/xorg-proto - ) -" -BDEPEND=" - >=dev-lang/yasm-0.6.2 - >=dev-util/kbuild-0.1.9998.3127 - sys-devel/bin86 - sys-power/iasl -" -PDEPEND=" - gui? ( x11-drivers/xf86-video-vboxvideo ) -" - -PATCHES=( - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch -) - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" -MODULESD_VBOXSF_ALIASES=("fs-vboxsf vboxsf") # 485996 -CONFIG_CHECK="DRM_TTM" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) - vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" - use gui && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" - - linux-mod_pkg_setup -} - -src_prepare() { - eapply "${PATCHES[@]}" - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null - eend $? || die - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - if ! use gui; then - echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die - fi - - # Remove pointless GCC version check - sed -e '/ check_gcc$/d' -i configure || die - - # Respect LDFLAGS (bug #759100) - sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die - - eapply "${WORKDIR}/virtualbox-patches-7.0.8/patches" - eapply_user -} - -src_configure() { - tc-export AR CC CXX LD RANLIB - - # Build the user-space tools, warnings are harmless - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - $(usev !dbus --disable-dbus) - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - - # bug #843437 - # Respect LDFLAGS (bug #759100) - # Cannot use LDFLAGS here because they also get passed to $(LD) - cat >> LocalConfig.kmk <<-EOF || die - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - CCLDFLAGS=${LDFLAGS} - EOF - - edo ./configure "${myconf[@]}" -} - -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_ONLY_ADDITIONS=1 - - KBUILD_VERBOSE=2 - - AS="$(tc-getCC)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LD="$(tc-getCC)" - - TOOL_GCC3_CC="$(tc-getCC)" - TOOL_GCC3_CXX="$(tc-getCXX)" - TOOL_GCC3_LD="$(tc-getCC)" - TOOL_GCC3_AS="$(tc-getCC)" - TOOL_GCC3_AR="$(tc-getAR)" - TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" - - 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_GXX3_LD_SYSMOD="$(tc-getCXX)" - - TOOL_GCC3_CFLAGS="${CFLAGS}" - TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" - VBOX_GCC_OPT="${CXXFLAGS}" - VBOX_NM="$(tc-getNM)" - TOOL_YASM_AS=yasm - ) - - MAKE="kmk" emake "${myemakeargs[@]}" - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - # Move this here for bug 836037 - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=/lib/modules/${KV_FULL}/build \ - KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers" - if linux_chkconfig_present CC_IS_CLANG; then - ewarn "Warning: building ${PN} with a clang-built kernel is experimental." - - BUILD_PARAMS+=' CC=${CHOST}-clang' - if linux_chkconfig_present LD_IS_LLD; then - BUILD_PARAMS+=' LD=ld.lld' - if linux_chkconfig_present LTO_CLANG_THIN; then - # kernel enables cache by default leading to sandbox violations - BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir=' - fi - fi - fi - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - if use dbus; then - newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} - else - newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} - fi - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use gui ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - doins VBoxDRMClient - fperms 4755 /usr/bin/VBoxDRMClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod_pkg_postinst - udev_reload - if ! use gui ; then - elog "use flag gui is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} - -pkg_postrm() { - linux-mod_pkg_postrm - udev_reload -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild deleted file mode 100644 index 3ae573b7e126..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.0.8-r2.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo linux-mod-r1 systemd toolchain-funcs udev - -MY_PN="VirtualBox" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${PV}/${MY_P}a.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2" -S="${WORKDIR}/${MY_PN}-${PV}" - -# Reminder: see the LICENSE related comment in app-emulation/virtualbox-additions ebuild -LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" -IUSE="+dbus gui" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -# TODO: find out what this is, remove comment if obsolete - -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - sys-libs/pam - sys-libs/zlib - dbus? ( sys-apps/dbus ) - gui? ( - x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) -" -# some libs here are indirect dependencies, and also needed at compile time. -# keeping them in DEPEND to avoid warnings from qa-vdb. -DEPEND=" - ${RDEPEND} - gui? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXau - x11-libs/libXdmcp - x11-base/xorg-proto - ) -" -BDEPEND=" - >=dev-lang/yasm-0.6.2 - >=dev-util/kbuild-0.1.9998.3127 - sys-devel/bin86 - sys-power/iasl -" -PDEPEND=" - gui? ( x11-drivers/xf86-video-vboxvideo ) -" - -PATCHES=( - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-1.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-kernel-6.4-patch-2.patch - "${FILESDIR}"/virtualbox-guest-additions-7.0.8-fix-gcc13.patch -) - -DOCS=() # Don't install the default README file during einstalldocs - -VBOX_MOD_SRC_DIR="out/linux.${ARCH}/release/bin/additions/src" -CONFIG_CHECK="DRM_TTM" - -src_prepare() { - eapply "${PATCHES[@]}" - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null - eend $? || die - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - eapply -d "${VBOX_MOD_SRC_DIR}" -- "${FILESDIR}"/vboxguest-6.1.36-log-use-c99.patch - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - if ! use gui; then - echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk || die - fi - - # Remove pointless GCC version check - sed -e '/ check_gcc$/d' -i configure || die - - # Respect LDFLAGS (bug #759100) - sed -i -e '/TEMPLATE_VBoxR3Exe_LDFLAGS.linux[ ]*=/ s/$/ $(CCLDFLAGS)/' Config.kmk || die - - eapply "${WORKDIR}/virtualbox-patches-7.0.8/patches" - eapply_user -} - -src_configure() { - tc-export AR CC CXX LD RANLIB - - # Build the user-space tools, warnings are harmless - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - $(usev !dbus --disable-dbus) - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - - # bug #843437 - # Respect LDFLAGS (bug #759100) - # Cannot use LDFLAGS here because they also get passed to $(LD) - cat >> LocalConfig.kmk <<-EOF || die - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - CCLDFLAGS=${LDFLAGS} - EOF - - edo ./configure "${myconf[@]}" -} - -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_ONLY_ADDITIONS=1 - - KBUILD_VERBOSE=2 - - AS="$(tc-getCC)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LD="$(tc-getCC)" - - TOOL_GCC3_CC="$(tc-getCC)" - TOOL_GCC3_CXX="$(tc-getCXX)" - TOOL_GCC3_LD="$(tc-getCC)" - TOOL_GCC3_AS="$(tc-getCC)" - TOOL_GCC3_AR="$(tc-getAR)" - TOOL_GCC3_OBJCOPY="$(tc-getOBJCOPY)" - #TOOL_GCC3_LD_SYSMOD="$(tc-getCC)" - - 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_GXX3_LD_SYSMOD="$(tc-getCXX)" - - TOOL_GCC3_CFLAGS="${CFLAGS}" - TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" - VBOX_GCC_OPT="${CXXFLAGS}" - VBOX_NM="$(tc-getNM)" - TOOL_YASM_AS=yasm - ) - - MAKE="kmk" emake "${myemakeargs[@]}" - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - # Move this here for bug 836037 - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - local modlist=( vboxguest vboxsf ) - use gui && modlist+=( vboxvideo ) - modlist=( "${modlist[@]/%/=misc:${VBOX_MOD_SRC_DIR}}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - - insinto /etc/modprobe.d # 485996 - newins - vboxsf.conf <<-EOF - # modprobe.d configuration file for VBOXSF - - # Internal Aliases - Do not edit - # ------------------------------ - alias fs-vboxsf vboxsf - EOF - - cd out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - if use dbus; then - newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} - else - newinitd <(sed 's/ dbus\>//' "${FILESDIR}"/${PN}-8.initd-r1) ${PN} - fi - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use gui ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - doins VBoxDRMClient - fperms 4755 /usr/bin/VBoxDRMClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload - if ! use gui ; then - elog "use flag gui is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} - -pkg_postrm() { - udev_reload -} diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index 1a8e78edab16..8bb783074c02 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,16 +1,10 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 AUX virtualbox-modules-7.0.10-kernel-6.4.10.patch 312 BLAKE2B 878d706d8aeb11780ff8068c5f18784c4282da5e2fbec620a794a791e20c44256d54f1919e8abde939137607204442cc9fd13121b79518606cceae4f0d141508 SHA512 0c90a82d377bbbd294f9e9fec1810ff4e07afc43fe97ef2b8cc7eafa2a6fde00e1e0352bd8b1d14f3bee0eb7c8094906a880d1092823620f5230cb30bd260911 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a -DIST vbox-kernel-module-src-6.1.44.tar.xz 678920 BLAKE2B d18bd899205b1baa476b6a17b29c8f210238ddcf5949dd5f7b73e06854c85a816422b8f24045d3d0c1adb3cf1fcadbe089e61c2b9764262a14b04b2beaede8be SHA512 a682c94e61ad1c6090223348522123ee7ba87cdd69aaa0bc09a268068bebc2f9d7c8a156c52d82237999f26664790dddb1c8aca72ac4b5ba2133e35086f6516c DIST vbox-kernel-module-src-6.1.46.tar.xz 680036 BLAKE2B 46963957424fab934152ff945a3f1c0da9ca395f6ce7834e249805d155e2d41ec94b9feaed5c214d90fab547509ca48282fa7603b7f9434e7a5d596ea75177f9 SHA512 b60cf42e8213cb4c7f68090d118a477b4535cca7011f495b8ed3a254070dd8912853bb6c647cb4c86448e241005ad2467888d4731aee994c1ac80d2f38e153b3 DIST vbox-kernel-module-src-7.0.10.tar.xz 717508 BLAKE2B 7e4517eb39a7927a9b4343ab3cf3700c28fd1b2271311a980b4e257029dd228fd541a940b9f0a3b8190161d1b020e76f1a6d89752016620116fc175e45fb038b SHA512 0c7c3bac13a42cca4c6b30c4bbea86511ebbb296c5f941a3fb6cb190cbc60303f80ec93e3e18f03f85a6de1f02c3db102f6bd80f793610a38645b03112fc5ce7 -DIST vbox-kernel-module-src-7.0.8.tar.xz 718032 BLAKE2B f8993f6668d12f6bb6a4ab81376e02b11f806012e9ef101ab7d1cbe17004ce34c9214691e1047aa0b5a82b25b91521b9c9ab20a8b7638136cc64e44f1dda89e6 SHA512 5f56a94cdac2490a2dfea3f006f7fb0229e7467d7a71029063c200d42dbf4fbeb65d3d0612f862c5c303f8cd5b60a9ab58dc7a8f593f128e7e6b3f89c53eaefc -EBUILD virtualbox-modules-6.1.44-r1.ebuild 942 BLAKE2B d001b609287f13ded153dcca7e6188a9389503a7fbf1a0ac014554fba47582acc0e6416b1b58a524cbc33972a8bac3ce052cf3c4d9dfe01d5d296419261f371e SHA512 3ad9fb5df15b2666148204323fd43f72aa5dafbd74a2402258a286ebbb65b27d42f979068f13552d717ac07d24664c8603feaae09b06f17071c8871617aba209 -EBUILD virtualbox-modules-6.1.44.ebuild 2452 BLAKE2B ac3c57ed8b03807848cb1b5d6e1c7e096e75ed6d002086aa4b07fbb33ad45b79efbd5e1d1592880550b8280eb0302272e1835071adf786ff4dd6ee79b60b65b8 SHA512 291bc97f33f713f0ab3136736f390a2bee33458313d7c23b20254dceaa74e5087dfa2c81c43296f6ff237de7ab193318f0282752c46ff403c12ee40919164d00 EBUILD virtualbox-modules-6.1.46-r1.ebuild 1002 BLAKE2B 354032d27a55e478e15da1b382387247d464706c6b110dbdf22cbb4ebe479c752c4b195defb14d7d3fcd0f6d1c7c76c398624d7bb21649d84e87ca8c77399386 SHA512 f94b0656475eacf9e99a989a5f0e917a8c38e09f9eda7a085b3431fffebdb9a970dbf4caab3d7732c5070f827c26d493212f6ab5580267d2999c4feddb60c1d0 EBUILD virtualbox-modules-6.1.46.ebuild 941 BLAKE2B 2e25e3085b1a5879cc8e753a04552735bc1bcdf4a1ecfc11f9c796d4a6f770f5028e0712771a6415f481c89bf332652ba5973d51e54cf56146335ccc53d27fcf SHA512 3f5d092613f4013c3d3f39675350b17b4a305ce96d8ffda446736021d581821c4b18bf3161fefc3ad772186b12dcc3e0f0eb52751acfd78883837efd78c0f03b EBUILD virtualbox-modules-7.0.10-r1.ebuild 1002 BLAKE2B 6e5f51d3e7c0931558528c667e967217169057b95948fa7cc679a6effa33b85e0b01217698028660f83964d14e8f559402bb2bfc19d4e09e9e92bb46efbcacff SHA512 e49e662f1dc6c447ea4f6596196f04e63af3cf3ba6cb85b322f7861dc3a247fa00a58bf9510c3858ecf8e559580a5d8fed1798198288737973934d287c3a59eb -EBUILD virtualbox-modules-7.0.10.ebuild 942 BLAKE2B 666835042ed720f08e0e51ab83ee1a4c9328b7abff922c929148ed246a03cc410856e846542ce5d1758b0c094ab9f040c6a8ba29ea2486ca64dddc01d9db05bc SHA512 b3dd20429f4dad94e1c5f270de8de0af095fec9e5980283f9ebbf625047840e238f254ed42c73cc985ab0dfb86bec225e6124f21d990d040f723ba39cfa5c0fe -EBUILD virtualbox-modules-7.0.8-r1.ebuild 942 BLAKE2B 666835042ed720f08e0e51ab83ee1a4c9328b7abff922c929148ed246a03cc410856e846542ce5d1758b0c094ab9f040c6a8ba29ea2486ca64dddc01d9db05bc SHA512 b3dd20429f4dad94e1c5f270de8de0af095fec9e5980283f9ebbf625047840e238f254ed42c73cc985ab0dfb86bec225e6124f21d990d040f723ba39cfa5c0fe -EBUILD virtualbox-modules-7.0.8.ebuild 2452 BLAKE2B a6450dbe26b3b841b6e5842f937ec5942c8dad219560c77e9e5fde28e44fadd3a3b60af9b43523148edcb2166eab584d1f2db0dfe0fccff3316f689e8705d211 SHA512 600466e3edf5bddc799b8a0f01b8873acfc855a5468c7c8c95969181db8483a170ced08d071169047fa38cd91452c7ac615c2a30855434750129825bd4e89e5d +EBUILD virtualbox-modules-7.0.10.ebuild 941 BLAKE2B e48bef455faacaa9b1882e739e4bed41fd9b7f83315f33133b185c19433e8191603ae73aa9c5342221bb57f0518af6cb085b9d8def670f1135af66d2dc130df5 SHA512 deed8b02d834136fef5021bc9127dc45fb0cfa425fcd90692bd03ae851a713b9032b996fa8fa2180c0e85ce4083a96cc538ddc0959051609ec0a0f63c08f8b45 MISC metadata.xml 255 BLAKE2B 9386ef3bdb55211441f303528b31f8ccd9ad9039744400e859574a424fa1f366a989fe78f5c10038f3dd9b06a6a389e4a7e643b3eac0dc93a79ac4cc3b4c5423 SHA512 6c158e12464285afd44b70d0653b65f65da1c523fc2b1b07eb6d2dec56f58234bb31cb9dc36238cd6dfc20031b4d58c04e7c1678cc9f917194403ad8a209513f diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild deleted file mode 100644 index 00acad894a77..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from VirtualBox-*.run -# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb - -EAPI=8 - -inherit linux-mod-r1 - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" - -src_compile() { - local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44.ebuild deleted file mode 100644 index cc01aaeed406..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.44.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from VirtualBox-*.run -# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb - -EAPI=8 - -inherit linux-mod toolchain-funcs - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}" - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})" -MODULESD_VBOXDRV_ENABLED="yes" -MODULESD_VBOXNETADP_ENABLED="no" -MODULESD_VBOXNETFLT_ENABLED="no" -CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" - -# Check if the build directory exists and all directories above it have sane permissions -virtualbox_check_kv_dir() { - if [[ ! -d ${KV_DIR} ]]; then - [[ -z $a ]] && return 1 - elog "Directory not found: ${KV_DIR}" - local a=$(dirname "${KV_DIR}") - while [[ -n $a && $a != '/' && $1 != '.' ]]; do - if [[ -d $a && ( ! -r $a || ! -x $a ) ]]; then - elog "Please check permissions of $a" - fi - a=$(dirname "$a") - done - return 1 - fi - return 0 -} - -pkg_pretend() { - # bug 893286 - get_version - virtualbox_check_kv_dir -} - -pkg_setup() { - linux-mod_pkg_setup - virtualbox_check_kv_dir || die - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" - if linux_chkconfig_present CC_IS_CLANG; then - ewarn "Warning: building ${PN} with a clang-built kernel is experimental." - - BUILD_PARAMS+=' CC=${CHOST}-clang' - if linux_chkconfig_present LD_IS_LLD; then - BUILD_PARAMS+=' LD=ld.lld' - if linux_chkconfig_present LTO_CLANG_THIN; then - # kernel enables cache by default leading to sandbox violations - BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir=' - fi - fi - fi -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} - -pkg_postinst() { - # Remove vboxpci.ko from current running kernel - # This module is obsolete, removed in december 2019, so it may be missing. No || die - # TODO: consider removing this line in the near future - find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete - linux-mod_pkg_postinst -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.10.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.10.ebuild index d0c1bf4e4df5..60b7d2b1120a 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.10.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.10.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}" LICENSE="GPL-3" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" +KEYWORDS="amd64" CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild deleted file mode 100644 index d0c1bf4e4df5..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from VirtualBox-*.run -# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb - -EAPI=8 - -inherit linux-mod-r1 - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}" - -LICENSE="GPL-3" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" - -src_compile() { - local modlist=( {vboxdrv,vboxnetflt,vboxnetadp}=misc ) - local modargs=( KERN_DIR="${KV_OUT_DIR}" KERN_VER="${KV_FULL}" ) - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8.ebuild deleted file mode 100644 index 9b9f026e3515..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-7.0.8.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from VirtualBox-*.run -# XXX: update: now it is split from virtualbox-*-Debian~bullseye_amd64.deb - -EAPI=8 - -inherit linux-mod toolchain-funcs - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${MY_P}.tar.xz" -S="${WORKDIR}" - -LICENSE="GPL-3" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})" -MODULESD_VBOXDRV_ENABLED="yes" -MODULESD_VBOXNETADP_ENABLED="no" -MODULESD_VBOXNETFLT_ENABLED="no" -CONFIG_CHECK="~!SPINLOCK JUMP_LABEL" - -# Check if the build directory exists and all directories above it have sane permissions -virtualbox_check_kv_dir() { - if [[ ! -d ${KV_DIR} ]]; then - [[ -z $a ]] && return 1 - elog "Directory not found: ${KV_DIR}" - local a=$(dirname "${KV_DIR}") - while [[ -n $a && $a != '/' && $1 != '.' ]]; do - if [[ -d $a && ( ! -r $a || ! -x $a ) ]]; then - elog "Please check permissions of $a" - fi - a=$(dirname "$a") - done - return 1 - fi - return 0 -} - -pkg_pretend() { - # bug 893286 - get_version - virtualbox_check_kv_dir -} - -pkg_setup() { - linux-mod_pkg_setup - virtualbox_check_kv_dir || die - BUILD_PARAMS="CC=\"$(tc-getBUILD_CC)\" KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" - if linux_chkconfig_present CC_IS_CLANG; then - ewarn "Warning: building ${PN} with a clang-built kernel is experimental." - - BUILD_PARAMS+=' CC=${CHOST}-clang' - if linux_chkconfig_present LD_IS_LLD; then - BUILD_PARAMS+=' LD=ld.lld' - if linux_chkconfig_present LTO_CLANG_THIN; then - # kernel enables cache by default leading to sandbox violations - BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir=' - fi - fi - fi -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} - -pkg_postinst() { - # Remove vboxpci.ko from current running kernel - # This module is obsolete, removed in december 2019, so it may be missing. No || die - # TODO: consider removing this line in the near future - find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete - linux-mod_pkg_postinst -} diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index fe67256482e8..3b6c175f71af 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -7,7 +7,6 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446 AUX virtualbox-6.1.26-configure-include-qt5-path.patch 717 BLAKE2B d6d9f1b0d30602e18b245e25bf1c5e2f4a33e308956fa946f913cf054173aa337708923ef92355f171f5b53a1b1ed58089f1a5146d8cd40a049fdfef874c5194 SHA512 bd07544302db16c291c21ef548455590079307fac2e11c3508019a6fb38a47db6a130c4ba265f9f47dead82d1684226542f21ff2da889ece51cba4b0744d109c AUX virtualbox-6.1.34-r3-python.patch 343 BLAKE2B 6eb68ba31ab57a1f2065a7d48ef75175f5c3ba45ff9514c1f1ece8f6f54c1d8fe907ca3a10e411bc6b4474cddb39224d54b4bf4cd7b57522b2ca499ce85061c8 SHA512 a22f46e82f163676a5c07b8010160444cc621f9d12ec1226a304ebdf0800f8f24174dec2fb5e8999ba51f574cd2d290af1c7b94b54ca8c2cd6abdad9025e7fea AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6f519c80957b3c7d55569f2ac02d3642d29574b9f8ed4b1c043cf14a899ff3cc67d7f7442bdd1ce27079b987783c36f38b39b49a SHA512 eb1f5d4ef64ea3306ae0489b3c7019a98e6f00c8a62ec8414c78bc8c14ab654ddae57c579557511e4144bf367ad3a2ea58dc5d9ba1a2c796f30fbbec0be7f414 -AUX virtualbox-6.1.42-python3_11.patch 2737 BLAKE2B a0dcd9afcdf2e07a55e3fba54e0eedc7e7072a126aa4791e676209f2c060745df9c32eba0378b9fc275591801947636411186aa2a3c8b5b1927fc93375815cd8 SHA512 7dd4101b7c10a3c1f4f4294c65a80cb392bb31a7cb8113bde59ee112d3d5c5e768daf1645d5b9c5b13ce49c08ed23b7a47064127c9e168743aeb66c614ef249f AUX virtualbox-6.1.44-fix-libxml2.patch 1115 BLAKE2B bdcbd6ef7e4812065ad1aa47c3acbff5c402a21af7ece4c3e3ca1867248eff3f16e0d98d8c70c3306d900f285de077ee7f48d744b40df7e2f3566517ebdd6150 SHA512 fe3ee1671dbcacd71c0cdc9f2179dcb0a05121ded8e7f6a1acfea07b5e951d4d2701377c57ae638148e09cc224893f0efdb2f760cd9ccbdf7f3415d9ff563711 AUX virtualbox-7.0.0-fix-compilation-clang.patch 1638 BLAKE2B 2c1c021a5b95ffdbd46982249c3a60e97d79db17994491c3c1774d7fc889d5b5a0da974d05859e21772b6f265bf1009ad3f13d19a5d264c7f8b4b2bacd6a9bdb SHA512 9c83dfb1550463fc9ddce68dd0648b12721ad1f9fa92fac2e7234ac8149fc5a1a5698a759d1352fc8003d737ce987fbc476ed9a9b350490cf52e42e1a08444dd AUX virtualbox-7.0.10-python.patch 871 BLAKE2B 3f01becc0d369805dd373a691eafd3cd9ee40b4e8db95aa285fb07e314f1489a163c8f4e7cd494834f9adde21f80ad668a5b3f4166c67cd150ce3a029e980b0c SHA512 0ee7b8f44d8c2e1e4b35c2edbc4c5a12b9fa165133975eac83e7cbdc127d273a1f20b6720b97a33912489d5d64c41b7429bde60c01264e31a1e7995707bdbaea @@ -15,22 +14,17 @@ AUX virtualbox-7.0.6-fix-libxml2.patch 15849 BLAKE2B 2a12ab133aeed3295fd9c1281a3 AUX virtualbox-7.0.6-gcc-13.patch 579 BLAKE2B 50d629cafe1aff45ed08d712ab730555f2093336f28be38246c54a60ccbefab880b4b5a548b45e151c583749d347a26dc43fc5fef4e8c400c7bad424c9fa366a SHA512 34b5543c62044d530ee5927b367301f39d465d6177cfa2023578ff572d8e62eef2c5a06e1ec8d274fc582c017232b3603f668a1c09ec7774620e83245cdf90ba AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b AUX virtualbox-7.0.8-mtune-keep-size.patch 401 BLAKE2B 8c4691d9b60030cdaa48e53bed0cf691ba5bc4345661d297114b3747e57368281896ef423edd0e67ee5c1a741d044bbba3b3443c46ce23ff4fd4fb65278fffcc SHA512 46ae7c8321474eb1abfbb90ef07d122715e80c3fecc718ea3d08f86261c3b46b00b4b38513e0372f7067833efa8c79fae5db91589afb651e210876aed6b01b0d -AUX virtualbox-7.0.8-python3_11.patch 3217 BLAKE2B 385be6d3c78e995006f146b89ab9dcc937331b970b0e79f2b0a87a41fd83fba482cb9b59d8a0eea0506eda5260ac65bcc6011907a507c0dcfa4726be440cfebc SHA512 dad06aa58161468d3e7a3733a77431f82b6c2e0b2a4f679ad0bf580feb6d2822b33d469b35a1760b086f2774a08045bfb6756e244ad1061158e2e305b6990a74 AUX virtualbox-7.0.9-python.patch 983 BLAKE2B ef9f83cb1447789d189b1eaaafe461ea7954b1326cb15e3093abfc85020dc5699eff009c75fa10ab9fa3d7b999a5deb4a081059a79c19338b4691f5e9dcd577e SHA512 bedae8ec051697f029c3ac9af70ad9e20e120e022779c6d2ce33f3cd10041e460b83c106e381a654e352f0dbdcf7c074868a59e79e99008336442a13b96007f7 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 -DIST VirtualBox-6.1.44.tar.bz2 165775421 BLAKE2B e87d7175bc616784c79d02b595d81119cedc7f4df1822b71ca10b85d44d5cd1dacd999e7867a0bef8579ea715ef732b990cef63f3325fff0c139abe394d88ad7 SHA512 49c3baa1a40dcafcc6b31d0abcfecfcb24305de44e5efd3f68ba4443574e21b8cc34d7288e0fbc56730bc3be2bee07089b7dfed14848a88dc38a1433b6dda8af DIST VirtualBox-6.1.46.tar.bz2 166045588 BLAKE2B 041fad30d7cbe524cfd5c865b225c00df7715a6648ed0d8f7ee3ca4be0d0dabcb324c676ba2ea78288cde89ed8e5412fae75e31bb49f623de2acddb8f10d6ee1 SHA512 695ca4d41ff10d0581e4cffe4a0ec80e0fe380f4c7d5d51ee4d21aeb61646c26edd60301e541894e71c3323e2d7207e23299938c18ee45631afd1e0851946e77 DIST VirtualBox-7.0.10.tar.bz2 175450841 BLAKE2B 49eaa14f716f021f1ecec1ad48a2aa8a3a758cbd9b03cf30d65ddcf5aba11842b0ea8bc2c4d477084a4cea318dc302a4ed426ec9f675a1fe675c5f18c48796c7 SHA512 2870d39385f66557281edf1368db68cd69d6a9bebc30d52511929462d0ac210cec49dd8531a280c6facff22ba6e4808477fbf3d09abf998d863a007fc7f2c3bd -DIST VirtualBox-7.0.8a.tar.bz2 199387757 BLAKE2B 0ba397825277ecbb851bd4ea94c85448e2966fd96ef8edcaf3102f8515553736d6ceee84c0647fa37443c1875256353fdd029d6c505aa99834079acb957b24a0 SHA512 fcbf907f6f7f2396ebff5a31af6ec00b38f09799380bac4847cc9044455832de058659edaa9f621b0054fa402bfacef1b5444498c9faeb3671d02da1505c952d DIST virtualbox-help-7.0.10.tar.xz 3941196 BLAKE2B fa6667e0cf12e2e05b896a7d9d7e1f78d43bb4618f35b3c81f5ccf5f227d1181b0c8fb1f6dc02a8619550b193a73d4094c5d3f0d43514392f9ed563085068789 SHA512 fab2dff812a438f3e78dbace24741d91b317bbbc7362f082a18f3871e3c6fd8af7744cf1b3fd3b82cf5135e03d521de05a7a5bc98ec19aacfa1b4e5392e60f30 DIST virtualbox-help-7.0.8.tar.xz 3941816 BLAKE2B f1c82ccc8a0d4e99f2302a7024a551e7e4a70348b193cf0c3a3b2917a717451c74d652555cadb278f6e27c47dac88a8121acfe9425bc0f5b82b5101475f384b3 SHA512 7483c4321492effb5b4329d48b363d8d2b3aaa248c0259cd06569497090aa438c39e94d6a5da4f511202f424e596f66e7580e37ffa5da66661fd0fadcd99c5ef DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57 DIST virtualbox-patches-7.0.10_pre20230615.tar.bz2 2253 BLAKE2B 27b422acc2ae85c4324d6f4471db80c9f680b1c4a00223c38b9e3fb31709b05163a1bd53408cffeabdef295e856aa8b01b86e0fecf5d80ace376ea1bd4fc9504 SHA512 c2177f46048f09b6be9ac2c35b43d74f67350b052411cc64adf6c0b3d284055eef79f960f1384a3aaeee7d25f8c19ea8f936ee2623a2251d1d28f85ed3469c22 DIST virtualbox-patches-7.0.8.tar.bz2 2733 BLAKE2B 044dfe02a5bd5e757091318b394b0e5918677b5bbce9caef4a18d4d8df54821559f0df6ffbdd6f52d4934bc4018e9c9d908571c5d3d8804fd3b0f22a7a1aed84 SHA512 93a06aa3f9508d3a8743ca8494a958159b5bc3fd7a0a08ff23414d05c4f31084cf0f1c82a3866e222c83e6996ba004546f0bd33c6eb9a90eec8e548b8b3f2fbf -EBUILD virtualbox-6.1.44.ebuild 18931 BLAKE2B 9427315b0a0aa723a834d5f553547569472c7b61814eeaf2bae629cc166b947919bf970f844f3e3bdceeb749825ab2240ed9a3043c27db0d9eb60e1f65bc41d2 SHA512 798b5b80140315880a3fb06319a8cef1b12517863a802290772b937bb94b41b85ce90eb9f5447476a40d1cb398501d6d2f8255df75d1f59b2b57c508adf81fb2 EBUILD virtualbox-6.1.46.ebuild 18887 BLAKE2B aed99c4c6f459b4f05e70f21f8e4a83d423bd18f49cb4b3776fd4352c49980a1addbc4388676bb5e9f6821943227f869b1c32b3e253e36be095f34de769bc91c SHA512 ddf75c7aeaaaa640703625aaaa803e6ae96857aaf6cb31fe8e0ed7f722c6403d7230836fdfa6a929b08e465f5665b1f76e79ac9c2d332c9f6796637fbf27fe6b -EBUILD virtualbox-7.0.10.ebuild 20659 BLAKE2B e17ef4f6b512c585e80dbd5e7370255e254ae6f9bf51e6e7521fbcc591be83b928d733dd2fda77307340fe5914e9cecf34be7af9b6e0166f368d317365f7463a SHA512 fdae404f24f2615a654fa0c637ce3993df7930fa2716b80c79a07a10b1b89ff18f316e9e3ad7f2fd49a7d3d6912f0a375885ced8a6d1f69d683e9dcfebb1223a -EBUILD virtualbox-7.0.8a.ebuild 20647 BLAKE2B eec6de1dacef37a8367528b3848b562ffcebc48e53217a9e1c3587ff0161917d0e869dd24b34df10f57bddc120574f0a6854e8412f7ebf4805cd3ac1b6dc33a6 SHA512 d746f705c58b9452e6400e12d15690013e0e90cfa820bc3828f7bd0612318e01a1c5a03d434f870251e2b3c83d4fe346ffceefa928960de1f497c5eb89d1ffd0 +EBUILD virtualbox-7.0.10.ebuild 20658 BLAKE2B c59f66e1c81d6f522b738aaf3d1f50192cc1e992c08c5eb60a654664325088e97d70db867cb61aa0c6bcc046d8a79f4db7731ca861c5cc84983cb144c3515f77 SHA512 cb1293093cdcab9d9d51602b624cd46d122974e4314a20da021d33175a4a27d2434052c2baffce2780b15a109acdb90989ead907ba2828e0ecfc38a244f27e8c EBUILD virtualbox-9999.ebuild 21353 BLAKE2B 8e4333fda64fb1818b38126e39c49da8542cac4c4a033e99a1580c21540710e75818de63151aec9d436ac2a40b7da86a1069b4374be147eda6556d6608a21f13 SHA512 98fadee33deef13ceab5becd9539412da5505567dd550850872c6fb8f6da43d7b113308562dae6c849a8f13910aed28e535eff523c15b55be22ba8ef6c2db37b MISC metadata.xml 870 BLAKE2B 26f9370557a12c17465e7ca2d63902a2ce5b2d65fbdf40f3b890bd89aca28a1816424caf579f71b762876e8e91b292c5ecbcbad985e9da1e1472e66a2eaf6965 SHA512 eb2e9114dc343062e9afd3b933a5d355be790febb4a18f741347072d305b7d63ed40a6a3b9d11b91eb8602d5d2d4f5cf6c2ebde278fb0d0df48a5c5647374e33 diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.42-python3_11.patch b/app-emulation/virtualbox/files/virtualbox-6.1.42-python3_11.patch deleted file mode 100644 index 1c3af9d8afef..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-6.1.42-python3_11.patch +++ /dev/null @@ -1,81 +0,0 @@ -Add Python 3.11 support to virtualbox 6.1 - ---- a/src/libs/xpcom18a4/python/Makefile.kmk -+++ b/src/libs/xpcom18a4/python/Makefile.kmk -@@ -26,7 +26,7 @@ - - # - # List of supported Python versions, defining a number of --# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables -+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|311|311M|DEF]_[INC|LIB] variables - # which get picked up below. - # - ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. -@@ -624,6 +624,52 @@ - endif - endif - endif -+ -+ifdef VBOX_PYTHON311_INC -+# -+# Python 3.11 version -+# -+DLLS += VBoxPython3_11 -+VBoxPython3_11_EXTENDS = VBoxPythonBase -+VBoxPython3_11_EXTENDS_BY = appending -+VBoxPython3_11_TEMPLATE = XPCOM -+VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC) -+VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON311_LIB_X86 -+DLLS += VBoxPython3_11_x86 -+VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86 -+VBoxPython3_11_x86_EXTENDS_BY = appending -+VBoxPython3_11_x86_TEMPLATE = XPCOM -+VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC) -+VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86) -+ endif -+ endif -+endif -+ -+ifdef VBOX_PYTHON311M_INC -+# -+# Python 3.11 version with pymalloc -+# -+DLLS += VBoxPython3_11m -+VBoxPython3_11m_EXTENDS = VBoxPythonBase_m -+VBoxPython3_11m_EXTENDS_BY = appending -+VBoxPython3_11m_TEMPLATE = XPCOM -+VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC) -+VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON311M_LIB_X86 -+DLLS += VBoxPython3_11m_x86 -+VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m -+VBoxPython3_11m_x86_EXTENDS_BY = appending -+VBoxPython3_11m_x86_TEMPLATE_ = XPCOM -+VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC) -+VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86) -+ endif -+ endif -+endif - - ifdef VBOX_PYTHONDEF_INC - # ---- a/src/libs/xpcom18a4/python/src/module/_xpcom.cpp -+++ b/src/libs/xpcom18a4/python/src/module/_xpcom.cpp -@@ -84,7 +84,11 @@ - # define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX) - # endif - # ifdef VBOX_PYXPCOM_VERSIONED --# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 -+# if PY_VERSION_HEX >= 0x030b0000 && PY_VERSION_HEX < 0x030c0000 -+# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_11") -+# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_11) -+ -+# elif PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000 - # define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10") - # define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10) - diff --git a/app-emulation/virtualbox/files/virtualbox-7.0.8-python3_11.patch b/app-emulation/virtualbox/files/virtualbox-7.0.8-python3_11.patch deleted file mode 100644 index 02fc9c1b12fe..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-7.0.8-python3_11.patch +++ /dev/null @@ -1,86 +0,0 @@ -Add support for python 3.11 - -Virtualbox 7.0.0 will only build a lib named VBoxPython3.so, regardless of the -actual python version used when compiling. Remove VBoxPython3m.so, we don't -use it. - ---- a/src/libs/xpcom18a4/python/Makefile.kmk -+++ b/src/libs/xpcom18a4/python/Makefile.kmk -@@ -30,7 +30,7 @@ - - # - # List of supported Python versions, defining a number of --# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|DEF]_[INC|LIB] variables -+# VBOX_PYTHON[26|27|31|32|32M|33|33M|34|34M|35|35M|36|36M|37|37M|38|38M|39|39M|310|310M|311|311M|DEF]_[INC|LIB] variables - # which get picked up below. - # - ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script. -@@ -665,6 +665,48 @@ - endif - endif - -+ ifdef VBOX_PYTHON311_INC -+ # -+ # Python 3.11 version -+ # -+ DLLS += VBoxPython3_11 -+ VBoxPython3_11_EXTENDS = VBoxPythonBase -+ VBoxPython3_11_EXTENDS_BY = appending -+ VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC) -+ VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON311_LIB_X86 -+ DLLS += VBoxPython3_11_x86 -+ VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86 -+ VBoxPython3_11_x86_EXTENDS_BY = appending -+ VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC) -+ VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86) -+ endif -+ endif -+ endif -+ -+ ifdef VBOX_PYTHON311M_INC -+ # -+ # Python 3.11 version with pymalloc -+ # -+ DLLS += VBoxPython3_11m -+ VBoxPython3_11m_EXTENDS = VBoxPythonBase_m -+ VBoxPython3_11m_EXTENDS_BY = appending -+ VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC) -+ VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB) -+ -+ ifdef VBOX_WITH_32_ON_64_MAIN_API -+ ifdef VBOX_PYTHON311M_LIB_X86 -+ DLLS += VBoxPython3_11m_x86 -+ VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m -+ VBoxPython3_11m_x86_EXTENDS_BY = appending -+ VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC) -+ VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86) -+ endif -+ endif -+ endif -+ - ifdef VBOX_PYTHONDEF_INC - # - # Python without versioning -@@ -707,18 +749,13 @@ - # TODO: ASSUMING that we don't need a different headers for pymalloc - # ('m' builds < 3.8) and CRT malloc. - # -- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \ -+ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \ - ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,))) - ifneq ($(VBOX_PYTHON_LIMITED_API_VER),) - DLLS += VBoxPython3 - VBoxPython3_EXTENDS = VBoxPythonBase - VBoxPython3_DEFS = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_DEFS)) Py_LIMITED_API=0x03030000 - VBoxPython3_INCS = $(VBoxPythonBase_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC) -- -- DLLS += VBoxPython3m -- VBoxPython3m_EXTENDS = VBoxPythonBase_m -- VBoxPython3m_DEFS = $(filter-out VBOX_PYXPCOM_VERSIONED,$(VBoxPythonBase_m_DEFS)) Py_LIMITED_API=0x03030000 -- VBoxPython3m_INCS = $(VBoxPythonBase_m_INCS) $(VBOX_PYTHON$(VBOX_PYTHON_LIMITED_API_VER)_INC) - endif - endif # VBOX_WITH_PYTHON_LIMITED_API - diff --git a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild b/app-emulation/virtualbox/virtualbox-6.1.44.ebuild deleted file mode 100644 index b148184cbd9b..000000000000 --- a/app-emulation/virtualbox/virtualbox-6.1.44.ebuild +++ /dev/null @@ -1,676 +0,0 @@ -# Copyright 2022-2023 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_{9..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-6.1.36.tar.bz2" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-2 dtrace? ( CDDL )" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64" -IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc" - -unset WATCOM #856769 - -COMMON_DEPEND=" - ${PYTHON_DEPS} - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${PV} - >=dev-libs/libxslt-1.1.19 - net-misc/curl - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libvpx:0= - sys-libs/zlib:= - !headless? ( - sdl? ( media-libs/libsdl:0[X,video] ) - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - opengl? ( - media-libs/libglvnd[X] - virtual/glu - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - opengl? ( dev-qt/qtopengl:5 ) - x11-libs/libXinerama - ) - ) - dev-libs/openssl:0= - virtual/libcrypt:= - lvm? ( sys-fs/lvm2 ) - opus? ( media-libs/opus ) - udev? ( >=virtual/udev-171 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) - 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} - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !headless? ( - x11-libs/libXinerama - x11-libs/libXrandr - opengl? ( virtual/opengl ) - ) - java? ( virtual/jdk:1.8 ) - pam? ( sys-libs/pam ) - pax-kernel? ( sys-apps/elfix ) - pulseaudio? ( media-libs/libpulse ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=app-arch/tar-1.34-r2 - >=dev-util/kbuild-0.1.9998.3127 - <=dev-util/kbuild-0.1.9998.3500 - >=dev-lang/yasm-0.6.2 - dev-libs/libIDL - sys-apps/which - sys-devel/bin86 - sys-libs/libcap - sys-power/iasl - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-dtd:4.4 - dev-texlive/texlive-basic - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-fontsextra - ) - java? ( virtual/jdk:1.8 ) - qt5? ( dev-qt/linguist-tools:5 ) -" -RDEPEND=" - ${COMMON_DEPEND} - java? ( virtual/jre: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 ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365 - - # This patch is needed to avoid automagic detection based on a hardcoded - # list of Pythons in configure. It's necessary but not sufficient - # (see the rest of the ebuild's logic for the remainder) to handle - # proper Python selection. - "${FILESDIR}"/${PN}-6.1.34-r3-python.patch - "${FILESDIR}"/${PN}-6.1.42-python3_11.patch - - # 865361 - "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch - - # 906309 - "${FILESDIR}"/${PN}-6.1.44-fix-libxml2.patch - - # Downloaded patchset - "${WORKDIR}"/virtualbox-patches-6.1.36/patches -) - -pkg_pretend() { - if ! use headless && ! use qt5 ; then - einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." - elif use headless && use qt5 ; then - einfo "You selected USE=\"headless qt5\", defaulting to" - einfo "USE=\"headless\", this build will not include any X11/Qt frontend." - fi - - if ! use opengl ; then - 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 - - # 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 - 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), see bug #232775 - rm -r kBuild/bin tools || die - - # Replace pointless GCC version check with something more sensible. - # This is needed for the qt5 version check. - 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 - 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 - - # 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 - 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 - - # 890561 - echo -e "\nVBOX_GTAR=gtar" >> LocalConfig.kmk || die -} - -src_configure() { - tc-ld-disable-gold # bug #488176 - - #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 - - # 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 - - tc-export AR CC CXX LD RANLIB - export HOST_CC="$(tc-getBUILD_CC)" - - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - - --disable-dbus - --disable-kmods - - $(usev !alsa --disable-alsa) - $(usev debug --build-debug) - $(usev !doc --disable-docs) - $(usev !java --disable-java) - $(usev !lvm --disable-devmapper) - $(usev !opus --disable-libopus) - $(usev !pulseaudio --disable-pulse) - $(usev !python --disable-python) - $(usev vboxwebsrv --enable-webservice) - $(usev vnc --enable-vnc) - ) - - if ! use headless ; then - myconf+=( - $(usev !opengl --disable-opengl) - $(usev !qt5 --disable-qt) - $(usev !sdl --disable-sdl) - ) - else - myconf+=( - --build-headless - --disable-opengl - ) - fi - - if use amd64 && ! has_multilib_profile ; then - myconf+=( --disable-vmmraw ) - fi - - # bug #843437 - cat >> LocalConfig.kmk <<-EOF || die - CXXFLAGS=${CXXFLAGS} - CFLAGS=${CFLAGS} - EOF - - # 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 - - 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 - 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 - 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,Tunctl,VMMPreload,XPCOMIPCD} \ - vboximg-mount *so *r0 iPxeBaseBin ; 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}/VBoxTunctl /usr/bin/VBoxTunctl - dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount - - 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 -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - if ! use headless ; then - vbox_inst rdesktop-vrdp - 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 qt5 ; 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 - fi - - 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 - fi - - if use python ; then - local mangled_python="${EPYTHON#python}" - mangled_python="${mangled_python/./_}" - - local python_path_ext="${ED}/usr/$(get_libdir)/virtualbox/VBoxPython${mangled_python}.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 - 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 headless && use qt5 ; 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-7.0.10.ebuild b/app-emulation/virtualbox/virtualbox-7.0.10.ebuild index a20f38fac366..5d713069086e 100644 --- a/app-emulation/virtualbox/virtualbox-7.0.10.ebuild +++ b/app-emulation/virtualbox/virtualbox-7.0.10.ebuild @@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc" unset WATCOM #856769 diff --git a/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild b/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild deleted file mode 100644 index c851121c5279..000000000000 --- a/app-emulation/virtualbox/virtualbox-7.0.8a.ebuild +++ /dev/null @@ -1,735 +0,0 @@ -# Copyright 2022-2023 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_{9..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" -BASE_PV=${PV%a} -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/${BASE_PV}/${MY_P}.tar.bz2 - https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.0.8.tar.bz2 - gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) ) -" -S="${WORKDIR}/${MY_PN}-${BASE_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 vnc" - -unset WATCOM #856769 - -COMMON_DEPEND=" - ${PYTHON_DEPS} - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${BASE_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 ) - 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-util/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 ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1.26-configure-include-qt5-path.patch # bug #805365 - - # This patch is needed to avoid automagic detection based on a hardcoded - # list of Pythons in configure. It's necessary but not sufficient - # (see the rest of the ebuild's logic for the remainder) to handle - # proper Python selection. - "${FILESDIR}"/${PN}-6.1.34-r3-python.patch - - # 865361 - "${FILESDIR}"/${PN}-6.1.36-fcf-protection.patch - - "${FILESDIR}"/${PN}-7.0.0-fix-compilation-clang.patch - "${FILESDIR}"/${PN}-7.0.8-python3_11.patch - "${FILESDIR}"/${PN}-7.0.6-gcc-13.patch - "${FILESDIR}"/${PN}-7.0.8-mtune-keep-size.patch - "${FILESDIR}"/${PN}-7.0.6-fix-libxml2.patch - - # Downloaded patchset - "${WORKDIR}"/virtualbox-patches-7.0.8/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 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." - 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 - 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 - - # 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 - 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 #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-ld-disable-gold # bug #488176 - - 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 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 - - 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 - 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 - 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 -n "VBOX_APP_HOME=${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-${BASE_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 - 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/${BASE_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 -} |