diff options
Diffstat (limited to 'app-emulation')
121 files changed, 837 insertions, 8562 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex bcbb54ff8cb2..bcc8c314fc0e 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest index 7951c53630c1..7735f5c00304 100644 --- a/app-emulation/cadvisor/Manifest +++ b/app-emulation/cadvisor/Manifest @@ -1,8 +1,5 @@ -AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429 AUX cadvisor.initd-r1 567 BLAKE2B 8cd59227cdc07047c6c62fbcf74ec942468b86881d9b149a44fb60a10d8ed2a07c0cc97d59a9acf6dabac55969a77a6c69305893a4dcc90d10df9f4b007186c6 SHA512 84124c91f718446473644f3ed9e82592b1dbf14aecbf13a0a31a58938df19f8f65a108e03d0f377866ddc9d68cba1cb6963c2e5b9c384e6f6df441b504384460 DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c -DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633 -DIST cadvisor-0.35.0.tar.gz 5268930 BLAKE2B 065619ee459062bb521e855ccfd576afe236863bdc203b65e53a7eb6aec7172b6b9bb1d4183667ed36c471becb09fd974d1e4f809cf614f4d0d03ea3b87c2f63 SHA512 9fdae170fd167e0b1a2b69112ff2ec081640a144490c04e364536cae71a90e2c2845857f35af81ec58d4addd3675fd86b045d1f1b99a3e281f6270ab5d2a70f3 DIST cadvisor-0.36.0.tar.gz 6182273 BLAKE2B 0406bd88c6595f23de06be1e63e7c0affda7f94a3bbbb1b9e390f2747fdd3ef3199622a5003b79ed083a0cd80e6c013d7776e18269044150dafb98341c54425b SHA512 2da8a2e81d33b97e6f7c5ba3982e51b6d87748b138345ff94eb7671df851f0a535ceeef61358b0ee43bc161a88becdb153065bd7ff8fc9d7c390a4629ad10f02 DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273 DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.zip 889396 BLAKE2B 37e1420148340c6d59d3bdc554c8d92ccce4dc145403915d067fe18966fa8baea5a3090714dc8d27c8c24831ca71213c11f1c719d0044647f887590a9b5bcc62 SHA512 f5d89d8eed8a58bfba541ab1102db390e6b4e7ce181f9d6e166c03685cedb1974169b298074bf8c5b2ac7c1e965e0e9794d379a9bb6537a3a11deab41fbec772 @@ -412,7 +409,5 @@ DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200117235808-5f6fbceb4c31.mod 164 BLAKE2B cd DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200117235808-5f6fbceb4c31.zip 139116 BLAKE2B 0de019e1229821d8c2c53df204e6f8f9c3b80f1b3fe5ca6ff7482dd8f684c2bec95bdbfcfe84b9fb54fe060687d4f0740759a24aaaac27dc8d4794a4157d01ff SHA512 a67bcdc90e4d5395a2ff1ec6030bbbbd105a7a8cc564abdef28fed07a3d7a53382ff06b36b10a59f717e52d3fd3b3a54e92ff98ccafb31096fc03f7d78ce3cdf DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200122174043-1e243dd1a584.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5 DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20200122174043-1e243dd1a584.zip 139668 BLAKE2B 503f321d47d7e30d85b1c6ef96cd136901e3a4d100cfad50382d2f88f312d0c525b134f0414abf3e03faa6ed86a665646746e848c2f55a8747f7fa90f0d9e4cc SHA512 631e2314df6041fc800bf34e10359894223f7500034d6a53ae578a117f05602708ae0030a312656a15147064ec8a17465f0c917ed400d4fc5b163e6ece89c764 -EBUILD cadvisor-0.34.0.ebuild 1119 BLAKE2B 6e6346ce9c4d8f5f7c46a11683a74b6efbc3479856633a50814ec2675a4ce71c3f0b102e7eb18da407d84b5e55b7c804bdb1fdc589cb20f066c80ce2b553df36 SHA512 0fedf5a3b41fd886e8d8c6f5ef779a3e32108d794c750302b0183634ab3cc33054b80fb25678ccc232645c4f9dc72249b413c2532868f3b9fcda5565d9c61bb6 -EBUILD cadvisor-0.35.0.ebuild 1142 BLAKE2B bf4fb604d8138610920e6d4870a5604c26b731b581dacf60ddfed470d1fb09d0689c9489b57c0b274694459b063bca8195c80045f82ed28fd8dfd80e5175d0ca SHA512 ceb1edc4f056a113c9696c5aae291bf8006d1de720d89988975d44a03b6f9b27eef8a43516042da5185ae2178e9004655b718bf38b63fd7ff8e2a789025a849d EBUILD cadvisor-0.36.0.ebuild 24922 BLAKE2B 320f81e18fdee811020bb305fab4f23bf45988adcd06444155f9ad3cd1a679ab627cbd9f3f115f4872cb240af0589faf8ba35cb30ec8be1457b486d785fa4043 SHA512 c91287a161734aa4e9315aba9eadde6400d8a0645d0d52cf2d6ff020763b04c0ff23226bffc6c49b04b247e7b17ee07995bae4da32ab00c606cac02f73010ce1 MISC metadata.xml 328 BLAKE2B 61bca93d2712241a0988c8b6b2da6859b4bd1e3dba6209d6628c4b69e00a565410ee8a46ea8132b3edf2269a8ab7b44083e59bb4f5d5568c52794ece55130316 SHA512 29a397dddc11fcff90776fb2d90356c162080b7b6ffa24633b7c89d9c0bbd208e5cc3aa77a89ffdd7f81c1f618124883be342566c6b6ab3bc92e443f4c39da09 diff --git a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild deleted file mode 100644 index 76ad3d58d03a..000000000000 --- a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN="github.com/google/cadvisor" - -inherit user golang-build golang-vcs-snapshot -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -COMMIT="24a6a52" -KEYWORDS="~amd64" - -DESCRIPTION="Analyzes resource usage and performance characteristics of running containers" -HOMEPAGE="https://github.com/google/cadvisor" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" -SLOT="0" -IUSE="" - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 /dev/null ${PN} -} - -src_prepare() { - sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die - sed -i -e "s/git describe.*/echo ${PV} )/"\ - -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\ - src/${EGO_PN}/build/build.sh || die - default -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME - pushd "src/${EGO_PN}" - GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build - popd || die -} - -src_install() { - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - dobin src/${EGO_PN}/${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-emulation/cadvisor/cadvisor-0.35.0.ebuild b/app-emulation/cadvisor/cadvisor-0.35.0.ebuild deleted file mode 100644 index 06fd94f5eb73..000000000000 --- a/app-emulation/cadvisor/cadvisor-0.35.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN="github.com/google/cadvisor" -COMMIT=49033161 -inherit golang-build golang-vcs-snapshot - -DESCRIPTION="Analyzes resource usage and performance characteristics of running containers" -HOMEPAGE="https://github.com/google/cadvisor" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 ISC MIT" -KEYWORDS="~amd64" -SLOT="0" - -COMMON_DEPEND="acct-group/cadvisor - acct-user/cadvisor" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" - -src_prepare() { - sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die - sed -i -e "s/git describe.*/echo ${PV} )/"\ - -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\ - src/${EGO_PN}/build/build.sh || die - default -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME - pushd "src/${EGO_PN}" - GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build - popd || die -} - -src_install() { - newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} - dobin src/${EGO_PN}/${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} -} diff --git a/app-emulation/cadvisor/files/cadvisor.initd b/app-emulation/cadvisor/files/cadvisor.initd deleted file mode 100644 index 19e36b2c81a5..000000000000 --- a/app-emulation/cadvisor/files/cadvisor.initd +++ /dev/null @@ -1,18 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2016-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="cAdvisor - Analyzes resource usage and performance characteristics of running containers" -pidfile=${pidfile:-"/run/${SVCNAME}.pid"} -user=${user:-${SVCNAME}} -group=${group:-${SVCNAME}} - -command="/usr/bin/cadvisor" -command_background="true" -start_stop_daemon_args="--user ${user} --group ${group} \ - --stdout /var/log/${SVCNAME}/${SVCNAME}.log \ - --stderr /var/log/${SVCNAME}/${SVCNAME}.log" - -depend() { - after net -} diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest index 4f13999c3cc1..38440d6a4a32 100644 --- a/app-emulation/crossover-bin/Manifest +++ b/app-emulation/crossover-bin/Manifest @@ -21,6 +21,7 @@ DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf2 DIST install-crossover-18.0.0.bin 206792916 BLAKE2B d1784ddd2dc568d2b6f1fe60b7fad149e6128e61d2315b2179f4d87b7d49bc0166851df3fb3e39b911bfbbba6366f8c98f63e47e18abb173a1129f11795454c7 SHA512 3ad7393714a43e7323ad6e81ea8f165df9253dfdfff20fc68f5091e77b288b86c3a3e11883732dc73ec5c89e500005b6451899b7e43fc4900c6bd40445739281 DIST install-crossover-18.1.0.bin 206784995 BLAKE2B 4e8ae8330373b505b2ed361e314bcdaf3564a0b846484d2708e64e94d3fe856c35e1d235fa474d4a079a8c0e88dade02bb1e93f0608d1ec99dca2a3a74f7865c SHA512 a679f0a801a6c2045a724ae5935745457689ae73ea4246daa1fc89a387f42c55ba0431db8fcdf48ba7253f616613adb51ca0402fe19480c0254f614fcb6884d8 DIST install-crossover-18.5.0.bin 224996342 BLAKE2B 300141bcf7c54ab1ce8229c6930df783454d450aee7b1be3cc3a193d1501320dee3e6fdfb3f37c56ae76e97f83f1b45838f1d5b7ed9793888a51df0203fe6dfe SHA512 ce44d7f79280adb36ecbcbdee3fa743dcca47b629fd1cb0ae2afbca56514df96e78e1103f09f5059aaf971a3a561f992158104ffa30bdd28925b14e58bd96855 +DIST install-crossover-19.0.1.bin 227349999 BLAKE2B 3f43c9ad1bc6e2ca77404eb69894b34fab04002c41b33551a01272201e15b5523049d7e7abe87c741f5913f18a45714ff2b83fda6c375dff68c7648d5e7c26bb SHA512 aedf2d3a071facf15a4aec9280a10c99229825fd3e5412e3949a0e1d85c235625a04d4453e7b8e182659f7500c864bab168c225f51cb0a839b08a96ef36596dd EBUILD crossover-bin-12.5.0-r2.ebuild 3874 BLAKE2B e8617f6fc4da436e9dfc5c4429210c0fc49879d1b50ce22325ad86259c859f3a4ef8bfe71fae6a73d3cc37a6981809d1fd0a98790f74aa1dc039c6f44b681485 SHA512 0fd826845aef6878a00be0733b778b18aaa4813125d6d652e4e508e8399bc2554c7d3ba2420e47b72aec3df8f0821c64260aed65d26923fc568441c2bfbe10ad EBUILD crossover-bin-12.5.1-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08 EBUILD crossover-bin-13.0.0-r2.ebuild 3875 BLAKE2B 5637ddbd6901928e3c70e247a527d7cb855f2ba890abfcf90d8f60a184e74ecae21a97b1b0a2759db25c56dd0c88edc5ebb73c03fa6dfa170ba4b6806b185178 SHA512 adc0fc54a645ae12f863b5b05b039730ee41d676a126089fca08e08f9eca7d1c6a832f17fdbfd0e22b14252606e76add5f5e125728b4c413447fc0a138f37e08 @@ -44,5 +45,6 @@ EBUILD crossover-bin-17.5.0.ebuild 4767 BLAKE2B 371b22e6af826da7eb67f12949aa4fbc EBUILD crossover-bin-17.5.1.ebuild 5315 BLAKE2B 55b93a199734ddc6ef85069d1889ac92202e39a8293bc4f018dd3ffe8c2ee94b5deb207fe81206f619c1fdc34be5a7be5d43b1759d7b351ae248bf3c61bd6851 SHA512 47e7090c299d605bf52c8ef2614e6ac7e6c50c667455e84ba74a904d160354d5d4017350bb6be717a3850d65319841e258e5b9a3c86927001f3996aaf7223ca9 EBUILD crossover-bin-18.0.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9 EBUILD crossover-bin-18.1.0.ebuild 5539 BLAKE2B 646d073e0c2b4cb0748ce536e74261ecb8fa6671935ddc91295c900f207883888e226017f1fed5c564d8591ba9769f8da5bbcb73074613de1402664a4470d856 SHA512 d091e40901b338ddda288a7780c00e0425717481115083f8e947d13a7badc8b5f178056defbc9b3c81a37cfde2f88bd07b5ec99bfd05261ce0dd44725fc2cbe9 -EBUILD crossover-bin-18.5.0-r1.ebuild 5656 BLAKE2B ee68dc397661ba5d7d4cdc516ab01a62e38fa8ddf85431ee90f4d7b80e247ad62225e5fdf0798ca6c1da7e8bfacaf3f46a95a2c8d0a9d0244eff61f36c620b0f SHA512 dfd44614a23ccf3ce360361a07e3de32aedbb03cf5756cee81c4c07569d66a146ed7cf4b23df1821726326fe2cd6d77605370bbcd9b29bf24a3be632eafb4cd3 -MISC metadata.xml 364 BLAKE2B 9978c9532a9bd1adcfa22f00db6a8fd80fda155a6adc69ee0c0693093e7a7ac0a0eba1ef5a0657e6dff5aabdb7e6259c883aceffbba89b495a25b0d3e26e5174 SHA512 68f361d337b167c549eafab8e45dcb33548ac67a206ead2f7118330a77888c6e2ba4dbe7755ca23c81a5e619458f25359e3f2d8eee4f6d0e359b5c3a28475096 +EBUILD crossover-bin-18.5.0-r1.ebuild 5800 BLAKE2B ff3272e3f8c8054b57c3c88a6ec94580d3e5d539d2035fbca88858f16db866b9eaaaf620cab2c7350e9be5c2996aff18035b018be40c5e4e29ad5c172cc42108 SHA512 daf4a588a52fe2ff28b3aa510aacc533f1b7be47ea22f489ba95be16b82e829ccb4356c38a3f0cc9f74a0bb79653929f34c15dd4b825b1f7d7acdb35b3c2d3cb +EBUILD crossover-bin-19.0.1-r1.ebuild 7728 BLAKE2B aaf5ffbc0e41f9e4bdb6fc329223cd8c0f78abc012a1ba163fb09096a875c7634859fe563dcccd33f68315dc8c76d048854a0aa913a4ee42a114fb5dc4177075 SHA512 11fa2f78352abac1ddcc91952e73c91fa427fe2ccf72dd601a66afe1dd4e42e8766df3cbc0b64e36a0911f2be152663d3785df88e101fe18b15e13e7af1234ab +MISC metadata.xml 570 BLAKE2B 3939d88434eae718567a9a63f3eeb936c601e75543c0e35231e3b7035e50c2a259338c115ac7fe905e9709903c2fe3332d0bf0cf8fd69da5b08a685ec8950cce SHA512 485431a76b4622cdfb7c7c61c02b2d71783ba9866e03d3c8a92c092c81dbd9b1f32bb27b2ff6a152bdafa51b2e32da0fa496a3d79f2a8d9a64ee5237fac9aa54 diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild index e103a45516a4..ccf4360c42cf 100644 --- a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crosso LICENSE="CROSSOVER-3" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms ldap +mp3 +nls +openal +opencl +opengl +pcap +png scanner +ssl +v4l +vulkan" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="bindist test" @@ -52,7 +52,6 @@ RDEPEND="${DEPEND} >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}] dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] ') - dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) @@ -70,13 +69,17 @@ RDEPEND="${DEPEND} virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) - ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) + dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] + media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild new file mode 100644 index 000000000000..e3e7f205d8a6 --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support" +HOMEPAGE="https://www.codeweavers.com/products/" +SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-3" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan" +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +RESTRICT="bindist test" + +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED=" + opt/cxoffice/lib/.* + opt/cxoffice/lib64/.* + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/wineserver32 + opt/cxoffice/bin/wineserver64 + opt/cxoffice/bin/wine64-preloader + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxdiag64 + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + opt/cxoffice/bin/wineloader64 +" +QA_TEXTRELS=" + opt/cxoffice/lib/wine/* + opt/cxoffice/lib/libwine.so* +" + +S="${WORKDIR}" + +DEPEND="" +BDEPEND="${PYTHON_DEPS} + app-arch/unzip + dev-lang/perl + dev-util/bbe +" + +RDEPEND="${DEPEND} + ${PYTHON_DEPS} + !prefix? ( sys-libs/glibc ) + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + capi? ( net-libs/libcapi[abi_x86_32(-)] ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg:0[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:2 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + gstreamer? ( + media-libs/gstreamer:1.0[abi_x86_32(-)] + jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] ) + media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)] + ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opencl? ( virtual/opencl[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) + dev-libs/gobject-introspection + dev-util/desktop-file-utils + media-libs/alsa-lib[abi_x86_32(-)] + media-libs/freetype:2[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-),osmesa?] + media-libs/tiff:0[abi_x86_32(-)] + sys-auth/nss-mdns[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/ncurses-compat:5[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXcursor[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/pango[introspection] +" + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} into your DISTDIR directory" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + default + + sed -i \ + -e "s:xdg_install_icons(:&\"${ED}\".:" \ + -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \ + -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \ + "${S}/lib/perl/CXMenuXDG.pm" + + # Remove unnecessary files, license.txt file kept as it's used by + # multiple files (apart of the menu to show the license) + rm -r guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym ../cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + #cp -r ./* "${ED}/opt/cxoffice" \ + find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \ + || die "Could not install into ${ED}/opt/cxoffice" + + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + dodir /etc/env.d + echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die + + # Konqueror in its infinite wisdom decides to try opening things for + # writing, which are sandbox violations. This breaks the install process if + # it is installed, so we ninja edit it to false so it so doesn't run. + sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ + || die "Could not apply workaround for konqueror" + + # Install menus + # XXX: locate_gui.sh automatically detects *-application-merged directories + # This means what we install will vary depending on the contents of + # /etc/xdg, which is a QA violation. It is not clear how to resolve this. + XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \ + "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \ + || die "Could not install menus" + + # Revert ninja edit + sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \ + || die "Could not apply workaround for konqueror" + + rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \ + || die "Could not remove uninstall menus" + sed -i \ + -e "s:\"${ED}\".::" \ + -e "s:${ED}::" \ + "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \ + || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" + sed -i -e "s:${ED}:/:" \ + "${ED}/usr/share/applications/"*"CrossOver.desktop" \ + || die "Could not fix paths of *.desktop files" + + # Workaround missing libs + # https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658 + if use gphoto2; then + bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die + mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die + bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die + mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die + fperms a+x "/opt/cxoffice/bin/cxdiag" + fi + # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900 + if use pcap; then + dosym "../../../usr/lib64/libpcap.so.1.9.1" "/opt/cxoffice/lib64/libpcap.so.0.8" + dosym "../../../usr/lib32/libpcap.so.1.9.1" "/opt/cxoffice/lib/libpcap.so.0.8" + fi +} + +pkg_postinst() { + einfo "${P} is open source software with the exception of the GUI." + einfo "Source code can be obtained from:" + einfo + einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz" + + # The check done by /opt/cxoffice/bin/cxdiag is far superior to this. + # However, we do this check because I noticed that we could end up with a + # system that doesn't have a working OpenCL according to cxdiag, yet the + # dependencies have been installed. This is a defensive measure to reduce + # user frustration. A more robust check might be worthwhile. + if use opencl; then + local b32=false + local b64=false + if [[ ! -e "${EROOT}/usr/lib32/libOpenCL.so.1" ]]; then + b32=true + ewarn "32-bit libOpenCL.so.1 missing." + fi + + if use amd64 && [[ ! -e "${EROOT}/usr/lib64/libOpenCL.so.1" ]]; then + b64=true + ewarn "64-bit libOpenCL.so.1 missing." + fi + + if $b32 || $b64; then + ewarn + ewarn "Set OpenCL via eselect opencl to avoid problems" + fi + fi +} diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml index fadaa124e17a..7be1d14b856a 100644 --- a/app-emulation/crossover-bin/metadata.xml +++ b/app-emulation/crossover-bin/metadata.xml @@ -7,6 +7,9 @@ </maintainer> <use> <flag name="capi">Enable ISDN support via CAPI</flag> + <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag> <flag name="opencl">Enable OpenCL support</flag> + <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> + <flag name="vulkan">Enable Vulkan drivers</flag> </use> </pkgmetadata> diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index 170d9276dbf2..3fb0943c3667 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -1,4 +1,6 @@ DIST diskimage-builder-2.35.0.tar.gz 439947 BLAKE2B 9b148948caef031f44992aaa2b0463b6cc9390b0591fdfe6e82d8258becda61eb5aa0d87ae91ed73523057ae357dcf327d7ca9d8d6a1b66da7f2d535d6c32dc1 SHA512 c5ad15c7a793a6c4b17e09fb119ad1444273f930741ae68491ce3a95f416cf8bb76ed0f6df4e34e03359355426c9189f2f5a8b730cb9ffd027a0bbd676f62310 +DIST diskimage-builder-2.36.0.tar.gz 441509 BLAKE2B 4f8ec1686df8438c53eb088e52b954d0b84c8f327108599970f987db8de0f5ea7491e123c5f41fa9ff058d8f9d30238a533357b01e1cb671dd1fb3eb96ad28cb SHA512 f3fc13195742b25b8cca72d8b5630900d77f5af69dd9d153c44875e9e8f8f27393a8478a4adcdc05ea9d5b73b742e066edb5ab636bfd8d88c404c8f0fe33f1e7 EBUILD diskimage-builder-2.35.0.ebuild 1129 BLAKE2B 660fdba0c75e9f9b71dd1b8edc7f979e8a8a055c78078bf10ce7fb145070a74a6fc88844d765fac5f2847b6f797601b9d00c84827e80f62329359fdf7fdb859d SHA512 8e40801a1da5446b1b16c5712d089def56cbf6c25ca74dd64c287fe9157abe399ac6cec752508aa9e9b8651492e39bdf9946d052d07636b1f1bc03abe18e1f23 +EBUILD diskimage-builder-2.36.0.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b EBUILD diskimage-builder-9999.ebuild 1131 BLAKE2B d077e0bcc6df338cfbab02a90bf1cada112848619de1a660afb0e79d282d1698e6ab39acb47dffb5b8582ac2cd465b63b60febbff791d84f3cdb2c015f194cf5 SHA512 ab2e56b8e7068487ac60422a81b0ba60a59b8bb30e20108a82d1bb809d3ed6987ae0226632e91a7eb3b30d92145792858f0d6b7cd4eaf8fa15caf6d863bfeb0b MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277 diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild new file mode 100644 index 000000000000..092a05de7652 --- /dev/null +++ b/app-emulation/diskimage-builder/diskimage-builder-2.36.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +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} + dev-python/setuptools[${PYTHON_USEDEP}]" +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-swarm/Manifest b/app-emulation/docker-swarm/Manifest index 3532201e0275..8af6293189d2 100644 --- a/app-emulation/docker-swarm/Manifest +++ b/app-emulation/docker-swarm/Manifest @@ -1,7 +1,3 @@ -DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3 SHA512 2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992 -DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565 SHA512 76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c -DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8 -DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620 -DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240 -EBUILD docker-swarm-1.2.5.ebuild 2170 BLAKE2B 5f72fefbe686c03f7f55b2b3ba8776f5f010a728004ff957fb36f6ebcbbe243f036fd04cae8f6c6d34b8c96e1f7f3babe9018b5816602a748eae29d35a063c44 SHA512 3a3fbc32ab43fec5e3443022280ff7765d396ec1d06814f66be3eb446f1761b245aa06ee02fe0193b6728719c8fa7908b30c17e85290feab75f27761eb9bfd5f +DIST docker-swarm-1.2.9.tar.gz 1532493 BLAKE2B 243a3cb6d2e9f719d81947429c6616e93cf1b08187685922ad5daf732e61db12bd626fa26f30174af7e779c8ba45ecce7d2cfb33835ef985bdd57657e30e2228 SHA512 cc0e0e27d0ed4845abd99d1554630cc8e2ab0645d40a76358a83b2ea6d1bc5287dbf5d1aefdd2eb4302aeef3894725e75cae3f5da2353b045492a4357631daa2 +EBUILD docker-swarm-1.2.9.ebuild 1785 BLAKE2B 33249b9b898394ca4abbef4b7391ed75a9dacb691692c1cfae076f67e408df556c7e62788949ac03e457717208eea7a3cd413438bbf9dbfd94c7a517d7f076fb SHA512 69be32a5e547703cdcf9e9e7886339faad7fffd31a530c95c3e9204db915864278b5e37d82d777e35203e4ea0ad1f8fcb051d8615ecc3e822215b7fa74961935 MISC metadata.xml 303 BLAKE2B 876c526defdc7c039b7923f9860e3fef8bfc3c835e4cc8a50e54ae3ae535c53a27fea39f17a3fbe46939a330e16e9534ebd6ec64d3141075694c4010bb858ef4 SHA512 b724e0dbde2212d3071b201aca8572059e0756f3be2a056097c84ea802ae4365a9682767725a02e3333f5f5cbd31f8e30a0a2b54b3e32619d75fbaa8400a9c22 diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild deleted file mode 100644 index 95e2cbea5ca8..000000000000 --- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KEYWORDS="~amd64" -EGO_PN=github.com/docker/${PN##*-}/... -SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz - https://github.com/gemnasium/logrus-airbrake-hook/archive/v2.1.1.tar.gz -> logrus-airbrake-hook-2.1.1.tar.gz - https://github.com/airbrake/gobrake/archive/v2.0.8.tar.gz -> gobrake-2.0.8.tar.gz - https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz" -DESCRIPTION="A Docker-native clustering system" -HOMEPAGE="https://docs.docker.com/swarm" -LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2" -SLOT="0" -IUSE="" -RESTRICT="test" -DEPEND=">=dev-lang/go-1.6:= - !!<app-admin/consul-0.6.3-r1" -RDEPEND="" - -get_archive_go_package() { - local archive=${1} uri x - for x in ${SRC_URI}; do - if [[ ${x} == http* ]]; then - uri=${x} - elif [[ ${x} == ${archive} ]]; then - break - fi - done - uri=${uri#https://} - uri=${uri%/archive/*} - case ${uri} in - ${EGO_PN%/*}*) - echo "${EGO_PN%/*}|swarm-*" - ;; - github.com/gemnasium/logrus-airbrake-hook) - echo "gopkg.in/gemnasium/logrus-airbrake-hook.v2|logrus-airbrake-hook-*" - ;; - github.com/airbrake/gobrake) - echo "gopkg.in/airbrake/gobrake.v2|gobrake-*" - ;; - *) - echo "${uri}|${uri##*/}-*" - ;; - esac -} - -unpack_go_packages() { - local go_package x - # Unpack packages to appropriate locations for GOPATH - for x in ${A}; do - unpack ${x} - if [[ ${x} == *.tar.gz ]]; then - go_package=$(get_archive_go_package ${x}) - x=${go_package#*|} - go_package=${go_package%|*} - mkdir -p src/${go_package%/*} - mv ${x} src/${go_package} || die - fi - done -} - -src_unpack() { - mkdir "${S}" || die - cd "${S}" || die - unpack_go_packages -} - -src_compile() { - GOPATH="${S}" GOBIN="${S}/bin" \ - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - [[ -x ${S}/bin/${PN#docker-} ]] || die -} - -src_install() { - dobin "${S}/bin/${PN#docker-}" - dosym swarm /usr/bin/docker-swarm - cd "${S}/src/${EGO_PN%/*}" || die - dodoc CHANGELOG.md CONTRIBUTING.md logo.png README.md ROADMAP.md -} diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild new file mode 100644 index 000000000000..5ca267108edf --- /dev/null +++ b/app-emulation/docker-swarm/docker-swarm-1.2.9.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module + +KEYWORDS="~amd64" +EGO_PN=github.com/docker/swarm +EGIT_COMMIT="527a849cc6b8297690f478905083fc77951da2a7" +MY_PN=classicswarm +SRC_URI="https://github.com/docker/classicswarm/archive/v${PV}.tar.gz -> ${P}.tar.gz" +DESCRIPTION="Swarm Classic: a container clustering system" +HOMEPAGE="https://docs.docker.com/swarm" +LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2" +SLOT="0" +IUSE="" +RESTRICT="test" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + # It would require internet access to run `go mod vendor`, so + # generate approximate go.mod and vendor/modules.txt from the + # content of vendor.conf. Use a dummy vendor_version that is + # good enough for go to recognize as a valid version. + rm -f go.mod vendor/modules.txt || die + local x vendor_version=v1.0.0 + printf -- 'module %s\n' "${EGO_PN}" >> go.mod || die + printf -- 'go 1.14\n' >> go.mod || die + printf -- 'require (\n' >> go.mod || die + while read -r x; do + printf -- '\t%s %s\n' "${x}" "${vendor_version}" >> go.mod || die + printf -- '# %s %s\n' "${x}" "${vendor_version}" >> vendor/modules.txt || die + printf -- '## explicit\n' >> vendor/modules.txt || die + printf -- '%s\n' "${x}" >> vendor/modules.txt || die + done < <(grep -Eo "^[^#[:space:]]+" vendor.conf) + printf -- ')\n' >> go.mod || die + default +} + +src_compile() { + GOBIN="${S}/bin" \ + go install -v -work -x -mod=vendor -x \ + -ldflags "-w -X github.com/docker/swarm/version.GITCOMMIT=${EGIT_COMMIT} \ + -X github.com/docker/swarm/version.BUILDTIME=$(date -u +%FT%T%z)" \ + ./... || die +} + +src_install() { + dobin bin/swarm + dosym swarm /usr/bin/docker-swarm + dodoc CHANGELOG.md CONTRIBUTING.md logo.png README.md +} diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest index eb7e024bb037..61cad95fa022 100644 --- a/app-emulation/free42/Manifest +++ b/app-emulation/free42/Manifest @@ -7,8 +7,10 @@ DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62 DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69 DIST free42-nologo-2.5.16.tgz 7412652 BLAKE2B bdea95adca140eecbb192706a5e611c1ad5d248b47aa609ac2733eb018ea74e7661a1797acf9458aa07b6015df7376b3ef329685cff984d364c2f5e26f7d213b SHA512 5adfe5ce09e3aecae7f05d3880234eb903eb48b36ee10e88be87a8941752323f97067b97cb85699fc03591fc355024eb6cd621f64c31e6e5c6dd4d5027f1ba34 DIST free42-nologo-2.5.17.tgz 7412893 BLAKE2B ce8a06d290d4fcc12fd9b98c9bb80e12b3dc0a8d53b87cba874bce5798812d667c9e61ac4d990ace9828b10bf223adb1e32274ca11837ec50b4b0559fe8d92ac SHA512 64efdb93a33780095360eb987ca5fa192336b285dcf785a268db59fa4aa8cf2c8ce91b8242c9b4d5efa9c4556f5d688894f60056117e1c0774147894e59d32c9 +DIST free42-nologo-2.5.18.tgz 7413195 BLAKE2B c3d7d92c2f9b527fb6932f46644cb306217ab103bde1ecfd52a2659a1a71eaef199abeda8b24977e338757bfd57c824c31bc3bf9aa396e3372629b04737e6232 SHA512 3543d0a0cc4dff9c96c1121f221dded40f2574fffbd4747ef179b0d5cf75a003f49bc548df554fb46504af787d9d2fdb434c23a420f4b3592c838f4d00ac7140 EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5 EBUILD free42-2.5.14.ebuild 990 BLAKE2B f118d313e87f6f89e1b78e2af1eef073ea4709533da835213771886835411f59eadb99c10e2d45f62b72357713a0ece52ba9d1918656c0a75bba91b249d815bb SHA512 e6ab94244995e737f6d2286784ffe1fbbf948036a62066a448c5d84d1ffc3d21a714658d207720699fd6b2352a97c6deab8c2a157e32ea3c7a3d1b247753ba36 EBUILD free42-2.5.16.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f EBUILD free42-2.5.17.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f +EBUILD free42-2.5.18.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f MISC metadata.xml 525 BLAKE2B 19dca8c4cbe1777e905b4d4e6a410e08f6e22044428bc860534e98fbc31ab6b1469eaabd0e673c1b1229079871dbdbae267c01c211bcc85952ce0d79cbe61a22 SHA512 2bfe3994ec23d46f9cde4cf7dd66be9842315f2b104479114b3190edf7b09f0bbc5094c61eebe45b1a5330bf530ecb8505ccdff68b343a0bae048353b6efc24c diff --git a/app-emulation/free42/free42-2.5.18.ebuild b/app-emulation/free42/free42-2.5.18.ebuild new file mode 100644 index 000000000000..bd3148a0b387 --- /dev/null +++ b/app-emulation/free42/free42-2.5.18.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 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/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest index d59e75a9edc5..3a72e3ff4a65 100644 --- a/app-emulation/fs-uae-launcher/Manifest +++ b/app-emulation/fs-uae-launcher/Manifest @@ -1,4 +1,4 @@ AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0 -DIST fs-uae-launcher-3.0.3.tar.gz 9633064 BLAKE2B e5f80762407d95a64611121aaf936efaa915bdaef85a87e20998c0349f3f9c9b0640de0a9122c57b957ef031b15461012b5a8aecf13147d987b5db647b26e983 SHA512 dcb88af8e6f791dba9a48aa6fa706dd99288f1fe4b44250cc9c55342eee943c52f94c53b502fe8d570cc259f54583f345ed430e0e3a9878bd2a966ade4789b3c -EBUILD fs-uae-launcher-3.0.3.ebuild 2081 BLAKE2B d7abd9b9fbfd6fc116a45191184ce5fc64119b1e9aaab0d68a76dd7a10c245267d1f60d7f5b198cf8c3e34df67a07d3c7a341c0197bf993546f72bb4eb7dac89 SHA512 d964253b8e0ead001167d1e3f5e403475f7dbe06af7ffa05760a926d52ca68f52b35a0ae7defbf2c59ec10f50179c944b4de0338d3c238036fa9e24e14549123 +DIST fs-uae-launcher-3.0.5.tar.gz 9633819 BLAKE2B 8ce627302244bbd7d174f28c0dad345699942429c1109a7408c88412f6bb0e3e5d765e6c51abf2b95837a83261023b4f9c58d65892e58043889be8dc5e4cb759 SHA512 1a6700c56a14edce86ffbefee7494117af067da8b1dbc22937a36641ccb90927a3bbb011d15a891388bf08378aa623e00a2d45dbc49e822a5a569e110843add5 +EBUILD fs-uae-launcher-3.0.5.ebuild 2081 BLAKE2B d7abd9b9fbfd6fc116a45191184ce5fc64119b1e9aaab0d68a76dd7a10c245267d1f60d7f5b198cf8c3e34df67a07d3c7a341c0197bf993546f72bb4eb7dac89 SHA512 d964253b8e0ead001167d1e3f5e403475f7dbe06af7ffa05760a926d52ca68f52b35a0ae7defbf2c59ec10f50179c944b4de0338d3c238036fa9e24e14549123 MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3 diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild index 14013d591da6..14013d591da6 100644 --- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.3.ebuild +++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest index 5f22b9c4cdec..7dd2c690d879 100644 --- a/app-emulation/fs-uae/Manifest +++ b/app-emulation/fs-uae/Manifest @@ -1,5 +1,5 @@ AUX fs-uae-3.0.0-Xatom.h.patch 669 BLAKE2B 3463b8f19551b8ea3d634bc75f9de2fb77685af9c24e1fba555991d1d094f4d75be048e4d9a7852bfd8882b1e9826f174550bc3953e3ec636193aaa647462d12 SHA512 af86c772049d8ff5eef36c8988888891ea60a68e929d752c8f1c9e325af584175f14496a2099654381bb33a3adecb913991e129fee05524ecad4a166228dbd68 AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7 -DIST fs-uae-3.0.3.tar.gz 4844072 BLAKE2B 7e072abc11de1d7e174e3af9203d35941305f4bd5df9e11c5a94ada26c81c52912b1edee25e6ad3fa9d114dcb888d421fcb55def3a83931cab792650f5acfe9d SHA512 dce5f4b7e769902d334b48a5d5ff50cd152f48c8e50d5089a11abfe1a405e574eec460842b0bd74540375b80e65faca58b223cf6b03da6f84e326433f52f7c98 -EBUILD fs-uae-3.0.3.ebuild 2438 BLAKE2B 85370875f1b35d6099e1b9d910ae959bd43872294c682acd678407fe9eb1d214dde93659c7307a991c8f762ae86e079261775f31dd1ba3a409038241076945dd SHA512 697d2f8c6eb21db06ee10de11df1c1ab785f6c8ece259f6fcaac2928ec408c748df32362f3d5a304c3fef4a871d0c34cfb749bc9b0bde574c78b276abd9f6d01 +DIST fs-uae-3.0.5.tar.gz 4819884 BLAKE2B 0a82e0635ed02c1b4f04610555370c80ea12a870a73fd00cc98adefcefada2deed293c437202af34fc98e2f695fe1b08df918eca71b504e5b94e5ab3a099d9ed SHA512 b34ffb818040c7bf67022f26e1dbc9ebf06742a354212f2b0d2aa6b8e04c60807893a16ff965c819395f4c3fb3c43c35b38dce848b86fa046a211e12414385c7 +EBUILD fs-uae-3.0.5.ebuild 2267 BLAKE2B d6f1d480b28519bfc0849c19af61fd6b8cf4bd58bc8c17f1aad424fb1f75bdf72d8692c5c96eece134e92080abb332e3027a57611a42c85b9c36b4fbc93bd14f SHA512 925f9c2c629e97fe785e40f8c2992bf73434656cc00332220be0b3e1015e9dd973e926cbcf7b0e94fb9f42c724377221feef6dc15bab62d42d2cc8bcceb080b5 MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745 diff --git a/app-emulation/fs-uae/fs-uae-3.0.3.ebuild b/app-emulation/fs-uae/fs-uae-3.0.5.ebuild index a33c9af89fae..3cf31cf10ce0 100644 --- a/app-emulation/fs-uae/fs-uae-3.0.3.ebuild +++ b/app-emulation/fs-uae/fs-uae-3.0.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools xdg-utils +inherit autotools xdg DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE" HOMEPAGE="https://fs-uae.net/" @@ -105,15 +105,6 @@ src_install() { } pkg_postinst() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update - + xdg_pkg_postinst elog "Install app-emulation/fs-uae-launcher for a better graphical interface." } - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index 368bb2d1db43..fa168ffe880d 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -18,6 +18,9 @@ AUX ganeti-2.15-python-mock.patch 869 BLAKE2B 0be8ccb3c193cb363a71175022f2c31554 AUX ganeti-2.15-respect-HFLAGS.patch 332 BLAKE2B 360b7473870d9e803aa958f58ddad8e5de1e5c33f6d669014ebd71fc9e3b96608987ea3e7357e26782a3b9fcd62fb7b84b9024e8c68c1db0067fc92c8dc45c6a SHA512 f9d223a072ca7c842ca688b9d7ab6ab2d514647c9346d01fed4f8c5e1111e1531a0a16cfa2f6b1600a8e72cba06abc7d81f0789f1c68c48991c260b8d6a88f94 AUX ganeti-2.15-use-balloon-device.patch 711 BLAKE2B 23eb3434a0a24905fb3fdc49e129bdb6d044f2ee0b72bc9ec1994e355fa4df662b04194c20829f9afbdd93635bfd34c8c0a3a6bd32d64052a875dfd38bfb48f6 SHA512 e3f90d71dc595de554ead6ec21a79404b6a1098f3157fb3c6bcb95e8f27044c78451531e5e38ffc04b19e26ccd89ff14672d35b6a5e61c180e43fe95425d0794 AUX ganeti-2.15.2-bdev_py.patch 601 BLAKE2B 95ee87cf14344a5fdb224e8972ac64431beed8b7d90d08e615d4012d11d23c6df55a8c6bde1d217e86b926bd5d2a939ccabb81a0ed9080b8e9e2b110d4b783fa SHA512 b8c4ab1d67c8b1a0ef4b9581776b5f70178f501d476c3b1a3891a7d4633fd0146b2ac3f95e2a19584e7cc3422c67ef1169a65a57498ccd5d5c18b5196060201f +AUX ganeti-2.15.2-check-man-warnings.patch 612 BLAKE2B c2044184c048466bd8a1b7a92ccfb940728f7cbe26a218b386681b6711cf07c60df7f3bd610184dedebfca63050287aeab7acf2e3630bfff990d2bfc5692a596 SHA512 9f43e20f2fd14a066920cba8f99392710b0eb074cec60c5d940fb30256b772f2ca21d301cec2d6feaacebfe71e16b4df4f8c959c520cdd9d16e9dc6020dbe31c +AUX ganeti-2.15.2-ftbfs-sphinx-warning.patch 2029 BLAKE2B 129bd181ae44599ac362efc79caf0617b2037995d063236eed88e0f0925ae2362205652d41fb12d6a774069e5cd2c0bb292c58bf69f8a546d57d61daed3f0e95 SHA512 510c60e8bbc3f4e27bf17c109611d32a0c3baf21e7c167dd228e7a185524d7955b534687207e74b7c3785af314e6382dd8718f8bab2be58ac2a343e82cb15c52 +AUX ganeti-2.15.2-pyopenssl.patch 948 BLAKE2B 72a7df325e5bdc1b1de56c7bacb0b0443c2e13552616d72b47a9ce1d6559a04c4ff65dee966a5424b6584fd99670061cab291b07f111aac2615138ed4166e4a7 SHA512 d7a843f12a723750228ac5b06331277a2bf263e461f5b74c0c37e7e91ac4021b036ad61aa19e3896310020db848bbffea234d6752f16afaa2a56bcecc18d642d AUX ganeti-2.15.2-remove-sandbox-failing-tests.patch 2641 BLAKE2B ecf41445e52160a754fb9a433fad59141ae0058ed5a86d9cd0981b7ee952015528b85467b77226d70f4cd1847dbc813efbd8198e6424b1405835ea256e983448 SHA512 51e8f10a8a20100dbe290023d3cfd9d585052f441d79daeb18188940977f19401ffe46924df88118b662a26b2423ca119968e8de9c8664cde531b9d7ea23af93 AUX ganeti-2.16-kvmd-run-as-daemon-user.patch 1257 BLAKE2B 43766f2cf5fd18ca23ed4072258a3973c343dd92fbfcba51e62b3a7533b720092042a8bbc2f371cfab515085c54d349eecbd13f044cd18e3ee99c3869e848333 SHA512 c913ea0ba2af8d73342f105990234b4cfe4060a41cee1530d3dfe828a3e048d5c7cb473de22094330ab3efe9d2ade64bc15d98585a56d1d0f10e0b13b95485a5 AUX ganeti-2.16-noded-must-run-as-root.patch 917 BLAKE2B 102d39e0483e71caef350ea2d56d709a23ac3092dba6e0dfc8972abb0b08080e7ffcb2001f42cd6e9c5277b8f225ab9e7c87b800f85e8eeee3a5159efc110d74 SHA512 69c51f88d3f5628fa17852425d8dc18e98a1a1d6b51ef7219c88efa29b01909bffec2df43dc40801bf7332d3252834b3034a8db56a2d9f283b62e2295c156746 @@ -35,7 +38,7 @@ DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfd DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af -EBUILD ganeti-2.15.2-r9.ebuild 12220 BLAKE2B 9afceba7d515ed36d740f255aefa6424a8666e9bf61b608d3e0c79848500a95d1d098c78e8a9c12a6a260720a9ff039c86cfc9bcc0b17901d80280f8a9eb6678 SHA512 39c34793b7e13b67821ce9c7eaf50e35decf395898dc93318bd97e326ddd40f1d717ff7ffab3ad22d99c1481c208a44fe24dc7a74cfeed6733bb2a8ae8e24967 +EBUILD ganeti-2.15.2-r10.ebuild 12375 BLAKE2B a08ec6e74df047d59339b56920ca84ac6bc018d20420482a11fad142d4b7383798a78bd07aceae4a5793d49cab01c7fced528323e48ca87fb71002d3ca09e19e SHA512 5e24ab704ce3a12e9d4d7ade712251d843c79b2bd8a8ebb7dc9788d885745cb034195caec920698e62d17995dda6670114d059bb5d3cd80c21f1a5e008e9490a EBUILD ganeti-2.16.0_rc1.ebuild 10619 BLAKE2B 6f3a4aca5ac36c41671ce34a489e79fd6382055683722e34aee736c2baf9fa3ec4cb60e90eab9c2d9a7fed57391c84a793bfdd855a664238876a58931166e141 SHA512 a11bf679646bcd6081efb028fc1333e3e98c6551cefeff4d9336f585990050533ef57ba2ca5cb7ef3aa0f966afa0c9e532b999c169df30b453cedb03bd638801 EBUILD ganeti-2.17.0_beta1.ebuild 10646 BLAKE2B 75c7e1d72d0a778dbaa0c5703c7a41ea7df3f3b1b20f4744d62e130be022d030953c1b3636f3f8d9e58a71d4c6ac4863f2cc4ed493db0e66eab95b5cb529e5a0 SHA512 77da930bdf819620f06c3e722b02a0afa4bfb4beed918a88f9f330d11605c9b8fdbb413f8af9f791a6c7e1c1071720f89966d52b958fe790209efe4582cf773f MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896 diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch b/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch new file mode 100644 index 000000000000..913033dde4b4 --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-check-man-warnings.patch @@ -0,0 +1,13 @@ +# https://bugs.gentoo.org/719846 +# Redirecting both stdout and stderr to /dev/null leaves nothing for grep to search +# Given that there aren't any warnings in the manpages, no need to filter, either +--- a/autotools/check-man-warnings 2020-04-30 23:10:08.140721582 +0000 ++++ b/autotools/check-man-warnings 2020-04-30 23:21:06.708945592 +0000 +@@ -37,6 +37,4 @@ + fi + + LANG="$loc" LC_ALL="$loc" MANWIDTH=80 \ +- man --warnings --encoding=utf8 --local-file "$1" 2>&1 >/dev/null | \ +- grep -v -e "cannot adjust line" -e "can't break line" | \ +- grep . ++ man --warnings --encoding=utf8 --local-file "$1" >/dev/null diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch b/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch new file mode 100644 index 000000000000..3da34eed165f --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-ftbfs-sphinx-warning.patch @@ -0,0 +1,41 @@ +# https://bugs.gentoo.org/719846 +# Probably related to https://github.com/sphinx-doc/sphinx/issues/4225 +# +# Warning, treated as error: +# /var/tmp/portage/app-emulation/ganeti-2.15.2-r9/temp/gntbuild.tiR1shJ6/doc/design-impexp2.rst:512:Could not lex literal_block as "python". Highlighting skipped. + +--- a/doc/design-impexp2.rst 2020-04-30 23:40:50.121698365 +0000 ++++ b/doc/design-impexp2.rst 2020-04-30 23:41:05.692129339 +0000 +@@ -507,32 +507,6 @@ + respective system (measured for the CGI/FastCGI program using ``time + -v``). + +-:: +- +- ---------------------------------------------------------------------- +- Block size 4 KB 64 KB 128 KB 1 MB 4 MB +- ====================================================================== +- Plain CGI script reading 83 174 180 122 120 +- from ``/dev/zero`` +- 0.6/3.9 0.1/2.4 0.1/2.2 0.0/1.9 0.0/2.1 +- ---------------------------------------------------------------------- +- FastCGI with ``fcgiwrap``, 86 167 170 177 174 +- ``dd`` reading from +- ``/dev/zero`` 1.1/5 0.5/2.9 0.5/2.7 0.7/3.1 0.7/2.8 +- ---------------------------------------------------------------------- +- FastCGI with ``fcgiwrap``, 68 146 150 170 170 +- Python script copying from +- ``/dev/zero`` to stdout +- 1.3/5.1 0.8/3.7 0.7/3.3 0.9/2.9 0.8/3 +- ---------------------------------------------------------------------- +- FastCGI, Python script using 31 48 47 5 1 +- ``flup`` library (version +- 1.0.2) reading from +- ``/dev/zero`` +- 23.5/9.8 14.3/8.5 16.1/8 - - +- ---------------------------------------------------------------------- +- +- + It should be mentioned that the ``flup`` library is not implemented in + the most efficient way, but even with some changes it doesn't get much + faster. It is fine for small amounts of data, but not for huge diff --git a/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch b/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch new file mode 100644 index 000000000000..882c4f19acbe --- /dev/null +++ b/app-emulation/ganeti/files/ganeti-2.15.2-pyopenssl.patch @@ -0,0 +1,33 @@ +--- a/lib/http/__init__.py ++++ b/lib/http/__init__.py +@@ -88,6 +88,12 @@ + # send/receive quantum + SOCK_BUF_SIZE = 32768 + ++# OpenSSL.SSL.ConnectionType was deprecated in pyopenssl-19.1.0: ++try: ++ ssl_conn_type = OpenSSL.SSL.Connection ++except AttributeError: ++ ssl_conn_type = OpenSSL.SSL.ConnectionType ++ + + class HttpError(Exception): + """Internal exception for HTTP errors. +@@ -377,7 +383,7 @@ + + # Handshake is only supported by SSL sockets + if (op == SOCKOP_HANDSHAKE and +- not isinstance(sock, OpenSSL.SSL.ConnectionType)): ++ not isinstance(sock, ssl_conn_type)): + return + + # No override by default +@@ -414,7 +420,7 @@ + return sock.recv(arg1) + + elif op == SOCKOP_SHUTDOWN: +- if isinstance(sock, OpenSSL.SSL.ConnectionType): ++ if isinstance(sock, ssl_conn_type): + # PyOpenSSL's shutdown() doesn't take arguments + return sock.shutdown() + else: diff --git a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild index 385e68848589..4427da82567e 100644 --- a/app-emulation/ganeti/ganeti-2.15.2-r9.ebuild +++ b/app-emulation/ganeti/ganeti-2.15.2-r10.ebuild @@ -204,6 +204,9 @@ PATCHES+=( "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" "${FILESDIR}/ganeti-2.15.2-bdev_py.patch" + "${FILESDIR}/ganeti-2.15.2-check-man-warnings.patch" + "${FILESDIR}/ganeti-2.15.2-ftbfs-sphinx-warning.patch" + "${FILESDIR}/ganeti-2.15.2-pyopenssl.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 75f865d58e38..3ca29f1d765f 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -21,6 +21,6 @@ DIST libvirt-6.1.0.tar.xz 8276964 BLAKE2B cf57e28d17e868ab4a69f03fe77b0d779362c6 DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4 EBUILD libvirt-6.0.0-r3.ebuild 8891 BLAKE2B ad688cf1ccc1dc04d34844ef0dc9387f42be1547b73e4c331ea4879884fd8de70dba24edb1a865ac0416162248b8e90411df678a67a9759b6b08329087e9a13f SHA512 f77ec0b1abcb41a5e0418fc4fcee2ddc6f3d9ca00e94a0beebfd8b0a5b03a972efa99835fb5c4b935c41766adab78dcb9b02bb282c3ff08850932f07742f9fe2 EBUILD libvirt-6.1.0-r1.ebuild 8777 BLAKE2B d093067d76d19a47a804e88c66c35a161866f23a5a048cd10c865c26493f98db7b8fa729c6adf24cbe5af6cdae5b6570c4c1d0a88a4b1571575a15351e5a9e40 SHA512 786874faf23852522bdb3b8e5917d9ace7cc4341a5d3b50e87117d03cff078deb4071881d492afdb29108427224f8c9c1aeaf7efd45bc246845de51f2c4db832 -EBUILD libvirt-6.2.0-r2.ebuild 8777 BLAKE2B 1c9b51501534b2a22902b9f8db8b2c9ec78723bd026ee5d76942ccb4c0c7380610c5b9291387a2ea2b22368227976c3bf0d17d03211185d8942c490fd3aa6686 SHA512 6be30022ebb91201ee4bd3bc6e970ef1fe38bff44757a1134e6a472bc9ac72518ab3c600ec6182c49a3de64d231d4699b41682225c613db98b3a3d0de623d495 -EBUILD libvirt-9999.ebuild 8723 BLAKE2B d546b8941b1f8f8bc764bbc18a9052da46bb3fb379e622dc3eb6651a1b6bdf27d0a3d39591f42b9f8418dbf31a8b088da6680f522d5d57c60fcd8ee988eac240 SHA512 2549ee1c77dceec462ba28e798d5505d94eb891ad03afdd52d956f515ac7d31de5d145014f6047b150ff1cc677611c5dfdb4f20182c6c9cdedce8390b683f6a7 +EBUILD libvirt-6.2.0-r2.ebuild 8737 BLAKE2B c5ec7d389d67e93c53a494c1d585d06292413fa6ace2757d8906885ca35a31c97858ebc1c9aab44275392b766590b34fa17195fed932c1477850e4d853ac92e5 SHA512 52460fa384383a3f22b3b91a4ee6e05b3771f9c749592a299e11cb1d65d3f098dcce61ba9614e9389b278bd4594034547709f1665b80e878a4eae8a4276e20c8 +EBUILD libvirt-9999.ebuild 8679 BLAKE2B 73abd5971e97b01b7056c007f8018d7da4d565ee3b371c1b499e3516717ebc40535f2401505c3d01b772e96184776c958bf4e78473dc1871a148b4face0be528 SHA512 b2fee1a0ca9cadab3f5de9623d813d2cd486c1068eab694b900bceaf9d89935a5e78c233783c06c26fbda31abeaaf8b6519da2f651cc26e20531a0826771b57b MISC metadata.xml 3702 BLAKE2B cf4bd9200b3cc77129b7a56ad3e399d1371613dbb4fbdda96c4977ff2b2e8340afef5f10efe6a5f82015c34662dcccef4db8740a666b4714741d97973ec772a8 SHA512 2ba4fd9991263b8884856512faedfaecec0896e8cfdd9bf76a19838f6aaea766c43ca97d40753cd434c6b38a859ddd59b3c9d26b759871c6bdebbff160521509 diff --git a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild index 422f22851ddf..9e26e773524c 100644 --- a/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-6.2.0-r2.ebuild @@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" SRC_URI="" - KEYWORDS="" + KEYWORDS="amd64 x86" SLOT="0" else SRC_URI="https://libvirt.org/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" SLOT="0/${PV}" fi @@ -77,7 +77,6 @@ RDEPEND=" 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 diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index a761557096f1..7325bbb67914 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -9,7 +9,7 @@ inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any- if [[ ${PV} = *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://libvirt.org/git/libvirt.git" + EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git" SRC_URI="" KEYWORDS="" SLOT="0" @@ -77,7 +77,6 @@ RDEPEND=" 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 diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index 234f08c57703..f5b97c5f5e39 100644 --- a/app-emulation/open-vm-tools/Manifest +++ b/app-emulation/open-vm-tools/Manifest @@ -8,5 +8,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.0.1-14773994.tar.gz 3972888 BLAKE2B 8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163 SHA512 3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276 +DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e EBUILD open-vm-tools-11.0.1-r1.ebuild 3134 BLAKE2B 424ed232a629c2d8c9d2af5f5cf57c5c686f9dbbc062b2abd208e4d687aea875e753ddefbd417caf9bbabe071167f45591774df667097d7edefde4546fb4b119 SHA512 f64540dfcffe1ee7e0584fb59ace3082544c6f71fa310c2fa4f3ba35440c586da43780e5e5a5cac551cd1781c617b3945e825fcb07fd52f54ad6d6d1703fbfe7 +EBUILD open-vm-tools-11.1.0.ebuild 3146 BLAKE2B c509b879979229195cb42172149e997167c223c84e8dd9087d8a38f8ff028eb0f1418e73639eacdaa79f0f5bc95f1ee020d10ef8d13ab0504a9eada90642c5ba SHA512 270c9bb189641b2a0650195601aebd86cbdbbe8cc1ae15a894e8a8f7ce269d6069cd018843c0ed596ac3581c15e4e6a9e672a162a60f695eb00bc97ee8adeb2d MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201 diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild new file mode 100644 index 000000000000..b9f5c70c0417 --- /dev/null +++ b/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild @@ -0,0 +1,142 @@ +# Copyright 2007-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools linux-info pam systemd toolchain-funcs + +DESCRIPTION="Opensourced tools for VMware guests" +HOMEPAGE="https://github.com/vmware/open-vm-tools" +MY_P="${P}-16036546" +SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${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 static-libs +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:2 + 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) + $(use_enable static-libs 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/q4wine/Manifest b/app-emulation/q4wine/Manifest index be63c36c7847..be88863d6cb3 100644 --- a/app-emulation/q4wine/Manifest +++ b/app-emulation/q4wine/Manifest @@ -1,5 +1,3 @@ -DIST q4wine-1.3.11.tar.bz2 2868845 BLAKE2B 98893b1f65bcb8b8f301d7046a650658a9537849818fddf4803471a626f24d8c812867daec1f167b1fa5cdce9f9c0c50323d715ea06c51f3d52f85904257d2b0 SHA512 95ac66632bc46b10659e1d0e5f3c68b73934a85ddcc6582abd367d28f9949ad0ca732a5596db800bbc76b40ae7cf05fd95febf6d8b44db20cf710c2c1e23288f DIST q4wine-1.3.12.tar.bz2 2875348 BLAKE2B 0656574542c218163a0d7bef6d09459e7816a936f1d4c2fcf3ee15416aca23f6c97895b7f2f34e9a40b64f904cad579062ab173cc93f00c543a1ae861bf3f179 SHA512 c384c5c57b3bbea9f5ba2940e990c7ff28c9f410c9abd33fe1f17973b67bdf85dad4c74809ad3a225eaea49796221ab04e2e29dd81ea8ef7015e9b7adf9ab44e -EBUILD q4wine-1.3.11.ebuild 1186 BLAKE2B a185558ed4c5b63edeb7c1b4f64d3e757b69c7864babb85bf10ea5ea58b1b2b0f55cf16c7df650d86653852d7bc7b44c905f8520339e09a29e353a17b4111160 SHA512 448eada5f0367e444b2a8549f6a04bfbb38a4e5576173b3a447ba8fe907388be1bf8a125cbd3986c5239bd5b9718ff18ef87b482f9714cef7aec1657f3e57456 -EBUILD q4wine-1.3.12.ebuild 1186 BLAKE2B b5d77827028ad5cac653d30c2d270ee79c576ce905c5230f493da47ea29f7a1d35cd124d6947c5e400a72afddae96386dc8e608ff50f85bf1f2270ca7d40995c SHA512 72966d0b270051327c8fb9e865352774c2124a906c1993d856cc09df3d6289f00d748abd832b9a6dade069e90f407858b4d5a4a76b39c2fb21c0631e9b62b35f +EBUILD q4wine-1.3.12.ebuild 1184 BLAKE2B a1cf884f08c002e48b9a7a0b6ef5b5a6acf7720f1b53aee37529b458164a78c8917aeb4fc59e24104f974210c0ec80434f35a814f2e3578241fdea65025ac213 SHA512 7657a3600286e4fe64ae7ef940764108a6f21cdb84ca779e548179c17fc1ed744436b79e0c588c18f70aee04991e3c615968022dbf35dade7aa4c9d238315bab MISC metadata.xml 641 BLAKE2B af03073e86a430ccc228ba18c2dd18d4fe8d07438e5beec07f3712807a792829096cb3eeaa4e912a80c2634a1bb16ef20ddbc08684fc4fdf2b14d839cd520733 SHA512 707f77ef56bb3bcbe4bda434f1262f77c0b337a8789508e0df04d2cd791959ca7dc67b74ac81b6e248023f3da83c86bcf7f185ca689ab7b3bf346250850df8ed diff --git a/app-emulation/q4wine/q4wine-1.3.11.ebuild b/app-emulation/q4wine/q4wine-1.3.11.ebuild deleted file mode 100644 index 4604dd003e7c..000000000000 --- a/app-emulation/q4wine/q4wine-1.3.11.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg cmake - -# Upstream names the package PV-rX. We change that to -# PV_pX so we can use portage revisions. -MY_P=${PN}-${PV/_p/-r} - -DESCRIPTION="Qt GUI configuration tool for Wine" -HOMEPAGE="https://q4wine.brezblock.org.ua/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="+dbus debug +ico +iso +wineappdb" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsingleapplication[qt5(+),X] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dbus? ( dev-qt/qtdbus:5 ) - ico? ( >=media-gfx/icoutils-0.26.0 ) -" -RDEPEND="${DEPEND} - app-admin/sudo - >=sys-apps/which-2.19 - iso? ( sys-fs/fuseiso ) -" - -S="${WORKDIR}"/${MY_P} - -DOCS=( AUTHORS ChangeLog README ) - -src_configure() { - local mycmakeargs=( - -DDEBUG=$(usex debug ON OFF) - -DWITH_ICOUTILS=$(usex ico ON OFF) - -DWITH_SYSTEM_SINGLEAPP=ON - -DWITH_WINEAPPDB=$(usex wineappdb ON OFF) - -DUSE_BZIP2=OFF - -DUSE_GZIP=OFF - -DWITH_DBUS=$(usex dbus ON OFF) - ) - cmake_src_configure -} diff --git a/app-emulation/q4wine/q4wine-1.3.12.ebuild b/app-emulation/q4wine/q4wine-1.3.12.ebuild index 879806eac12d..81b76c34c437 100644 --- a/app-emulation/q4wine/q4wine-1.3.12.ebuild +++ b/app-emulation/q4wine/q4wine-1.3.12.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+dbus debug +ico +iso +wineappdb" BDEPEND=" diff --git a/app-emulation/qemu-riscv64-bin/Manifest b/app-emulation/qemu-riscv64-bin/Manifest index 6dc57ee4fb8c..d9f62ca356c1 100644 --- a/app-emulation/qemu-riscv64-bin/Manifest +++ b/app-emulation/qemu-riscv64-bin/Manifest @@ -1,3 +1,3 @@ DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0 -EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 467 BLAKE2B 21775993cbb9db3cd2e613b8e3ebec5a0fbd6c456766a2dde70e72adb3c8c4cda0f34afce49c2470220ebeab44f118105b0052a031cbe58e95fd9d7cc4cc0ea6 SHA512 f39ac61bef07a769e7a5ac59f7be78f949fa5bc5de34705e76768a5f62ab9aeca75aeda1776024f085781e5ca780de68501d8b231f18443fa49dce0c4d42b5ff +EBUILD qemu-riscv64-bin-3.1.0-r4.ebuild 489 BLAKE2B c8c05afb49827fc776fc4569f51fbcc18a43519241dc580afc58b6e8cac09e31e3a82224fc6ebce7beef913a3794da1a9f9ddb86b2b01c4c5a8254f2e07e9ecb SHA512 a93aadc16237a744e0edd22ba11787b3867a25a402b560ea5ed5ec6e5104d9e1f88c66ce3b562fb936f416bd4088e4e74d687b418e40377cc8485a341e09dba1 MISC metadata.xml 479 BLAKE2B 9073a68b14d921d5557835e3f3518f3e35688452310d8d9c89233abca25277588a67eee0641e0cfb8afb7951fd29281ca7add9a20ff45acae1f3532ad051e862 SHA512 78d7fa09208d0cb1c6bad33a92d059858d94939821147fa2f095b961bee64ea29db6dedba6e68dac9db6ae2b985e3c8462d56bbe079fbe074c623257a830b6ff diff --git a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild index 30853f041f52..650e2af57e19 100644 --- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild +++ b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,8 @@ KEYWORDS="~amd64" RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]" +QA_PREBUILT="*" + S=${WORKDIR} src_install() { diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 9be1c90119e7..0f2e8408f5b4 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -5,11 +5,13 @@ AUX qemu-2.5.0-cflags.patch 410 BLAKE2B 1d072b5dd00369bb565b30c2aa7047de92b441bf AUX qemu-4.0.0-mkdir_systemtap.patch 333 BLAKE2B e7e35e7fe510e7e1a86005f3d51384a81d1de7705f3b856656ec71cc0a2a29626e94918b3cc23b32e47c8073b77b62b498e71c3e956549e25ee5f4da1a8ac9cf SHA512 de48a7d663bd78051ed8a1f62d8b0b8e3bfe58d8a0001daf12518dbd087be3154e766be11c607485e7dd851b08d5675c4fb2a2fe5cf18f3b900164a4d93eab10 AUX qemu-4.2.0-ati-vga-crash.patch 4213 BLAKE2B bd67a7fa5cc782360e42dba38be05d973a18ee0a281a1d6623b836769f6d3e0e7de87111ab5b20ddc4d6b3e069e0dd9dc9c6a4fc56fc076562b69d89f4600936 SHA512 6075eed84d4cd0252fd8c82316c0b47c56e3deef5852acf5677a9e091610102c1d790ea1da4c7b6595f84bf1362e824f4ffe06675d4dc0b96da4c6401b4d0cc0 AUX qemu-4.2.0-cflags.patch 508 BLAKE2B 86724caca22a4bd2b21db306d04d8c0f6a542a15b82bb4e340f3ddb8471f47e854276ff33adee7bd5682ecb797efdb048e9d028d954a064712d1e817e1eb6e26 SHA512 5bfb8f0e739d7bb260b5b5b0a2d28f30b97833b8037227c511f55c9bd9502241c891e7e3780e750598ccfd7fb01615254f1c7f6634787fec67539a61a217e18d +AUX qemu-5.0.0-epoll-strace.patch 1455 BLAKE2B 8617fd020d36d0fc29d83d0340177f046ee58e08eb3663ae023647f0246450a8d65df1558731ecef06f29917411a26a97b2f9491e96efe4bf44e1a5be439999a SHA512 17f79dcc1e112d776875df281c13e12d58e43c0530718c992700d70030c9527f915193356db8e6f0fc721f8462f95305442c9393310f2a04df4d060f7e3a3f09 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B 3783d0f923ded66cce1195248981c83bbaf8b7ad2a270207e92e60b4d05d4787cd9324649c113a4616c2a9ddcef99841264f19915615b7a0a24dac9febed48ba SHA512 556f1c595a35ee4279b2d0890d90e48cd43d9d641ccca495e2494f62ab48dfc000dbe23718276271ced3d4b7680c814f8f8846195089ff56186f618063a83b48 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 -EBUILD qemu-4.2.0-r5.ebuild 24410 BLAKE2B 62165db1afd588b237dbcfd6383e140d4c3b82336a0dd921e7a0249ec2400d82c721a85036ccfb5d8ad97c0f4659f17101e93aa673b4e6626b188a784e2d8857 SHA512 7e5e226646041d42cf34721c837a0bbdf14c14cf6fa8cf181e5c4af85cb20c5fc4ee29524133e09024da4fc7ae6d3626a6d17da205b3161de2f4d3ca8010472a -EBUILD qemu-4.2.0-r6.ebuild 24467 BLAKE2B 850484ea855dc4939329b19e46414844b2b0a505ba4c4190377f47197681f3d1d249074573f388de759dc9340ff0bfdc6e2a56df8c1eefca41dd02cdeffccb74 SHA512 f18d944c2683ef1d93f017cc8025bd51dd7ef561d7f1ad8c0176b146bbd23d3a3b3f8d4e155eee1865d940b707179febe6ee37ae04e8cd16373875bd504119d3 -EBUILD qemu-9999.ebuild 24313 BLAKE2B ef0e66599c42688b16d3576e799681004acc1f83709a0307fb12b535bbb9a79a95c3343a5261f0bb14e1cf83844ccf9223c236661d5ecb459845585f75362a40 SHA512 4783f436324c02d1b58cb6f6a7d144d7a52eb3667600f28b32830d63eca43e2500361f4765010a2ee5f4d32335f33bd51637051780da698e77e3d11c9d0d1fab -MISC metadata.xml 4379 BLAKE2B 6608d9d9926e801dd84c9b8dc8f177fea1ee1896754c717cd0189aa2399e85abedd67d92f4fa0b35a84a3d86fa2871232098b6380caf408ace7a6dc96968228d SHA512 ff90794397e5e10df98bccc55508d5b5a963c0a14ee506fb2130499660e9b64aee6fcdba41906103a4f6e77a27f228b7cd34835b7035ce49bd6a8cbf2f25242e +DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf +EBUILD qemu-4.2.0-r6.ebuild 24465 BLAKE2B 039d18ecffc0e41943b4b2263f5edf06e7bc4adfa8d1c95644c6d0d2e0fceb823c8e52e2549f939a4e699640fdc22dd68c3420054a933f335b008de888a70da4 SHA512 5585d835b938bb20a8959cbd41a9e86f9d0f993e9968e4b51e77028c536ee530d3bc2b25bdc31b0a3e13d27c2342b242f02a9478d28a66d5f588bfb7c9928c2f +EBUILD qemu-5.0.0.ebuild 24519 BLAKE2B 15a12c1b06533f6b1107262b3b9809a733a4ae4cd85c5b1517bd5735b662139baf67645d3b2a8503141023a320fecc9a874021e237c73195fe7d2745a09b4ce0 SHA512 283aa8f4330727d77250d8c74fcce1e9430df2aa46f8a4869b55f01479a062d61c548db612b97a8d322a019e5acb80c61a506057973768163e871886d077caaa +EBUILD qemu-9999.ebuild 24519 BLAKE2B 15a12c1b06533f6b1107262b3b9809a733a4ae4cd85c5b1517bd5735b662139baf67645d3b2a8503141023a320fecc9a874021e237c73195fe7d2745a09b4ce0 SHA512 283aa8f4330727d77250d8c74fcce1e9430df2aa46f8a4869b55f01479a062d61c548db612b97a8d322a019e5acb80c61a506057973768163e871886d077caaa +MISC metadata.xml 4465 BLAKE2B ef8f4fcd42539604fd5d05228dc89b9bebe56490c20da6cd3244a9b9d8c5c66036562ff64e4a740c824a80f2fbfa70b6540873d223f4bb9f901337fe78e3012c SHA512 103ee38332f04a84527e177e9efc36847daa0bcdb6ea90a33ed8656139b7464f8d99dd6cdf7cc33460c87701786e8573cac532af2f84d5ae53d1b78c750ef770 diff --git a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch new file mode 100644 index 000000000000..c0f9a2e008d0 --- /dev/null +++ b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch @@ -0,0 +1,50 @@ +https://lists.nongnu.org/archive/html/qemu-devel/2020-04/msg02643.html + +From 6bce23d8daf96a7faa9288e7414948cda31ddaa2 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Thu, 16 Apr 2020 18:55:49 +0100 +Subject: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output + +Fix syscall name and parameters priinter. + +Before the change: + +``` +$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a +... +1274697 %s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616) = 3 +1274697 exit_group(0) +``` + +After the change: + +``` +$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a +... +1273719 epoll_create1(2097152) = 3 +1273719 exit_group(0) +``` + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + linux-user/strace.list | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/linux-user/strace.list ++++ b/linux-user/strace.list +@@ -125,10 +125,10 @@ + { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL }, + #endif + #ifdef TARGET_NR_epoll_create +-{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL }, ++{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL }, + #endif + #ifdef TARGET_NR_epoll_create1 +-{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL }, ++{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL }, + #endif + #ifdef TARGET_NR_epoll_ctl + { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL }, +-- +2.26.2 + diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml index 07244b5deff4..0c30c4582643 100644 --- a/app-emulation/qemu/metadata.xml +++ b/app-emulation/qemu/metadata.xml @@ -28,6 +28,7 @@ <flag name="iscsi">Enable direct iSCSI support via <pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag> + <flag name="io-uring">Enable efficient I/O via <pkg>sys-libs/liburing</pkg>.</flag> <flag name="ncurses">Enable the ncurses-based console</flag> <flag name="nfs">Enable NFS support</flag> <flag name="numa">Enable NUMA support</flag> diff --git a/app-emulation/qemu/qemu-4.2.0-r6.ebuild b/app-emulation/qemu/qemu-4.2.0-r6.ebuild index 172ce2eba7b5..8a93874b711e 100644 --- a/app-emulation/qemu/qemu-4.2.0-r6.ebuild +++ b/app-emulation/qemu/qemu-4.2.0-r6.ebuild @@ -25,7 +25,7 @@ if [[ ${PV} = *9999* ]]; then else SRC_URI="https://download.qemu.org/${P}.tar.xz https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/qemu/qemu-4.2.0-r5.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild index b0b4efc874c5..ae78e0ad179f 100644 --- a/app-emulation/qemu/qemu-4.2.0-r5.ebuild +++ b/app-emulation/qemu/qemu-5.0.0.ebuild @@ -23,9 +23,8 @@ if [[ ${PV} = *9999* ]]; then inherit git-r3 SRC_URI="" else - SRC_URI="https://download.qemu.org/${P}.tar.xz - https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" + SRC_URI="https://download.qemu.org/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -35,18 +34,19 @@ LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc - +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux + +fdt glusterfs gnutls gtk infiniband iscsi io-uring + jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen - xfs +xkb" + xfs +xkb zstd" COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - lm32 moxie tricore unicore32" + lm32 moxie rx tricore unicore32" IUSE_USER_TARGETS="${COMMON_TARGETS} aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx" @@ -120,6 +120,7 @@ SOFTMMU_TOOLS_DEPEND=" sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing[static-libs(+)] ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) @@ -140,7 +141,7 @@ SOFTMMU_TOOLS_DEPEND=" rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( - media-libs/libsdl2[X] + media-libs/libsdl2[video] media-libs/libsdl2[static-libs(+)] ) sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) @@ -158,7 +159,9 @@ SOFTMMU_TOOLS_DEPEND=" virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( @@ -215,10 +218,10 @@ RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-qemu )" PATCHES=( - "${FILESDIR}"/${PN}-2.5.0-cflags.patch "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 - "${WORKDIR}"/patches + "${FILESDIR}"/${PN}-4.2.0-cflags.patch + "${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch ) QA_PREBUILT=" @@ -438,7 +441,6 @@ qemu_src_configure() { fi } conf_opts+=( - --disable-bluez $(conf_notuser accessibility brlapi) $(conf_notuser aio linux-aio) $(conf_notuser bzip2) @@ -452,6 +454,7 @@ qemu_src_configure() { $(conf_notuser gtk) $(conf_notuser infiniband rdma) $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) $(conf_notuser jemalloc jemalloc) $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) @@ -483,6 +486,7 @@ qemu_src_configure() { $(conf_notuser xen xen-pci-passthrough) $(conf_notuser xfs xfsctl) $(conf_notuser xkb xkbcommon) + $(conf_notuser zstd) ) if [[ ${buildtype} == "user" ]] ; then diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index b189a315909f..ae78e0ad179f 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -34,12 +34,13 @@ LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc - +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux + +fdt glusterfs gnutls gtk infiniband iscsi io-uring + jemalloc +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen - xfs +xkb" + xfs +xkb zstd" COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x @@ -119,6 +120,7 @@ SOFTMMU_TOOLS_DEPEND=" sys-fabric/librdmacm:=[static-libs(+)] ) iscsi? ( net-libs/libiscsi ) + io-uring? ( sys-libs/liburing[static-libs(+)] ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( virtual/jpeg:0=[static-libs(+)] ) lzo? ( dev-libs/lzo:2[static-libs(+)] ) @@ -157,7 +159,9 @@ SOFTMMU_TOOLS_DEPEND=" virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] )" + xfs? ( sys-fs/xfsprogs[static-libs(+)] ) + zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) +" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( @@ -217,6 +221,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902 "${FILESDIR}"/${PN}-4.2.0-cflags.patch + "${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch ) QA_PREBUILT=" @@ -449,6 +454,7 @@ qemu_src_configure() { $(conf_notuser gtk) $(conf_notuser infiniband rdma) $(conf_notuser iscsi libiscsi) + $(conf_notuser io-uring linux-io-uring) $(conf_notuser jemalloc jemalloc) $(conf_notuser jpeg vnc-jpeg) $(conf_notuser kernel_linux kvm) @@ -480,6 +486,7 @@ qemu_src_configure() { $(conf_notuser xen xen-pci-passthrough) $(conf_notuser xfs xfsctl) $(conf_notuser xkb xkbcommon) + $(conf_notuser zstd) ) if [[ ${buildtype} == "user" ]] ; then diff --git a/app-emulation/simplevirt/Manifest b/app-emulation/simplevirt/Manifest index ce133a509b8a..682952f3a068 100644 --- a/app-emulation/simplevirt/Manifest +++ b/app-emulation/simplevirt/Manifest @@ -6,5 +6,5 @@ DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50d DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae DIST simplevirt-0.0_p20181012.tar.gz 14652 BLAKE2B a6a648ed159d0648f27174c6598c9ae85e41530b218ef0360962884d1f61cfd16d2534ef4d2a01eb87138d0390fc7fe25e070c602f296344b8285c9dd2804287 SHA512 64c0edfc22ed0347c7335b942b06b6b9fd8c3f2ea7d374bf14b96b98b23248d15b6f38d7d1d809c8cd60b605f1809dfca8ff5c249e2df183c8b1636c26440ca8 -EBUILD simplevirt-0.0_p20181012.ebuild 2132 BLAKE2B f6ae27c4dd6b7f60a3008b04e30fba04659478c4874768bf5b1116d52890141838a0bfccf424eeb7b9126f23736f5040c28f6af81c7d7a50a5cb586c1dfe8afb SHA512 e34ec31a73639d8f622b290dc58ac5beb44f1338f99b2a4809473f293138f3f341e7f1dd6e54db06b7907f261310d3e07654e3a56b380f580a91038fd2b6710e -MISC metadata.xml 576 BLAKE2B d62570b65053dc9cb9c264b5fdc90aec72d429b6a166e0c4298e4d27105b127094b1a5ad2f96fe8ba6d23118d82faa3aada90643a5165e3874f2f425dc7d37f1 SHA512 91031a71f21466b4782efe38f645169a585dcc29346c4a6e98b129549b8ccb197cb00f03ce3d9d51306284bc24494afcf117efb003c33855f262177daf077987 +EBUILD simplevirt-0.0_p20181012-r1.ebuild 2088 BLAKE2B 7ee65bf2f0ae236e901d2abd66d6ff46963023dfb20017ca78f67c91843d298da83b0540136259f10db2d8a3b05f5238ebccbc2ef837f583fabab0ab0d53be72 SHA512 e10663b3b9c9574cb7d847d17c45d02d1111ff379f1fa812c934e40b64b48276abe631171b47b0881c4c3d936c24b7433d1e48c288663270f8d806f92e82897f +MISC metadata.xml 473 BLAKE2B 742768d0f49f8d15b12a4c4d14d5cad41899adf34beedaff9c51ab785bc09b5278de0325a3ab0803de7ec17d9df4e1ed03f3135895d6def353ab2957aef5571c SHA512 5f02732aba8e98b5b94d91d54d96d15bcbdee31c531ea6d9d9fb9377edd8a8577a5691582562735d55fa562f09391f0625344d2377dadf9bf048c4e0a8aca14b diff --git a/app-emulation/simplevirt/metadata.xml b/app-emulation/simplevirt/metadata.xml index 25e89f9e5959..e45e3daf442e 100644 --- a/app-emulation/simplevirt/metadata.xml +++ b/app-emulation/simplevirt/metadata.xml @@ -5,9 +5,6 @@ <email>rafaelmartins@gentoo.org</email> <name>Rafael G. Martins</name> </maintainer> - <longdescription lang="en"> - Simple virtual machine manager for Linux (QEMU/KVM) - </longdescription> <upstream> <maintainer status="active"> <email>rafael@rafaelmartins.eng.br</email> diff --git a/app-emulation/simplevirt/simplevirt-0.0_p20181012.ebuild b/app-emulation/simplevirt/simplevirt-0.0_p20181012-r1.ebuild index 8f7c69b4bddc..45f5a524d281 100644 --- a/app-emulation/simplevirt/simplevirt-0.0_p20181012.ebuild +++ b/app-emulation/simplevirt/simplevirt-0.0_p20181012-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ EGO_VENDOR=( "gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml" ) -inherit linux-info golang-vcs-snapshot user +inherit linux-info golang-vcs-snapshot EGO_PN="github.com/rafaelmartins/simplevirt" GIT_COMMIT="78d29d8fa11ce72af5f897430af7bb7d2947a32f" @@ -30,6 +30,7 @@ KEYWORDS="" IUSE="" RDEPEND=" + acct-group/simplevirt virtual/logger app-emulation/qemu" @@ -37,12 +38,6 @@ CONFIG_CHECK="~TUN ~BRIDGE" ERROR_TUN="CONFIG_TUN: Universal TUN/TAP driver required to setup bridge networking" ERROR_BRIDGE="CONFIG_BRIDGE: 802.1d Ethernet Bridging required to setup bridge networking" -pkg_setup() { - enewgroup simplevirt - - linux-info_pkg_setup -} - src_compile() { pushd src/${EGO_PN} > /dev/null || die GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}.Version=${GIT_VERSION}" ./cmd/... || die diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest index 8d76574636e5..90eabc7e3967 100644 --- a/app-emulation/skopeo/Manifest +++ b/app-emulation/skopeo/Manifest @@ -1,10 +1,8 @@ DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d -DIST skopeo-0.1.39.tar.gz 3850036 BLAKE2B e635be475f22cc25ab98e446424f4a6b0babe34f827a73f9c9c1533db782490e9af94e759ac78fbeeec1c0e1fa42eef9d09fb4e7ff1f4df654f65fe4c1a9f7b0 SHA512 c4aadc40f9d637c628cd96c204b3e9bc3a928c145521bed2e5046508fc936ff99442dda8b4a4cdd85c4d04e64a9ccee5ea8d563c6ebf4e6020d50d96b921716c DIST skopeo-0.1.40.tar.gz 3907911 BLAKE2B 0a9ebcc9662036b1595149f0d19a46c0565b115d37b22c6410041eef3e6755b20561439596f1033dd6ce2c78a4948e358b2518003729873d5ab8ce9a7bec082c SHA512 161edb8afa961e48e314cf70a4fcebd971a45a50fc11eab6ec751ba4eb05a8be011d16b83c4ed1fa9d6336846da5f518da006d4476ee4e29a160c629820773d3 DIST skopeo-0.1.41.tar.gz 4692408 BLAKE2B d5e99be0cb478065f1478beda355abc11c8f13ad8446251048502da1b1af38d407ec46d284e59d2018af5d1ca6a953ad6156a306e9bc1acbdb22b447fe17a59f SHA512 924af178eb9621395cfffcf51aa072886dc8c20746bce1599a503df8c54794e34184a1fc6fd9582b889c7c8efecf8cf192797bc8e208b90c71cca31bb970d8e9 DIST skopeo-0.2.0.tar.gz 4295805 BLAKE2B 4ad13ff49bec56f3766e8d94f80fe8e22edb011b8862fb1249882e5695fa9260a6e2ce3d8345411ee7717cb92d4c1516268678f0884a62b02bfc8c9a554367ee SHA512 89d416110561dbe967860f752db607634a37b12adc376736de48264ec064abfed6b3db9ae195ffb3e9616dd6d65528660a23f2a5145d4674ed47cf443f17295a -EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed EBUILD skopeo-0.1.41.ebuild 1330 BLAKE2B d17e46533d449b957b0829d2bd7790610fa3f1f314500b9a830d2710eeef33c6b0c8125bd803125245b361aae351e241bd8754683d0d28a6f63746d2cabd58a6 SHA512 c907e07d0587e652f425ac91be2dd5648820622864fea7845558db2f6df1f3c21ccd029f24b9be8edccf3e51679290fde22526590dcd55558227909ae520878f -EBUILD skopeo-0.2.0.ebuild 1318 BLAKE2B ca82dd7a456dde9cd8b354691d18123e7e66e163eadd04f9ecf2079f584b5b5a09dca5beb0a0ac905a94c0929da589474852606f2af380535918a5fa91b9fefe SHA512 4b73306b099f55d4216f4269a937c35755e7a1bd091dae00a8280803dc68c56ea34acbd722ce3a72b94823dbc36f0ade1844c6a96ba24be318c47762353efb6c -MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0 +EBUILD skopeo-0.2.0.ebuild 1396 BLAKE2B b36f33f7ab6c5fc8f963a16a505aa2e72cb5c74b2639eba02096e12a6d7b569ce64bac8c5f1072926ec8823532eeecd6c72567a910d4390c1639b07db358f78d SHA512 e77213f9d79443d813d434b2483ef5c685db5791eb1f5e56418754ffbe53ce76a6390964bfd1fe4fcf411a1fb037045ec86157d434adde6d593d2dcdbfde3cd6 +MISC metadata.xml 342 BLAKE2B 8109faaacc76ba08392a58856a22d3b7384e1cef85100e10f6827bf567bf51e4127e2c938e70de572ceefc99e3a57c32a7a10df878ba5516b5777ff26e6aca2e SHA512 8b400ab3b9293a3697bd8695e321c40a0f4d7a56f13539408ad93e1b4ef513035502649725c4c1ac478db8670c6141569ee45351c9c28b4a68500aeae1a82790 diff --git a/app-emulation/skopeo/metadata.xml b/app-emulation/skopeo/metadata.xml index c36c37139fad..6027ac0be078 100644 --- a/app-emulation/skopeo/metadata.xml +++ b/app-emulation/skopeo/metadata.xml @@ -5,4 +5,7 @@ <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> + <use> + <flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag> + </use> </pkgmetadata> diff --git a/app-emulation/skopeo/skopeo-0.1.39.ebuild b/app-emulation/skopeo/skopeo-0.1.39.ebuild deleted file mode 100644 index b26bcce76158..000000000000 --- a/app-emulation/skopeo/skopeo-0.1.39.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/containers/skopeo -COMMIT=1cf1e06 -inherit golang-vcs-snapshot bash-completion-r1 - -DESCRIPTION="Command line utility foroperations on container images and image repositories" -HOMEPAGE="https://github.com/containers/skopeo" -SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:= - >=dev-libs/libassuan-2.4.3:= - dev-libs/libgpg-error:= - >=sys-fs/btrfs-progs-4.0.1 - >=sys-fs/lvm2-2.02.145:=" -DEPEND="${COMMON_DEPEND} - dev-go/go-md2man" -RDEPEND="${COMMON_DEPEND}" - -S="${WORKDIR}/${P}/src/${EGO_PN}" - -RESTRICT="test" - -src_compile() { - local BUILDTAGS="containers_image_ostree_stub" - set -- env -u GOCACHE -u XDG_CACHE_HOME GO111MODULE=on GOPATH="${WORKDIR}/${P}" \ - go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ - -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ - -o skopeo ./cmd/skopeo - echo "$@" - "$@" || die - cd docs || die - for f in *.1.md; do - go-md2man -in ${f} -out ${f%%.md} || die - done -} - -src_install() { - dobin skopeo - doman docs/*.1 - dobashcomp completions/bash/skopeo - insinto /etc/containers - newins default-policy.json policy.json - insinto /etc/containers/registries.d - doins default.yaml - keepdir /var/lib/atomic/sigstore - einstalldocs -} diff --git a/app-emulation/skopeo/skopeo-0.2.0.ebuild b/app-emulation/skopeo/skopeo-0.2.0.ebuild index 41797bfbd1bb..c6caefe701f8 100644 --- a/app-emulation/skopeo/skopeo-0.2.0.ebuild +++ b/app-emulation/skopeo/skopeo-0.2.0.ebuild @@ -12,11 +12,12 @@ SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT" SLOT="0" KEYWORDS="~amd64" +IUSE="btrfs" COMMON_DEPEND=">=app-crypt/gpgme-1.5.5:= >=dev-libs/libassuan-2.4.3:= dev-libs/libgpg-error:= - >=sys-fs/btrfs-progs-4.0.1 + btrfs? ( >=sys-fs/btrfs-progs-4.0.1 ) >=sys-fs/lvm2-2.02.145:=" DEPEND="${COMMON_DEPEND} dev-go/go-md2man" @@ -25,7 +26,8 @@ RDEPEND="${COMMON_DEPEND}" RESTRICT="test" src_compile() { - local BUILDTAGS="containers_image_ostree_stub" + local BUILDTAGS + BUILDTAGS="containers_image_ostree_stub $(usex btrfs "" exclude_graphdriver_btrfs)" set -- go build -mod=vendor -ldflags "-X main.gitCommit=${COMMIT}" \ -gcflags "${GOGCFLAGS}" -tags "${BUILDTAGS}" \ -o skopeo ./cmd/skopeo diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest index a7e2f624eb26..839020e95aeb 100644 --- a/app-emulation/slirp4netns/Manifest +++ b/app-emulation/slirp4netns/Manifest @@ -1,5 +1,3 @@ -DIST slirp4netns-1.0.0.tar.gz 51919 BLAKE2B 9d2d95de80e644981f185a6c243949e55761b25cb908c1ee727f06264d08e794e8228a197e0cc858f81f582d3ddb349c5d6cd2566944c63f41299fb2a5a0d3d2 SHA512 fe0256f0b91647b361999915c6c2b975ee33c437afef3cf490f5e33f582da4db97e360e86654831d7e9b2a8b0d78c91080874a9377247693ac54ffdb60ca6fb9 DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63 -EBUILD slirp4netns-1.0.0.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2 -EBUILD slirp4netns-1.0.1.ebuild 783 BLAKE2B 93a68b4f0ddc4b385d120b2c782d93349e03fe0098bce11a426e8fa53ee6cd049337688aa581c87307c57b59e4e5ada8656b24d89ef6da3dbbf360ab54167a5c SHA512 bbf7d29b57ea330aff86edc3547a08ffa13ca247d3e0f1979be201b27568c70cf714b9d8fb6c16b81886a4583a3d7c042476b9b61815b9f202e1f8a468a7c5e2 +EBUILD slirp4netns-1.0.1.ebuild 942 BLAKE2B 970fc2e131a194f9387230c3ce6b2516797f9cf72a0e9a7456068716cc3cff9cad4df827b55f751b44497a253eba9566bd3b175963c28f4fa7c3637553560f15 SHA512 340f4ec282e903a44770c10b7b74580bf14562f627a8fcf53b148a37d55ea85da8849960a9ebcd69a146f7a9ee1fe95c87a374c36da32149234a9eef0a86aa2b MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild deleted file mode 100644 index 4aaf598fb7e5..000000000000 --- a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="User-mode networking for unprivileged network namespaces" -HOMEPAGE="https://github.com/rootless-containers/slirp4netns" -SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=" - dev-libs/glib:2= - dev-libs/libpcre:= - net-libs/libslirp:= - sys-libs/libseccomp:= - sys-libs/libcap:=" - -DEPEND="${RDEPEND} - virtual/pkgconfig" -RESTRICT="test" - -src_prepare() { - eautoreconf - default -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "You need to have the tun kernel module loaded in order to have" - elog "slirp4netns working" - fi -} diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild index 4aaf598fb7e5..2d9af4a06ab7 100644 --- a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild +++ b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild @@ -25,6 +25,9 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { + # Respect AR variable for bug 722162. + sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \ + -i configure.ac || die eautoreconf default } diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index e79872e319af..da81e07b3daa 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,6 +1,6 @@ AUX vice-pkg-config.patch 825 BLAKE2B 6f46115866805299ba9354b9d15c3a766508ad1fe8aa82ac427a00d48ee2d1af41096bedeb7d3b579e704511164c37d55eeb7f00a39586f60737eb3ea394f043 SHA512 fe1e6b6d13012a4550336d716232418f5e1bf90ede4d4a36ad73244c7f957f641a425ccda50c5802c2e313e54081288da583c516a8689a18021b6e376fe18424 DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0 DIST vice-emu-code-r37605-trunk-vice.zip 26854864 BLAKE2B 771728b69cb38492d086d199fcb56d19f14738bc6b5c3f0b1c9c6ffb07db0d2c2a3d631ed9f32a2abf0159d4e3e0d144c04e6ba13c22ce619ea1090f89b7b5cc SHA512 975c342d5ee7f72cc775bee711fed77fb6ce00bc15eef13403b9f3a457ac589d0089bcdf452507605bbf11d8806fceec94729becf1ef3fe66f6074854684d998 -EBUILD vice-3.4_p37498.ebuild 4166 BLAKE2B 8bb99120020c12260e811927071e425e4ec4be00fd0b6cd962d9b9404afc799723b3d52b04c771bba52fcf00e908905cd5318ff1a7f663c5ef01655885f3d3a9 SHA512 2989578734dcabe8700af3e1b19384e4b8e17df82ded0e0a6a9708299a3ba008b8f50d6b5e3309f47dc163f2ec4bf7c90aaf0d256e3bde6ef3258509d747b9a5 -EBUILD vice-3.4_p37605.ebuild 4218 BLAKE2B cf422c8347f23e492786b203912967ac1240e54ba1d5e79d9702ddb36c3d7c84227f0a978c3e9b32f6b877e2ef38f93b2ea86cfe7c8ca124dbd57a31d1face8b SHA512 dd7dd55f0552d406d6981d37fab577f2ecbf2d576a359d8a2cc3204a7669e96dc11501e9f8639c97d3bc61322c107a12b39ec5160b4d1246b98a86f4abeff1ae +EBUILD vice-3.4_p37498.ebuild 4112 BLAKE2B 6242044c536b35adfa53cfab6abfe1242cdfb9274d5980028eb9b645a5ea8c9cad4b728900ff378389fca6e44fc19189ea5755ae16868ff1ffdd90a69c6ba1bb SHA512 396f0e0cd576ea145c1fa473dca8efa8171ba3cb2100cf9d20b55e13bb3380c8884dae2322dac6edb0f18f438c3f157417daa5317a833c838de061a53da735e9 +EBUILD vice-3.4_p37605.ebuild 4164 BLAKE2B 54abd89244252aa99d3c3fdcc0a47aa6b8e205da3af5c9e18692e1b1be6ebb4c384174332881c95c78ee766d446ab5952331dd30dd9d3b7eb89ee82a25ab6bd8 SHA512 2eae27edb9702bbe893dd58ed89e7d6edb1784971d1a487c8e807611709b38161e671c7a0de6af229ff70a5776d4ab80e3c51e07e6b4bd4fbd75877ef719bebf MISC metadata.xml 692 BLAKE2B d9f0e48aab3fb0ed8ccc7b044f561a96cd563eeeabfae63371cf4b3772a8068c2b4191c09d89465402a202496a2aac7234ffab8adbcc4c17be54ab0e0c9d307c SHA512 f7be3c1e6a6394452d3f7aac52b25ba0eeb098841ecac32bbcc92257a7f09430f9a18927234ba166014523eb7b930c66d803d9105025b79ac1dbebed781fec96 diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild index 9e9f6f6462e5..f14dee2dee47 100644 --- a/app-emulation/vice/vice-3.4_p37498.ebuild +++ b/app-emulation/vice/vice-3.4_p37498.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 x86" -IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib" +IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib" REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )" RDEPEND=" @@ -26,10 +26,7 @@ RDEPEND=" >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p37605.ebuild index 46da78904065..c77734211e9c 100644 --- a/app-emulation/vice/vice-3.4_p37605.ebuild +++ b/app-emulation/vice/vice-3.4_p37605.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib" +IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib" REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )" RDEPEND=" @@ -26,10 +26,7 @@ RDEPEND=" >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1:1.1 ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:= ) - ) + ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) gif? ( media-libs/giflib:= ) gtk? ( diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest index a9e81c0c0dc3..9dda084a462e 100644 --- a/app-emulation/virt-manager/Manifest +++ b/app-emulation/virt-manager/Manifest @@ -1,4 +1,4 @@ DIST virt-manager-2.2.1.tar.gz 2623754 BLAKE2B c81e730f2d685152bd0ef0a0327a74a70c50bff91e80ed0e3de92d0b848183c4bc092be333f2f0785c6a0b39f0b6d6abbd1f38c902f52ba4af7c56d64ee9b026 SHA512 aa97af52b3552c087beab8701762c21e8e6d818c9787d5376ed4e1ae40a34d5e8870c4c00fda9cb17a2340d1dff5b17e853182df720cdd9ea4c91cf01502a33a -EBUILD virt-manager-2.2.1-r3.ebuild 2428 BLAKE2B edc17b2b770ed6ee1fdab7731a6c7282837470ed80c2865953598fbc211cee49530fdf6ad0e91d86c76acdbb76d36378c0c25a102973765cbcd0271717edc5e1 SHA512 a4226f0f3aa7b79a64dce3d2e786640b6c2ba13950e16788fe379f11bcf591d85cb11f73cb4c36b995221bd854561199f4727c57a84fd762f6ec6dffd11e63fd -EBUILD virt-manager-9999.ebuild 2470 BLAKE2B 2c580d80a54ac043fa8f5e832a09bb33135e5f2270a037b9be17b0e7e3b21307cb650eeec48f2905c8283015b171b58d4ec337a4105873fa616ac0da4426a578 SHA512 c9715914829a0d4b597739cfda257ee3c430b9bc25406369cfcb4add225d3986878d32f9d24c2945acf24d7f44ab5db4d2692796e09d826f6ec467441c8e05e9 +EBUILD virt-manager-2.2.1-r3.ebuild 2386 BLAKE2B 066a7344b0adc2404175275bb5b610a36416d352aa709bfa9e04d0b168fefadeeba979c0f6d0da8b06405ff7e365c36761bafb1f90eef99f005a033a91f89430 SHA512 5ab789a9e538b66f09d88a1ba0e5ce6b8b0b9fc4dab81f88fbb31d0393b9dc7ef4489d485c7cc9980539503d598aedd69e79067f15247854c4169060c6c21fc8 +EBUILD virt-manager-9999.ebuild 2428 BLAKE2B 888383dd0aed1b3fd74b84d459a5c53a4ce6f2afec94b3f8040557f4fdf0d3a39e20c68afb621994181231ceea21257a59bc861f89676dec6ca6627f5ab37b51 SHA512 a14d5ed1599853312ce9de17fef7ffdde022c618a24e1d686fed2cbdd8196ef1e37114353a88655a5202bcee77b627381be0b45e90946cca1941b15d5c5ff28a 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 091a92f50ba5..e90e77b0dbae 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 @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=no @@ -32,7 +32,6 @@ RDEPEND="!app-emulation/virtinst >=app-emulation/libvirt-glib-1.0.0[introspection] $(python_gen_cond_dep ' dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}] - dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}] dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild index b7b613db8926..dc329fa32f1f 100644 --- a/app-emulation/virt-manager/virt-manager-9999.ebuild +++ b/app-emulation/virt-manager/virt-manager-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_SETUPTOOLS=no @@ -33,7 +33,6 @@ RDEPEND="!app-emulation/virtinst $(python_gen_cond_dep ' dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}] dev-python/argcomplete[${PYTHON_MULTI_USEDEP}] - dev-python/ipaddr[${PYTHON_MULTI_USEDEP}] dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}] dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] dev-python/requests[${PYTHON_MULTI_USEDEP}] diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest index 892cbac4355f..45b1812021ef 100644 --- a/app-emulation/virtualbox-additions/Manifest +++ b/app-emulation/virtualbox-additions/Manifest @@ -1,15 +1,7 @@ -DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b5d8751882a21874e4745d675642185542eb617f2a74b3e55b4444067822511d33b6d358e37e179d1b1c6464d701a8ab45a54 SHA512 86f1d7071a9033b7826dcacbcf23822acc772d909af8a8a12345bd5fe68375677b522d0e1987f2908412d5a29369d0a1221fd099f8b692c8d25fe9cbe40fd11e -DIST VBoxGuestAdditions_5.2.36.iso 49661952 BLAKE2B 181c26b5362ebdd8508bcc5b3f75993fc6ab7036093004a614c5153a8c772e2bdaab309adc452cfe78ee09fbd528c00a875193f4183b75e3cb6ce169b4f68507 SHA512 4be8e943f61b17445b17d092db84ddd6841d933bf2b8dd1fad7cc0095d31932347f861e110917ca6d0ebec2ee62b2afa7e5977123830e50a4e0e4a6c1872e28e DIST VBoxGuestAdditions_5.2.40.iso 49770496 BLAKE2B 4d9ca6cde78da325575f56f0b12d7beccfd09a564b98c808495ac8425f47bd0ce1b86a5cfb79c30256b36b109032013a0677ff07c45808324ca3b85efe5b7f51 SHA512 a2ea5539de454bb062dffa0b61ac4962c8932539ab0cdaae98f7703528c201bc856b0597b92c20e83fab5b97981be3811061386022ca3687d8c102983e05ec7b -DIST VBoxGuestAdditions_6.0.16.iso 77201408 BLAKE2B 713381429cbef6685c4890c47dc0896571ca24cacc96d73903cdd91220a6b5ba7c6012c69d62489eaabd1fe75dd0000a3415d7d316fbc79b3b8ac2cf45cba75a SHA512 d17de374714023b02fef76bad53a15fe4d5d4bc752e900843419e9c3ba4988bd9bdc8fd6797bb4fdfa722d0f41ff144ed6865a0778609a7aea5e96de34c7beb8 DIST VBoxGuestAdditions_6.0.20.iso 77297664 BLAKE2B 72c3e6b3c757d866bbf94cb2593b81d05362dcb1485db8412c8c3a95a7619754eeeaa75f8d813bd26bb3c27a718e3f687fb5904dd2574d29eb96988f48fcc67b SHA512 16c69ddee28650ac35ee25bead96568cdfe269042ed6a4138b5870322ff9dab405ea844d75886a0b52c44f0c47a34814a30d48734a6683df6b6ad042b1bea68d -DIST VBoxGuestAdditions_6.1.4.iso 59688960 BLAKE2B e7c86bbb2eddfc1e9dd555a5d9e5b808194a0124f0cf3bfb09aa226a89cd348cf979f523361fbd0cc400912709310592f938e56ef410a9f81c1bb514db58c2e7 SHA512 a1e8f404c3d58adc60adb6a14cecc3e56f0705bd810891038d2fd6691e9f54f61daa4ffe804c77005b2764cb7c7c8d97fb67077e05aca94cf21c4afa89cd7f4a DIST VBoxGuestAdditions_6.1.6.iso 59760640 BLAKE2B dac4f92c851d37ad995ff631f1b7ecda702c3dce5b299232fc7ec956009fb13e09fc0e5d6980d09c4a9f1b58ab5fcff93c791ecc0fb184cefa701f072e68b87c SHA512 b87cc85d46ffcbf6ae8b21ef5932144b956f59925a1c5a87bbcc81dd9dbd845b1f3f282b92cea3dcc15d3e338e676dd58f81762e27019c1fb6736c541b1fdd9a -EBUILD virtualbox-additions-5.2.32.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6 -EBUILD virtualbox-additions-5.2.36.ebuild 711 BLAKE2B b26c7ff1e2302c53e08ca632ca1531b11529f714702e41ebf0c9626dd0014f7955b8f1c247592cc0ce70504defe3cf208d4104b9953358d185ed87c2d0913137 SHA512 455688eafa83a3b01af4c8c516ccb102b7f6008e9e029fb5543b843c9926bc6f59aa0d5bd2da933ffc0d3ae923d90c35171bbc1dd499983a5a5be4070be73ecb -EBUILD virtualbox-additions-5.2.40.ebuild 711 BLAKE2B b26c7ff1e2302c53e08ca632ca1531b11529f714702e41ebf0c9626dd0014f7955b8f1c247592cc0ce70504defe3cf208d4104b9953358d185ed87c2d0913137 SHA512 455688eafa83a3b01af4c8c516ccb102b7f6008e9e029fb5543b843c9926bc6f59aa0d5bd2da933ffc0d3ae923d90c35171bbc1dd499983a5a5be4070be73ecb -EBUILD virtualbox-additions-6.0.16.ebuild 768 BLAKE2B bf059ba8cc66f0cd95ed56f055a0c552621817f036996a5df95f664f7689a642453d3b065eea0b2cc510ca7a0fdcb1d39c72704e935b04ed21aa870c3a3bc8c8 SHA512 4c3281e2c7069f644e9e8b2d2ac181fe5be9b4805c7788a8009f3269595d800af17f4e97101ff3696d4a9568f104502fa162c92c3883b0808bafa3b82e07ce18 +EBUILD virtualbox-additions-5.2.40.ebuild 710 BLAKE2B 5cc278d912a575945517dca38dd421209cb449ec1a75ead026dee8bf7664f38824aea1b16e378493d61d1d01eb564fa10886aa2c5a37e5ce67c1f53b40f4c745 SHA512 a0b54219ba2d003e3af5986bec95c6aedb97aa529ab72ea5f3cc80a6b8ee457cb5d8608d1e115c8661d700e694b19533cb1a65e4f59784bc30d6b87e73c6d3d2 EBUILD virtualbox-additions-6.0.20.ebuild 768 BLAKE2B bf059ba8cc66f0cd95ed56f055a0c552621817f036996a5df95f664f7689a642453d3b065eea0b2cc510ca7a0fdcb1d39c72704e935b04ed21aa870c3a3bc8c8 SHA512 4c3281e2c7069f644e9e8b2d2ac181fe5be9b4805c7788a8009f3269595d800af17f4e97101ff3696d4a9568f104502fa162c92c3883b0808bafa3b82e07ce18 -EBUILD virtualbox-additions-6.1.4.ebuild 763 BLAKE2B c57b3c6b7602771dc32a940bd3c770407809cd5acb5b02e80c0f9c2e5cbacd000e267a2cf4081f19ea17a4744b2e0eb7e40dde9662fc2ef00f478a83522b3dfa SHA512 eeb8c4d8333f2044e41eb908463b37508fa31a74cd4eefa09ec9da7def8790d71a9f55c7404c9d2355480b5547adcf0f5438fa35a0b0c9513307f26cf46b8ff5 EBUILD virtualbox-additions-6.1.6.ebuild 763 BLAKE2B c57b3c6b7602771dc32a940bd3c770407809cd5acb5b02e80c0f9c2e5cbacd000e267a2cf4081f19ea17a4744b2e0eb7e40dde9662fc2ef00f478a83522b3dfa SHA512 eeb8c4d8333f2044e41eb908463b37508fa31a74cd4eefa09ec9da7def8790d71a9f55c7404c9d2355480b5547adcf0f5438fa35a0b0c9513307f26cf46b8ff5 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild deleted file mode 100644 index d5584316c421..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.32.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=VBoxGuestAdditions -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=${MY_PN}_${MY_PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" - -LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RESTRICT="mirror" - -RDEPEND="!app-emulation/virtualbox-bin - !=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.36.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.36.ebuild deleted file mode 100644 index a36f5980fbe3..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.36.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=VBoxGuestAdditions -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=${MY_PN}_${MY_PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" - -LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" -RESTRICT="mirror" - -RDEPEND="!app-emulation/virtualbox-bin - !=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild index a36f5980fbe3..a6f1f50a2ef7 100644 --- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild +++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.40.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RESTRICT="mirror" diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.16.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.16.ebuild deleted file mode 100644 index 1afb82dc197a..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.16.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=VBoxGuestAdditions -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=${MY_PN}_${MY_PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" - -LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="mirror" - -RDEPEND="!app-emulation/virtualbox-bin - !=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.4.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.4.ebuild deleted file mode 100644 index 97264897ea7d..000000000000 --- a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.4.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=VBoxGuestAdditions -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=${MY_PN}_${MY_PV} - -DESCRIPTION="CD image containing guest additions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso" - -LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" -IUSE="" -RESTRICT="mirror" - -RDEPEND="!app-emulation/virtualbox-bin - !=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -src_unpack() { - return 0 -} - -src_install() { - insinto /usr/share/${PN/-additions} - newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso -} diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest index 88efdafc8112..e951823e4613 100644 --- a/app-emulation/virtualbox-bin/Manifest +++ b/app-emulation/virtualbox-bin/Manifest @@ -4,35 +4,17 @@ AUX vboxwebsrv-initd 674 BLAKE2B be1cb2574ff5e9e1efc6a137d18e67b2ecbe0e94b6a3a2d AUX virtualbox-bin-3-wrapper 2931 BLAKE2B bb8a72f749996b945d42a3d94ab895ee5b234bed907e6d1e055993f34a2459720bd8b0c56b61eae9c2e159e2b820d5117a6f9bed6ebfc3b327fa133c8f3aa812 SHA512 adb6ba2b3252b19b4c0331c10a025d05fd2399642530ba9aec2efa2dc8dbea4188a95806935532ad8229db29f0767c3098ef7646204f5e540e291ceb350b76ac AUX virtualbox-bin-config 28 BLAKE2B 86d452db92ceb19e9389ca83c800955066b84f4c3a289ff56cd0d7638a0a3d47891e670e070be9f3bcc30d730982237fc9211d1a9bbdbf8429c7ca80d25fbcc1 SHA512 8086ef107aff0aa3e17f5fcb8ee5de4dd8a24cb119c3523e3e3a302819eb4258328adead1b6f40b96706539f4e1c43dbd5c055a16a304ac29f7f302ebf2e4c4c AUX virtualbox-bin.desktop-2 205 BLAKE2B cb0ab2e87d0e82e88656f3288eb4af255fd1c9f732dbd6e1aa545d30d4176526fa38aebd3eccb4acb46c638056504be37231dc042fa030fcb04020e00d7d401c SHA512 7e9555aaa317e1cb551e5ff591b9d20bbb76a738f9e923c13d206e02c1e6bfc8f4eb17b498b235ac0aa2062e4acbd5f24d2522de2da3cff2e12c264875bc476d -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645 -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.36-135684.tar.gz 26989444 BLAKE2B fae15190bb434918e1ee15582c261b0bf33fbffa0ada922708892cc63ef8ca007decc7611394b056207df4f3ceb9fef781ace6f05e357e4849ae619ccc810b84 SHA512 c2a8f905ddde2c75a852e0391cfef252d45c6582994be53de8198c5c6276fe1827610620ae7e515c7cd7358ae8c9ab49766a8d968ea371895e7553955fd9cdec DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.tar.gz 26737982 BLAKE2B 4a050067c0111929fe73695ec4f057e6b33cb224c034ca564beb65cc4fb73491b2c03e0b88ddb77ede5fbd392b0e0c9eae3226f937998b2c06484ff083b4a714 SHA512 5e3e528707b7f3eab19db5358258a69518996a98364e57df9853a549d7310b8db58b40041470f263b212fe6e2bb163e745a3b9b7567c681834d99442289407f4 -DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.16-135674.tar.gz 23164167 BLAKE2B 59885f2710e8169c28cc1f5e0e9edb3b761030aee1eeeb645bed1085e145a02fb2e518108cf4426620a369b17b6ce7ff4b5c442ef69b29b33257993603874d7c SHA512 de4732d1c3ef5589c3af388c71003a1a1b4b48c7c47f26ab8b5950ccd2b906c3785af2e310df27e8f9b83ecf572857c4178c8f7cb96d3a3bca103da4fbc036ea DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.tar.gz 23238318 BLAKE2B 160e92cb889c765ae28eccb535478af81377d6ce2cadde53e572c41e52f230ca266975b8fe37db0743450bb9e90b23d2fe6d1974496bbb93280381de1379cdd6 SHA512 26f81b5ca3aa5c8423ea42cd1d650657351114f46373d9ca7fa08895865229008d1dff225b9caae6a603758da1c15d2b025da6add86fded377a2700bdbf9b65c -DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.4-136177.tar.gz 10997977 BLAKE2B 066a0302b53a62ef27f5c0fafc499e8fd8f253807bc8808e88c32a4b71872c0cc8a57ffc6727f9e2bf7f6ba1b4e1d41c3001b8e9b3e490acfd4339bf8b02dfdd SHA512 373aa70182c4f86de14c40026f1d435832f2f377a8fe422fcbc3644b5e6a5f7abfc56df3f4b9acf1fa70cccb0bc483f12b6f70f6009a725ca0fa1b7e38dbfeab DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.tar.gz 10999815 BLAKE2B f7c0e3ec1ba3c2eb991f76a574c1605eebc0a2a40751f6c822f37cbff743b642c9c09ce8dcebc725bdf51f2099dc044aed6486909ab7dd9d62335a1dd483bfb1 SHA512 938564a68e7b18a83022329217c2304470a3682ccd5a837be3caa1b802d3c7bed450428c1d3176fac571eb8a53dca2405ca53853163ad613ef056bc3b3beef68 -DIST VirtualBox-5.2.32-132073-Linux_amd64.run 83854803 BLAKE2B 3522df31f4f98efcd40adcaaf8ac458078adf0bbfed96c7d309d4726ddb8b8dd78eef830b3cfcb2f1fa6329bcc30ea2449f5c88cab66fa0c7d20818d7b5aa07a SHA512 aea9b27793f3363eba2ed627cc3b35ca51445946e6e9f20382fb3034afbb7470d27fdc476066c04acc595690a9e34109e8b8ce6dcab10fdc990b241b24ec47fb -DIST VirtualBox-5.2.32-132073-Linux_x86.run 82943439 BLAKE2B 31a22e8b52a53d6948a5af533b5c8f374d703c44736678c0bbe6fd9b5298bed4817996c32902a69c2c59dbf751cea04f22beb7203deaeadf79d2424e123e9d37 SHA512 05f99b673224c2b3d94b0d568067ae5ee74200c88a3b7f6665988a9d0c35f69f81c07292b838d07c07fd6d5484979615fd255650b138387501a593f3833b9071 -DIST VirtualBox-5.2.36-135684-Linux_amd64.run 83885521 BLAKE2B 6940d009069a80f46f0e568732e81e0151e18f7c24c5ff44dab3b305e5f21d4cf729ce162f67b21b4f034b8dc7ab4df4a07a24ab00a7349083bb15d3af27c0c4 SHA512 288a4ec1ba2f245771c87034876e1cfa59ea3eaed124bd77ffed20fadc54dbf3071624a94fefeb26a7d356fb55fe206d11510136194e15b10fa9585c8d5efe73 -DIST VirtualBox-5.2.36-135684-Linux_x86.run 82974158 BLAKE2B d2c44159f00111438c51c60d4356247693c6773e8b244fcdf24cd2029b423c36edbea20e2130cf414ca5f076d04b1c085e9fac9a6b8504a991dcf76e61feb2c0 SHA512 888fafda0986066edf32c208503857ce58f220251d142ac0a327989d0d24987b2d69798143142e749c49cf37fddec23b3fe624503914327d0c53e3794db2d688 DIST VirtualBox-5.2.40-137108-Linux_amd64.run 83865043 BLAKE2B d44f3ee6b05446fbe36b5672ec00d2ffcf5b8592ebfdfc6d091dd1bf92d821644976bad55ca390ad834d274dbe738341457888fb78030de9ddadd680362c4b11 SHA512 1f068f776ef65ed930eed0ecc6304a374ea36339c21dfc7b41a61b6e82d61f5c8de13f4b93f19500f9eccbe9e3d0f1a816c46b7b7b4d5ed195ce1ddc45c57e7f DIST VirtualBox-5.2.40-137108-Linux_x86.run 82994639 BLAKE2B 4f90a72d5d8952ae05bff9c50262e377c0ffbc134741eddc0aa6dccd9a575de746bcdcf0e0fc2db8f5ee36e730bcf814e0fd1291a739dd33260be7219f11c44a SHA512 580f8a6c7a1fe04132789b60ce4cb4db39f980590731e18b9c2cd7727d59efdd5250fbe80704a4542f8876d8fdc89cc048b669259e8170a28350157901bc14c4 -DIST VirtualBox-6.0.16-135674-Linux_amd64.run 127251928 BLAKE2B a0aa634be851ba5620ae89b0c324204aa4a069c1480fe0d7effcb3796900b688d39f1204778e16e407c266d06583d3531e7831b789de238bab380160a9821036 SHA512 d3cdd40a5f7d2bc1537244db1dd5c5cb58a5b7df527952c1abcd5bd701afd59dd77ec1aa90489cd7640fe88a01aac9b20cc8522750f534a5d11af6f7e125482c DIST VirtualBox-6.0.20-137117-Linux_amd64.run 127231448 BLAKE2B 2fa6307add56b318708cdb88615aa15e39577f43c0d65e74037d6f184a3937144ae8f5abcf217809776dd19e4f3141e5bb78adadebc0be63d47bc69786cfa0c7 SHA512 9ac9b893c7cad4dc58833f6132ec0da6564a11112d8bef881bf1dab584abf046e167513c2e4c4ed3c5ce2e4b845c9cf99721fda657b2993b5692eb4ca15d2f5b -DIST VirtualBox-6.1.4-136177-Linux_amd64.run 117185995 BLAKE2B 4ce483efd27c3183024f7baa3e07c1d6484767ba957582cad3111359c9d5b24b293f3b860ea566eb1bbc383710cb81b27b4e39c2aa24c9cc56dc6ba593fd1adb SHA512 14609ff7c76e93b561763456fc92dc3d3ed8d0c556af1ea0906abfb88a8fce9b8da6f392f3146945d03c7874f78d3f1f61df563c9f0160ef3315f30c286316e6 DIST VirtualBox-6.1.6-137129-Linux_amd64.run 110530008 BLAKE2B 9f2f2e65ace7bc5919dcaba23b0a979a1b246af65722fd955dfb6110bda0fc119f9388e8d404bbdbf00bd8a96c25c505dc7a3589fc98680cdb115f1c1327936d SHA512 a4ea1a37bcbc70a9be3bf201dac06e31bb5d8e4dd9d9f04fb8f2fc6387c6ae165c0812d357062e1593a2d5a6d7902ba068984bc8658750df49d991025b96dc05 -DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf -DIST VirtualBoxSDK-5.2.36-135684.zip 10203411 BLAKE2B 241dca39482d620063476b86514d3b71d69b3187be15fdf8774ee3fc34ff98ac66ba97baebe4cc107727a07594d3c124c05867a7f62661cf11bc6bd43528cdba SHA512 646bc84b605c236ecf9c38fd14cfc5f2d1ddf72a874482dd9a0f799bc099e3c2ca11512607d988c411495fcf12495ea49e0fabea2ca04a22e73efecb94928190 DIST VirtualBoxSDK-5.2.40-137108.zip 10201020 BLAKE2B db4a2fd69fdc3ab4201c086c15f14144dd1f75e87d13c4493aaeaf2b69e06a599623416e17a3715c9836b7b7bf36aaba34c06e27ddd70900ca6c5fdd43e311e1 SHA512 15bf89ca622396a5b2f66fb42762959548e8d0b2e0bd3b63223bcccff449f5c094af0315deecae167e105276915fb6b2e61a1f71465be4e85b52a58e313a2830 -DIST VirtualBoxSDK-6.0.16-135674.zip 10803791 BLAKE2B 2b8507cf5143370ab753f55b27c1890ded25b1ed28457bb8ba094f2b2fa7e813d0605a25c5adbcbe828aec34c9fe7526e7a60c2e1cfc1085a611959474016280 SHA512 c7b811b89d6fa892c86c60e41922051d75ff079c9868eaf3b454aca73b3de77aa9361422216668203d105c910fffa94bd7b4bae4243c769660209c979009d7fe DIST VirtualBoxSDK-6.0.20-137117.zip 10803680 BLAKE2B aaec9c6b9f0d758528f8490920bc98c594e8aa2bd241f941e9093553d5353b4999f4041519198740344da92af3d7fb7992dcb6945a55d5471d9952a76daea4f5 SHA512 b2574f7d93c3d92a09a2cd18f68db3ac78d5c51d454cc322800b0d8555c4fdb541b5c797e11795dda51f5998f98dc9ed4839b836f4c64f8f95211b6ae71c198d -DIST VirtualBoxSDK-6.1.4-136177.zip 11173848 BLAKE2B 816b18bcfe2cde169dca3c5f3e89854b61f2bb7b59d28749f994c8f9a60e18c5f1cbe659c53c7a3b49a0bcb90959c0cd0b36c2254879f735e835b463927b2190 SHA512 e7b2a0dc892a9989cd0142edad131d0cf4240029d98f80a230e3e401be3a6f1d8c82c810b19b7e865946145b77cd87d91602adc640c182a2dfbdae1c21821a48 DIST VirtualBoxSDK-6.1.6-137129.zip 11176791 BLAKE2B 9ad2592604e9b007c8d302d8efb67a3b5e069549bca7e6330a417d1c719e2de533e0f429909f95cfb77a5633eb806955c4ae4113ad6707af33854b7605215531 SHA512 d46549657fd8f2eb95196c310a9d81163fb231ce663ac7e24e1e8ac15b5830b25188c547db91fdca5b9524c2ba340f0b638e34863f8e26b4d118bf832b7f99bf -EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B 7cbf1dc1c97c89206aed7d59ea9af49c1ed43335f98dd954001b891692f20ac77db051c1d0c9fa45094d99f5aa72cfb15a07e853a9c7542cabd8837c826adab1 SHA512 eaef0196a2d0bc5b0b50ba04125c33100821018a91149fd07e97e4cb85082f4d2df78536343905756608feb89fcb3b87a1a9aee07043555e72dde6b91c4f9c9b -EBUILD virtualbox-bin-5.2.36.135684.ebuild 8329 BLAKE2B 83fdc9985fc0ce401ecf69e178e57a928c8befcd46645f7f84c1c27b83dc696183b9a89b70f408fd8c9ab7744625f3ef98d53042744ad02f68a6fb6d81350389 SHA512 bfa64d3d0c43ffdad8fa1ba95325f1cee497478c6750deaf1e8d23f8ce0d5abcc272db2503f2b524135af29840df5a65295018547138a0d42c1763cbf5d11549 -EBUILD virtualbox-bin-5.2.40.137108.ebuild 8329 BLAKE2B 83fdc9985fc0ce401ecf69e178e57a928c8befcd46645f7f84c1c27b83dc696183b9a89b70f408fd8c9ab7744625f3ef98d53042744ad02f68a6fb6d81350389 SHA512 bfa64d3d0c43ffdad8fa1ba95325f1cee497478c6750deaf1e8d23f8ce0d5abcc272db2503f2b524135af29840df5a65295018547138a0d42c1763cbf5d11549 -EBUILD virtualbox-bin-6.0.16.135674-r1.ebuild 8513 BLAKE2B a7f8888ac85d53c08e8c70602c951e1c0432c5b908d29e1a1e9dfe762778f5d11d6e28b6bd392c6a9d40d00cd1c1a964fe6400b79d0c59422d950ef53b38c9ff SHA512 1f6fe943790a95332b7fe3c240fc355b842dd34e193605f73171507fca7fec77cc0da322cc0815580930c29a21594dfbe2305bf831ef49fb280a72e9fef23a1f +EBUILD virtualbox-bin-5.2.40.137108.ebuild 8328 BLAKE2B 374f7989bef23f23edda495f8cb44b561d4174b4e90c3eeef3ee7f7865f6a2532532fb8d66c9f42bd4be9fe8042d3162f4f83b3d1ac9f322b2965ce6da69b74a SHA512 86301b658c8266ffecdf87cca476be3041f7ed89aaeb878b4abd2c0cfb8c9e1519b369ceb06c75b582f208e1fb7305f0fac9e34418972d0f50f656fa1fb84e4c EBUILD virtualbox-bin-6.0.20.137117.ebuild 8513 BLAKE2B a7f8888ac85d53c08e8c70602c951e1c0432c5b908d29e1a1e9dfe762778f5d11d6e28b6bd392c6a9d40d00cd1c1a964fe6400b79d0c59422d950ef53b38c9ff SHA512 1f6fe943790a95332b7fe3c240fc355b842dd34e193605f73171507fca7fec77cc0da322cc0815580930c29a21594dfbe2305bf831ef49fb280a72e9fef23a1f -EBUILD virtualbox-bin-6.1.4.136177-r1.ebuild 8513 BLAKE2B fd3084df313b23a8c45282bc0b0aeabc3e1796182f2388b255c6f2af83c7808995f5c6beacc222e8bc49d500ccddf8b0b8ea7fa3fb237f83363894a28231cfa7 SHA512 413336dc5117771963b1ddc5601a752240d41f5f990103c511639ad1aa716639eca1ff827229a4db0b95ae7a552f1a6ffd95a09228a1e89ca899361582f2b9d3 EBUILD virtualbox-bin-6.1.6.137129.ebuild 8513 BLAKE2B fd3084df313b23a8c45282bc0b0aeabc3e1796182f2388b255c6f2af83c7808995f5c6beacc222e8bc49d500ccddf8b0b8ea7fa3fb237f83363894a28231cfa7 SHA512 413336dc5117771963b1ddc5601a752240d41f5f990103c511639ad1aa716639eca1ff827229a4db0b95ae7a552f1a6ffd95a09228a1e89ca899361582f2b9d3 MISC metadata.xml 599 BLAKE2B 2af2e738880f4fb9b684baa124df483d90548177fc8f5a8223dc13a5c96a3bf7f84754a41c4d2bd5821140dd2479874b4d7c8b99b04a83febc5027f4370fb70f SHA512 4306caf88c97be9f63238727dd70ad834011dc33650aa809eaf4ac285febecd7604dc030b285a31167ecb338434fc68eff011528533cda53acdd72ad6a5b5aa0 diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild deleted file mode 100644 index 2ed1560fbf7a..000000000000 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5)" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}" -MY_P="VirtualBox-${VBOX_PV}-Linux" -# needed as sometimes the extpack gets another build ID -EXTP_PV="${VBOX_PV}" -EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack" -EXTP_P="${EXTP_PN}-${EXTP_PV}" -# needed as sometimes the SDK gets another build ID -SDK_PV="${VBOX_PV}" -SDK_P="VirtualBoxSDK-${SDK_PV}" - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run ) - x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run ) - https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz" - -LICENSE="GPL-2 PUEL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp" -RESTRICT="bindist mirror" - -if [[ "${PV}" != *beta* ]] ; then - SRC_URI+=" - sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )" - IUSE+=" sdk" -fi - -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="!!app-emulation/virtualbox - !app-emulation/virtualbox-additions - ~app-emulation/virtualbox-modules-${MAIN_PV} - !headless? ( - dev-libs/glib - media-libs/fontconfig - media-libs/freetype - media-libs/libpng - media-libs/libsdl[X] - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - chm? ( dev-libs/expat ) - ) - dev-libs/libxml2 - sys-fs/lvm2 - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libSM - x11-libs/libICE - x11-libs/libXdmcp - ${PYTHON_DEPS}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}" - -QA_PREBUILT="opt/VirtualBox/*" - -PYTHON_UPDATER_IGNORE="1" - -src_unpack() { - unpack_makeself ${MY_P}_${ARCH}.run - unpack ./VirtualBox.tar.bz2 - - mkdir "${S}"/${EXTP_PN} || die - pushd "${S}"/${EXTP_PN} &>/dev/null || die - unpack ${EXTP_P}.tar.gz - popd &>/dev/null || die - - if [[ "${PV}" != *beta* ]] && use sdk ; then - unpack VirtualBoxSDK-${SDK_PV}.zip - fi -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - - if ! use headless ; then - newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop - - # set up symlinks (bug #572012) - dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml - - local size ico icofile - for size in 16 24 32 48 64 72 96 128 256 ; do - pushd "${S}"/icons/${size}x${size} &>/dev/null || die - if [[ -f "virtualbox.png" ]] ; then - doicon -s ${size} virtualbox.png - fi - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="virtualbox-${ico}.png" - if [[ -f "${icofile}" ]] ; then - doicon -s ${size} ${icofile} - fi - done - popd &>/dev/null || die - done - doicon -s scalable "${S}"/icons/scalable/virtualbox.svg - insinto /usr/share/pixmaps - newins "${S}"/icons/48x48/virtualbox.png ${PN}.png - fi - - pushd "${S}"/${EXTP_PN} &>/dev/null || die - insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom - popd &>/dev/null || die - rm -rf "${S}"/${EXTP_PN} - - insinto /opt/VirtualBox - dodir /opt/bin - - doins UserManual.pdf - - if [[ "${PV}" != *beta* ]] && use sdk ; then - doins -r sdk - fi - - if use additions; then - doins -r additions - fi - - if use vboxwebsrv; then - doins vboxwebsrv - fowners root:vboxusers /opt/VirtualBox/vboxwebsrv - fperms 0750 /opt/VirtualBox/vboxwebsrv - dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - if use rdesktop-vrdp; then - doins rdesktop-vrdp - doins -r rdesktop-vrdp-keymaps - fperms 0750 /opt/VirtualBox/rdesktop-vrdp - dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp - fi - - if ! use headless && use chm; then - doins kchmviewer VirtualBox.chm - fowners root:vboxusers /opt/VirtualBox/kchmviewer - fperms 0750 /opt/VirtualBox/kchmviewer - fi - - # This ebuild / package supports only py2.7. When py3 comes is unknown. - # The compile phase makes VBoxPython2_7.so. - # py3 support would presumably require a binary pre-compiled by py3. - use python && doins VBoxPython.so VBoxPython2_7.so - - rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ - vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \ - VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \ - webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \ - 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \ - VBoxPython?_*.so - - if use headless ; then - rm -rf VBoxSDL VirtualBox VBoxKeyboard.so - fi - - doins -r * - - # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) - dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so - dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so - dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so - dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so - dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so - - local each - for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. - fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl - fperms 4750 /opt/VirtualBox/VBoxNetDHCP - fperms 4750 /opt/VirtualBox/VBoxNetNAT - - if ! use headless ; then - # Hardened build: Mark selected binaries set-user-ID-on-execution - for each in VBox{SDL,Headless} VirtualBox; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4510 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL - else - # Hardened build: Mark selected binaries set-user-ID-on-execution - fowners root:vboxusers /opt/VirtualBox/VBoxHeadless - fperms 4510 /opt/VirtualBox/VBoxHeadless - pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless - fi - - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless - dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - local udevdir="$(get_udevdir)" - insinto ${udevdir}/rules.d - doins "${FILESDIR}"/10-virtualbox.rules - sed "s@%UDEVDIR%@${udevdir}@" \ - -i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die - # move udev scripts into ${udevdir} (bug #372491) - mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh -} - -pkg_postinst() { - xdg_desktop_database_update - - gnome2_icon_cache_update - - udevadm control --reload-rules && udevadm trigger --subsystem-match=usb - - elog "" - if ! use headless ; then - elog "To launch VirtualBox just type: \"VirtualBox\"" - elog "" - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Please visit http://www.virtualbox.org/wiki/Editions for" - elog "an overview about the different features of ${PN}" - elog "and virtualbox-ose" - if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.36.135684.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.36.135684.ebuild deleted file mode 100644 index accb093039ef..000000000000 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.36.135684.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5)" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}" -MY_P="VirtualBox-${VBOX_PV}-Linux" -# needed as sometimes the extpack gets another build ID -EXTP_PV="${VBOX_PV}" -EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack" -EXTP_P="${EXTP_PN}-${EXTP_PV}" -# needed as sometimes the SDK gets another build ID -SDK_PV="${VBOX_PV}" -SDK_P="VirtualBoxSDK-${SDK_PV}" - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run ) - x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run ) - https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz" - -LICENSE="GPL-2 PUEL" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp" -RESTRICT="bindist mirror" - -if [[ "${PV}" != *beta* ]] ; then - SRC_URI+=" - sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )" - IUSE+=" sdk" -fi - -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="!!app-emulation/virtualbox - !app-emulation/virtualbox-additions - ~app-emulation/virtualbox-modules-${MAIN_PV} - !headless? ( - dev-libs/glib - media-libs/fontconfig - media-libs/freetype - media-libs/libpng - media-libs/libsdl[X] - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - chm? ( dev-libs/expat ) - ) - dev-libs/libxml2 - sys-fs/lvm2 - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libSM - x11-libs/libICE - x11-libs/libXdmcp - ${PYTHON_DEPS}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}" - -QA_PREBUILT="opt/VirtualBox/*" - -PYTHON_UPDATER_IGNORE="1" - -src_unpack() { - unpack_makeself ${MY_P}_${ARCH}.run - unpack ./VirtualBox.tar.bz2 - - mkdir "${S}"/${EXTP_PN} || die - pushd "${S}"/${EXTP_PN} &>/dev/null || die - unpack ${EXTP_P}.tar.gz - popd &>/dev/null || die - - if [[ "${PV}" != *beta* ]] && use sdk ; then - unpack VirtualBoxSDK-${SDK_PV}.zip - fi -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - - if ! use headless ; then - newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop - - # set up symlinks (bug #572012) - dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml - - local size ico icofile - for size in 16 24 32 48 64 72 96 128 256 ; do - pushd "${S}"/icons/${size}x${size} &>/dev/null || die - if [[ -f "virtualbox.png" ]] ; then - doicon -s ${size} virtualbox.png - fi - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="virtualbox-${ico}.png" - if [[ -f "${icofile}" ]] ; then - doicon -s ${size} ${icofile} - fi - done - popd &>/dev/null || die - done - doicon -s scalable "${S}"/icons/scalable/virtualbox.svg - insinto /usr/share/pixmaps - newins "${S}"/icons/48x48/virtualbox.png ${PN}.png - fi - - pushd "${S}"/${EXTP_PN} &>/dev/null || die - insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom - popd &>/dev/null || die - rm -rf "${S}"/${EXTP_PN} - - insinto /opt/VirtualBox - dodir /opt/bin - - doins UserManual.pdf - - if [[ "${PV}" != *beta* ]] && use sdk ; then - doins -r sdk - fi - - if use additions; then - doins -r additions - fi - - if use vboxwebsrv; then - doins vboxwebsrv - fowners root:vboxusers /opt/VirtualBox/vboxwebsrv - fperms 0750 /opt/VirtualBox/vboxwebsrv - dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - if use rdesktop-vrdp; then - doins rdesktop-vrdp - doins -r rdesktop-vrdp-keymaps - fperms 0750 /opt/VirtualBox/rdesktop-vrdp - dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp - fi - - if ! use headless && use chm; then - doins kchmviewer VirtualBox.chm - fowners root:vboxusers /opt/VirtualBox/kchmviewer - fperms 0750 /opt/VirtualBox/kchmviewer - fi - - # This ebuild / package supports only py2.7. When py3 comes is unknown. - # The compile phase makes VBoxPython2_7.so. - # py3 support would presumably require a binary pre-compiled by py3. - use python && doins VBoxPython.so VBoxPython2_7.so - - rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ - vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \ - VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \ - webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \ - 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \ - VBoxPython?_*.so - - if use headless ; then - rm -rf VBoxSDL VirtualBox VBoxKeyboard.so - fi - - doins -r * - - # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) - dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so - dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so - dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so - dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so - dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so - - local each - for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,NetNAT,TestOGL,ExtPackHelperApp}; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. - fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl - fperms 4750 /opt/VirtualBox/VBoxNetDHCP - fperms 4750 /opt/VirtualBox/VBoxNetNAT - - if ! use headless ; then - # Hardened build: Mark selected binaries set-user-ID-on-execution - for each in VBox{SDL,Headless} VirtualBox; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4510 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL - else - # Hardened build: Mark selected binaries set-user-ID-on-execution - fowners root:vboxusers /opt/VirtualBox/VBoxHeadless - fperms 4510 /opt/VirtualBox/VBoxHeadless - pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless - fi - - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless - dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - local udevdir="$(get_udevdir)" - insinto ${udevdir}/rules.d - doins "${FILESDIR}"/10-virtualbox.rules - sed "s@%UDEVDIR%@${udevdir}@" \ - -i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die - # move udev scripts into ${udevdir} (bug #372491) - mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh -} - -pkg_postinst() { - xdg_desktop_database_update - - gnome2_icon_cache_update - - udevadm control --reload-rules && udevadm trigger --subsystem-match=usb - - elog "" - if ! use headless ; then - elog "To launch VirtualBox just type: \"VirtualBox\"" - elog "" - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Please visit http://www.virtualbox.org/wiki/Editions for" - elog "an overview about the different features of ${PN}" - elog "and virtualbox-ose" - if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild index accb093039ef..46e94991f5b3 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.40.137108.ebuild @@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am LICENSE="GPL-2 PUEL" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp" RESTRICT="bindist mirror" diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.16.135674-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.16.135674-r1.ebuild deleted file mode 100644 index 0b44094702c5..000000000000 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.16.135674-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5-6)" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - KEYWORDS="~amd64" #~x86 -fi -VBOX_BUILD_ID="$(ver_cut 4)" -VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}" -MY_P="VirtualBox-${VBOX_PV}-Linux" -# needed as sometimes the extpack gets another build ID -EXTP_PV="${VBOX_PV}" -EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack" -EXTP_P="${EXTP_PN}-${EXTP_PV}" -# needed as sometimes the SDK gets another build ID -SDK_PV="${VBOX_PV}" -SDK_P="VirtualBoxSDK-${SDK_PV}" - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run ) - https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz" - #x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run ) - -LICENSE="GPL-2 PUEL" -SLOT="0" -IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp" -RESTRICT="bindist mirror" - -if [[ "${PV}" != *beta* ]] ; then - SRC_URI+=" - sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )" - IUSE+=" sdk" -fi - -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="!!app-emulation/virtualbox - !app-emulation/virtualbox-additions - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${MAIN_PV} - !headless? ( - dev-libs/glib - media-libs/fontconfig - media-libs/freetype - media-libs/libpng - media-libs/libsdl[X] - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - chm? ( dev-libs/expat ) - ) - dev-libs/libxml2 - sys-fs/lvm2 - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libSM - x11-libs/libICE - x11-libs/libXdmcp - ${PYTHON_DEPS}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}" - -QA_PREBUILT="opt/VirtualBox/*" - -PYTHON_UPDATER_IGNORE="1" - -src_unpack() { - unpack_makeself ${MY_P}_${ARCH}.run - unpack ./VirtualBox.tar.bz2 - - mkdir "${S}"/${EXTP_PN} || die - pushd "${S}"/${EXTP_PN} &>/dev/null || die - unpack ${EXTP_P}.tar.gz - popd &>/dev/null || die - - if [[ "${PV}" != *beta* ]] && use sdk ; then - unpack VirtualBoxSDK-${SDK_PV}.zip - fi -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - - if ! use headless ; then - newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop - - # set up symlinks (bug #572012) - dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml - - local size ico icofile - for size in 16 24 32 48 64 72 96 128 256 ; do - pushd "${S}"/icons/${size}x${size} &>/dev/null || die - if [[ -f "virtualbox.png" ]] ; then - doicon -s ${size} virtualbox.png - fi - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="virtualbox-${ico}.png" - if [[ -f "${icofile}" ]] ; then - doicon -s ${size} ${icofile} - fi - done - popd &>/dev/null || die - done - doicon -s scalable "${S}"/icons/scalable/virtualbox.svg - insinto /usr/share/pixmaps - newins "${S}"/icons/48x48/virtualbox.png ${PN}.png - fi - - pushd "${S}"/${EXTP_PN} &>/dev/null || die - insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom - popd &>/dev/null || die - rm -rf "${S}"/${EXTP_PN} - - insinto /opt/VirtualBox - dodir /opt/bin - - doins UserManual.pdf - - if [[ "${PV}" != *beta* ]] && use sdk ; then - doins -r sdk - fi - - if use additions; then - doins -r additions - fi - - if use vboxwebsrv; then - doins vboxwebsrv - fowners root:vboxusers /opt/VirtualBox/vboxwebsrv - fperms 0750 /opt/VirtualBox/vboxwebsrv - dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - if use rdesktop-vrdp; then - doins rdesktop-vrdp - doins -r rdesktop-vrdp-keymaps - fperms 0750 /opt/VirtualBox/rdesktop-vrdp - dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp - fi - - if ! use headless && use chm; then - doins kchmviewer VirtualBox.chm - fowners root:vboxusers /opt/VirtualBox/kchmviewer - fperms 0750 /opt/VirtualBox/kchmviewer - fi - - # This ebuild / package supports only py2.7. When py3 comes is unknown. - # The compile phase makes VBoxPython2_7.so. - # py3 support would presumably require a binary pre-compiled by py3. - use python && doins VBoxPython.so - - rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ - vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \ - VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \ - webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \ - 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \ - VBoxPython?_*.so - - if use headless ; then - rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so - fi - - doins -r * - - # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) - dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so - dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so - dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so - dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so - dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so - - local each - for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. - for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - if ! use headless ; then - # Hardened build: Mark selected binaries set-user-ID-on-execution - for each in VBox{SDL,Headless} ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4510 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL - else - # Hardened build: Mark selected binaries set-user-ID-on-execution - fowners root:vboxusers /opt/VirtualBox/VBoxHeadless - fperms 4510 /opt/VirtualBox/VBoxHeadless - pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless - fi - - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless - dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - local udevdir="$(get_udevdir)" - insinto ${udevdir}/rules.d - doins "${FILESDIR}"/10-virtualbox.rules - sed "s@%UDEVDIR%@${udevdir}@" \ - -i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die - # move udev scripts into ${udevdir} (bug #372491) - mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - - udevadm control --reload-rules && udevadm trigger --subsystem-match=usb - - elog "" - if ! use headless ; then - elog "To launch VirtualBox just type: \"VirtualBox\"" - elog "" - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Please visit http://www.virtualbox.org/wiki/Editions for" - elog "an overview about the different features of ${PN}" - elog "and virtualbox-ose" - if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.4.136177-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.4.136177-r1.ebuild deleted file mode 100644 index 067dfbaf487d..000000000000 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.4.136177-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit xdg-utils gnome2 pax-utils python-r1 udev unpacker eapi7-ver - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5-6)" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - KEYWORDS="~amd64" #~x86 -fi -VBOX_BUILD_ID="$(ver_cut 4)" -VBOX_PV="${MY_PV}-${VBOX_BUILD_ID}" -MY_P="VirtualBox-${VBOX_PV}-Linux" -# needed as sometimes the extpack gets another build ID -EXTP_PV="${VBOX_PV}" -EXTP_PN="Oracle_VM_VirtualBox_Extension_Pack" -EXTP_P="${EXTP_PN}-${EXTP_PV}" -# needed as sometimes the SDK gets another build ID -SDK_PV="${VBOX_PV}" -SDK_P="VirtualBoxSDK-${SDK_PV}" - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd64.run ) - https://download.virtualbox.org/virtualbox/${MY_PV}/${EXTP_P}.vbox-extpack -> ${EXTP_P}.tar.gz" - #x86? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_x86.run ) - -LICENSE="GPL-2 PUEL" -SLOT="0" -IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp" -RESTRICT="bindist mirror" - -if [[ "${PV}" != *beta* ]] ; then - SRC_URI+=" - sdk? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${SDK_P}.zip )" - IUSE+=" sdk" -fi - -DEPEND="app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="!!app-emulation/virtualbox - !app-emulation/virtualbox-additions - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${MY_PV,,} - !headless? ( - dev-libs/glib - media-libs/fontconfig - media-libs/freetype - media-libs/libpng - media-libs/libsdl[X] - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - chm? ( dev-libs/expat ) - ) - dev-libs/libxml2 - sys-fs/lvm2 - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXmu - x11-libs/libSM - x11-libs/libICE - x11-libs/libXdmcp - ${PYTHON_DEPS}" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}" - -QA_PREBUILT="opt/VirtualBox/*" - -PYTHON_UPDATER_IGNORE="1" - -src_unpack() { - unpack_makeself ${MY_P}_${ARCH}.run - unpack ./VirtualBox.tar.bz2 - - mkdir "${S}"/${EXTP_PN} || die - pushd "${S}"/${EXTP_PN} &>/dev/null || die - unpack ${EXTP_P}.tar.gz - popd &>/dev/null || die - - if [[ "${PV}" != *beta* ]] && use sdk ; then - unpack VirtualBoxSDK-${SDK_PV}.zip - fi -} - -src_configure() { - :; -} - -src_compile() { - :; -} - -src_install() { - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - - if ! use headless ; then - newmenu "${FILESDIR}"/${PN}.desktop-2 ${PN}.desktop - - # set up symlinks (bug #572012) - dosym ../../../../opt/VirtualBox/virtualbox.xml /usr/share/mime/packages/virtualbox.xml - - local size ico icofile - for size in 16 24 32 48 64 72 96 128 256 ; do - pushd "${S}"/icons/${size}x${size} &>/dev/null || die - if [[ -f "virtualbox.png" ]] ; then - doicon -s ${size} virtualbox.png - fi - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="virtualbox-${ico}.png" - if [[ -f "${icofile}" ]] ; then - doicon -s ${size} ${icofile} - fi - done - popd &>/dev/null || die - done - doicon -s scalable "${S}"/icons/scalable/virtualbox.svg - insinto /usr/share/pixmaps - newins "${S}"/icons/48x48/virtualbox.png ${PN}.png - fi - - pushd "${S}"/${EXTP_PN} &>/dev/null || die - insinto /opt/VirtualBox/ExtensionPacks/${EXTP_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom - popd &>/dev/null || die - rm -rf "${S}"/${EXTP_PN} - - insinto /opt/VirtualBox - dodir /opt/bin - - doins UserManual.pdf - - if [[ "${PV}" != *beta* ]] && use sdk ; then - doins -r sdk - fi - - if use additions; then - doins -r additions - fi - - if use vboxwebsrv; then - doins vboxwebsrv - fowners root:vboxusers /opt/VirtualBox/vboxwebsrv - fperms 0750 /opt/VirtualBox/vboxwebsrv - dosym ../../opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - if use rdesktop-vrdp; then - doins rdesktop-vrdp - doins -r rdesktop-vrdp-keymaps - fperms 0750 /opt/VirtualBox/rdesktop-vrdp - dosym ../../opt/VirtualBox/rdesktop-vrdp /opt/bin/rdesktop-vrdp - fi - - if ! use headless && use chm; then - doins kchmviewer VirtualBox.chm - fowners root:vboxusers /opt/VirtualBox/kchmviewer - fperms 0750 /opt/VirtualBox/kchmviewer - fi - - # This ebuild / package supports only py2.7. When py3 comes is unknown. - # The compile phase makes VBoxPython2_7.so. - # py3 support would presumably require a binary pre-compiled by py3. - use python && doins VBoxPython.so - - rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ - vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \ - VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \ - webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \ - 90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \ - VBoxPython?_*.so - - if use headless ; then - rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so - fi - - doins -r * - - # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) - dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so - dosym ../VBoxREM.so /opt/VirtualBox/components/VBoxREM.so - dosym ../VBoxRT.so /opt/VirtualBox/components/VBoxRT.so - dosym ../VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so - dosym ../VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so - - local each - for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,TestOGL,ExtPackHelperApp} $(usex headless '' VirtualBox) ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - # VBoxNetAdpCtl and VBoxNetDHCP binaries need to be suid root in any case.. - for each in VBoxNet{AdpCtl,DHCP,NAT} $(usex headless '' VirtualBoxVM) ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4750 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - if ! use headless ; then - # Hardened build: Mark selected binaries set-user-ID-on-execution - for each in VBox{SDL,Headless} ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 4510 /opt/VirtualBox/${each} - pax-mark -m "${ED%/}"/opt/VirtualBox/${each} - done - - dosym ../VirtualBox/VBox.sh /opt/bin/VirtualBox - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxSDL - else - # Hardened build: Mark selected binaries set-user-ID-on-execution - fowners root:vboxusers /opt/VirtualBox/VBoxHeadless - fperms 4510 /opt/VirtualBox/VBoxHeadless - pax-mark -m "${ED%/}"/opt/VirtualBox/VBoxHeadless - fi - - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxManage - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxVRDP - dosym ../VirtualBox/VBox.sh /opt/bin/VBoxHeadless - dosym ../VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - local udevdir="$(get_udevdir)" - insinto ${udevdir}/rules.d - doins "${FILESDIR}"/10-virtualbox.rules - sed "s@%UDEVDIR%@${udevdir}@" \ - -i "${ED%/}"${udevdir}/rules.d/10-virtualbox.rules || die - # move udev scripts into ${udevdir} (bug #372491) - mv "${ED%/}"/opt/VirtualBox/VBoxCreateUSBNode.sh "${ED%/}"${udevdir} || die - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - - udevadm control --reload-rules && udevadm trigger --subsystem-match=usb - - elog "" - if ! use headless ; then - elog "To launch VirtualBox just type: \"VirtualBox\"" - elog "" - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Please visit http://www.virtualbox.org/wiki/Editions for" - elog "an overview about the different features of ${PN}" - elog "and virtualbox-ose" - if [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest index 953a48c2c89d..f32de16b2726 100644 --- a/app-emulation/virtualbox-extpack-oracle/Manifest +++ b/app-emulation/virtualbox-extpack-oracle/Manifest @@ -1,15 +1,7 @@ -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e52c746299d32ae908892791d8fb9b4dda264875e66bf0459adfbc64381001e9be1800a8ac93bbea14dceb47a0e81cf79c29a4c0796f7c4a30021e4beb036cfa SHA512 382ed45a90981397da7d46925a73c5aa0cc870fe41992c87ccd3d3a33420b199e4a0a19761a6c6ebeacf93450e2937d81befb6fdaf7fb7961827e23f0f24c645 -DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.36-135684.tar.gz 26989444 BLAKE2B fae15190bb434918e1ee15582c261b0bf33fbffa0ada922708892cc63ef8ca007decc7611394b056207df4f3ceb9fef781ace6f05e357e4849ae619ccc810b84 SHA512 c2a8f905ddde2c75a852e0391cfef252d45c6582994be53de8198c5c6276fe1827610620ae7e515c7cd7358ae8c9ab49766a8d968ea371895e7553955fd9cdec DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.40-137108.tar.gz 26737982 BLAKE2B 4a050067c0111929fe73695ec4f057e6b33cb224c034ca564beb65cc4fb73491b2c03e0b88ddb77ede5fbd392b0e0c9eae3226f937998b2c06484ff083b4a714 SHA512 5e3e528707b7f3eab19db5358258a69518996a98364e57df9853a549d7310b8db58b40041470f263b212fe6e2bb163e745a3b9b7567c681834d99442289407f4 -DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.16-135674.tar.gz 23164167 BLAKE2B 59885f2710e8169c28cc1f5e0e9edb3b761030aee1eeeb645bed1085e145a02fb2e518108cf4426620a369b17b6ce7ff4b5c442ef69b29b33257993603874d7c SHA512 de4732d1c3ef5589c3af388c71003a1a1b4b48c7c47f26ab8b5950ccd2b906c3785af2e310df27e8f9b83ecf572857c4178c8f7cb96d3a3bca103da4fbc036ea DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.20-137117.tar.gz 23238318 BLAKE2B 160e92cb889c765ae28eccb535478af81377d6ce2cadde53e572c41e52f230ca266975b8fe37db0743450bb9e90b23d2fe6d1974496bbb93280381de1379cdd6 SHA512 26f81b5ca3aa5c8423ea42cd1d650657351114f46373d9ca7fa08895865229008d1dff225b9caae6a603758da1c15d2b025da6add86fded377a2700bdbf9b65c -DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.4-136177.tar.gz 10997977 BLAKE2B 066a0302b53a62ef27f5c0fafc499e8fd8f253807bc8808e88c32a4b71872c0cc8a57ffc6727f9e2bf7f6ba1b4e1d41c3001b8e9b3e490acfd4339bf8b02dfdd SHA512 373aa70182c4f86de14c40026f1d435832f2f377a8fe422fcbc3644b5e6a5f7abfc56df3f4b9acf1fa70cccb0bc483f12b6f70f6009a725ca0fa1b7e38dbfeab DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.6-137129.tar.gz 10999815 BLAKE2B f7c0e3ec1ba3c2eb991f76a574c1605eebc0a2a40751f6c822f37cbff743b642c9c09ce8dcebc725bdf51f2099dc044aed6486909ab7dd9d62335a1dd483bfb1 SHA512 938564a68e7b18a83022329217c2304470a3682ccd5a837be3caa1b802d3c7bed450428c1d3176fac571eb8a53dca2405ca53853163ad613ef056bc3b3beef68 -EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07 -EBUILD virtualbox-extpack-oracle-5.2.36.135684.ebuild 1014 BLAKE2B 98430a4df92cb561f976e21c54549b34bb6667ca8e11b8cd05fae0e143bacb5f558d9714454f4d2c7dcdc3e118c436a3245e81b8964ca006c713dfa1db620744 SHA512 aa348126bfa07bada186d37b61cb381c72259cb91649c269115aa5323e8f677add4174b7e6a6319c7b1eb116ef73d14eeef81dc59ec327a6a60e249516a7fa6e -EBUILD virtualbox-extpack-oracle-5.2.40.137108.ebuild 1014 BLAKE2B 98430a4df92cb561f976e21c54549b34bb6667ca8e11b8cd05fae0e143bacb5f558d9714454f4d2c7dcdc3e118c436a3245e81b8964ca006c713dfa1db620744 SHA512 aa348126bfa07bada186d37b61cb381c72259cb91649c269115aa5323e8f677add4174b7e6a6319c7b1eb116ef73d14eeef81dc59ec327a6a60e249516a7fa6e -EBUILD virtualbox-extpack-oracle-6.0.16.135674.ebuild 1073 BLAKE2B d8455cc34906468bcca74b6b97d036697f73ccaa7a9e4dd8e75c0788d77992fa47cf17b36af62252d1ab60d414139d2e6d91573205e511bdab74811dea664fae SHA512 be6697071823d650e389c892bf09fb84b5aa5ca98211ee2b13e9af3aaa5182890ab3f1d3b7fc004c9995c645e9c2a2a279dd2c8676ced2802406a7ce9d1e46a6 +EBUILD virtualbox-extpack-oracle-5.2.40.137108.ebuild 1013 BLAKE2B 5fbd8cd2a629c410b9d06669cab58e7bfcb7bd05ff0585cfe60e786a9edf121408ce040a47b96b2f0648ae30a5d97e02cd081dd73164b3233d6172693b562891 SHA512 4d8b9d7223797ba02c71d213d6e690cfc272945c74003e7aee5991136d484359d06f825f8c1963533e9f8af6f0471da963dab65441abc81defcd2e0aa036f187 EBUILD virtualbox-extpack-oracle-6.0.20.137117.ebuild 1073 BLAKE2B d8455cc34906468bcca74b6b97d036697f73ccaa7a9e4dd8e75c0788d77992fa47cf17b36af62252d1ab60d414139d2e6d91573205e511bdab74811dea664fae SHA512 be6697071823d650e389c892bf09fb84b5aa5ca98211ee2b13e9af3aaa5182890ab3f1d3b7fc004c9995c645e9c2a2a279dd2c8676ced2802406a7ce9d1e46a6 -EBUILD virtualbox-extpack-oracle-6.1.4.136177.ebuild 1068 BLAKE2B 33ade4b37520ea9e963ccdb462ab3e84b9670440490d30eed75dadf10facdbca1573e438d011365c8489240c06cb9ec6c208c1cc2197ad9f40e8623afcef9fa6 SHA512 0bf4c4bb7bde40d808056b2ac8877bda00c5e529f3056f1e476222ab7c8bbcb0eb6478c3636e012037c00407ae9b9a3f47271742272fa9262270b435a3312611 EBUILD virtualbox-extpack-oracle-6.1.6.137129.ebuild 1068 BLAKE2B 33ade4b37520ea9e963ccdb462ab3e84b9670440490d30eed75dadf10facdbca1573e438d011365c8489240c06cb9ec6c208c1cc2197ad9f40e8623afcef9fa6 SHA512 0bf4c4bb7bde40d808056b2ac8877bda00c5e529f3056f1e476222ab7c8bbcb0eb6478c3636e012037c00407ae9b9a3f47271742272fa9262270b435a3312611 MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild deleted file mode 100644 index d8c083d99b72..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.32.132073.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5)" - DEP_PV="${MY_PV}" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - DEP_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" - -LICENSE="PUEL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -RESTRICT="bindist mirror strip" - -RDEPEND="~app-emulation/virtualbox-${DEP_PV}" - -S="${WORKDIR}" - -QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.36.135684.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.36.135684.ebuild deleted file mode 100644 index e91c340762ab..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.36.135684.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5)" - DEP_PV="${MY_PV}" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - DEP_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" - -LICENSE="PUEL" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="" -RESTRICT="bindist mirror strip" - -RDEPEND="~app-emulation/virtualbox-${DEP_PV}" - -S="${WORKDIR}" - -QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild index e91c340762ab..4f8d1dba0b26 100644 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild +++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.40.137108.ebuild @@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac LICENSE="PUEL" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RESTRICT="bindist mirror strip" diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.16.135674.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.16.135674.ebuild deleted file mode 100644 index f47c45cca29a..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.16.135674.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5-6)" - DEP_PV="${MY_PV}" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - DEP_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" - -LICENSE="PUEL" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="bindist mirror strip" - -RDEPEND="~app-emulation/virtualbox-${DEP_PV}" - -S="${WORKDIR}" - -QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.4.136177.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.4.136177.ebuild deleted file mode 100644 index 80cbd84e9501..000000000000 --- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.4.136177.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib - -MAIN_PV="$(ver_cut 1-3)" -if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then - MY_PV="${MAIN_PV}_$(ver_cut 5-6)" - DEP_PV="${MY_PV}" - MY_PV="${MY_PV/beta/BETA}" - MY_PV="${MY_PV/rc/RC}" -else - MY_PV="${MAIN_PV}" - DEP_PV="${MAIN_PV}" -fi -VBOX_BUILD_ID="$(ver_cut 4)" -MY_PN="Oracle_VM_VirtualBox_Extension_Pack" -MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}" - -DESCRIPTION="PUEL extensions for VirtualBox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz" - -LICENSE="PUEL" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" -IUSE="" -RESTRICT="bindist mirror strip" - -RDEPEND="~app-emulation/virtualbox-${DEP_PV}" - -S="${WORKDIR}" - -QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*" - -src_install() { - insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN} - doins -r linux.${ARCH} - doins ExtPack* PXE-Intel.rom -} diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest index 7d291536fe01..7b8490918a95 100644 --- a/app-emulation/virtualbox-guest-additions/Manifest +++ b/app-emulation/virtualbox-guest-additions/Manifest @@ -2,27 +2,16 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947 AUX vboxguest-4.1.0-log-use-c99.patch 393 BLAKE2B 5363bcc98696e06d64e232043f89e4881390f43efafe8624ab23d78338e64bfee385c18a160553f17cfa36e81151d1c5d1889d31abd7caf942d7034043ab1288 SHA512 7327faccd5095706d097f2b47acfea21736291ed54ee7b605670fdfddf5f09815759dc49f9497d06e5920043e0b5b9af1b4ee0993ea13e5055641cbeedd66d6f AUX vboxguest-6.0.6-log-use-c99.patch 282 BLAKE2B df1d521c39ab6b3fa421f866fd83545bfea972dbbb1a952ce6aa388845175a4a3f71bc1cd34151f537994713ad1144fb0497f1383ed116357e7971f02c38ada9 SHA512 31fc13e5bb6286f80fde312aeb7917f662addc5b889ca1aeafa4f3545bece46eccface3b94df01c25a33d60302a14b3ae5b1eef87f25a4eef9a9dd4a75b3d7cb AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40 -AUX virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch 2951 BLAKE2B d804e9f0b10695a19212baad58f0ec455ad407412950ef57d3f5ea69026d1fa6a0a0d1bd9a9c491d2e0b4e22b4bda610d82e2a301573ce9c8381633e9c869650 SHA512 870a742f4b80ac82a28c033e76b2a0367f35459bc346b98fa58a80f486771641feaf2b53ae11ca042fdd67d2f2618ef705d36f1889ae1ec5336afc390bbc286f AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83 AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9 -DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e -DIST VirtualBox-5.2.36.tar.bz2 118253892 BLAKE2B 6b54a8c4aa996bc595b163bce501b97d543d4335507723cf3f6f9fd723f1d9ed42bddc90a8d3028688c0ac4918bbd4a32ab94f81daa867b99d0f0ce9cc9a4c59 SHA512 3437ef3300a706c2b4a4cdabdb3b100786f727e2052659d74cde955a88363052bce48820aa92f2eea9029c08bd23a2473ff080a754dfe0671ab0a6392d887071 DIST VirtualBox-5.2.40.tar.bz2 118285273 BLAKE2B 5d1fa572522c0a4d0124b49d68ec6f2bf240431bbe9ebd3dcf34252cc4710ec158c295c3cdb9628f045ce672a840b251b644cd92131cd4ff5ec9eab958609bc6 SHA512 3632c7184593350e484b055f85040f2a1883db4c228b04dc41e36d60de6e3123284cc9eb89ee0eba68bcd317dfdf1a5bb8594738108ea642528cafba965f3a18 -DIST VirtualBox-6.0.16.tar.bz2 154406073 BLAKE2B 8d0c9c1e6c675c5e2c7f01802072370fded7c5d7f7f581c6570b111c4aa4ac327fb74370ac36e4a4e31c6627640f8eb697a43b32fd2818f78e6b119f063d560f SHA512 ff9b726a5a865ed3fc5436e778da434ce532113898ed50434e2a561150410eabeee7194320eb115552542ecfd7c332f46f2d04fba782509dda8e66511e2a1a61 DIST VirtualBox-6.0.20.tar.bz2 154286741 BLAKE2B e5000919dd21ebca52a508e88a54d404c0cbceb9c101d47d146b45af2509f1e922403e0ea05753dac7293870f64f8c3e478fa0c0a77611f35a3f3ce52b1fa4c1 SHA512 0ecfcc68514ca89f9bee818c43e19e999561798cba72afa27f44a46bf53c7e45e05371d973fc76b7af003e85528b19b3156531fd9bf9a0d5f30dc53665e2f48f -DIST VirtualBox-6.1.4.tar.bz2 165450190 BLAKE2B acb99e64b095d414556d129ee96ef00d59900d8bb4f20f4fdfd4415d027eb0b1df9656b56940656c19074ea088dcca2e6e13372d38bcc30fb3a8372293a36117 SHA512 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167 DIST VirtualBox-6.1.6.tar.bz2 159389496 BLAKE2B 00a5dd823e3136417b075aac2f526f954b5bcaad828cb6abcbd5b3ad7412c4afe8d499e0fb2a8897f4cdab7e7084e848fde69a0d8e355c14767eafde21ebac46 SHA512 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a -DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450 DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff09444c68f86f82a360e9dbb44fa6072d6c28120f3c23cff8c15bacbd38bce8b69b3d8f35c4d3d493684df962ea6e353eec413dcc38 SHA512 3cf2526d209a54e94cd94840793769fd96fa988e21555d76eda2207a7f87e04b446a28ac6c8a2954e7c00a35107c144cadaec276d171214acdcc2900eb41306c -DIST virtualbox-6.0.16-patches-01.tar.xz 3520 BLAKE2B 1ca10c5902ece4657c6a9a03fe28c80a364d999e181cc46fc52d7dac0f0272faca6d6b19cb12d126bb0f4f6014b8c391b2b0f82ca016625410287fcc0c240778 SHA512 33b14fa1ce5526be88d6d5b72b5c86c68c37f565074a764b9d7a65f5c0a39e3d81533f9923087add71783556c1e51e816b674ce46d2800eb678846f65226fb69 DIST virtualbox-6.0.20-patches-01.tar.xz 3464 BLAKE2B dbfd15322edf178e752139c6f82be966422ff0d3c5d914fe8d4b6980f5805d27552dc813e97ea17665004d5f6cc3486461732edaaeabdd59cd1799b2ee85af06 SHA512 04f0c9d0565c77bca334cbcfd8ac439dff1a1d8246dbea3f5e06035eff6f6dd72b54f2227d6197e2851e418ad74bb4feeef07e442f3441bc75d80a72d0d0e00d DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B 5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c SHA512 31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42 -EBUILD virtualbox-guest-additions-5.2.32.ebuild 6142 BLAKE2B 052c9424b2c54340900c0435929aff514e1f93194c24500854ee46951f186c4ce3f47a58a3b8ae3dedc787b7fe34ad913cfe7915e3b027124cdf9138b5656cba SHA512 21111797b8a8cb64c42715fa918940db187a509ef8600ed3a767f7f5b192e7f7925c59d6ea2049bcfe789d26c902b20fa82491aa9dd563e665b3fb5a1d3e1024 -EBUILD virtualbox-guest-additions-5.2.36.ebuild 6143 BLAKE2B 0d0a04fc98e076a1d003aedcea38242782ee76ff4d19354214af45dd6a8df756b1c10b1774992b6b3f9470b321223888d82d1da341dac5fee0ded23ad3c724d8 SHA512 24e211f891e623acb8f6f56ca5372b8294543e214fce549aa59eb6a7dc9605386f72fa8e012cc56a44b35f171c9af50cdd73c00da4ae3fa00831fd89fe5245c0 -EBUILD virtualbox-guest-additions-5.2.40.ebuild 6143 BLAKE2B 0d0a04fc98e076a1d003aedcea38242782ee76ff4d19354214af45dd6a8df756b1c10b1774992b6b3f9470b321223888d82d1da341dac5fee0ded23ad3c724d8 SHA512 24e211f891e623acb8f6f56ca5372b8294543e214fce549aa59eb6a7dc9605386f72fa8e012cc56a44b35f171c9af50cdd73c00da4ae3fa00831fd89fe5245c0 -EBUILD virtualbox-guest-additions-6.0.16-r1.ebuild 5971 BLAKE2B 2a8fdfd3c91af9c710382b0af3fc33d9ed0186be534e0fcf904781957b5f1ff36a0f807191606fe2e3015cb35e76b5c1321c98c79bb93f083cc2b19a10758728 SHA512 0251f905b075eaef9229fd2d8f6f0e605b5b5ae087ecd2a931d4ac81a332334e3f499c3a91b56b726584e97c77c69b7b67665db0c1fa21da17bf989a08f5316a +EBUILD virtualbox-guest-additions-5.2.40.ebuild 6142 BLAKE2B d8408ad427b7799bee605a69fe3924ab51d79308ac864abd0bfa686fb388eccba5488beeab6b70546a144052f9c6b1d577ebc2d6966550f1d28409c4098ac5c5 SHA512 5f4bcc70576a4c9140deab81c7033496b54a8854c92e8c628d6f78773333a7604b38697f2869f79c1d21c72584b9c57e1cde38bbfca33a7f5657c728825fe4ef EBUILD virtualbox-guest-additions-6.0.20.ebuild 5971 BLAKE2B d2aca16b35685ff57a6ff7242e2e97f1b57a36e20f168217ee3a00b13b4331797a9fffd33f58b8a12fcb6b69a35582050d244f4a4b57710f857b530490ca61ad SHA512 7d8b04f85ef1cac52ddda9db7c18788968528343b8f111d68eac8cb7ac155b507067486aa9d77151f20e2423f987208be9648fa554a20cac9cf34d90b0f43eb5 -EBUILD virtualbox-guest-additions-6.1.4-r1.ebuild 5908 BLAKE2B 66efeeec93ad81817b29a91a7d11ce925175f9ed4a6090b73bc0c8680872c62fe9758f22bab238dd52e957cb04060e248697ad47cc2d6eceae772672fc33113b SHA512 4c82f114e15a190ad72e87a670ce45b042e8220b6a0c84b572b108d593fa516572bc2865871da66fdcd3ef4ae917dcf8c46a6c947a9aa1f434a855ddc94bb7bf EBUILD virtualbox-guest-additions-6.1.6.ebuild 5908 BLAKE2B 66efeeec93ad81817b29a91a7d11ce925175f9ed4a6090b73bc0c8680872c62fe9758f22bab238dd52e957cb04060e248697ad47cc2d6eceae772672fc33113b SHA512 4c82f114e15a190ad72e87a670ce45b042e8220b6a0c84b572b108d593fa516572bc2865871da66fdcd3ef4ae917dcf8c46a6c947a9aa1f434a855ddc94bb7bf MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635 diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch deleted file mode 100644 index ad4b460c8142..000000000000 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-6.0.12-linux-5.3+-compatibility.patch +++ /dev/null @@ -1,75 +0,0 @@ -https://bugs.gentoo.org/694614 -https://www.virtualbox.org/ticket/18911#comment:5 - ---- a/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -+++ b/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c -@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - #endif - if (in_dev != NULL) - { -- for_ifa(in_dev) { -+ struct in_ifaddr *ifa; -+ -+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { - if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) - return NOTIFY_OK; - -@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - - pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, - /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); -- } endfor_ifa(in_dev); -+ } - } - - /* ---- a/Runtime/r0drv/linux/mp-r0drv-linux.c -+++ b/Runtime/r0drv/linux/mp-r0drv-linux.c -@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - if (RTCpuSetCount(&OnlineSet) > 1) - { - /* Fire the function on all other CPUs without waiting for completion. */ --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+ Assert(!rc); NOREF(rc); - # else - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); --# endif - Assert(!rc); NOREF(rc); -+# endif - } - #endif - -@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - { - #ifdef CONFIG_SMP - IPRT_LINUX_SAVE_EFL_AC(); -- int rc; - RTMPARGS Args; - - RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; -@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - Args.cHits = 0; - - RTThreadPreemptDisable(&PreemptState); --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # else /* older kernels */ -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # endif /* older kernels */ - RTThreadPreemptRestore(&PreemptState); - -- Assert(rc == 0); NOREF(rc); - IPRT_LINUX_RESTORE_EFL_AC(); - #else - RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild deleted file mode 100644 index 25b3ec46f46d..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod systemd user toolchain-funcs - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P="VirtualBox-${MY_PV}" -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.16-patches-02.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="X" - -RDEPEND=" - X? ( x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE ) - sys-apps/dbus -" -DEPEND=" - ${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/pam - sys-power/iasl - x11-base/xorg-proto -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) - vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)" - - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - - # Create and unpack a tarball with the sources of the Linux guest - # kernel modules, to include all the needed files - "${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz" - unpack ./vbox-kmod.tar.gz - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" - rm -rf kBuild/bin tools -} - -src_prepare() { - # PaX fixes (see bug #298988) - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # stupid new header references... - local vboxheader mdir - for vboxheader in {product,revision,version}-generated.h ; do - for mdir in vbox{guest,sf} ; do - ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ - "${WORKDIR}/${mdir}/${vboxheader}" - done - done - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -src_configure() { - # build the user-space tools, warnings are harmless - local cmd=( - ./configure - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - echo "${cmd[@]}" - "${cmd[@]}" || die "configure failed" - source ./env.sh - export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" -} - -src_compile() { - MAKE="kmk" \ - emake TOOL_YASM_AS=yasm \ - VBOX_ONLY_ADDITIONS=1 \ - KBUILD_VERBOSE=2 - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-8.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \ - || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_preinst() { - enewgroup vboxguest - enewuser vboxguest -1 /bin/sh /dev/null vboxguest - # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist - enewgroup vboxsf -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "Also make sure you use the Mesa library for OpenGL:" - elog " eselect opengl set xorg-x11" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.36.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.36.ebuild deleted file mode 100644 index 31dd32c71431..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.36.ebuild +++ /dev/null @@ -1,229 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod systemd user toolchain-funcs - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P="VirtualBox-${MY_PV}" -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-5.2.36-patches-01.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="X" - -RDEPEND=" - X? ( x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE ) - sys-apps/dbus -" -DEPEND=" - ${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/pam - sys-power/iasl - x11-base/xorg-proto -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) - vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)" - - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - - # Create and unpack a tarball with the sources of the Linux guest - # kernel modules, to include all the needed files - "${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz" - unpack ./vbox-kmod.tar.gz - - # Remove shipped binaries (kBuild,yasm), see bug #232775 - cd "${S}" - rm -rf kBuild/bin tools -} - -src_prepare() { - # PaX fixes (see bug #298988) - pushd "${WORKDIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # stupid new header references... - local vboxheader mdir - for vboxheader in {product,revision,version}-generated.h ; do - for mdir in vbox{guest,sf} ; do - ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ - "${WORKDIR}/${mdir}/${vboxheader}" - done - done - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -src_configure() { - # build the user-space tools, warnings are harmless - local cmd=( - ./configure - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - echo "${cmd[@]}" - "${cmd[@]}" || die "configure failed" - source ./env.sh - export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" -} - -src_compile() { - MAKE="kmk" \ - emake TOOL_YASM_AS=yasm \ - VBOX_ONLY_ADDITIONS=1 \ - KBUILD_VERBOSE=2 - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-8.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \ - || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_preinst() { - enewgroup vboxguest - enewuser vboxguest -1 /bin/sh /dev/null vboxguest - # automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist - enewgroup vboxsf -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "Also make sure you use the Mesa library for OpenGL:" - elog " eselect opengl set xorg-x11" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild index 31dd32c71431..0950ac45f197 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.40.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="X" RDEPEND=" diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.16-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.16-r1.ebuild deleted file mode 100644 index a9d194c3ded9..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.16-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod systemd toolchain-funcs - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P="VirtualBox-${MY_PV}" -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.16-patches-01.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="X" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - X? ( x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE ) - sys-apps/dbus -" -DEPEND=" - ${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/pam - sys-power/iasl - x11-base/xorg-proto -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -S="${WORKDIR}/${MY_P}" -VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) - vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" - - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die - eend - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -src_configure() { - # build the user-space tools, warnings are harmless - local cmd=( - ./configure - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - echo "${cmd[@]}" - "${cmd[@]}" || die "configure failed" - source ./env.sh - export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" -} - -src_compile() { - MAKE="kmk" \ - emake TOOL_YASM_AS=yasm \ - VBOX_ONLY_ADDITIONS=1 \ - KBUILD_VERBOSE=2 - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-8.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \ - || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "Also make sure you use the Mesa library for OpenGL:" - elog " eselect opengl set xorg-x11" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.4-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.4-r1.ebuild deleted file mode 100644 index 6779b7c6ccc0..000000000000 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.4-r1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod systemd toolchain-funcs - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P="VirtualBox-${MY_PV}" -DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.0_rc1-patches-01.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="X" - -# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist -RDEPEND=" - acct-group/vboxguest - acct-group/vboxsf - acct-user/vboxguest - X? ( x11-apps/xrandr - x11-apps/xrefresh - x11-libs/libXmu - x11-libs/libX11 - x11-libs/libXt - x11-libs/libXext - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - x11-libs/libICE ) - sys-apps/dbus -" -DEPEND=" - ${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/pam - sys-power/iasl - x11-base/xorg-proto -" -PDEPEND=" - X? ( x11-drivers/xf86-video-vboxvideo ) -" -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" - -S="${WORKDIR}/${MY_P}" -VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src" - -pkg_setup() { - export DISTCC_DISABLE=1 #674256 - MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest) - vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)" - use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)" - - linux-mod_pkg_setup - BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Provide kernel sources - pushd src/VBox/Additions &>/dev/null || die - ebegin "Extracting guest kernel module sources" - kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die - eend - popd &>/dev/null || die - - # PaX fixes (see bug #298988) - pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die - eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch - popd &>/dev/null || die - - # Disable things unused or splitted into separate ebuilds - cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die - use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk - - # Remove pointless GCC version check - sed -e '/^check_gcc$/d' -i configure || die - - eapply "${WORKDIR}/patches" - - eapply_user -} - -src_configure() { - # build the user-space tools, warnings are harmless - local cmd=( - ./configure - --nofatal - --disable-xpcom - --disable-sdl-ttf - --disable-pulse - --disable-alsa - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --target-arch=${ARCH} - --with-linux="${KV_OUT_DIR}" - --build-headless - ) - echo "${cmd[@]}" - "${cmd[@]}" || die "configure failed" - source ./env.sh - export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}" -} - -src_compile() { - MAKE="kmk" \ - emake TOOL_YASM_AS=yasm \ - VBOX_ONLY_ADDITIONS=1 \ - KBUILD_VERBOSE=2 - - # Now creating the kernel modules. We must do this _after_ - # we compiled the user-space tools as we need two of the - # automatically generated header files. (>=3.2.0) - linux-mod_src_compile -} - -src_install() { - linux-mod_src_install - - cd "${S}"/out/linux.${ARCH}/release/bin/additions || die - - insinto /sbin - newins mount.vboxsf mount.vboxsf - fperms 4755 /sbin/mount.vboxsf - - newinitd "${FILESDIR}"/${PN}-8.initd ${PN} - - insinto /usr/sbin/ - newins VBoxService vboxguest-service - fperms 0755 /usr/sbin/vboxguest-service - - insinto /usr/bin - doins VBoxControl - fperms 0755 /usr/bin/VBoxControl - - # VBoxClient user service and xrandr wrapper - if use X ; then - doins VBoxClient - fperms 0755 /usr/bin/VBoxClient - - pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \ - || die - newins 98vboxadd-xclient VBoxClient-all - fperms 0755 /usr/bin/VBoxClient-all - popd &>/dev/null || die - fi - - # udev rule for vboxdrv - local udev_rules_dir="/lib/udev/rules.d" - dodir ${udev_rules_dir} - echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ - >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \ - || die - - # VBoxClient autostart file - insinto /etc/xdg/autostart - doins "${FILESDIR}"/vboxclient.desktop - - # sample xorg.conf - dodoc "${FILESDIR}"/xorg.conf.vbox - docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox - - systemd_dounit "${FILESDIR}/${PN}.service" -} - -pkg_postinst() { - linux-mod_pkg_postinst - if ! use X ; then - elog "use flag X is off, enable it to install the" - elog "X Window System video driver." - fi - elog "" - elog "Please add users to the \"vboxguest\" group so they can" - elog "benefit from seamless mode, auto-resize and clipboard." - elog "" - elog "The vboxsf group has been added to make automount services work." - elog "These services are part of the shared folders support." - elog "" - elog "Please add:" - elog "/etc/init.d/${PN}" - elog "to the default runlevel in order to start" - elog "needed services." - elog "To use the VirtualBox X driver, use the following" - elog "file as your /etc/X11/xorg.conf:" - elog " /usr/share/doc/${PF}/xorg.conf.vbox" - elog "" - elog "Also make sure you use the Mesa library for OpenGL:" - elog " eselect opengl set xorg-x11" - elog "" - elog "An autostart .desktop file has been installed to start" - elog "VBoxClient in desktop sessions." - elog "" - elog "You can mount shared folders with:" - elog " mount -t vboxsf <shared_folder_name> <mount_point>" - elog "" - elog "Warning:" - elog "this ebuild is only needed if you are running gentoo" - elog "inside a VirtualBox Virtual Machine, you don't need" - elog "it to run VirtualBox itself." - elog "" -} diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest index f50e5c586862..12db0ad1b9c3 100644 --- a/app-emulation/virtualbox-modules/Manifest +++ b/app-emulation/virtualbox-modules/Manifest @@ -1,21 +1,11 @@ AUX create_vbox_modules_tarball.sh 896 BLAKE2B 4153a8fa67cd8fe7187f3c4232691b1ded8e51315f41292f9fcc0adb294e9b235b0c2f1e91f6f728076ab85f687ea1ba2877dc44b511eaceb24e7d6e71a8bbd4 SHA512 c3154a13550817c581fa142e24081edfbdbc145315d34cc4569d12ad87a518fa0bf1443c053b50fdfdea6915bda1325ad973455ee85079294b83a49fd53f4771 AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8cea08a6dbe78f75dd89aa072ac2ac0d745e598e8195ef321eaee53d31bedf52013d94efc046863e65c9fac0d61a507b292b04c7fb9 SHA512 600fd557992efb1fb5db9db64914becd5a86f81a42d70bbc3823533df941881f2289a6ccf630adb8346419499dd48b84ed43c21d0aba183a780daa99fcafddbd -AUX virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch 2930 BLAKE2B a6875c7b0e93caf7388db66e4e76df0c0c0e41f01fd57a415b6ad4cf128570a8cb0330adf26fb45e40c6104d029f40bac53ef0fcbd061b391372c24459693fee SHA512 0da03204d3575563abb95036d54fccf5a002413b5a2ee1f9a5d4ab3433062fcc49d6fe41cc05e5775b3c9d703227e79cb6bae193f6ab2d2bdab306d37abf985b -AUX virtualbox-modules-6.0.14-kernel-5.4_rc6.patch 13688 BLAKE2B 15e900c3bb8d3d1adcf4b5ca63ac99369e47af3f8842d2fe8b7e1be7e33e2a05eebbf7120c0d5759d258de1b0f1ce5da92af4455fdd0101f053a1bedd31c78e1 SHA512 0970766f95b5215e0b0802db56b58375c4f46303e82b252fd34dbe56cc00e5be4e673c730c75e8eb92a18e7b42769cb11a57bf3824c3e3efe93fc67bff5cfe1f AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a -DIST vbox-kernel-module-src-5.2.32.tar.xz 642428 BLAKE2B 0dda5cb5608c1eed22bea209564d53c5f7eab58ca620db2cc441e3c1ba9ad66609c4ef13df07fd29b691f2941a070f9852e8729cd386081df6a82ede345f33c5 SHA512 fadedab690cb7dee8b9a6747ed711d924bf3bce8999b24e7b64cb8738c53c2fa7372b1a8e8535e7e4ef0235aec02d4a3f1f67cd07d7621934fab684c5163329e -DIST vbox-kernel-module-src-5.2.36.tar.xz 643160 BLAKE2B 50f1aee4d56c8b78a5e7512cb843b4e36137c38b160ca0419b2061892f29a98edaa266afb8f94ee0952e4c8af57b41da24a7d70b43a5adf5c5a15b2a4ac867b9 SHA512 b8aa3e8de1573ac728dc00d85ffbb0c25cdb118af92f16f7a4c1a7d394526b8f3005aab1b4422af6251bdafb958c6dc86b31f13c1f35116c8ff39a9288aed277 DIST vbox-kernel-module-src-5.2.40.tar.xz 644200 BLAKE2B 0083423831bcec17f4960747c3ae939a8b4a5d2f89d6f09ad88308b078035bc6f068314d2c74182c9bb7ea0007e9c6a5b3eaa8f48ce58330294a78f66ed3faa5 SHA512 b62359104fdd0a1fd2b506cec2e4b71fa9582f1a89088d3a45791835981e1cd2e0895861b688cfbd7306454aa66c18bcd1444b26181f084b7af69f43d3e9b499 -DIST vbox-kernel-module-src-6.0.16.tar.xz 669392 BLAKE2B 19e718097ee4da75c8dc3b565735f0a378d94547911ec89af52d8dccb36d67391a2f6700575c374552cd4fc4eb8a7e3d6618a800380e473429bd3759e0d1f9c0 SHA512 8979da4cba07c9095778864af0fd29c0acf10d71ea587819954a349e8c193a03b2268bf80dca9004803d8cf2a40974994fcd1f2c6e2ac657b5032f6c04977793 DIST vbox-kernel-module-src-6.0.20.tar.xz 670656 BLAKE2B ccd4130272545e57fa64f56adcc3b16d96dac2e6e44f8057a447fddb9c51e3be7729298b835b7e335a7d0e58e0603d96ee084547375a331209cf6fa3751868cd SHA512 fa7fd8dbff39bf65852522481c4725be7aeedb3052f7a628f15defd78dd8353ae3466a294f25bc51b555db9da774ad8ca756fa8d01f45af250ab57f7e2ce7193 -DIST vbox-kernel-module-src-6.1.4.tar.xz 664412 BLAKE2B b4cfe5b2792c8f5dc2bf6038f69e32d07aaead358b144e154806f404bcc0ffbb72d470db265b96f41ca714edc0588ce06748054b8358675c24848614253a7cfb SHA512 bb247a8d2450694937095bc9c263554f805c51676e2da726f124ce4f775c69bedab95286e8d00686e04c1d8fff67f6335aa29f51a0c0ec00b862ad4e56fe290c DIST vbox-kernel-module-src-6.1.6.tar.xz 667048 BLAKE2B 00cdddc108d54cb829e771eac1c95f254e97465960b50f6f95595cf4f25485146d9d807de903152f3472a9e57246379f15ea82f6464fc00053e4b6b6e9dbeebe SHA512 5fb91051d6f41c25f4ac642249f2dac289c06134d3815578c094db089dc36903a573913933c34d32e8bbf5d704f7225eabb849fd559430247a89a713f059012e -EBUILD virtualbox-modules-5.2.32.ebuild 1203 BLAKE2B 564094a44633e5193d26e88bc866b0354a3dbec67d08c6b09869c8863487fe30f939f9039a6f23fb9061e200ea428c728fa689e6db643c1710716d565bac42ed SHA512 f3ab32231d5c050d39bae1af958de61e4964b2146aed215d6eae95b96a3a2428b8411b2f9f7bf9f0e81259120f2229b81498cb8b4d9e7d18d511bfb223d4f16c -EBUILD virtualbox-modules-5.2.36.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b -EBUILD virtualbox-modules-5.2.40.ebuild 1471 BLAKE2B 3470de73e2295b5e3e23ab0ca3a4d0d1b87651c7394f7e74caec4357ba9d8a52f882af11fdbf75e7ad1e77ad645028450bf5fcc919616e20b36d47338b1b708a SHA512 494ef76097b12598f99bca623d0099ccacf129cd591ea6f5e16a5e147ed1d9a093708eebcac3d28f5b654586717a0001d675ecc294d747fe42298f3c1963d22b -EBUILD virtualbox-modules-6.0.16-r1.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be +EBUILD virtualbox-modules-5.2.40.ebuild 1470 BLAKE2B 1d02bf0795851604467a9df85d63d6de1793706f816e72a4d706be12aa0c1d338fff794588c5bf1e34855348904053ae3914895391b38cb8f593db0cdd3d4ab5 SHA512 36aaf5718aa036dc162cb16579eaa21069cc900098fa5f8e3d10fb1cbf67509a350ea1a7effce5931988f54ce9b625518695ee70e77ae4bca780443cfc1eaa24 EBUILD virtualbox-modules-6.0.20.ebuild 1458 BLAKE2B ab41e8a5636a52182198d2f0696f29885542a6dfb3ca65fbd315606905b42300e02f451391ea5517e02c963e6296f2af44ad3e639082bd32085f7eedfffa530b SHA512 7e326b960ccc58174fffd07046f2e6d5289ee4dca3031fa1c517b3f4e3c3aaf6dfee44382f6af4372ba6d96d0e7252c73519910ad50bbc3bcc02362b53b7f0be -EBUILD virtualbox-modules-6.1.4-r1.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345 EBUILD virtualbox-modules-6.1.6.ebuild 1419 BLAKE2B ff41b1aded92f404c199e42076227efd4f5fde305fbd67e4a3b1f198c58a54786f72ba0e7eaf0e789a7bd13d67c1435e91f96e329362498187234a8918d29ac1 SHA512 d12adaafe5d3369dc793e9051ca3eedb10e52a76a9d0ea1805e6476808831613a93eaf71c93a836b075af2c822580e35e2b26e03216abdbecc3b44f83cfb6345 MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000 diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch deleted file mode 100644 index ff573dd69b67..000000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.12-linux-5.3+-compatibility.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/694560 - -https://www.virtualbox.org/ticket/18911#comment:5 - ---- a/vboxnetflt//linux/VBoxNetFlt-linux.c -+++ b/vboxnetflt//linux/VBoxNetFlt-linux.c -@@ -2123,7 +2123,9 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - #endif - if (in_dev != NULL) - { -- for_ifa(in_dev) { -+ struct in_ifaddr *ifa; -+ -+ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { - if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) - return NOTIFY_OK; - -@@ -2137,7 +2139,7 @@ static int vboxNetFltLinuxEnumeratorCallback(struct notifier_block *self, unsign - - pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, - /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); -- } endfor_ifa(in_dev); -+ } - } - - /* ---- a/vboxdrv/r0drv/linux/mp-r0drv-linux.c -+++ b/vboxdrv/r0drv/linux/mp-r0drv-linux.c -@@ -283,12 +283,15 @@ RTDECL(int) RTMpOnAll(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - if (RTCpuSetCount(&OnlineSet) > 1) - { - /* Fire the function on all other CPUs without waiting for completion. */ --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); -+ Assert(!rc); NOREF(rc); - # else - int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); --# endif - Assert(!rc); NOREF(rc); -+# endif - } - #endif - -@@ -326,7 +329,6 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - { - #ifdef CONFIG_SMP - IPRT_LINUX_SAVE_EFL_AC(); -- int rc; - RTMPARGS Args; - - RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; -@@ -337,14 +339,17 @@ RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2) - Args.cHits = 0; - - RTThreadPreemptDisable(&PreemptState); --# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) -+ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # else /* older kernels */ -- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); -+ Assert(rc == 0); NOREF(rc); - # endif /* older kernels */ - RTThreadPreemptRestore(&PreemptState); - -- Assert(rc == 0); NOREF(rc); - IPRT_LINUX_RESTORE_EFL_AC(); - #else - RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch deleted file mode 100644 index 2c52aa6757cf..000000000000 --- a/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch +++ /dev/null @@ -1,308 +0,0 @@ -https://www.virtualbox.org/changeset/81586/vbox -https://www.virtualbox.org/changeset/81587/vbox -https://www.virtualbox.org/changeset/81649/vbox (partially) - ---- 6.0.14/vboxdrv/include/iprt/cdefs.h -+++ 6.0.14/vboxdrv/include/iprt/cdefs.h -@@ -1166,7 +1166,7 @@ - * Tell the compiler that we're falling through to the next case in a switch. - * @sa RT_FALL_THRU */ - #if RT_GNUC_PREREQ(7, 0) --# define RT_FALL_THROUGH() __attribute__((fallthrough)) -+# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) - #else - # define RT_FALL_THROUGH() (void)0 - #endif ---- 6.0.14/vboxdrv/r0drv/linux/alloc-r0drv-linux.c -+++ 6.0.14/vboxdrv/r0drv/linux/alloc-r0drv-linux.c -@@ -443,9 +443,6 @@ - } - - SetPageReserved(&paPages[iPage]); --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */ -- MY_SET_PAGES_EXEC(&paPages[iPage], 1); --#endif - } - *pPhys = page_to_phys(paPages); - pvRet = phys_to_virt(page_to_phys(paPages)); -@@ -491,9 +488,6 @@ - for (iPage = 0; iPage < cPages; iPage++) - { - ClearPageReserved(&paPages[iPage]); --#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 4, 20) /** @todo find the exact kernel where change_page_attr was introduced. */ -- MY_SET_PAGES_NOEXEC(&paPages[iPage], 1); --#endif - } - __free_pages(paPages, cOrder); - IPRT_LINUX_RESTORE_EFL_AC(); ---- 6.0.14/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -+++ 6.0.14/vboxdrv/r0drv/linux/memobj-r0drv-linux.c -@@ -86,6 +86,8 @@ - /** Set if the allocation is contiguous. - * This means it has to be given back as one chunk. */ - bool fContiguous; -+ /** Set if executable allocation. */ -+ bool fExecutable; - /** Set if we've vmap'ed the memory into ring-0. */ - bool fMappedToRing0; - /** The pages in the apPages array. */ -@@ -289,10 +291,11 @@ - * Only valid if fContiguous == true, ignored otherwise. - * @param fFlagsLnx The page allocation flags (GPFs). - * @param fContiguous Whether the allocation must be contiguous. -+ * @param fExecutable Whether the memory must be executable. - * @param rcNoMem What to return when we're out of pages. - */ - static int rtR0MemObjLinuxAllocPages(PRTR0MEMOBJLNX *ppMemLnx, RTR0MEMOBJTYPE enmType, size_t cb, -- size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, int rcNoMem) -+ size_t uAlignment, gfp_t fFlagsLnx, bool fContiguous, bool fExecutable, int rcNoMem) - { - size_t iPage; - size_t const cPages = cb >> PAGE_SHIFT; -@@ -371,7 +374,8 @@ - for (iPage = 0; iPage < cPages; iPage++) - { - pMemLnx->apPages[iPage] = &paPages[iPage]; -- MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1); -+ if (fExecutable) -+ MY_SET_PAGES_EXEC(pMemLnx->apPages[iPage], 1); - if (PageHighMem(pMemLnx->apPages[iPage])) - BUG(); - } -@@ -379,6 +383,7 @@ - fContiguous = true; - #endif /* < 2.4.22 */ - pMemLnx->fContiguous = fContiguous; -+ pMemLnx->fExecutable = fExecutable; - - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) - /* -@@ -409,7 +414,7 @@ - * This should never happen! - */ - printk("rtR0MemObjLinuxAllocPages(cb=0x%lx, uAlignment=0x%lx): alloc_pages(..., %d) returned physical memory at 0x%lx!\n", -- (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0])); -+ (unsigned long)cb, (unsigned long)uAlignment, rtR0MemObjLinuxOrder(cPages), (unsigned long)page_to_phys(pMemLnx->apPages[0])); - rtR0MemObjLinuxFreePages(pMemLnx); - return rcNoMem; - } -@@ -438,14 +443,12 @@ - while (iPage-- > 0) - { - #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) -- /* -- * See SetPageReserved() in rtR0MemObjLinuxAllocPages() -- */ -+ /* See SetPageReserved() in rtR0MemObjLinuxAllocPages() */ - ClearPageReserved(pMemLnx->apPages[iPage]); - #endif --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22) --#else -- MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 22) -+ if (pMemLnx->fExecutable) -+ MY_SET_PAGES_NOEXEC(pMemLnx->apPages[iPage], 1); - #endif - } - -@@ -662,10 +665,10 @@ - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 22) - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_HIGHUSER, -- false /* non-contiguous */, VERR_NO_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY); - #else - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_PAGE, cb, PAGE_SIZE, GFP_USER, -- false /* non-contiguous */, VERR_NO_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -696,19 +699,19 @@ - #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32) - /* ZONE_DMA32: 0-4GB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA32, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - if (RT_FAILURE(rc)) - #endif - #ifdef RT_ARCH_AMD64 - /* ZONE_DMA: 0-16MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_DMA, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - #else - # ifdef CONFIG_X86_PAE - # endif - /* ZONE_NORMAL: 0-896MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_LOW, cb, PAGE_SIZE, GFP_USER, -- false /* non-contiguous */, VERR_NO_LOW_MEMORY); -+ false /* non-contiguous */, fExecutable, VERR_NO_LOW_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -738,17 +741,17 @@ - #if (defined(RT_ARCH_AMD64) || defined(CONFIG_X86_PAE)) && defined(GFP_DMA32) - /* ZONE_DMA32: 0-4GB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA32, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - if (RT_FAILURE(rc)) - #endif - #ifdef RT_ARCH_AMD64 - /* ZONE_DMA: 0-16MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_DMA, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - #else - /* ZONE_NORMAL (32-bit hosts): 0-896MB */ - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, RTR0MEMOBJTYPE_CONT, cb, PAGE_SIZE, GFP_USER, -- true /* contiguous */, VERR_NO_CONT_MEMORY); -+ true /* contiguous */, fExecutable, VERR_NO_CONT_MEMORY); - #endif - if (RT_SUCCESS(rc)) - { -@@ -795,7 +798,7 @@ - - rc = rtR0MemObjLinuxAllocPages(&pMemLnx, enmType, cb, uAlignment, fGfp, - enmType == RTR0MEMOBJTYPE_PHYS /* contiguous / non-contiguous */, -- VERR_NO_PHYS_MEMORY); -+ false /*fExecutable*/, VERR_NO_PHYS_MEMORY); - if (RT_FAILURE(rc)) - return rc; - ---- 6.0.14/vboxdrv/r0drv/linux/the-linux-kernel.h -+++ 6.0.14/vboxdrv/r0drv/linux/the-linux-kernel.h -@@ -337,8 +337,10 @@ - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) --# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) --# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */ -+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) -+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# endif - #else - # define MY_SET_PAGES_EXEC(pPages, cPages) \ - do { \ ---- 6.0.14/vboxdrv/r0drv/linux/thread2-r0drv-linux.c -+++ 6.0.14/vboxdrv/r0drv/linux/thread2-r0drv-linux.c -@@ -36,6 +36,9 @@ - #include <iprt/errcore.h> - #include "internal/thread.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ #include <uapi/linux/sched/types.h> -+#endif /* >= KERNEL_VERSION(4, 11, 0) */ - - RTDECL(RTTHREAD) RTThreadSelf(void) - { ---- 6.0.14/vboxnetadp/include/iprt/cdefs.h -+++ 6.0.14/vboxnetadp/include/iprt/cdefs.h -@@ -1166,7 +1166,7 @@ - * Tell the compiler that we're falling through to the next case in a switch. - * @sa RT_FALL_THRU */ - #if RT_GNUC_PREREQ(7, 0) --# define RT_FALL_THROUGH() __attribute__((fallthrough)) -+# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) - #else - # define RT_FALL_THROUGH() (void)0 - #endif ---- 6.0.14/vboxnetadp/r0drv/linux/the-linux-kernel.h -+++ 6.0.14/vboxnetadp/r0drv/linux/the-linux-kernel.h -@@ -337,8 +337,10 @@ - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) --# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) --# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */ -+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) -+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# endif - #else - # define MY_SET_PAGES_EXEC(pPages, cPages) \ - do { \ ---- 6.0.14/vboxnetflt/include/iprt/cdefs.h -+++ 6.0.14/vboxnetflt/include/iprt/cdefs.h -@@ -1166,7 +1166,7 @@ - * Tell the compiler that we're falling through to the next case in a switch. - * @sa RT_FALL_THRU */ - #if RT_GNUC_PREREQ(7, 0) --# define RT_FALL_THROUGH() __attribute__((fallthrough)) -+# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) - #else - # define RT_FALL_THROUGH() (void)0 - #endif ---- 6.0.14/vboxnetflt/linux/VBoxNetFlt-linux.c -+++ 6.0.14/vboxnetflt/linux/VBoxNetFlt-linux.c -@@ -924,8 +924,13 @@ - for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i]; -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -+ pSG->aSegs[iSeg].cb = pFrag->bv_len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -+# else /* < KERNEL_VERSION(5, 4, 0) */ - pSG->aSegs[iSeg].cb = pFrag->size; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -+# endif /* >= KERNEL_VERSION(5, 4, 0) */ - Log6((" %p", pSG->aSegs[iSeg].pv)); - pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; - Assert(iSeg <= pSG->cSegsAlloc); -@@ -940,8 +945,13 @@ - for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++) - { - skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i]; -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -+ pSG->aSegs[iSeg].cb = pFrag->bv_len; -+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset; -+# else /* < KERNEL_VERSION(5, 4, 0) */ - pSG->aSegs[iSeg].cb = pFrag->size; - pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->page_offset; -+# endif /* >= KERNEL_VERSION(5, 4, 0) */ - Log6((" %p", pSG->aSegs[iSeg].pv)); - pSG->aSegs[iSeg++].Phys = NIL_RTHCPHYS; - Assert(iSeg <= pSG->cSegsAlloc); ---- 6.0.14/vboxnetflt/r0drv/linux/the-linux-kernel.h -+++ 6.0.14/vboxnetflt/r0drv/linux/the-linux-kernel.h -@@ -337,8 +337,10 @@ - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) --# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) --# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */ -+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) -+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# endif - #else - # define MY_SET_PAGES_EXEC(pPages, cPages) \ - do { \ ---- 6.0.14/vboxpci/include/iprt/cdefs.h -+++ 6.0.14/vboxpci/include/iprt/cdefs.h -@@ -1166,7 +1166,7 @@ - * Tell the compiler that we're falling through to the next case in a switch. - * @sa RT_FALL_THRU */ - #if RT_GNUC_PREREQ(7, 0) --# define RT_FALL_THROUGH() __attribute__((fallthrough)) -+# define RT_FALL_THROUGH() __attribute__((__fallthrough__)) - #else - # define RT_FALL_THROUGH() (void)0 - #endif ---- 6.0.14/vboxpci/r0drv/linux/the-linux-kernel.h -+++ 6.0.14/vboxpci/r0drv/linux/the-linux-kernel.h -@@ -337,8 +337,10 @@ - #endif - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) --# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) --# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) /* The interface was removed, but we only need it for < 2.4.22, so who cares. */ -+# define MY_SET_PAGES_EXEC(pPages, cPages) set_pages_x(pPages, cPages) -+# define MY_SET_PAGES_NOEXEC(pPages, cPages) set_pages_nx(pPages, cPages) -+# endif - #else - # define MY_SET_PAGES_EXEC(pPages, cPages) \ - do { \ diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild deleted file mode 100644 index a5f5de5da3b1..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.32.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from virtualbox-bin - -EAPI=7 - -inherit linux-mod toolchain-funcs user - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pax_kernel" - -RDEPEND="!=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -BUILD_TARGETS="all" -BUILD_TARGET_ARCH="${ARCH}" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})" - -pkg_setup() { - enewgroup vboxusers - linux-mod_pkg_setup - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" -} - -src_prepare() { - if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch - fi - - default -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - doins "${FILESDIR}"/virtualbox.conf -} - -pkg_postinst() { - linux-mod_pkg_postinst -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild deleted file mode 100644 index 9a370bd79a45..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.36.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from virtualbox-bin - -EAPI=7 - -inherit linux-mod toolchain-funcs user - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="pax_kernel" - -RDEPEND="!=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})" -MODULESD_VBOXDRV_ENABLED="yes" -MODULESD_VBOXNETADP_ENABLED="no" -MODULESD_VBOXNETFLT_ENABLED="no" -# The following is a security measure that comes directly from usptream. -# Do NOT remove this!!! -MODULESD_VBOXPCI_ADDITIONS=( - "blacklist vboxpci" - "install vboxpci /bin/true" -) - -pkg_setup() { - enewgroup vboxusers - linux-mod_pkg_setup - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" -} - -src_prepare() { - if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch - fi - - default -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} - -pkg_postinst() { - linux-mod_pkg_postinst -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild index 9a370bd79a45..4d5d660417e6 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.40.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="pax_kernel" RDEPEND="!=app-emulation/virtualbox-9999" diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16-r1.ebuild deleted file mode 100644 index 0dac94ce21ac..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.16-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from virtualbox-bin - -EAPI=7 - -inherit linux-mod toolchain-funcs - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="pax_kernel" - -RDEPEND="!=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})" -MODULESD_VBOXDRV_ENABLED="yes" -MODULESD_VBOXNETADP_ENABLED="no" -MODULESD_VBOXNETFLT_ENABLED="no" -# The following is a security measure that comes directly from usptream. -# Do NOT remove this!!! -MODULESD_VBOXPCI_ADDITIONS=( - "blacklist vboxpci" - "install vboxpci /bin/true" -) - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" -} - -src_prepare() { - if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch - fi - - default -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4-r1.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4-r1.ebuild deleted file mode 100644 index 6ad5644e2ed2..000000000000 --- a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# XXX: the tarball here is just the kernel modules split out of the binary -# package that comes from virtualbox-bin - -EAPI=7 - -inherit linux-mod toolchain-funcs - -MY_P="vbox-kernel-module-src-${PV}" -DESCRIPTION="Kernel Modules for Virtualbox" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" -IUSE="pax_kernel" - -RDEPEND="!=app-emulation/virtualbox-9999" - -S="${WORKDIR}" - -BUILD_TARGETS="all" -MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})" -MODULESD_VBOXDRV_ENABLED="yes" -MODULESD_VBOXNETADP_ENABLED="no" -MODULESD_VBOXNETFLT_ENABLED="no" - -pkg_setup() { - linux-mod_pkg_setup - BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1" -} - -src_prepare() { - if use pax_kernel && kernel_is -ge 3 0 0 ; then - eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch - fi - - default -} - -src_install() { - linux-mod_src_install - insinto /usr/lib/modules-load.d/ - newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf -} - -pkg_postinst() { - # Remove vboxpci.ko from current running kernel - find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete - linux-mod_pkg_postinst -} diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index 0b37f31a97a2..8392a583d065 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -9,23 +9,13 @@ AUX virtualbox-ose-5-wrapper 3405 BLAKE2B 92001ed3397a22abb5955617451bfb78d1f1f6 AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea AUX virtualbox-ose.desktop-2 201 BLAKE2B 05fbf657e8c1d8ec46f1b88e681efd50a4e5ab2a0f32f3fd25ca956e1e9bff6357c69a96628e3eba26b01869b6dc596f68f739f9330fa3018c186dfa0fdcea06 SHA512 a678e237ad0451e8785f242ebf822b4f3b03d2e2280a62f71728f79bdcfc84d3465ee60cad90db75e64b2c89a1b0b224de00519728fb605df67ca7c9aee0874c AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171 -DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452049331cf06c80420205844ea4a46ddb3352e0fd91564d94d018cb03921e7f894b30c79ddb684ad498d3f86dee88bf8994 SHA512 4e98d5df5e9e6445dde268d5eacea82e655ce9b96cd6579a9d470a08a0c066b7cd7e212b276e2671e936b4a73a53ecf9daa666cb3a8b9d7dc353c70c9283505e -DIST VirtualBox-5.2.36.tar.bz2 118253892 BLAKE2B 6b54a8c4aa996bc595b163bce501b97d543d4335507723cf3f6f9fd723f1d9ed42bddc90a8d3028688c0ac4918bbd4a32ab94f81daa867b99d0f0ce9cc9a4c59 SHA512 3437ef3300a706c2b4a4cdabdb3b100786f727e2052659d74cde955a88363052bce48820aa92f2eea9029c08bd23a2473ff080a754dfe0671ab0a6392d887071 DIST VirtualBox-5.2.40.tar.bz2 118285273 BLAKE2B 5d1fa572522c0a4d0124b49d68ec6f2bf240431bbe9ebd3dcf34252cc4710ec158c295c3cdb9628f045ce672a840b251b644cd92131cd4ff5ec9eab958609bc6 SHA512 3632c7184593350e484b055f85040f2a1883db4c228b04dc41e36d60de6e3123284cc9eb89ee0eba68bcd317dfdf1a5bb8594738108ea642528cafba965f3a18 -DIST VirtualBox-6.0.16.tar.bz2 154406073 BLAKE2B 8d0c9c1e6c675c5e2c7f01802072370fded7c5d7f7f581c6570b111c4aa4ac327fb74370ac36e4a4e31c6627640f8eb697a43b32fd2818f78e6b119f063d560f SHA512 ff9b726a5a865ed3fc5436e778da434ce532113898ed50434e2a561150410eabeee7194320eb115552542ecfd7c332f46f2d04fba782509dda8e66511e2a1a61 DIST VirtualBox-6.0.20.tar.bz2 154286741 BLAKE2B e5000919dd21ebca52a508e88a54d404c0cbceb9c101d47d146b45af2509f1e922403e0ea05753dac7293870f64f8c3e478fa0c0a77611f35a3f3ce52b1fa4c1 SHA512 0ecfcc68514ca89f9bee818c43e19e999561798cba72afa27f44a46bf53c7e45e05371d973fc76b7af003e85528b19b3156531fd9bf9a0d5f30dc53665e2f48f -DIST VirtualBox-6.1.4.tar.bz2 165450190 BLAKE2B acb99e64b095d414556d129ee96ef00d59900d8bb4f20f4fdfd4415d027eb0b1df9656b56940656c19074ea088dcca2e6e13372d38bcc30fb3a8372293a36117 SHA512 021592629614b9f8a57474b9a0cd110af7b63a3bc98b00806f4ce57b64f020fda313fdaef5cec546ad302f98093427818e176decbc026dffaa47faae574bf167 DIST VirtualBox-6.1.6.tar.bz2 159389496 BLAKE2B 00a5dd823e3136417b075aac2f526f954b5bcaad828cb6abcbd5b3ad7412c4afe8d499e0fb2a8897f4cdab7e7084e848fde69a0d8e355c14767eafde21ebac46 SHA512 4a94417fe69c40755b55526cee67068ca8d32e71e5b6ebe0cccf46062dfb4ee76b33ac92f8b8f4748d438eda1714129360fdbaa39c16df3877b20109a7c6439a -DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450 DIST virtualbox-5.2.36-patches-01.tar.xz 3440 BLAKE2B 66749efba87d82ed4a11ff09444c68f86f82a360e9dbb44fa6072d6c28120f3c23cff8c15bacbd38bce8b69b3d8f35c4d3d493684df962ea6e353eec413dcc38 SHA512 3cf2526d209a54e94cd94840793769fd96fa988e21555d76eda2207a7f87e04b446a28ac6c8a2954e7c00a35107c144cadaec276d171214acdcc2900eb41306c -DIST virtualbox-6.0.16-patches-01.tar.xz 3520 BLAKE2B 1ca10c5902ece4657c6a9a03fe28c80a364d999e181cc46fc52d7dac0f0272faca6d6b19cb12d126bb0f4f6014b8c391b2b0f82ca016625410287fcc0c240778 SHA512 33b14fa1ce5526be88d6d5b72b5c86c68c37f565074a764b9d7a65f5c0a39e3d81533f9923087add71783556c1e51e816b674ce46d2800eb678846f65226fb69 DIST virtualbox-6.0.20-patches-01.tar.xz 3464 BLAKE2B dbfd15322edf178e752139c6f82be966422ff0d3c5d914fe8d4b6980f5805d27552dc813e97ea17665004d5f6cc3486461732edaaeabdd59cd1799b2ee85af06 SHA512 04f0c9d0565c77bca334cbcfd8ac439dff1a1d8246dbea3f5e06035eff6f6dd72b54f2227d6197e2851e418ad74bb4feeef07e442f3441bc75d80a72d0d0e00d DIST virtualbox-6.1.14-patches-01.tar.xz 2344 BLAKE2B cb89af8ffe0ecaa54929349abfb1541ca8630063d8282e773e4c66c3eec3ed108328b1ee81247d997981e5d49792b4019e1358b270c3622508b62e647c544ae4 SHA512 b08c2f66a050270a5c8b4d7264b1cf0afaf7809c3888c48a9b55ac75f0906bdb6bc28eef136ce032c777a810f2ce0a3cf6bb3df0259e5a6737f9ecc3ea708bba -EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1 -EBUILD virtualbox-5.2.36.ebuild 14436 BLAKE2B f17dda45a12edc196ff15c96537adb8fa503baade17d928f50d883f7fd82818d1663729ef4a74714274243faf820d05df63232945464c0e59c33ee1dcbbe0a8e SHA512 9a8d3a395f98cc71bbc0892fc517cbc6a1fce438cd03daa739683f1689f3e21da7ec658df15454d6bb9f306d5ab1b45475b01643854c70482ae34ac0b885f294 -EBUILD virtualbox-5.2.40.ebuild 14436 BLAKE2B f17dda45a12edc196ff15c96537adb8fa503baade17d928f50d883f7fd82818d1663729ef4a74714274243faf820d05df63232945464c0e59c33ee1dcbbe0a8e SHA512 9a8d3a395f98cc71bbc0892fc517cbc6a1fce438cd03daa739683f1689f3e21da7ec658df15454d6bb9f306d5ab1b45475b01643854c70482ae34ac0b885f294 -EBUILD virtualbox-6.0.16-r1.ebuild 14597 BLAKE2B 41b401627936df95add918202877f30ad40df76d99084c6c50210e4be7b2b733ae45f553c3ad4deead23f5f1f852d2bbf5068e2ec132fb6be5506a008a384e01 SHA512 8cc1904470925a6fbc1d0150e25694f70a482c83d133ce92c4b5504203d68c0ac80ca2b03114040cccdc30fab5c25702dd717f4f8119cf869e526e4d43b6792a -EBUILD virtualbox-6.0.20.ebuild 14597 BLAKE2B deb61a423398a90621333f98c8490801d82ac5643bbaa6bde338593779842d11d4b58a8f156652b047c3cdace662e06d32f6902fe4dce288b363de041c2ac333 SHA512 03e2f26998374244f922f364a3c6071d5ec8bab8b68b06061bb5c1fbaf4af71b3ebb7fa85a0930ffef25a8d54e473a9e3cab175fef601aad385bac0dac5ec827 -EBUILD virtualbox-6.1.4-r2.ebuild 14468 BLAKE2B 6df18fc2376e5f568c295358c0681eb0582d098827829f15b3f80f7e53cb387d5980f35a90d446386cc1b07733d7262f8e67dade5a860ad504ca82a02d45ccbd SHA512 827573c866c28241a1a1499fa9b96b9e5799d7850c6094aed369aa8c5fc62e8d02d0e45ccbb2df8ef337ab1c4d40df8b1547f2c4a7e0846abd00e60841d7da75 +EBUILD virtualbox-5.2.40.ebuild 14429 BLAKE2B 1cb2f4e3a7c88984ad60aece1250e4bc1f6fb6355f13ac8b2f933427ff3036b3b93fe881727a34f1dac1e8d157ff146cf1cd8ef13b444d841432901bed97aeaa SHA512 6cfe81f12807d6622a8caec221fa2e03018e49fc3eb5ca962aa4e49a721aff0cab75d8c08b0133f05d53cff09c789975fc95b7729f58b85e172f91c4a81123de +EBUILD virtualbox-6.0.20.ebuild 14591 BLAKE2B 5a78a6463de2c70a35c08c0e753d18dff3cb9547cd313905613ec59d1c03c90ea64af6d1a988bd37db254f6fbc9553be5a1ff0cec6b974e3be55f495e3e074bb SHA512 9e31c7bf3ecbc00f952db7fa6674f55d33a634c3e139dd22f1ba487b94686b2b3acd9e57f7fdb93a38d5f0b23bc6ff51e5186b11eb4bfc502271d86898239a11 EBUILD virtualbox-6.1.6.ebuild 14468 BLAKE2B 6df18fc2376e5f568c295358c0681eb0582d098827829f15b3f80f7e53cb387d5980f35a90d446386cc1b07733d7262f8e67dade5a860ad504ca82a02d45ccbd SHA512 827573c866c28241a1a1499fa9b96b9e5799d7850c6094aed369aa8c5fc62e8d02d0e45ccbb2df8ef337ab1c4d40df8b1547f2c4a7e0846abd00e60841d7da75 MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549 diff --git a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild b/app-emulation/virtualbox/virtualbox-5.2.32.ebuild deleted file mode 100644 index a55c3b9db734..000000000000 --- a/app-emulation/virtualbox/virtualbox-5.2.32.ebuild +++ /dev/null @@ -1,497 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz" - -LICENSE="GPL-2 dtrace? ( CDDL )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" - -RDEPEND="!app-emulation/virtualbox-bin - ~app-emulation/virtualbox-modules-${PV} - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - net-misc/curl - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libvpx:0= - sys-libs/zlib:= - !headless? ( - media-libs/libsdl:0[X,video] - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - opengl? ( virtual/opengl media-libs/freeglut ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - opengl? ( dev-qt/qtopengl:5 ) - x11-libs/libXinerama - ) - ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - lvm? ( sys-fs/lvm2 ) - opus? ( media-libs/opus ) - udev? ( >=virtual/udev-171 ) - vnc? ( >=net-libs/libvncserver-0.9.9 ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/libcap - sys-power/iasl - virtual/pkgconfig - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - doc? ( - app-text/docbook-sgml-dtd:4.4 - dev-texlive/texlive-basic - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-fontsextra - ) - !headless? ( x11-libs/libXinerama ) - java? ( >=virtual/jdk-1.6 ) - pam? ( sys-libs/pam ) - pax_kernel? ( sys-apps/elfix ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( dev-qt/linguist-tools:5 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - java? ( >=virtual/jre-1.6 )" - -QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so - usr/lib/virtualbox/VBoxSDL.so - usr/lib/virtualbox/VBoxSharedFolders.so - usr/lib/virtualbox/VBoxDD2.so - usr/lib/virtualbox/VBoxOGLrenderspu.so - usr/lib/virtualbox/VBoxPython.so - usr/lib/virtualbox/VBoxDD.so - usr/lib/virtualbox/VBoxDDU.so - usr/lib/virtualbox/VBoxREM64.so - usr/lib/virtualbox/VBoxSharedClipboard.so - usr/lib/virtualbox/VBoxHeadless.so - usr/lib/virtualbox/VBoxRT.so - usr/lib/virtualbox/VBoxREM.so - usr/lib/virtualbox/VBoxSettings.so - usr/lib/virtualbox/VBoxKeyboard.so - usr/lib/virtualbox/VBoxSharedCrOpenGL.so - usr/lib/virtualbox/VBoxVMM.so - usr/lib/virtualbox/VirtualBox.so - usr/lib/virtualbox/VBoxOGLhosterrorspu.so - usr/lib/virtualbox/components/VBoxC.so - usr/lib/virtualbox/components/VBoxSVCM.so - usr/lib/virtualbox/components/VBoxDDU.so - usr/lib/virtualbox/components/VBoxRT.so - usr/lib/virtualbox/components/VBoxREM.so - usr/lib/virtualbox/components/VBoxVMM.so - usr/lib/virtualbox/VBoxREM32.so - usr/lib/virtualbox/VBoxPython2_7.so - usr/lib/virtualbox/VBoxXPCOMC.so - usr/lib/virtualbox/VBoxOGLhostcrutil.so - usr/lib/virtualbox/VBoxNetDHCP.so - usr/lib/virtualbox/VBoxNetNAT.so" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - java? ( sdk ) - python? ( sdk ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -pkg_pretend() { - if ! use headless && ! use qt5 ; then - einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." - elif use headless && use qt5 ; then - einfo "You selected USE=\"headless qt5\", defaulting to" - einfo "USE=\"headless\", this build will not include any X11/Qt frontend." - fi - - if ! use opengl ; then - einfo "No USE=\"opengl\" selected, this build will lack" - einfo "the OpenGL feature." - fi - if ! use python ; then - einfo "You have disabled the \"python\" USE flag. This will only" - einfo "disable the python bindings being installed." - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - - tc-ld-disable-gold #bug 488176 - tc-export CC CXX LD AR RANLIB - export HOST_CC="$(tc-getBUILD_CC)" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Replace pointless GCC version check with something less stupid. - # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \ - -i configure || die - - # Disable things unused or split into separate ebuilds - sed -e "s@MY_LIBDIR@$(get_libdir)@" \ - "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die - - # Respect LDFLAGS - sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ - -i Config.kmk src/libs/xpcom18a4/Config.kmk || die - - # Do not use hard-coded ld (related to bug #488176) - sed -e '/QUIET)ld /s@ld @$(LD) @' \ - -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die - - # Use PAM only when pam USE flag is enbaled (bug #376531) - if ! use pam ; then - elog "Disabling PAM removes the possibility to use the VRDP features." - sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die - sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ - src/VBox/HostServices/Makefile.kmk || die - fi - - # add correct java path - if use java ; then - sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ - -i "${S}"/Config.kmk || die - java-pkg-opt-2_src_prepare - fi - - # Only add nopie patch when we're on hardened - if gcc-specs-pie ; then - eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" - fi - - # Only add paxmark patch when we're on pax_kernel - if use pax_kernel ; then - eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch - fi - - rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -doecho() { - echo "$@" - "$@" || die -} - -src_configure() { - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --disable-dbus - --disable-kmods - $(usex alsa '' --disable-alsa) - $(usex debug --build-debug '') - $(usex doc '' --disable-docs) - $(usex java '' --disable-java) - $(usex lvm '' --disable-devmapper) - $(usex opus --build-libopus '') - $(usex pulseaudio '' --disable-pulse) - $(usex python '' --disable-python) - $(usex vboxwebsrv --enable-webservice '') - $(usex vnc --enable-vnc '') - ) - if ! use headless ; then - myconf+=( - $(usex opengl '' --disable-opengl) - $(usex qt5 '' --disable-qt) - ) - else - myconf+=( - --build-headless - --disable-opengl - ) - fi - if use amd64 && ! has_multilib_profile ; then - myconf+=( --disable-vmmraw ) - fi - # not an autoconf script - doecho ./configure ${myconf[@]} -} - -src_compile() { - source ./env.sh || die - - # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" - MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ - TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ - TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ - TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ - TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \ - VBOX_GCC_OPT="${CXXFLAGS}" \ - TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ - all -} - -src_install() { - local binpath="release" - use debug && binpath="debug" - cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die - - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile - - vbox_inst() { - local binary="${1}" - local perms="${2:-0750}" - local path="${3:-${vbox_inst_path}}" - - [[ -n "${binary}" ]] || die "vbox_inst: No binray given!" - [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." - - insinto ${path} - doins ${binary} - fowners root:vboxusers ${path}/${binary} - fperms ${perms} ${path}/${binary} - } - - # Create configuration files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-4-config" vbox.cfg - - # Set the correct libdir - sed \ - -e "s@MY_LIBDIR@$(get_libdir)@" \ - -i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" - - # Install the wrapper script - exeinto ${vbox_inst_path} - newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox" - fowners root:vboxusers ${vbox_inst_path}/VBox - fperms 0750 ${vbox_inst_path}/VBox - - # Install binaries and libraries - insinto ${vbox_inst_path} - doins -r components - - # *.rc files for x86_64 are only available on multilib systems - local rcfiles="*.rc" - if use amd64 && ! has_multilib_profile ; then - rcfiles="" - fi - for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do - vbox_inst ${each} - done - - # These binaries need to be suid root. - for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do - vbox_inst ${each} 4750 - done - - # Install EFI Firmware files (bug #320757) - pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die - for fwfile in VBoxEFI{32,64}.fd ; do - vbox_inst ${fwfile} 0644 - done - popd &>/dev/null || die - - # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) - # VBoxXPCOMIPCD (bug #524202) - for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${ED%/}"${vbox_inst_path}/${each} - done - - # Symlink binaries to the shipped wrapper - for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl - - if use pam ; then - # VRDPAuth only works with this (bug #351949) - dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so - fi - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - if ! use headless ; then - vbox_inst VBoxSDL 4750 - pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL - - for each in vboxsdl VBoxSDL ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - if use qt5 ; then - vbox_inst VirtualBox 4750 - pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox - - if use opengl ; then - vbox_inst VBoxTestOGL - pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL - fi - - for each in virtualbox VirtualBox ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - insinto /usr/share/${PN} - doins -r nls - doins -r UnattendedTemplates - - newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop - fi - - pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die - for size in 16 32 48 64 128 ; do - newicon -s ${size} ${PN}-${size}px.png ${PN}.png - done - newicon ${PN}-48px.png ${PN}.png - doicon -s scalable ${PN}.svg - popd &>/dev/null || die - pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die - for size in 16 24 32 48 64 72 96 128 256 512 ; do - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="${PN}-${ico}-${size}px.png" - if [[ -f "${icofile}" ]] ; then - newicon -s ${size} ${icofile} ${PN}-${ico}.png - fi - done - done - popd &>/dev/null || die - fi - - if use lvm ; then - vbox_inst VBoxVolInfo 4750 - dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo - fi - - if use sdk ; then - insinto ${vbox_inst_path} - doins -r sdk - - if use java ; then - java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" - java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so" - fi - fi - - if use udev ; then - # New way of handling USB device nodes for VBox (bug #356215) - local udevdir="$(get_udevdir)" - insinto ${udevdir} - doins VBoxCreateUSBNode.sh - fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh - insinto ${udevdir}/rules.d - sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ - > "${T}"/10-virtualbox.rules || die - doins "${T}"/10-virtualbox.rules - fi - - if use vboxwebsrv ; then - vbox_inst vboxwebsrv - dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - # Fix version string in extensions or else they don't get accepted - # by the virtualbox host process (see bug #438930) - find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ - | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ - || die - - if use vnc ; then - insinto ${vbox_inst_path}/ExtensionPacks - doins -r ExtensionPacks/VNC - fi - - if use dtrace ; then - insinto ${vbox_inst_path}/ExtensionPacks - doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack - fi - - if use doc ; then - dodoc UserManual.pdf - fi - - newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - - if use udev ; then - udevadm control --reload-rules \ - && udevadm trigger --subsystem-match=usb - fi - - tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf - - if ! use headless && use qt5 ; then - elog "To launch VirtualBox just type: \"virtualbox\"." - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The latest user manual is available for download at:" - elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Starting with version 4.0.0, ${PN} has USB-1 support." - elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - elog "package." - elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" - elog "the \"extension\" USE flag. For installation of the guest additions ISO" - elog "image, please emerge" - elog " app-emulation/virtualbox-additions" - elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - if ! use udev ; then - elog "" - elog "WARNING!" - elog "Without USE=udev, USB devices will likely not work in ${PN}." - elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/app-emulation/virtualbox/virtualbox-5.2.36.ebuild b/app-emulation/virtualbox/virtualbox-5.2.36.ebuild deleted file mode 100644 index 44876802ad93..000000000000 --- a/app-emulation/virtualbox/virtualbox-5.2.36.ebuild +++ /dev/null @@ -1,496 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) -inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.36-patches-01.tar.xz" - -LICENSE="GPL-2 dtrace? ( CDDL )" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" - -RDEPEND="!app-emulation/virtualbox-bin - ~app-emulation/virtualbox-modules-${PV} - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - net-misc/curl - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libvpx:0= - media-libs/opus - sys-libs/zlib:= - !headless? ( - media-libs/libsdl:0[X,video] - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - opengl? ( virtual/opengl media-libs/freeglut ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - opengl? ( dev-qt/qtopengl:5 ) - x11-libs/libXinerama - ) - ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - lvm? ( sys-fs/lvm2 ) - udev? ( >=virtual/udev-171 ) - vnc? ( >=net-libs/libvncserver-0.9.9 ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/libcap - sys-power/iasl - virtual/pkgconfig - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - doc? ( - app-text/docbook-sgml-dtd:4.4 - dev-texlive/texlive-basic - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-fontsextra - ) - !headless? ( x11-libs/libXinerama ) - java? ( >=virtual/jdk-1.6 ) - pam? ( sys-libs/pam ) - pax_kernel? ( sys-apps/elfix ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( dev-qt/linguist-tools:5 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - java? ( >=virtual/jre-1.6 )" - -QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so - usr/lib/virtualbox/VBoxSDL.so - usr/lib/virtualbox/VBoxSharedFolders.so - usr/lib/virtualbox/VBoxDD2.so - usr/lib/virtualbox/VBoxOGLrenderspu.so - usr/lib/virtualbox/VBoxPython.so - usr/lib/virtualbox/VBoxDD.so - usr/lib/virtualbox/VBoxDDU.so - usr/lib/virtualbox/VBoxREM64.so - usr/lib/virtualbox/VBoxSharedClipboard.so - usr/lib/virtualbox/VBoxHeadless.so - usr/lib/virtualbox/VBoxRT.so - usr/lib/virtualbox/VBoxREM.so - usr/lib/virtualbox/VBoxSettings.so - usr/lib/virtualbox/VBoxKeyboard.so - usr/lib/virtualbox/VBoxSharedCrOpenGL.so - usr/lib/virtualbox/VBoxVMM.so - usr/lib/virtualbox/VirtualBox.so - usr/lib/virtualbox/VBoxOGLhosterrorspu.so - usr/lib/virtualbox/components/VBoxC.so - usr/lib/virtualbox/components/VBoxSVCM.so - usr/lib/virtualbox/components/VBoxDDU.so - usr/lib/virtualbox/components/VBoxRT.so - usr/lib/virtualbox/components/VBoxREM.so - usr/lib/virtualbox/components/VBoxVMM.so - usr/lib/virtualbox/VBoxREM32.so - usr/lib/virtualbox/VBoxPython2_7.so - usr/lib/virtualbox/VBoxXPCOMC.so - usr/lib/virtualbox/VBoxOGLhostcrutil.so - usr/lib/virtualbox/VBoxNetDHCP.so - usr/lib/virtualbox/VBoxNetNAT.so" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - java? ( sdk ) - python? ( sdk ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -pkg_pretend() { - if ! use headless && ! use qt5 ; then - einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." - elif use headless && use qt5 ; then - einfo "You selected USE=\"headless qt5\", defaulting to" - einfo "USE=\"headless\", this build will not include any X11/Qt frontend." - fi - - if ! use opengl ; then - einfo "No USE=\"opengl\" selected, this build will lack" - einfo "the OpenGL feature." - fi - if ! use python ; then - einfo "You have disabled the \"python\" USE flag. This will only" - einfo "disable the python bindings being installed." - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - - tc-ld-disable-gold #bug 488176 - tc-export CC CXX LD AR RANLIB - export HOST_CC="$(tc-getBUILD_CC)" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Replace pointless GCC version check with something less stupid. - # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \ - -i configure || die - - # Disable things unused or split into separate ebuilds - sed -e "s@MY_LIBDIR@$(get_libdir)@" \ - "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die - - # Respect LDFLAGS - sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ - -i Config.kmk src/libs/xpcom18a4/Config.kmk || die - - # Do not use hard-coded ld (related to bug #488176) - sed -e '/QUIET)ld /s@ld @$(LD) @' \ - -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die - - # Use PAM only when pam USE flag is enbaled (bug #376531) - if ! use pam ; then - elog "Disabling PAM removes the possibility to use the VRDP features." - sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die - sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ - src/VBox/HostServices/Makefile.kmk || die - fi - - # add correct java path - if use java ; then - sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ - -i "${S}"/Config.kmk || die - java-pkg-opt-2_src_prepare - fi - - # Only add nopie patch when we're on hardened - if gcc-specs-pie ; then - eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" - fi - - # Only add paxmark patch when we're on pax_kernel - if use pax_kernel ; then - eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch - fi - - rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -doecho() { - echo "$@" - "$@" || die -} - -src_configure() { - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --disable-dbus - --disable-kmods - $(usex alsa '' --disable-alsa) - $(usex debug --build-debug '') - $(usex doc '' --disable-docs) - $(usex java '' --disable-java) - $(usex lvm '' --disable-devmapper) - $(usex pulseaudio '' --disable-pulse) - $(usex python '' --disable-python) - $(usex vboxwebsrv --enable-webservice '') - $(usex vnc --enable-vnc '') - ) - if ! use headless ; then - myconf+=( - $(usex opengl '' --disable-opengl) - $(usex qt5 '' --disable-qt) - ) - else - myconf+=( - --build-headless - --disable-opengl - ) - fi - if use amd64 && ! has_multilib_profile ; then - myconf+=( --disable-vmmraw ) - fi - # not an autoconf script - doecho ./configure ${myconf[@]} -} - -src_compile() { - source ./env.sh || die - - # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" - MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ - TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ - TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ - TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ - TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \ - VBOX_GCC_OPT="${CXXFLAGS}" \ - TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ - all -} - -src_install() { - local binpath="release" - use debug && binpath="debug" - cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die - - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile - - vbox_inst() { - local binary="${1}" - local perms="${2:-0750}" - local path="${3:-${vbox_inst_path}}" - - [[ -n "${binary}" ]] || die "vbox_inst: No binray given!" - [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." - - insinto ${path} - doins ${binary} - fowners root:vboxusers ${path}/${binary} - fperms ${perms} ${path}/${binary} - } - - # Create configuration files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-4-config" vbox.cfg - - # Set the correct libdir - sed \ - -e "s@MY_LIBDIR@$(get_libdir)@" \ - -i "${ED%/}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" - - # Install the wrapper script - exeinto ${vbox_inst_path} - newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox" - fowners root:vboxusers ${vbox_inst_path}/VBox - fperms 0750 ${vbox_inst_path}/VBox - - # Install binaries and libraries - insinto ${vbox_inst_path} - doins -r components - - # *.rc files for x86_64 are only available on multilib systems - local rcfiles="*.rc" - if use amd64 && ! has_multilib_profile ; then - rcfiles="" - fi - for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do - vbox_inst ${each} - done - - # These binaries need to be suid root. - for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do - vbox_inst ${each} 4750 - done - - # Install EFI Firmware files (bug #320757) - pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die - for fwfile in VBoxEFI{32,64}.fd ; do - vbox_inst ${fwfile} 0644 - done - popd &>/dev/null || die - - # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) - # VBoxXPCOMIPCD (bug #524202) - for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${ED%/}"${vbox_inst_path}/${each} - done - - # Symlink binaries to the shipped wrapper - for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl - - if use pam ; then - # VRDPAuth only works with this (bug #351949) - dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so - fi - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - if ! use headless ; then - vbox_inst VBoxSDL 4750 - pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxSDL - - for each in vboxsdl VBoxSDL ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - if use qt5 ; then - vbox_inst VirtualBox 4750 - pax-mark -m "${ED%/}"${vbox_inst_path}/VirtualBox - - if use opengl ; then - vbox_inst VBoxTestOGL - pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL - fi - - for each in virtualbox VirtualBox ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - insinto /usr/share/${PN} - doins -r nls - doins -r UnattendedTemplates - - newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop - fi - - pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die - for size in 16 32 48 64 128 ; do - newicon -s ${size} ${PN}-${size}px.png ${PN}.png - done - newicon ${PN}-48px.png ${PN}.png - doicon -s scalable ${PN}.svg - popd &>/dev/null || die - pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die - for size in 16 24 32 48 64 72 96 128 256 512 ; do - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="${PN}-${ico}-${size}px.png" - if [[ -f "${icofile}" ]] ; then - newicon -s ${size} ${icofile} ${PN}-${ico}.png - fi - done - done - popd &>/dev/null || die - fi - - if use lvm ; then - vbox_inst VBoxVolInfo 4750 - dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo - fi - - if use sdk ; then - insinto ${vbox_inst_path} - doins -r sdk - - if use java ; then - java-pkg_regjar "${ED%/}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" - java-pkg_regso "${ED%/}/${vbox_inst_path}/libvboxjxpcom.so" - fi - fi - - if use udev ; then - # New way of handling USB device nodes for VBox (bug #356215) - local udevdir="$(get_udevdir)" - insinto ${udevdir} - doins VBoxCreateUSBNode.sh - fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh - insinto ${udevdir}/rules.d - sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ - > "${T}"/10-virtualbox.rules || die - doins "${T}"/10-virtualbox.rules - fi - - if use vboxwebsrv ; then - vbox_inst vboxwebsrv - dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - # Fix version string in extensions or else they don't get accepted - # by the virtualbox host process (see bug #438930) - find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ - | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ - || die - - if use vnc ; then - insinto ${vbox_inst_path}/ExtensionPacks - doins -r ExtensionPacks/VNC - fi - - if use dtrace ; then - insinto ${vbox_inst_path}/ExtensionPacks - doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack - fi - - if use doc ; then - dodoc UserManual.pdf - fi - - newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - - if use udev ; then - udevadm control --reload-rules \ - && udevadm trigger --subsystem-match=usb - fi - - tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf - - if ! use headless && use qt5 ; then - elog "To launch VirtualBox just type: \"virtualbox\"." - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The latest user manual is available for download at:" - elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Starting with version 4.0.0, ${PN} has USB-1 support." - elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - elog "package." - elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" - elog "the \"extension\" USE flag. For installation of the guest additions ISO" - elog "image, please emerge" - elog " app-emulation/virtualbox-additions" - elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - if ! use udev ; then - elog "" - elog "WARNING!" - elog "Without USE=udev, USB devices will likely not work in ${PN}." - elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then - elog "" - elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild index 44876802ad93..306436546bc2 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.40.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.40.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit flag-o-matic gnome2-utils java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg-utils MY_PV="${PV/beta/BETA}" @@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="alsa debug doc dtrace headless java libressl lvm pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" RDEPEND="!app-emulation/virtualbox-bin diff --git a/app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild deleted file mode 100644 index 9e588603a0d2..000000000000 --- a/app-emulation/virtualbox/virtualbox-6.0.16-r1.ebuild +++ /dev/null @@ -1,511 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) -inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.16-patches-01.tar.xz" - -LICENSE="GPL-2 dtrace? ( CDDL )" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" - -CDEPEND=" - ${PYTHON_DEPS} - !app-emulation/virtualbox-bin - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${PV} - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - net-misc/curl - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libvpx:0= - sys-libs/zlib:= - !headless? ( - media-libs/libsdl:0[X,video] - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - opengl? ( virtual/opengl media-libs/freeglut ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - opengl? ( dev-qt/qtopengl:5 ) - x11-libs/libXinerama - ) - ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - lvm? ( sys-fs/lvm2 ) - opus? ( media-libs/opus ) - udev? ( >=virtual/udev-171 ) - vnc? ( >=net-libs/libvncserver-0.9.9 ) -" -DEPEND=" - ${CDEPEND} - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !headless? ( x11-libs/libXinerama ) - pam? ( sys-libs/pam ) - pax_kernel? ( sys-apps/elfix ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( dev-qt/linguist-tools:5 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/libcap - sys-power/iasl - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-dtd:4.4 - dev-texlive/texlive-basic - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-fontsextra - ) - java? ( >=virtual/jdk-1.6 ) -" -RDEPEND=" - ${CDEPEND} - java? ( >=virtual/jre-1.6 ) -" - -QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so - usr/lib/virtualbox/VBoxSDL.so - usr/lib/virtualbox/VBoxSharedFolders.so - usr/lib/virtualbox/VBoxDD2.so - usr/lib/virtualbox/VBoxOGLrenderspu.so - usr/lib/virtualbox/VBoxPython.so - usr/lib/virtualbox/VBoxDD.so - usr/lib/virtualbox/VBoxDDU.so - usr/lib/virtualbox/VBoxREM64.so - usr/lib/virtualbox/VBoxSharedClipboard.so - usr/lib/virtualbox/VBoxHeadless.so - usr/lib/virtualbox/VBoxRT.so - usr/lib/virtualbox/VBoxREM.so - usr/lib/virtualbox/VBoxSettings.so - usr/lib/virtualbox/VBoxKeyboard.so - usr/lib/virtualbox/VBoxSharedCrOpenGL.so - usr/lib/virtualbox/VBoxVMM.so - usr/lib/virtualbox/VirtualBox.so - usr/lib/virtualbox/VBoxOGLhosterrorspu.so - usr/lib/virtualbox/components/VBoxC.so - usr/lib/virtualbox/components/VBoxSVCM.so - usr/lib/virtualbox/components/VBoxDDU.so - usr/lib/virtualbox/components/VBoxRT.so - usr/lib/virtualbox/components/VBoxREM.so - usr/lib/virtualbox/components/VBoxVMM.so - usr/lib/virtualbox/VBoxREM32.so - usr/lib/virtualbox/VBoxPython2_7.so - usr/lib/virtualbox/VBoxXPCOMC.so - usr/lib/virtualbox/VBoxOGLhostcrutil.so - usr/lib/virtualbox/VBoxNetDHCP.so - usr/lib/virtualbox/VBoxNetNAT.so" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - java? ( sdk ) - python? ( sdk ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -pkg_pretend() { - if ! use headless && ! use qt5 ; then - einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." - elif use headless && use qt5 ; then - einfo "You selected USE=\"headless qt5\", defaulting to" - einfo "USE=\"headless\", this build will not include any X11/Qt frontend." - fi - - if ! use opengl ; then - einfo "No USE=\"opengl\" selected, this build will lack" - einfo "the OpenGL feature." - fi - if ! use python ; then - einfo "You have disabled the \"python\" USE flag. This will only" - einfo "disable the python bindings being installed." - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - - tc-ld-disable-gold #bug 488176 - tc-export CC CXX LD AR RANLIB - export HOST_CC="$(tc-getBUILD_CC)" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Replace pointless GCC version check with something less stupid. - # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \ - -i configure || die - - # Disable things unused or split into separate ebuilds - sed -e "s@MY_LIBDIR@$(get_libdir)@" \ - "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die - - # Respect LDFLAGS - sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ - -i Config.kmk src/libs/xpcom18a4/Config.kmk || die - - # Do not use hard-coded ld (related to bug #488176) - sed -e '/QUIET)ld /s@ld @$(LD) @' \ - -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die - - # Use PAM only when pam USE flag is enbaled (bug #376531) - if ! use pam ; then - elog "Disabling PAM removes the possibility to use the VRDP features." - sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die - sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ - src/VBox/HostServices/Makefile.kmk || die - fi - - # add correct java path - if use java ; then - sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ - -i "${S}"/Config.kmk || die - java-pkg-opt-2_src_prepare - fi - - # Only add nopie patch when we're on hardened - if gcc-specs-pie ; then - eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" - fi - - # Only add paxmark patch when we're on pax_kernel - if use pax_kernel ; then - eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch - fi - - rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die - eapply "${WORKDIR}/patches" - - eapply_user -} - -doecho() { - echo "$@" - "$@" || die -} - -src_configure() { - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --disable-dbus - --disable-kmods - $(usex alsa '' --disable-alsa) - $(usex debug --build-debug '') - $(usex doc '' --disable-docs) - $(usex java '' --disable-java) - $(usex lvm '' --disable-devmapper) - $(usex opus '' --disable-libopus) - $(usex pulseaudio '' --disable-pulse) - $(usex python '' --disable-python) - $(usex vboxwebsrv --enable-webservice '') - $(usex vnc --enable-vnc '') - ) - if ! use headless ; then - myconf+=( - $(usex opengl '' --disable-opengl) - $(usex qt5 '' --disable-qt) - ) - else - myconf+=( - --build-headless - --disable-opengl - ) - fi - if use amd64 && ! has_multilib_profile ; then - myconf+=( --disable-vmmraw ) - fi - # not an autoconf script - doecho ./configure ${myconf[@]} -} - -src_compile() { - source ./env.sh || die - - # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" - MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ - TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ - TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ - TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ - TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \ - VBOX_GCC_OPT="${CXXFLAGS}" \ - TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ - all -} - -src_install() { - cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die - - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile - - vbox_inst() { - local binary="${1}" - local perms="${2:-0750}" - local path="${3:-${vbox_inst_path}}" - - [[ -n "${binary}" ]] || die "vbox_inst: No binary given!" - [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." - - insinto ${path} - doins ${binary} - fowners root:vboxusers ${path}/${binary} - fperms ${perms} ${path}/${binary} - } - - # Create configuration files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-4-config" vbox.cfg - - # Set the correct libdir - sed \ - -e "s@MY_LIBDIR@$(get_libdir)@" \ - -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" - - # Install the wrapper script - exeinto ${vbox_inst_path} - newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" - fowners root:vboxusers ${vbox_inst_path}/VBox - fperms 0750 ${vbox_inst_path}/VBox - - # Install binaries and libraries - insinto ${vbox_inst_path} - doins -r components - - # *.rc files for x86_64 are only available on multilib systems - local rcfiles="*.rc" - if use amd64 && ! has_multilib_profile ; then - rcfiles="" - fi - for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do - vbox_inst ${each} - done - - # These binaries need to be suid root. - for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do - vbox_inst ${each} 4750 - done - - # Install EFI Firmware files (bug #320757) - for each in VBoxEFI{32,64}.fd ; do - vbox_inst ${each} 0644 - done - - # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) - # VBoxXPCOMIPCD (bug #524202) - for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${ED}"${vbox_inst_path}/${each} - done - - # Symlink binaries to the shipped wrapper - for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl - - if use pam ; then - # VRDPAuth only works with this (bug #351949) - dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so - fi - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - if ! use headless ; then - vbox_inst rdesktop-vrdp - vbox_inst VBoxSDL 4750 - pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL - - for each in vboxsdl VBoxSDL ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - if use qt5 ; then - vbox_inst VirtualBox - vbox_inst VirtualBoxVM 4750 - for each in VirtualBox{,VM} ; do - pax-mark -m "${ED}"${vbox_inst_path}/${each} - done - - if use opengl ; then - vbox_inst VBoxTestOGL - pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL - fi - - for each in virtualbox{,vm} VirtualBox{,VM} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - insinto /usr/share/${PN} - doins -r nls - doins -r UnattendedTemplates - - domenu ${PN}.desktop - fi - - pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die - for size in 16 32 48 64 128 ; do - newicon -s ${size} ${PN}-${size}px.png ${PN}.png - done - newicon ${PN}-48px.png ${PN}.png - doicon -s scalable ${PN}.svg - popd &>/dev/null || die - pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die - for size in 16 24 32 48 64 72 96 128 256 512 ; do - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="${PN}-${ico}-${size}px.png" - if [[ -f "${icofile}" ]] ; then - newicon -s ${size} ${icofile} ${PN}-${ico}.png - fi - done - done - popd &>/dev/null || die - fi - - if use lvm ; then - vbox_inst VBoxVolInfo 4750 - dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo - fi - - if use sdk ; then - insinto ${vbox_inst_path} - doins -r sdk - - if use java ; then - java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" - java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so" - fi - fi - - if use udev ; then - # New way of handling USB device nodes for VBox (bug #356215) - local udevdir="$(get_udevdir)" - insinto ${udevdir} - doins VBoxCreateUSBNode.sh - fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh - insinto ${udevdir}/rules.d - sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ - > "${T}"/10-virtualbox.rules || die - doins "${T}"/10-virtualbox.rules - fi - - if use vboxwebsrv ; then - vbox_inst vboxwebsrv - dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - # Fix version string in extensions or else they don't get accepted - # by the virtualbox host process (see bug #438930) - find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ - | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ - || die - - local extensions_dir="${vbox_inst_path}/ExtensionPacks" - - if use vnc ; then - insinto ${extensions_dir} - doins -r ExtensionPacks/VNC - fi - - if use dtrace ; then - insinto ${extensions_dir} - doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack - fi - - if use doc ; then - dodoc UserManual.pdf - fi - - newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if use udev ; then - udevadm control --reload-rules \ - && udevadm trigger --subsystem-match=usb - fi - - tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf - - if ! use headless && use qt5 ; then - elog "To launch VirtualBox just type: \"virtualbox\"." - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The latest user manual is available for download at:" - elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Starting with version 4.0.0, ${PN} has USB-1 support." - elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - elog "package." - elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" - elog "the \"extension\" USE flag. For installation of the guest additions ISO" - elog "image, please emerge" - elog " app-emulation/virtualbox-additions" - elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - if ! use udev ; then - elog "" - elog "WARNING!" - elog "Without USE=udev, USB devices will likely not work in ${PN}." - elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild index 73d398156286..f16c7450b105 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.20.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.20.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg MY_PV="${PV/beta/BETA}" diff --git a/app-emulation/virtualbox/virtualbox-6.1.4-r2.ebuild b/app-emulation/virtualbox/virtualbox-6.1.4-r2.ebuild deleted file mode 100644 index 7ddbfdc42040..000000000000 --- a/app-emulation/virtualbox/virtualbox-6.1.4-r2.ebuild +++ /dev/null @@ -1,507 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg - -MY_PV="${PV/beta/BETA}" -MY_PV="${MY_PV/rc/RC}" -MY_P=VirtualBox-${MY_PV} - -DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use" -HOMEPAGE="https://www.virtualbox.org/" -SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 - https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.1.14-patches-01.tar.xz" - -LICENSE="GPL-2 dtrace? ( CDDL )" -SLOT="0" -[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ -KEYWORDS="~amd64" -IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" - -CDEPEND=" - ${PYTHON_DEPS} - !app-emulation/virtualbox-bin - acct-group/vboxusers - ~app-emulation/virtualbox-modules-${PV} - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - net-misc/curl - dev-libs/libxml2 - media-libs/libpng:0= - media-libs/libvpx:0= - sys-libs/zlib:= - !headless? ( - media-libs/libsdl:0[X,video] - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - opengl? ( virtual/opengl media-libs/freeglut ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - opengl? ( dev-qt/qtopengl:5 ) - x11-libs/libXinerama - ) - ) - libressl? ( dev-libs/libressl:= ) - !libressl? ( dev-libs/openssl:0= ) - lvm? ( sys-fs/lvm2 ) - opus? ( media-libs/opus ) - udev? ( >=virtual/udev-171 ) - vnc? ( >=net-libs/libvncserver-0.9.9 ) -" -DEPEND=" - ${CDEPEND} - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - !headless? ( x11-libs/libXinerama ) - pam? ( sys-libs/pam ) - pax_kernel? ( sys-apps/elfix ) - pulseaudio? ( media-sound/pulseaudio ) - qt5? ( dev-qt/linguist-tools:5 ) - vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/kbuild-0.1.9998.3127 - >=dev-lang/yasm-0.6.2 - sys-devel/bin86 - sys-libs/libcap - sys-power/iasl - virtual/pkgconfig - doc? ( - app-text/docbook-sgml-dtd:4.4 - dev-texlive/texlive-basic - dev-texlive/texlive-latex - dev-texlive/texlive-latexrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-fontsextra - ) - java? ( >=virtual/jdk-1.6 ) -" -RDEPEND=" - ${CDEPEND} - java? ( >=virtual/jre-1.6 ) -" - -QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so - usr/lib/virtualbox/VBoxSDL.so - usr/lib/virtualbox/VBoxSharedFolders.so - usr/lib/virtualbox/VBoxDD2.so - usr/lib/virtualbox/VBoxOGLrenderspu.so - usr/lib/virtualbox/VBoxPython.so - usr/lib/virtualbox/VBoxDD.so - usr/lib/virtualbox/VBoxDDU.so - usr/lib/virtualbox/VBoxREM64.so - usr/lib/virtualbox/VBoxSharedClipboard.so - usr/lib/virtualbox/VBoxHeadless.so - usr/lib/virtualbox/VBoxRT.so - usr/lib/virtualbox/VBoxREM.so - usr/lib/virtualbox/VBoxSettings.so - usr/lib/virtualbox/VBoxKeyboard.so - usr/lib/virtualbox/VBoxSharedCrOpenGL.so - usr/lib/virtualbox/VBoxVMM.so - usr/lib/virtualbox/VirtualBox.so - usr/lib/virtualbox/VBoxOGLhosterrorspu.so - usr/lib/virtualbox/components/VBoxC.so - usr/lib/virtualbox/components/VBoxSVCM.so - usr/lib/virtualbox/components/VBoxDDU.so - usr/lib/virtualbox/components/VBoxRT.so - usr/lib/virtualbox/components/VBoxREM.so - usr/lib/virtualbox/components/VBoxVMM.so - usr/lib/virtualbox/VBoxREM32.so - usr/lib/virtualbox/VBoxPython2_7.so - usr/lib/virtualbox/VBoxXPCOMC.so - usr/lib/virtualbox/VBoxOGLhostcrutil.so - usr/lib/virtualbox/VBoxNetDHCP.so - usr/lib/virtualbox/VBoxNetNAT.so" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE=" - java? ( sdk ) - python? ( sdk ) - vboxwebsrv? ( java ) - ${PYTHON_REQUIRED_USE} -" - -pkg_pretend() { - if ! use headless && ! use qt5 ; then - einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend." - elif use headless && use qt5 ; then - einfo "You selected USE=\"headless qt5\", defaulting to" - einfo "USE=\"headless\", this build will not include any X11/Qt frontend." - fi - - if ! use opengl ; then - einfo "No USE=\"opengl\" selected, this build will lack" - einfo "the OpenGL feature." - fi - if ! use python ; then - einfo "You have disabled the \"python\" USE flag. This will only" - einfo "disable the python bindings being installed." - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - python-single-r1_pkg_setup - - tc-ld-disable-gold #bug 488176 - tc-export CC CXX LD AR RANLIB - export HOST_CC="$(tc-getBUILD_CC)" -} - -src_prepare() { - # Remove shipped binaries (kBuild,yasm), see bug #232775 - rm -r kBuild/bin tools || die - - # Replace pointless GCC version check with something less stupid. - # This is needed for the qt5 version check. - sed -e 's@^check_gcc$@cc_maj="$(${CC} -dumpversion | cut -d. -f1)" ; cc_min="$(${CC} -dumpversion | cut -d. -f2)"@' \ - -i configure || die - - # Disable things unused or split into separate ebuilds - sed -e "s@MY_LIBDIR@$(get_libdir)@" \ - "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die - - # Respect LDFLAGS - sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ - -i Config.kmk src/libs/xpcom18a4/Config.kmk || die - - # Do not use hard-coded ld (related to bug #488176) - sed -e '/QUIET)ld /s@ld @$(LD) @' \ - -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die - - # Use PAM only when pam USE flag is enbaled (bug #376531) - if ! use pam ; then - elog "Disabling PAM removes the possibility to use the VRDP features." - sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die - sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \ - src/VBox/HostServices/Makefile.kmk || die - fi - - # add correct java path - if use java ; then - sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \ - -i "${S}"/Config.kmk || die - java-pkg-opt-2_src_prepare - fi - - # Only add nopie patch when we're on hardened - if gcc-specs-pie ; then - eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch" - fi - - # Only add paxmark patch when we're on pax_kernel - if use pax_kernel ; then - eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch - fi - - eapply "${WORKDIR}/patches" - - eapply_user -} - -doecho() { - echo "$@" - "$@" || die -} - -src_configure() { - local myconf=( - --with-gcc="$(tc-getCC)" - --with-g++="$(tc-getCXX)" - --disable-dbus - --disable-kmods - $(usex alsa '' --disable-alsa) - $(usex debug --build-debug '') - $(usex doc '' --disable-docs) - $(usex java '' --disable-java) - $(usex lvm '' --disable-devmapper) - $(usex opus '' --disable-libopus) - $(usex pulseaudio '' --disable-pulse) - $(usex python '' --disable-python) - $(usex vboxwebsrv --enable-webservice '') - $(usex vnc --enable-vnc '') - ) - if ! use headless ; then - myconf+=( - $(usex opengl '' --disable-opengl) - $(usex qt5 '' --disable-qt) - ) - else - myconf+=( - --build-headless - --disable-opengl - ) - fi - if use amd64 && ! has_multilib_profile ; then - myconf+=( --disable-vmmraw ) - fi - # not an autoconf script - doecho ./configure ${myconf[@]} -} - -src_compile() { - source ./env.sh || die - - # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529) - MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #' - MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" - MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ - TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ - TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ - TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ - TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \ - VBOX_GCC_OPT="${CXXFLAGS}" \ - TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \ - VBOX_WITH_VBOXIMGMOUNT=1 \ - all -} - -src_install() { - cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die - - local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile - - vbox_inst() { - local binary="${1}" - local perms="${2:-0750}" - local path="${3:-${vbox_inst_path}}" - - [[ -n "${binary}" ]] || die "vbox_inst: No binary given!" - [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits." - - insinto ${path} - doins ${binary} - fowners root:vboxusers ${path}/${binary} - fperms ${perms} ${path}/${binary} - } - - # Create configuration files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-4-config" vbox.cfg - - # Set the correct libdir - sed \ - -e "s@MY_LIBDIR@$(get_libdir)@" \ - -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed" - - # Install the wrapper script - exeinto ${vbox_inst_path} - newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox" - fowners root:vboxusers ${vbox_inst_path}/VBox - fperms 0750 ${vbox_inst_path}/VBox - - # Install binaries and libraries - insinto ${vbox_inst_path} - doins -r components - - for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} vboximg-mount *so *r0 iPxeBaseBin ; do - vbox_inst ${each} - done - - # These binaries need to be suid root. - for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do - vbox_inst ${each} 4750 - done - - # Install EFI Firmware files (bug #320757) - for each in VBoxEFI{32,64}.fd ; do - vbox_inst ${each} 0644 - done - - # VBoxSVC and VBoxManage need to be pax-marked (bug #403453) - # VBoxXPCOMIPCD (bug #524202) - for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do - pax-mark -m "${ED}"${vbox_inst_path}/${each} - done - - # Symlink binaries to the shipped wrapper - for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl - dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount - - if use pam ; then - # VRDPAuth only works with this (bug #351949) - dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so - fi - - # set an env-variable for 3rd party tools - echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox" - doenvd "${T}/90virtualbox" - - if ! use headless ; then - vbox_inst rdesktop-vrdp - vbox_inst VBoxSDL 4750 - pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL - - for each in vboxsdl VBoxSDL ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - if use qt5 ; then - vbox_inst VirtualBox - vbox_inst VirtualBoxVM 4750 - for each in VirtualBox{,VM} ; do - pax-mark -m "${ED}"${vbox_inst_path}/${each} - done - - if use opengl ; then - vbox_inst VBoxTestOGL - pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL - fi - - for each in virtualbox{,vm} VirtualBox{,VM} ; do - dosym ${vbox_inst_path}/VBox /usr/bin/${each} - done - - insinto /usr/share/${PN} - doins -r nls - doins -r UnattendedTemplates - - domenu ${PN}.desktop - fi - - pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die - for size in 16 32 48 64 128 ; do - newicon -s ${size} ${PN}-${size}px.png ${PN}.png - done - newicon ${PN}-48px.png ${PN}.png - doicon -s scalable ${PN}.svg - popd &>/dev/null || die - pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die - for size in 16 24 32 48 64 72 96 128 256 512 ; do - for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do - icofile="${PN}-${ico}-${size}px.png" - if [[ -f "${icofile}" ]] ; then - newicon -s ${size} ${icofile} ${PN}-${ico}.png - fi - done - done - popd &>/dev/null || die - fi - - if use lvm ; then - vbox_inst VBoxVolInfo 4750 - dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo - fi - - if use sdk ; then - insinto ${vbox_inst_path} - doins -r sdk - - if use java ; then - java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar" - java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so" - fi - fi - - if use udev ; then - # New way of handling USB device nodes for VBox (bug #356215) - local udevdir="$(get_udevdir)" - insinto ${udevdir} - doins VBoxCreateUSBNode.sh - fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh - fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh - insinto ${udevdir}/rules.d - sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \ - > "${T}"/10-virtualbox.rules || die - doins "${T}"/10-virtualbox.rules - fi - - if use vboxwebsrv ; then - vbox_inst vboxwebsrv - dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv - newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv - newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv - fi - - # Fix version string in extensions or else they don't get accepted - # by the virtualbox host process (see bug #438930) - find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ - | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ - || die - - local extensions_dir="${vbox_inst_path}/ExtensionPacks" - - if use vnc ; then - insinto ${extensions_dir} - doins -r ExtensionPacks/VNC - fi - - if use dtrace ; then - insinto ${extensions_dir} - doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack - fi - - if use doc ; then - dodoc UserManual.pdf - fi - - newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst - - if use udev ; then - udevadm control --reload-rules \ - && udevadm trigger --subsystem-match=usb - fi - - tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf - - if ! use headless && use qt5 ; then - elog "To launch VirtualBox just type: \"virtualbox\"." - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The latest user manual is available for download at:" - elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf" - elog "" - elog "For advanced networking setups you should emerge:" - elog "net-misc/bridge-utils and sys-apps/usermode-utilities" - elog "" - elog "Starting with version 4.0.0, ${PN} has USB-1 support." - elog "For USB-2 support, PXE-boot ability and VRDP support please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - elog "package." - elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and" - elog "the \"extension\" USE flag. For installation of the guest additions ISO" - elog "image, please emerge" - elog " app-emulation/virtualbox-additions" - elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge" - elog " app-emulation/virtualbox-extpack-oracle" - if ! use udev ; then - elog "" - elog "WARNING!" - elog "Without USE=udev, USB devices will likely not work in ${PN}." - elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then - elog "" - elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\"" - elog "or else USB in ${PN} won't work." - fi -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/app-emulation/wine-mono/Manifest b/app-emulation/wine-mono/Manifest index 6f93605d027b..cb99c0e94264 100644 --- a/app-emulation/wine-mono/Manifest +++ b/app-emulation/wine-mono/Manifest @@ -10,6 +10,7 @@ DIST wine-mono-4.9.0.msi 94960640 BLAKE2B b60debd41ea33eee15ab1a546c526858b97cf4 DIST wine-mono-4.9.2.msi 94981632 BLAKE2B b70a5177fad3c6ee2b04ef40105c7700a08339786a23d7378ba72005da5b3cb6b3a797f0173ba32224bcfd25a4bb0fa01c92a83b88e005973b33320717f5b31a SHA512 73e46ec57c7a78d8c32ead4698c299fa557bb97739ce22c9405f95f48f55d604743aa01cc64183c9f89f99aec6f04b664bac0ef96e6a436d38ebcd9d7cf3b329 DIST wine-mono-4.9.3.msi 95017472 BLAKE2B bf054bcff51e986ddb95788fdd1925ee13efe6e881089a23192d4ccb2527ccb2a2969917b9c3bb16a2161a2bd1d60c24605fd07e6c432f8f77c7c506222045f9 SHA512 4631d4e3b5118eb726f614e2f58f9e95f44bb97a1285fa726d3542d44e2a77ce818997ecb4de42e0d318d364d7c929f10d7c5176b59732e8b468e7695633706c DIST wine-mono-4.9.4.msi 95266304 BLAKE2B fb9c81f8ac8fca104f766d62b02c8751b5b7b91740cb43942477c7bdcac382eafeb5fc9c3fe78191b19d81bc5f06dd5c33db7ecfbdaba5e6be69ed39a6827706 SHA512 d52a2cc1137eac87acdaecbb7a81b3d618cad9ad3d7bca5b29940b7432923bfc1497ec21501a05797ef52c6588bb9c5e312df5c02ede8448d1fe1f2880557fc9 +DIST wine-mono-5.0.0-x86.msi 79537664 BLAKE2B f5a4185a7a63a1c1966d871d4c8d5bae07d3bbbc3153f20847c3919ac87be5644e15b45764286483641d9ce19176f79c7c7544e543fad62032ef5302a66ea8ea SHA512 8f83122d4b552b3a3d8b000abbd19b7a72edf45e52fa63a9220228240d8e4c014531bb265d062a38f6924fae07dd45420a5c7566f99e0c471e116fb80906c08c 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 @@ -22,4 +23,5 @@ EBUILD wine-mono-4.9.0.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a21179851 EBUILD wine-mono-4.9.2.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f EBUILD wine-mono-4.9.3.ebuild 503 BLAKE2B 935815fea7250e178ec3eec1ac280a2117985172fbe8201be194f9f63cbfdfb27358eec9cc98857d2dd687c1c7a37febfd96809c6339e8c16077f8ac5748220a SHA512 2f7dae1b9b8b62b8cd19aa244214502b49cd615467553dc209ea88117247291e99df272e275ff973de03b3cc895ad0da12e9201827408a21558e1ce3049f600f EBUILD wine-mono-4.9.4.ebuild 501 BLAKE2B 291fc02c8a792407a6e727ae5ac2a211201fa00761a5dc613cda2bd231524f187897e39725c08114316bceee53676998c2a5b4669da56919da665af5f5643c9a SHA512 710d387c1d7dce22f8a832bf7f090aa4cd9992e6622133a7cb187f2b13a7de0a88b0afc45d53882094a475de56ba5e0e4b631d778d61186686e76f9a4380cdf5 +EBUILD wine-mono-5.0.0.ebuild 511 BLAKE2B 6f8626fe54401295d68e1c70791c8d3d64528a7abde7e9d08eacfac832f1941fde7764bf564309c456cd95257b3dfc5efd9d5755ba758cec8b9b66caa2466d1d SHA512 61937ea63b95758fb622ef9ec189f83bb1832fa3f4cf977b0741314649aa2d19e29e26089656fc2cb8034a75b404bb21790b9a33715eb7535be54ceba7bc29c8 MISC metadata.xml 614 BLAKE2B e45f9e8581cec69afc21a5af29aa71eec05ba7fa626624e6c06000a5f013a3606674074beec999a0f8f91c91fc8912995b20cb88f8ad8a40bffbd964c5bf020f SHA512 5655c4bd737975334e66b4ea0c6cdb447dd647a7a3c76c0cd9782c405c9540ae396c87677bde408d3977b838813e00f12249f0f84267b75894e5554b2c6bcb6c diff --git a/app-emulation/wine-mono/wine-mono-5.0.0.ebuild b/app-emulation/wine-mono/wine-mono-5.0.0.ebuild new file mode 100644 index 000000000000..30b33158592b --- /dev/null +++ b/app-emulation/wine-mono/wine-mono-5.0.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 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 2439c5f4881d..f73e0a5ae4d7 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,19 +1,16 @@ DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf -DIST wine-5.2.tar.xz 22837712 BLAKE2B ee9d4d4dd6c0669d1585cc6988d933dbc7aa5277a0f13e965dd9eecb621e475d33a832b316e37f1372a965efe517efafa9f857a38d9bf081026d221db96b7a0d SHA512 57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f -DIST wine-5.3.tar.xz 22918612 BLAKE2B dce58aec45f665e1014635eadc9cc00c969e46c87de5d41bc51168237d9fc01011dcfc3fa4c83ed4cbcdfe19a3747e5e32f87946434a6eba2a8547f1929b33f3 SHA512 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6 -DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98 DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4 -DIST wine-staging-5.2.tar.gz 9898002 BLAKE2B f4dc43223cf89e6c76fc7898a98acdc9eb3d4a8e8279a38135f155d9a3fe6a2f7bbc52ece5c4a07cf801caa91c10e40f172271b442356e52a59c31a8a82db3c3 SHA512 dd2066db1eb4d424579bdf8d25f476eae0b86a6bea7b1f7ff2a21d7bf0209b4ef00d9c0ed29a7cab50c5dea4684acb5d342ebf02554b16fd0938a03e607f6270 -DIST wine-staging-5.3.tar.gz 9904213 BLAKE2B 5a1a9b41a17533238151ad87ec631a9ff78f954fa51baaebac787bd4eba88730a3524e4778a55eb80fd4153302d443d859c0b27c149495cd72ab6263aa583a8a SHA512 df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702 -DIST wine-staging-5.4.tar.gz 9924147 BLAKE2B c82fa66470645e62e63e8760d68cb92e4a04c209db712371bc1a534756c6b16c109e247bb1866edc514bdb24ba6a9e9f4ccb5c0db204d51541da0af82fd3b96f SHA512 d4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b +DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407 +DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de DIST wine-staging-5.5.tar.gz 9920540 BLAKE2B 21b24fd3a2b3ee9c9ea029e1114d0faaf0b8a4ef732eafb4f7e0301886aee9160699867147c4087515a37edc57a42919c662b1e203bf9df674d78579b3be3c39 SHA512 8e926d73f275ed36b1c1e55235831c171b427501265a0e859accc7ca6b5077513bc2b3d37d973842b76b57a56798d11c101a387c626c96ed422d8a06cd908221 DIST wine-staging-5.6.tar.gz 9922611 BLAKE2B 945e7a6398d6f3f8f85f334a06462282647405cf0b7d0e9d1985c9c5daa460c1bb9f8dc66d090311aeb8136d0603e836084bbeb2904833f4f73d7fdd9dd9bef1 SHA512 7ddf5699834a6e04b094a7cae008175c874415d22554bac38176f3121b9533071ef610f8b5a0dd3ce3e4adf8a9d4ac214aa1cee7634959c5150b66fbb74710b7 -EBUILD wine-staging-5.2.ebuild 20117 BLAKE2B 3e5a8e17f2026867dd4cde3e254f67b3674060e3da2c0b92fa19263aefc39b8bbac23b19781cfe65b37f489104eff6824290f51bd57c195f632ac987fa63a5f4 SHA512 89a5b86c0a3512b3a84975ffdccf27f37cca0e6fb7f88b227832c7f97fd01bec7f3c977b0e631c468e51a4ed29a3a4c2c510cd85a05a0f3cb5acf57b091758dc -EBUILD wine-staging-5.3-r1.ebuild 20270 BLAKE2B bb01e66fa3f2e2e91a44caad8388be624e82b0fc23a7eac2634299a4da8ed6396f54523ce62aaddeb00eb9b066789fd44e8398a66990c4a9d87eac5dc008e3a6 SHA512 1f45e12c8a69436751b733bd35c7737ded4a188a487c42aeb5e8169b7c49b56ccee862d96104125a751c766264b9f7ef5d5ead3e84857c19c689baf3c31fa60e -EBUILD wine-staging-5.4.ebuild 20270 BLAKE2B bb01e66fa3f2e2e91a44caad8388be624e82b0fc23a7eac2634299a4da8ed6396f54523ce62aaddeb00eb9b066789fd44e8398a66990c4a9d87eac5dc008e3a6 SHA512 1f45e12c8a69436751b733bd35c7737ded4a188a487c42aeb5e8169b7c49b56ccee862d96104125a751c766264b9f7ef5d5ead3e84857c19c689baf3c31fa60e +DIST wine-staging-5.7.tar.gz 9913511 BLAKE2B f5d803a067ec61c5d698d7ebf0623b55f0e4fee487e6fcfb4de057d742ff4d55bf184004c4427e8b93052efa74fe9e14da2a41a826c79a0c62ef25de7b6e10ef SHA512 042bcf7b90769c9d88d5cd844009301fb768568ee10ebf7aed9c3397ca35f6d6b512db2010917695f32bed9edf174d95f80a141d5af75a43871444b1830f2922 +DIST wine-staging-5.8.tar.gz 9878712 BLAKE2B a96f7e4aa1d1dddcda1a9d6a30ab3b564fb365a09efde22e5b7abab1ac015da0bc242b2fec6d4ae14dc5ddad38e3314a5f8c430e6eb10853ed8619e805bf5787 SHA512 3ea2a90ab0613b680274c95cf7ef3d3a7d807571fb792e05fc1df9bbd7a35c80a0d7c38342fea8858c5557ae3f12287a7ce09d0cdab5064000b79ec6c891ad15 EBUILD wine-staging-5.5-r1.ebuild 20395 BLAKE2B 47e075b9a1f7413f49f19ed5c8fcc96cad55f35644c9f6e6a00c462f3a8f590c5fcc9c73a71702bff6eba9610f01559e80279a052e6e91c205da9bf4b759a8bf SHA512 38042be6ac2926a8cb870e8f52a9e3e6b07ee3cc27d72e81329e47fe3c4c66569b5440ecb9f7e767d67e67e4ba5453680ff014a6b392f7a9884b8faff7a67341 EBUILD wine-staging-5.5.ebuild 20351 BLAKE2B e02469f34ecdcfd3840afdd74ccba9e07c04fa103bf3fab37643918ce353bff2b5a93031f66b66287d001838732f00a62ef1e3528c99c9aede262c6536af0f56 SHA512 17c45c016054ef4b14ec628e873f1e5447cb79a35bc6b78b0f40e33dc9f08fb778845786e2e85fdb949ed3c38b196f23817fa3cf136688f2d16246b96efe09cd EBUILD wine-staging-5.6.ebuild 20335 BLAKE2B 6455afc8ce78bfe296010d7901198d43aa57c1a8a82e6d538f457d6e7e970478c30c3781f010e8d378aa913e3653777a598842563aceedfd1a51116fb25304c7 SHA512 4181eba5382b2c357cf22d6df059cdf2e747dd86c279dd64e2e79a66e23b45621d1f985da13585bb5aa31ed27652ed1859958b77a492aa21c48e59a132f50167 -EBUILD wine-staging-9999.ebuild 20335 BLAKE2B 6455afc8ce78bfe296010d7901198d43aa57c1a8a82e6d538f457d6e7e970478c30c3781f010e8d378aa913e3653777a598842563aceedfd1a51116fb25304c7 SHA512 4181eba5382b2c357cf22d6df059cdf2e747dd86c279dd64e2e79a66e23b45621d1f985da13585bb5aa31ed27652ed1859958b77a492aa21c48e59a132f50167 +EBUILD wine-staging-5.7.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7 +EBUILD wine-staging-5.8.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7 +EBUILD wine-staging-9999.ebuild 20335 BLAKE2B b72f4a198a4624222653084b047027cd4d0d376016ea8f903d63355c4b98df48bddafdb52ed43b885265b8496f8ad89c849c456fee9943c17d4a004a11fd8176 SHA512 200aba15c914656205ab9f56e8eca057f3c54a8da6fde14ddcde5a5d5168585720080258661b01a845fd75cbe3743433cdd073986de4dc91ea5d04000f06b2d7 MISC metadata.xml 3813 BLAKE2B de077c2b962c962401ae0922aa8a244f08db7a5f0773d8d1466497dd3d2cd6e8b60186c5025f0806b49238266117035986df25c9c939fb9d9ec98ac7af5ebbf4 SHA512 edac5258e3d47f8c0285eb382cb5209996630bd65722c864a2b548dad09d72073d1c3e797fdda0f0cbf46bb87abbc5cbf1020fec2984b08c164d019a90fc4902 diff --git a/app-emulation/wine-staging/wine-staging-5.2.ebuild b/app-emulation/wine-staging/wine-staging-5.2.ebuild deleted file mode 100644 index 8c6094667945..000000000000 --- a/app-emulation/wine-staging/wine-staging-5.2.ebuild +++ /dev/null @@ -1,615 +0,0 @@ -# Copyright 1999-2020 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}" - -STAGING_P="wine-staging-${PV}" -STAGING_DIR="${WORKDIR}/${STAGING_P}" -GWP_V="20191222" -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 [[ ${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 )" -fi - -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 pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks 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}] ) - 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}] ) - 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}] ) - 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}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) - vkd3d? ( app-emulation/vkd3d[${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.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) - 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}-5.0-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 -) -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 ${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() { - 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 -} - -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_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 - 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="" - 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 - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --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 ncurses curses) - $(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) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 - $(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 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 && ! use ncurses; 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 - } - 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 - else - if use staging; then - eselect wine register --staging ${P} || 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 ${P} - if [[ ${PN} == "wine-vanilla" ]]; then - eselect wine deregister --vanilla ${P} || die - else - if use staging; then - eselect wine deregister --staging ${P} || 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-5.4.ebuild b/app-emulation/wine-staging/wine-staging-5.7.ebuild index 81084a55cb34..59a4de5dea0d 100644 --- a/app-emulation/wine-staging/wine-staging-5.4.ebuild +++ b/app-emulation/wine-staging/wine-staging-5.7.ebuild @@ -44,7 +44,7 @@ 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -112,6 +112,7 @@ COMMON_DEPEND=" 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}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) @@ -129,7 +130,7 @@ RDEPEND="${COMMON_DEPEND} !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?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -165,7 +166,6 @@ 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}-5.0-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 ) PATCHES_BIN=() @@ -353,7 +353,7 @@ src_prepare() { ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." - local STAGING_EXCLUDE="" + 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 @@ -473,6 +473,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild b/app-emulation/wine-staging/wine-staging-5.8.ebuild index 81084a55cb34..59a4de5dea0d 100644 --- a/app-emulation/wine-staging/wine-staging-5.3-r1.ebuild +++ b/app-emulation/wine-staging/wine-staging-5.8.ebuild @@ -44,7 +44,7 @@ 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -112,6 +112,7 @@ COMMON_DEPEND=" 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}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) @@ -129,7 +130,7 @@ RDEPEND="${COMMON_DEPEND} !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?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -165,7 +166,6 @@ 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}-5.0-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 ) PATCHES_BIN=() @@ -353,7 +353,7 @@ src_prepare() { ewarn "Applying the Wine-Staging patchset. Any bug reports to the" ewarn "Wine bugzilla should explicitly state that staging was used." - local STAGING_EXCLUDE="" + 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 @@ -473,6 +473,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 492702f9ac4f..59a4de5dea0d 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -130,7 +130,7 @@ RDEPEND="${COMMON_DEPEND} !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?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.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 d21e659b4276..a6fb026d6056 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,24 +1,16 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2 DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf -DIST wine-4.0.1.tar.xz 21665840 BLAKE2B b33b5ce8b4624dfbbbf473a88ed8c52d5e53855fa98ac3128e9b89dbeee6e92044ed1e662e1dc9669bd8d805424c36f2dd2c836c51bf6a5e4d78350926a13150 SHA512 dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc -DIST wine-4.0.2.tar.xz 21668348 BLAKE2B f1aa8ba3add9ae1e6fbb930a0c557c0015a699b21ba9988c6832c9a1b5180f98cbaadc561fbe4a22e97ff78732ee121a14f5a82b0637c71a4856fa5524ff2f5a SHA512 14cb7eeba188562b73125c668f2020e1df6802e486552e422d3aa75b95f6fccedc0f87868f7e58ce71697941ff49757981ec93b9ef288da37ca8570658f194fc DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14 -DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83 -DIST wine-5.2.tar.xz 22837712 BLAKE2B ee9d4d4dd6c0669d1585cc6988d933dbc7aa5277a0f13e965dd9eecb621e475d33a832b316e37f1372a965efe517efafa9f857a38d9bf081026d221db96b7a0d SHA512 57fa66885c3b5f43e51324e24b8524f663ad67ff15b464ac7d58096d5921f523a59ef5f1dc1ea7aa65fa10d64b7cd832f421c1b773c72bc312d8544a61c33f8f -DIST wine-5.3.tar.xz 22918612 BLAKE2B dce58aec45f665e1014635eadc9cc00c969e46c87de5d41bc51168237d9fc01011dcfc3fa4c83ed4cbcdfe19a3747e5e32f87946434a6eba2a8547f1929b33f3 SHA512 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6 -DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98 DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4 -EBUILD wine-vanilla-4.0.1.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea8291543507fd5caa46d9becd1739a26b5750d5a3bcbee297a7d36938667533e1bdf90cb8f84aa379da3e053d117f8e40bb4b17a SHA512 904d8f283ebe05ab6d819105c841ccb056ce1e0a688006136af8db70f11592b1492595afdfd3904f15cc669c121865473b7c646490af3fc7986212fc827f922d -EBUILD wine-vanilla-4.0.2.ebuild 17271 BLAKE2B 0dc8b48e1686efa414ae9a6ea8291543507fd5caa46d9becd1739a26b5750d5a3bcbee297a7d36938667533e1bdf90cb8f84aa379da3e053d117f8e40bb4b17a SHA512 904d8f283ebe05ab6d819105c841ccb056ce1e0a688006136af8db70f11592b1492595afdfd3904f15cc669c121865473b7c646490af3fc7986212fc827f922d +DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407 +DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05 -EBUILD wine-vanilla-4.0.ebuild 17268 BLAKE2B a4d0bb90b8554762ae188f7261661d500c8fcf951a42ef4d5133dd45b22f28810e8794c36d290026b0fdc864ce497f9f3b3a08e67f923ed63f6e1a8fd74d4a1b SHA512 3c964ff70281401cce1fd39d9a0843321f5f1ae19a6d2bda4b3c478bb772ec064de76e143d676c37858b7d9252fe1f0cfb5460ba1148cb678e15fa7d9496c345 EBUILD wine-vanilla-5.0.ebuild 17490 BLAKE2B 99c20620e3a74afb13605a253695de535a1fb09afd3c79c12769379993cceb2cfd387433023c7a45bb265df77eac933e3edd31fdf5e36cc7eefc28b96abd7924 SHA512 229049df1bfe362260b46a71608010be777ca26de04340aa465f6675c1e249d5e8a2b9d5f7b42c9ab55207d90bca3fd1bb6625ba5e1d27ed2993cf3b4176be0b -EBUILD wine-vanilla-5.2.ebuild 17484 BLAKE2B 66f8ae074ec3cd6f982864e3d7294aca5c1ffdfa517cc3df4a3de5262e5fb1d0758341b2d6a1cfbe76cb9b5e65b764ec453f3ace0b9975daee720b6838b97d0f SHA512 d76182430dfc766f78de84ed8bc427aee60146562e386ff7c2889eb518b862baabade4bed3c080ccccab515d4bebdc0f19eb9368a735e6828b735f826277f8f7 -EBUILD wine-vanilla-5.3.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22 -EBUILD wine-vanilla-5.4.ebuild 17554 BLAKE2B 179a429261514a73ae4fe6bf8b34fab85209e4366b6c97f25ad9450698612e041ae938454876d5f6731543d0e0492144f2b98fb0fbefeb0ac71ddb8ea3eb289c SHA512 200d007480309c951f6d3dc973065e296c43c7e1fd4dd82d1deff9c2307d897e9a87536178aa4b75cb3b2ca021fa2262386ee33a9404136ff818387c5f497d22 EBUILD wine-vanilla-5.5.ebuild 17635 BLAKE2B 009a63dfe37b6e32a6363be4c9965c883b99d4274bf98f3773f97c50252fb5323311a3914f747ae64d33a5f401792234746fc6f4fa0014a0c37def48f1b89d18 SHA512 40b910b12a756b0fa671b2b87a2d59befcb2cfb4c76c55428039265a6319a7893bb3a3016b8e932dc2906ce86ea21ac0bf40b18c6b3a85ecd3f0594b01f8bdce EBUILD wine-vanilla-5.6.ebuild 17575 BLAKE2B caa74ad628520bd34a659b9c9f453fd62c8abb0c1d2714cc0d9ebcffa6fa876ca1c993978187bbc9c5cf455493cd01294d957bd235d3e046dba55843d2cb458e SHA512 9dda07ac24cd60bd4eaf15e51c8dca22281059bd43cb71571476d5d27e83bade73a4826c1f118709430e625c40666b8dae16ab4c0d5b1e52109d509d911299b8 -EBUILD wine-vanilla-9999.ebuild 17575 BLAKE2B caa74ad628520bd34a659b9c9f453fd62c8abb0c1d2714cc0d9ebcffa6fa876ca1c993978187bbc9c5cf455493cd01294d957bd235d3e046dba55843d2cb458e SHA512 9dda07ac24cd60bd4eaf15e51c8dca22281059bd43cb71571476d5d27e83bade73a4826c1f118709430e625c40666b8dae16ab4c0d5b1e52109d509d911299b8 -MISC metadata.xml 3342 BLAKE2B a4be85e6b184b90e008d8beed5aabda03e9a378c5b348bcbdb98d8dcac52328915a39483943ab799abab49b755e36782bab1103400c4e40186da44abe40e4e47 SHA512 45f4066692fc4ff90124233313bc4804530925936aa260051f51558fed031de421b1c3d6941126733dc21d6b13a7821af4676333f25ef4eab355e170005ca444 +EBUILD wine-vanilla-5.7.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0 +EBUILD wine-vanilla-5.8.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0 +EBUILD wine-vanilla-9999.ebuild 17575 BLAKE2B cb68d3bb14713d2ee2b2a4cf4e47937f65dc0fc3057a2792ab817ef3b408cf11a1b9dde6e69da9070d7954944467917fe1e8c6c0a4d96019b28e5f94e8992d2c SHA512 ef2c000ff73257c9ef2ee1ae5aabf298076d8283a4e1d4a3d125fe50586db68100de737065351eb7c7db3bd6a42450845daf2b1aff4f6a24b3e9b2015e970fa0 +MISC metadata.xml 3141 BLAKE2B 07e1e174d2acc8cb6e5b2767daa8b70490f75102e95f17d8b55e416aa50c4cc47c163cf7b0d95140bab074213b490fdd0f1297703369d413d7c00486800b8232 SHA512 d5eec710aebe9ae4eab2bb4e9c14079884c60882f1cec1b3e42bcb95008acb29e26ce633b55518bd5bab4c581e1194bdb104f0e630c683360994bfd666b059e4 diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index 03b00009d222..497dd69c907f 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -4,10 +4,6 @@ <maintainer type="project"> <email>wine@gentoo.org</email> <name>Wine</name> - <description> - This package must be kept in sync with repo/proj/wine repository. - Any changes need to be run past the maintainer to ensure the two repositories are kept in sync. - </description> </maintainer> <longdescription> Wine is an Open Source implementation of the Windows API on top of X and Unix. diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild deleted file mode 100644 index 4f522c6c80e1..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild +++ /dev/null @@ -1,531 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar 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 ltprune 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) - MINOR_V=$(ver_cut 2) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" - KEYWORDS="-* amd64 x86" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20180120" -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/~np-hardass/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 +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 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}] ) - 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}] ) - 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}] ) - 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}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( app-emulation/vkd3d[${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[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.7.5 ) - 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}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 -) -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 -} - -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_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 - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(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) - $(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 v4l) - $(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 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 && ! use ncurses; 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 - } - 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} - - 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 "${D%/}${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-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild deleted file mode 100644 index 4f522c6c80e1..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild +++ /dev/null @@ -1,531 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar 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 ltprune 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) - MINOR_V=$(ver_cut 2) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" - KEYWORDS="-* amd64 x86" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20180120" -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/~np-hardass/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 +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 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}] ) - 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}] ) - 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}] ) - 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}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( app-emulation/vkd3d[${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[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.7.5 ) - 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}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 -) -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 -} - -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_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 - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(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) - $(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 v4l) - $(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 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 && ! use ncurses; 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 - } - 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} - - 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 "${D%/}${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-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild deleted file mode 100644 index 52f615df89f1..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild +++ /dev/null @@ -1,531 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="ar 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 te th tr uk wa zh_CN zh_TW" -PLOCALE_BACKUP="en" - -inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune 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) - MINOR_V=$(ver_cut 2) - SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz" - KEYWORDS="-* amd64 x86" -fi -S="${WORKDIR}/${MY_P}" - -GWP_V="20180120" -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/~np-hardass/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 +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 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}] ) - 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}] ) - 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}] ) - 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}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( app-emulation/vkd3d[${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[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.7.5 ) - 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}-1.5.26-winegcc.patch" #260726 - "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615 - "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 -) -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 -} - -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_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 - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --includedir="${MY_INCLUDEDIR}" - --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}" - --libexecdir="${MY_LIBEXECDIR}" - --localstatedir="${MY_LOCALSTATEDIR}" - --mandir="${MY_MANDIR}" - --sysconfdir=/etc/wine - $(use_with alsa) - $(use_with capi) - $(use_with lcms cms) - $(use_with cups) - $(use_with ncurses curses) - $(use_with udisks dbus) - $(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) - $(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 v4l) - $(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 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 && ! use ncurses; 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 - } - 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} - - 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 "${D%/}${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-5.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild deleted file mode 100644 index e7c7d4d37c7a..000000000000 --- a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild +++ /dev/null @@ -1,536 +0,0 @@ -# Copyright 1999-2020 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="20191222" -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 +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 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}] ) - 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}] ) - 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}] ) - v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vkd3d? ( app-emulation/vkd3d[${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.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) - 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}-5.0-memset-O3.patch" #480508 - "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 -) -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 -} - -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_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 - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( - --prefix="${MY_PREFIX}" - --datarootdir="${MY_DATAROOTDIR}" - --datadir="${MY_DATADIR}" - --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 ncurses curses) - $(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) - --without-mingw # linux LDFLAGS leak in mingw32: bug #685172 - $(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 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 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 && ! use ncurses; 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 - } - 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-5.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild index ab4b0c11da26..f1b0c2c98e78 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.3.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.7.ebuild @@ -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 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 +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -93,6 +93,7 @@ COMMON_DEPEND=" 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}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -109,7 +110,7 @@ RDEPEND="${COMMON_DEPEND} !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?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -141,7 +142,6 @@ 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}-5.0-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 ) PATCHES_BIN=() @@ -406,6 +406,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild index ab4b0c11da26..f1b0c2c98e78 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild @@ -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 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 +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -93,6 +93,7 @@ COMMON_DEPEND=" 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}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) @@ -109,7 +110,7 @@ RDEPEND="${COMMON_DEPEND} !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?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.0.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple @@ -141,7 +142,6 @@ 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}-5.0-memset-O3.patch" #480508 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 ) PATCHES_BIN=() @@ -406,6 +406,7 @@ multilib_src_configure() { $(use_enable test tests) $(use_with truetype freetype) $(use_with udev) + $(use_with unwind) $(use_with v4l v4l2) $(use_with vkd3d) $(use_with vulkan) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 9ab1b2de54b1..f1b0c2c98e78 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -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.1[abi_x86_32?,abi_x86_64?] ) - mono? ( app-emulation/wine-mono:4.9.4 ) + mono? ( app-emulation/wine-mono:5.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 e74785ad7a62..b2d0cd6a9952 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -10,5 +10,5 @@ DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225 DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e EBUILD xen-pvgrub-4.12.2.ebuild 4462 BLAKE2B c59b5b69a1d319637ea6ef75d2291957ff4d2c287d6b8744d55ded9c294122ee7fe0be38df368316aa5698a5f9f187364d3dbd42ff55259b48bfd2fd3e844df2 SHA512 9b6247b8762c03a02209b84b4f6303813ea4dcb9de9071cc88fe478c24708b4344f21e73fb1ba823b1484d574df078d476b10616bb03d1418b013e7fb8d03afa -EBUILD xen-pvgrub-4.13.0.ebuild 4522 BLAKE2B 24f3ba6d69007bbd7b22930848b8f4a09cfa265610a4d1cefe91d2375a4807adf2fae1750676faaf4b3659bf595500d42f1c35540449247105823563f5fa6209 SHA512 5e20ee4dd82916d993b2220d8e7340bb86394c8412adadd71b1be79ca5002205b4c6a55f092d24223c9a43892e458ddb934014bd15a978efeeb64c4284178ce4 +EBUILD xen-pvgrub-4.13.0.ebuild 4531 BLAKE2B d02b6eb33a83ab30f33a6c382a3d1874c0d213b802f7a86287019b8af791499dc03a2f7f3e9414b08ecb3d4793a56a1f1ef5db5f5829e376e22c1378d83edd5a SHA512 80072e65336fc1eb94586a70187a85ff4a0d87ed95b7bc241b7ece0556374b3a78c0f91d38274da14ef9e9bc95de1f3e89d91e1df45269bd7ee25b213f656572 MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046 diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0.ebuild index 2fec4e1c157f..5c95dccf2ec9 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE='xml,threads' +PYTHON_COMPAT=( python3_{6,7,8} ) +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 14b75ddf1e4e..6127fca392dd 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -28,5 +28,5 @@ DIST xen-4.13.0-upstream-patches-0.tar.xz 11156 BLAKE2B e704a3fc1a9213a79208cf60 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225 DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97 EBUILD xen-tools-4.12.2-r1.ebuild 14966 BLAKE2B df7d4e20a1184631204f0e6f31f041c52bfd09a4c6d883a80d58f0d88cc96ec1cff25659a8995383a00f153d020b22c1e8a3a3f0e7c807dff382cae9411f2db6 SHA512 f26b572cd184cf0243d9b0c54dfb6746ecf52696e5e96858262def32530515d503a5cfbdf3f39ab8d029f4cb72a32f84f78f842f7fdfb4cf0f6e8b346a593090 -EBUILD xen-tools-4.13.0-r2.ebuild 15675 BLAKE2B 0d934e2a81df6d0a5a9b97352eff5a598fc6d43f45fab1b99e8d10330ea42e4cf83d638a2ec98561f74595bd85fec2220c7eab8ed1d5c801e51cabd8d9aa9cdc SHA512 e1301de618bd9ed0625455759418fe51bd9184ddf4d6ec0591763dc557c38bb426c6670be11dd2c506231574b2c773e09711f7ff8c7cd9ac496634c0207167e4 +EBUILD xen-tools-4.13.0-r2.ebuild 15684 BLAKE2B bbe104bb0aa810c155fa1f5dd23b66270caf42ee359fa340d05689e80aca2ba5e1311fbf69107437bfefa5a4831ab218679d18018eb98de77bd125190340f3e7 SHA512 10f254ba053bb2576660ee54b8d5b5a05f9474f3f3a78f95952c81c6b04850102cfdbe237298a7c14adc6c7c595e9c306326c8059f7d6ae8e5f0d271679f399a MISC metadata.xml 1662 BLAKE2B 1b243436df5eb36e30f73b36db45d859aa03f7e9d3360fcdb91c35e3a1c00f1217e5e7cd1461b65d9da2883f5e8ca969b958f9b2160def4c1f15347c1887b2cd SHA512 d6cdf124c7767727f7c8d16a2dc0f85a7213db21f8d1595f7d8899c7cb81d47849fd05759ccfc460630c32917e64ea31ef6384dc050ab0eb392f571b12db68ed diff --git a/app-emulation/xen-tools/xen-tools-4.13.0-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0-r2.ebuild index 2da36941e35f..3643831cebe5 100644 --- a/app-emulation/xen-tools/xen-tools-4.13.0-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.13.0-r2.ebuild @@ -3,8 +3,8 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE='ncurses,xml,threads' +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE='ncurses,xml,threads(+)' inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index cd498935f86c..01bbd4dd9e1a 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.6-efi.patch 1954 BLAKE2B c027aff764e83eef957241827980559ccfeec5525bf0ce6b6b2d38db565fd0f24b21609c1d497934ef823d42116eaf96799b45314f11f57a9238ab21f1255a00 SHA512 361af33159cf49626e92d2815fd4422ea5b1d696a32ce2695ce75205fbbfb89d96b64a8af7332fffdc4a4390000bf52d3730403dfc2334af0da0bea59d58b689 -DIST xen-4.12.2-upstream-patches-1.tar.xz 17016 BLAKE2B 5bd27f6187c13b1c4792aa81c0ca8cde0d687566e0fde322e7cb249e1c8665fca0def5a137493a04598b617c46f052cf69701257ea1b97823fd1534d94cabd8f SHA512 dab5e7a3ac1a82faff3069f07945dc0b9651f90e8e87b3c342bb98a06ac244d212dc0baf8c7f1997f285b06baca9dc57d4823bfb220ca34274bd3d6d31421b02 DIST xen-4.12.2-upstream-patches-2.tar.xz 34484 BLAKE2B 79799a2fa9e638adf80ff1b5a1609b28747dad254da2e8ebd94afd75d5b7c061d25d507e7d388af17905347e180537dec8d0e27bd18cf6c53f51f7272d4adafe SHA512 abf9d82fe20fc9411384283876cf020a31e6c22ab2e54a7fae0d95ade02f434e4afb08d47c3ed5e4bc7ea5f518df7dc57baef2b8e76e3439bd937e2ee3c2b658 DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f DIST xen-4.13.0-upstream-patches-2.tar.xz 55980 BLAKE2B b85512456cac253d7f4dd0dca120d694cde0b0f4d0270023bca337f9bc693eb768c1a43d74d412c38dc665ee50a70d2985e5bfc6edde3eacc4376d2f6d7877c8 SHA512 fb852be98209e135a11241dd15e9bd174a5a3724bfaea1fc3b12ba964b8fc275946b1c443c70a78212dff0bc9b25015a00d9f902183c135053e27957b55b6bb6 DIST xen-4.13.0.tar.gz 39005191 BLAKE2B cd85bfe549e20447afb8ec6b2ab33ea1893f45392c08737730d7898706748ebb96b2e842b2ff3e4af8c5d8a705e6d25a2bfb8acf0d7cc771805d0cc97757a949 SHA512 5b2ded9a2fe3f7ddf40eed1fa9858baead06233a01eb6099cc45b3c78b6c3823acfe7b731910733e87125dfa49d08c53f74c215fb1b320a92b44b87a0a105225 -EBUILD xen-4.12.2-r1.ebuild 4438 BLAKE2B 5ce21712847014902bd61b988be35433d66d0d24f037a0898b4bb4ac8415edf1f045e4186fdd2fc728f2897ec6b7ecfd5912b37d1310c43c7a5bfcef7fe29538 SHA512 a66e3803812a90325a29b45cc0faca670bcbcd0882975f9dac5353320d8a5c327268d688af6cb1a7bad2960c02a003eef69bb2c27e580b0b5b0f671ba76e9e65 EBUILD xen-4.12.2-r2.ebuild 4438 BLAKE2B f7c59b7e260b7a2fab93501ac0213769c9835bf8e5068a7376b7c473c87a03f927b40948cc74d55a913b45283f1b03dc4373e4c5e884c1168e7767f51fa289fc SHA512 7fdd14a30c867e9a312d9d7e65f7ae85780a4f56d26ca3daae5919f90358d22057940385920daaba4b2f94955e915fff40fbc410213d542263df8369b8e504dc -EBUILD xen-4.13.0-r3.ebuild 4439 BLAKE2B c6c5d13844b559e630643e8b4ee18d450e4d57c8c919eae5354070d74d52aa62596584eed5ecd67f6d5ccd8994a810f150b14bd155e3c0de9121d0cb49d8ec97 SHA512 f360730e1a31b6dd51a43d1cb0d7623397bb96e9c8dec3eb298d6c3aba8798d0793f99c1ef175720b8cdddda6d41dad4d5c08f258c52525995f7599ab4463f45 +EBUILD xen-4.13.0-r3.ebuild 4445 BLAKE2B 79a5fc63f6b98420dc7be0fa370685bb700e735ba5427e4f064be80b0396dc7543e86445ceec3673a4d125fc3a9b4b3d31e43adfdff0f092364f24ac3a3ccc17 SHA512 9e7754a710578a7976097dac1c0f1978b96b44d70640607e2e94fdefa9c226e0d4df7635ad412a55dd7b7b6c5f6c9161b9977a803197a27ddf2b73f1c4b67375 MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248 diff --git a/app-emulation/xen/files/xen-4.6-efi.patch b/app-emulation/xen/files/xen-4.6-efi.patch deleted file mode 100644 index bf888def7d90..000000000000 --- a/app-emulation/xen/files/xen-4.6-efi.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/xen/Makefile b/xen/Makefile -index 4c54e9b..a5cdccd 100644 ---- a/xen/Makefile -+++ b/xen/Makefile -@@ -41,9 +41,15 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) - _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) - [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) - $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) -+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ else \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ fi; - [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) - $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) - if [ -r $(TARGET).efi -a -n '$(EFI_DIR)' ]; then \ -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile -index 5f24951..4ec0ee2 100644 ---- a/xen/arch/x86/Makefile -+++ b/xen/arch/x86/Makefile -@@ -116,7 +116,7 @@ $(TARGET)-syms: prelink.o xen.lds $(BASEDIR)/common/symbols-dummy.o - $(@D)/.$(@F).1.o -o $@ - rm -f $(@D)/.$(@F).[0-9]* - --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 -+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 - EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug - EFI_LDFLAGS += --section-alignment=0x200000 --file-alignment=0x20 - EFI_LDFLAGS += --major-image-version=$(XEN_VERSION) diff --git a/app-emulation/xen/xen-4.12.2-r1.ebuild b/app-emulation/xen/xen-4.12.2-r1.ebuild deleted file mode 100644 index 1610c864961a..000000000000 --- a/app-emulation/xen/xen-4.12.2-r1.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=( python2_7 ) - -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.0-r3.ebuild b/app-emulation/xen/xen-4.13.0-r3.ebuild index f95ccf1dab63..9141030b5854 100644 --- a/app-emulation/xen/xen-4.13.0-r3.ebuild +++ b/app-emulation/xen/xen-4.13.0-r3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs |