diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /app-emulation | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'app-emulation')
61 files changed, 2549 insertions, 1598 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 3f2429722437..c587be72ec74 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest index 97c1de6b9fbb..bb168bf65c38 100644 --- a/app-emulation/crun/Manifest +++ b/app-emulation/crun/Manifest @@ -1,5 +1,5 @@ -DIST crun-0.15.tar.gz 1364861 BLAKE2B 7078e71229bae4bc663398891b21344abc3189c78a11e4feeae3236e1df4a2c5160cf26f2cc243d4c0898a642a779603d473d2c22ca2b67123c6ac4654fce4d7 SHA512 f9a9e94b6a9c5cff01fe93b1c3d5876a0794e6288b802cf579556e11411ca5d6e63cae3859aaa4df4bb600e2d27aa131872a93a92784b9b48f7885411d86f325 DIST crun-0.16.tar.gz 1370194 BLAKE2B c2a2450518226421b43d93597b38da80ca330cb3d8d9c259f323d49561e93dc3d003a25599eb8e918888dd824037c53bd0a07624c3154fa3778cc6dad37ac04b SHA512 f5a0d19c037af55478ee5f83b63d74277c8640f715b81a8233d3f1acd4cdfdad491e5c1f5beda04d0d7aa16693e9a004b0bde71343b082aa514ae76e5907d029 -EBUILD crun-0.15.ebuild 1526 BLAKE2B 8d072072c296bd4e7b7d7861f194eff58b36448144b81b0655b5ad9cc8706dcd0712aa914d42d704294d2bbba8ee638121c8fca3cb873f5fe896a7dd34be9a18 SHA512 4a324e42979c1d5984bbf36681cb153d35a8cb7f3f1ad2b9a8dbbb02b590cc862bb4be45bb86997d66b0b5edb87813464ecf24d999e3d15764c84bc43c2a569d +DIST crun-0.17.tar.gz 1385658 BLAKE2B 3d4c30989b9e79d02bf9a6c298daa8d0b5b6b8bfcfaca8ae9e27ad865762a32b6af2c8806586bba2ab94271446a93c34e8f2d465cc008c41bbe69e565556a1b1 SHA512 b095a3c4fca8ae683553805de468594e8dd891cc9911b56e8be7c429584e71fb40a364cf55a6a829950078a539d35308310f53f57b8fb40d483d394e91b20b01 EBUILD crun-0.16.ebuild 1393 BLAKE2B 4405a9825f15c2c29471a8d104b66a1a412c41aed3ef23d73ebac347eabc7afc8883795a8022aac520f1e5a47405d4247a96efa09e8a56a3b992872c6c407183 SHA512 8015aff83762d3b359d5d8ea4c8c20dc3693212659bb173101abfb01a6a617a102f4168736d74f4435ce01782964c03d63cee58db21b9cc2d6d82d0dc84fc55b -MISC metadata.xml 1323 BLAKE2B ed901603f82b37f0be35823d1ac8e905679941d4dcec938272800df6b18d0ba7d1354bf405af0c7be743b11d2b1789be53b67c2d5bdad615bb83f3f4f0e9208c SHA512 201db113216801b4f9c8d83535874d270e828c5c780e96480f662a8a744657f886446f15ab2f4c2500d209a0d2ac03b501e625146775aa8f751b8bd3e0473b11 +EBUILD crun-0.17.ebuild 1393 BLAKE2B 202766c3cd321d12f35214d28cb7dde3c7bd5ba916106ec7523923e54d5f6070d66a7486e198f137a2808684ee9ad2f3acc2c25434ed445a4255519ff04adebf SHA512 db0ffd3ae2a3b9a725c25694095b6c5ee6cc7f96eaff1324f3209dd6d5fdf3e200c0072531bc537a063a5dddcfb1cdb6bcfdc9ef5e58c74204de2f624b4d7113 +MISC metadata.xml 1269 BLAKE2B 3c486216614d2758ad8dc7d01ca46babb33375fad75b959361d792a818d0515f1b2a4c913252eb2f006ecd962e281556137ded3eebe96f5e62f3caa5994c5bb4 SHA512 d1999558dfa98c2006e095589a15d2c2e61ac302b520759921c4eae5c94a245e25b0d7b23eb5754d5a324006d447ab3275bb188e8387110c9c3ec81f724efc87 diff --git a/app-emulation/crun/crun-0.15.ebuild b/app-emulation/crun/crun-0.17.ebuild index fc58b334caf1..bc97b2bddb13 100644 --- a/app-emulation/crun/crun-0.15.ebuild +++ b/app-emulation/crun/crun-0.17.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,20 +14,19 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="+bpf +caps criu man +seccomp systemd static-libs" +IUSE="+bpf +caps criu +seccomp systemd static-libs" DEPEND=" sys-kernel/linux-headers >=dev-libs/yajl-2.0.0 caps? ( sys-libs/libcap ) - criu? ( >=sys-process/criu-3.13 ) + criu? ( >=sys-process/criu-3.15 ) seccomp? ( sys-libs/libseccomp ) systemd? ( sys-apps/systemd:= ) " RDEPEND="${DEPEND}" BDEPEND=" ${PYTHON_DEPS} - man? ( dev-go/go-md2man ) " # the crun test suite is comprehensive to the extent that tests will fail @@ -39,12 +38,12 @@ DOCS=( README.md ) src_configure() { local myeconfargs=( - $(use_enable bpf) \ - $(use_enable caps) \ - $(use_enable criu) \ - $(use_enable seccomp) \ - $(use_enable systemd) \ - $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '') + $(use_enable bpf) + $(use_enable caps) + $(use_enable criu) + $(use_enable seccomp) + $(use_enable systemd) + $(usex static-libs '--enable-shared --enable-static' '--enable-shared --disable-static' '' '') ) econf "${myeconfargs[@]}" @@ -53,16 +52,10 @@ src_configure() { src_compile() { emake -C libocispec emake crun - if use man ; then - emake generate-man - fi } src_install() { emake "DESTDIR=${D}" install-exec - if use man ; then - emake "DESTDIR=${D}" install-man - fi - + doman crun.1 einstalldocs } diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml index e26e3d83bf66..11d539113887 100644 --- a/app-emulation/crun/metadata.xml +++ b/app-emulation/crun/metadata.xml @@ -26,7 +26,6 @@ <flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter) support for managing device controllers. </flag> - <flag name="man">Build and install man pages</flag> <flag name="criu">Enable CRIU based checkpoint/restore support</flag> </use> </pkgmetadata> diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 709aac407662..ee2245012d5c 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,4 +1,6 @@ DIST diskimage-builder-3.5.0.tar.gz 477918 BLAKE2B 0621a4af9bc68a19c45d88ddbe636ae3e6e86cc1668023b0f10020bff51929a03c12edfced248fc138a114ad4b538d7b71828ed44a5d18b54e39bd47919b9699 SHA512 bea42f47078966686af9774ef34300f326e2ddf4b536af53d1378cf413e6675df9f71c54d90fdb55fbdeeefc708264350a48d4a4b2824d0bc3263df04742d768 +DIST diskimage-builder-3.7.0.tar.gz 472703 BLAKE2B 4c3bf294f33556525f65d29e999cccaa4066d42f8e17742041666872ac01f5c6acab77d20b5d4281cc385a3f6988086e43c36f5330a656e5d2cb73c2e63e346d SHA512 c4453840f043774446e8dcb88bdc841d2fee8fb60432168fe48048171896932f2be9048fb0af9c5b777978218ec51f24bdfd6484a8e6cbe7a195b6df2508a1e1 EBUILD diskimage-builder-3.5.0.ebuild 1121 BLAKE2B 630bdf14446d40bd3084ecfe4b7aad4c26b99b2ddd7ab55bb1796e3749b418c07710478dcfbfd8aa9dd763999646381be6c14cabf7b3938ecf71270797435a39 SHA512 5ec7462c238fe26d8b54432b605b7d910c9ebacd82150b9cb1e060294f9958aeef4ce022655c82418f7f3f81ce58e518c2d2bb12aa9cc591db5bf460828f81ed +EBUILD diskimage-builder-3.7.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.7.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.7.0.ebuild new file mode 100644 index 000000000000..4c39e9fb0b8c --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-3.7.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/docker-cli/Manifest b/app-emulation/docker-cli/Manifest index 045ab18a7a97..7a58237de8c4 100644 --- a/app-emulation/docker-cli/Manifest +++ b/app-emulation/docker-cli/Manifest @@ -1,3 +1,5 @@ DIST docker-cli-20.10.2.tar.gz 7706210 BLAKE2B c8d537be8344dbd2113232c85a52f001231fdf653819710cf4492c86d58662e5f0d74f6fb00593d1034b5d481f15524cec89e2b3463900705a545b2051ab38d2 SHA512 907c846bf4043dcce4dd4e95e6335554b50e954464a83f75a44b1c0fcf9f2625c490a12758d18653c0d031768878a3f6fc91cb7fc6e1d3235d5e8f21ecd93caf +DIST docker-cli-20.10.3.tar.gz 7733821 BLAKE2B ab71e6817e7fe0d7c5f8c776cb25ae7bc49b5a224c835fe833988b67dfdf562207cd0afed4710d33e8a31156bd16bdc70df13f1194e862314add069c320c4e6e SHA512 769bed3e5409f6be570ab3672bef1bea4d16d5bfaeb81af8c4b3b7cfb56732c108c5404464731c001cf94fefd77c40a142bed80c85f1b058041e187453a6b88e EBUILD docker-cli-20.10.2.ebuild 1823 BLAKE2B f2cfec3be88532c82bd2b875978a2ce8ee90629747eebd471b3ad1f434c15b34d6fb6edea495863f1d091cab577a1f96355b6afbd7179baa161c01423555d2e9 SHA512 6c0050f769bf95fc9c02063f3597f6199a0f1f822a5b740fcc49872e1652a6fdcd535a926b5e3b512f61a49cfa3852a412c4bffb65ffbc3cdbc8658d44bb46da +EBUILD docker-cli-20.10.3.ebuild 1823 BLAKE2B 232555c2644df9900218045ba16e10f922fc64973fe2883d64c47321bc83af2b2682c9e9926661df2600f5b216e4b885de2ff8ea40f1994d5e99d7c3513057fa SHA512 f9c02bbc7aba914229a8b4acb89ff5d7d47edda4472d34b805b462a33c85389104d57a1f5be968e9c5499fb2c8935c4face373a857d9e7d046e2c1a6a138731f MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c diff --git a/app-emulation/docker-cli/docker-cli-20.10.3.ebuild b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild new file mode 100644 index 000000000000..2675134a9e69 --- /dev/null +++ b/app-emulation/docker-cli/docker-cli-20.10.3.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GIT_COMMIT=48d30b5b32 +EGO_PN="github.com/docker/cli" +inherit bash-completion-r1 golang-vcs-snapshot + +DESCRIPTION="the command line binary for docker" +HOMEPAGE="https://www.docker.com/" +MY_PV=${PV/_/-} +SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="hardened" + +RDEPEND="!<app-emulation/docker-20.10.1" +BDEPEND="dev-go/go-md2man" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +src_prepare() { + default + sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die + sed -i 's@md2man@go-md2man@' man/md2man-all.sh || die +} + +src_compile() { + export DISABLE_WARN_OUTSIDE_CONTAINER=1 + export GOPATH="${WORKDIR}/${P}" + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat VERSION)" \ + GITCOMMIT="${GIT_COMMIT}" \ + dynbinary + + # build man pages + # see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + go build -o "${T}"/gen-manpages ./man || + die 'build gen-manpages failed' + "${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 || + die 'gen-manpages failed' + ./man/md2man-all.sh -q || + die 'md2man-all.sh failed' +} + +src_install() { + dobin build/docker + doman man/man*/* + dobashcomp contrib/completion/bash/* + bashcomp_alias docker dockerd + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completion/fish/docker.fish + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* +} diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest index 4ea40dee9633..d1d2c1427440 100644 --- a/app-emulation/docker/Manifest +++ b/app-emulation/docker/Manifest @@ -1,7 +1,11 @@ DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873 DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28 +DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc DIST docker-20.10.2.tar.gz 11045195 BLAKE2B 182ceabbabfa091eaae8ecf12a50dfbe296722072ee24cdde48c3ed2ad40f47d6f939830a00e1dbe7d5dfb1fa25ccda7efe25ce3e4f9a7bbf6ad85dac109168c SHA512 b514e98e3f71874fcf5374eeaaabc2c879691b48937dbc962be3577d834f571353d4f946aebfa69f1a62b1388c9220bfdff09b62bf62c134bd41f494e8506f56 +DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8 EBUILD docker-19.03.13-r2.ebuild 9217 BLAKE2B c75a45738a89c1205a6515e3c9796cdffa63776cc54ba6f345579ecaae9642dbb8c8246af1b78b0cd14002a25a1bb8ff8238a4eca874bdfd30ea23bf1c5ff5c1 SHA512 65f016b40849652aea58353a6a3045c0aaac8793891db727ab597a97e885a27ba8380413b108ce090afa66474fa3502b74c8278722bcae454fc98b4a3c226bf4 EBUILD docker-19.03.14.ebuild 9216 BLAKE2B 01bb9dde2f897bc65e4eabefc07be637118e19d512e4a0c46e8ba6d5aec6b5b2aba8f1e702eda11a4641f08acc3c91661348b89561b3d2f11e7e59bf6991ec3e SHA512 cf68f486054ed21d6a690f364e84db2e8b8efab22d8eb1a8de0e381d1011c221f0ab664be5e22973d82cc1a98fac29135cc3baa0171362b7152e80da1d5a186b +EBUILD docker-19.03.15.ebuild 9217 BLAKE2B 8f0eeca1ce67fd8507ff2b8e5e21aaa3191325c3a27acc50d9749bcc235cc0e40d5fa3b47c4076e0a2b00699e1583a5dbe913a3661eb552816076f27f4b9c39c SHA512 a6a6e934368ab9a16635e5e4ef610ef8df087126e33ca59c90f253c5e8357ef761e60d58e275eca012176c65576d90f4213913137f84bb3d063278efe6173c6c EBUILD docker-20.10.2.ebuild 8102 BLAKE2B 5d5c0141716c1f08797d10b61bd0c80be27fdd7ccac70d7b02035e91afe105c6b3bf637cf86c35844f371637002559a977c4b819009329f7dbe68e0802385f45 SHA512 1b2b889559e70b5be6cee3a49149293ad30d0e2a67f01b0be27dcf75190a5f2cdf8fe489a81df0c0febd6f76b051ada8c73a3745f34ea2bf6a9fdbe4c02734b1 +EBUILD docker-20.10.3.ebuild 8102 BLAKE2B 1cda7fd700b096e0d21428f40e66331276e65269615eaa5f25f1a78fd1d8c9cb21419621479429dcd0bfa59119b69b1e6fdfa1d27b7b9ac37d9356a61050d6a1 SHA512 3755cc9759b8e544763869a6ff52d73060ddd04c149704c02de9e2ce23decec443ee95f162eaaf6a270a3191cdc604eaa5cccb86e30e6fe356b76690ea6be8a8 MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3 diff --git a/app-emulation/docker/docker-19.03.15.ebuild b/app-emulation/docker/docker-19.03.15.ebuild new file mode 100644 index 000000000000..ac8fee3a6cc3 --- /dev/null +++ b/app-emulation/docker/docker-19.03.15.ebuild @@ -0,0 +1,333 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGO_PN="github.com/docker/docker-ce" + +if [[ ${PV} = *9999* ]]; then + # Docker cannot be fetched via "go get", thanks to autogenerated code + EGIT_REPO_URI="https://${EGO_PN}.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}" + inherit git-r3 +else + DOCKER_GITCOMMIT=420b1d3625 + MY_PV=${PV/_/-} + SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" + [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" + inherit golang-vcs-snapshot +fi +inherit bash-completion-r1 golang-base linux-info systemd udev + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://www.docker.com/" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +BDEPEND=" + >=dev-lang/go-1.13.12 + dev-go/go-md2man + virtual/pkgconfig +" + +DEPEND=" + acct-group/docker + >=dev-db/sqlite-3.7.9:3 + apparmor? ( sys-libs/libapparmor ) + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) + device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies +# https://github.com/docker/docker-ce/tree/master/components/engine/hack/dockerfile/install +# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# for appropriate brachch/version of course +RDEPEND=" + ${DEPEND} + !sys-apps/systemd[-cgroup-hybrid(+)] + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.3.9[apparmor?,btrfs?,device-mapper?,seccomp?,selinux?] + ~app-emulation/runc-1.0.0_rc10[apparmor?,seccomp?,selinux(-)?] + ~app-emulation/docker-proxy-0.8.0_p20201105 + container-init? ( >=sys-process/tini-0.18.0[static] ) +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP + + ~BLK_CGROUP ~BLK_DEV_THROTTLING + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY + + ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR + ~EXT4_FS_SECURITY + ~EXT4_FS_POSIX_ACL +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if kernel_is lt 5 1; then + CONFIG_CHECK+=" + ~NF_NAT_IPV4 + ~IOSCHED_CFQ + ~CFQ_GROUP_IOSCHED + " + fi + + if kernel_is lt 5 2; then + CONFIG_CHECK+=" + ~NF_NAT_NEEDED + " + fi + + if kernel_is lt 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + linux-info_pkg_setup +} + +src_compile() { + export GOPATH="${WORKDIR}/${P}" + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # if we're building from a tarball, we need the GITCOMMIT value + [[ ${DOCKER_GITCOMMIT} ]] && export DOCKER_GITCOMMIT + + # fake golang layout + ln -s docker-ce/components/engine ../docker || die + ln -s docker-ce/components/cli ../cli || die + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp selinux; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + pushd components/engine || die + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + VERSION="$(cat ../../VERSION)" \ + ./hack/make.sh dynbinary || die 'dynbinary failed' + + popd || die # components/engine + + pushd components/cli || die + + # build cli + DISABLE_WARN_OUTSIDE_CONTAINER=1 emake \ + LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \ + VERSION="$(cat ../../VERSION)" \ + GITCOMMIT="${DOCKER_GITCOMMIT}" \ + dynbinary + + # build man pages + go build -o gen-manpages github.com/docker/cli/man || die + ./gen-manpages --root . --target ./man/man1 || die + ./man/md2man-all.sh -q || die + rm gen-manpages || die + # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man) + + popd || die # components/cli +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + + pushd components/engine || die + newbin bundles/dynbinary-daemon/dockerd-${PV} dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + insinto /usr/share/vim/vimfiles + doins -r contrib/syntax/vim/ftdetect + doins -r contrib/syntax/vim/syntax + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" + popd || die # components/engine + + pushd components/cli || die + + newbin build/docker-* docker + + doman man/man*/* + + sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die + dobashcomp contrib/completion/bash/* + bashcomp_alias docker dockerd + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completion/fish/docker.fish + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/_* + popd || die # components/cli +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot:" + if systemd_is_booted || has_version sys-apps/systemd; then + elog " systemctl enable docker.service" + else + elog " rc-update add docker default" + fi + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog ' usermod -aG docker <youruser>' + elog + + if use device-mapper; then + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" + elog + fi + + if use overlay; then + elog " Overlay storage driver/USEflag has been deprecated" + elog " in favor of overlay2 (enabled unconditionally)" + elog + fi + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi +} diff --git a/app-emulation/docker/docker-20.10.3.ebuild b/app-emulation/docker/docker-20.10.3.ebuild new file mode 100644 index 000000000000..b8b0e6129674 --- /dev/null +++ b/app-emulation/docker/docker-20.10.3.ebuild @@ -0,0 +1,293 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +EGO_PN=github.com/docker/docker +GIT_COMMIT=46229ca1d8 +inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot + +DESCRIPTION="The core functions you need to create Docker images and run Docker containers" +HOMEPAGE="https://www.docker.com/" +MY_PV=${PV/_/-} +SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp" + +DEPEND=" + acct-group/docker + >=dev-db/sqlite-3.7.9:3 + apparmor? ( sys-libs/libapparmor ) + btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) + device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) + seccomp? ( >=sys-libs/libseccomp-2.2.1 ) +" + +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies +# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies +# https://github.com/moby/moby/tree/master//hack/dockerfile/install +# make sure containerd, docker-proxy, runc and tini pinned to exact versions from ^, +# for appropriate branchch/version of course +RDEPEND=" + ${DEPEND} + >=net-firewall/iptables-1.4 + sys-process/procps + >=dev-vcs/git-1.7 + >=app-arch/xz-utils-4.9 + dev-libs/libltdl + ~app-emulation/containerd-1.4.3[apparmor?,btrfs?,device-mapper?,seccomp?] + ~app-emulation/runc-1.0.0_rc92[apparmor?,seccomp?] + ~app-emulation/docker-proxy-0.8.0_p20201215 + cli? ( app-emulation/docker-cli ) + container-init? ( >=sys-process/tini-0.19.0[static] ) +" + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies +BDEPEND=" + >=dev-lang/go-1.13.12 + dev-go/go-md2man + virtual/pkgconfig +" + +RESTRICT="installsources strip" + +S="${WORKDIR}/${P}/src/${EGO_PN}" + +# see "contrib/check-config.sh" from upstream's sources +CONFIG_CHECK=" + ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS + ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG + ~KEYS + ~VETH ~BRIDGE ~BRIDGE_NETFILTER + ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE + ~NETFILTER_NETLINK ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS + ~IP_NF_NAT ~NF_NAT + ~POSIX_MQUEUE + + ~USER_NS + ~SECCOMP + ~CGROUP_PIDS + ~MEMCG_SWAP + + ~BLK_CGROUP ~BLK_DEV_THROTTLING + ~CGROUP_PERF + ~CGROUP_HUGETLB + ~NET_CLS_CGROUP + ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED + ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR + + ~VXLAN + ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER + ~IPVLAN + ~MACVLAN ~DUMMY + + ~OVERLAY_FS ~!OVERLAY_FS_REDIRECT_DIR + ~EXT4_FS_SECURITY + ~EXT4_FS_POSIX_ACL +" + +ERROR_KEYS="CONFIG_KEYS: is mandatory" +ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers" +ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering" + +ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering" +ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering" +ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering" +ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering" +ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks" +ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks" + +pkg_setup() { + if kernel_is lt 3 10; then + ewarn "" + ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported." + ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies" + fi + + if kernel_is le 3 18; then + CONFIG_CHECK+=" + ~RESOURCE_COUNTERS + " + fi + + if kernel_is le 3 13; then + CONFIG_CHECK+=" + ~NETPRIO_CGROUP + " + else + CONFIG_CHECK+=" + ~CGROUP_NET_PRIO + " + fi + + if kernel_is lt 4 5; then + CONFIG_CHECK+=" + ~MEMCG_KMEM + " + ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional" + fi + + if kernel_is lt 4 7; then + CONFIG_CHECK+=" + ~DEVPTS_MULTIPLE_INSTANCES + " + fi + + if kernel_is lt 5 1; then + CONFIG_CHECK+=" + ~NF_NAT_IPV4 + ~IOSCHED_CFQ + ~CFQ_GROUP_IOSCHED + " + fi + + if kernel_is lt 5 2; then + CONFIG_CHECK+=" + ~NF_NAT_NEEDED + " + fi + + if kernel_is lt 5 8; then + CONFIG_CHECK+=" + ~MEMCG_SWAP_ENABLED + " + fi + + if use aufs; then + CONFIG_CHECK+=" + ~AUFS_FS + ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone" + fi + + if use btrfs; then + CONFIG_CHECK+=" + ~BTRFS_FS + ~BTRFS_FS_POSIX_ACL + " + fi + + if use device-mapper; then + CONFIG_CHECK+=" + ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY + " + fi + + linux-info_pkg_setup +} + +src_compile() { + export DOCKER_GITCOMMIT="${GIT_COMMIT}" + export GOPATH="${WORKDIR}/${P}" + + # setup CFLAGS and LDFLAGS for separate build target + # see https://github.com/tianon/docker-overlay/pull/10 + export CGO_CFLAGS="-I${ROOT}/usr/include" + export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)" + + # let's set up some optional features :) + export DOCKER_BUILDTAGS='' + for gd in aufs btrfs device-mapper overlay; do + if ! use $gd; then + DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}" + fi + done + + for tag in apparmor seccomp; do + if use $tag; then + DOCKER_BUILDTAGS+=" $tag" + fi + done + + if use hardened; then + sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die + grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed' + sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \ + -i hack/make/dynbinary-daemon || die + grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed' + fi + + # build daemon + ./hack/make.sh dynbinary || die 'dynbinary failed' +} + +src_install() { + dosym containerd /usr/bin/docker-containerd + dosym containerd-shim /usr/bin/docker-containerd-shim + dosym runc /usr/bin/docker-runc + use container-init && dosym tini /usr/bin/docker-init + newbin bundles/dynbinary-daemon/dockerd dockerd + + newinitd contrib/init/openrc/docker.initd docker + newconfd contrib/init/openrc/docker.confd docker + + systemd_dounit contrib/init/systemd/docker.{service,socket} + + udev_dorules contrib/udev/*.rules + + dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md + dodoc -r docs/* + + # note: intentionally not using "doins" so that we preserve +x bits + dodir /usr/share/${PN}/contrib + cp -R contrib/* "${ED}/usr/share/${PN}/contrib" +} + +pkg_postinst() { + udev_reload + + elog + elog "To use Docker, the Docker daemon must be running as root. To automatically" + elog "start the Docker daemon at boot:" + if systemd_is_booted || has_version sys-apps/systemd; then + elog " systemctl enable docker.service" + else + elog " rc-update add docker default" + fi + elog + elog "To use Docker as a non-root user, add yourself to the 'docker' group:" + elog ' usermod -aG docker <youruser>' + elog + + if use device-mapper; then + elog " Devicemapper storage driver has been deprecated" + elog " It will be removed in a future release" + elog + fi + + if use overlay; then + elog " Overlay storage driver/USEflag has been deprecated" + elog " in favor of overlay2 (enabled unconditionally)" + elog + fi + + if has_version sys-fs/zfs; then + elog " ZFS storage driver is available" + elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info" + elog + fi + + if use cli; then + ewarn "Starting with docker 20.10.2, docker has been split into" + ewarn "two packages upstream, so Gentoo has followed suit." + ewarn + ewarn "app-emulation/docker contains the daemon and" + ewarn "app-emulation/docker-cli contains the docker command." + ewarn + ewarn "docker currently installs docker-cli using the cli use flag." + ewarn + ewarn "This use flag is temporary, so you need to take the" + ewarn "following actions:" + ewarn + ewarn "First, disable the cli use flag for app-emulation/docker" + ewarn + ewarn "Then, if you need docker-cli and docker on the same machine," + ewarn "run the following command:" + ewarn + ewarn "# emerge --noreplace docker-cli" + ewarn + fi +} diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index a6125ea9b667..52197978553c 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -5,7 +5,9 @@ AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5 DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5 DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b +DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836 EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5 EBUILD free42-2.5.22.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f EBUILD free42-2.5.24.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304 +EBUILD free42-2.5.25.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304 MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758 diff --git a/app-emulation/free42/free42-2.5.25.ebuild b/app-emulation/free42/free42-2.5.25.ebuild new file mode 100644 index 000000000000..d25a89b2d1c4 --- /dev/null +++ b/app-emulation/free42/free42-2.5.25.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_PV="${PN}-nologo-${PV}" + +DESCRIPTION="An HP-42S Calculator Simulator" +HOMEPAGE="https://thomasokken.com/free42/" +SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa" + +DEPEND="dev-libs/atk + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/gtk+:3 + alsa? ( media-libs/alsa-lib )" + +RDEPEND="${DEPEND}" + +DOCS=( CREDITS HISTORY README ) +S="${WORKDIR}/${MY_PV}" + +PATCHES=( + "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch" + "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch" +) + +src_prepare() { + default +} + +src_compile() { + local myconf + use alsa && myconf="AUDIO_ALSA=yes" + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk + emake -C gtk clean + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk +} + +src_install() { + default + dobin gtk/free42bin gtk/free42dec +} diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest index 9c0b57eba901..907f8fd31d60 100644 --- a/app-emulation/genymotion-bin/Manifest +++ b/app-emulation/genymotion-bin/Manifest @@ -1,3 +1,3 @@ -DIST genymotion-3.1.2-linux_x64.bin 40553630 BLAKE2B fd11ad2a190788758cc84d8be7774aabcd3e21a7cfda05948ed2bd09fae9834489ab69a6f834ef700ae283899185ef2c9f2371b7a0549327f95fb83701e4f29e SHA512 068f491965edf0d455676aa1903ef7df427986d750efc80e691ca68f7c4908101de782c71dbefc6dd53d2c8344b5b7fbd0e4c8f2fa5f3e2944d6c558627c2dc3 -EBUILD genymotion-bin-3.1.2.ebuild 3592 BLAKE2B 86cf768889157d29282a787c244d2819f83c18969f127ade68556be74a61e965ee1643fe7868cd46637d77009f9bb1104798e27ac095d29446a0129569232d07 SHA512 4094ee96e501dad45c108b1e8b74e3f91e9fe307d2074cff99aba46705c7a07a216bbd687f59ff5ce2c43f5064178a555332d2e5acfeeea2bebfe7cf2f13666e -MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c +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 +MISC metadata.xml 371 BLAKE2B d19be76b4ad2e2001f890c52fa894b50dd3fb63de95eb8b1a36666efe3e087c4c66d33a4d9d369f1ef3bbbc9be59648d91859448da8cca1397da8dcaf8efc1fc SHA512 5ffa59cea45522f04e42a63fb486e8584f30d07ce5ab9c9d875cc7342d1ff99665db25585d924b3f5e25eff42e54c55a3e970cd9b88b32a1112066d9a8c214d8 diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.1.2.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.2.0.ebuild index f5745370f0d7..1b6fe08cd282 100644 --- a/app-emulation/genymotion-bin/genymotion-bin-3.1.2.ebuild +++ b/app-emulation/genymotion-bin/genymotion-bin-3.2.0.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 @@ -17,10 +17,7 @@ LICENSE="genymotion" SLOT="0" KEYWORDS="-* ~amd64" -RDEPEND="|| ( - app-emulation/virtualbox - app-emulation/virtualbox-bin - ) +RDEPEND="app-emulation/virtualbox || ( dev-libs/openssl-compat:1.0.0 =dev-libs/openssl-1.0*:0 @@ -86,7 +83,6 @@ src_install() { 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}"/libqgsttools_p.so.1 doins "${MY_PN}"/qt.conf doins "${MY_PN}"/libicu* diff --git a/app-emulation/genymotion-bin/metadata.xml b/app-emulation/genymotion-bin/metadata.xml index 0a47874eaf48..cc2aa77ecc42 100644 --- a/app-emulation/genymotion-bin/metadata.xml +++ b/app-emulation/genymotion-bin/metadata.xml @@ -5,10 +5,6 @@ <email>fedeliallalinea@gmail.com</email> <name>Marco Genasci</name> </maintainer> - <maintainer type="person"> - <email>mudler@gentoo.org</email> - <name>Ettore Di Giacinto</name> - </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index 0caf98572563..794338aef128 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -13,8 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1 -EBUILD libguestfs-1.36.13-r2.ebuild 4066 BLAKE2B a69aef4ca7f87b3187cfd0683ca72fbe6aa79083318996b0108546246ff271c5144aaa388bbada0fd9dc763b97933838cf746c3b05381e94d7139daca8faafc4 SHA512 17a673845828e3e406892fdb91b1b5319351c261e874b59bdbba600147ae0c190d80bd919a0d6e3bfe9af33611f4ce358a129d904459deed322919475d45923e -EBUILD libguestfs-1.36.15-r2.ebuild 4270 BLAKE2B 37aa027e7154348bb85cb6a3882ac436061461f8cc6b1512d758db660ddec847933fb74751d646de3e1652c84d1a59dcdc5df56c3ebce3210914ef08eb13ca3f SHA512 537a78fc168e8a63008c73e64b396321a493e63f7c021a792e501fcab4742f257753b2c0a397cbe34b09738ecd4eea0b9a4ac9164db434a150e6c08fe29b3adf -EBUILD libguestfs-1.38.6-r1.ebuild 3982 BLAKE2B a3a620ad65c8f09f884c24c3d9cf59c552074bbd37603340bb9c58b423a0bb4e2a4ba0693be1999dca9a9d09bef699bc641d3b1cb50ce374cecd7b739ceaa9ea SHA512 461b83fc2e1abdbca3b1a6e43432889a31001ae3c118f35e202e9f137ac13c1d286fd4ff9e4fa2b4ac7a2461ccc6ff737c55e1a3755c88a95823227c49e5666e +EBUILD libguestfs-1.36.13-r2.ebuild 4068 BLAKE2B e1ed4bed7e91b15ef764e02b9ea0b57f4445a15b42acb61c40e6713e2eca18159cfee126969089afd02d945564d778e3cdb4d94f50bd41d252073ee07159a79b SHA512 045a24d92a43ff064c70f7050264ff7187c838912da4852fe717edcfec820e864529cb1e0b81f5f5362b31604c1516d8665051a8070f34ce74f7bc9a97ab1f30 +EBUILD libguestfs-1.36.15-r2.ebuild 4272 BLAKE2B 4faaff876e59c79077f9222d3560f60443e11599c0862f25fdcada21a2e6ea6342a93b8cf8a228bf8f8bfdc9de0387724baa4ab8c2755f3690892331866dea71 SHA512 a04d6cc9d2a8c66979fae3e73ab292a9e3c5d0b958f3856411d57ed7928393acda8320faf3306a7a1bebd83231fab303cef67b9ead14ea8fb7782e17f1ef0559 +EBUILD libguestfs-1.38.6-r1.ebuild 3984 BLAKE2B 613029ed271bc50e83c1e25c7045ff433cdc1332d2f9ed09b191352b43268597955d6392245bb25dded3955c2e900b19c4526f0070baa70cc62bdb7bd1666d38 SHA512 00a7bea64c8e628b154c5d746f95c9d5830e23ea4709a4767758518e07192b66aaef5112a350769973c0d11992f38e18731f22464d7efc829d7f5983eddf7749 EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964 diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild index 1c3065d4181c..da60a79915f1 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild @@ -10,8 +10,8 @@ MY_PV_2="$(get_version_component_range 2)" [[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development" DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" -HOMEPAGE="http://libguestfs.org/" -SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" +HOMEPAGE="https://libguestfs.org/" +SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild index a1d8a602c2a3..ed267915f05c 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild @@ -10,8 +10,8 @@ MY_PV_2="$(ver_cut 2)" [[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" -HOMEPAGE="http://libguestfs.org/" -SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" +HOMEPAGE="https://libguestfs.org/" +SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild index 007b01984ed2..b522fb1d4797 100644 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild @@ -10,8 +10,8 @@ MY_PV_2="$(ver_cut 2)" [[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" -HOMEPAGE="http://libguestfs.org/" -SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" +HOMEPAGE="https://libguestfs.org/" +SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 98fcbc10108f..c2b806d3bead 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,6 +1,5 @@ AUX README.gentoo-r3 2062 BLAKE2B bf45e0f63182dbff31982581045389c5510d5c3e648de34982ea9861923833a024681072ecf4f76b2ca025da30ed4a5a0f1273c85b4c0beb08189f80ce54de3e SHA512 6c54bd70a8521fcfe7eb21df87466c1df0026c569700f3d1b14c76cef4c1e68a56aa13d66b5214ae35a4c24bca58350d07d3e54ca3204ad336be618f51b00984 AUX libvirt-6.0.0-fix_paths_in_libvirt-guests_sh.patch 1281 BLAKE2B 631f813ad29db29a6eb537ecd7b9d12aed097c5e0e01c07161adac1dec8a6f129bc098172fe6de4e78a2fbe5e67052005a7c5d1d17cbbb63ad27025662b9fa34 SHA512 dc80c9fc459207dd1ff77548054ea5a51c41a2d36e1b8917eca5f69293a86168af3da47466d8ff954a8b2e0ead9f28ed7d6c2c3671cf67d0ebb4039003a0dde2 -AUX libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch 4415 BLAKE2B 0bac886d57267eee37b78b146f68dbbd487a7d4a6c72a7ce27a328ba7077fe344dbd1930e5111439fdfb616a997e73e2a6f4c91f18a2a6f5518e37fe3c9f637c SHA512 8bd69463dc8ee705a64626203b3b05ad68dc8042e7d5ae9a7545a7597c7858633bb122a4dc3529c80de68367da24db5a106f632c9a52b178f44a448525030cc2 AUX libvirt-6.7.0-do-not-use-sysconfig.patch 5001 BLAKE2B 65e6dfacc598ba771fccc1c45c504aadcc83d0d8df211e70721dd0d7e3653c2c4d44a892ece19ee7e22d95552950e21f9d9e0a4ff960d66ebd2f9999c4cd52d1 SHA512 7dd3e4cf03dd8351a644a1669be70fcc6397b27983c0ec7b716dde61c92cf7dc9c46fc841cead5ae616897d9ed60209b03d5d78a4247215f4e79d11282da91ad AUX libvirt-6.7.0-doc-path.patch 468 BLAKE2B 2438dcccd20faa9bf32734b7a043ca7a9981d37f32d7c867c5ab31a0904f6d57f5bdb4817296506e65e40b3013eef6a978b1d22e3a204b2989f6b766a4f18877 SHA512 401ae495e8aaef1fdea02fc0e05562f3d2f29e286ea493a2eab0f874d1d89053580ff15110ab484a2f39b0546bdc82135e6e1561545ceff6fa7341b875dd54ad AUX libvirt-6.7.0-fix-paths-for-apparmor.patch 1974 BLAKE2B b5e9a151aa6bfbccf76ef0d6638b00cfbc3f8c4d5a722ba83699d29a32ef2f9a7d9eb678c1f61a128b0fee958a3349a4b843be08cec940f7d1e22757bc66bb95 SHA512 f81627e9c3d6c117e76a7a30af162a8ff8fafa191313155ceecf39bae2c457417152a0380d06cd3a4958b52a6ba410730cf66cd912072f7ec951b507c0a83f96 @@ -13,13 +12,9 @@ AUX libvirtd.init-r19 1114 BLAKE2B a69f5a07e0b946a3167ac4509611d08a8b848e7337677 AUX libvirtd.tmpfiles.conf 36 BLAKE2B fa0e1dac4117dcb2a2e826c82c4c63e20156db47abf4088167484f1f3149a4998840cf1aba745621851d7e2653df5c7f7268d8d61be3a3731ea053a88f35c13b SHA512 2b1c3c64dd6fa03d8c2ae24e7ce4aa7d754913214542a68a4e99f10fbc251fd23ee26e297a957d7b4b70eec8ef028c41fc915da3a85fbbd16143bb92d1de3aed AUX virtlockd.init-r2 573 BLAKE2B 83bbd228bd59fa29f1d974bc5eec8af0b701328a0a64bbb9e2d9cb918d5d0b3c0d5e791afa18f47ffa2c429082083912fda3f2401c3c5b3d8d85ea8b7cacf440 SHA512 11bf7208e8da8cf7b907049100d095f4d6b5d215a0955fa620e50d6d541d3ecd9d779a7903c64feb25d17545c45491d52441e14a04f2c793f3b03dee7784c482 AUX virtlogd.init-r2 572 BLAKE2B e6a86e34eda78fc032df17e1bd94095e357770f4036e19fff895266b58df7e31774f6004fec56fad9e69bf7d1afa5d898bdebe018013877f8844d05b3a46d509 SHA512 d5d83edee8a4bdf0dac79abc129ff7ec11573aa580e32963d7c7d47133e276a4427d8653683fc8b0a6c1c2aba631e5875c73454d6fef3bcac6dcaca542e69f34 -DIST libvirt-6.10.0.tar.xz 8462796 BLAKE2B f1188cc869768682bdcb7ab763465705413ebc4fe418e37d4f5ef6a861507c4104a1844cd533fce905e24847918eba6e4e4f054f66b112e9fb54ee19a3653dfc SHA512 42e77a3542e9f15c3aeaab1639a80ee6539cb0f09a1e8324aa0059a8f6041acf20263a9556ac65c9a7a14693b0756020231085e4556ff54cf8329110018a2485 DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9 -DIST libvirt-6.9.0.tar.xz 8432360 BLAKE2B 5cf577017158bab3ec5ad55e8e5944f4efd88cb3eb5460355ad0bfc1a30dba5c607b5b3523b8f9095552c494129ccb19bb89a6a0791469d5d47052c2375fa940 SHA512 ca9aed93589e91d383f9a5bddf5ba9fa20b849ba3b302017d625ba4910a0f942d1531006ddeaaa2622d121808105dec6e9bcb0c867f62e2fc546ce043675e175 DIST libvirt-7.0.0.tar.xz 8567648 BLAKE2B 0c0b360c371a14b6d82dc6bef4b228bf7a4a17db1a8425d1354128b0705365a04440217ed0862761b2a8eaf81d81494177d777e734a9045bbc87fc613b56eb05 SHA512 dd6db5ec4971cf4c6059795fd81d5a3a889b10740e34c3c92271eda1c683c99df2c8f923398065d8a7c4f987a20eb1da617d5297ba8ea5a31f154412af50c343 -EBUILD libvirt-6.10.0-r2.ebuild 8279 BLAKE2B a0cef8fddb1d6943cd48cd1ed185254bd19c59e1a4c7024821baec46a639d61aa0c7b50eed99dd2e31e0e0e7fcf4d0da8ad6f2c492999c527263ba2891bc03a8 SHA512 e839ef9cdf99f6aebc4e0b9354cbbea1fdf440ced8ebf34c80d0001c5095cc41c93d97eeafae4485f10cee2060fe84b1f31f97c7616f58f1e2b438839341ea37 EBUILD libvirt-6.8.0-r2.ebuild 8769 BLAKE2B 5d425a9f6b776869b2d4a886100ed30730ea504b619d76ac24f823583697ea88b0fa039db1cfd927c82351abe0bea97601eb06cdb5c0ecf40bc42d65521767d9 SHA512 76a636969fb6b11c9def8cfac402762fa35a474f925beecc40b4bec2b841981a235eaf3bfa272ec63e907275dce332aa03bae8f72f033ed7f2adfae987796e09 -EBUILD libvirt-6.9.0-r1.ebuild 8685 BLAKE2B 469fa6996995f038297721b54a5f10e51bdd39d54545a419214875d46628acd06f566d1780a52a87f92f52836441b0f96d42ed5830afaf8a2b2bef90abd6dc15 SHA512 2fbc8c8aa73839a515c0c52be1a27731d6269b1b31149542feb0430220ad32e960b09107d094c04fa91b79804a1b262a4a1a55a8d788e69a26da808ea980c762 -EBUILD libvirt-7.0.0.ebuild 8197 BLAKE2B 3c2fbcc2195e65a20445cdab2dd54bdf3e516ad69023d9b2a07cf0cf60962f1bab8bb19dd52b07e035887828f880020dc7ce47aef008853033bf74b1b226f7c1 SHA512 f7580ec5ffe596158cd3a8aae33e296ce4e7e08cfa67a0b269921ca2adae743189d02f47874224afaf55213422ecbdaaebd2b2468dd28e9af13b9312b68c4d9b -EBUILD libvirt-9999.ebuild 8197 BLAKE2B c3c3d05524bf7a93d8617e2bdebbca177f79731f079e10facea57b2aeffe31a9e6752781f4f8bf93bcc509f05d686791dc7584a6f7477d3e3ffca940c17e35ec SHA512 ac3c4ff34163bd0946ec78b51a7844e287c4f1a972d84776eca68d6517b20113f683f57157def3f7d9c0a554fa347ad4faea3fca72054075b3f840f4e0501756 +EBUILD libvirt-7.0.0-r1.ebuild 8455 BLAKE2B b194bd09c45cc29bf356b9d9cd30013d1c8e409c5a0b832a81636eec7495750aab422d9f7a8222354d3ee8f105f1b993bcb79b81237dfb699cbf3e2d0ab70b45 SHA512 f4a8283b7fd229121ca92fa4760834e3913855056166d8ade5c9fff42d03cf066270085541601c12015c3e0512dc41cf86ba8b77176a690c9e0550721fba49f3 +EBUILD libvirt-9999.ebuild 8268 BLAKE2B ce194a4cf1558734a5c6b3e925a6e7e9af530525649557b1b8c990ff23fbf3153864390c90d51557f58be1295dd5f8084263657245b2f8b82a406c47ab34b652 SHA512 9af86bde3f89bda4717ad6fca871d2ee81b196265c91d9664c88b6338d48272341a495470ebe7ac30367b22be2a77626f5c18cf1ad3bce51534445112ac9ad98 MISC metadata.xml 3568 BLAKE2B ea4e03121fbc3aca8af2d8e12b42fefc9954e8e38fd83b1014353dd83bceeae4e1ba65329b42fb19fc0d6a9aae7c9d16cf88817d4ea7cfe767c7ef5734b291f6 SHA512 4d691fecee1ddd161a67e3b18a6071d1f0f6e1dcc6ae8deb1a63d73ca9c6d86f5a879d8ab9e43397b7988d66a7df9be6f556a52ebfe8d886b1f03e89614cf073 diff --git a/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch b/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch deleted file mode 100644 index 207cc20ba091..000000000000 --- a/app-emulation/libvirt/files/libvirt-6.10.0-Fix-segfault-when-parsing-mdev-types.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a Mon Sep 17 00:00:00 2001 -Message-Id: <4c4d0e2da07b5a035b26a0ff13ec27070f7c7b1a.1607416232.git.mprivozn@redhat.com> -From: Jonathon Jongsma <jjongsma@redhat.com> -Date: Wed, 2 Dec 2020 11:52:39 -0600 -Subject: [PATCH] conf: Fix segfault when parsing mdev types -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit f1b0890 introduced a potential crash due to incorrect operator -precedence when accessing an element from a pointer to an array. - -Backtrace below: - - #0 virNodeDeviceGetMdevTypesCaps (sysfspath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", mdev_types=0x7fff801c9b40, nmdev_types=0x7fff801c9b48) at ../src/conf/node_device_conf.c:2676 - #1 0x00007ffff7caf53d in virNodeDeviceGetPCIDynamicCaps (sysfsPath=0x7fff801661e0 "/sys/devices/pci0000:00/0000:00:02.0", pci_dev=0x7fff801c9ac8) at ../src/conf/node_device_conf.c:2705 - #2 0x00007ffff7cae38f in virNodeDeviceUpdateCaps (def=0x7fff80168a10) at ../src/conf/node_device_conf.c:2342 - #3 0x00007ffff7cb11c0 in virNodeDeviceObjMatch (obj=0x7fff84002e50, flags=0) at ../src/conf/virnodedeviceobj.c:850 - #4 0x00007ffff7cb153d in virNodeDeviceObjListExportCallback (payload=0x7fff84002e50, name=0x7fff801cbc20 "pci_0000_00_02_0", opaque=0x7fffe2ffc6a0) at ../src/conf/virnodedeviceobj.c:909 - #5 0x00007ffff7b69146 in virHashForEach (table=0x7fff9814b700 = {...}, iter=0x7ffff7cb149e <virNodeDeviceObjListExportCallback>, opaque=0x7fffe2ffc6a0) at ../src/util/virhash.c:394 - #6 0x00007ffff7cb1694 in virNodeDeviceObjListExport (conn=0x7fff98013170, devs=0x7fff98154430, devices=0x7fffe2ffc798, filter=0x7ffff7cf47a1 <virConnectListAllNodeDevicesCheckACL>, flags=0) - at ../src/conf/virnodedeviceobj.c:943 - #7 0x00007fffe00694b2 in nodeConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/node_device/node_device_driver.c:228 - #8 0x00007ffff7e703aa in virConnectListAllNodeDevices (conn=0x7fff98013170, devices=0x7fffe2ffc798, flags=0) at ../src/libvirt-nodedev.c:130 - #9 0x000055555557f796 in remoteDispatchConnectListAllNodeDevices (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0) - at src/remote/remote_daemon_dispatch_stubs.h:1613 - #10 0x000055555557f6f9 in remoteDispatchConnectListAllNodeDevicesHelper (server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000, rerr=0x7fffe2ffc8a0, args=0x7fffd4008470, ret=0x7fffd40084e0) - at src/remote/remote_daemon_dispatch_stubs.h:1591 - #11 0x00007ffff7ce9542 in virNetServerProgramDispatchCall (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:428 - #12 0x00007ffff7ce90bd in virNetServerProgramDispatch (prog=0x555555690c10, server=0x555555627080, client=0x5555556bf050, msg=0x5555556c0000) at ../src/rpc/virnetserverprogram.c:302 - #13 0x00007ffff7cf042b in virNetServerProcessMsg (srv=0x555555627080, client=0x5555556bf050, prog=0x555555690c10, msg=0x5555556c0000) at ../src/rpc/virnetserver.c:137 - #14 0x00007ffff7cf04eb in virNetServerHandleJob (jobOpaque=0x5555556b66b0, opaque=0x555555627080) at ../src/rpc/virnetserver.c:154 - #15 0x00007ffff7bd912f in virThreadPoolWorker (opaque=0x55555562bc70) at ../src/util/virthreadpool.c:163 - #16 0x00007ffff7bd8645 in virThreadHelper (data=0x55555562bc90) at ../src/util/virthread.c:233 - #17 0x00007ffff6d90432 in start_thread () at /lib64/libpthread.so.0 - #18 0x00007ffff75c5913 in clone () at /lib64/libc.so.6 - -Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com> -Reviewed-by: Ján Tomko <jtomko@redhat.com> -Signed-off-by: Ján Tomko <jtomko@redhat.com> -Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---- - src/conf/node_device_conf.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c -index 4e2837c1cd..cac4243b50 100644 ---- a/src/conf/node_device_conf.c -+++ b/src/conf/node_device_conf.c -@@ -2673,7 +2673,7 @@ virNodeDeviceGetMdevTypesCaps(const char *sysfspath, - - /* this could be a refresh, so clear out the old data */ - for (i = 0; i < *nmdev_types; i++) -- virMediatedDeviceTypeFree(*mdev_types[i]); -+ virMediatedDeviceTypeFree((*mdev_types)[i]); - VIR_FREE(*mdev_types); - *nmdev_types = 0; - --- -2.26.2 - diff --git a/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild deleted file mode 100644 index d49fae5f1c0c..000000000000 --- a/app-emulation/libvirt/libvirt-6.10.0-r2.ebuild +++ /dev/null @@ -1,330 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - SRC_URI="" - SLOT="0" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev - virtualbox +virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - qemu? ( libvirtd ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - acct-user/qemu - policykit? ( acct-group/libvirt ) - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dbus - sys-apps/dmidecode - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-1.5.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - >=app-emulation/xen-4.6.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs )" - -DEPEND="${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-6.7.0-doc-path.patch - "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-6.10.0-Fix-segfault-when-parsing-mdev-types.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_use apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature udev) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dnetcf=disabled - -Dsanlock=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Drunstatedir="${EPREFIX}/run" - ) - - meson_src_configure -} - -src_test() { - export VIR_TEST_DEBUG=1 - meson_src_test -} - -src_install() { - meson_src_install - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig || die - rm -rf "${D}"/var || die - rm -rf "${D}"/run || die - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-6.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.9.0-r1.ebuild deleted file mode 100644 index 32c72d4990bd..000000000000 --- a/app-emulation/libvirt/libvirt-6.9.0-r1.ebuild +++ /dev/null @@ -1,345 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" - SRC_URI="" - SLOT="0" -else - SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" - SLOT="0/${PV}" -fi - -DESCRIPTION="C toolkit to manipulate virtual machines" -HOMEPAGE="https://www.libvirt.org/" -LICENSE="LGPL-2.1" -IUSE=" - apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi - iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz - parted pcap policykit +qemu rbd sasl selinux +udev +vepa - virtualbox +virt-network wireshark-plugins xen zfs -" - -REQUIRED_USE=" - firewalld? ( virt-network ) - libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) - lxc? ( caps libvirtd ) - openvz? ( libvirtd ) - policykit? ( dbus ) - qemu? ( libvirtd ) - vepa? ( macvtap ) - virt-network? ( libvirtd ) - virtualbox? ( libvirtd ) - xen? ( libvirtd )" - -BDEPEND=" - acct-user/qemu - policykit? ( acct-group/libvirt ) - app-text/xhtml1 - dev-lang/perl - dev-libs/libxslt - dev-perl/XML-XPath - dev-python/docutils - virtual/pkgconfig" - -# gettext.sh command is used by the libvirt command wrappers, and it's -# non-optional, so put it into RDEPEND. -# We can use both libnl:1.1 and libnl:3, but if you have both installed, the -# package will use 3 by default. Since we don't have slot pinning in an API, -# we must go with the most recent -RDEPEND=" - app-misc/scrub - >=dev-libs/glib-2.48.0 - dev-libs/libgcrypt:0 - dev-libs/libnl:3 - >=dev-libs/libxml2-2.7.6 - >=net-analyzer/openbsd-netcat-1.105-r1 - >=net-libs/gnutls-1.0.25:0= - net-libs/libssh2 - net-libs/libtirpc - net-libs/rpcsvc-proto - >=net-misc/curl-7.18.0 - sys-apps/dmidecode - sys-devel/gettext - sys-libs/ncurses:0= - sys-libs/readline:= - apparmor? ( sys-libs/libapparmor ) - audit? ( sys-process/audit ) - caps? ( sys-libs/libcap-ng ) - dbus? ( sys-apps/dbus ) - dtrace? ( dev-util/systemtap ) - firewalld? ( >=net-firewall/firewalld-0.6.3 ) - fuse? ( sys-fs/fuse:0= ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) - iscsi? ( sys-block/open-iscsi ) - iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) - libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) - nfs? ( net-fs/nfs-utils ) - numa? ( - >sys-process/numactl-2.0.2 - sys-process/numad - ) - parted? ( - >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] - ) - pcap? ( >=net-libs/libpcap-1.0.0 ) - policykit? ( >=sys-auth/polkit-0.9 ) - qemu? ( - >=app-emulation/qemu-1.5.0 - dev-libs/yajl - ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl ) - selinux? ( >=sys-libs/libselinux-2.0.85 ) - virt-network? ( - net-dns/dnsmasq[script] - net-firewall/ebtables - >=net-firewall/iptables-1.4.10[ipv6] - net-misc/radvd - sys-apps/iproute2[-minimal] - ) - wireshark-plugins? ( net-analyzer/wireshark:= ) - xen? ( - >=app-emulation/xen-4.6.0 - app-emulation/xen-tools:= - ) - udev? ( - virtual/libudev - >=x11-libs/libpciaccess-0.10.9 - ) - zfs? ( sys-fs/zfs )" - -DEPEND="${BDEPEND} - ${RDEPEND} - ${PYTHON_DEPS}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch - "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch - "${FILESDIR}"/${PN}-6.7.0-doc-path.patch - "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch - "${FILESDIR}"/${PN}-6.8.0-fix-libvirt-lxc-dbus.patch -) - -pkg_setup() { - # Check kernel configuration: - CONFIG_CHECK="" - use fuse && CONFIG_CHECK+=" - ~FUSE_FS" - - use lvm && CONFIG_CHECK+=" - ~BLK_DEV_DM - ~DM_MULTIPATH - ~DM_SNAPSHOT" - - use lxc && CONFIG_CHECK+=" - ~BLK_CGROUP - ~CGROUP_CPUACCT - ~CGROUP_DEVICE - ~CGROUP_FREEZER - ~CGROUP_NET_PRIO - ~CGROUP_PERF - ~CGROUPS - ~CGROUP_SCHED - ~CPUSETS - ~IPC_NS - ~MACVLAN - ~NAMESPACES - ~NET_CLS_CGROUP - ~NET_NS - ~PID_NS - ~POSIX_MQUEUE - ~SECURITYFS - ~USER_NS - ~UTS_NS - ~VETH - ~!GRKERNSEC_CHROOT_MOUNT - ~!GRKERNSEC_CHROOT_DOUBLE - ~!GRKERNSEC_CHROOT_PIVOT - ~!GRKERNSEC_CHROOT_CHMOD - ~!GRKERNSEC_CHROOT_CAPS" - - kernel_is lt 4 7 && use lxc && CONFIG_CHECK+=" - ~DEVPTS_MULTIPLE_INSTANCES" - - use macvtap && CONFIG_CHECK+=" - ~MACVTAP" - - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_MARK_T - ~BRIDGE_NF_EBTABLES - ~NETFILTER_ADVANCED - ~NETFILTER_XT_CONNMARK - ~NETFILTER_XT_MARK - ~NETFILTER_XT_TARGET_CHECKSUM - ~IP_NF_FILTER - ~IP_NF_MANGLE - ~IP_NF_NAT - ~IP_NF_TARGET_MASQUERADE - ~IP6_NF_FILTER - ~IP6_NF_MANGLE - ~IP6_NF_NAT" - # Bandwidth Limiting Support - use virt-network && CONFIG_CHECK+=" - ~BRIDGE_EBT_T_NAT - ~IP_NF_TARGET_REJECT - ~NET_ACT_POLICE - ~NET_CLS_FW - ~NET_CLS_U32 - ~NET_SCH_HTB - ~NET_SCH_INGRESS - ~NET_SCH_SFQ" - - # Handle specific kernel versions for different features - kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" - if kernel_is ge 3 6; then - CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP " - kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM " - fi - - ERROR_USER_NS="Optional depending on LXC configuration." - - if [[ -n ${CONFIG_CHECK} ]]; then - linux-info_pkg_setup - fi -} - -src_prepare() { - touch "${S}/.mailmap" || die - - default - - # Tweak the init script: - cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die - sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ - -i "${S}/libvirtd.init" || die "sed failed" -} - -src_configure() { - local emesonargs=( - $(meson_feature apparmor) - $(meson_use apparmor apparmor_profiles) - $(meson_feature audit) - $(meson_feature caps capng) - $(meson_feature dbus) - $(meson_feature dtrace) - $(meson_feature firewalld) - $(meson_feature fuse) - $(meson_feature glusterfs) - $(meson_feature glusterfs storage_gluster) - $(meson_feature iscsi storage_iscsi) - $(meson_feature iscsi-direct storage_iscsi_direct) - $(meson_feature libvirtd driver_libvirtd) - $(meson_feature libssh) - $(meson_feature lvm storage_lvm) - $(meson_feature lvm storage_mpath) - $(meson_feature lxc driver_lxc) - $(meson_feature macvtap) - $(meson_feature nls) - $(meson_feature numa numactl) - $(meson_feature numa numad) - $(meson_feature openvz driver_openvz) - $(meson_feature parted storage_disk) - $(meson_feature pcap libpcap) - $(meson_feature policykit polkit) - $(meson_feature qemu driver_qemu) - $(meson_feature qemu yajl) - $(meson_feature rbd storage_rbd) - $(meson_feature sasl) - $(meson_feature selinux) - $(meson_feature udev) - $(meson_feature vepa virtualport) - $(meson_feature virt-network driver_network) - $(meson_feature virtualbox driver_vbox) - $(meson_feature wireshark-plugins wireshark_dissector) - $(meson_feature xen driver_libxl) - $(meson_feature zfs storage_zfs) - - -Dhal=disabled - -Dnetcf=disabled - -Dsanlock=disabled - - -Ddriver_esx=enabled - -Dinit_script=systemd - -Dqemu_user=$(usex caps qemu root) - -Dqemu_group=$(usex caps qemu root) - -Ddriver_remote=enabled - -Dstorage_fs=enabled - -Ddriver_vmware=enabled - - --localstatedir="${EPREFIX}/var" - -Drunstatedir="${EPREFIX}/run" - ) - - meson_src_configure -} - -src_test() { - # remove problematic tests, bug #591416, bug #591418 - sed -i -e 's#commandtest$(EXEEXT) # #' \ - -e 's#virfirewalltest$(EXEEXT) # #' \ - -e 's#nwfilterebiptablestest$(EXEEXT) # #' \ - -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \ - tests/Makefile - - export VIR_TEST_DEBUG=1 - meson_src_test -} - -src_install() { - meson_src_install - - # Remove bogus, empty directories. They are either not used, or - # libvirtd is able to create them on demand - rm -rf "${D}"/etc/sysconfig || die - rm -rf "${D}"/var || die - rm -rf "${D}"/run || die - - newbashcomp "${S}/tools/bash-completion/vsh" virsh - bashcomp_alias virsh virt-admin - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - - newinitd "${S}/libvirtd.init" libvirtd - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests - newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd - newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd - - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests - - DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3") - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -pkg_preinst() { - # we only ever want to generate this once - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die - fi -} - -pkg_postinst() { - if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then - touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die - fi - - use libvirtd || return 0 - # From here, only libvirtd-related instructions, be warned! - - readme.gentoo_print_elog -} diff --git a/app-emulation/libvirt/libvirt-7.0.0.ebuild b/app-emulation/libvirt/libvirt-7.0.0-r1.ebuild index 1bb2cf3a7fcf..628e451d28d4 100644 --- a/app-emulation/libvirt/libvirt-7.0.0.ebuild +++ b/app-emulation/libvirt/libvirt-7.0.0-r1.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 @@ -69,6 +69,7 @@ RDEPEND=" sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= + virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) @@ -103,7 +104,7 @@ RDEPEND=" sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( - net-dns/dnsmasq[script] + net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd @@ -209,12 +210,15 @@ pkg_setup() { if [[ -n ${CONFIG_CHECK} ]]; then linux-info_pkg_setup fi + + python-any-r1_pkg_setup } src_prepare() { touch "${S}/.mailmap" || die default + python_fix_shebang . # Tweak the init script: cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die @@ -291,6 +295,12 @@ src_install() { rm -rf "${D}"/var || die rm -rf "${D}"/run || die + # Fix up doc paths for revisions + if [ $PV != $PVR ]; then + mv "${D}"/usr/share/doc/${PN}-${PV}/* "${D}"/usr/share/doc/${PF} || die + rmdir "${D}"/usr/share/doc/${PN}-${PV} || die + fi + newbashcomp "${S}/tools/bash-completion/vsh" virsh bashcomp_alias virsh virt-admin diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index d943093b1028..a1cb740eced1 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -69,6 +69,7 @@ RDEPEND=" sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= + virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) @@ -103,7 +104,7 @@ RDEPEND=" sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( - net-dns/dnsmasq[script] + net-dns/dnsmasq[dhcp,ipv6,script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd @@ -209,12 +210,15 @@ pkg_setup() { if [[ -n ${CONFIG_CHECK} ]]; then linux-info_pkg_setup fi + + python-any-r1_pkg_setup } src_prepare() { touch "${S}/.mailmap" || die default + python_fix_shebang . # Tweak the init script: cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index 78f86d709f6c..716c07ef3172 100644 --- a/app-emulation/open-vm-tools/Manifest +++ b/app-emulation/open-vm-tools/Manifest @@ -7,5 +7,7 @@ AUX vgauthd.service 339 BLAKE2B 8f80d6d2f017623a8594c060e38e319c9406f5cf0008002e AUX vmtoolsd.service 244 BLAKE2B 65bf0e80b580c2c29a06a2cbf37f8428dbfe03404cea92d0d62c2d0f4d1ccefea8f1b553ca9cdaf5693f5f1546db5733061218e4c95b953e5f140e602fe68ba2 SHA512 0e29b56eb1495a6a9d3c84862e62aac78f29d9940aa19717d2a15ea88fe9484bf84ac858bbbcf22ed9194ecd141758a4398d5a193dd0d74172fd8fe53df53505 AUX vmtoolsd.vgauth.service 312 BLAKE2B dba8ddb1b701cea490b117d08c93738a38bd668cf5444501bad8aabc503da4b87e53103a26ca4664247f14582c5546a28f093768833182581a850f0c50bc61e3 SHA512 fce9af2a3b98bf1fd5063af6c0d00bac7eba4ca02456d9266be5b74f2dea168521ffd44c38df1e28b0684f7ce21e4cb44ec2570fcbe01ff2ef432b55ede585f3 DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d +DIST open-vm-tools-11.2.5-17337674.tar.gz 4057528 BLAKE2B 2adc5179e09a4bb501fe12c9e6dea7fee106516fd250899170a8fb3bcefb9b576136a82e4c3d3a73217b44aba8880728bb3588cedd715529f9b2991f0156ac84 SHA512 b6d4bc6522418ec7a881752181ad9240e535854df492e758abf3996c6afe245466ffbff60cc1b6cdff5cf731b5769c9f9cb96aed29f0b788d0eef05f91fcf8ab EBUILD open-vm-tools-11.2.0_p16938113-r1.ebuild 3138 BLAKE2B 89fd2f0ad743c54e9df564749e4163be037dbed8f159717779419c9c5430528634a36ffb22712be305ad39accadfd12c5cabf99180d782744c028819369c0baf SHA512 0d463a4ac777a0e0afdc6df7035bf5c832b38c60e06c5f96485fec88a7f054d842e487fbe307d41cbf489c44ff83566ef9c94ac3495957120c8074f94d26a628 +EBUILD open-vm-tools-11.2.5_p17337674.ebuild 3112 BLAKE2B 7e9207ec60692927fbfb3e33818f3abc1ee452cfcb835d0804544441076d1c24a7526349dd81b1582136f3fcb120b14028b4282d49b86501e3f11b545b126dd7 SHA512 d99ce3e9505992e3a9a46919932be42a4b2e159a739aed4f2fdd35d9d90e7a26a0b98d9d58a359937f85579da5038b685dc7e8d9e1e2d28b733db21b8a66300d MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201 diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild new file mode 100644 index 000000000000..b67d57a32133 --- /dev/null +++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.5_p17337674.ebuild @@ -0,0 +1,142 @@ +# Copyright 2007-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info pam systemd + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="https://github.com/vmware/open-vm-tools" +MY_P="${PN}-${PV/_p/-}" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl +vgauth" +REQUIRED_USE=" + multimon? ( X ) + vgauth? ( ssl ) +" + +RDEPEND=" + dev-libs/glib + net-libs/libtirpc + deploypkg? ( dev-libs/libmspack ) + fuse? ( sys-fs/fuse:0 ) + pam? ( sys-libs/pam ) + ssl? ( dev-libs/openssl:0 ) + vgauth? ( + dev-libs/libxml2 + dev-libs/xmlsec + ) + X? ( + x11-libs/libXext + multimon? ( x11-libs/libXinerama ) + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXrandr + x11-libs/libXtst + x11-libs/libSM + x11-libs/libXcomposite + x11-libs/gdk-pixbuf-xlib + x11-libs/gtk+:3 + gtkmm? ( + dev-cpp/gtkmm:3.0 + dev-libs/libsigc++:2 + ) + ) + dnet? ( dev-libs/libdnet ) + icu? ( dev-libs/icu:= ) + resolutionkms? ( + x11-libs/libdrm[video_cards_vmware] + virtual/libudev + ) +" + +DEPEND="${RDEPEND} + net-libs/rpcsvc-proto +" + +BDEPEND=" + dev-util/glib-utils + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/10.1.0-mount.vmhgfs.patch" + "${FILESDIR}/10.1.0-Werror.patch" +) + +pkg_setup() { + local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3" + use X && CONFIG_CHECK+=" ~DRM_VMWGFX" + kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS" + kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS" + kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM" + linux-info_pkg_setup +} + +src_prepare() { + eapply -p2 "${PATCHES[@]}" + eapply_user + eautoreconf +} + +src_configure() { + local myeconfargs=( + --without-root-privileges + $(use_enable multimon) + $(use_with X x) + $(use_with X gtk3) + $(use_with gtkmm gtkmm3) + $(use_enable doc docs) + --disable-tests + $(use_enable resolutionkms) + --disable-static + $(use_enable deploypkg) + $(use_with pam) + $(use_enable vgauth) + $(use_with dnet) + $(use_with icu) + ) + # Avoid a bug in configure.ac + use ssl || myeconfargs+=( --without-ssl ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + if use pam; then + rm "${ED}"/etc/pam.d/vmtoolsd || die + pamd_mimic_system vmtoolsd auth account + fi + + newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools + newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools + + if use vgauth; then + systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service + systemd_dounit "${FILESDIR}"/vgauthd.service + else + systemd_dounit "${FILESDIR}"/vmtoolsd.service + fi + + # Replace mount.vmhgfs with a wrapper + mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die + dosbin "${FILESDIR}/mount.vmhgfs" + + # Make fstype = vmhgfs-fuse work in fstab + dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse + + if use X; then + fperms 4711 /usr/bin/vmware-user-suid-wrapper + dobin scripts/common/vmware-xdg-detect-de + fi +} diff --git a/app-emulation/punes/Manifest b/app-emulation/punes/Manifest index e71c0aeda6b7..51aa7d637170 100644 --- a/app-emulation/punes/Manifest +++ b/app-emulation/punes/Manifest @@ -1,3 +1,4 @@ -DIST punes-0.106.tar.gz 5595484 BLAKE2B aa3bb5c869e679b19829a3d1de970517d6d626e0ed2404a9ed09d16af8fabb1ee3258ec8fbb4027fb6b70b5449b2bb7ac6880f43c3ba846687c65d8a0eeaf3f2 SHA512 f35c5cee05464cb11f130938cf7aa519d4dea35dbf52ce3606c3c6bb2596bc59b75e11816a5b44c7b1c9d402a299b4db49727087b4c93c3cb2ba473adfdd4fa2 -EBUILD punes-0.106.ebuild 1121 BLAKE2B 50d21cdb0d9cc999f07bd8f7272951bc26d579aeadfd87f10701eab49cfc611208104680517eb808a2e794cf211b6b41c22748fab898c76873044fb5cb68deaa SHA512 2a8fdefbf14ed66a01e32155442cc9c52052a1ed1fac8d39bac5ddda23eabd1ecf7082d3ba3166d68d5c3db4b2df0f2a4f869da587bf1f189c291a480cc2005a +AUX punes-0.107_ffmpeg-configure.patch 798 BLAKE2B da041283394db3a436478025fe3c8f5919f368bf00a5947fc688110d86691e987a52653e21215e05aab9d9861e7346fb526031c560da363570e6aeba11e4255c SHA512 443ad57c8659597f1beab1e5bb0a560f053986a6021785e24107463aa2351c1d6e26ee760cb1ec4a9913d8e01002a31f41d21a0b878e8925a66f02a858cebaa6 +DIST punes-0.107.tar.gz 44024138 BLAKE2B 048df5bc9b019bafcd4eec75dc027de7cde9f8aa0d484ef96e5c41b091ba55c13b84ef7c7c36987b53206b1b7027758534479d0cc9fde63d89a48092c3f9d26d SHA512 eb3b7aa1c18765402e1e57e23dd4b019255320b795c0f578a4d5ae9f4e0c163613da07280e2a5abed80b9ba90e74c80b53b5fdd80e405103f0063ca55d0ee7bd +EBUILD punes-0.107.ebuild 1241 BLAKE2B 5df5b93a315a152425c1bbeeb612b3a173d8682350d5b2f13740699752efeb9d96b99e57b578103e78b13edc3929344962dee8585a337fe5bc95bcdc036a39cc SHA512 149e4797185ae7d906ec4ef5ec29314eee21084829272379fdbf79d29519715d7e329174ef0485ab1a6448943e72781a2b6314b096a200ead2237e5a5138c2df MISC metadata.xml 529 BLAKE2B 41ca9104473edaf94faa28749d5705ccd3f0b0eae2ce6e421652ca025d6cf21e1094a9a36c9f787e1556f23ecb73d48c5f3b7784cffc082016307403136ce905 SHA512 6a4892f8f0ff213d87d98db48612b067a131dd6c59b0c4bbf78c098f9a33592ebbee8ef78674a812ef2b35d233c9dea52752aaca315ea0065c472a4c5c9732b1 diff --git a/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch new file mode 100644 index 000000000000..fd70e0d49ef0 --- /dev/null +++ b/app-emulation/punes/files/punes-0.107_ffmpeg-configure.patch @@ -0,0 +1,27 @@ +From 241b71fdacad10ad1e790e5a4e380ea1ffbe8a93 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Thu, 21 Jan 2021 12:32:31 +0300 +Subject: [PATCH] Fix ffmpeg configure switch option + +autoconf's --with-PACKAGE/--without-PACKAGE requires $withval, not +$enableval. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index fd9e0365..f63d50ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ AC_ARG_WITH([ffmpeg], + AS_HELP_STRING([--with-ffmpeg], + [Build with support for FFmpeg [autodetect] @<:@default: yes@:>@] + ), +- [with_ffmpeg=$enableval], [with_ffmpeg=yes]) ++ [with_ffmpeg=$withval], [with_ffmpeg=yes]) + + AC_ARG_ENABLE([release], + AS_HELP_STRING([--disable-release], +-- +2.26.2 + diff --git a/app-emulation/punes/punes-0.106.ebuild b/app-emulation/punes/punes-0.107.ebuild index 1cdb9cc4f012..db719a74f5f9 100644 --- a/app-emulation/punes/punes-0.106.ebuild +++ b/app-emulation/punes/punes-0.107.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 @@ -12,9 +12,10 @@ SRC_URI="https://github.com/punesemu/puNES/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="cg" +IUSE="cg ffmpeg" RDEPEND=" + ffmpeg? ( media-video/ffmpeg:= ) dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 @@ -30,6 +31,10 @@ BDEPEND=" S="${WORKDIR}/puNES-${PV}" +PATCHES=( + "${FILESDIR}/${P}_ffmpeg-configure.patch" +) + src_prepare() { default @@ -42,7 +47,8 @@ src_prepare() { src_configure() { econf \ - $(use_with cg opengl-nvidia-cg) + $(use_with cg opengl-nvidia-cg) \ + $(use_with ffmpeg) } pkg_postinst() { diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 80e1a319686f..81520af8b08c 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -9,6 +9,7 @@ AUX qemu-5.1.0-usb-oob-CVE-2020-14364.patch 3210 BLAKE2B f812f4bb18e540ebafeb9bf AUX qemu-5.2.0-cleaner-werror.patch 884 BLAKE2B 95404f78f5559f5725c1978e7ef619675817bbe308cd636d6cd9fc43c5ed7440d826c4cb89165fbb275dae3840026b6391e8040b0d21d65120c34b7e41f844e7 SHA512 bdaf7c433c0f10a3666b4f06b680122e4a9bcf41382e50b3f3cb7b236134860ce91864d305282707068763f1521d61d47277579acdf778d6bd4312884eb04d43 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac +AUX qemu-5.2.0-no-pie-ld.patch 2929 BLAKE2B 07126013ba465c30fe9ddc8e690e1906d5fa187cf47adcfe94177fe46e6a0365622e938090b23b5517df9e78aa211f4b014939e50503ba8bc09afca5794479ca SHA512 d6cecad4d98fad469dd8514e02372053a99d8077aa4348a36609cf459d7dffa962df937fe0350540ecae4beb274dc1b3c72bce34145474491156ff564104532f AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288 AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896fa42da75aa99aecfed75283b78073fed43dfbafb8bd9c3c0545ebcd943fe86410171f9933965646bb0f2ed901a0720bc6d SHA512 604e6865d206536287f7690179bf7c369e83646742feb9af2a1b46be809c19754e22c2bec430f35cf2e3ef0fc4929541e140d15ddff4a9579db5cf18a3bab1f7 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e @@ -17,6 +18,6 @@ DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3 EBUILD qemu-5.1.0-r3.ebuild 25432 BLAKE2B f12769a35b050372341beb39b8ec82c9ce7527c54d570ef612af433fbc7e75f9adacca8d6ab42aca68ff5abb58a67b3dea5f2d2204a78c4fb6052c1df897e9b6 SHA512 268ea9f2be68b022b93177e795f4ef7b6955f9cacd6185a9730e76ee2ef771902316d659f73c3de5bace9290c7e75f7fe9933f12e06d779f58c54883a5c94d06 EBUILD qemu-5.2.0-r1.ebuild 25166 BLAKE2B 490ee1d912eae15de8acb4b121db0ecf3841be870f27f96b332ec96e25ab6fb8a8160a991faf1b55fd32423c65e1fe27d0c4279ae067119baf0926257229800c SHA512 4338db442a55540c84007b1c19b55533bc29437e5a5c47593abb1e8ae686125feeaacc217efbc6e9d76fea537440e7e5d5419a779ac2ecc5c8b55b6edce96019 -EBUILD qemu-5.2.0-r2.ebuild 25220 BLAKE2B ea28731e9ccf0609ec71ee4a833c7ee6edeb601d48ef6703c7583c89e4a6aa985fcc1f474eacd1747e4677c22f743ac729fa16ad5ee9f26eff48fcb515d70506 SHA512 1683b1690757c5d6af8f71636b6b918b09b09fb0b35aaf2be51df9314e1413351c35cf76d7b11a253021a5a62fab475e7b0dcd03f9225a54bd1b8a4e29c70119 -EBUILD qemu-9999.ebuild 25219 BLAKE2B cf860af6fc19de8230075596e91db75acea37788d609b63c94b1b3a330f332c92b510276e38f0acc26892446fcb16ebaf4f7e0bd466e994d8dc7e7801349a3dd SHA512 67a85a3223c5642f714ac12c6672054d2dde53fbe08d715f01cc5f2d3660a9ff9d2f0acc94b88f04b3a6a9ae74046954beede5b04aa8ce78f411025949af732e -MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61 +EBUILD qemu-5.2.0-r2.ebuild 25349 BLAKE2B d8de8d084b2d83df2deae8d6245ad6f3f4a851c721d2169112a241233b423c7ba139daf95d7fb9bbd8bdbbe92047e0c152cff369daa64f46b624bcd7bc94aca7 SHA512 766a1be55d9b676990d8bb5c14236ad0091ef210b706041da2c5f672b3416745b2e745c7122b69c53817ccc65f9fa34ee483c49613417dcd61261e8e2fbb53ae +EBUILD qemu-9999.ebuild 25305 BLAKE2B a614602507a1a0940c7ff92528cf721ca0e7c7b5d75a229ba97f4777fe8b80994ba52e65ad829a3d06b041d05de16f5fece8282f4b65fc457eaf82868554e4b1 SHA512 ce2ce6f8357b72b2f7eab345ebf5cbf876d12d7af67ddd10d3cd9f1bd5c5dd727372ac71f2ec4d385ef4faef6a2e0042caceb608cd746272cda493a7a042b4c9 +MISC metadata.xml 4458 BLAKE2B 522818589e668292cbb756008eba7c9f6e0fac36c8d777f0490a1f66cecf576760947a8d94cf03e22af9c9da1d57e25b533c62ee73e9a4fb6da01a6d25c5db03 SHA512 3e054a17a0c86b4ddec0407d44967954170bbb030cea20de6c6841c057bd7e5c2b1b9013e3c0951db9ee570edbd9e7c433e5e3893f7bd762d44b35f9a1fae7db diff --git a/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch new file mode 100644 index 000000000000..f47a58790cc1 --- /dev/null +++ b/app-emulation/qemu/files/qemu-5.2.0-no-pie-ld.patch @@ -0,0 +1,73 @@ +From bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Mon Sep 17 00:00:00 2001 +From: Christian Ehrhardt <christian.ehrhardt@canonical.com> +Date: Mon, 14 Dec 2020 16:09:38 +0100 +Subject: [PATCH] build: -no-pie is no functional linker flag + +Recent binutils changes dropping unsupported options [1] caused a build +issue in regard to the optionroms. + + ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \ + -s -o multiboot.img multiboot.o + ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) + +This isn't really a regression in ld.bfd, filing the bug upstream +revealed that this never worked as a ld flag [2] - in fact it seems we +were by accident setting --nmagic). + +Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be +droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE +in .mak, therefore we can also remove it from being added there. + +[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d +[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5 + +Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> +Message-Id: <20201214150938.1297512-1-christian.ehrhardt@canonical.com> +Cc: qemu-stable@nongnu.org +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +--- + configure | 3 --- + pc-bios/optionrom/Makefile | 1 - + 2 files changed, 4 deletions(-) + +--- a/configure ++++ b/configure +@@ -2137,7 +2137,6 @@ EOF + # Check we support --no-pie first; we will need this for building ROMs. + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CFLAGS_NOPIE="-fno-pie" +- LDFLAGS_NOPIE="-no-pie" + fi + + if test "$static" = "yes"; then +@@ -2153,7 +2152,6 @@ if test "$static" = "yes"; then + fi + elif test "$pie" = "no"; then + CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" +- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then + CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" +@@ -6714,7 +6712,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak + echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak + echo "GLIB_LIBS=$glib_libs" >> $config_host_mak + echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak +-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak + echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak + echo "EXESUF=$EXESUF" >> $config_host_mak + echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak +diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile +index 084fc10f05..30771f8d17 100644 +--- a/pc-bios/optionrom/Makefile ++++ b/pc-bios/optionrom/Makefile +@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32) + + LD_I386_EMULATION ?= elf_i386 + override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +-override LDFLAGS += $(LDFLAGS_NOPIE) + + all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin + +-- +2.30.0 + diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index 930ce2797949..0016d14bf2d9 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -18,7 +18,7 @@ <flag name="aio">Enables support for Linux's Async IO</flag> <flag name="alsa">Enable alsa output for sound emulation</flag> <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag> - <flag name="curl">Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag> + <flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag> <flag name="fdt">Enables firmware device tree support</flag> <flag name="glusterfs">Enables GlusterFS cluster fileystem via <pkg>sys-cluster/glusterfs</pkg></flag> diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild index 90d6bcb7da44..8de809e7cd88 100644 --- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild @@ -182,7 +182,7 @@ X86_FIRMWARE_DEPEND=" >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios )" -PPC64_FIRMWARE_DEPEND=" +PPC_FIRMWARE_DEPEND=" pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) @@ -210,7 +210,8 @@ CDEPEND=" ) qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_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 ) @@ -229,6 +230,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-5.2.0-strings.patch "${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch + "${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch ) QA_PREBUILT=" @@ -764,8 +766,8 @@ src_install() { rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" rm "${ED}/usr/share/qemu/vgabios-virtio.bin" rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then + # 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 diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 1e9063a884a2..dcde210564b5 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -182,7 +182,7 @@ X86_FIRMWARE_DEPEND=" >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios )" -PPC64_FIRMWARE_DEPEND=" +PPC_FIRMWARE_DEPEND=" pin-upstream-blobs? ( ~sys-firmware/seabios-1.12.0[binary,seavgabios] ) @@ -210,7 +210,8 @@ CDEPEND=" ) qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_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 ) @@ -764,8 +765,8 @@ src_install() { rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" rm "${ED}/usr/share/qemu/vgabios-virtio.bin" rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then + # 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 diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest index 21eaac4469d0..7f62f39af896 100644 --- a/app-emulation/virt-manager/Manifest +++ b/app-emulation/virt-manager/Manifest @@ -1,8 +1,8 @@ DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a DIST virt-manager-3.1.0.tar.gz 2848420 BLAKE2B 729a16ee419cfc9f118e4a59336e961f17f38908ab3aaa3598c83bff3e8bca75b150f0f38b021c5ccb839a7c43e87f071859f68c2a81425715e236e14d0a7929 SHA512 185e34d8ebb2f9755bf9732bdafdbe9d0924d8c3b69758947252cce5deeac2042f473ba63673eea2bf36beb1f216a856938650f86e2c86eb5618e8f8522df53d DIST virt-manager-3.2.0.tar.gz 2858909 BLAKE2B 83bd8589fb7d9c855300e06689fdeeeee575e354f9349b5bc63ff1da1a8b578a842f6f60d95a8b8fa53ed007c090d37f706f50fb8dcbcee83c08e27853a150cc SHA512 90cd98fe6b269007cd30f628490c65df440abe39b4925c65dc80667e7d80d059752695353ccf6ac3e2436206da311bc402eda50df31874d82ef8fe115966e1ec -EBUILD virt-manager-2.2.1-r3.ebuild 2397 BLAKE2B 7fc787ffdb0ffe89164586233bb919856481a032069d51fc5265e22b9b9baca093abb20c161d79f88ec98d927b48b7823079e24afb3569331c90314d2db45bc5 SHA512 f6c77b03078942b912170c0bf3c68dc5110e22c0d67875d9e210eaa57fb440ed1352614aca0e7e14b2af9aa623deab5af7e20a9ffa48408a41665334f5956219 -EBUILD virt-manager-3.1.0.ebuild 2455 BLAKE2B c94d782f649f08f52d0c6621557f0f8c58e726de7129cd7a1b8770c3172d5bb769456b35f2cfd50e04eb03d0900af32f9e63c88552e420b5d84f411edfe5a2b2 SHA512 249cd64213e7ea8b574ae2eb915133be418793d3e0d17e0ca116a52cf09c9a2c426cfbda3924d61c3fc9504c739feb22023e46cf8e2574d842f7430dcb5d2ffe -EBUILD virt-manager-3.2.0.ebuild 2440 BLAKE2B cfad50535705db101fe016a904eb5885458a870277c85866f4b7c7d7450b0367c2f8949d546752e5dc508867161e6f6deaa0b6ff16e825c7dc0977359c13bca3 SHA512 449695d40e3039a3ec56e8b08dff7269c313aecc0b65b945e9aa0ed9d8ef4d44dbf5a458dfa03fc4c4f437927fca4f601f93791a8083f8c6fbcff08980a8ade3 -EBUILD virt-manager-9999.ebuild 2418 BLAKE2B c90043625298564d14a2212bbf0e4af29ca5f796ed194dec6f8ce4d40e25eb41d4a73d07508b88d5d41d5b26098935bdfb9d09e1cdcbb6eb9c161ea0f2baa655 SHA512 97aa27c1afb9f8d33a020ffe5b7a8b71568c950e65becb382470f75bf10965775cce2c27555042dc9593558206da4b1d23fc05c9c204c06fa0ac6b78356616e9 +EBUILD virt-manager-2.2.1-r3.ebuild 2369 BLAKE2B d429198a0d3b4e629b28bc43de33950e6a2e236cc732d641e9d05d9c48da1c3f3da629f06e3c451d357c9cd933bebc5950ca55aa3f6889e05775d2020e86a220 SHA512 49831cfc41641f24cc19306d829246bef0d80138ead3a29f4a311f775f88da4ee50ea40f14c05ba1751b5e7042d4ea4f8831d222ebdd5a9b100a38e5cd55cb30 +EBUILD virt-manager-3.1.0.ebuild 2426 BLAKE2B 0cddadea64ff30d4e262095c5fc0c3623c6f25a9a16a280aa594a62b437d20cbfb9cc4e12f498d55ef8f2e29eefa4a242daddcb04a267f169f38cc9770d007ca SHA512 09787a65b161d8b81e36e2210cdd0a3932013891d2dc86d97411d02734f8b0ed7c3936b69f88eaf80aef4d4035d5730c2fc73b87ddde0681c243d7cc548fc654 +EBUILD virt-manager-3.2.0.ebuild 2412 BLAKE2B af1bac50830405601c98987ccb240c27051ee3fbb182f1b1813346e142da9c64db81fe1198666dcfd198e2104d331bb45cd1d47fe1dd948b67486d1fbafc842d SHA512 8a53d6af073d5f479a20993a6c1e79cd1a21ed10be932339a781abb024cb95e1a3ed5489f73c88ed195696c9549216358b3cf9d09c280037d951cfa7f8c87571 +EBUILD virt-manager-9999.ebuild 2405 BLAKE2B f9428dabdc6c1193af28d6c6829bafbef6ec70fdc9b9ad47600b2b73c25708856caef642b4c72ad327fec3c425547f57eca644fcba78d9ec497fb0462279dd7c SHA512 fb0017b665759dda9e58ffa010db2fb0a6fe6cbca1e5465646d3280129e9167acfab79ffb1c80289055a298549e871468c230d669e76731f285bb2f87c6d05da MISC metadata.xml 662 BLAKE2B 4ddc8ee05f0679380316f8c175194b325d931967c9faee576f042fa42e0c7d6f8aa6b688464c1a839b8b20e184646d6e356095ffad136141c6c1fc7aa5d4f4f6 SHA512 7aaac81b00bb77562616d6ba9442c2e37d7cdd1142af090e3fe07be36315b5179bdb9cf78073c3f901e9a924c089ba00474e3c7121d785b6622b60be1fce682a diff --git a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild b/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild index d652192107af..e0ce6f6fc762 100644 --- a/app-emulation/virt-manager/virt-manager-2.2.1-r3.ebuild +++ b/app-emulation/virt-manager/virt-manager-2.2.1-r3.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=6 @@ -15,7 +15,6 @@ HOMEPAGE="http://virt-manager.org" if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" - KEYWORDS="amd64 arm64 x86" EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" diff --git a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild b/app-emulation/virt-manager/virt-manager-3.1.0.ebuild index f22536b912af..7b57165eb531 100644 --- a/app-emulation/virt-manager/virt-manager-3.1.0.ebuild +++ b/app-emulation/virt-manager/virt-manager-3.1.0.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=6 @@ -15,11 +15,10 @@ HOMEPAGE="http://virt-manager.org" if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" - KEYWORDS="amd64 arm64 x86" EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" fi LICENSE="GPL-2" diff --git a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild index 91e20874b0a2..71e23226d3f3 100644 --- a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild +++ b/app-emulation/virt-manager/virt-manager-3.2.0.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=6 @@ -15,7 +15,6 @@ HOMEPAGE="http://virt-manager.org" if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" - KEYWORDS="amd64 arm64 x86" EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index 08f5fd5f3011..4c93200f4a26 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -15,7 +15,6 @@ HOMEPAGE="http://virt-manager.org" if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" - KEYWORDS="" EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git" else SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz" diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest index 5cb6a4c203bd..71baa0ec418f 100644 --- a/app-emulation/wine-mono/Manifest +++ b/app-emulation/wine-mono/Manifest @@ -13,6 +13,7 @@ DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b9 DIST wine-mono-5.0.0-x86.msi 79537664 BLAKE2B f5a4185a7a63a1c1966d871d4c8d5bae07d3bbbc3153f20847c3919ac87be5644e15b45764286483641d9ce19176f79c7c7544e543fad62032ef5302a66ea8ea SHA512 8f83122d4b552b3a3d8b000abbd19b7a72edf45e52fa63a9220228240d8e4c014531bb265d062a38f6924fae07dd45420a5c7566f99e0c471e116fb80906c08c DIST wine-mono-5.1.0-x86.msi 84094976 BLAKE2B 25b044696f46810a843c17117f61532de3d4922f202e5acc2106b67f99eda6d359a799dd53ac4801380e81fdb5929c29e09a4923df99bf104b462ac77c682f29 SHA512 c4013307ba43121346f11881a30ff83d4921e0563a1ad3ff1adc34373f7bda5d5f6ad8c46bafe11c13ca372075333562864e073fe944428225b01fb885f9532f DIST wine-mono-5.1.1-x86.msi 84130304 BLAKE2B 05a5344b59249a758443cf91670eaef71d9ad3a3024b11442a8d3512ba54356439d503629fa799e2454975f47c0eaf6ff9e25ed61b020f29efceacc78347d578 SHA512 c518b93a470cc897abaf1dba18cc773dca0df62a28d35f32f2ddbe39b4de616c0307545bea5dc3ca87a01fd96b47feb3e1d8c3778106304b9cc08ebb3d1d665f +DIST wine-mono-6.0.0-x86.msi 87507456 BLAKE2B b3cd3c767ecab3f679f82ad5efe393c10bd87261b48d25804ac4fa200eeadae74f73ca59b6b31f2d64695f1ea28e43ea333fadc78bb4f0c3d97d22087667548d SHA512 04a499429572a88308c3b906d4f729648b0a5bdf53f24e3630b14f644aaaf6d9be603f08cc76e25a35010f9e347b4b93c308bab417e5e64a801050f932ea176b EBUILD wine-mono-4.6.4.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3 EBUILD wine-mono-4.7.0.ebuild 493 BLAKE2B 062ba95f20540e8cebca2b2dc1ceea8a49ab9be791d11de595ff300337bcd4d015f21825a0bbbd62837d618ad093ce7b24a95bd87b7eeae4e1e3479542fc034d SHA512 5cf9052ebb4a0cf0f7717be83ed059d2622836edad31f9bdb314afeb51a9f6ab9c65e5c7a9884f802dd0c4f9b47bf4262ecc24ad49c439f8b826e025f988022c EBUILD wine-mono-4.7.1.ebuild 491 BLAKE2B ca3c7d026b50367f574915102069052519ecef3f49b1ca7185a64902807939f1b149fdb2e120097751261ad7e0ac6dae0ceef08d0fbd3658c5c5ab7c3178bc34 SHA512 459ebb021fc4f9401de138164c90e139a3592587da66a25cbc6ac6db6a24e46257d4a2b63cdc2edad1783413924a04d574301123ef7fe93f4ca3a9a0045acac3 @@ -28,4 +29,5 @@ EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa0 EBUILD wine-mono-5.0.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8 EBUILD wine-mono-5.1.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8 EBUILD wine-mono-5.1.1.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8 +EBUILD wine-mono-6.0.0.ebuild 511 BLAKE2B 2807e1fdd29bf3200690e008a981cf226dc1ab60c18437227bffd99fc683e3a8316e173937c775a910f3ccb2afcfd77b7bf9c1ab1d662048a1ef60d51d5508bd SHA512 37243bd166422fce836debc9551230290ffcc7b62f30f8676fd8b5640a9b6a6dd580a9d0af1fae4e3b4e5921cc723ea66186d859250a68ac4df9f96b41ff56b8 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c diff --git a/app-emulation/wine-mono/wine-mono-6.0.0.ebuild b/app-emulation/wine-mono/wine-mono-6.0.0.ebuild new file mode 100644 index 000000000000..0860b6bcb4b4 --- /dev/null +++ b/app-emulation/wine-mono/wine-mono-6.0.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Wine Mono is a replacement for the .NET runtime and class libraries in Wine" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="https://dl.winehq.org/wine/${PN}/${PV}/${P}-x86.msi" + +LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT MPL-1.1" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" + +DEPEND="!!app-emulation/wine:0" + +S="${WORKDIR}" + +src_install() { + insinto /usr/share/wine/mono + doins "${DISTDIR}/${P}-x86.msi" +} diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index 1b21ed7fad09..33db9db6e950 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,15 +1,18 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75 -DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4 DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18 DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057 -DIST wine-staging-5.20.tar.gz 10378427 BLAKE2B 75910b198ca5b79f41f4aa115a962cb01a4dd208512feffc2ef9bc327d9c82d0c0babd543ea011917257c5dfd7c5f2f2815dae81d553dd4b239b627bafba1635 SHA512 64913c3af44890a959593c610c713113f068811a8fe79e234a61f262af963d194d1d71d336361c6a473ad0f3f64fc5a88cee36facdc0824cea6856fc74da9634 +DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0 +DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4 DIST wine-staging-5.21.tar.gz 10362610 BLAKE2B 41f40c33b7d0853c63b81da863145f242b640a0e491b3ee92e1c687d33b85344676e764ae93921f00643b4bd3247e9c9aef4ba92cf80aa43785db1f762eac8cc SHA512 079a7fccd66d886b3498c45057b1bb215d3897e44e0c8d6afb56174fad583e8a578ea888d70d62a18da1566bb9649fdefd08227efecd21fc71b0b3d739dab636 DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7a23a1ad9945cedeced179657645970048846517f4eced051989b0ef1ee555c9f8176de073a66b3633f3fe1fd90e0836 SHA512 0ce0314b470e90c741fd02ede522b6dd754fb69595b527e3ad5ac62d944bc7eca43eca88aa2b85d99a9945fbad05872cdcd2ac87ed809dcd41a9ce56bfcc1147 DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38 -EBUILD wine-staging-5.20.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8 +DIST wine-staging-6.1.tar.gz 9855125 BLAKE2B e5bd41294b7f17cd283d4ab90cce4f362740c2b3de2a867ef50c44639f5472392b3c11e199a66da63018f18df2f2a99579b50f27d6dd0163bd989efe1e7983e2 SHA512 50bf3f07cf8008731cee131852cbce43c5ec44219e8e96fb70a0fc82954b0a2a9d25ee8b25b7c62b47abd131591ca8fe0461214287601465edccda80be6d598f +DIST wine-staging-6.2.tar.gz 9820682 BLAKE2B 3de0c0ecbdabc1ffb965e6d5ebf5689fbeaf24ee33aaa2ff078db39d1542aa935b6d4d940fef570f1c60260748f4ef52b9789625b840f73e70ed3482995d505d SHA512 558c46250babaacda92885c35c438797baff7b8eb45cb3cdf7f7572c35e6412e621182061a3a4e31444cc7580f99a61de6bd433bf2bb2b8139cdd718afd9cd2e EBUILD wine-staging-5.21.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8 EBUILD wine-staging-5.22-r2.ebuild 21689 BLAKE2B 212be2581df2c851d2cc06eac3de72d506d7d142703e2cd29fb116ea32431a9ab60f2950c30f7afad9f97ccd4d91674fed55c54360402933e71d97444833e1c9 SHA512 d7dac0725c2502f9627962bf6ab9a550b5a2ea9ef5a2daabfa2536bb220671860a379229cccbad45aa075a18d449ed6af1cacf295e214a16bee473c6af2f4a74 EBUILD wine-staging-6.0.ebuild 22040 BLAKE2B 55372befe8fc1036ca8f5e2932130b9c25787727abb2a55f2692ea378fbae8e37031fb6a073b9dc2dbb39a88afacc23d05e76329488a63f9d9d324afb092dfa4 SHA512 40897f4c0c7aafe2e398739c557a0440f83b50484d9cb38c5906a94234c4659dd9d688b8768dd20999761c59a5c989e81776a3b6da191644f44d0308f0e7d043 -EBUILD wine-staging-9999.ebuild 22040 BLAKE2B 55372befe8fc1036ca8f5e2932130b9c25787727abb2a55f2692ea378fbae8e37031fb6a073b9dc2dbb39a88afacc23d05e76329488a63f9d9d324afb092dfa4 SHA512 40897f4c0c7aafe2e398739c557a0440f83b50484d9cb38c5906a94234c4659dd9d688b8768dd20999761c59a5c989e81776a3b6da191644f44d0308f0e7d043 +EBUILD wine-staging-6.1.ebuild 22040 BLAKE2B 55372befe8fc1036ca8f5e2932130b9c25787727abb2a55f2692ea378fbae8e37031fb6a073b9dc2dbb39a88afacc23d05e76329488a63f9d9d324afb092dfa4 SHA512 40897f4c0c7aafe2e398739c557a0440f83b50484d9cb38c5906a94234c4659dd9d688b8768dd20999761c59a5c989e81776a3b6da191644f44d0308f0e7d043 +EBUILD wine-staging-6.2.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25 +EBUILD wine-staging-9999.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033 diff --git a/app-emulation/wine-staging/wine-staging-5.20.ebuild b/app-emulation/wine-staging/wine-staging-6.1.ebuild index 9c6e2a76fa30..28716e74fdc2 100644 --- a/app-emulation/wine-staging/wine-staging-5.20.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.1.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=6 @@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko PLOCALE_BACKUP="en" inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils - MY_PN="${PN%%-*}" -MY_P="${MY_PN}-${PV}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then EGIT_REPO_URI="https://source.winehq.org/git/wine.git" EGIT_BRANCH="master" inherit git-r3 @@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" -STAGING_P="wine-staging-${PV}" +STAGING_P="wine-staging-${MY_PV}" STAGING_DIR="${WORKDIR}/${STAGING_P}" GWP_V="20200523" PATCHDIR="${WORKDIR}/gentoo-wine-patches" @@ -35,16 +39,16 @@ SRC_URI="${SRC_URI} https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz " -if [[ ${PV} == "9999" ]] ; then +if [[ ${MY_PV} == "9999" ]] ; then STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" else SRC_URI="${SRC_URI} - staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )" + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" fi LICENSE="LGPL-2.1" -SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -86,7 +90,6 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -113,6 +116,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) @@ -129,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.1 ) perl? ( dev-lang/perl @@ -172,7 +176,7 @@ PATCHES=( PATCHES_BIN=() # https://bugs.gentoo.org/show_bug.cgi?id=635222 -if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then DEPEND+=" dev-util/patchbin" fi @@ -286,15 +290,45 @@ wine_env_vcs_vars() { } pkg_pretend() { - wine_build_environment_check || die + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi - # Verify OSS support - if use oss && ! use kernel_FreeBSD; then - if ! has_version ">=media-sound/oss-4"; then - eerror "You cannot build wine with USE=oss without having support from a" - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then eerror - die + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." fi fi } @@ -303,7 +337,7 @@ pkg_setup() { wine_build_environment_check || die wine_env_vcs_vars || die - WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${PN#wine}-${MY_PV}" WINE_VARIANT="${WINE_VARIANT#-}" MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" @@ -317,7 +351,7 @@ pkg_setup() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${MY_PV} == "9999" ]] ; then EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack if use staging; then local CURRENT_WINE_COMMIT=${EGIT_VERSION} @@ -420,6 +454,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -440,7 +477,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -455,7 +491,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) @@ -475,6 +512,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -544,12 +582,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi @@ -576,12 +622,12 @@ multilib_src_install_all() { } pkg_postinst() { - eselect wine register ${P} + eselect wine register ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine register --vanilla ${P} || die + eselect wine register --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine register --staging ${P} || die + eselect wine register --staging ${PN}-${MY_PV} || die fi fi @@ -604,12 +650,12 @@ pkg_postinst() { } pkg_prerm() { - eselect wine deregister ${P} + eselect wine deregister ${PN}-${MY_PV} if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die + eselect wine deregister --vanilla ${PN}-${MY_PV} || die else if use staging; then - eselect wine deregister --staging ${P} || die + eselect wine deregister --staging ${PN}-${MY_PV}|| die fi fi diff --git a/app-emulation/wine-staging/wine-staging-6.2.ebuild b/app-emulation/wine-staging/wine-staging-6.2.ebuild new file mode 100644 index 000000000000..9bb1565d0057 --- /dev/null +++ b/app-emulation/wine-staging/wine-staging-6.2.ebuild @@ -0,0 +1,667 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils +MY_PN="${PN%%-*}" +MY_PV="${PV/_/-}" +MY_P="${MY_PN}-${MY_PV}" + +if [[ ${MY_PV} == "9999" ]] ; then + EGIT_REPO_URI="https://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(ver_cut 1) + MINOR_V=$(ver_cut 2) + if [[ ${MINOR_V} != "0" ]] ; then + MINOR_V="x" + fi + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86" +fi +S="${WORKDIR}/${MY_P}" + +STAGING_P="wine-staging-${MY_PV}" +STAGING_DIR="${WORKDIR}/${STAGING_P}" +GWP_V="20200523" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz +" + +if [[ ${MY_PV} == "9999" ]] ; then + STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git" +else + SRC_URI="${SRC_URI} + staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )" +fi + +LICENSE="LGPL-2.1" +SLOT="${MY_PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + pipelight? ( staging ) + test? ( abi_x86_32 ) + themes? ( staging ) + vaapi? ( staging ) + vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) + themes? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + x11-libs/gtk+:3[${MULTILIB_USEDEP}] + ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) + vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + )" + +RDEPEND="${COMMON_DEPEND} + app-emulation/wine-desktop-common + >app-eselect/eselect-wine-0.3 + !app-emulation/wine:0 + dos? ( >=games-emulation/dosbox-0.74_p20160629 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) + perl? ( + dev-lang/perl + dev-perl/XML-Simple + ) + pulseaudio? ( + realtime? ( sys-auth/rtkit ) + ) + samba? ( >=net-fs/samba-3.0.25[winbind] ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + X? ( x11-base/xorg-proto ) + prelink? ( sys-devel/prelink ) + staging? ( + dev-lang/perl + dev-perl/XML-Simple + ) + xinerama? ( x11-base/xorg-proto )" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" +) +PATCHES_BIN=() + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + +wine_compiler_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + # GCC-specific bugs + if tc-is-gcc; then + # bug #549768 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then + ebegin "Checking for gcc-5 ms_abi compiler bug" + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die + # Run in subshell to prevent "Aborted" message + ( "${T}"/pr66838 || false ) >/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${pn_live_val} ]]; then + if use staging; then + eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}" + eerror "cannot be used to set the commit. Instead, you may use the" + eerror "environment variables:" + eerror " EGIT_OVERRIDE_COMMIT_WINE" + eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" + eerror + return 1 + fi + fi + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environment variables:" + eerror " EGIT_OVERRIDE_COMMIT_WINE" + eerror " EGIT_OVERRIDE_COMMIT_WINE_STAGING_WINE_STAGING" + eerror + return 1 + fi +} + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]] ; then + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi + + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${MY_PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${MY_PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack + if use staging; then + local CURRENT_WINE_COMMIT=${EGIT_VERSION} + + EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack + + local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die + + if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then + einfo "The current Staging patchset is not guaranteed to apply on this WINE commit." + einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT." + einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_WINE_COMMIT} emerge -1 wine" + fi + fi + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + if use staging; then + ewarn "Applying the Wine-Staging patchset. Any bug reports to the" + ewarn "Wine bugzilla should explicitly state that staging was used." + + local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176 + use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight" + + # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches + ebegin "Running Wine-Staging patch installer" + ( + set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE} + cd "${STAGING_DIR}/patches" + source "${STAGING_DIR}/patches/patchinstall.sh" + ) + eend $? || die "Failed to apply Wine-Staging patches" + fi + + default + eapply_bin + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die + done + # Add wine64 manpages to Makefile + if use abi_x86_64; then + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' loader/Makefile.in || die + fi + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir="${EPREFIX}/etc/wine" + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with udisks dbus) + $(use_with faudio) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gcrypt) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gssapi) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with kerberos krb5) + $(use_with ldap) + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_with sdl) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with unwind) + $(use_with usb) + $(use_with v4l v4l2) + $(use_with vkd3d) + $(use_with vulkan) + $(use_with X x) + $(use_with X xfixes) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + use staging && myconf+=( + --with-xattr + $(use_with themes gtk3) + $(use_with vaapi va) + ) + + local PKG_CONFIG AR RANLIB + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + # set AR and RANLIB to make QA scripts happy; #483342 + tc-export PKG_CONFIG AR RANLIB + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + # Avoid double prefix from dosym and make_wrapper + MY_PREFIX=${MY_PREFIX#${EPREFIX}} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${ED%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + eshopts_pop +} + +pkg_postinst() { + eselect wine register ${PN}-${MY_PV} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${PN}-${MY_PV} || die + else + if use staging; then + eselect wine register --staging ${PN}-${MY_PV} || die + fi + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${PN}-${MY_PV} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${PN}-${MY_PV} || die + else + if use staging; then + eselect wine deregister --staging ${PN}-${MY_PV}|| die + fi + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 28716e74fdc2..9bb1565d0057 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 8b1e3ed5c2bf..f9eda5481bae 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -2,15 +2,17 @@ DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75 DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652 -DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4 DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18 DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057 +DIST wine-6.1.tar.xz 24227160 BLAKE2B 968405fb8a4060732a6070687e28aecc9169692bf18e058d358e859a2626281b5adb67b94d849628ecbfa87ad772a367f62fd3c5f45aecdf7d0a7e7aa8167c33 SHA512 49ee77c41e2fb1c4f22417117b26f8a467ec6c99583fca66f147003f776fcaf5ca42227153c7ca3325dfe70141ae9bfb88e3eb6e4cf25dd31a5ba5115d2685d0 +DIST wine-6.2.tar.xz 24270924 BLAKE2B b83e7ff097d8f48cc46588a672515e8c1eafeafd592d4ced6a8347eaa33c31f9c5a2603958a10ce02463993c8ca5db77b227d0fbce452c1e3a637e5ea42cf635 SHA512 d28870ba58fc4ed9dc083f843d7f4ee8921722bb33e0b84c89f281fc27e5f827c0998ad629eb21c92f860dade77194d3c8a0f5b4c6ae3407fe7acef245cfa9a4 EBUILD wine-vanilla-5.0.2.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a EBUILD wine-vanilla-5.0.3-r1.ebuild 17635 BLAKE2B 05faf2469f3c1645e6839d5be2f710b3cf544ad513bfd3699f5afd7390c64d31233e499d68d372908e5f43118c67d7396fce9978b35545086208de51b942a6ba SHA512 1ef21017980fd5ae253fcb9b2521c639f8069fe5dc3cd08a42b091da22948739f02b04cd8e68eafa809afef19616bb1ecffbfa6fb86000087ee9a61d7a1917c8 -EBUILD wine-vanilla-5.20.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 EBUILD wine-vanilla-5.21.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4 EBUILD wine-vanilla-5.22-r2.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da EBUILD wine-vanilla-6.0.ebuild 18924 BLAKE2B af143b0cf047f4d6b49675bdd3849e7597263553d67ac2210f339930343b4dbfc54b1002279f1c92782ff5d560c0d49a4dafac3fd77887a4cee1b6d0120d011f SHA512 aa4eb01b8b856e6563c5e7bd302762388c90ccd7f7d97ddcf6f5f4d79616345708ad641efb01377fc7514a5363be64a73fa75b7925dea14147fe7737f84b555f -EBUILD wine-vanilla-9999.ebuild 18924 BLAKE2B af143b0cf047f4d6b49675bdd3849e7597263553d67ac2210f339930343b4dbfc54b1002279f1c92782ff5d560c0d49a4dafac3fd77887a4cee1b6d0120d011f SHA512 aa4eb01b8b856e6563c5e7bd302762388c90ccd7f7d97ddcf6f5f4d79616345708ad641efb01377fc7514a5363be64a73fa75b7925dea14147fe7737f84b555f +EBUILD wine-vanilla-6.1.ebuild 18924 BLAKE2B b54545cd05170a0191625b4c507c7fafa22eab2234bba204fbe4c23f878e76ace1e7d7eb339c97176caac264a3c3241ac477c7adcfe02b456de003f5afe38273 SHA512 43cb06f5f72f9a18a628007b0c357ed58dc2bc663feb613f2d5f1400cf876d82d31f0ffe6a9cc7226aa3f89cf97761fab7812e0f0b27113827f09cf0dea94527 +EBUILD wine-vanilla-6.2.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53 +EBUILD wine-vanilla-9999.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8 diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.1.ebuild index 226b93efb90f..c5ffac5326bb 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.1.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=6 @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -73,7 +73,6 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -94,6 +93,7 @@ COMMON_DEPEND=" udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND} >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) - gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:5.1.1 ) perl? ( dev-lang/perl @@ -261,6 +261,34 @@ pkg_pretend() { die fi fi + + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi } pkg_setup() { @@ -354,6 +382,9 @@ src_configure() { export LDCONFIG=/bin/true use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi multilib-minimal_src_configure } @@ -374,7 +405,6 @@ multilib_src_configure() { $(use_with capi) $(use_with lcms cms) $(use_with cups) - $(use_with ncurses curses) $(use_with udisks dbus) $(use_with faudio) $(use_with fontconfig) @@ -388,7 +418,8 @@ multilib_src_configure() { $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) $(use_enable mono mscoree) $(use_with mp3 mpg123) $(use_with netapi) @@ -408,6 +439,7 @@ multilib_src_configure() { $(use_with truetype freetype) $(use_with udev) $(use_with unwind) + $(use_with usb) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) @@ -470,12 +502,20 @@ multilib_src_install_all() { fi # Remove wineconsole if neither backend is installed #551124 - if ! use X && ! use ncurses; then + if ! use X; then rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die - rm_wineconsole() { - rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die - } + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + multilib_foreach_abi rm_wineconsole fi diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild new file mode 100644 index 000000000000..045e3bfde6b8 --- /dev/null +++ b/app-emulation/wine-vanilla/wine-vanilla-6.2.ebuild @@ -0,0 +1,579 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW" +PLOCALE_BACKUP="en" + +inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils + +MY_PN="${PN%%-*}" +MY_P="${MY_PN}-${PV}" + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://source.winehq.org/git/wine.git" + EGIT_BRANCH="master" + inherit git-r3 + SRC_URI="" + #KEYWORDS="" +else + MAJOR_V=$(ver_cut 1) + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" + KEYWORDS="-* ~amd64 ~x86" +fi +S="${WORKDIR}/${MY_P}" + +GWP_V="20200523" +PATCHDIR="${WORKDIR}/gentoo-wine-patches" + +DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" +HOMEPAGE="https://www.winehq.org/" +SRC_URI="${SRC_URI} + https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz +" + +LICENSE="LGPL-2.1" +SLOT="${PV}" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) + X? ( truetype ) + elibc_glibc? ( threads ) + osmesa? ( opengl ) + test? ( abi_x86_32 ) + vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 + +# FIXME: the test suite is unsuitable for us; many tests require net access +# or fail due to Xvfb's opengl limitations. +RESTRICT="test" + +COMMON_DEPEND=" + X? ( + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-libs/libXi[${MULTILIB_USEDEP}] + x11-libs/libXxf86vm[${MULTILIB_USEDEP}] + ) + alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) + capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) + cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) + faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) + fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) + gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] + ) + jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) + kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) + lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) + ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) + netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) + nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) + openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/glu[${MULTILIB_USEDEP}] + virtual/opengl[${MULTILIB_USEDEP}] + ) + osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) + pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) + scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) + ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) + udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) + udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) + vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) + xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + xml? ( + dev-libs/libxml2[${MULTILIB_USEDEP}] + dev-libs/libxslt[${MULTILIB_USEDEP}] + )" + +RDEPEND="${COMMON_DEPEND} + app-emulation/wine-desktop-common + >app-eselect/eselect-wine-0.3 + !app-emulation/wine:0 + dos? ( >=games-emulation/dosbox-0.74_p20160629 ) + gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) + mono? ( app-emulation/wine-mono:6.0.0 ) + perl? ( + dev-lang/perl + dev-perl/XML-Simple + ) + pulseaudio? ( + realtime? ( sys-auth/rtkit ) + ) + samba? ( >=net-fs/samba-3.0.25[winbind] ) + selinux? ( sec-policy/selinux-wine ) + udisks? ( sys-fs/udisks:2 )" + +# tools/make_requests requires perl +DEPEND="${COMMON_DEPEND} + sys-devel/flex + >=sys-kernel/linux-headers-2.6 + virtual/pkgconfig + virtual/yacc + X? ( x11-base/xorg-proto ) + prelink? ( sys-devel/prelink ) + xinerama? ( x11-base/xorg-proto )" + +# These use a non-standard "Wine" category, which is provided by +# /etc/xdg/applications-merged/wine.menu +QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop +usr/share/applications/wine-notepad.desktop +usr/share/applications/wine-uninstaller.desktop +usr/share/applications/wine-winecfg.desktop" + +PATCHES=( + "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 + "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 + "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 + "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" +) +PATCHES_BIN=() + +# https://bugs.gentoo.org/show_bug.cgi?id=635222 +if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then + DEPEND+=" dev-util/patchbin" +fi + +wine_compiler_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + # GCC-specific bugs + if tc-is-gcc; then + # bug #549768 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then + ebegin "Checking for gcc-5 ms_abi compiler bug" + $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die + # Run in subshell to prevent "Aborted" message + ( "${T}"/pr66838 || false ) >/dev/null 2>&1 + if ! eend $?; then + eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/549768" + eerror + return 1 + fi + fi + # bug #574044 + if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then + ebegin "Checking for gcc-5-3 stack realignment compiler bug" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1 + if ! eend $?; then + eerror "Wine cannot be built with this version of gcc-5.3" + eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild," + eerror "or use gcc-config to select a different compiler version." + eerror "See https://bugs.gentoo.org/574044" + eerror + return 1 + fi + fi + fi + + # Ensure compiler support + if use abi_x86_64; then + ebegin "Checking for 64-bit compiler with builtin_ms_va_list support" + # Compile in subshell to prevent "Aborted" message + ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1) + if ! eend $?; then + eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine" + eerror + eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine" + eerror + return 1 + fi + fi +} + +wine_build_environment_check() { + [[ ${MERGE_TYPE} = "binary" ]] && return 0 + + if use abi_x86_64; then + if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then + eerror "You need gcc-4.4+ to compile 64-bit wine" + die + elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then + eerror "You need clang-3.8+ to compile 64-bit wine" + die + fi + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then + ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by" + ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in" + ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4" + fi + if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then + if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then + ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work" + ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine." + ewarn "See package.env in man 5 portage for more information on how to do this." + ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details" + fi + fi + + if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then + eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only." + eerror "See https://bugs.gentoo.org/487864 for more details." + eerror + return 1 + fi +} + +wine_env_vcs_vars() { + local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT" + local pn_live_val="${pn_live_var}" + eval pn_live_val='$'${pn_live_val} + if [[ ! -z ${EGIT_COMMIT} ]]; then + eerror "Commits must now be specified using the environmental variables" + eerror "EGIT_OVERRIDE_COMMIT_WINE" + eerror + return 1 + fi +} + +pkg_pretend() { + wine_build_environment_check || die + + # Verify OSS support + if use oss && ! use kernel_FreeBSD; then + if ! has_version ">=media-sound/oss-4"; then + eerror "You cannot build wine with USE=oss without having support from a" + eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)" + eerror + die + fi + fi + + if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target i686-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi + + if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then + eerror + eerror "USE=\"mingw\" is currently experimental, and requires the" + eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds." + eerror + eerror "These can be installed by using 'sys-devel/crossdev':" + eerror + eerror "crossdev --target x86_64-w64-mingw32" + eerror + eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw" + eerror + die "MinGW build was enabled, but no compiler to support it was found." + fi +} + +pkg_setup() { + wine_build_environment_check || die + wine_env_vcs_vars || die + + WINE_VARIANT="${PN#wine}-${PV}" + WINE_VARIANT="${WINE_VARIANT#-}" + + MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}" + MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}" + MY_DATADIR="${MY_DATAROOTDIR}" + MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}" + MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}" + MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}" + MY_MANDIR="${MY_DATADIR}/man" +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack + fi + + default + + l10n_find_plocales_changes "${S}/po" "" ".po" +} + +src_prepare() { + + eapply_bin(){ + local patch + for patch in ${PATCHES_BIN[@]}; do + patchbin --nogit < "${patch}" || die + done + } + + local md5="$(md5sum server/protocol.def)" + + default + eapply_bin + eautoreconf + + # Modification of the server protocol requires regenerating the server requests + if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then + einfo "server/protocol.def was patched; running tools/make_requests" + tools/make_requests || die #432348 + fi + sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die + if ! use run-exes; then + sed -i '/^MimeType/d' loader/wine.desktop || die #117785 + fi + + # Edit wine.desktop to work for specific variant + sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die + + # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652 + cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die + + l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS + + # Fix manpage generation for locales #469418 and abi_x86_64 #617864 + + # Duplicate manpages input files for wine64 + local f + for f in loader/*.man.in; do + cp ${f} ${f/wine/wine64} || die + done + # Add wine64 manpages to Makefile + if use abi_x86_64; then + sed -i "/wine.man.in/i \ + \\\twine64.man.in \\\\" loader/Makefile.in || die + sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\ +\164\2/' loader/Makefile.in || die + fi + + rm_man_file(){ + local file="${1}" + loc=${2} + sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die + } + + while read f; do + l10n_for_each_disabled_locale_do rm_man_file "${f}" + done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print) +} + +src_configure() { + wine_compiler_check || die + + export LDCONFIG=/bin/true + use custom-cflags || strip-flags + if use mingw; then + export CROSSCFLAGS="${CFLAGS}" + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local myconf=( + --prefix="${MY_PREFIX}" + --datarootdir="${MY_DATAROOTDIR}" + --datadir="${MY_DATADIR}" + --docdir="${MY_DOCDIR}" + --includedir="${MY_INCLUDEDIR}" + --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" + --libexecdir="${MY_LIBEXECDIR}" + --localstatedir="${MY_LOCALSTATEDIR}" + --mandir="${MY_MANDIR}" + --sysconfdir="${EPREFIX}/etc/wine" + $(use_with alsa) + $(use_with capi) + $(use_with lcms cms) + $(use_with cups) + $(use_with udisks dbus) + $(use_with faudio) + $(use_with fontconfig) + $(use_with ssl gnutls) + $(use_enable gecko mshtml) + $(use_with gphoto2 gphoto) + $(use_with gsm) + $(use_with gssapi) + $(use_with gstreamer) + --without-hal + $(use_with jpeg) + $(use_with kerberos krb5) + $(use_with ldap) + # TODO: Will bug 685172 still need special handling? + $(use_with mingw) + $(use_enable mono mscoree) + $(use_with mp3 mpg123) + $(use_with netapi) + $(use_with nls gettext) + $(use_with openal) + $(use_with opencl) + $(use_with opengl) + $(use_with osmesa) + $(use_with oss) + $(use_with pcap) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with threads pthread) + $(use_with scanner sane) + $(use_with sdl) + $(use_enable test tests) + $(use_with truetype freetype) + $(use_with udev) + $(use_with unwind) + $(use_with usb) + $(use_with v4l v4l2) + $(use_with vkd3d) + $(use_with vulkan) + $(use_with X x) + $(use_with X xfixes) + $(use_with xcomposite) + $(use_with xinerama) + $(use_with xml) + $(use_with xml xslt) + ) + + local PKG_CONFIG + # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 + tc-export PKG_CONFIG + + if use amd64; then + if [[ ${ABI} == amd64 ]]; then + myconf+=( --enable-win64 ) + else + myconf+=( --disable-win64 ) + fi + + # Note: using --with-wine64 results in problems with multilib.eclass + # CC/LD hackery. We're using separate tools instead. + fi + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" + emake depend +} + +multilib_src_test() { + # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader" + if [[ ${ABI} == x86 ]]; then + if [[ $(id -u) == 0 ]]; then + ewarn "Skipping tests since they cannot be run under the root user." + ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf" + return + fi + + WINEPREFIX="${T}/.wine-${ABI}" \ + Xemake test + fi +} + +multilib_src_install_all() { + local DOCS=( ANNOUNCE AUTHORS README ) + add_locale_docs() { + local locale_doc="documentation/README.$1" + [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} ) + } + l10n_for_each_locale_do add_locale_docs + + einstalldocs + prune_libtool_files --all + + if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script + rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \ + "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die + fi + + # Remove wineconsole if neither backend is installed #551124 + if ! use X; then + rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die + rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die + + if ! use mingw; then + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die + } + else + rm_wineconsole() { + rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die + } + fi + + multilib_foreach_abi rm_wineconsole + fi + + use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055 + use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader} + + # Avoid double prefix from dosym and make_wrapper + MY_PREFIX=${MY_PREFIX#${EPREFIX}} + + if use abi_x86_64 && ! use abi_x86_32; then + dosym wine64 "${MY_PREFIX}"/bin/wine # 404331 + dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader + fi + + # Failglob for binloops, shouldn't be necessary, but including to stay safe + eshopts_push -s failglob #615218 + # Make wrappers for binaries for handling multiple variants + # Note: wrappers instead of symlinks because some are shell which use basename + local b + for b in "${ED%/}${MY_PREFIX}"/bin/*; do + make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}" + done + eshopts_pop +} + +pkg_postinst() { + eselect wine register ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine register --vanilla ${P} || die + fi + + eselect wine update --all --if-unset || die + + xdg_desktop_database_update + + if ! use gecko; then + ewarn "Without Wine Gecko, wine prefixes will not have a default" + ewarn "implementation of iexplore. Many older windows applications" + ewarn "rely upon the existence of an iexplore implementation, so" + ewarn "you will likely need to install an external one, like via winetricks" + fi + if ! use mono; then + ewarn "Without Wine Mono, wine prefixes will not have a default" + ewarn "implementation of .NET. Many windows applications rely upon" + ewarn "the existence of a .NET implementation, so you will likely need" + ewarn "to install an external one, like via winetricks" + fi +} + +pkg_prerm() { + eselect wine deregister ${P} + if [[ ${PN} == "wine-vanilla" ]]; then + eselect wine deregister --vanilla ${P} || die + fi + + eselect wine update --all --if-unset || die +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 8234054004a2..045e3bfde6b8 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then #KEYWORDS="" else MAJOR_V=$(ver_cut 1) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz" + SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz" KEYWORDS="-* ~amd64 ~x86" fi S="${WORKDIR}/${MY_P}" @@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND} !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:5.1.1 ) + mono? ( app-emulation/wine-mono:6.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 3747e2329a2a..eb2dcee1ae92 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -7,8 +7,8 @@ DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac69 DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 -DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 +DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e EBUILD xen-pvgrub-4.13.2.ebuild 4527 BLAKE2B d15b849b72dc8758ee7253c2a12e24c43faad900047051cee89b6c1c51933a571430d7d9b2b50d7828f6425db16a0e1878939943f74d79f407667aed4650abe5 SHA512 2006e7c6c574cd0ba09a0c460f4469f9a3379488aaf9f54672bf67c1b6159aaeb752f06af9c57af7b69fa02b20b28fff9bc6a0688cc0d23ce1a3a8116ba5ca44 -EBUILD xen-pvgrub-4.14.0.ebuild 4530 BLAKE2B e8e1e6a46a090cb50814c9f3647bb5e7032863391a2b54dd0b610dcc9d3882f0f991ad426559f1e0472f74c55ce050d71a11092daff0e8fc2751e1ef2c97ae76 SHA512 9069a35ad4100f96a15e71034a8c86ad76d3f7c43e5068bc05f9fd903f0df9ba6d6b984d4291b3eb5cf3a34f172eedbaaa7fa91e5734dcdea3e04a9c6f336f02 +EBUILD xen-pvgrub-4.14.1.ebuild 4530 BLAKE2B ef74a5ed5ffe009f105e48b1b19193a8ae6f115ffe665940fa9e0de29d46465675b242b6154945a10dbb5d0a89c0266adaf9f577ad74e42cad58eeff25a17b6c SHA512 44f97e79d3e13e6860f1b3ae8d504a76cdcbba744b20159592bd6721266d0d4325a88f9fb5d506f91b6c2ddee94b5f10198e18c65078f24b395f51cccdfb456e MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild index 586ee80bce45..c3980e0437ec 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{6..9} ) PYTHON_REQ_USE='xml,threads(+)' inherit flag-o-matic multilib python-single-r1 toolchain-funcs diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index f136be4fc971..2f12969e548b 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -1,4 +1,4 @@ -AUX gentoo-patches.conf 2263 BLAKE2B 046e6ad4d3734da5820784fd82fb0ce4d781a2f1be9bc970541bb865c5b2ce157e1dae13eed47be193fd5633bc2be8e5681fcdfc2f4aee66bcc5b4150b1d0120 SHA512 bb9835623a87a3679aca40dae9113ae3b9b36118fb616361e7c1f127242eff7c476155609c8e569976eb89f0f5a7d79692577685834462a372d61d916cce2710 +AUX gentoo-patches.conf 1927 BLAKE2B e2c68e6da8e5bba8906f5bf7379de29b6c71ec589bd9d6ca9892c36d134ddb3db39bcca1c155fe8ae996173b8787e1b18c89aa1107bd5e7c7fb997a4ab770e0c SHA512 0e24fe1f2efbe0c8f6bd076b74b22e29f4ea66f97f3e6e07af1f8b74a37872e5dcb8a63c68aa7f70d104cc7b7b98336e5b5b4e187a48e6a4e870b88794ecd5b5 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b @@ -20,16 +20,12 @@ DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b95266ec7fcee5c27065ba999b023ded9eb42a3690555e626911493f1dc995927fa67071bdc6432b3995df82134f8c49ea0d72eaf407f455dd1e2675d5b8d844 SHA512 8120696ba6d79fd9189664deed9b0489825d8d1edf7b931023b3979b7b9f82248e5b808c4517036cd40a85442ddf51a8dcad3b05d7f3c3cc6650654d53da4050 DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0 DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393 -DIST xen-4.13.2-upstream-patches-0.tar.xz 15404 BLAKE2B e4f679e4281e4edfe4f1e7722c19a973461b9a6423828f17719dfd766a73ef61a74b1cd87f375e2b0c2ec9cbed7b6a0f12c4a9982bbc325cdbba4c70a7145248 SHA512 122fe404f9c19567016e43208ddd08bdac56e7f264853d6cbe0929650fc4ada7175cc24c0e4fbf088acab77127eb76454948b98cbc731e35a12e1b068a5fd793 DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 -DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b -DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 +DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1 -DIST xen-security-patches-28.tar.xz 1580 BLAKE2B c304894801b37259508582fc6947e26c0b8665e982d91de86c16efd5eaecd6c9bb19570534642d39e81175fe58baccf576990a481f40f8848692d3465ad17a85 SHA512 b442b5568e76e0f2a5cfc91063515b96347f8b30f6101a81536b78edecc400861fd99281e1994bc6626bff28ece3df8f8306575c8abbb2cddaf3a6d3542c0b2f DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079 -EBUILD xen-tools-4.13.2-r1.ebuild 16589 BLAKE2B a7c07df0a4f5701ea087c63a8fc84c2165917bf71010dc9ad8a0ed2e56f3e0bf68d316474a2f5c0cfb248cedf068ff4c25cdc6f455959f04f3bb404bd9c872d3 SHA512 496607f4494fc9e87d6ecf3c3d108919ba1f317fff0f1f4fe6648b5c0e0fbc6ca3d35e2890945d47615ef0a79176ca8e54f149b43f893919a48b67d193f5cd50 EBUILD xen-tools-4.13.2-r2.ebuild 16589 BLAKE2B e0dcea110a807bd7c565b41c0d3a016a04b684dfecfa01870951ea606759fa067a3f7a78d655a5decda409f54663c722c499cd98753ba8b3210f5b87efd39731 SHA512 9673f9fa78c6860688213fd21fb015111b6c23f355f89f8f63d0076adde5e87c749f7a44d53323d2fa4894644b04cc069cfd3a949265efe82e0276ddf1abc609 -EBUILD xen-tools-4.14.0-r5.ebuild 16590 BLAKE2B 1c1a8cc19c95f62ba44d222d3fcaaccd2ea18aa932670f2eb666ec0738fd08f98625cd4c5fe3494d026fac9dd1da8c80b81387fd6d86ba61ac4e6de3dd2a3c7d SHA512 7fd7146455daff2de1fc079d087681c8813be78e9dddafa91186db8c26d60cd632fe4ebad393ca00bfa13f80411317af544562e75ad81ded268ef5d150558788 +EBUILD xen-tools-4.14.1.ebuild 16587 BLAKE2B 91b60db2a81fcdc88d2523bbfbf8a6125df1d66d2c12016bb48b71486946186ada12b2567f5c1d2b0f2576b3ea30bc8b439c7e7338ee15a1b482420103dac87d SHA512 237b5271694e0aa408f024de90d3672d24224d1a9e12fb779d7a820c1762579bb023543ffe3bcd27890edd71eb987a0f7b188ff2a16da2f10837261ff0ba56ff MISC metadata.xml 1596 BLAKE2B 049149106eb740b3ca38008d18431001f4cf27ef8ab4223cb78ba97e301292a13f39ea51c6064fb1e116404d9c52a61c0d42b921416d0a5fff0f7749e2ab4f59 SHA512 76830a62f4fe0d93df26372c67c2f1aca143e85227d86246e2c2e2aade6c0f64b62f7d7f7229612e65b5da82dd0401822317fe2607e14565a2eb9386c760fc80 diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf index 23d836ed8d16..1cc00d3345f9 100644 --- a/app-emulation/xen-tools/files/gentoo-patches.conf +++ b/app-emulation/xen-tools/files/gentoo-patches.conf @@ -51,28 +51,6 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch" # Fix building with gcc 10, bug #722930 _gx060=" xen-tools-4.13.0-gcc10.patch" -# xen-tools-4.13.1 patches set -_gpv_xen_tools_4131_0=" -${_gx038} -${_gx027} -${_gx028} ${_gx029} -${_gx037} -${_gx053} ${_gx050} ${_gx051} -${_gx054} ${_gx056} -${_gx060} -" - -# xen-tools-4.13.2 patches set -_gpv_xen_tools_4132_0=" -${_gx038} -${_gx027} -${_gx028} ${_gx029} -${_gx037} -${_gx053} ${_gx050} ${_gx051} -${_gx054} ${_gx056} -${_gx060} -" - # xen-tools-4.13.2 patches set (v1) _gpv_xen_tools_4132_1=" ${_gx038} @@ -83,8 +61,8 @@ ${_gx053} ${_gx050} ${_gx051} ${_gx054} ${_gx056} " -# xen-tools-4.14.0 patches set -_gpv_xen_tools_4140_0=" +# xen-tools-4.14.1 patches set +_gpv_xen_tools_4141_0=" ${_gx039} ${_gx027} ${_gx028} ${_gx029} diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild deleted file mode 100644 index 64f27f213959..000000000000 --- a/app-emulation/xen-tools/xen-tools-4.13.2-r1.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='ncurses,xml,threads(+)' - -inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs - -MY_PV=${PV/_/-} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - REPO="xen.git" - EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" - S="${WORKDIR}/${REPO}" -else - KEYWORDS="amd64 ~arm ~arm64 x86" - UPSTREAM_VER=0 - SECURITY_VER=29 - # xen-tools's gentoo patches tarball - GENTOO_VER=21 - # xen-tools's gentoo patches version which apply to this specific ebuild - GENTOO_GPV=1 - # xen-tools ovmf's patches - OVMF_VER= - - SEABIOS_VER="1.12.1" - EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151" - EDK2_OPENSSL_VERSION="1_1_1g" - EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037" - EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d" - IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6" - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz" - [[ -n ${OVMF_VER} ]] && \ - OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz" - - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz - https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz - ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz ) - ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz - https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz - https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz - https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz - ${OVMF_PATCHSET_URI} ) - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" - - S="${WORKDIR}/xen-${MY_PV}" -fi - -DESCRIPTION="Xen tools including QEMU and xl" -HOMEPAGE="https://www.xenproject.org" -DOCS=( README ) - -LICENSE="GPL-2" -SLOT="0/$(ver_cut 1-2)" -# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make -# >=dev-lang/ocaml-4 stable -# Masked in profiles/eapi-5-files instead -IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ipxe? ( rombios ) - ovmf? ( hvm ) - pygrub? ( python ) - rombios? ( hvm ) - system-ipxe? ( rombios ) - ?? ( ipxe system-ipxe ) - ?? ( qemu system-qemu )" - -COMMON_DEPEND=" - sys-apps/pciutils - dev-libs/lzo:2 - dev-libs/glib:2 - dev-libs/yajl - dev-libs/libaio - dev-libs/libgcrypt:0 - sys-libs/zlib - ${PYTHON_DEPS} -" - -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-4.11 - $(python_gen_cond_dep ' - dev-python/lxml[${PYTHON_MULTI_USEDEP}] - pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] ) - ') - x86? ( sys-devel/dev86 - system-ipxe? ( sys-firmware/ipxe[qemu] ) - sys-power/iasl ) - api? ( dev-libs/libxml2 - net-misc/curl ) - - ovmf? ( - !arm? ( !arm64? ( dev-lang/nasm ) ) - $(python_gen_impl_dep sqlite) - ) - !amd64? ( >=sys-apps/dtc-1.4.0 ) - amd64? ( sys-power/iasl - system-seabios? ( sys-firmware/seabios ) - system-ipxe? ( sys-firmware/ipxe[qemu] ) - rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) - dev-lang/perl - app-misc/pax-utils - doc? ( - app-text/ghostscript-gpl - app-text/pandoc - $(python_gen_cond_dep ' - dev-python/markdown[${PYTHON_MULTI_USEDEP}] - ') - dev-texlive/texlive-latexextra - media-gfx/transfig - ) - hvm? ( x11-base/xorg-proto ) - qemu? ( - app-arch/snappy:= - x11-libs/pixman - sdl? ( - media-libs/libsdl[X] - media-libs/libsdl2[X] - ) - ) - system-qemu? ( app-emulation/qemu[xen] ) - ocaml? ( dev-ml/findlib - >=dev-lang/ocaml-4 ) - python? ( >=dev-lang/swig-4.0.0 )" - -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2[-minimal] - net-misc/bridge-utils - screen? ( - app-misc/screen - app-admin/logrotate - )" - -# hvmloader is used to bootstrap a fully virtualized kernel -# Approved by QA team in bug #144032 -QA_WX_LOAD=" - usr/libexec/xen/boot/hvmloader - usr/share/qemu-xen/qemu/hppa-firmware.img - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -QA_PREBUILT=" - usr/libexec/xen/bin/elf2dmp - usr/libexec/xen/bin/ivshmem-client - usr/libexec/xen/bin/ivshmem-server - usr/libexec/xen/bin/qemu-edid - usr/libexec/xen/bin/qemu-img - usr/libexec/xen/bin/qemu-io - usr/libexec/xen/bin/qemu-keymap - usr/libexec/xen/bin/qemu-nbd - usr/libexec/xen/bin/qemu-pr-helper - usr/libexec/xen/bin/qemu-system-i386 - usr/libexec/xen/bin/virtfs-proxy-helper - usr/libexec/xen/libexec/xen-bridge-helper - usr/share/qemu-xen/qemu/s390-ccw.img - usr/share/qemu-xen/qemu/s390-netboot.img - usr/share/qemu-xen/qemu/u-boot.e500 -" - -RESTRICT="test" - -pkg_setup() { - python_setup - export "CONFIG_LOMOUNT=y" - - #bug 522642, disable compile tools/tests - export "CONFIG_TESTS=n" - - if [[ -z ${XEN_TARGET_ARCH} ]] ; then - if use x86 && use amd64; then - die "Confusion! Both x86 and amd64 are set in your use flags!" - elif use x86; then - export XEN_TARGET_ARCH="x86_32" - elif use amd64 ; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi -} - -src_prepare() { - local i - - # Upstream's patchset - if [[ -n ${UPSTREAM_VER} ]]; then - einfo "Try to apply Xen Upstream patch set" - eapply "${WORKDIR}"/patches-upstream - fi - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - EPATCH_SUFFIX="patch" - EPATCH_FORCE="yes" - - source "${WORKDIR}"/patches-security/${PV}.conf || die - - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - - # apply qemu-xen/upstream patches - pushd "${S}"/tools/qemu-xen/ > /dev/null - for i in ${XEN_SECURITY_QEMUU}; do - eapply "${WORKDIR}"/patches-security/qemuu/$i - done - popd > /dev/null - - # apply qemu-traditional patches - pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null - for i in ${XEN_SECURITY_QEMUT}; do - eapply "${WORKDIR}"/patches-security/qemut/$i - done - popd > /dev/null - fi - - # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err - mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die - pushd tools/firmware/ > /dev/null - ln -s seabios-dir-remote seabios-dir || die - popd > /dev/null - - # Gentoo's patchset - if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then - einfo "Try to apply Gentoo specific patch set" - source "${FILESDIR}"/gentoo-patches.conf || die - _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV} - for i in ${!_gpv}; do - eapply "${WORKDIR}"/patches-gentoo/$i - done - fi - - # Ovmf's patchset - if use ovmf; then - if [[ -n ${OVMF_VER} ]];then - einfo "Try to apply Ovmf patch set" - pushd "${WORKDIR}"/edk2-*/ > /dev/null - eapply "${WORKDIR}"/patches-ovmf - popd > /dev/null - fi - mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die - rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die - mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die - cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die - cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die - fi - - # ipxe - if use ipxe; then - cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die - - # gcc 10 - cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die - echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die - fi - - mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die - - # Fix texi2html build error with new texi2html, qemu.doc.html - sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die - - use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die - sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \ - -i tools/firmware/Makefile || die - - # Drop .config, fixes to gcc-4.6 - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - # drop flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - unset CPPFLAGS - - if ! use pygrub; then - sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die - fi - - if ! use python; then - sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die - fi - - if ! use hvm; then - sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die - # Bug 351648 - elif ! use x86 && ! has x86 $(get_all_abis); then - mkdir -p "${WORKDIR}"/extra-headers/gnu || die - touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die - export CPATH="${WORKDIR}"/extra-headers - fi - - if use qemu; then - if use sdl; then - sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \ - tools/Makefile || die - else - sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \ - tools/qemu-xen-traditional/xen-setup || die - sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \ - tools/Makefile || die - fi - else - # Don't bother with qemu, only needed for fully virtualised guests - sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die - fi - - # Reset bash completion dir; Bug 472438 - sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \ - -i Config.mk || die - sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die - - # xencommons, Bug #492332, sed lighter weight than patching - sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \ - -i tools/hotplug/Linux/init.d/xencommons.in || die - - # fix bashishm - sed -e '/Usage/s/\$//g' \ - -i tools/hotplug/Linux/init.d/xendriverdomain.in || die - - # respect multilib, usr/lib/libcacard.so.0.0.0 - sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \ - -i tools/qemu-xen/configure || die - - #bug 518136, don't build 32bit exactuable for nomultilib profile - if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then - sed -i -e "/x86_emulator/d" tools/tests/Makefile || die - fi - - # uncomment lines in xl.conf - sed -e 's:^#autoballoon=:autoballoon=:' \ - -e 's:^#lockfile=:lockfile=:' \ - -e 's:^#vif.default.script=:vif.default.script=:' \ - -i tools/examples/xl.conf || die - - # disable capstone (Bug #673474) - sed -e "s:\$\$source/configure:\0 --disable-capstone:" \ - -i tools/Makefile || die - - # disable glusterfs - sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \ - -i tools/Makefile || die - - default -} - -src_configure() { - local myconf="--prefix=${PREFIX}/usr \ - --libdir=${PREFIX}/usr/$(get_libdir) \ - --libexecdir=${PREFIX}/usr/libexec \ - --localstatedir=${EPREFIX}/var \ - --disable-werror \ - --disable-xen \ - --enable-tools \ - --enable-docs \ - $(use_enable api xenapi) \ - $(use_enable ipxe) \ - $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \ - $(use_enable ocaml ocamltools) \ - $(use_enable ovmf) \ - $(use_enable pam) \ - $(use_enable rombios) \ - --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \ - " - - use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" - use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64" - use amd64 && myconf+=" $(use_enable qemu-traditional)" - tc-ld-disable-gold # Bug 669570 - econf ${myconf} -} - -src_compile() { - local myopt - use debug && myopt="${myopt} debug=y" - use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y" - - if test-flag-CC -fno-strict-overflow; then - append-flags -fno-strict-overflow - fi - - emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt} - - if use doc; then - emake -C docs build - else - emake -C docs man-pages - fi -} - -src_install() { - # Override auto-detection in the build system, bug #382573 - export INITD_DIR=/tmp/init.d - export CONFIG_LEAF_DIR=../tmp/default - - # Let the build system compile installed Python modules. - local PYTHONDONTWRITEBYTECODE - export PYTHONDONTWRITEBYTECODE - - emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \ - XEN_PYTHON_NATIVE_INSTALL=y install-tools - - # Created at runtime - rm -rv "${ED}/var/run" || die - - # Fix the remaining Python shebangs. - python_fix_shebang "${D}" - - # Remove RedHat-specific stuff - rm -rf "${D}"/tmp || die - - if use doc; then - emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs - dodoc -r docs/{pdf,txt} - else - emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032 - fi - dodoc ${DOCS[@]} - - newconfd "${FILESDIR}"/xendomains.confd xendomains - newconfd "${FILESDIR}"/xenstored.confd xenstored - newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled - newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains - newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored - newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled - newinitd "${FILESDIR}"/xencommons.initd xencommons - newconfd "${FILESDIR}"/xencommons.confd xencommons - newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev - newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev - newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog - - if use screen; then - cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die - cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die - keepdir /var/log/xen-consoles - fi - - # For -static-libs wrt Bug 384355 - if ! use static-libs; then - rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a - fi - - # for xendomains - keepdir /etc/xen/auto - - # Remove files failing QA AFTER emake installs them, avoiding seeking absent files - find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ - -o -name openbios-ppc -o -name palcode-clipper \) -delete || die - - keepdir /var/lib/xen/dump - keepdir /var/lib/xen/xenpaging - keepdir /var/lib/xenstored - keepdir /var/log/xen - - if use python; then - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py" - python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so" - fi - - python_optimize -} - -pkg_postinst() { - elog "Official Xen Guide and the offical wiki page:" - elog "https://wiki.gentoo.org/wiki/Xen" - elog "https://wiki.xen.org/wiki/Main_Page" - elog "" - elog "Recommended to utilise the xencommons script to config system at boot" - elog "Add by use of rc-update on completion of the install" - - if ! use hvm; then - echo - elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" - elog "support enable the hvm use flag." - elog "An x86 or amd64 system is required to build HVM support." - fi - - if use qemu; then - elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" - elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" - elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" - elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" - fi -} diff --git a/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild index 2193d83a91bb..bade7dc64537 100644 --- a/app-emulation/xen-tools/xen-tools-4.14.0-r5.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{6..9} ) PYTHON_REQ_USE='ncurses,xml,threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs @@ -17,8 +17,8 @@ if [[ $PV == *9999 ]]; then S="${WORKDIR}/${REPO}" else KEYWORDS="~amd64 ~arm ~arm64 ~x86" - UPSTREAM_VER=6 - SECURITY_VER=28 + UPSTREAM_VER= + SECURITY_VER= # xen-tools's gentoo patches tarball GENTOO_VER=22 # xen-tools's gentoo patches version which apply to this specific ebuild diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index 08ce3edab76e..d954195c4113 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,11 +1,8 @@ AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0 -DIST xen-4.13.2-upstream-patches-1.tar.xz 15832 BLAKE2B 4e20a1e2d575ed7e1d21f3b34ed0d8bf6e1405cb39cc5c6ffc099614ea833ac9794bfcfcdea0893fdf81b318f536017ac3a023ad096bc8a8c7390c01f1d513ed SHA512 48dda9dadec1e87fb7b6952636e73057f6e0a5501f9727d05ac636fd47747194501db709c8ffa7154e79b6b612a98b658a03bc083c5065ff851ac57f454b599e -DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae +DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3 -DIST xen-4.14.0-upstream-patches-6.tar.xz 119116 BLAKE2B e3a0f807182d32754c6ae2000324237117cfa66c4a43c27b583b6aef69a3889949779751b71a87b2538f679fb481e8a723433950c689f28a8c2e96278c1b0ddb SHA512 03b1fdc08e74756001fbb0de4e21297456f63615e6f63b8f360f8270ef85b0d50c3872be41cc26529ed0d91d82ffda2af53882b7c5233113f223a4ec813a0d5b -DIST xen-4.14.0.tar.gz 39950576 BLAKE2B db4c3e79cfdfb10260d0d14d9d28e8c8bd9bf23f42aee743acf8f560bf4cdb96a425c0df887c70f9755f62680be24bfbe0149e52a4cb843ae83090cd9d6afc71 SHA512 ebce47a2f754955d8517123d69f62006634d97620fbbe3784869a0667466e586a249f57ffaf7846d5bcb45d69377cde43354c82c233fbb5407e55653b9a33ac0 -EBUILD xen-4.13.2-r2.ebuild 4443 BLAKE2B 9b0e5d974cebef78d4752b62b652f7905ff7ef3f6e59c085a3a02c60b160c7eff1e907e7e8e49a02c4dca52d3b317007cadee89c2927c127d7b9ffd1d274b174 SHA512 8c35da3f78e3cb1b4dd3beb21376920eeb0a92b9c8fc92c736d75c94597a2abf77630bea20a48266477fbb9655be5c05f348d10b4a7c8c8c7344b3278a18fc23 -EBUILD xen-4.13.2-r3.ebuild 4443 BLAKE2B a31dd7322d601fe47f2f1780f0f5d3e0795de536a2f229543137cff8b2982d69a572c54a37f912870b18b638fa96805c07f635db8892246c5cdd39c29a904bd8 SHA512 1dd6d906b85e4a3e546a6ea4a6ba10270334bb095c1e4e265663ae4038c03fe6ec28ae2ba645109b5c97c23399e0889d1733d1d1aad4be16ac01c037472970d6 -EBUILD xen-4.14.0-r7.ebuild 4444 BLAKE2B e6742d24d02d217ac2b954d6191b6fa3c8ef10212e93d2a9d73178c32daf140b79708bdb8d854dfaf28067e39081b28a4443bd53d14362bd8ea2841b9abc68ba SHA512 2cce5027e9768faee0c6070eb48bd8daee57c0eadce7bb9eb01278e9ddb90115f0c6e861ec23a03928dca3fcf0e6ec6a5c92cfe7afba034df035cf0aef3635d5 +DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9 +EBUILD xen-4.13.2-r4.ebuild 4443 BLAKE2B 2df57309d69ec69f73e83715e1aaf0f3a273f2adfc756d87a0939b42d1c2c2688fcc755ffd5609a7281648ba9e3ba63114503d4647cc93111bd93c925f5b75f8 SHA512 8b121636cfa76c024b7dd92a0757714133502d143d42587cec19a39514356bd75a2d0b82cb4547ac7ec06370acda9dcd27991f09fd722a79d537aaf9fdaba16a +EBUILD xen-4.14.1.ebuild 4443 BLAKE2B b130fe3a6e22344350d4977a363da8830857425ffbf127293a41aa05855882b2ed8e6b834b23063d5676f948fccee58024369e537068a2a6e92ef086ca31bcd7 SHA512 f522dd225c3f66079229d513d94d79c66dae160dd05816d5e7fc6f5900f6d5c6257028d6067443bf85ae6856743f0ebbf29e402f95b050fbe8325b0319750e80 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248 diff --git a/app-emulation/xen/xen-4.13.2-r2.ebuild b/app-emulation/xen/xen-4.13.2-r2.ebuild deleted file mode 100644 index abce4bba283f..000000000000 --- a/app-emulation/xen/xen-4.13.2-r2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs - -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} - -if [[ $PV == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://xenbits.xen.org/xen.git" - SRC_URI="" -else - KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=1 - SECURITY_VER= - GENTOO_VER= - - [[ -n ${UPSTREAM_VER} ]] && \ - UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz - https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" - [[ -n ${SECURITY_VER} ]] && \ - SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz" - [[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz" - SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz - ${UPSTREAM_PATCHSET_URI} - ${SECURITY_PATCHSET_URI} - ${GENTOO_PATCHSET_URI}" -fi - -DESCRIPTION="The Xen virtual machine monitor" -HOMEPAGE="https://www.xenproject.org" -LICENSE="GPL-2" -SLOT="0" -IUSE="debug efi flask" - -DEPEND="${PYTHON_DEPS} - efi? ( >=sys-devel/binutils-2.22[multitarget] ) - !efi? ( >=sys-devel/binutils-2.22 )" -RDEPEND="" -PDEPEND="~app-emulation/xen-tools-${PV}" - -# no tests are available for the hypervisor -# prevent the silliness of /usr/lib/debug/usr/lib/debug files -# prevent stripping of the debug info from the /usr/lib/debug/xen-syms -RESTRICT="test splitdebug strip" - -# Approved by QA team in bug #144032 -QA_WX_LOAD="boot/xen-syms-${PV}" - -REQUIRED_USE="arm? ( debug )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - python-any-r1_pkg_setup - if [[ -z ${XEN_TARGET_ARCH} ]]; then - if use amd64; then - export XEN_TARGET_ARCH="x86_64" - elif use arm; then - export XEN_TARGET_ARCH="arm32" - elif use arm64; then - export XEN_TARGET_ARCH="arm64" - else - die "Unsupported architecture!" - fi - fi - - if use flask ; then - export "XSM_ENABLE=y" - export "FLASK_ENABLE=y" - fi -} - -src_prepare() { - # Upstream's patchset - [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream - - # Security patchset - if [[ -n ${SECURITY_VER} ]]; then - einfo "Try to apply Xen Security patch set" - # apply main xen patches - # Two parallel systems, both work side by side - # Over time they may concdense into one. This will suffice for now - source "${WORKDIR}"/patches-security/${PV}.conf - - local i - for i in ${XEN_SECURITY_MAIN}; do - eapply "${WORKDIR}"/patches-security/xen/$i - done - fi - - # Gentoo's patchset - [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - - eapply "${FILESDIR}"/${PN}-4.11-efi.patch - - # Drop .config - sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop" - - if use efi; then - export EFI_VENDOR="gentoo" - export EFI_MOUNTPOINT="/boot" - fi - - default -} - -src_configure() { - use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i" - - use debug && myopt="${myopt} debug=y" - - # remove flags - unset CFLAGS - unset LDFLAGS - unset ASFLAGS - - tc-ld-disable-gold # Bug 700374 -} - -src_compile() { - # Send raw LDFLAGS so that --as-needed works - emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt} -} - -src_install() { - local myopt - use debug && myopt="${myopt} debug=y" - - # The 'make install' doesn't 'mkdir -p' the subdirs - if use efi; then - mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die - fi - - emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install - - # make install likes to throw in some extra EFI bits if it built - use efi || rm -rf "${D}/usr/$(get_libdir)/efi" -} - -pkg_postinst() { - elog "Official Xen Guide:" - elog " https://wiki.gentoo.org/wiki/Xen" - - use efi && einfo "The efi executable is installed in /boot/efi/gentoo" - - elog "You can optionally block the installation of /boot/xen-syms by an entry" - elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK" - elog "e.g. echo ${msg} > /etc/portage/env/xen.conf" - - ewarn - ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause" - ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems" - ewarn "to work fine." - ewarn - ewarn "Add sched=credit to xen command line options to use the legacy scheduler." - ewarn - ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B" -} diff --git a/app-emulation/xen/xen-4.13.2-r3.ebuild b/app-emulation/xen/xen-4.13.2-r4.ebuild index 1688f9fe90ae..4c38268d9b14 100644 --- a/app-emulation/xen/xen-4.13.2-r3.ebuild +++ b/app-emulation/xen/xen-4.13.2-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then SRC_URI="" else KEYWORDS="amd64 ~arm -x86" - UPSTREAM_VER=2 + UPSTREAM_VER=3 SECURITY_VER= GENTOO_VER= diff --git a/app-emulation/xen/xen-4.14.0-r7.ebuild b/app-emulation/xen/xen-4.14.1.ebuild index a3eb52d4a09d..eab5d1a69759 100644 --- a/app-emulation/xen/xen-4.14.0-r7.ebuild +++ b/app-emulation/xen/xen-4.14.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs @@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then SRC_URI="" else KEYWORDS="~amd64 ~arm -x86" - UPSTREAM_VER=6 + UPSTREAM_VER= SECURITY_VER= GENTOO_VER= |