diff options
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/Manifest.gz | bin | 21043 -> 21046 bytes | |||
-rw-r--r-- | app-emulation/docker-compose/Manifest | 3 | ||||
-rw-r--r-- | app-emulation/docker-compose/docker-compose-1.25.2.ebuild | 73 | ||||
-rw-r--r-- | app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch | 71 | ||||
-rw-r--r-- | app-emulation/qemu/Manifest | 8 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-4.0.0-r50.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-4.1.0-r1.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-4.2.0-r1.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 4 |
9 files changed, 159 insertions, 12 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex 8a4465d84fd0..1d80387a0a19 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 58d7d677a855..295219c5c96c 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,11 +1,14 @@ AUX docker-compose-1.24.0-setup-py.patch 1767 BLAKE2B 14ad1ab45fc11006a6054e4b5774990ba199344fc233f55b6ad034cf5fdce47cef96b15466c9b04cf33633a1cd34074db597b38b85d443499ff5264afc878a61 SHA512 1bd028ec272a8758ecec351590046919172a73d63b61643737438cda445f35caa2f85afed0b3ebe2c9092f5c7b1a84b1f340f661e4fcfa80301ef5d70f25e8bf AUX docker-compose-1.25.0-setup-py.patch 2209 BLAKE2B 151abd435ec6e5745d0d073a3509206c095c14391a7fb5e50b1679da61dec4e001e36c0757995e84c5174ce6c9c38aada385b44314f4325e76bbc76bfe0943ff SHA512 3a10564ef42e03da2e722a24564f536c978403d9702350465dfb3b255048641ebe41aa320461098f65a59ba48e73a14b66e073a5d52c44fa9d4416e309797bb7 +AUX docker-compose-1.25.2-setup-py.patch 2209 BLAKE2B 24cb97379440c94c4f18d999806dc0ffb23a5ec09915ff1e421a0135189955cbe6e67bb8f535071bfa1dfd2d7153af3e9c5e634e4de0699a8e740f6c407f233a SHA512 e9987469d46f10bfa97a6b6a65e089a6f8c86451154668e7db0ba1cd564acaad798d1aa189b458166517f19e604aee2e309941df9296be1d5e8e730252f273d8 DIST docker-compose-1.24.0.tar.gz 307601 BLAKE2B cb2a6f96e14c04d0279b25c075182d8f09e5a622e4cee2ce74995224e3a8634cc5f22ccc548b7754bbeb11630c1e638386cb1a6df927b3619cb6e7e3595aac6c SHA512 318c6bf9877147de09526b4d49c3fd86012d85626e7a9a15863ca55a60e10fa85b27429605045d0aaa993dddd3bc2e5f23cbb76856276a874e84793b878a3e86 DIST docker-compose-1.24.1.tar.gz 307749 BLAKE2B 7ded0a4b82a7a9beb9de38752f38998ca4ea9421e5ed5630627820ec7e250ad6f03f6788bcbebe8bc0dd4c064d275bb4ca5a6055a95b6a0f72d7ae9038ec7f22 SHA512 9b8632ef263b8dfa678e8b99b46e00441f779716a524280ce25f62fcd2605f400723b7790c466338374c34653946dc2c5d7f09593ddd892fee3409c2a2fd1a5f DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d DIST docker-compose-1.25.1.tar.gz 321627 BLAKE2B 9056b0e359ff6cccba16b7ea5fc96de363f242103c48d15e3ed19ed5291878f7a5c81f99b7fd3eff46eaff5b271e883125ab02ff22bf592c4a5dd12792790fdc SHA512 5e58edd3364caecc9b6ec0e92e629e624694e42f96da836378648918dfaa41ddc0c99b107f2d3f11d1dd6ab86a516a7b2da3783b542623440d8c0c6628c05020 +DIST docker-compose-1.25.2.tar.gz 306196 BLAKE2B 6bf9c1ae14b25f41a7b3893f5ddc5b654743b29eb17c3d1b23e47d004e8e3feaf021b67c2419632faa6b11713ad1bd956b9f756e36fcd8efc7e60404a1de53a7 SHA512 ce045c6af233d6d03fd26100bce836444abb3022d6661ac6073cd8c6b8ed1cc0bbef9cbfad73672c8d3b6f3a12ee98e6e60c5f1b90360f778d5fa8d18e00179e EBUILD docker-compose-1.24.0.ebuild 2261 BLAKE2B e4aef84ffa83e5b73335a6d88a981549ba9888b411a7acdd33b78b42a589bb3e97159266b3b6252d734cb086ca41eeb43c7ca0f6df32c3d746e164da49b84374 SHA512 40e1dbfb659a2c121e3b287114db1075b78b74034074f51f17419c370f7ac5c5b216dea8ab5af3667dc852166422aac64b55c55e2c8ce241c5c9c9a02474dd68 EBUILD docker-compose-1.24.1.ebuild 2262 BLAKE2B e1a7c1f2b4d5f20b74747916ea79349ba082f93d6b6b621b2438e5968c726bdb54dc25a62cd31705ac66398747d0405727ec7a28fd88fcf308ebed8f4c41075e SHA512 12e8cc7b892932fd7109fb8f46440c5c253af4346faef6a8e560303a0e6d7d7f50e5a534e8aa20d0df13d1c03f00d7cc059cb2db2bdde4fce37d20bf1c7644ae EBUILD docker-compose-1.25.0-r1.ebuild 2462 BLAKE2B 70b24d9e859862f3b44abdf9c73f7b38924503ede0c8b121dbcb488f6553c0fd49d519139e38f9f15879f5c20935d6b9584e4087c3d94d3b960c86841ddddd19 SHA512 bb62f237659bb049d66f26f2558748592d8caace2ab09581f4d92a5d32bbb4a3191018695500766163edde96f9a2c9edba43412d7c0b65302747780f5765358f EBUILD docker-compose-1.25.1.ebuild 2462 BLAKE2B a0fb38b964daa7cbda7057940cb3561db3533d9200d32b6a3428ae595563faad31748176ef0f6692e3e50172061ff7039645faf5de5500d35810bf3419fe6ae5 SHA512 6e1c26a9b63ba008c2fad4af7d86c0981a8db1a4e1ee60387c6996f4408ae337a997b44b3bab01c6b624365891d7d3f0889b5fd7956302d3362610b62f98268f +EBUILD docker-compose-1.25.2.ebuild 2460 BLAKE2B 5921efdd67f61943b30432733faf03c3407fcd9f3f8fbaf56540365bf3be35f2ed9c9d60be542a9ee23a1ef0e30f2c869a355eb4a5aaea735f10ccd845ec4482 SHA512 c448923fe2ab5e594eff4e050ce8eb8073a5dcad4f58279a1e454b86bc5008fbb57d30586b266de2da92767978a42dadce69781e54ee779d75da354ef076da0a MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc diff --git a/app-emulation/docker-compose/docker-compose-1.25.2.ebuild b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild new file mode 100644 index 000000000000..7bdd266df6a4 --- /dev/null +++ b/app-emulation/docker-compose/docker-compose-1.25.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 2018-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_6} ) + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Multi-container orchestration for Docker" +HOMEPAGE="https://github.com/docker/compose" +SRC_URI="https://github.com/docker/compose/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + >=dev-python/docker-py-3.7.0[${PYTHON_USEDEP}] + >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=dev-python/requests-2.20.0[${PYTHON_USEDEP}] + >=dev-python/six-1.3.0[${PYTHON_USEDEP}] + >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}] + >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/backports-shutil_get_terminal_size-1.0.0[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep '>=dev-python/subprocess32-3.5.4[${PYTHON_USEDEP}]' 'python2_7' )" + +DEPEND="${RDEPEND} + test? ( + <dev-python/pytest-4[${PYTHON_USEDEP}] + dev-python/ddt[${PYTHON_USEDEP}] + $(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' ) + )" + +S="${WORKDIR}/compose-${PV}" + +PATCHES=( + # Bug #679968 -- https://bugs.gentoo.org/679968 + # Bug #681002 -- https://bugs.gentoo.org/681002 + "${FILESDIR}"/${PN}-1.25.2-setup-py.patch +) + +src_prepare() { + # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command." + sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die + + default +} + +python_test() { + distutils_install_for_testing + ${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}" +} + +python_install_all() { + newbashcomp contrib/completion/bash/docker-compose ${PN} + + insinto /usr/share/zsh/site-functions + doins contrib/completion/zsh/* + + distutils-r1_python_install_all +} diff --git a/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch new file mode 100644 index 000000000000..3af8d2de06e6 --- /dev/null +++ b/app-emulation/docker-compose/files/docker-compose-1.25.2-setup-py.patch @@ -0,0 +1,71 @@ +From 19d9b58b97127f24e2280e3119e420393e7d239f Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Mon, 20 Jan 2020 19:27:46 +0100 +Subject: [PATCH] setup.py: Drop generic upper version boundaries + +--- + setup.py | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/setup.py b/setup.py +index 110441d..3f6a46f 100644 +--- a/setup.py ++++ b/setup.py +@@ -30,35 +30,35 @@ def find_version(*file_paths): + + + install_requires = [ +- 'cached-property >= 1.2.0, < 2', +- 'docopt >= 0.6.1, < 1', +- 'PyYAML >= 3.10, < 6', +- 'requests >= 2.20.0, < 3', +- 'texttable >= 0.9.0, < 2', +- 'websocket-client >= 0.32.0, < 1', +- 'docker[ssh] >= 3.7.0, < 5', +- 'dockerpty >= 0.4.1, < 1', +- 'six >= 1.3.0, < 2', +- 'jsonschema >= 2.5.1, < 4', ++ 'cached-property >= 1.2.0', ++ 'docopt >= 0.6.1', ++ 'PyYAML >= 3.10', ++ 'requests >= 2.20.0', ++ 'texttable >= 0.9.0', ++ 'websocket-client >= 0.32.0', ++ 'docker[ssh] >= 3.7.0', ++ 'dockerpty >= 0.4.1', ++ 'six >= 1.3.0', ++ 'jsonschema >= 2.5.1', + ] + + + tests_require = [ +- 'pytest < 6', ++ 'pytest', + ] + + + if sys.version_info[:2] < (3, 4): +- tests_require.append('mock >= 1.0.1, < 4') ++ tests_require.append('mock >= 1.0.1') + + extras_require = { +- ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'], +- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'], +- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'], +- ':python_version < "3.3"': ['backports.shutil_get_terminal_size == 1.0.0', +- 'ipaddress >= 1.0.16, < 2'], +- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'], +- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'], ++ ':python_version < "3.2"': ['subprocess32 >= 3.5.4'], ++ ':python_version < "3.4"': ['enum34 >= 1.0.4'], ++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'], ++ ':python_version < "3.3"': ['backports.shutil_get_terminal_size >= 1.0.0', ++ 'ipaddress >= 1.0.16'], ++ ':sys_platform == "win32"': ['colorama >= 0.4'], ++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'], + } + + +-- +2.24.1 + diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 29607574a0c3..31cf3cde1edf 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -15,8 +15,8 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13 DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2 DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56 -EBUILD qemu-4.0.0-r50.ebuild 24071 BLAKE2B 6cc861b8c39f3b1ecebfd38de3412ca51e4ffaabd50f4bea42b37e713f5b01fc286f3eb07d3bf44e80f8e5d9af5b73dc59ef68f8c9ca7df6d3fbb535521b53e9 SHA512 ad5f62bf4106a2a580f77ecc5581db4ce1ce176d0740bf3fb84990d8256b3fd8a4887abc80b980a08e1542e5a0a1b5f381a15924a87deee70e0e230ec913d2a9 -EBUILD qemu-4.1.0-r1.ebuild 24168 BLAKE2B 60b04c447f1c7dc8f672b71537f6bceed25b1e5bca5559d1f5509eccb8198b71f797a8d974600f1132beda30a3f051bdb7214746052dcf403c88ca3787626c45 SHA512 3148624da606eecc511c39934524d5fa8bcd7ba2bacc71c031269834d9f364077788c9d93bb89153f02b577558cd573fe0faff6de9b714308f20f247d6fcbe66 -EBUILD qemu-4.2.0-r1.ebuild 24275 BLAKE2B bfda425a642b0ccb34d555d3baba1f97bc8c4843bcb75be1562b05e498b559fff66aad39894cc92119a13d771bbce05c6a9048d79d1278b856304fa5642d2a17 SHA512 81deee7fd757d4f432f6ec887c891e9c07f2a9062b0a7d7035df66c56216ce264847710a9ad9ae7924f5bfe20340d784e8d21dbeb131ddba898c0cd8c3a1d1ed -EBUILD qemu-9999.ebuild 24203 BLAKE2B 4d153036a646d0862c556ca9e23642ea5c0987ef4e723b77aec84c487804eaaff4771e5c8e6ff8dbbaf79ef1526bd89792ad87f66483bcbab8e681d7af166d57 SHA512 a9cfd65ad5d145cab2d37b287e858ffa49e8de94b37b84fa6d818c212094efdcf2a3d34af3fde7599e51fab2f6ef10139407c024d35c93712c5ba5a1e6ea8bc6 +EBUILD qemu-4.0.0-r50.ebuild 24060 BLAKE2B 262941105b0a6a0a64e58eb0e12cca4ee400a2d5a0f7ed2a1d0dc0c85ee3632fd4be3db947f243e3ae0360a334dfe71613c8612b14006260793a4e4ef62daf0f SHA512 87653c43f31b7ce092b67cb4f24dc9367e53280011fb87dcc82a00dc09884cc24ca4c7f251a59d2ea0163a76202e06ebb69a3f1052536420dac11d083837097f +EBUILD qemu-4.1.0-r1.ebuild 24157 BLAKE2B 8ecf6d6b5a230de2b79f7464bf46b6cd27352f949156be3056e28bf02a508c8ef21603354e9f080491bce143ee73297eb631d0f33571a2b7a0819804f0590d5f SHA512 9fa83117ee2f5d7ba3d64d8e8b63afdf41c10f50ad2cb20031024a14741cb66226945230d36af218048023cb8fbbb845b3472812bf25bba4073f935ec1f900d7 +EBUILD qemu-4.2.0-r1.ebuild 24264 BLAKE2B 81861654968db951d7da4edee08e0302dc0ec2639f38c1f68f3a5686c9bb670d06eafa86712ab0e69058187d988e54538467ddb226f6b3224462d6623d1566d8 SHA512 9423d678ccee63bb33bf1f1f358da5953ec6021ca110d612cb237dd58df7cb977bb192dac23f939fe3806c419d3ab51215c947d3a8a3f7feb5449ce33243dcfd +EBUILD qemu-9999.ebuild 24192 BLAKE2B 778901f0285515aac742e49f8b394400020bbe3e792c7ace6a4fffd9bd435debeec325a3b71b83eef3560499a1382eb551f01b76c0da9977fd92ec68ae90204c SHA512 b687a7738e93fe8fb39009c7bc1f982ef188822b583334fa61bee454532f8eacd861e350061ca4a98bf9f95556c13dca70af8c01bbece1901c833892579d8932 MISC metadata.xml 4319 BLAKE2B aea03446434b66be757704de0bac113c91fc7c66343103777091ee7038531990017b24e4fe48209cd168b8383df92e9421ec78c88b74e40bd8769f505b2892fa SHA512 bf80056f3dde8b3708859f7d0f7f12e83933ef81d00ba02a437de424b2d98a030aaceb886ccd44992357200d5eb9d0b704e36c7f51b4a6aa044ef04df4f1d76d diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild index e121f256e565..6227a2fa81c1 100644 --- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild +++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild @@ -58,7 +58,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) - static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) + static? ( static-user !alsa !gtk !opengl !pulseaudio !rbd !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -126,7 +126,7 @@ SOFTMMU_TOOLS_DEPEND=" ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) + rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] diff --git a/app-emulation/qemu/qemu-4.1.0-r1.ebuild b/app-emulation/qemu/qemu-4.1.0-r1.ebuild index 1bf631e15c6c..c0af6bf79692 100644 --- a/app-emulation/qemu/qemu-4.1.0-r1.ebuild +++ b/app-emulation/qemu/qemu-4.1.0-r1.ebuild @@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) - static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy ) + static? ( static-user !alsa !gtk !opengl !pulseaudio !rbd !snappy ) virtfs? ( xattr ) vte? ( gtk )" @@ -132,7 +132,7 @@ SOFTMMU_TOOLS_DEPEND=" ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) + rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] diff --git a/app-emulation/qemu/qemu-4.2.0-r1.ebuild b/app-emulation/qemu/qemu-4.2.0-r1.ebuild index 6f904b8d897a..21a8f4a01b6e 100644 --- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild +++ b/app-emulation/qemu/qemu-4.2.0-r1.ebuild @@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) - static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins ) + static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( xattr ) vte? ( gtk ) @@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND=" ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) + rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 987c96564697..0d029214a5d6 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -64,7 +64,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_riscv32? ( fdt ) qemu_softmmu_targets_riscv64? ( fdt ) - static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy !plugins ) + static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy ) static-user? ( !plugins ) virtfs? ( xattr ) vte? ( gtk ) @@ -135,7 +135,7 @@ SOFTMMU_TOOLS_DEPEND=" ) png? ( media-libs/libpng:0=[static-libs(+)] ) pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph[static-libs(+)] ) + rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) sdl? ( media-libs/libsdl2[X] |