diff options
Diffstat (limited to 'app-emulation/qemu')
| -rw-r--r-- | app-emulation/qemu/Manifest | 12 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-4.0.0-r50.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-4.1.0.ebuild | 6 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 2 |
4 files changed, 6 insertions, 16 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 85df92414089..44707eacb8d7 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -14,13 +14,7 @@ AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13 DIST qemu-4.1.0.tar.xz 54001708 BLAKE2B fc89d0c967fb31a73cbdca556e79c05c44b241382a83f02150a8e39b00cb7de7fb6f248e82e1364e314680481bfb3843e74804534c0ba91a5bb2ff1b8d771130 SHA512 82fd51702a7b9b1b00b2f1bd3b4a832b80249018dbba1add0b0a73e7d4bee452afd45574b4d8df7ce4477d8711f3bda4ca072a1a6de25895c93eb21cf78fc4b2 -<<<<<<< HEAD -EBUILD qemu-4.0.0-r50.ebuild 24059 BLAKE2B 1b37f45dfc3f73f23fba024bed185f75df72f55ad8d68a273ce954eb01021a51ecffecc08ead6b92f015319861b3906ca1d54e731db8a81717d090828bc65570 SHA512 240b96516c7cea8f1b8d9be3d8a736e05384dd984b7d1f0973f71fd68337d2ae6955fa7e129c3b8c5cfce0c1cde1596b760412068694bc5835c124d199d2234d -EBUILD qemu-4.1.0.ebuild 24163 BLAKE2B 33a35941a60017acec0e4600504c3462d0aae79de320da812be097a9b2c3f4971c279a8ed8a5c38db4c83026cdc847b7f877d3d263791fc856746cded9153b81 SHA512 48686acbb7b97737e7851c53798afdc9601a521db4c719364d72de8915779abc1d9d0f06d129f69dd57e0fde2d362a278d0624bffce81e1f4bca6b3d69ab6b61 -EBUILD qemu-9999.ebuild 24066 BLAKE2B 391e815b990ae5bd97e24ff35f58c0abb818688d82785f0f6449ca32a170d5df84087d2b82db581318b23f1fe51a5db9865b31ecffdec64ec15bebd40873ba22 SHA512 7084f305e683c1a625704ba99f4d17abb188bb3090f83222d1bb8fc0e54c98fb3560331bf1ed7e769dab8a56811e658e0763e02754cdd11e3368abbe6b6959a7 -======= -EBUILD qemu-4.0.0-r50.ebuild 24058 BLAKE2B 985a90476641bdadb888034f01bea1613060288caf18c9b33ef2d984bdb0b49e356670ab540b8f75517ef65000b019659ba85bc87951fc8e23472eb8ef7e05bd SHA512 de8bdc762becd2915a8f42b8a6b202d6a044a2c17d0116555dc7ff2b7288ef13766ac350b28a77dc8594a58fd67d75238d45b757630ce12edd224caa3bcbb575 -EBUILD qemu-4.1.0.ebuild 24162 BLAKE2B 162a8478f4d3de04b20da363a4aa5a5731a7bb22a157e4695d252479ae287e89f757904d60b79ba136fee563163fff524c885e0ec4cfbdde6985613d2d81a832 SHA512 58784a1760c1879c3f152bedb07bca429de329a14a57bbcc8902d13e11d51affc303cf1add8e9e303c088e6c921a46411ed15d173b726181f43c32d7de7289e8 -EBUILD qemu-9999.ebuild 24065 BLAKE2B ae91939955dc990470b479c41862e3f81a28472ec69bfa7ca62ddc15a9fe8dbefa3c344a0e022e1cd228dfaa2340a5dae039a190336f733dd260ef4e7045ca17 SHA512 70e7830e23bf0ba44486392653fd12ee4fe2cbf5ff1f545f989d42acd76340bc33505e6e2520139fda7131b828ce0c95fc5764f38b7949fb3ff6aa421a2db095 ->>>>>>> next +EBUILD qemu-4.0.0-r50.ebuild 24048 BLAKE2B 53508cf3218ebdb7656b82166373fd32005280fe6fac21c7704fed295824165b2493270ec3a639ff6d8ec37f70b5c5b0fd6ad7ec6358402041d6310b903262c1 SHA512 c539799bffaf2e246e7893cfbcffafe9aec94f0056c9d139322214dee090900c7678aec2e1c72a2c4b08babaef9afbb9554cf0d0cd34dea6b707738a28d98580 +EBUILD qemu-4.1.0.ebuild 24152 BLAKE2B db3d5364929c9c995546ba7638ad69513b07c96f607b320f9fd3509a3db633b88eead39112fc2b2d954c2349a7a8567aef5fb98e7ca336295c59ad418e48520c SHA512 fb48a1806b8015345fc34cb5b1575ef86d15d4c89c358de7bb627580ba853da6c9e30cfcb27779121536afe4c428c1e588c8ce2fc520ea869bdb880817a3b7b6 +EBUILD qemu-9999.ebuild 24055 BLAKE2B 1969956b298b301448b1cd1ab0a48469ca8bacfd659d69e45fd7593efdde0a82d1a9790719ae94f7825980db0412b9941e2dab32856832008964c1fa93596235 SHA512 c1dc3cfe71735d63f4196c2017509c29704baa4c5c0a34a5e282309b59e24d47352231b9dcc923018fa76b6684022322b9ca95925101d421bc76a07059553d7f MISC metadata.xml 4012 BLAKE2B 1777649cce22dce3bc047584df1ab428fb3216f126a175b727df0857de99f857b6f6a1465a39eedb81355a0348e11ae504f92d60d03b0ffddeb3529ac4854a85 SHA512 85a4126971ea026e21371a4eb1f2e6f0c194644902bd9cc64a066f161b353e4a39cdcdd51af8fc554e446c0b13817c3416cce9f6261d5d8ab93ba50d58eb6dab diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild index 872c8ec75e57..d585d58e2726 100644 --- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild +++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd" + KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild index 36cddd2c6991..d0bec4380dbc 100644 --- a/app-emulation/qemu/qemu-4.1.0.ebuild +++ b/app-emulation/qemu/qemu-4.1.0.ebuild @@ -24,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -684,11 +684,7 @@ src_install() { emake DESTDIR="${ED}" install # This might not exist if the test failed. #512010 -<<<<<<< HEAD - [[ -e check-report.html ]] && dohtml check-report.html -======= [[ -e check-report.html ]] && dodoc check-report.html ->>>>>>> next if use kernel_linux; then udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index c9ec7d176c3d..d024b5020691 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="http://wiki.qemu-project.org/download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |