From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 May 2021 22:28:33 +0100 Subject: gentoo resync : 04.05.2021 --- app-emulation/Manifest.gz | Bin 20897 -> 20878 bytes app-emulation/diskimage-builder/Manifest | 10 +- .../diskimage-builder-3.10.0.ebuild | 2 +- .../diskimage-builder-3.11.0.ebuild | 39 + .../diskimage-builder-3.7.0.ebuild | 39 - .../diskimage-builder-3.8.0.ebuild | 39 - .../diskimage-builder-3.9.0.ebuild | 39 - app-emulation/docker-credential-helpers/Manifest | 2 +- .../docker-credential-helpers-0.6.3.ebuild | 4 +- app-emulation/genymotion-bin/Manifest | 4 +- .../genymotion-bin/genymotion-bin-3.2.0.ebuild | 122 --- .../genymotion-bin/genymotion-bin-3.2.1.ebuild | 116 +++ app-emulation/lxc/Manifest | 5 +- app-emulation/lxc/lxc-4.0.6.ebuild | 5 +- app-emulation/lxc/lxc-4.0.8.ebuild | 173 ++++ app-emulation/lxd/Manifest | 3 + app-emulation/lxd/lxd-4.0.6.ebuild | 156 ++++ app-emulation/nemu/Manifest | 2 +- app-emulation/nemu/nemu-2.5.0.ebuild | 2 +- app-emulation/qemu/Manifest | 10 +- app-emulation/qemu/qemu-5.2.0-r2.ebuild | 2 +- app-emulation/qemu/qemu-5.2.0-r3.ebuild | 2 +- app-emulation/qemu/qemu-5.2.0-r50.ebuild | 2 +- app-emulation/qemu/qemu-6.0.0.ebuild | 905 +++++++++++++++++++++ app-emulation/qemu/qemu-9999.ebuild | 2 +- app-emulation/spice/Manifest | 6 +- app-emulation/spice/spice-0.14.3-r1.ebuild | 5 +- app-emulation/spice/spice-0.14.3.ebuild | 7 +- app-emulation/spice/spice-9999.ebuild | 5 +- app-emulation/virtualbox-additions/Manifest | 4 +- .../virtualbox-additions-6.1.20.ebuild | 2 +- .../virtualbox-additions-6.1.22.ebuild | 34 + app-emulation/virtualbox-extpack-oracle/Manifest | 4 +- .../virtualbox-extpack-oracle-6.1.20.143896.ebuild | 2 +- .../virtualbox-extpack-oracle-6.1.22.144080.ebuild | 43 + app-emulation/virtualbox-guest-additions/Manifest | 4 +- .../virtualbox-guest-additions-6.1.20.ebuild | 2 +- .../virtualbox-guest-additions-6.1.22.ebuild | 221 +++++ app-emulation/virtualbox-modules/Manifest | 4 +- .../virtualbox-modules-6.1.20.ebuild | 2 +- .../virtualbox-modules-6.1.22.ebuild | 55 ++ app-emulation/virtualbox/Manifest | 6 +- app-emulation/virtualbox/virtualbox-6.1.18.ebuild | 5 +- .../virtualbox/virtualbox-6.1.20-r1.ebuild | 7 +- app-emulation/virtualbox/virtualbox-6.1.22.ebuild | 502 ++++++++++++ app-emulation/wine-gecko/Manifest | 2 +- app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild | 2 +- app-emulation/wine-staging/Manifest | 10 +- app-emulation/wine-staging/wine-staging-6.4.ebuild | 4 +- app-emulation/wine-staging/wine-staging-6.5.ebuild | 4 +- app-emulation/wine-staging/wine-staging-6.6.ebuild | 4 +- app-emulation/wine-staging/wine-staging-6.7.ebuild | 4 +- .../wine-staging/wine-staging-9999.ebuild | 4 +- app-emulation/wine-vanilla/Manifest | 12 +- app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild | 4 +- app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild | 4 +- app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild | 4 +- app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild | 4 +- app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild | 4 +- .../wine-vanilla/wine-vanilla-9999.ebuild | 4 +- 60 files changed, 2344 insertions(+), 331 deletions(-) create mode 100644 app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild delete mode 100644 app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild delete mode 100644 app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild delete mode 100644 app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild delete mode 100644 app-emulation/genymotion-bin/genymotion-bin-3.2.0.ebuild create mode 100644 app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild create mode 100644 app-emulation/lxc/lxc-4.0.8.ebuild create mode 100644 app-emulation/lxd/lxd-4.0.6.ebuild create mode 100644 app-emulation/qemu/qemu-6.0.0.ebuild create mode 100644 app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild create mode 100644 app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild create mode 100644 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild create mode 100644 app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild create mode 100644 app-emulation/virtualbox/virtualbox-6.1.22.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 66a7ac62701d..369fdc380d96 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 18b9ad8f94cb..645a9cbc4e3f 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,10 +1,6 @@ DIST diskimage-builder-3.10.0.tar.gz 474514 BLAKE2B 75e54b58be31a1d175ea97fd587040d2d8a69619fa66f7283866241c8a38b898c7e863b484be1199b61fe5fce76f51a4e5bf72d42fbd5d5456b1402501c337f0 SHA512 678718eb12e024899d0020c0219899e213a69a445afe3352a49a99dc786d7388e0af37c0fb1273eeb2176ad3b24f62f8299b4f15e9f7fc9714f03be3bf3b4f7c -DIST diskimage-builder-3.7.0.tar.gz 472703 BLAKE2B 4c3bf294f33556525f65d29e999cccaa4066d42f8e17742041666872ac01f5c6acab77d20b5d4281cc385a3f6988086e43c36f5330a656e5d2cb73c2e63e346d SHA512 c4453840f043774446e8dcb88bdc841d2fee8fb60432168fe48048171896932f2be9048fb0af9c5b777978218ec51f24bdfd6484a8e6cbe7a195b6df2508a1e1 -DIST diskimage-builder-3.8.0.tar.gz 473795 BLAKE2B 86ce05ac649ff0faef90d9dd6f2677d6cc609e2fa4613ab00b88f75b861e586650f4a74ea01d1fb68745581d043b0dc7d8f3c9e8437ee16003a34ffc617ab513 SHA512 f3e553746f77545cf6cfe7fad706000bfa9761878f4481bae5fe8d06118c2e0360a7af220e89fe3d65320a6a2ae8b4f4ae69259fa9455bebe8bae8b07acff455 -DIST diskimage-builder-3.9.0.tar.gz 473797 BLAKE2B 79654b7d5673d084e81850be102174b509c43fc598b54455256309abe9e503db779be03a440cd5bc6c37fd890bba9412cd8850dfc2bf855f7d8bf69e1e26ee6e SHA512 8be45bef3680b7a5c7aeb1a301a09ace26db51b4f842a7fdb19194a82cc3436e18296e9a3b88a75cfeccbd14e9098d6ad83f50ca44f7eaeba85accf4ef54e7da -EBUILD diskimage-builder-3.10.0.ebuild 1123 BLAKE2B cc82c9e4c73aae92442577bf136ef2e9bdbe932520b5c1032d9d5228a804f3c1a04398c4cec040f7e663b34c3ab750c2db287aa86ce664c6559c52a2a4c231cf SHA512 645ab4802e59c14b9f2311a24caa9afdddcf132c07134d6f95e59b82b689aabf88ae9d6ef168d7f9c5b9c124550803e00eade2711c850df23941c033e2781120 -EBUILD diskimage-builder-3.7.0.ebuild 1121 BLAKE2B a64ba6cca5c81049cbbdbd6e04628f3a50f478e7f61b9c5137ec65149752fa09af7ad8563c2711c7fc1f6568703b09c29a81a701a872d8e9a5b490278e16c61f SHA512 ca9964ecd5c57a57952a995cb650ae0ff4394e85f31a72eef282a2783e29aed87ebc602e8a2e98c4f03bf89a413769cc5ce3706058baa394bc1c7ccb104c4543 -EBUILD diskimage-builder-3.8.0.ebuild 1123 BLAKE2B cc82c9e4c73aae92442577bf136ef2e9bdbe932520b5c1032d9d5228a804f3c1a04398c4cec040f7e663b34c3ab750c2db287aa86ce664c6559c52a2a4c231cf SHA512 645ab4802e59c14b9f2311a24caa9afdddcf132c07134d6f95e59b82b689aabf88ae9d6ef168d7f9c5b9c124550803e00eade2711c850df23941c033e2781120 -EBUILD diskimage-builder-3.9.0.ebuild 1123 BLAKE2B cc82c9e4c73aae92442577bf136ef2e9bdbe932520b5c1032d9d5228a804f3c1a04398c4cec040f7e663b34c3ab750c2db287aa86ce664c6559c52a2a4c231cf SHA512 645ab4802e59c14b9f2311a24caa9afdddcf132c07134d6f95e59b82b689aabf88ae9d6ef168d7f9c5b9c124550803e00eade2711c850df23941c033e2781120 +DIST diskimage-builder-3.11.0.tar.gz 475123 BLAKE2B 2d286193c99077b943ddc2342871878d78380c27b247cca895d14e9ca1ca69c3d260fe0061e9f09a80156cee327234ce0a8c129f2008422d0db1bd736175f490 SHA512 083a3dff0ec32cd35cb5a95f25b115778aa4b74ab47796c13ac007fa6af5940140117eb4c2b5f44674316f65b0c0b53b6e077787e8018f6d7735906d333d2da0 +EBUILD diskimage-builder-3.10.0.ebuild 1121 BLAKE2B a64ba6cca5c81049cbbdbd6e04628f3a50f478e7f61b9c5137ec65149752fa09af7ad8563c2711c7fc1f6568703b09c29a81a701a872d8e9a5b490278e16c61f SHA512 ca9964ecd5c57a57952a995cb650ae0ff4394e85f31a72eef282a2783e29aed87ebc602e8a2e98c4f03bf89a413769cc5ce3706058baa394bc1c7ccb104c4543 +EBUILD diskimage-builder-3.11.0.ebuild 1123 BLAKE2B cc82c9e4c73aae92442577bf136ef2e9bdbe932520b5c1032d9d5228a804f3c1a04398c4cec040f7e663b34c3ab750c2db287aa86ce664c6559c52a2a4c231cf SHA512 645ab4802e59c14b9f2311a24caa9afdddcf132c07134d6f95e59b82b689aabf88ae9d6ef168d7f9c5b9c124550803e00eade2711c850df23941c033e2781120 EBUILD diskimage-builder-9999.ebuild 1123 BLAKE2B 5848bfa1c44cc05d104c38c37307f870aa30654be677093be98d5ece398235ec64ca5c0a980a8c366b8d09f273788bd1373d6d98f6512385c95ad9545644a2b3 SHA512 4f6c0771ba57a5339e0686577b57ab509642bcb1f2cd05a911e7158f2fb6c6b4a6f431535fe2a5f89d3cb4d9ec343dafcf15de2592c2c595d4a803571ce31bfa MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild index 4c39e9fb0b8c..3e9683aa3bc4 100644 --- a/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild +++ b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" fi LICENSE="Apache-2.0" diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild new file mode 100644 index 000000000000..4c39e9fb0b8c --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-3.11.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Golden Disk Image builder." +HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" +else + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + +CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] + !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" +DEPEND="${CDEPEND}" +RDEPEND="${CDEPEND} + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] + >=dev-python/networkx-1.10[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] + app-emulation/qemu + sys-block/parted + sys-fs/multipath-tools + sys-fs/dosfstools + sys-apps/gptfdisk + !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild deleted file mode 100644 index 3e9683aa3bc4..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild deleted file mode 100644 index 4c39e9fb0b8c..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-3.8.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild deleted file mode 100644 index 4c39e9fb0b8c..000000000000 --- a/app-emulation/diskimage-builder/diskimage-builder-3.9.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Golden Disk Image builder." -HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/" -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" -DEPEND="${CDEPEND}" -RDEPEND="${CDEPEND} - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] - !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.10[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - app-emulation/qemu - sys-block/parted - sys-fs/multipath-tools - sys-fs/dosfstools - sys-apps/gptfdisk - !dev-python/dib-utils[${PYTHON_USEDEP}]" diff --git a/app-emulation/docker-credential-helpers/Manifest b/app-emulation/docker-credential-helpers/Manifest index 24db9c1f716c..991c575bb877 100644 --- a/app-emulation/docker-credential-helpers/Manifest +++ b/app-emulation/docker-credential-helpers/Manifest @@ -1,3 +1,3 @@ DIST docker-credential-helpers-0.6.3.tar.gz 28971 BLAKE2B b50e4de0f3b126e0118f24f845a94be5e932975ab54ad6e0a52129a56109ecafb021f14986569295242cb0af4ea109d8786b8a5ca8481cc48daad14671841432 SHA512 2d15be8df134bff08eef9461348f07cd57c70c15a0ab044de2e69296c400b8c0e16198c90fd064d5ce83037d0bad57520e7524b0832b7a00e69397203dc90d10 -EBUILD docker-credential-helpers-0.6.3.ebuild 1245 BLAKE2B 7151fc66ed32fa3c43e1c8df41f18431c15f843dd88985fd25a0864a0c99eed0c31ed168d3e8ed4d6460286a919140658e45a0f87630a443b7ceea6b9ef9071a SHA512 7f3a855a1c78a5f36f7bcd784cbb01dfd34d6796cf91376bb949ff98e1cf66b056a8cdb5755cc252392d827a352c30a813da0fb3556c62ba3ab8d3eb1361ead1 +EBUILD docker-credential-helpers-0.6.3.ebuild 1244 BLAKE2B 25fbe23b6fdb260ee8623f91e3df3f0a75e75cdc42f3ddf12ccb179f7e792142956fdc192701fa31c357e9d76fddd6840418d566cccc5110817ab2804ef61b9a SHA512 e5f93230354e429c0f5e84add71971c417e7399ba743eb67b52e7a0969e138034dcac1a17c453ae2b3f369ec0ae63e2f9686868ae1ed5ea3d62a843f4671314d MISC metadata.xml 877 BLAKE2B 5411cc175644103cddc23decc424aa517f71296362ea3859cc969fc50ffec41b4fd325e98f681e9798e196f6da3f30dc86a4af0ca797d2d83684920b58550cc0 SHA512 e7f7a33a2fb1bbf308606d713691153304b2989de19a8a6f618471b252889d12af8d0737f53379a90da628dea2f7ea6fa61222e4d57c91297731b4b7f52cb793 diff --git a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild index 1b1d5979dcfc..ea5a5b0037df 100644 --- a/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild +++ b/app-emulation/docker-credential-helpers/docker-credential-helpers-0.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SLOT="0" if [[ ${PV} = *9999* ]]; then inherit golang-vcs else - KEYWORDS="~amd64 ~arm64" + KEYWORDS="amd64 ~arm64" EGIT_COMMIT="v${PV}" SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" inherit golang-vcs-snapshot diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest index a392df24c8fe..9d25b03810d1 100644 --- a/app-emulation/genymotion-bin/Manifest +++ b/app-emulation/genymotion-bin/Manifest @@ -1,3 +1,3 @@ -DIST genymotion-3.2.0-linux_x64.bin 48173545 BLAKE2B 3b921dfe01d56989d8f8998f6555fceabbfeacd3e87969dcc226d354e1ad5173e37682127d3158bbb280fa72386fd67adbcc3e64b2c5325c8144f106a8fd4469 SHA512 934047a4ced3dcc97c4be4f9767b885d79451701d974471e55b338ffb6bdb255654933678b6a8ba5a732b95ad0992b049effe2bcb8d05957526093b246d5deb6 -EBUILD genymotion-bin-3.2.0.ebuild 3513 BLAKE2B b6aec93ad7fbe91e6e9a52b03e31b6e7f62d53e1aa6fc34b7a0a31d813cfc5bb36053b28db18e13b943aabc790bb5fcbac5ae6f275a5cbc5ba0ce3c909f85c05 SHA512 b6a215f0928577b96ae2222aa9c60ea971990242895c2a7cdbecf517fed7ed7ec1393bb263a446c67636a9843c5c884cf3b5204e9afe993ee2435d0f0913fdcf +DIST genymotion-3.2.1-linux_x64.bin 48264053 BLAKE2B 961b2480ed72ad29e1b71d98cedf98cb724e42032539445aa19e2783f2d714f389d983aa5d886e8f759a1a77585725daa1084ffac3d7083f72de78ccab46af77 SHA512 47589913c66dac42e107420574cdc1fd7ea6db8dacfa16c0173a72207f77d0bedf72e6c6643453b1b83e1e7d906ea52e79e3876d3d687bb689f251ce3bfa8385 +EBUILD genymotion-bin-3.2.1.ebuild 3218 BLAKE2B 21b7465d5aa0fad810c57922b9e91e0f72dccc216045b9e83335119345193aa616532d1367b3c7f19810dcac722b6700f876009428f75c36383575dd9411edc8 SHA512 d8020641f06594931127ce1ace3cd9805fba484ff8b788b2af7cfbcfc1290a39bd52be24a0a745c8ca995c3c78bac75520620923607f2c3526fadb92eff3d26d MISC metadata.xml 401 BLAKE2B 931e25a3d3febffc304151165b7573a1d3d6d1977ffb842dc25142083106f21e025ab8006757e97382e0287ee1240842e66ebbd44e6543382d08497559a6dd05 SHA512 4d7350199a900f6658f00ab900ba282cca1369248b03099ce0bce113bd33028893e7894605e035446d4c0d62f7231f05734fe19b6ebcf120d9e8ec6245053148 diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.2.0.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.2.0.ebuild deleted file mode 100644 index 1b6fe08cd282..000000000000 --- a/app-emulation/genymotion-bin/genymotion-bin-3.2.0.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 desktop pax-utils - -MY_PN="${PN/-bin}" -MY_P="${MY_PN}-${PV}" -BIN_ARCHIVE="${MY_P}-linux_x64.bin" - -DESCRIPTION="Complete set of tools that provide a virtual environment for Android" -HOMEPAGE="https://genymotion.com" -SRC_URI="${BIN_ARCHIVE}" - -LICENSE="genymotion" -SLOT="0" -KEYWORDS="-* ~amd64" - -RDEPEND="app-emulation/virtualbox - || ( - dev-libs/openssl-compat:1.0.0 - =dev-libs/openssl-1.0*:0 - ) - dev-libs/hiredis:0/0.14 - sys-apps/util-linux - virtual/opengl -" -BDEPEND="dev-util/patchelf" - -RESTRICT="bindist fetch" -S="${WORKDIR}" - -QA_PREBUILT=" - opt/${MY_PN}/*.so* - opt/${MY_PN}/imageformats/*.so - opt/${MY_PN}/plugins/*.so* - opt/${MY_PN}/${MY_PN} - opt/${MY_PN}/genyshell - opt/${MY_PN}/player - opt/${MY_PN}/${MY_PN}adbtunneld - opt/${MY_PN}/gmtool -" - -pkg_nofetch() { - einfo - einfo "Please visit" - einfo - einfo " https://www.genymotion.com/download/" - einfo - einfo "and download " - einfo - einfo " ${BIN_ARCHIVE}" - einfo - einfo "which must be placed in DISTDIR directory." - einfo -} - -src_unpack() { - cp "${DISTDIR}/${BIN_ARCHIVE}" "${WORKDIR}" || die "cp failed" -} - -src_prepare() { - default - - chmod +x ${BIN_ARCHIVE} || die "chmod failed" - yes | ./${BIN_ARCHIVE} > /dev/null || die "unpack failed" - - # removed windows line for bashcompletion - sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed" - - # patch to support newer hiredis version (0.14) - for i in genymotion genyshell gmtool player libcom.so.1.0.0 librendering.so.1.0.0 ; do - patchelf --replace-needed libhiredis.so.0.13 libhiredis.so.0.14 "${MY_PN}/${i}" || die "Unable to patch ${i} for hiredis" - done -} - -src_install() { - insinto /opt/"${MY_PN}" - exeinto /opt/"${MY_PN}" - - # Use qt bundled - doins -r "${MY_PN}"/{geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2} - doins -r "${MY_PN}"/{icons,imageformats,platforms,plugins,sqldrivers,translations,xcbglintegrations} - doins "${MY_PN}"/libQt* - doins "${MY_PN}"/qt.conf - doins "${MY_PN}"/libicu* - - doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so* - # android library - doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so* - - find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed" - - doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool} - - pax-mark -m "${ED}/opt/${MY_PN}/genymotion" - pax-mark -m "${ED}/opt/${MY_PN}/gmtool" - - dosym ../"${MY_PN}"/genyshell /opt/bin/genyshell - dosym ../"${MY_PN}"/genymotion /opt/bin/genymotion - dosym ../"${MY_PN}"/gmtool /opt/bin/gmtool - - newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool - - insinto /usr/share/zsh/site-functions - doins "${MY_PN}/completion/zsh/_gmtool" - - sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/icon.png:" \ - -e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \ - "${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed" - domenu "${HOME}"/.local/share/applications/genymobile-genymotion.desktop -} - -pkg_postinst() { - elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager" - elog "'Android SDK Platform-tools' and 'Android SDK Tools'" - elog "Your user should also be in the android group to work correctly" - elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)" - elog - elog " /opt/android-sdk-update-manager" -} diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild new file mode 100644 index 000000000000..5cf358b040a3 --- /dev/null +++ b/app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 desktop pax-utils + +MY_PN="${PN/-bin}" +MY_P="${MY_PN}-${PV}" +BIN_ARCHIVE="${MY_P}-linux_x64.bin" + +DESCRIPTION="Complete set of tools that provide a virtual environment for Android" +HOMEPAGE="https://genymotion.com" +SRC_URI="${BIN_ARCHIVE}" + +LICENSE="genymotion" +SLOT="0" +KEYWORDS="-* ~amd64" + +RDEPEND="app-emulation/virtualbox + || ( + dev-libs/openssl-compat:1.0.0 + =dev-libs/openssl-1.0*:0 + ) + >=dev-libs/hiredis-1.0.0 + sys-apps/util-linux + virtual/opengl +" + +RESTRICT="bindist fetch" +S="${WORKDIR}" + +QA_PREBUILT=" + opt/${MY_PN}/*.so* + opt/${MY_PN}/imageformats/*.so + opt/${MY_PN}/plugins/*.so* + opt/${MY_PN}/${MY_PN} + opt/${MY_PN}/genyshell + opt/${MY_PN}/player + opt/${MY_PN}/${MY_PN}adbtunneld + opt/${MY_PN}/gmtool +" + +pkg_nofetch() { + einfo + einfo "Please visit" + einfo + einfo " https://www.genymotion.com/download/" + einfo + einfo "and download " + einfo + einfo " ${BIN_ARCHIVE}" + einfo + einfo "which must be placed in DISTDIR directory." + einfo +} + +src_unpack() { + cp "${DISTDIR}/${BIN_ARCHIVE}" "${WORKDIR}" || die "cp failed" +} + +src_prepare() { + default + + chmod +x ${BIN_ARCHIVE} || die "chmod failed" + yes | ./${BIN_ARCHIVE} > /dev/null || die "unpack failed" + + # removed windows line for bashcompletion + sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed" +} + +src_install() { + insinto /opt/"${MY_PN}" + exeinto /opt/"${MY_PN}" + + # Use qt bundled + doins -r "${MY_PN}"/{geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2} + doins -r "${MY_PN}"/{icons,imageformats,platforms,plugins,sqldrivers,translations,xcbglintegrations} + doins "${MY_PN}"/libQt* + doins "${MY_PN}"/qt.conf + doins "${MY_PN}"/libicu* + + doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so* + # android library + doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so* + + find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed" + + doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool} + + pax-mark -m "${ED}/opt/${MY_PN}/genymotion" + pax-mark -m "${ED}/opt/${MY_PN}/gmtool" + + dosym ../"${MY_PN}"/genyshell /opt/bin/genyshell + dosym ../"${MY_PN}"/genymotion /opt/bin/genymotion + dosym ../"${MY_PN}"/gmtool /opt/bin/gmtool + + newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool + + insinto /usr/share/zsh/site-functions + doins "${MY_PN}/completion/zsh/_gmtool" + + sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/icon.png:" \ + -e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \ + "${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed" + domenu "${HOME}"/.local/share/applications/genymobile-genymotion.desktop +} + +pkg_postinst() { + elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager" + elog "'Android SDK Platform-tools' and 'Android SDK Tools'" + elog "Your user should also be in the android group to work correctly" + elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)" + elog + elog " /opt/android-sdk-update-manager" +} diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index 0487789935af..78588e27d77f 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -4,5 +4,8 @@ AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650 AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43 SHA512 98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15 DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7 SHA512 baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db -EBUILD lxc-4.0.6.ebuild 4702 BLAKE2B 3fc686cfdbd38610702ae2aa0569a5f2dc8df2cdfc181f313f74e91015bf91ba1f565a347dc1dc2850fb3b6638a574879af5324d1a429c7763a33274ae76259c SHA512 ff8da7a1f545e079b0505517a5bd7f603c1e2e097c7c016e18925f88817cc35457c4195029c8368afe759cb590f7b28c362a724714201cee9f9b046ad2711560 +DIST lxc-4.0.8.tar.gz 1488025 BLAKE2B 51bbbf968bc07472214edbad89ed703f54347d5dd78860a2954609d87a1971326a5fcc2254890756d769dcf5e6005e19f6eff34fd923bb594cffcea0b8100ebd SHA512 b2b9887c5c4646fbd873fd15779a563954ac729bfbd546ccc2b9c7e5e283b3b3189290a31cc6c549881201ff29d955b56c084a72c080f48f83240c12b46ce85e +DIST lxc-4.0.8.tar.gz.asc 833 BLAKE2B 36e82957f878553b04dffc18aa82b81a55b400f4ceeddc2a47f3c1c28c34356f358626dbbc712dadd72678ef3340028817d5addc011fe5650419acf4bdd4f0f1 SHA512 138a17d971466c7a14f4da40af7163bb752be9008f00f6ce240fdc416ad97bd0b89b181b8565a95592bb2de456fba117e3263fb87eb92ced99ae3d7e984dc9b3 +EBUILD lxc-4.0.6.ebuild 4641 BLAKE2B 7344c4c288841bf83d9e55cf80487927fe5faa329d9eddbf6ca9009fe16aaf26957d7e5fb5dd61735b20bc1b93a81cfc3a06b52d53ecff51c869a280add09ca0 SHA512 9882e81775f6c5b3fa0075ce3c0b143419b4b11e838f16160d2466e19c82c5bd20fee58a25a64d72f613e08719339cdf47a15ff5e801d260e5cbd664f841ffd8 +EBUILD lxc-4.0.8.ebuild 4671 BLAKE2B 445b62d24e7b11fe9aff915ff52edc5fce05076e4c725b69ff8c2de2f694669ddbb70fbe58980bb9935d619015569482eafd1ed7a7c8f60a5f3f43abb0ec7b30 SHA512 7f2b725301619dc29b8376976dfa34e8d8ac1a728be2080717991b054e4e8f9b824db067f44d4dbe94400f5f12ba8c3a5ad2b1c7abd55330678575057327ddc6 MISC metadata.xml 620 BLAKE2B 459aa85a0e432faff7d0a2a1e61d536bde2e07e057ce8da642e07582219605643740f1241f83d19335a96de568841234bc2505273570bafbd187bb51da64a674 SHA512 303ca453f18cdbeef118e6a452b1a0e56d2466cba47fec8d021c1b8e4a9998ba743a729fdadc71e27e98f1fe12f43d17d76820986aeb93f286e74565c1a852f6 diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild b/app-emulation/lxc/lxc-4.0.6.ebuild index ff87b65cfbfb..e22cf583db24 100644 --- a/app-emulation/lxc/lxc-4.0.6.ebuild +++ b/app-emulation/lxc/lxc-4.0.6.ebuild @@ -14,7 +14,7 @@ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" LICENSE="LGPL-3" SLOT="0" -IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools verify-sig" +IUSE="apparmor +caps doc examples man pam selinux +ssl +tools verify-sig" RDEPEND="acct-group/lxc acct-user/lxc @@ -27,8 +27,7 @@ RDEPEND="acct-group/lxc pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= )" DEPEND="${RDEPEND} >=sys-kernel/linux-headers-4 diff --git a/app-emulation/lxc/lxc-4.0.8.ebuild b/app-emulation/lxc/lxc-4.0.8.ebuild new file mode 100644 index 000000000000..89a0b2e2b2df --- /dev/null +++ b/app-emulation/lxc/lxc-4.0.8.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig + +DESCRIPTION="A userspace interface for the Linux kernel containment features" +HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc" +SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="apparmor +caps doc man pam selinux +ssl +tools verify-sig" + +RDEPEND="acct-group/lxc + acct-user/lxc + app-misc/pax-utils + sys-apps/util-linux + sys-libs/libcap + sys-libs/libseccomp + virtual/awk + caps? ( sys-libs/libcap ) + pam? ( sys-libs/pam ) + selinux? ( sys-libs/libselinux ) + ssl? ( + dev-libs/openssl:0= + )" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-4 + apparmor? ( sys-apps/apparmor )" +BDEPEND="doc? ( app-doc/doxygen ) + man? ( app-text/docbook-sgml-utils ) + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + +CONFIG_CHECK="~!NETPRIO_CGROUP + ~CGROUPS + ~CGROUP_CPUACCT + ~CGROUP_DEVICE + ~CGROUP_FREEZER + + ~CGROUP_SCHED + ~CPUSETS + ~IPC_NS + ~MACVLAN + + ~MEMCG + ~NAMESPACES + ~NET_NS + ~PID_NS + + ~POSIX_MQUEUE + ~USER_NS + ~UTS_NS + ~VETH" + +ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" +ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" +ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers" +ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" +ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command" +ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" +ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking" + +DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt ) + +pkg_setup() { + linux-info_pkg_setup +} + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch + "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854 +) + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +src_prepare() { + default + eautoreconf +} + +src_configure() { + append-flags -fno-strict-aliasing + + local myeconfargs=( + --bindir=/usr/bin + --localstatedir=/var + --sbindir=/usr/bin + + --with-config-path=/var/lib/lxc + --with-distro=gentoo + --with-init-script=systemd + --with-rootfs-path=/var/lib/lxc/rootfs + --with-runtime-path=/run + --with-systemdsystemunitdir=$(systemd_get_systemunitdir) + + --disable-coverity-build + --disable-dlog + --disable-fuzzers + --disable-mutex-debugging + --disable-no-undefined + --disable-rpath + --disable-sanitizers + --disable-tests + --disable-werror + + --enable-bash + --enable-commands + --enable-memfd-rexec + --enable-seccomp + --enable-thread-safety + + $(use_enable apparmor) + $(use_enable caps capabilities) + $(use_enable doc api-docs) + $(use_enable doc examples) + $(use_enable man doc) + $(use_enable pam) + $(use_enable selinux) + $(use_enable ssl openssl) + $(use_enable tools) + + $(use_with pam pamdir $(getpam_mod_dir)) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die + bashcomp_alias ${PN}-start \ + ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait} + + keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc + rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed" + + find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die + + # Gentoo-specific additions! + newinitd "${FILESDIR}/${PN}.initd.8" ${PN} + + # Remember to compare our systemd unit file with the upstream one + # config/init/systemd/lxc.service.in + systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service" + + DOC_CONTENTS=" + For openrc, there is an init script provided with the package. + You should only need to symlink /etc/init.d/lxc to + /etc/init.d/lxc.configname to start the container defined in + /etc/lxc/configname.conf. + + Correspondingly, for systemd a service file lxc@.service is installed. + Enable and start lxc@configname in order to start the container defined + in /etc/lxc/configname.conf." + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + elog "Please run 'lxc-checkconfig' to see optional kernel features." + elog + optfeature "automatic template scripts" app-emulation/lxc-templates + optfeature "Debian-based distribution container image support" dev-util/debootstrap + optfeature "snapshot & restore functionality" sys-process/criu +} diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest index f86ab43a4210..17c184819582 100644 --- a/app-emulation/lxd/Manifest +++ b/app-emulation/lxd/Manifest @@ -6,5 +6,8 @@ AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67f AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718 DIST lxd-4.0.5.tar.gz 14659330 BLAKE2B 4d61885a94946d3a6018324512ea318716cb9c1bc5f40be4eb62f71ad6a0eb993cda0ef917fbefb3949c0d47a6217245cc62e0ced3abfbcf47f6d8375a7d85d0 SHA512 8b9e6742dc3383fb31dce33d9f8ffe7a0ea661d274f6c3ac710f58d4d5b90b596881386571564ec0cd8f027da43eaa3948dd675d6fa07f1095405f4cc05f1211 DIST lxd-4.0.5.tar.gz.asc 833 BLAKE2B f5b2ead748973831ec7ba7be00c34d26b16a6b168fb88a25f07126eeab5c812cab72609acc443e9bb541ff64849952bf66f8ee207083836a2aab905f1373c1e0 SHA512 b59edaf88cd8ab34271eb0ebb52270ede1509351596449b1b955eaba70a50f6f18fdc95fcc933deca3fe545b9aa45bfda3b7aa6553a8b4f2cedc8d1a6b3a5946 +DIST lxd-4.0.6.tar.gz 15353779 BLAKE2B f699e91c53b407e5a0e47fe40b133d6216754b1e5c5829ee68993468565f2080c12cbcbf8373d6da16ca94a3648ec51b874e66ff589be09dc95f2382d18f3e12 SHA512 58efaac50dbcbb3cf0e7aa1b3b43085beae4546dfcd081720b049c2b88bf120b9a74e7db1238bbdd8cc2449e039b076ece3734e8f46f3ddbdc70aaae8b326963 +DIST lxd-4.0.6.tar.gz.asc 833 BLAKE2B 6d1756b130a944a98e62d809c45129178bfc39158c71e09319cdaff7461b14bda467e44a781bb5c15d40afdae4d3ec86f98919738a8c169d3fff910d8e9fe58a SHA512 6c59bd8ec9bf0d9bd90c8ab2970cf6928c0bef3736631ea2a56ebc464f33940366d35925ddfc4104c13fa0fd4e1bea42796e0a2eb82a8bf395957829f938c7db EBUILD lxd-4.0.5.ebuild 3744 BLAKE2B 4034a472a91e650d7ac141f650db6fa8d78060491db95baa6bce4f246f1f1c34681d5e292ab31ea914bb5b7717b6ea820a2870f85391cd1e8270066b611b918a SHA512 c28ece030f7a3c4919e156585f031ff653851857029d3a0164fa4b095ecf0f61faeb3b44b49f350cf0985fe35295fad727b5c457cf7aeed87d5a096ae2add31e +EBUILD lxd-4.0.6.ebuild 3892 BLAKE2B 396f95dadd97bd1fdd2442668e1b4cfec818ce4def49099e8b5b6f14a0182fc1acacec6f993eefab44311570af1392a874ce7d3195476da9504998fe66675579 SHA512 5a62ded7071f3750d13af637b308de63c81ad459fbe8b93fe6dbcf3c4a6a1ba930a15339687d5241c7e51e40ec3622a995a8143200f01b6a5425c73c56cae1f3 MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0 diff --git a/app-emulation/lxd/lxd-4.0.6.ebuild b/app-emulation/lxd/lxd-4.0.6.ebuild new file mode 100644 index 000000000000..bfa426ef05e4 --- /dev/null +++ b/app-emulation/lxd/lxd-4.0.6.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig + +DESCRIPTION="Fast, dense and secure container management" +HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd" +SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="apparmor ipv6 nls verify-sig" + +DEPEND="app-arch/xz-utils + >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)] + dev-libs/dqlite + dev-libs/lzo + dev-libs/raft + net-dns/dnsmasq[dhcp,ipv6?]" +RDEPEND="${DEPEND} + acct-group/lxd + net-firewall/ebtables + net-firewall/iptables[ipv6?] + sys-apps/iproute2[ipv6?] + sys-fs/fuse:* + sys-fs/lxcfs + sys-fs/squashfs-tools[lzma] + virtual/acl" +BDEPEND="dev-lang/go + nls? ( sys-devel/gettext ) + verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )" + +CONFIG_CHECK=" + ~CGROUPS + ~IPC_NS + ~NET_NS + ~PID_NS + + ~SECCOMP + ~USER_NS + ~UTS_NS +" + +ERROR_IPC_NS="CONFIG_IPC_NS is required." +ERROR_NET_NS="CONFIG_NET_NS is required." +ERROR_PID_NS="CONFIG_PID_NS is required." +ERROR_SECCOMP="CONFIG_SECCOMP is required." +ERROR_UTS_NS="CONFIG_UTS_NS is required." + +# Go magic. +QA_PREBUILT="/usr/bin/fuidshift + /usr/bin/lxc + /usr/bin/lxc-to-lxd + /usr/bin/lxd-agent + /usr/bin/lxd-benchmark + /usr/bin/lxd-p2c + /usr/sbin/lxd" + +EGO_PN="github.com/lxc/lxd" +GOPATH="${S}/_dist" # this seems to reset every now and then, though + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +src_prepare() { + default + + export GOPATH="${S}/_dist" + + sed -i \ + -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \ + -e "s:make:make ${MAKEOPTS}:g" \ + Makefile || die + + # Fix hardcoded ovmf file path, see bug 763180 + sed -i \ + -e "s:/usr/share/OVMF:/usr/share/edk2-ovmf:g" \ + -e "s:OVMF_VARS.ms.fd:OVMF_VARS.secboot.fd:g" \ + doc/environment.md \ + lxd/apparmor/instance_qemu.go \ + lxd/instance/drivers/driver_qemu.go || die "Failed to fix hardcoded ovmf paths." +} + +src_configure() { :; } + +src_compile() { + export GOPATH="${S}/_dist" + export GO111MODULE=auto + + cd "${S}" || die + + for k in fuidshift lxd-benchmark lxc lxc-to-lxd; do + go install -v -x "${EGO_PN}/${k}" || die "failed compiling ${k}" + done + + go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon" + + # Needs to be built statically + CGO_ENABLED=0 go install -v -tags netgo "${EGO_PN}"/lxd-p2c + CGO_ENABLED=0 go install -v -tags agent,netgo "${EGO_PN}"/lxd-agent + + use nls && emake build-mo +} + +src_test() { + export GO111MODULE=auto + export GOPATH="${S}/_dist" + go test -v ${EGO_PN}/lxd || die +} + +src_install() { + local bindir="_dist/bin" + export GOPATH="${S}/_dist" + + dosbin ${bindir}/lxd + + for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do + dobin ${bindir}/${l} + done + + cd "${S}" || die + + newbashcomp scripts/bash/lxd-client lxc + + newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd + newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd + + if use apparmor; then + systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service + else + systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service + fi + + systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service + systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket + + dodoc AUTHORS doc/* + use nls && domo po/*.mo +} + +pkg_postinst() { + elog + elog "Consult https://wiki.gentoo.org/wiki/LXD for more information," + elog "including a Quick Start." + elog + elog "Please run 'lxc-checkconfig' to see all optional kernel features." + elog + optfeature "btrfs storage backend" sys-fs/btrfs-progs + optfeature "lvm2 storage backend" sys-fs/lvm2 + optfeature "zfs storage backend" sys-fs/zfs + elog + elog "Be sure to add your local user to the lxd group." +} diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest index 0763fe417d10..e6ffdc184363 100644 --- a/app-emulation/nemu/Manifest +++ b/app-emulation/nemu/Manifest @@ -1,6 +1,6 @@ DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a DIST nemu-2.5.0.tar.gz 108742 BLAKE2B e68cbf50d56983873656d8e3428cb3ffaa09cafc9cbc8e545d72bf9dfb61e64a06bdc41c3f50011c4c488017efe33afe9fa1d634aae6e9151c45a7d3971c60db SHA512 081199413c41e545d23704091760c4a10b8dcdb21d9d0e6add1e549fa33bdd988490034767e08dee681eee6d06899104b8282cafc4578e06a0eabc505325bbdc EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba -EBUILD nemu-2.5.0.ebuild 2124 BLAKE2B 8957ff9b7fa1ff385bd7f5509c3b5e6d3ca054e479ae0e54a8d6b0ca62b6cf143ac8d20d6ccf0392cdb55a489c42007c3293668450338cc4ba69a09cad160655 SHA512 bd8e64614f83c494c1bf32d91fea2a556a00998fa5ca36bc171a9f45c41c55a15d7407173ebbcb92616309f01fedc204d514e701c9982e9c53b7b58cfc0bcb67 +EBUILD nemu-2.5.0.ebuild 2126 BLAKE2B 9b44d87d92e59ad7a660e5eb28d06678ee1771a4cdee5d3054f4806e32c98d07b9348a248528e9c3b8bfda7c6a682989c44e20fd64c37326e9406748d285f1fb SHA512 d6687a6d6f4ecbc9b8f3eb892b2e92a9f9cfc34e9d707bae7560f6a4c6e9203061108ce9e083914d72451f6817b23b232b77ab40f2c866d5f9678964bb30af75 EBUILD nemu-9999.ebuild 1807 BLAKE2B 184913b0d41c88acc6861ca2cd1f1dca5d82c6646ae7066465e82782eb610712e75a0ddfb1431fdf414e4aa57f66438a80e61fc5f266d3204be08bd0e3fb7a21 SHA512 c36e0f8285d7131ae2d72b9ec9c061f2f32749565537f7863ffce35eb7f52a7d438b33ce06d451e15e4490f7cc188c382641e4b21fc4a2bbb946f7fafa70aa8d MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315 diff --git a/app-emulation/nemu/nemu-2.5.0.ebuild b/app-emulation/nemu/nemu-2.5.0.ebuild index 7747ae0c73a6..799186bb4b86 100644 --- a/app-emulation/nemu/nemu-2.5.0.ebuild +++ b/app-emulation/nemu/nemu-2.5.0.ebuild @@ -33,7 +33,7 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND="sys-devel/gettext" -S="${WORKDIR}/$PN-${MY_PV}/" +S="${WORKDIR}/${PN}-${MY_PV}/" pkg_pretend() { if use kernel_linux; then diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 8eecc19c5bc2..d342634b9e9e 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -11,8 +11,10 @@ AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e19 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3 -EBUILD qemu-5.2.0-r2.ebuild 25477 BLAKE2B ebcbdb6a2d54cf8736bceabef649afaedc23e451debd68b871b4843463c10df0065d7377ceff6f8d019d4fcf0bdf086ab481daf9f6c4bbf4056f846f84ad9c3b SHA512 0a3cb9ab6b1d9ccbf2e9b2734dc00ab163c1dbc995c5a274bb07df63aa885cdd5a6b5246019d4ad43e064845c4f6dca39c5e71f412275d87249e7047433762a0 -EBUILD qemu-5.2.0-r3.ebuild 25638 BLAKE2B d7b226e1998f6893c26cc7264b0f5fe713d3bedb2ac1a194cc8479de50c403295cb4f8fcb17afe1b02d8e2802c8161d39c574914be79f2aec9597b575de576aa SHA512 aecc7662e36c282c4d4a114285a7396f66b150d2e787678fdd9081b5bb18169184f8dfacbb85961d7bd711dcd1e82438290daa84709bbeb04e9f9153613ee504 -EBUILD qemu-5.2.0-r50.ebuild 25749 BLAKE2B 89c755160de4ecb4a7f73218bc6d8a6713984d199dcbbbc88d5d520f4c8712c75419e57b4f64b8a4a2519a9665c6aef081541585b306e677f348306e7e665197 SHA512 1f62f7af804ce6380495fccdb936819beed77ff7d8c76d5901dfebe0078851511d1e70b45b892dae4e56bf64d8305842457e110118118fe9508fb8a0a299ba13 -EBUILD qemu-9999.ebuild 25546 BLAKE2B 935bb420930bf9f6acc34d71edc2325e9419fea79f87af5284df97b76f9050dd03264ac2748d31cd079a74cccadc4cb5f1270ac1d14ea3f36d9c5093a660502a SHA512 4bd274042fc00c41850fef692f1de466e3237b2437c75855c3518e2b0ce30f4bd20cbf5daf6bd60e2e71497645504a6d201a96aa8c333719b87b2abaa6119dda +DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4 +EBUILD qemu-5.2.0-r2.ebuild 25479 BLAKE2B c53c242253d3571ba7d5484ff30773e16aa51c4c14be99c7c50326657220c3ddfe5e84074b0e99268582d8c735b6ce71a179ab5ce5d88cdda33dcd0f0cc3aef4 SHA512 88f55bba87bec4393f3e4e1706ad5352a7b2f1f531b2f4c74370beeab7e4318428113040861b0dd37ed6ce3524caadfb957ab15a329fc52cf13ea1cbbd70c86e +EBUILD qemu-5.2.0-r3.ebuild 25640 BLAKE2B 4e9a83a504eb5e310a1157c097b2637cb02704b032e5bb0b6facd6a7d46ffe027f1c9846adabd4256339cef5cf745c710ab0d8ce17f8b0505151bee97ab2d102 SHA512 aa2ec3557ded5b2b73084c4bdd7cb716d52a9f4c48b92cba205424da972a5cf5b2d998b4f9820cb65b15f092f1359a2f77b0354932652df07bdb122abc7a0c92 +EBUILD qemu-5.2.0-r50.ebuild 25751 BLAKE2B 7a316b453d112521f814fb76da71681da9317681bdc43145ebacb8b0409066177e0cd0ea5b795590d1eabf3bbab84d58d69f9f37ca09d8bfb03c71dcfc03e5e7 SHA512 b49e53851bc907f9aa16169b22c12904911ef21c261477c2bb7681391e621db37581b63c5202aaa6088b4364800d090680a5312494e630ad3092405bbea8ba24 +EBUILD qemu-6.0.0.ebuild 25548 BLAKE2B 43ccb808ddfcc2366c33aaec79a1fee3bbd66c6b4887025a067b1cd8f95c1e9f5406354b4fc94cc2de107f8bf18792f9c6e2bae62298681fc70f6a484f1fd801 SHA512 5b07feb1dffa86fc92051f6629815a9d03dd56c0d4d7461776011f40eaed7165e29d6adf21e67237fc572aa1763ab2bb5e728cdb54965c48649cfb1def157bb1 +EBUILD qemu-9999.ebuild 25548 BLAKE2B 43ccb808ddfcc2366c33aaec79a1fee3bbd66c6b4887025a067b1cd8f95c1e9f5406354b4fc94cc2de107f8bf18792f9c6e2bae62298681fc70f6a484f1fd801 SHA512 5b07feb1dffa86fc92051f6629815a9d03dd56c0d4d7461776011f40eaed7165e29d6adf21e67237fc572aa1763ab2bb5e728cdb54965c48649cfb1def157bb1 MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild index f8958f1829c3..6b38e035765e 100644 --- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild @@ -804,7 +804,7 @@ src_install() { firmware_abi_change() { local pv for pv in ${REPLACING_VERSIONS}; do - if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then return 0 fi done diff --git a/app-emulation/qemu/qemu-5.2.0-r3.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild index c92538311582..7512af2e9447 100644 --- a/app-emulation/qemu/qemu-5.2.0-r3.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild @@ -809,7 +809,7 @@ src_install() { firmware_abi_change() { local pv for pv in ${REPLACING_VERSIONS}; do - if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then return 0 fi done diff --git a/app-emulation/qemu/qemu-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild index 7a9f08f85398..6d459a989b6b 100644 --- a/app-emulation/qemu/qemu-5.2.0-r50.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild @@ -812,7 +812,7 @@ src_install() { firmware_abi_change() { local pv for pv in ${REPLACING_VERSIONS}; do - if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then return 0 fi done diff --git a/app-emulation/qemu/qemu-6.0.0.ebuild b/app-emulation/qemu/qemu-6.0.0.ebuild new file mode 100644 index 000000000000..bdf454fd8ec7 --- /dev/null +++ b/app-emulation/qemu/qemu-6.0.0.ebuild @@ -0,0 +1,905 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="ncurses,readline" + +FIRMWARE_ABI_VERSION="5.2.0-r50" + +inherit eutils linux-info toolchain-funcs multilib python-r1 +inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" + EGIT_SUBMODULES=( + meson + tests/fp/berkeley-softfloat-3 + tests/fp/berkeley-testfloat-3 + ui/keycodemapdb + ) + inherit git-r3 + SRC_URI="" +else + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" +HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" + +LICENSE="GPL-2 LGPL-2 BSD-2" +SLOT="0" + +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc + +fdt glusterfs gnutls gtk infiniband iscsi io-uring + jack jemalloc +jpeg kernel_linux + kernel_FreeBSD lzo multipath + ncurses nfs nls numa opengl +oss +pin-upstream-blobs + plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux + +slirp + smartcard snappy spice ssh static static-user systemtap test udev usb + usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen + xfs zstd" + +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + lm32 + moxie + rx + tricore + unicore32 +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" + +use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) +use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) +IUSE+=" ${use_softmmu_targets} ${use_user_targets}" + +RESTRICT="!test? ( test )" +# Allow no targets to be built so that people can get a tools-only build. +# Block USE flag configurations known to not work. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + qemu_softmmu_targets_arm? ( fdt ) + qemu_softmmu_targets_microblaze? ( fdt ) + qemu_softmmu_targets_mips64el? ( fdt ) + qemu_softmmu_targets_ppc64? ( fdt ) + qemu_softmmu_targets_ppc? ( fdt ) + qemu_softmmu_targets_riscv32? ( fdt ) + qemu_softmmu_targets_riscv64? ( fdt ) + static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy ) + static-user? ( !plugins ) + vhost-user-fs? ( caps seccomp ) + virtfs? ( caps xattr ) + vte? ( gtk ) + multipath? ( udev ) + plugins? ( !static !static-user ) +" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# and user/softmmu targets (qemu-*, qemu-system-*). +# +# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. +# +# The attr lib isn't always linked in (although the USE flag is always +# respected). This is because qemu supports using the C library's API +# when available rather than always using the external library. +ALL_DEPEND=" + >=dev-libs/glib-2.0[static-libs(+)] + sys-libs/zlib[static-libs(+)] + python? ( ${PYTHON_DEPS} ) + systemtap? ( dev-util/systemtap ) + xattr? ( sys-apps/attr[static-libs(+)] )" + +# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) +# softmmu targets (qemu-system-*). +SOFTMMU_TOOLS_DEPEND=" + dev-libs/libxml2[static-libs(+)] + >=x11-libs/pixman-0.28.0[static-libs(+)] + accessibility? ( + app-accessibility/brltty[api] + app-accessibility/brltty[static-libs(+)] + ) + aio? ( dev-libs/libaio[static-libs(+)] ) + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + bzip2? ( app-arch/bzip2[static-libs(+)] ) + capstone? ( dev-libs/capstone:= ) + caps? ( sys-libs/libcap-ng[static-libs(+)] ) + curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) + fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) + glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) + gnutls? ( + dev-libs/nettle:=[static-libs(+)] + >=net-libs/gnutls-3.0:=[static-libs(+)] + ) + gtk? ( + x11-libs/gtk+:3 + vte? ( x11-libs/vte:2.91 ) + ) + infiniband? ( + sys-fabric/libibumad:=[static-libs(+)] + sys-fabric/libibverbs:=[static-libs(+)] + sys-fabric/librdmacm:=[static-libs(+)] + ) + iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing:=[static-libs(+)] ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc ) + jpeg? ( virtual/jpeg:0=[static-libs(+)] ) + lzo? ( dev-libs/lzo:2[static-libs(+)] ) + multipath? ( sys-fs/multipath-tools ) + ncurses? ( + sys-libs/ncurses:0=[unicode] + sys-libs/ncurses:0=[static-libs(+)] + ) + nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) + numa? ( sys-process/numactl[static-libs(+)] ) + opengl? ( + virtual/opengl + media-libs/libepoxy[static-libs(+)] + media-libs/mesa[static-libs(+)] + media-libs/mesa[egl,gbm] + ) + png? ( media-libs/libpng:0=[static-libs(+)] ) + pulseaudio? ( media-sound/pulseaudio ) + rbd? ( sys-cluster/ceph ) + sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) + sdl? ( + media-libs/libsdl2[video] + media-libs/libsdl2[static-libs(+)] + ) + sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) + seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) + slirp? ( net-libs/libslirp[static-libs(+)] ) + smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) + snappy? ( app-arch/snappy:= ) + spice? ( + >=app-emulation/spice-protocol-0.12.3 + >=app-emulation/spice-0.12.0[static-libs(+)] + ) + ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) + udev? ( virtual/libudev[static-libs(+)] ) + usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) + usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) + vde? ( net-misc/vde[static-libs(+)] ) + virgl? ( media-libs/virglrenderer[static-libs(+)] ) + virtfs? ( sys-libs/libcap ) + xen? ( app-emulation/xen-tools:= ) + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" + +SEABIOS_VERSION="1.14.0" + +X86_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/edk2-ovmf-202008[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] + ) + !pin-upstream-blobs? ( + sys-firmware/edk2-ovmf + sys-firmware/ipxe[qemu] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + sys-firmware/sgabios + )" +PPC_FIRMWARE_DEPEND=" + pin-upstream-blobs? ( + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ) + !pin-upstream-blobs? ( + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] + ) +" + +BDEPEND=" + $(python_gen_impl_dep) + dev-lang/perl + sys-apps/texinfo + virtual/pkgconfig + doc? ( dev-python/sphinx ) + gtk? ( nls? ( sys-devel/gettext ) ) + test? ( + dev-libs/glib[utils] + sys-devel/bc + ) +" +CDEPEND=" + !static? ( + ${ALL_DEPEND//\[static-libs(+)]} + ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} + ) + qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) +" +DEPEND="${CDEPEND} + kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) + static? ( + ${ALL_DEPEND} + ${SOFTMMU_TOOLS_DEPEND} + ) + static-user? ( ${ALL_DEPEND} )" +RDEPEND="${CDEPEND} + acct-group/kvm + selinux? ( sec-policy/selinux-qemu )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch + "${FILESDIR}"/${PN}-5.2.0-strings.patch + "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch + "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch +) + +QA_PREBUILT=" + usr/share/qemu/hppa-firmware.img + usr/share/qemu/openbios-ppc + usr/share/qemu/openbios-sparc64 + usr/share/qemu/openbios-sparc32 + usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf + usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf + usr/share/qemu/palcode-clipper + usr/share/qemu/s390-ccw.img + usr/share/qemu/s390-netboot.img + usr/share/qemu/u-boot.e500 +" + +QA_WX_LOAD="usr/bin/qemu-i386 + usr/bin/qemu-x86_64 + usr/bin/qemu-alpha + usr/bin/qemu-arm + usr/bin/qemu-cris + usr/bin/qemu-m68k + usr/bin/qemu-microblaze + usr/bin/qemu-microblazeel + usr/bin/qemu-mips + usr/bin/qemu-mipsel + usr/bin/qemu-or1k + usr/bin/qemu-ppc + usr/bin/qemu-ppc64 + usr/bin/qemu-ppc64abi32 + usr/bin/qemu-sh4 + usr/bin/qemu-sh4eb + usr/bin/qemu-sparc + usr/bin/qemu-sparc64 + usr/bin/qemu-armeb + usr/bin/qemu-sparc32plus + usr/bin/qemu-s390x + usr/bin/qemu-unicore32 +" + +DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the +kernel module loaded before running kvm. The easiest way to ensure that the +kernel module is loaded is to load it on boot. + For AMD CPUs the module is called 'kvm-amd'. + For Intel CPUs the module is called 'kvm-intel'. +Please review /etc/conf.d/modules for how to load these. + +Make sure your user is in the 'kvm' group. Just run + $ gpasswd -a kvm +then have re-login. + +For brand new installs, the default permissions on /dev/kvm might not let +you access it. You can tell udev to reset ownership/perms: + $ udevadm trigger -c add /dev/kvm + +If you want to register binfmt handlers for qemu user targets: +For openrc: + # rc-update add qemu-binfmt +For systemd: + # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" + +pkg_pretend() { + if use kernel_linux && kernel_is lt 2 6 25; then + eerror "This version of KVM requires a host kernel of 2.6.25 or higher." + elif use kernel_linux; then + if ! linux_config_exists; then + eerror "Unable to check your kernel for KVM support" + else + CONFIG_CHECK="~KVM ~TUN ~BRIDGE" + ERROR_KVM="You must enable KVM in your kernel to continue" + ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" + ERROR_KVM_AMD+=" your kernel configuration." + ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" + ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." + ERROR_TUN="You will need the Universal TUN/TAP driver compiled" + ERROR_TUN+=" into your kernel or loaded as a module to use the" + ERROR_TUN+=" virtual network device if using -net tap." + ERROR_BRIDGE="You will also need support for 802.1d" + ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." + use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" + ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" + ERROR_VHOST_NET+=" support" + + if use amd64 || use x86 || use amd64-linux || use x86-linux; then + if grep -q AuthenticAMD /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_AMD" + elif grep -q GenuineIntel /proc/cpuinfo; then + CONFIG_CHECK+=" ~KVM_INTEL" + fi + fi + + use python && CONFIG_CHECK+=" ~DEBUG_FS" + ERROR_DEBUG_FS="debugFS support required for kvm_stat" + + # Now do the actual checks setup above + check_extra_config + fi + fi + + if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then + eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" + eerror "instances are still pointing to it. Please update your" + eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" + eerror "and the right system binary (e.g. qemu-system-x86_64)." + die "update your virt configs to not use qemu-kvm" + fi +} + +# Sanity check to make sure target lists are kept up-to-date. +check_targets() { + local var=$1 mak=$2 + local detected sorted + + pushd "${S}"/default-configs/targets/ >/dev/null || die + + # Force C locale until glibc is updated. #564936 + detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) + sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) + if [[ ${sorted} != "${detected}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "${var}: ${sorted}" + eerror "$(printf '%-*s' ${#var} configure): ${detected}" + die "sync ${var} to the list of targets" + fi + + popd >/dev/null +} + +src_prepare() { + check_targets IUSE_SOFTMMU_TARGETS softmmu + check_targets IUSE_USER_TARGETS linux-user + + default + + # Use correct toolchain to fix cross-compiling + tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS + export WINDRES=${CHOST}-windres + + # Verbose builds + MAKEOPTS+=" V=1" + + # Remove bundled copy of libfdt + rm -r dtc || die +} + +## +# configures qemu based on the build directory and the build type +# we are using. +# +qemu_src_configure() { + debug-print-function ${FUNCNAME} "$@" + + local buildtype=$1 + local builddir="${S}/${buildtype}-build" + + mkdir "${builddir}" + + local conf_opts=( + --prefix=/usr + --sysconfdir=/etc + --bindir=/usr/bin + --libdir=/usr/$(get_libdir) + --datadir=/usr/share + --docdir=/usr/share/doc/${PF}/html + --mandir=/usr/share/man + --localstatedir=/var + --disable-bsd-user + --disable-containers # bug #732972 + --disable-guest-agent + --disable-strip + + # bug #746752: TCG interpreter has a few limitations: + # - it does not support FPU + # - it's generally slower on non-self-modifying code + # It's advantage is support for host architectures + # where native codegeneration is not implemented. + # Gentoo has qemu keyworded only on targets with + # native code generation available. Avoid the interpreter. + --disable-tcg-interpreter + + --disable-werror + # We support gnutls/nettle for crypto operations. It is possible + # to use gcrypt when gnutls/nettle are disabled (but not when they + # are enabled), but it's not really worth the hassle. Disable it + # all the time to avoid automatically detecting it. #568856 + --disable-gcrypt + --python="${PYTHON}" + --cc="$(tc-getCC)" + --cxx="$(tc-getCXX)" + --host-cc="$(tc-getBUILD_CC)" + $(use_enable debug debug-info) + $(use_enable debug debug-tcg) + $(use_enable doc docs) + $(use_enable nls gettext) + $(use_enable plugins) + $(use_enable xattr attr) + ) + + # Disable options not used by user targets. This simplifies building + # static user targets (USE=static-user) considerably. + conf_notuser() { + if [[ ${buildtype} == "user" ]] ; then + echo "--disable-${2:-$1}" + else + use_enable "$@" + fi + } + # Enable option only for softmmu build, but not 'user' or 'tools' + conf_softmmu() { + if [[ ${buildtype} == "softmmu" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + # Enable option only for tools build, but not 'user' or 'softmmu' + conf_tools() { + if [[ ${buildtype} == "tools" ]] ; then + use_enable "$@" + else + echo "--disable-${2:-$1}" + fi + } + conf_opts+=( + $(conf_notuser accessibility brlapi) + $(conf_notuser aio linux-aio) + $(conf_notuser bzip2) + $(conf_notuser capstone) + $(conf_notuser caps cap-ng) + $(conf_notuser curl) + $(conf_notuser fdt) + $(conf_notuser glusterfs) + $(conf_notuser gnutls) + $(conf_notuser gnutls nettle) + $(conf_notuser gtk) + $(conf_notuser infiniband rdma) + $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) + $(conf_notuser jemalloc jemalloc) + $(conf_notuser jpeg vnc-jpeg) + $(conf_notuser kernel_linux kvm) + $(conf_notuser lzo) + $(conf_notuser multipath mpath) + $(conf_notuser ncurses curses) + $(conf_notuser nfs libnfs) + $(conf_notuser numa) + $(conf_notuser opengl) + $(conf_notuser png vnc-png) + $(conf_notuser rbd) + $(conf_notuser sasl vnc-sasl) + $(conf_notuser sdl) + $(conf_softmmu sdl-image) + $(conf_notuser seccomp) + $(conf_notuser slirp slirp system) + $(conf_notuser smartcard) + $(conf_notuser snappy) + $(conf_notuser spice) + $(conf_notuser ssh libssh) + $(conf_notuser udev libudev) + $(conf_notuser usb libusb) + $(conf_notuser usbredir usb-redir) + $(conf_notuser vde) + $(conf_notuser vhost-net) + $(conf_notuser vhost-user-fs) + $(conf_tools vhost-user-fs virtiofsd) + $(conf_notuser virgl virglrenderer) + $(conf_softmmu virtfs) + $(conf_notuser vnc) + $(conf_notuser vte) + $(conf_notuser xen) + $(conf_notuser xen xen-pci-passthrough) + $(conf_notuser xfs xfsctl) + # use prebuilt keymaps, bug #759604 + --disable-xkbcommon + $(conf_notuser zstd) + ) + + if [[ ${buildtype} == "user" ]] ; then + conf_opts+=( --disable-libxml2 ) + else + conf_opts+=( --enable-libxml2 ) + fi + + if [[ ! ${buildtype} == "user" ]] ; then + # audio options + local audio_opts=( + # Note: backend order matters here: #716202 + # We iterate from higher-level to lower level. + $(usex pulseaudio pa "") + $(usev jack) + $(usev sdl) + $(usev alsa) + $(usev oss) + ) + conf_opts+=( + --audio-drv-list=$(printf "%s," "${audio_opts[@]}") + ) + fi + + case ${buildtype} in + user) + conf_opts+=( + --enable-linux-user + --disable-system + --disable-blobs + --disable-tools + ) + local static_flag="static-user" + ;; + softmmu) + conf_opts+=( + --disable-linux-user + --enable-system + --disable-tools + ) + local static_flag="static" + ;; + tools) + conf_opts+=( + --disable-linux-user + --disable-system + --disable-blobs + --enable-tools + ) + local static_flag="static" + ;; + esac + + local targets="${buildtype}_targets" + [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) + + # Add support for SystemTAP + use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) + + # We always want to attempt to build with PIE support as it results + # in a more secure binary. But it doesn't work with static or if + # the current GCC doesn't have PIE support. + if use ${static_flag}; then + conf_opts+=( --static --disable-pie ) + else + tc-enables-pie && conf_opts+=( --enable-pie ) + fi + + # Meson will not use a cross-file unless cross_prefix is set. + tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) + + # Plumb through equivalent of EXTRA_ECONF to allow experiments + # like bug #747928. + conf_opts+=( ${EXTRA_CONF_QEMU} ) + + echo "../configure ${conf_opts[*]}" + cd "${builddir}" + ../configure "${conf_opts[@]}" || die "configure failed" + + # FreeBSD's kernel does not support QEMU assigning/grabbing + # host USB devices yet + use kernel_FreeBSD && \ + sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak +} + +src_configure() { + local target + + python_setup + + softmmu_targets= softmmu_bins=() + user_targets= user_bins=() + + for target in ${IUSE_SOFTMMU_TARGETS} ; do + if use "qemu_softmmu_targets_${target}"; then + softmmu_targets+=",${target}-softmmu" + softmmu_bins+=( "qemu-system-${target}" ) + fi + done + + for target in ${IUSE_USER_TARGETS} ; do + if use "qemu_user_targets_${target}"; then + user_targets+=",${target}-linux-user" + user_bins+=( "qemu-${target}" ) + fi + done + + softmmu_targets=${softmmu_targets#,} + user_targets=${user_targets#,} + + [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" + [[ -n ${user_targets} ]] && qemu_src_configure "user" + qemu_src_configure "tools" +} + +src_compile() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + default + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + default + fi + + cd "${S}/tools-build" + default +} + +src_test() { + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + pax-mark m */qemu-system-* #515550 + emake check + fi +} + +qemu_python_install() { + python_domodule "${S}/python/qemu" + + python_doscript "${S}/scripts/kvm/vmxcap" + python_doscript "${S}/scripts/qmp/qmp-shell" + python_doscript "${S}/scripts/qmp/qemu-ga-client" +} + +# Generate binfmt support files. +# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) +# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) +generate_initd() { + local out="${T}/qemu-binfmt" + local out_systemd="${T}/qemu.conf" + local d="${T}/binfmt.d" + + einfo "Generating qemu binfmt scripts and configuration files" + + # Generate the debian fragments first. + mkdir -p "${d}" + "${S}"/scripts/qemu-binfmt-conf.sh \ + --debian \ + --exportdir "${d}" \ + --qemu-path "${EPREFIX}/usr/bin" \ + || die + # Then turn the fragments into a shell script we can source. + sed -E -i \ + -e 's:^([^ ]+) (.*)$:\1="\2":' \ + "${d}"/* || die + + # Generate the init.d script by assembling the fragments from above. + local f qcpu package interpreter magic mask + cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die + for f in "${d}"/qemu-* ; do + source "${f}" + + # Normalize the cpu logic like we do in the init.d for the native cpu. + qcpu=${package#qemu-} + case ${qcpu} in + arm*) qcpu="arm";; + mips*) qcpu="mips";; + ppc*) qcpu="ppc";; + s390*) qcpu="s390";; + sh*) qcpu="sh";; + sparc*) qcpu="sparc";; + esac + + # we use 'printf' here to be portable across 'sh' + # implementations: #679168 + cat <>"${out}" + if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then + printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register + fi +EOF + + echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" + + done + cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die +} + +src_install() { + if [[ -n ${user_targets} ]]; then + cd "${S}/user-build" + emake DESTDIR="${ED}" install + + # Install binfmt handler init script for user targets. + generate_initd + doinitd "${T}/qemu-binfmt" + + # Install binfmt/qemu.conf. + insinto "/usr/share/qemu/binfmt.d" + doins "${T}/qemu.conf" + fi + + if [[ -n ${softmmu_targets} ]]; then + cd "${S}/softmmu-build" + emake DESTDIR="${ED}" install + + # This might not exist if the test failed. #512010 + [[ -e check-report.html ]] && dodoc check-report.html + + if use kernel_linux; then + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules + fi + + if use python; then + python_foreach_impl qemu_python_install + fi + fi + + cd "${S}/tools-build" + emake DESTDIR="${ED}" install + + # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 + pushd "${ED}"/usr/bin >/dev/null + pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 + popd >/dev/null + + # Install config file example for qemu-bridge-helper + insinto "/etc/qemu" + doins "${FILESDIR}/bridge.conf" + + cd "${S}" + dodoc MAINTAINERS docs/specs/pci-ids.txt + newdoc pc-bios/README README.pc-bios + + # Disallow stripping of prebuilt firmware files. + dostrip -x ${QA_PREBUILT} + + if [[ -n ${softmmu_targets} ]]; then + # Remove SeaBIOS since we're using the SeaBIOS packaged one + rm "${ED}/usr/share/qemu/bios.bin" + rm "${ED}/usr/share/qemu/bios-256k.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../seabios/bios.bin /usr/share/qemu/bios.bin + dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin + fi + + # Remove vgabios since we're using the seavgabios packaged one + rm "${ED}/usr/share/qemu/vgabios.bin" + rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" + rm "${ED}/usr/share/qemu/vgabios-qxl.bin" + rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" + rm "${ED}/usr/share/qemu/vgabios-virtio.bin" + rm "${ED}/usr/share/qemu/vgabios-vmware.bin" + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then + dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin + dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin + dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin + dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin + dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin + dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin + fi + + # Remove sgabios since we're using the sgabios packaged one + rm "${ED}/usr/share/qemu/sgabios.bin" + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin + fi + + # Remove iPXE since we're using the iPXE packaged one + rm "${ED}"/usr/share/qemu/pxe-*.rom + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then + dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom + dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom + dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom + dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom + dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom + dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom + fi + fi + + DISABLE_AUTOFORMATTING=true + readme.gentoo_create_doc +} + +firmware_abi_change() { + local pv + for pv in ${REPLACING_VERSIONS}; do + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then + return 0 + fi + done + return 1 +} + +pkg_postinst() { + if [[ -n ${softmmu_targets} ]] && use kernel_linux; then + udev_reload + fi + + xdg_icon_cache_update + + [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ + fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper + + DISABLE_AUTOFORMATTING=true + readme.gentoo_print_elog + + if use pin-upstream-blobs && firmware_abi_change; then + ewarn "This version of qemu pins new versions of firmware blobs:" + ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/ipxe)" + ewarn " $(best_version sys-firmware/seabios)" + ewarn " $(best_version sys-firmware/sgabios)" + ewarn "This might break resume of hibernated guests (started with a different" + ewarn "firmware version) and live migration to/from qemu versions with different" + ewarn "firmware. Please (cold) restart all running guests. For functional" + ewarn "guest migration ensure that all" + ewarn "hosts run at least" + ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." + fi +} + +pkg_info() { + echo "Using:" + echo " $(best_version app-emulation/spice-protocol)" + echo " $(best_version sys-firmware/edk2-ovmf)" + if has_version 'sys-firmware/edk2-ovmf[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/ipxe)" + echo " $(best_version sys-firmware/seabios)" + if has_version 'sys-firmware/seabios[binary]'; then + echo " USE=binary" + else + echo " USE=''" + fi + echo " $(best_version sys-firmware/sgabios)" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 9970b1a031f7..bdf454fd8ec7 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -846,7 +846,7 @@ src_install() { firmware_abi_change() { local pv for pv in ${REPLACING_VERSIONS}; do - if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then + if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then return 0 fi done diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest index 0cb70be92056..0058b529a7ea 100644 --- a/app-emulation/spice/Manifest +++ b/app-emulation/spice/Manifest @@ -4,7 +4,7 @@ AUX spice-0.14.3-CVE-2020-14355-762e0aba.patch 533 BLAKE2B f6ecb51c2ef568d7e9c34 AUX spice-0.14.3-CVE-2020-14355-b24fe6b6.patch 876 BLAKE2B 7ba5c57e7ca7265f6d42bf475403ba1f1ce3690b1d6ab9d9c65ee722005a1b198b7b6a5ffb0d94a2dea1c67eb7ecd2585d6974c43ffae1dd25a2bc51781d5483 SHA512 b13f1b44d3452b5b246efb1b98f9b4b9bcff8ed9161bfa79d31fb4404cc499772144676a96b37b1cb94c7e9036c23df092fb1a878651555164e733d0fafb0712 AUX spice-0.14.3-CVE-2020-14355-ef1b6ff7.patch 759 BLAKE2B 8d3f0b5d03d79dc1c02efec9f3746d4d8a5fc3be9b4a98a1b1b6f325cb19a03dbc2d29ab5c7a3a7bb807fda2bd52080c87d706a1c61eff15bc74a8c65a60f8ce SHA512 9b72fb0195feb5ddbce7dacca0459d2f5ad00a72c0f45488debae50c188b14274ae8a7208052e85ca42793a6be3a7483c816f1f381015ea5fe42fa05bb2a9f5a DIST spice-0.14.3.tar.bz2 1504304 BLAKE2B be655e1d4c48dae29903ab8e0dc52da63723e3252052afccc9587065531f28c8af7dbab4c585093f26d98f2273c6e734a553c18d4779a9f4464334ae1764f682 SHA512 9ecdc455ff25c71ac1fe6c576654b51efbfb860110bd6828065d23f7462d5c5cac772074d1a40f033386258d970b77275b2007bcfdffb23fdff2137154ea46e4 -EBUILD spice-0.14.3-r1.ebuild 2698 BLAKE2B 684a4f44144e435a7929731f8859e263a0d9e5da436011cbe6248589ee2c4ed074615e7b88a8eba8329a322581596eb73d598b5747b371f92b3bf71dae0eba49 SHA512 323c4e23e1ad04d56792c868054eb6edbb454c3af3124858f7623e6c33c7ad867f3ccf188f8736c6c810af30aa867d0fdb90005f1ad4d0299c287dc35bd9d7f2 -EBUILD spice-0.14.3.ebuild 2387 BLAKE2B 59c62447ccb9c49925163da9e976f642284daf975de196ade102593cf7ab131687e39e46b2206631513b4d8f5399936df3a0052a1b44b5c2a08cc0a6eb09ca6c SHA512 0269e6f91a2c028330de839878cd265f9a2b6d8b4677282e7524b0b8a4316620e7c5ca94789983e63e9d3420efb394324541fd5324f1e91e92cf8f4370dd6846 -EBUILD spice-9999.ebuild 2357 BLAKE2B bc8f0fdacbabead0e2f8917635adcc99dbf7bef8be1c7198983793d3653b24807bdd7d301dc107630e3461c95aac431faca02aa244f2cc9508553ee4c3bc9c9b SHA512 2ef47fcd3ef83c93470e38f8eb29b7873a5d77ad1090bb4c183222c5e66c4609a53fbb3ceb6157f7c1dbc42d44177636654c945fd9da762368ad5703b0dfefd6 +EBUILD spice-0.14.3-r1.ebuild 2621 BLAKE2B 5aa069382b144ce2f338821472519d7812794b731b36a442240fbfcbc0a3ea67aedc9e29658803775d86eb2af5712bd33cbf10809e87911a6165e878a422f582 SHA512 a0dc8069d249d8166875aefe31ab9101ef16a230b48d759e534183c4df10f1a218cf0d9edcbe4704cbfb52d999e1b34deb821d543e3b25deac7d748757c54a5a +EBUILD spice-0.14.3.ebuild 2310 BLAKE2B 86625e340900ec8d98cb005f174bcc476b87701080567645b4434c1ad563a54dc83c32078989f9e3ab5691c34f0c5ae3db0d14f3716995f79680f55737700294 SHA512 d9efffe7a3424f5741733ded820cbd07d3d4b4e9bcc8a292ea9dd2f1dc67e2d05efbceed3ccd030f996e1b6a042ac46116b755f04aa9b7860100bf2977182c23 +EBUILD spice-9999.ebuild 2297 BLAKE2B ad91d32b9df3b604d1d529b93a103a1e9b1cf753fdb8fdce0c4279131fe7ce47b18ea8ad29c53876441bebc80cb13ac1501ea38a34e29b603932624824629c03 SHA512 e3f9b1fab98362588d8c274539b396d1eaec8fa2e7de5745222f9756ae903bc65da7e3b87b863ce44aadbada7e67362b526cedbcf74b06ad6a90f7ecb94e9972 MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8 diff --git a/app-emulation/spice/spice-0.14.3-r1.ebuild b/app-emulation/spice/spice-0.14.3-r1.ebuild index 3b1c4cfb9ca5..8310f48f147f 100644 --- a/app-emulation/spice/spice-0.14.3-r1.ebuild +++ b/app-emulation/spice/spice-0.14.3-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2 LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="libressl lz4 sasl smartcard static-libs gstreamer test" +IUSE="lz4 sasl smartcard static-libs gstreamer test" RESTRICT="!test? ( test )" @@ -25,8 +25,7 @@ RDEPEND=" sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) + dev-libs/openssl:0=[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) diff --git a/app-emulation/spice/spice-0.14.3.ebuild b/app-emulation/spice/spice-0.14.3.ebuild index 95c2c45cdecc..2e239e2ac442 100644 --- a/app-emulation/spice/spice-0.14.3.ebuild +++ b/app-emulation/spice/spice-0.14.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2 LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="libressl lz4 sasl smartcard static-libs gstreamer" +IUSE="lz4 sasl smartcard static-libs gstreamer" # the libspice-server only uses the headers of libcacard RDEPEND=" @@ -23,8 +23,7 @@ RDEPEND=" sys-libs/zlib[static-libs(+)?] virtual/jpeg:0=[static-libs(+)?] >=x11-libs/pixman-0.17.7[static-libs(+)?] - !libressl? ( dev-libs/openssl:0=[static-libs(+)?] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)?] ) + dev-libs/openssl:0=[static-libs(+)?] lz4? ( app-arch/lz4:0=[static-libs(+)?] ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] ) diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild index 44eb9c360ee8..280a7ddc1f9c 100644 --- a/app-emulation/spice/spice-9999.ebuild +++ b/app-emulation/spice/spice-9999.ebuild @@ -14,7 +14,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="gstreamer libressl lz4 opus sasl smartcard static-libs test" +IUSE="gstreamer lz4 opus sasl smartcard static-libs test" RESTRICT="!test? ( test )" @@ -25,8 +25,7 @@ RDEPEND=" sys-libs/zlib virtual/jpeg:0= >=x11-libs/pixman-0.17.7 - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= lz4? ( app-arch/lz4:0= ) opus? ( media-libs/opus ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index 53942126feb2..598b2f619d54 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,5 +1,7 @@ DIST VBoxGuestAdditions_6.1.18.iso 61157376 BLAKE2B e022cfbc70fa45889c1db7592f30814faf88d7614c30ebd3fccd0127732d7fec51423904a160797ac199315dcbe4791f025e2dc4754141bfef0862b11510626c SHA512 07be8be75feb2d7d9bfc984ce34b955339d391580192817c2eb216b7577576a003dde310cc09f18c6b6bcf2e30ad548e1ee8bde0af420e4d1d43a3486861cf19 DIST VBoxGuestAdditions_6.1.20.iso 61018112 BLAKE2B feb6a292b05e861a90fdc5db80bc15e9df593a365a866a31ab7afce704511463012c18d76dc928dc5ecd0d2a23bc518c37ad9cdc8b4b72397af3ddd4b3eb97d8 SHA512 122bd5d31ab5cac2fe0582d1d541b5e9d0e8e544e1b3c5afb2b2e2c8b26fbfa964d15053ccc256575753d31206bffc09380dabc79d93946b0e56b743d82e40fe +DIST VBoxGuestAdditions_6.1.22.iso 61020160 BLAKE2B e6b79942ed905654ac98323fe5c960afe7467e4ee9da168f7a7b4856a001fa973418e979da57b6e75eedd801bd71f15700ac62a2dfac28b660b36b11287fab57 SHA512 826a4b7d714d1dcb3e7c5c3c95e2a47d2fef728172f2db0e9c983150d7cc335ca7ffd2c87c09e1ca3d0fb1342f4c6c03993f5fc8cff19f28e1f519dec0f3f96b EBUILD virtualbox-additions-6.1.18.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c -EBUILD virtualbox-additions-6.1.20.ebuild 778 BLAKE2B 34dc0e7631b7bd202a0ea7d7a18fd83f045d867cbd2533dfa333292f22d4378765672be9166ccf1aafdf075d58f3e48617dc9132ef5d34d413f867445e8cc9cc SHA512 0186ea39d7c27c7ea8826e59548d3287cc59225daff2350358d12e233af40f352d004a82edeeb17be5762a405b956f04c369472794749fe170345f7421779154 +EBUILD virtualbox-additions-6.1.20.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c +EBUILD virtualbox-additions-6.1.22.ebuild 778 BLAKE2B 34dc0e7631b7bd202a0ea7d7a18fd83f045d867cbd2533dfa333292f22d4378765672be9166ccf1aafdf075d58f3e48617dc9132ef5d34d413f867445e8cc9cc SHA512 0186ea39d7c27c7ea8826e59548d3287cc59225daff2350358d12e233af40f352d004a82edeeb17be5762a405b956f04c369472794749fe170345f7421779154 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild index b6488481acda..5f7f607a912a 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.20.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" RESTRICT="mirror" diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild new file mode 100644 index 000000000000..b6488481acda --- /dev/null +++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.22.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=VBoxGuestAdditions +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P=${MY_PN}_${MY_PV} + +DESCRIPTION="CD image containing guest additions for VirtualBox" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" + +LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="" +RESTRICT="mirror" + +RDEPEND="!app-emulation/virtualbox-bin + !=app-emulation/virtualbox-9999" + +S="${WORKDIR}" + +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 47d2eb5c7745..2b767a7fe0ef 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1,5 +1,7 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.18-142142.tar.gz 11157510 BLAKE2B d9ee20abac79ed5de03c39d1e6af3a5f18c5416149e9e64ebe9dfc4a937bd72b6590a2daaccc820e3ee6c6efcfd0c1c8e29bf3844cbbb929f13052415e16f2bb SHA512 3686b1c5dbdc5b28c172b4885c30ca9a444bc10dc7984df14a17e1dcc571456b06e80ad38e1409de8692c483c56f397162a53bd3dc6956d9ca91875fda0bda4e DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.20-143896.tar.gz 11132930 BLAKE2B a26e05d9869a52187b379b24ed556c6296772d1360b6f7d61afe17c2818351b5ee2256398e0d53a16d2b6014540f343f7f13539c3d5529f079ac363b48ea0d6e SHA512 85cd8327860c253ce2f871dd1138d18d97b8706f64a3dafaaf340a43d8f44f7ee696a1f845761e7c8d6dcf11c7afd1618798194482b6e09cbe7e2657d980116a +DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.22-144080.tar.gz 11133865 BLAKE2B f0db84695d94d914afd22086ced2a2ca73f860a0bc91bc11744e2cc4a3203584b06f7c855053e33c5f775bc7f6db08b7400f5eeea89566b9146dd144ccf1a2f9 SHA512 71dc1a82b9b88f615ecc7172df344042366a9303115cf44685ea96e3e729b8280edd36377b207fdbbf8adb388d1ec9b21c3ee709cf44aeb52d6811b26fa69a80 EBUILD virtualbox-extpack-oracle-6.1.18.142142.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae -EBUILD virtualbox-extpack-oracle-6.1.20.143896.ebuild 1084 BLAKE2B 1a44253aa5a7e89afaf6a416954707c672931710d21320092f0ac6f350cf94d61b88880e1b3061885312b6a3ffd90976f2cc1003c8445b26fb689e71f42a0a62 SHA512 ed161efc95a9d02ed8e20e7affa26e2f8b10d225dc7162a034a6ac98f71874f78fe13477c0ac0bbe11e174c5befeb8ba9728078824646734915722066d5a8ba9 +EBUILD virtualbox-extpack-oracle-6.1.20.143896.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae +EBUILD virtualbox-extpack-oracle-6.1.22.144080.ebuild 1084 BLAKE2B 1a44253aa5a7e89afaf6a416954707c672931710d21320092f0ac6f350cf94d61b88880e1b3061885312b6a3ffd90976f2cc1003c8445b26fb689e71f42a0a62 SHA512 ed161efc95a9d02ed8e20e7affa26e2f8b10d225dc7162a034a6ac98f71874f78fe13477c0ac0bbe11e174c5befeb8ba9728078824646734915722066d5a8ba9 MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509 diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild index 5e6035fc8003..54db34dd7a15 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.20.143896.ebuild @@ -26,7 +26,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac LICENSE="PUEL" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="" RESTRICT="bindist mirror strip" diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild new file mode 100644 index 000000000000..5e6035fc8003 --- /dev/null +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.22.144080.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib + +MAIN_PV="$(ver_cut 1-3)" +if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then + MY_PV="${MAIN_PV}_$(ver_cut 5-6)" + DEP_PV="${MY_PV}" + MY_PV="${MY_PV/beta/BETA}" + MY_PV="${MY_PV/rc/RC}" +else + MY_PV="${MAIN_PV}" + DEP_PV="${MAIN_PV}" +fi +VBOX_BUILD_ID="$(ver_cut 4)" +MY_PN="Oracle_VM_VirtualBox_Extension_Pack" +MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" + +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" + +LICENSE="PUEL" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="" +RESTRICT="bindist mirror strip" + +RDEPEND="=app-emulation/virtualbox-${DEP_PV}*" + +S="${WORKDIR}" + +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 5e47af9d3f24..d9bfa09332de 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -7,7 +7,9 @@ AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4 +DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 EBUILD virtualbox-guest-additions-6.1.18-r1.ebuild 6205 BLAKE2B d1171f7d2e7f363eec0376812cfd34ac725f24083a4acc3ca4ca5346f84cbbeea1414a4c93915b5f82f323f641d78e0967a02f5f0853cd5c57b1b10fa5b0e455 SHA512 4cea83e923f2037bc3058bf349f640e46be929f5c5425d353923bf7ce6cb17ed2a53fe986f5e24fdc6a05f8c7f1a679356a71b6bc84c5eda74cdec7430afffd3 -EBUILD virtualbox-guest-additions-6.1.20.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e +EBUILD virtualbox-guest-additions-6.1.20.ebuild 6206 BLAKE2B ea540bc820358581e7d95aeadb13ad2fda156b0735b4a33676a163c1dbaae235db82907cf08ac833700fd297e57fecfe775bc1036f323fc04c2cb279ccf807f8 SHA512 f1ef13f8dd2d890e729c797375b5e8662fe776d008f78008668114e7467ef0fe98b277bd12e3a67a685d66c13ed38731e6dc7590722440acbe7541fcccf67965 +EBUILD virtualbox-guest-additions-6.1.22.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509 diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild index d767c7658ddd..08e344b84659 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.20.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}. LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="X" # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild new file mode 100644 index 000000000000..d767c7658ddd --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.22.ebuild @@ -0,0 +1,221 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-mod systemd toolchain-funcs + +MY_PN="VirtualBox" +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P="${MY_PN}-${MY_PV}" +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" + +DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64 ~x86" +IUSE="X" + +# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist +RDEPEND=" + acct-group/vboxguest + acct-group/vboxsf + acct-user/vboxguest + X? ( x11-apps/xrandr + x11-apps/xrefresh + x11-libs/libXmu + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libSM + x11-libs/libICE ) + sys-apps/dbus +" +DEPEND=" + ${RDEPEND} + >=dev-util/kbuild-0.1.9998.3127 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-libs/pam + sys-power/iasl + x11-base/xorg-proto +" +PDEPEND=" + X? ( x11-drivers/xf86-video-vboxvideo ) +" +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" + +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}" +VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" + +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 + BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers" +} + +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 || die + eend + popd &>/dev/null || die + + # PaX fixes (see bug #298988) + pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die + eapply "${FILESDIR}"/vboxguest-6.0.6-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 + + eapply "${WORKDIR}/patches" + + eapply_user +} + +src_configure() { + # build the user-space tools, warnings are harmless + local cmd=( + ./configure + --nofatal + --disable-xpcom + --disable-sdl-ttf + --disable-pulse + --disable-alsa + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + --target-arch=${ARCH} + --with-linux="${KV_OUT_DIR}" + --build-headless + ) + echo "${cmd[@]}" + "${cmd[@]}" || die "configure failed" + source ./env.sh + export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" +} + +src_compile() { + MAKE="kmk" emake \ + VBOX_BUILD_PUBLISHER=_Gentoo \ + TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ + TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm \ + VBOX_ONLY_ADDITIONS=1 \ + KBUILD_VERBOSE=2 + + # 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) + 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 + + newinitd "${FILESDIR}"/${PN}-8.initd-r1 ${PN} + + 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 + + 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 + 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 "Also make sure you use the Mesa library for OpenGL:" + elog " eselect opengl set xorg-x11" + 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 " + 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 "" +} diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index e0ade409e40d..427a7b270220 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -6,6 +6,8 @@ AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1 AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a DIST vbox-kernel-module-src-6.1.18.tar.xz 672004 BLAKE2B 7199ba2a5020e5ab51d82735df16aee78ece74db232733b932c380f90dffd589a72613120bbd5c580381ab6f6308abb8d12f69855b9c0a8345bfb8587d022019 SHA512 49b54898b2701774fdeec0cd99dd51a1dd71ffd9be38e125fde73f0c64a697138d13bddbb0ed0e9582d354fa0394608084effb68bd35b266c87f6e3b44c6f342 DIST vbox-kernel-module-src-6.1.20.tar.xz 672188 BLAKE2B 0b2ef1e02ce6f55211703946dc53df0fe949a94bac2caf050d31a78e674c2934d5cfaf788da2246000d1dc99218a572cb02272a1a92f4df913fcf7635b65a98b SHA512 4fdc16258ec03c720c81b62c680addcbde8257a58a94b3bca8eefd378c126833d84f7f4fa7bb76fcd7c761983f8626d121b2d31d761f608ca7cce6a689ec0469 +DIST vbox-kernel-module-src-6.1.22.tar.xz 672348 BLAKE2B 331f81c370c24487f4966c745a72329065df2cc22918d03edefdf546d8e4ff0a36404ce98f1012faaacc301cd2c507b055db69b9125f91ad87fa5fde14d3abe0 SHA512 b50d7699db8909ea4e9126715152336a2c46e06f9fc24b5ef0624e7d26de1c83b2a57b0387dab0a46a9e50f9906126cfdcae4f290599de88a980adaff7fba180 EBUILD virtualbox-modules-6.1.18.ebuild 1531 BLAKE2B bc820f78c75b9057944568dd06b06a544f887c7aa8bf026e1907e9b898a7c10638069aa95a38e701ae0422d541d9aa045b109a40faeac1ddef7365f850acbeb5 SHA512 a4f08b633a6e4a5c22dbd7cd088c509e7e5c8658bc3b9604b4ebf77bb2edc70491ebc3eabfa414ae4bd174de36579aaab10226810f7df525691115ecbccaa042 -EBUILD virtualbox-modules-6.1.20.ebuild 1434 BLAKE2B 03065d413b537988bc71baacf3911c38a52589120fcd2f64528d091c37ccf2e4837358fa876f1cb0a46b15f44a8e10571afb1b76e392a11535f75c24df899365 SHA512 ddf073d44d9434c92103970b398034d282083a861091aa7d4a5d7a0a0697847741ab56ae35c9ea75bb0662a5d20f032293d159082f32c97166dece25c380b137 +EBUILD virtualbox-modules-6.1.20.ebuild 1433 BLAKE2B de4e7905f0df62d31e498763d0db42710f19140d16cb0aec7eee034e6a0d43e44bf883d7da60e73336ca17d68470683a831d2c09f156c4a87e481718b8713214 SHA512 daa7d3ca6970272c9605fbd11c85e1730244788871398d16aab73093baca1b26bea7f99382ffdb754040ca3bd560cc09b839802e96b438e076e25df1e21c6980 +EBUILD virtualbox-modules-6.1.22.ebuild 1434 BLAKE2B 03065d413b537988bc71baacf3911c38a52589120fcd2f64528d091c37ccf2e4837358fa876f1cb0a46b15f44a8e10571afb1b76e392a11535f75c24df899365 SHA512 ddf073d44d9434c92103970b398034d282083a861091aa7d4a5d7a0a0697847741ab56ae35c9ea75bb0662a5d20f032293d159082f32c97166dece25c380b137 MISC metadata.xml 352 BLAKE2B b3f8d24dd3e805ed233d105374d7c7d85b136b0260229daac917bec19bee0aa7dd9c2e19fdc036b576905152c3dad31aa5a6162c28812ca471f37b7297a77356 SHA512 98dcffafad310b4ceb74194af6de0e3e6c443167f53c41068ed0098c2f70916c88315739afb8bf917c1328886d063ca8a54e9dd9aeec3a41a911d34dbba5f10c diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild index e179b43d5370..a884e1456d03 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.20.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="pax_kernel" RDEPEND="!=app-emulation/virtualbox-9999" diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild new file mode 100644 index 000000000000..e179b43d5370 --- /dev/null +++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.22.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 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-bin + +EAPI=7 + +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/~polynomial-c/virtualbox/${MY_P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="pax_kernel" + +RDEPEND="!=app-emulation/virtualbox-9999" + +S="${WORKDIR}" + +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" + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" +} + +src_prepare() { + if use pax_kernel && kernel_is -ge 3 0 0 ; then + eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch + fi + + default +} + +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 + 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 b925bb2bf78b..a133c0bb2067 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -10,7 +10,9 @@ AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c DIST VirtualBox-6.1.20.tar.bz2 165569564 BLAKE2B cf8c110e78e7d7bef3e3243a8966f4d816dacc8dad6cc44737023a13f1b89dfb50661f6dabc742f328e5c03556ec82e7a22f5c1b97cfef774652ec901e733e5d SHA512 b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4 +DIST VirtualBox-6.1.22.tar.bz2 165560989 BLAKE2B 871c2189827174561a2abce4d52056db892e596bcff76274770b43157cca93d2be9a3458ad3d41cca81d73d95f1db37e2d15fdbc192f4d5a59e3cc9b6365d3f6 SHA512 ab0fc7cea455f74598d5da18528404405221e9c96a34f0355a39187524240596db4b54e1b1af5f152d5329b8e7977218819c0605f0d0ba0d83a1fb8f8487548d DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 -EBUILD virtualbox-6.1.18.ebuild 14557 BLAKE2B 0e02fb478f8284108c737e5c2cb8ae3319fe2d5ff8f0729a1c1e71b8a44bc47471a446191afa233d912fc71e7a0b8c3adfea8dc8644ad781d5b9fd41ab77d483 SHA512 19e2b276d6f7aa731a9f0130ae68f853bf90de6e347ad76692b083980bcac7e41fa89ddbe63a0ca3739b1a757e34f01eaf9e66cbe5a710a8aa423d6522c565b3 -EBUILD virtualbox-6.1.20-r1.ebuild 14483 BLAKE2B bb2f3cb2db2bdf4b7c70d2c383f814e54741b52ef0472bda903f44400c5d2cbd78732c50a8fd61b9b109fd474245c4b43cac92a64c624e75003436b24d7c69ae SHA512 27464e024724032f0afec7f2473d775d95b4707a43a5a62ded166d308e997c7c471e901019150de0918838c89123f4a0104ce45d1c63b81184cc987ba453cc2d +EBUILD virtualbox-6.1.18.ebuild 14498 BLAKE2B b5a1200ff60007815c69078c70e3bd82852ab2ca64a85be5f9c970516324131b18aa435306c3ae489913bd79fa6e8b1b264d62b0dbf140d0c6843cf9fa87b9cd SHA512 d4974d81abcc78d411dac1ec50b7051ec35b35f52bb82890fb23c285e2daa32bafadff8d45ebdda7ff7a3d213ea2fe00c5901632792f3f95b660ac21c27d10d1 +EBUILD virtualbox-6.1.20-r1.ebuild 14423 BLAKE2B c617f9d0ea37bc7e67f165c820298b6bd4869f1e49fb8c9098b8ca6ae6d0edab336a2643f78a07c9d9bce7323f7404a047167b6578deb1a34cacbb85dd0f4ea8 SHA512 95a98166c0ec6ab0d0808aedb80771e2d20163e7d4116f287b4a6c46f2fa699ebb86531745edc62c2349f2c81e8db489977baa5f63689bd961ee811bb954c7c0 +EBUILD virtualbox-6.1.22.ebuild 14363 BLAKE2B 88bec92b0bc9f6c699abc48dfba212abb336def1ed5022386f398b0b36db303bf7b6ce26a787bdf0b2248ea73b723f063c034bd992847247a96f9d5fa4218ff5 SHA512 3318273192f15ddf00b29e0e1dc6b2945a48a625df1308af4a85c3d0dcd043b380e1d9418b9e70ce1c2064c05ab2508dc2dc3db499da4efe2500b38e0539a6f4 MISC metadata.xml 773 BLAKE2B dade5d0d6cb8e4d8f92b865368af2e577d26e883b53e4d2274fb2b59e2ea92bdc8ee0af6a4cbca64384f9820779e44397825b3f1707d87631f1202bdc7164dac SHA512 c4718b4455eecd2669d47881af12257c1187c5f4aa3dd2fca8745df565f55a7b0e018da4ad3c5f38bd03b510bdfaaefa8a235d09fae3d8a99a55f263c995c74d diff --git a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild index f6f373e8a649..c106cf14fe04 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.18.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.18.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ KEYWORDS="amd64" -IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" CDEPEND=" ${PYTHON_DEPS} @@ -54,8 +54,7 @@ CDEPEND=" x11-libs/libXinerama ) ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) diff --git a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild index 95da7ce00ed7..653e36a99976 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.20-r1.ebuild @@ -20,8 +20,8 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}. LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" -IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +KEYWORDS="amd64" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" CDEPEND=" ${PYTHON_DEPS} @@ -54,8 +54,7 @@ CDEPEND=" x11-libs/libXinerama ) ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) + dev-libs/openssl:0= lvm? ( sys-fs/lvm2 ) opus? ( media-libs/opus ) udev? ( >=virtual/udev-171 ) diff --git a/app-emulation/virtualbox/virtualbox-6.1.22.ebuild b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild new file mode 100644 index 000000000000..f6ba09856a75 --- /dev/null +++ b/app-emulation/virtualbox/virtualbox-6.1.22.ebuild @@ -0,0 +1,502 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg + +MY_PN="VirtualBox" +MY_PV="${PV/beta/BETA}" +MY_PV="${MY_PV/rc/RC}" +MY_P=${MY_PN}-${MY_PV} +[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)" + +DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" +HOMEPAGE="https://www.virtualbox.org/" +SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.12-patches-01.tar.xz" + +LICENSE="GPL-2 dtrace? ( CDDL )" +SLOT="0/$(ver_cut 1-2)" +[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ +KEYWORDS="~amd64" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" + +CDEPEND=" + ${PYTHON_DEPS} + !app-emulation/virtualbox-bin + acct-group/vboxusers + ~app-emulation/virtualbox-modules-${DIR_PV:-${PV}} + dev-libs/libIDL + >=dev-libs/libxslt-1.1.19 + net-misc/curl + dev-libs/libxml2 + media-libs/libpng:0= + media-libs/libvpx:0= + sys-libs/zlib:= + !headless? ( + media-libs/libsdl:0[X,video] + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + opengl? ( media-libs/libglvnd[X] ) + 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= + lvm? ( sys-fs/lvm2 ) + opus? ( media-libs/opus ) + udev? ( >=virtual/udev-171 ) + vnc? ( >=net-libs/libvncserver-0.9.9 ) +" +DEPEND=" + ${CDEPEND} + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + !headless? ( + x11-libs/libXinerama + opengl? ( virtual/opengl ) + ) + pam? ( sys-libs/pam ) + pax_kernel? ( sys-apps/elfix ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( dev-qt/linguist-tools:5 ) + vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) +" +BDEPEND=" + ${PYTHON_DEPS} + >=dev-util/kbuild-0.1.9998.3127 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-libs/libcap + sys-power/iasl + virtual/pkgconfig + 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 ) +" +RDEPEND=" + ${CDEPEND} + java? ( >=virtual/jre-1.6 ) +" + +QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so + usr/lib/virtualbox/VBoxSDL.so + usr/lib/virtualbox/VBoxSharedFolders.so + usr/lib/virtualbox/VBoxDD2.so + usr/lib/virtualbox/VBoxOGLrenderspu.so + usr/lib/virtualbox/VBoxPython.so + usr/lib/virtualbox/VBoxDD.so + usr/lib/virtualbox/VBoxDDU.so + usr/lib/virtualbox/VBoxREM64.so + usr/lib/virtualbox/VBoxSharedClipboard.so + usr/lib/virtualbox/VBoxHeadless.so + usr/lib/virtualbox/VBoxRT.so + usr/lib/virtualbox/VBoxREM.so + usr/lib/virtualbox/VBoxSettings.so + usr/lib/virtualbox/VBoxKeyboard.so + usr/lib/virtualbox/VBoxSharedCrOpenGL.so + usr/lib/virtualbox/VBoxVMM.so + usr/lib/virtualbox/VirtualBox.so + usr/lib/virtualbox/VBoxOGLhosterrorspu.so + usr/lib/virtualbox/components/VBoxC.so + usr/lib/virtualbox/components/VBoxSVCM.so + usr/lib/virtualbox/components/VBoxDDU.so + usr/lib/virtualbox/components/VBoxRT.so + usr/lib/virtualbox/components/VBoxREM.so + usr/lib/virtualbox/components/VBoxVMM.so + usr/lib/virtualbox/VBoxREM32.so + usr/lib/virtualbox/VBoxPython2_7.so + usr/lib/virtualbox/VBoxXPCOMC.so + usr/lib/virtualbox/VBoxOGLhostcrutil.so + usr/lib/virtualbox/VBoxNetDHCP.so + usr/lib/virtualbox/VBoxNetNAT.so" + +S="${WORKDIR}/${MY_PN}-${DIR_PV:-${MY_PV}}" + +REQUIRED_USE=" + java? ( sdk ) + python? ( sdk ) + vboxwebsrv? ( java ) + ${PYTHON_REQUIRED_USE} +" + +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 +} + +pkg_setup() { + java-pkg-opt-2_pkg_setup + python-single-r1_pkg_setup + + tc-ld-disable-gold #bug 488176 + tc-export CC CXX LD AR RANLIB + export HOST_CC="$(tc-getBUILD_CC)" +} + +src_prepare() { + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -r kBuild/bin tools || die + + # Replace pointless GCC version check with something less stupid. + # 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 + + # 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 + + # Only add nopie patch when we're on hardened + if gcc-specs-pie ; then + eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" + fi + + # Only add paxmark patch when we're on pax_kernel + if use pax_kernel ; then + eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch + fi + + eapply "${WORKDIR}/patches" + + default +} + +doecho() { + echo "$@" + "$@" || die +} + +src_configure() { + local myconf=( + --with-gcc="$(tc-getCC)" + --with-g++="$(tc-getCXX)" + --disable-dbus + --disable-kmods + $(usex alsa '' --disable-alsa) + $(usex debug --build-debug '') + $(usex doc '' --disable-docs) + $(usex java '' --disable-java) + $(usex lvm '' --disable-devmapper) + $(usex opus '' --disable-libopus) + $(usex pulseaudio '' --disable-pulse) + $(usex python '' --disable-python) + $(usex vboxwebsrv --enable-webservice '') + $(usex vnc --enable-vnc '') + ) + if ! use headless ; then + myconf+=( + $(usex opengl '' --disable-opengl) + $(usex qt5 '' --disable-qt) + ) + else + myconf+=( + --build-headless + --disable-opengl + ) + fi + if use amd64 && ! has_multilib_profile ; then + myconf+=( --disable-vmmraw ) + fi + # not an autoconf script + doecho ./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}" + MAKE="kmk" emake \ + VBOX_BUILD_PUBLISHER=_Gentoo \ + TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \ + TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \ + TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ + VBOX_WITH_VBOXIMGMOUNT=1 \ + 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 + 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 + + 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)" + insinto ${udevdir} + doins VBoxCreateUSBNode.sh + fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh + fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh + insinto ${udevdir}/rules.d + sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ + > "${T}"/10-virtualbox.rules || die + doins "${T}"/10-virtualbox.rules + 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" -print0 \ + | xargs --no-run-if-empty --null 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 + + newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf +} + +pkg_postinst() { + xdg_pkg_postinst + + if use udev ; then + udevadm control --reload-rules \ + && udevadm trigger --subsystem-match=usb + fi + + tmpfiles_process /usr/lib/tmpfiles.d/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 "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf" + elog "" + elog "For advanced networking setups you should emerge:" + elog "net-misc/bridge-utils and sys-apps/usermode-utilities" + elog "" + elog "Starting with version 4.0.0, ${PN} has USB-1 support." + elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + elog "package." + elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" + elog "the \"extension\" USE flag. For installation of the guest additions ISO" + elog "image, please emerge" + elog " app-emulation/virtualbox-additions" + elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" + elog " app-emulation/virtualbox-extpack-oracle" + if ! use udev ; then + elog "" + elog "WARNING!" + elog "Without USE=udev, USB devices will likely not work in ${PN}." + elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then + elog "" + elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" + elog "or else USB in ${PN} won't work." + fi +} diff --git a/app-emulation/wine-gecko/Manifest b/app-emulation/wine-gecko/Manifest index e325f6fdbd39..eb9532579e81 100644 --- a/app-emulation/wine-gecko/Manifest +++ b/app-emulation/wine-gecko/Manifest @@ -6,5 +6,5 @@ DIST wine_gecko-2.47-x86.msi 49266176 BLAKE2B 6b1d4ebf53fac422c2da9ae7f5b6ab9064 DIST wine_gecko-2.47-x86_64.msi 50806272 BLAKE2B 6f91d4661a322eca41042cb7a246d5bff76ab72b4bda67183fc36735c923bd6d76624f21fd3e59f63fd872704edcf0116a6e7ab4fa6f074f5098c8fb5307534c SHA512 7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41 EBUILD wine-gecko-2.47-r1.ebuild 738 BLAKE2B 65313aa36c6b1f633ca53894a66824517a233b8c3d4056a951f8ec98ef0c653790b86f18a5ac046a0eab2c07107f27e5eaa981e70a91c4defcda297ccb02e75e SHA512 7c35333e8defa6956de3befa1bb6187a1353137334ee272c296d00eaca731c826ccfd6cd491a76bbec1bf36c6d4e2e8be124ca3eee2a3a7411ff3446071c2d32 EBUILD wine-gecko-2.47.1.ebuild 709 BLAKE2B 1e3574c3be03d6e3e335d7c88f64f7af09af770ee12a4544181a7820404b0d9d7b7982a293e94b7264390a82114ae4cd4a8ca9580f920809d45526cb561396b4 SHA512 e3b7c02da2974dfaa2737095d7b9b394096ecb0f3af0a5fb729c1ea3d3efa3887921c719a14ba732896f1b6d7866ddab116b3f54673ebd40ecf42e5cdd116598 -EBUILD wine-gecko-2.47.2.ebuild 708 BLAKE2B 93609c14eb1bb3ab58bab1fc14cda313b729234080470abb9e6cdbc423c5a9af31e1257296ff89f12cb52450f12211a9c78dbee4ed3011ec164c18fd39b345de SHA512 64440fa69b67234aad439ceea032b1c4723cfd696dadab6c9c47d79eb7c3181ca7d43f183a39cd0ee1b5ed57aaf71c66ca79887b85106dadb3bc423e7e4d1c47 +EBUILD wine-gecko-2.47.2.ebuild 709 BLAKE2B e7fce0c4d8a3a35d9b855bbb4b537f13de39e8f5f2c784992d03e63141934b533fd6f52bc96b186967b1484f7cf2aabefda2cd4dab06edee1e8e9bf25a4993cd SHA512 9c768b284e09868a2f3a66ac094f762372b85a6830dedf735782e345754cb7742d3931eeba3b791d9ec6a7638858ed0a53cd7cdddeb1669f6792d000663b234e MISC metadata.xml 321 BLAKE2B a78cdbf0755ae73cb4ec393d3febc46f39267e069001646a3db9af89382c09b2b7667edcce40975bfd890057466f8b86d14d3415b7a820d01198d8976bd5300d SHA512 a4a66f08ca203c1620732dd42b5e281d03d24675e4e471b7d6c6cd5a88b89a47b73b68b0b82f70eecee91c5c943e9886d8930f39b65b59ea285d23b010ad7635 diff --git a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild index 8f25ee06f62c..ef4f3027be56 100644 --- a/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild +++ b/app-emulation/wine-gecko/wine-gecko-2.47.2.ebuild @@ -19,7 +19,7 @@ DEPEND="!!app-emulation/wine:0" S="${WORKDIR}" -src_install(){ +src_install() { insinto /usr/share/wine/gecko use abi_x86_32 && doins "${DISTDIR}/${PN}-${PV}-x86.msi" use abi_x86_64 && doins "${DISTDIR}/${PN}-${PV}-x86_64.msi" diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index ee74ea7e3896..0b5f983f187b 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -7,9 +7,9 @@ DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4 DIST wine-staging-6.5.tar.gz 9743825 BLAKE2B 606377c33a789e092f044bb610746e54fba77a9af0e3da674d16c8ce0f51c59d82f78f0e63c5915fb6f1ab10d6ee91d7b95a7634f1177a6455de6e0c0517ef01 SHA512 bb5199419a22a4536ff95fb0e6257d7c870fe79f40346d56101579edae5c44086fac0db975e04452fcc1d7cda0d5392ff703e1c39504ec4ee63610e2e89fd1e1 DIST wine-staging-6.6.tar.gz 9756871 BLAKE2B 45e49f7cd2820e027cf9788e7257a3fdaeb97d711d8ae4b466026316f331c2ad84aa0f8446cbeacb98c280e21bd1666d23054bcbc7702533e4974148e684be91 SHA512 65e90c4a0965f2db499edcff5171552b8e95716ff9b2a4ed272d022bc0b1f99547ca1d7b09ced2a267cdf3dfbaf552f9cbb2cc8bbd34636eb3882406ab5985d2 DIST wine-staging-6.7.tar.gz 9722531 BLAKE2B 1df164ea23808f40baddbbe30ed92125563c3c952e13817ddea124cf780a397237e70aa48532d5b49c8b80919122a09e579f1928a13b6d17329d51f0ba03da74 SHA512 74805846e2e6e5d751c25f4b98ac671f8507d3a9b13d572e166b1885e397a6bb74bd3ea4b456d46298306d632499a4b88f97eb6d53ff049c2495cf055347611d -EBUILD wine-staging-6.4.ebuild 21988 BLAKE2B 3ddadace2bc48c8f2dc755eae43372f389b3d6338be3c253dacf31c0bd4e87470d189aa164dce0e9a67bf326a78189c9e616db7f4ae19fc1858978bd07d0d2f3 SHA512 a211d6169167d3135dfa8b0bb94ca20d8830ddbcddedab4118aa13c1a3a86338bfb6ecb9fc7fa5973a100ccdff2bc972e88143b20b7184f234f528d27ca93124 -EBUILD wine-staging-6.5.ebuild 21988 BLAKE2B 3ddadace2bc48c8f2dc755eae43372f389b3d6338be3c253dacf31c0bd4e87470d189aa164dce0e9a67bf326a78189c9e616db7f4ae19fc1858978bd07d0d2f3 SHA512 a211d6169167d3135dfa8b0bb94ca20d8830ddbcddedab4118aa13c1a3a86338bfb6ecb9fc7fa5973a100ccdff2bc972e88143b20b7184f234f528d27ca93124 -EBUILD wine-staging-6.6.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b -EBUILD wine-staging-6.7.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b -EBUILD wine-staging-9999.ebuild 21988 BLAKE2B f5a28faf8cc1870415423634ac55b1dfb9a6d8aaccdb93022db27604a63d868311dc89168f039192fbb7633ff9693346ec6a2e29970e23be4ef9cfa72767f8a9 SHA512 056996aa864b9c9c42d7e8ec46463915882c474097c4be4e98ec6872153ca1476ea75cc89ee407dd71c6fffb44bb1b7556d5d8102f1c5a0b2d4cf59d4a89830b +EBUILD wine-staging-6.4.ebuild 21990 BLAKE2B 5ad75ba1a2119ab1ac2737adeabcc5e15b42b78058e62e213a77674ca15c5b13a1c7652bc00d426ef37a7d146773c58cfebececc5c5741d56e402e8f2218a32e SHA512 83ba4f7786890f168d6393741653a03f8491e925d5da8ed9b27484976caf6697b5744676c4fe386f62cc2550971bacd17dce5effecd209adf6971ab55b3717fe +EBUILD wine-staging-6.5.ebuild 21990 BLAKE2B 5ad75ba1a2119ab1ac2737adeabcc5e15b42b78058e62e213a77674ca15c5b13a1c7652bc00d426ef37a7d146773c58cfebececc5c5741d56e402e8f2218a32e SHA512 83ba4f7786890f168d6393741653a03f8491e925d5da8ed9b27484976caf6697b5744676c4fe386f62cc2550971bacd17dce5effecd209adf6971ab55b3717fe +EBUILD wine-staging-6.6.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4 +EBUILD wine-staging-6.7.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4 +EBUILD wine-staging-9999.ebuild 21990 BLAKE2B 798aa83526eb1a02233461cb05735ef1c31a75356ea86fa67a864e2d50e157a2c8dfcb12c9c00e8fca050b73154eab9ff6930468252009655292001dc64c3866 SHA512 5f0a96f4974f99df2d291d917f56572823f1c57b5047b715c1c97a11437a2e01564e418c556e7a0e7e52507fd5cdda7aff250cd33691d00eaa17833d93ce74f4 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033 diff --git a/app-emulation/wine-staging/wine-staging-6.4.ebuild b/app-emulation/wine-staging/wine-staging-6.4.ebuild index 6641dfc2f349..88e527150d91 100644 --- a/app-emulation/wine-staging/wine-staging-6.4.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild @@ -373,7 +373,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -436,7 +436,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-staging/wine-staging-6.5.ebuild b/app-emulation/wine-staging/wine-staging-6.5.ebuild index 6641dfc2f349..88e527150d91 100644 --- a/app-emulation/wine-staging/wine-staging-6.5.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.5.ebuild @@ -373,7 +373,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -436,7 +436,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-staging/wine-staging-6.6.ebuild b/app-emulation/wine-staging/wine-staging-6.6.ebuild index 20eb02bc907b..f1e4e79a20aa 100644 --- a/app-emulation/wine-staging/wine-staging-6.6.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.6.ebuild @@ -373,7 +373,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -436,7 +436,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-staging/wine-staging-6.7.ebuild b/app-emulation/wine-staging/wine-staging-6.7.ebuild index 20eb02bc907b..f1e4e79a20aa 100644 --- a/app-emulation/wine-staging/wine-staging-6.7.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.7.ebuild @@ -373,7 +373,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -436,7 +436,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 20eb02bc907b..f1e4e79a20aa 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -373,7 +373,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -436,7 +436,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 4e91b7f7d410..21852907f3e1 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -4,10 +4,10 @@ DIST wine-6.4.tar.xz 24340220 BLAKE2B b09ea9237b71856184a03e64ef8cf7aa30591ebd65 DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4 DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758 -EBUILD wine-vanilla-6.0.ebuild 18913 BLAKE2B ca8e38cfcec6e420a8972c803db113bf9005c7e3bebd6a12e6d648d5cee73af3286a99d2fa4b974a3baf76ede579d2e14cd02a839648d4cfa6ced8aa7f480626 SHA512 9c5aa5535d79bd89685341c5527c2f15d826fe46555da3fdf7fd35f37c6a44fbf09c32157dee62e43cb40d3eeddf9b266be505f7ee7db9f503eb8e456f7de37a -EBUILD wine-vanilla-6.4.ebuild 18884 BLAKE2B ea4afc973667059760fa94232e5e9fbff6fe4ed14abf05e7c741d359d45a9ca37c55f7716009939140ab6cbcb0dbc5d2a6ac8a6c5b842be72aca892485e53304 SHA512 75b0fb09ff0aed3bce2e70407e132764883eee54c2e36c8d572706cd577a225ceb76dff4d360a61bdf672090763b1d1026aa6f2dcba2c0ac70f26784f181bdc9 -EBUILD wine-vanilla-6.5.ebuild 18884 BLAKE2B ea4afc973667059760fa94232e5e9fbff6fe4ed14abf05e7c741d359d45a9ca37c55f7716009939140ab6cbcb0dbc5d2a6ac8a6c5b842be72aca892485e53304 SHA512 75b0fb09ff0aed3bce2e70407e132764883eee54c2e36c8d572706cd577a225ceb76dff4d360a61bdf672090763b1d1026aa6f2dcba2c0ac70f26784f181bdc9 -EBUILD wine-vanilla-6.6.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1 -EBUILD wine-vanilla-6.7.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1 -EBUILD wine-vanilla-9999.ebuild 18884 BLAKE2B 11d1d163e671255a3f89cdbf4f3c2e45d6adbc56bb136a85c1151510f57e1fcf125c76301eafa7857451558402a885f391dae569de5a7f23017007f7ce841811 SHA512 720a41d5e9ff35f6bc9cf5f103352f645505b14e3c872faa5f7e9093d7de83a1a8f4062bc34b8bc1542f5b3324e912e15a14c476670f037070bd3a98f365eda1 +EBUILD wine-vanilla-6.0.ebuild 18915 BLAKE2B 62da21f599f1b17670630aebf24e9d05c0372567cca2708d40ec3d3da2f5db7c96c5888fd7f8c61e0cca151e31a46d9f538da5468bad06672f57e63d81c7b49d SHA512 4bb50445f5d5e6c21171fa87fc5c098e5993e3e65519726ad5bf84b50cd0b4d0096ace5ac31073f231bc65bfb8d78924f6892f801c2a977e1b82488b2293a282 +EBUILD wine-vanilla-6.4.ebuild 18886 BLAKE2B 51346684ac002b7430e01fdbd2d799bbc0aa346846004b93d2c89a961915eddf085fe7fdbfacd7acc01998d8a748203cb4d5a98c74c93aa915a664754619b515 SHA512 15b2af2e20c2d080a462276b9325c35ad04c53f083f4ffda786e425e02975db9a88c788e257677bb829054c44fabc261cdef5f4d01c32c701faddccb8f68a20b +EBUILD wine-vanilla-6.5.ebuild 18886 BLAKE2B 51346684ac002b7430e01fdbd2d799bbc0aa346846004b93d2c89a961915eddf085fe7fdbfacd7acc01998d8a748203cb4d5a98c74c93aa915a664754619b515 SHA512 15b2af2e20c2d080a462276b9325c35ad04c53f083f4ffda786e425e02975db9a88c788e257677bb829054c44fabc261cdef5f4d01c32c701faddccb8f68a20b +EBUILD wine-vanilla-6.6.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751 +EBUILD wine-vanilla-6.7.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751 +EBUILD wine-vanilla-9999.ebuild 18886 BLAKE2B 0a2ab276c8b73ae795ca5081c7688bf3c663aaa5d96021c821cc845c832d0a522d79c903cc36640275d3e5f2f0f32db05ac3a40b6054a5e53514009d8422fa1a SHA512 a2cb3cfb9e66ee3fe49b923b32b062b7710fbb69d5445aba3ff812132887950028de0d8ffafd8bbf0feac2ab927a77d6f8f12211b9ed974d35b9ec4de64d2751 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8 diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild index a22f22a5cc6f..cca4f00d131b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild @@ -319,7 +319,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -365,7 +365,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild index 7c3b8aca83fe..58304136185f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild @@ -318,7 +318,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -364,7 +364,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild index 7c3b8aca83fe..58304136185f 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.5.ebuild @@ -318,7 +318,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -364,7 +364,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild index 32fbb98391a5..d1662b9c437b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.6.ebuild @@ -318,7 +318,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -364,7 +364,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild index 32fbb98391a5..d1662b9c437b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.7.ebuild @@ -318,7 +318,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -364,7 +364,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 32fbb98391a5..d1662b9c437b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -318,7 +318,7 @@ src_unpack() { src_prepare() { - eapply_bin(){ + eapply_bin() { local patch for patch in ${PATCHES_BIN[@]}; do patchbin --nogit < "${patch}" || die @@ -364,7 +364,7 @@ src_prepare() { \164\2/' loader/Makefile.in || die fi - rm_man_file(){ + rm_man_file() { local file="${1}" loc=${2} sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die -- cgit v1.2.3