summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/Manifest.gzbin20855 -> 21039 bytes
-rw-r--r--app-emulation/aranym/Manifest4
-rw-r--r--app-emulation/aranym/aranym-1.1.0.ebuild101
-rw-r--r--app-emulation/aranym/files/aranym-1.1.0-conditional-installs.patch93
-rw-r--r--app-emulation/aranym/metadata.xml19
-rw-r--r--app-emulation/buildah/Manifest13
-rw-r--r--app-emulation/buildah/buildah-1.11.5-r1.ebuild (renamed from app-emulation/buildah/buildah-1.11.2.ebuild)25
-rw-r--r--app-emulation/buildah/buildah-1.11.6.ebuild (renamed from app-emulation/buildah/buildah-1.11.3.ebuild)25
-rw-r--r--app-emulation/buildah/buildah-1.12.0.ebuild (renamed from app-emulation/buildah/buildah-1.11.5.ebuild)2
-rw-r--r--app-emulation/buildah/metadata.xml5
-rw-r--r--app-emulation/cadvisor/Manifest8
-rw-r--r--app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild43
-rw-r--r--app-emulation/cadvisor/cadvisor-0.33.1.ebuild43
-rw-r--r--app-emulation/cadvisor/cadvisor-0.34.0.ebuild3
-rw-r--r--app-emulation/cadvisor/metadata.xml4
-rw-r--r--app-emulation/cloud-init/Manifest6
-rw-r--r--app-emulation/cloud-init/cloud-init-18.4-r1.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-18.5.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-9999.ebuild1
-rw-r--r--app-emulation/containerd/Manifest12
-rw-r--r--app-emulation/containerd/containerd-1.2.10.ebuild4
-rw-r--r--app-emulation/containerd/containerd-1.2.6.ebuild2
-rw-r--r--app-emulation/containerd/containerd-1.2.7.ebuild2
-rw-r--r--app-emulation/containerd/containerd-1.3.0.ebuild2
-rw-r--r--app-emulation/containerd/containerd-1.3.1.ebuild56
-rw-r--r--app-emulation/containerd/metadata.xml2
-rw-r--r--app-emulation/containers-storage/Manifest7
-rw-r--r--app-emulation/containers-storage/containers-storage-1.13.5.ebuild102
-rw-r--r--app-emulation/containers-storage/containers-storage-1.15.1.ebuild60
-rw-r--r--app-emulation/containers-storage/containers-storage-1.15.2.ebuild60
-rw-r--r--app-emulation/cri-tools/Manifest10
-rw-r--r--app-emulation/cri-tools/cri-tools-1.14.0.ebuild2
-rw-r--r--app-emulation/cri-tools/cri-tools-1.15.0.ebuild2
-rw-r--r--app-emulation/cri-tools/cri-tools-1.16.0.ebuild29
-rw-r--r--app-emulation/cri-tools/cri-tools-1.16.1.ebuild2
-rw-r--r--app-emulation/cri-tools/metadata.xml5
-rw-r--r--app-emulation/crun/Manifest3
-rw-r--r--app-emulation/crun/crun-0.10.6.ebuild72
-rw-r--r--app-emulation/crun/metadata.xml31
-rw-r--r--app-emulation/diskimage-builder/Manifest8
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild2
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild (renamed from app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild)2
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild42
-rw-r--r--app-emulation/docker-compose/Manifest7
-rw-r--r--app-emulation/docker-compose/docker-compose-1.24.0.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.24.1.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild71
-rw-r--r--app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch71
-rw-r--r--app-emulation/docker-machine-kvm/Manifest2
-rw-r--r--app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild2
-rw-r--r--app-emulation/docker-machine/Manifest2
-rw-r--r--app-emulation/docker-machine/docker-machine-0.13.0.ebuild2
-rw-r--r--app-emulation/docker-proxy/Manifest4
-rw-r--r--app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild2
-rw-r--r--app-emulation/docker-proxy/metadata.xml4
-rw-r--r--app-emulation/docker/Manifest10
-rw-r--r--app-emulation/docker/docker-18.09.9.ebuild2
-rw-r--r--app-emulation/docker/docker-19.03.2.ebuild308
-rw-r--r--app-emulation/docker/docker-19.03.4.ebuild2
-rw-r--r--app-emulation/docker/docker-19.03.5.ebuild (renamed from app-emulation/docker/docker-19.03.3.ebuild)8
-rw-r--r--app-emulation/dynamips/Manifest4
-rw-r--r--app-emulation/dynamips/dynamips-0.2.21.ebuild40
-rw-r--r--app-emulation/dynamips/metadata.xml1
-rw-r--r--app-emulation/faudio/Manifest6
-rw-r--r--app-emulation/faudio/faudio-19.06.ebuild1
-rw-r--r--app-emulation/faudio/faudio-19.09.ebuild1
-rw-r--r--app-emulation/faudio/faudio-9999.ebuild1
-rw-r--r--app-emulation/firecracker/Manifest23
-rw-r--r--app-emulation/firecracker/firecracker-0.18.0.ebuild2
-rw-r--r--app-emulation/firecracker/firecracker-0.18.1.ebuild152
-rw-r--r--app-emulation/firecracker/firecracker-0.19.0.ebuild148
-rw-r--r--app-emulation/firecracker/firecracker-0.19.1.ebuild148
-rw-r--r--app-emulation/flannel/Manifest2
-rw-r--r--app-emulation/flannel/metadata.xml4
-rw-r--r--app-emulation/free42/Manifest3
-rw-r--r--app-emulation/free42/files/free42-2.5.12-fix-makefile.patch45
-rw-r--r--app-emulation/free42/free42-2.5.12.ebuild50
-rw-r--r--app-emulation/fs-uae-launcher/Manifest4
-rw-r--r--app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild (renamed from app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild)2
-rw-r--r--app-emulation/fs-uae/Manifest4
-rw-r--r--app-emulation/fs-uae/fs-uae-3.0.2.ebuild (renamed from app-emulation/fs-uae/fs-uae-3.0.0.ebuild)0
-rw-r--r--app-emulation/ganeti-instance-debootstrap/Manifest2
-rw-r--r--app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild2
-rw-r--r--app-emulation/ganeti-instance-image/Manifest4
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild2
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild2
-rw-r--r--app-emulation/ganeti/Manifest10
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r5.ebuild331
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r6.ebuild340
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r7.ebuild365
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r8.ebuild5
-rw-r--r--app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild3
-rw-r--r--app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild3
-rw-r--r--app-emulation/genymotion-bin/Manifest4
-rw-r--r--app-emulation/genymotion-bin/genymotion-bin-3.0.3.ebuild (renamed from app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild)2
-rw-r--r--app-emulation/img/Manifest4
-rw-r--r--app-emulation/img/img-0.5.7-r1.ebuild34
-rw-r--r--app-emulation/img/img-0.5.7.ebuild31
-rw-r--r--app-emulation/img/metadata.xml9
-rw-r--r--app-emulation/kompose/Manifest2
-rw-r--r--app-emulation/kompose/kompose-1.19.0.ebuild2
-rw-r--r--app-emulation/libguestfs/Manifest8
-rw-r--r--app-emulation/libguestfs/libguestfs-1.36.13.ebuild1
-rw-r--r--app-emulation/libguestfs/libguestfs-1.36.15.ebuild1
-rw-r--r--app-emulation/libguestfs/libguestfs-1.38.6.ebuild1
-rw-r--r--app-emulation/libguestfs/metadata.xml4
-rw-r--r--app-emulation/libpod/Manifest5
-rw-r--r--app-emulation/libpod/libpod-1.6.3-r2.ebuild (renamed from app-emulation/libpod/libpod-1.6.3.ebuild)15
-rw-r--r--app-emulation/libpod/libpod-1.6.4.ebuild142
-rw-r--r--app-emulation/libvirt-snmp/Manifest2
-rw-r--r--app-emulation/libvirt-snmp/metadata.xml5
-rw-r--r--app-emulation/libvirt/Manifest12
-rw-r--r--app-emulation/libvirt/libvirt-5.2.0-r2.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.5.0-r1.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.6.0.ebuild20
-rw-r--r--app-emulation/libvirt/libvirt-5.8.0.ebuild22
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild35
-rw-r--r--app-emulation/libvirt/metadata.xml4
-rw-r--r--app-emulation/lxd/Manifest4
-rw-r--r--app-emulation/lxd/lxd-3.14.ebuild1
-rw-r--r--app-emulation/lxd/lxd-3.16-r1.ebuild (renamed from app-emulation/lxd/lxd-3.16.ebuild)5
-rw-r--r--app-emulation/nemu/Manifest2
-rw-r--r--app-emulation/nemu/nemu-2.2.1.ebuild73
-rw-r--r--app-emulation/openstack-guest-agents-unix/Manifest13
-rw-r--r--app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch60
-rw-r--r--app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch57
-rw-r--r--app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch15
-rw-r--r--app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch323
-rw-r--r--app-emulation/openstack-guest-agents-unix/metadata.xml10
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild39
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild44
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild31
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild65
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild73
-rw-r--r--app-emulation/pcem/Manifest4
-rw-r--r--app-emulation/pcem/files/pcem-15-respect-cflags.patch13
-rw-r--r--app-emulation/pcem/metadata.xml23
-rw-r--r--app-emulation/pcem/pcem-15.ebuild71
-rw-r--r--app-emulation/qemu/Manifest10
-rw-r--r--app-emulation/qemu/metadata.xml2
-rw-r--r--app-emulation/qemu/qemu-4.0.0-r50.ebuild1
-rw-r--r--app-emulation/qemu/qemu-4.1.0.ebuild1
-rw-r--r--app-emulation/qemu/qemu-4.2.0.ebuild826
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild9
-rw-r--r--app-emulation/reg/Manifest10
-rw-r--r--app-emulation/reg/metadata.xml4
-rw-r--r--app-emulation/reg/reg-0.16.0.ebuild48
-rw-r--r--app-emulation/reg/reg-0.16.1.ebuild (renamed from app-emulation/reg/reg-0.16.0_p20190102.ebuild)9
-rw-r--r--app-emulation/sen/Manifest6
-rw-r--r--app-emulation/sen/sen-0.5.1.ebuild27
-rw-r--r--app-emulation/sen/sen-0.6.0.ebuild1
-rw-r--r--app-emulation/sen/sen-0.6.1.ebuild1
-rw-r--r--app-emulation/skopeo/Manifest3
-rw-r--r--app-emulation/skopeo/skopeo-0.1.40-r1.ebuild (renamed from app-emulation/skopeo/skopeo-0.1.40.ebuild)12
-rw-r--r--app-emulation/slirp4netns/Manifest4
-rw-r--r--app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild (renamed from app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild)12
-rw-r--r--app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild36
-rw-r--r--app-emulation/spice-vdagent/Manifest2
-rw-r--r--app-emulation/spice-vdagent/metadata.xml4
-rw-r--r--app-emulation/virt-what/Manifest4
-rw-r--r--app-emulation/virt-what/metadata.xml4
-rw-r--r--app-emulation/virt-what/virt-what-1.20.ebuild24
-rw-r--r--app-emulation/virtualbox-additions/Manifest2
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-6.1.0.ebuild34
-rw-r--r--app-emulation/virtualbox-bin/Manifest12
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.135406.ebuild291
-rw-r--r--app-emulation/virtualbox-extpack-oracle/Manifest2
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.0.135406.ebuild43
-rw-r--r--app-emulation/virtualbox-guest-additions/Manifest10
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.32.ebuild4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.0.ebuild219
-rw-r--r--app-emulation/virtualbox-modules/Manifest6
-rw-r--r--app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch308
-rw-r--r--app-emulation/virtualbox-modules/files/virtualbox.conf-r13
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild4
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild54
-rw-r--r--app-emulation/virtualbox/Manifest3
-rw-r--r--app-emulation/virtualbox/virtualbox-6.1.0.ebuild504
-rw-r--r--app-emulation/vkd3d/Manifest2
-rw-r--r--app-emulation/vkd3d/vkd3d-9999.ebuild7
-rw-r--r--app-emulation/wine-any/Manifest20
-rw-r--r--app-emulation/wine-any/metadata.xml56
-rw-r--r--app-emulation/wine-any/wine-any-3.20.ebuild644
-rw-r--r--app-emulation/wine-any/wine-any-3.21.ebuild644
-rw-r--r--app-emulation/wine-any/wine-any-4.1.ebuild644
-rw-r--r--app-emulation/wine-any/wine-any-9999.ebuild645
-rw-r--r--app-emulation/wine-staging/Manifest16
-rw-r--r--app-emulation/wine-staging/metadata.xml1
-rw-r--r--app-emulation/wine-staging/wine-staging-4.18.ebuild5
-rw-r--r--app-emulation/wine-staging/wine-staging-4.19.ebuild5
-rw-r--r--app-emulation/wine-staging/wine-staging-4.20.ebuild5
-rw-r--r--app-emulation/wine-staging/wine-staging-4.21.ebuild (renamed from app-emulation/wine-staging/wine-staging-4.17.ebuild)7
-rw-r--r--app-emulation/wine-staging/wine-staging-9999.ebuild5
-rw-r--r--app-emulation/wine-vanilla/Manifest8
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild (renamed from app-emulation/wine-any/wine-any-4.0.ebuild)124
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild (renamed from app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild)2
-rw-r--r--app-emulation/winetricks/Manifest6
-rw-r--r--app-emulation/winetricks/winetricks-20190310.ebuild86
-rw-r--r--app-emulation/winetricks/winetricks-20190912.ebuild3
-rw-r--r--app-emulation/winetricks/winetricks-99999999.ebuild1
-rw-r--r--app-emulation/xen-pvgrub/Manifest9
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild (renamed from app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild)2
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc4.ebuild (renamed from app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc2.ebuild)0
-rw-r--r--app-emulation/xen-tools/Manifest12
-rw-r--r--app-emulation/xen-tools/files/gentoo-patches.conf6
-rw-r--r--app-emulation/xen-tools/xen-tools-4.11.3.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild)2
-rw-r--r--app-emulation/xen-tools/xen-tools-4.13.0_rc4.ebuild (renamed from app-emulation/xen-tools/xen-tools-4.13.0_rc2.ebuild)0
-rw-r--r--app-emulation/xen/Manifest15
-rw-r--r--app-emulation/xen/files/xen-4.11-efi.patch36
-rw-r--r--app-emulation/xen/xen-4.11.3-r1.ebuild (renamed from app-emulation/xen/xen-4.11.2-r2.ebuild)6
-rw-r--r--app-emulation/xen/xen-4.12.1-r4.ebuild (renamed from app-emulation/xen/xen-4.12.1-r2.ebuild)6
-rw-r--r--app-emulation/xen/xen-4.13.0_rc4.ebuild (renamed from app-emulation/xen/xen-4.13.0_rc2.ebuild)0
-rw-r--r--app-emulation/xtrs/Manifest3
-rw-r--r--app-emulation/xtrs/xtrs-4.9d-r4.ebuild78
-rw-r--r--app-emulation/xtrs/xtrs-4.9d-r5.ebuild4
223 files changed, 4454 insertions, 5698 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 0135e38793ae..7e75fd391072 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/aranym/Manifest b/app-emulation/aranym/Manifest
new file mode 100644
index 000000000000..03f6636e736d
--- /dev/null
+++ b/app-emulation/aranym/Manifest
@@ -0,0 +1,4 @@
+AUX aranym-1.1.0-conditional-installs.patch 3396 BLAKE2B b1013bb4897e83c960e2870317f6c7e468edc0a5c96362d140d7ab9533a88bbe45339f6cba17b103d3cb9ac5ab1efb0ed3752d1975c2442921119242bd87a73d SHA512 88a7c63f8311b04402bbd0f5e7f6f5358d2aabb9024d8303f7f11234e48e09464c9dd56e09df1ffc6aa11ef908e8672ffa3f77a1cfb1e77668c1c7de835fca30
+DIST aranym_1.1.0.orig.tar.gz 3785612 BLAKE2B 52b5fa34c78c67cb94cbe0d94795368cb7007f37571282d67387a0237500143f8078117132c9df392c5fd48b32cdb8c1cf727fe4d22a3d24eac0595215bddf4e SHA512 723b1a7c80532734e1dea288dbffd66746d9c7d1302ccb0259248a26aac5dedc7f66a134929de7064686af6c676d10918d90e2cf58cb010fd445979945177b51
+EBUILD aranym-1.1.0.ebuild 2423 BLAKE2B 965a397ab57ef29db4301166907dce74e59c6ecae81989bde5cdbf1756418bfd4ebba7d5aad58bc60867909a426e19dff8f8192dd90d49c30f563817b22add5e SHA512 0fd7a6c972bebf388bc84bfad8a1b0c0d2cb9520237ce7c9a336beca2fff5b005f1493c36cd98082e3ff1e76f2db4614f7c2d3edbc59b0abaf7efa2deb1c27d7
+MISC metadata.xml 861 BLAKE2B f43658208072ef8788ac8d62664ea137c41d1443ea62a6ae6fd04b32189045799ad2ebcd68da4f84b08be51277feb1e5176e03f27b6d0e30510bfdb45a649d4b SHA512 d9112337fcd30f94652f308e602d79e551374448fd19e8021c87016712bb5cd6417508400b72e9e9a7e432cce8f4b3247072637469f3bcb5c7dc3c13fc2624da
diff --git a/app-emulation/aranym/aranym-1.1.0.ebuild b/app-emulation/aranym/aranym-1.1.0.ebuild
new file mode 100644
index 000000000000..fe2c0f728ab6
--- /dev/null
+++ b/app-emulation/aranym/aranym-1.1.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multibuild xdg
+
+DESCRIPTION="Atari Running on Any Machine, VM running Atari ST/TT/Falcon OS and TOS/GEM apps"
+HOMEPAGE="https://aranym.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN^^}_${PV//./_}/${PN}_${PV}.orig.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+clipboard +jit jpeg lilo opengl osmesa pmmu +standard usb"
+REQUIRED_USE="|| ( jit pmmu standard ) lilo? ( pmmu )"
+
+# LILO can be used without zlib but the zlib dependency is automagic so
+# we just require it unconditionally.
+
+RDEPEND="
+ dev-libs/gmp:0=
+ media-libs/libsdl2[video]
+ clipboard? ( !kernel_Winnt? (
+ media-libs/libsdl2[X]
+ x11-libs/libX11
+ ) )
+ jpeg? ( virtual/jpeg )
+ kernel_linux? ( virtual/libudev )
+ lilo? ( sys-libs/zlib )
+ opengl? ( virtual/opengl )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pmmu? ( dev-libs/mpfr:0= )
+ usb? ( virtual/libusb:1 )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.0-conditional-installs.patch
+)
+
+ECONF_SOURCE="${S}"
+DOCS=()
+
+src_prepare() {
+ xdg_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ # standard must come last otherwise the aranym executable gets
+ # overwritten by the others.
+ MULTIBUILD_VARIANTS=(
+ $(usev jit)
+ $(usev pmmu)
+ $(usev standard)
+ )
+
+ multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_src_configure() {
+ # jit-fpu doesn't work on some platforms. FPUs were optional in
+ # Ataris anyway so just disable.
+ local myconf=(
+ $(use_enable opengl)
+ $(use_enable usb usbhost)
+ $(use_enable osmesa nfosmesa)
+ $(use_enable jpeg nfjpeg)
+ $(use_enable clipboard nfclipbrd)
+ --disable-jit-fpu
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == jit ]]; then
+ myconf+=( --enable-jit-compiler )
+ else
+ myconf+=( --disable-jit-compiler )
+ fi
+
+ if [[ ${MULTIBUILD_VARIANT} == pmmu ]]; then
+ myconf+=( --enable-fullmmu $(use_enable lilo) )
+ else
+ myconf+=( --disable-fullmmu --disable-lilo )
+ fi
+
+ # Force use of SDL2 over SDL1.
+ ac_cv_path_SDL_CONFIG=no econf "${myconf[@]}"
+
+ # https://github.com/aranym/aranym/issues/54
+ echo "#define HAVE_X11_XLIB_H 1" >> config.h || die
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir default
+}
+
+src_install() {
+ multibuild_foreach_variant run_in_build_dir default
+ rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+}
diff --git a/app-emulation/aranym/files/aranym-1.1.0-conditional-installs.patch b/app-emulation/aranym/files/aranym-1.1.0-conditional-installs.patch
new file mode 100644
index 000000000000..20ba1c1c4a0e
--- /dev/null
+++ b/app-emulation/aranym/files/aranym-1.1.0-conditional-installs.patch
@@ -0,0 +1,93 @@
+From 944ae098635d8bd4320b2acafc5746448e241db6 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 4 Dec 2019 23:31:04 +0000
+Subject: [PATCH] Reuse icon file and install normal/JIT/MMU files
+ conditionally
+
+---
+ Makefile.am | 19 ++++++++++---------
+ contrib/aranym-jit.desktop | 2 +-
+ contrib/aranym-mmu.desktop | 2 +-
+ doc/Makefile.am | 8 +++++++-
+ 4 files changed, 19 insertions(+), 12 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9fbc64b6..9dc7b71b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -79,18 +79,19 @@ install-data-local:
+ for s in 32 48; do \
+ $(mkinstalldirs) "${DESTDIR}${datadir}/icons/hicolor/$${s}x$${s}/apps/"; \
+ $(INSTALL_DATA) $(top_srcdir)/contrib/icon-$${s}.png "${DESTDIR}${datadir}/icons/hicolor/$${s}x$${s}/apps/aranym.png"; \
+- $(INSTALL_DATA) $(top_srcdir)/contrib/icon-$${s}.png "${DESTDIR}${datadir}/icons/hicolor/$${s}x$${s}/apps/aranym-jit.png"; \
+- $(INSTALL_DATA) $(top_srcdir)/contrib/icon-$${s}.png "${DESTDIR}${datadir}/icons/hicolor/$${s}x$${s}/apps/aranym-mmu.png"; \
+ done
+ $(mkinstalldirs) "${DESTDIR}${datadir}/pixmaps"
+- rm -f "${DESTDIR}${datadir}/pixmaps/aranym"*.png
+- ln -s ../icons/hicolor/32x32/apps/aranym.png "${DESTDIR}${datadir}/pixmaps/aranym.png"
+- ln -s ../icons/hicolor/32x32/apps/aranym.png "${DESTDIR}${datadir}/pixmaps/aranym-jit.png"
+- ln -s ../icons/hicolor/32x32/apps/aranym.png "${DESTDIR}${datadir}/pixmaps/aranym-mmu.png"
++ ln -sf ../icons/hicolor/32x32/apps/aranym.png "${DESTDIR}${datadir}/pixmaps/aranym.png"
+ $(mkinstalldirs) "${DESTDIR}${datadir}/applications"
+- for name in aranym aranym-jit aranym-mmu; do \
+- $(INSTALL_DATA) "$(top_srcdir)/contrib/$${name}.desktop" "${DESTDIR}${datadir}/applications/$${name}.desktop"; \
+- done
++if USE_JIT
++ $(INSTALL_DATA) "$(top_srcdir)/contrib/aranym-jit.desktop" "${DESTDIR}${datadir}/applications/aranym-jit.desktop"
++else
++if FULLMMU
++ $(INSTALL_DATA) "$(top_srcdir)/contrib/aranym-mmu.desktop" "${DESTDIR}${datadir}/applications/aranym-mmu.desktop"
++else
++ $(INSTALL_DATA) "$(top_srcdir)/contrib/aranym.desktop" "${DESTDIR}${datadir}/applications/aranym.desktop"
++endif
++endif
+
+ uninstall-local:
+ rm -f $(DESTDIR)$(docdir)/changelog
+diff --git a/contrib/aranym-jit.desktop b/contrib/aranym-jit.desktop
+index 1ca2c55a..5a4ee582 100644
+--- a/contrib/aranym-jit.desktop
++++ b/contrib/aranym-jit.desktop
+@@ -3,7 +3,7 @@ Encoding=UTF-8
+ Name=ARAnyM JIT
+ Comment=Virtual Machine with JIT CPU compiler for max speed
+ Exec=aranym-jit
+-Icon=aranym-jit
++Icon=aranym
+ Terminal=false
+ Type=Application
+ Categories=System;Emulator;
+diff --git a/contrib/aranym-mmu.desktop b/contrib/aranym-mmu.desktop
+index 610d0e52..2b841f23 100644
+--- a/contrib/aranym-mmu.desktop
++++ b/contrib/aranym-mmu.desktop
+@@ -3,7 +3,7 @@ Encoding=UTF-8
+ Name=ARAnyM MMU
+ Comment=Virtual Machine with MMU for FreeMiNT and Linux-m68k
+ Exec=aranym-mmu
+-Icon=aranym-mmu
++Icon=aranym
+ Terminal=false
+ Type=Application
+ Categories=System;Emulator;
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 3f466ef8..f0a0688e 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,6 +1,12 @@
+ man1dir = $(mandir)/man1
+
+-man1_MANS = aranym.1 aranym-mmu.1 aranym-jit.1
++man1_MANS = aranym.1
++if USE_JIT
++man1_MANS += aranym-jit.1
++endif
++if FULLMMU
++man1_MANS += aranym-mmu.1
++endif
+ if NEED_ARATAPIF
+ man1_MANS += aratapif.1
+ endif
+--
+2.24.0
+
diff --git a/app-emulation/aranym/metadata.xml b/app-emulation/aranym/metadata.xml
new file mode 100644
index 000000000000..a9d26d2bbfb7
--- /dev/null
+++ b/app-emulation/aranym/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chewi@gentoo.org</email>
+ <name>James Le Cuirot</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">aranym/aranym</remote-id>
+ </upstream>
+ <use>
+ <flag name="clipboard">Enable bidirectional clipboard transfer between the host and FreeMiNT</flag>
+ <flag name="jit">Build Just-In-Time compiler variant with increased performance</flag>
+ <flag name="lilo">Enable support for directly booting kernels such as Linux</flag>
+ <flag name="osmesa">Allow images to be rendered in memory using the host CPU</flag>
+ <flag name="pmmu">Build full PMMU variant, required for running mainline Linux</flag>
+ <flag name="standard">Build standard (no JIT or PMMU) variant</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-emulation/buildah/Manifest b/app-emulation/buildah/Manifest
index 43694cdc65af..186ecece3d72 100644
--- a/app-emulation/buildah/Manifest
+++ b/app-emulation/buildah/Manifest
@@ -1,7 +1,8 @@
-DIST buildah-1.11.2.tar.gz 10128075 BLAKE2B ad8f4253b62cd7709bf5ae530d002190c1850da6bbfa7dff2281de0592422eccc67a4ba6e52f7a82d6c1b320b986237a84d0ffaaf9b3b1b93822a54621365250 SHA512 f491d96d5bb4d0aa03981fb58d24f36c2e3928179c8fb79e85f323ce9a65ae6da05b816d86ae43f94a83a1b2445b315f93ca28b531436d9b4e5861e4adef2aac
-DIST buildah-1.11.3.tar.gz 10429884 BLAKE2B 2d433a128d115c6b2f3a9d246d41406993905dee357237796cea3295036d026ca93f8c98ca992cfebfa574ab0d5e7b974fd356a146b7cde58986166bc18a5645 SHA512 07fff3f8c044ad01a663bf5470b19f75568ce741b3bb45f656200099ba559622597111ede3e20331dc06139f2e58d962d92bf0fdd00284ca6ed05b5b66500975
DIST buildah-1.11.5.tar.gz 10594213 BLAKE2B 421d4ea78ad84fbae42086b8d49fec26db8e2aa1f83e261a8b5b1f3f41a5be4ea2fdeb41d4e27fb52bf23f309b8aea1d050cea0c6deffcad0ebb273032e712ba SHA512 04a9c51e1cb6f3a88f118b69dcea1eba85b02d534e671cd5bf31a6d6a797bce4a488c9373c92736fccd74331c1242ff60a95f44626ecbb50c32db176c7106e86
-EBUILD buildah-1.11.2.ebuild 1485 BLAKE2B 4f766ba24804b36bc976d4e1f767e469482ab8d9930b8a5488a57cd72b3644ca7bafe8d909d6e7272d73c99daf905a589bcb8b9032aeda9869e7d0bbd8ef1943 SHA512 7b10c0998a118d0e888222fe2bee26dcb2887b1f965a114f14a823b1ea8d917d55e6af657f68e003b779642f6205de43d72c4a3f119ebe8e5594a00241d3e858
-EBUILD buildah-1.11.3.ebuild 1485 BLAKE2B 01285630eb57227136150c22ff37c364786541b891c0141614e5c08a19403257ec0f2e0c7947a011c9c72d066d0581ea46a09e8cd4714bcde069a78f990efec5 SHA512 0af5f84ecf95ae34df0ed7617cb7459f9f679021e388b7247bba13a16e18649f3a0ad1cd16deca6cd3b03aa40f3ef63884bce790ca7dd25c1c2222040806cf01
-EBUILD buildah-1.11.5.ebuild 1208 BLAKE2B eda40fe5008c05f0de349186a5701bb0759bbcf38f82cbdc7c4a5dc57b4e5d3fa9528683493d8e4786d5e981a8701510a4e2e21d178316433765c0f387a381d7 SHA512 bccc1c143aeec3b623709bca126072fa8cf0043e0dd85652527379f563b1c11283a5aed2d78c8899d3cf40900eb881069977884a5fa8ab7e0a3c5b5737a9dbf9
-MISC metadata.xml 430 BLAKE2B 7486f6f62edf735da40a63ee17411e421101908e3e2652584800a3bfe315afbd46b9b6fe6338f8bb6cc7d09eb1bab34c1600e9aa6ae08b8d0326ee896270f2ea SHA512 8f25eca02d11272cc5a479adf3e361fe7f7cd595b0d54d26668b68940e012499d6c447ba93f44773a72f5431dffc346f1286be1f1a984eaa94e9dfc9501eb7b0
+DIST buildah-1.11.6.tar.gz 10600477 BLAKE2B b70849ca0121e32cd66da3da282a443688c15a783a1be7d5d3650bf1122c865e9674d0790fb599f6da4c04072a19360aa224ccc76d516e8a8e71061c903dd0e1 SHA512 419d51d0b430dbc38862bad218cf0bb9a698472dd3932e69fa6bcfb2023b9cd10cf03916f2333892cdcc051ce799664619c62941965a59420d81ba4706e9d7be
+DIST buildah-1.12.0.tar.gz 10717080 BLAKE2B 67107684d625ef23166d666dba50244861e6903f46315d8bae4d313d3585da154b7ee5f87ae8ab69ca717fdf68b914dee0cbcf2e1e95c34ebfccee4739db1d62 SHA512 ed7d77dfe88f613ef4f756455d889d707707ad16f8f6a9b514a8fbaabb56fef58db54ceb2344954a9311bcc6f1f000b21ac461f9b612b8534ae6a4594ad7a16d
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
+EBUILD buildah-1.11.5-r1.ebuild 1584 BLAKE2B 2435e6136bbd7b261aa25cf1a1bd8cc83e417900c0bb2bdda0fa2de0ea39e67240770b0f0d25141a303892a931acf72a412c600f349342cf89528be227a1c9f9 SHA512 ae2f57cbdf97f30dc56d0eedecd7480cc7a3f5b88c1b1d3d25fe155249db8160466a2a606b32530e2607a3ecc952f3855d2ca16a98a117767d0494dda31e0477
+EBUILD buildah-1.11.6.ebuild 1584 BLAKE2B 7ffcafe3e88de41edb8d0b8b8433c451c40ec42ccc51789cf0b6f24b566bda4fd57c54559a44f8e305bf9f56b55d0c4695be2a38ce2063964f369e0edeb0b1a5 SHA512 c385003b323de4cd79aad24f7a12c57c61c55a9a2e0245ad1bf1cc21cfdd1e2745e464a79c835192f19356dabbdaaeddf0df8a709d2ce1de6ffb7c7c3401cce8
+EBUILD buildah-1.12.0.ebuild 1208 BLAKE2B e9195ea67dfddb0e592f7d0de2a4809e575b87a343d4cb6380950aca7031be06e87b83bab22ea33ccc5986f9764440b4311cff707aa206dff621c7f7b1b9a2bc SHA512 5cc5b01169134a55a930033bb0aa5ded2869d47a7e674afeffebd5b8d88e989c1f5b4f98d62ad4b0fd7ed46af100c380432b949ce5f219620b69b8224dd80d5b
+MISC metadata.xml 327 BLAKE2B cd14ee5c563ac21da34ce7728d2d12b797374bc43c50f4a9923d773ae4e010d4930793a0f0ecf610bb798fb3f1b7cd567944cf9895258e9244c3852969ac2406 SHA512 bed26d87edba20ed9385633b70b8bc23fc046ed95aa9b608400933ed4199594f6d0461854060a68b42d33a9b7be0d1b61f52e22e0d3b6d2c2248f58442094711
diff --git a/app-emulation/buildah/buildah-1.11.2.ebuild b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
index 6a58e5f4b30b..792dc80accb0 100644
--- a/app-emulation/buildah/buildah-1.11.2.ebuild
+++ b/app-emulation/buildah/buildah-1.11.5-r1.ebuild
@@ -2,18 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
+inherit bash-completion-r1 go-module
KEYWORDS="~amd64"
DESCRIPTION="A tool that facilitates building OCI images"
HOMEPAGE="https://github.com/containers/buildah"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
+IUSE="selinux"
EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0bafbfe"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+GIT_COMMIT="7c97335"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo
dev-libs/libgpg-error:=
@@ -23,17 +24,15 @@ RDEPEND="app-crypt/gpgme:=
selinux? ( sys-libs/libselinux:= )"
DEPEND="${RDEPEND}"
RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
src_prepare() {
default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
[[ -f selinux_tag.sh ]] || die
use selinux || { echo -e "#!/bin/sh\ntrue" > \
selinux_tag.sh || die; }
@@ -41,7 +40,7 @@ src_prepare() {
src_compile() {
export -n GOCACHE XDG_CACHE_HOME
- GOPATH="${WORKDIR}/${P}" emake all
+ emake all
}
src_install() {
@@ -53,5 +52,5 @@ src_install() {
}
src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
+ emake test-unit
}
diff --git a/app-emulation/buildah/buildah-1.11.3.ebuild b/app-emulation/buildah/buildah-1.11.6.ebuild
index 42661d17b64a..0b2d48115c43 100644
--- a/app-emulation/buildah/buildah-1.11.3.ebuild
+++ b/app-emulation/buildah/buildah-1.11.6.ebuild
@@ -2,18 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit bash-completion-r1 golang-vcs-snapshot
+inherit bash-completion-r1 go-module
KEYWORDS="~amd64"
DESCRIPTION="A tool that facilitates building OCI images"
HOMEPAGE="https://github.com/containers/buildah"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
-IUSE="ostree selinux"
-EGO_PN="${HOMEPAGE#*//}"
+IUSE="selinux"
EGIT_COMMIT="v${PV}"
-GIT_COMMIT="bdd78ad"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+GIT_COMMIT="9513cb8"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo
dev-libs/libgpg-error:=
@@ -23,17 +24,15 @@ RDEPEND="app-crypt/gpgme:=
selinux? ( sys-libs/libselinux:= )"
DEPEND="${RDEPEND}"
RESTRICT="test"
-REQUIRED_USE="!selinux? ( !ostree )"
-S="${WORKDIR}/${P}/src/${EGO_PN}"
src_prepare() {
default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
sed -e 's|^\(GIT_COMMIT ?= \).*|\1'${GIT_COMMIT}'|' -i Makefile || die
- [[ -f ostree_tag.sh ]] || die
- use ostree || { echo -e "#!/bin/sh\necho containers_image_ostree_stub" > \
- ostree_tag.sh || die; }
-
[[ -f selinux_tag.sh ]] || die
use selinux || { echo -e "#!/bin/sh\ntrue" > \
selinux_tag.sh || die; }
@@ -41,7 +40,7 @@ src_prepare() {
src_compile() {
export -n GOCACHE XDG_CACHE_HOME
- GOPATH="${WORKDIR}/${P}" emake all
+ emake all
}
src_install() {
@@ -53,5 +52,5 @@ src_install() {
}
src_test() {
- GOPATH="${WORKDIR}/${P}" emake test-unit
+ emake test-unit
}
diff --git a/app-emulation/buildah/buildah-1.11.5.ebuild b/app-emulation/buildah/buildah-1.12.0.ebuild
index 2f7bb8f8c0d9..3608a7769b98 100644
--- a/app-emulation/buildah/buildah-1.11.5.ebuild
+++ b/app-emulation/buildah/buildah-1.12.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
IUSE="selinux"
EGIT_COMMIT="v${PV}"
-GIT_COMMIT="7c97335"
+GIT_COMMIT="6cc4656"
SRC_URI="https://github.com/containers/buildah/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
RDEPEND="app-crypt/gpgme:=
app-emulation/skopeo
diff --git a/app-emulation/buildah/metadata.xml b/app-emulation/buildah/metadata.xml
index aef68f1e5381..491730ac55c1 100644
--- a/app-emulation/buildah/metadata.xml
+++ b/app-emulation/buildah/metadata.xml
@@ -5,11 +5,6 @@
<email>zmedico@gentoo.org</email>
<name>Zac Medico</name>
</maintainer>
- <use>
- <flag name="ostree">
- Enables dependencies for handling of OSTree images.
- </flag>
- </use>
<upstream>
<remote-id type="github">containers/buildah</remote-id>
</upstream>
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 7d9ccd13ad87..fd4f9bee93cc 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,9 +1,5 @@
AUX cadvisor.initd 555 BLAKE2B eaea61c2f974f9cfd97244243581d20da2f0312b4772f732193a2e3cededa3807ddfebcb417086c4d6d61257ce209019766b01f11b68eb0225cd131c90d4bf34 SHA512 c38d258b2416070076a51354f0b78be42809c571064a2b4098482137130b63c731fe8c97f9d8295170302b04d6bd5b5313c682594a36787f66193dc3d4f67429
AUX cadvisor.initd-r1 567 BLAKE2B 8cd59227cdc07047c6c62fbcf74ec942468b86881d9b149a44fb60a10d8ed2a07c0cc97d59a9acf6dabac55969a77a6c69305893a4dcc90d10df9f4b007186c6 SHA512 84124c91f718446473644f3ed9e82592b1dbf14aecbf13a0a31a58938df19f8f65a108e03d0f377866ddc9d68cba1cb6963c2e5b9c384e6f6df441b504384460
-DIST cadvisor-0.33.0.tar.gz 4646920 BLAKE2B ce0e264321efcfbbf422f086cd15dfde389a099d183cbc2daaefb5aa6aa36da0c6e213dc4c12a000b9049ce2a1444addee93746f5650a56fa0f7c6612aa25bd9 SHA512 3d1dd1b9dc684e71bca9dc64949911f5f3ae72c97aa3b6cd45dd51a404fc101b5591ec8c19c469d6a410de3cf46c3d8c104d34e5dd1fdc85c18c2d1b6a45b2af
-DIST cadvisor-0.33.1.tar.gz 4646909 BLAKE2B 1ba30d559c018bf11297ded8adcc77a8761f77a1a39d75fb6e704ab84b3118d14587c91fd638da59bc9a46969b0545bdcf55e482390adeef6a4841fd6a57988c SHA512 659b8c48f74ef34044c7b3d9a41d42338c9c90fa443bdf7766001ae570aab8ed61efa948d1d01c324b6f03a0d1bf3d3fb1483d40bfc3b7e67f768253e3638de5
DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
-EBUILD cadvisor-0.33.0-r1.ebuild 1067 BLAKE2B 1fc65cb53cf5485086b9e09ce4b5d55b03badf1b0897786e7dd110dce93a4b23e51e1594a7c3161a88ee417195ff8e31ec85e26d5a885e68b57155ef4eed43c5 SHA512 defde9918c8120d66a4766eae04c2e7c7d6e0bab1c97f40abd957bdc2d4e70181b672cce19444af071147f71c18a0974847f5eb9804a1cb042db41c1544d1544
-EBUILD cadvisor-0.33.1.ebuild 1067 BLAKE2B 6ca8de198d551133211b7840e54a497cae13e030c0d96294de2a30d86a56f4daf70ada324b308d722be79af6d438fc603902e73cf3659d84157388a94c8b4866 SHA512 52d29f926766995041bcfe545602df81aa24ae1725f853efe203711513ed7bf7c03e41d99fd359d390a4b3df5c72cdcaf256438a15e6903be35458795932c698
-EBUILD cadvisor-0.34.0.ebuild 1067 BLAKE2B 0cbedfd14e5fbb69bcf6a9778f0208ab1f6520f166ccb119dc15a23d95238053e6281e9ae0fbd300724933dc66a04b9d0c0836d6ffa53d0f309919ac571528d2 SHA512 88f20182dd1a60de4b03eee51ab325763eb6ce896348a797900dcd0f46fee8992263d2902f9f63bcd593417e8a7cf62feb1c5430daf7c99301dd8587490a2821
-MISC metadata.xml 325 BLAKE2B 3a83be7d0ee504a5ef4b25d8826101878da8bac2228afbe0598ec0aef7435d69ed6d754b88453336fd84a1ef38ab1646eb890bfbff1e8549836aa12c7d497f4b SHA512 d083dae5366eaea34ba9697c49a4399e822000a19b11cffffe82e08f4a331eb0f4672c8271ac342cebb79a66c1a245e41a17ff1d40ecbad2354940bfa14c1b06
+EBUILD cadvisor-0.34.0.ebuild 1119 BLAKE2B 6e6346ce9c4d8f5f7c46a11683a74b6efbc3479856633a50814ec2675a4ce71c3f0b102e7eb18da407d84b5e55b7c804bdb1fdc589cb20f066c80ce2b553df36 SHA512 0fedf5a3b41fd886e8d8c6f5ef779a3e32108d794c750302b0183634ab3cc33054b80fb25678ccc232645c4f9dc72249b413c2532868f3b9fcda5565d9c61bb6
+MISC metadata.xml 328 BLAKE2B 61bca93d2712241a0988c8b6b2da6859b4bd1e3dba6209d6628c4b69e00a565410ee8a46ea8132b3edf2269a8ab7b44083e59bb4f5d5568c52794ece55130316 SHA512 29a397dddc11fcff90776fb2d90356c162080b7b6ffa24633b7c89d9c0bbd208e5cc3aa77a89ffdd7f81c1f618124883be342566c6b6ab3bc92e443f4c39da09
diff --git a/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild b/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
deleted file mode 100644
index 2e4b131c1b4b..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.33.0-r1.ebuild
+++ /dev/null
@@ -1,43 +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="511ec9e"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-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() {
- 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.33.1.ebuild b/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
deleted file mode 100644
index 283eff3a8e7d..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.33.1.ebuild
+++ /dev/null
@@ -1,43 +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="7e9ea00"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0"
-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() {
- 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.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
index 26280e2293af..76ad3d58d03a 100644
--- a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
+++ b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
HOMEPAGE="https://github.com/google/cadvisor"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
SLOT="0"
IUSE=""
@@ -30,6 +30,7 @@ src_prepare() {
}
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
diff --git a/app-emulation/cadvisor/metadata.xml b/app-emulation/cadvisor/metadata.xml
index 9685b121c378..054ff1968a44 100644
--- a/app-emulation/cadvisor/metadata.xml
+++ b/app-emulation/cadvisor/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">google/cadvisor</remote-id>
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index d95339a96efb..c0e8dea135d2 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -10,7 +10,7 @@ DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debc
DIST cloud-init-18.4.tar.gz 965112 BLAKE2B 2879aafedea877e4e406a5e837d100ba65e40c62660621f606e7a189af7b1ec8d98ba2c02ae5d253a0b4587502d3a636dec5c2772c968a9037b47e62a05656b4 SHA512 730aca6406f652f55afc2dd50c49eb6708584e0a96715606bcba05cb7f40e47c256faff1f9748f04674a8f941ec9435801c9ed2ac79adec8a6ef167d6b195103
DIST cloud-init-18.5.tar.gz 990381 BLAKE2B 0dbbd5b2402d3a7742c46f8a37b0ea31f40ac16bdbfe49dca0056ab8f90c47dbf26e6d3f40f34275caf5102d0b9b8be4e2c28bfc2276e85a5aad11af20b08979 SHA512 f89ee636922e33b5b2dcb5230763404fbeee148e28b8f61bf5b2f1f07000f960f9d38545dfb7bcbe9afb8253f77d66c94b39e9a159715b44a440a7cbe1fe1aeb
EBUILD cloud-init-17.2.ebuild 1949 BLAKE2B 543af46782c0997669525287ee01572b4a54dea3872b0626176463248dd05f5eb6f21faa3bab9c61039f59d2ea55a7f207108bc89172ebdce3dbd5d661414f9a SHA512 5062b9043a3e802385b7e6d9d5ddfade26870a9c6b0c2884c3c2124203f238e319265ad1c78d58982bc08972d7fd3795428abb5d883c9e473f43664b6972093a
-EBUILD cloud-init-18.4-r1.ebuild 2494 BLAKE2B 2ae7233c30b8d4761346d854b78d709155323edf0b4596a6749980527e1d4dffd5a0b328557f6f4959100834bc738d21f040d17861d9edd975c4ffa0f0e72bc5 SHA512 ef891d79e787e1b92606c8554804bbf015454646913fe1afb1114b90e167117b7e16f32fdcdb9b1c648b0391fad5980827232cd6dcaae6a139ba011e9bbf05f8
-EBUILD cloud-init-18.5.ebuild 2571 BLAKE2B baa75de25cbec3d4e8fc4274aa4e4a25c00cdaee1b70eac78d7765c67fad5326f097204f8a3e83bb87041c2c02fa4654e40b97ace5fb53eeee7305eca54f9493 SHA512 709b3e24bfd0cdadc0cfbd7a75de625c1f58c1cd5397a1b2a9193a6742a3831504d43f227b547103484446790f511d0ab313e91df1e8be27f9596e9606be32cf
-EBUILD cloud-init-9999.ebuild 2561 BLAKE2B 4663885104b11ebd1a0a90eef92d0c851ac56271c3d383bfbd8f9b07fbd5f940874df32e75b5fa6948ae1a5ad2e4f884a6a05acc235ccaa12056c5820268f536 SHA512 fcce70e921f607bc163fdee9ad9792dc9d2ae5c53cef49de98cc82b76258c10c46029f0e7409be51d9c510bc93a003bbf6a068e6cf2e1eecc89d9d9b36270a6e
+EBUILD cloud-init-18.4-r1.ebuild 2521 BLAKE2B df67bde0e3394d76f0f0d31b5adc38f12e81e5ff53cf86ed130b84fb4e1167f44cf0b6357fbe574f9436fca9138ec14a99ef3d98eb37681187fc9e2f0253e4af SHA512 06545f0fe539651c6802596de9d4f8916825382e03befd5127fdd5f73fad025793897e804bc39d37eb2a5b06d54c08407b68201177dd49121479a4b8ada24f77
+EBUILD cloud-init-18.5.ebuild 2598 BLAKE2B 4f59a07d710138f29e5ca4148a2295310054478dc76a69ec1647740e8e61d650a87061c0136c9932e6a6c1b2f52ea0f12705ef1f637110a760ad6a881fc149c5 SHA512 cc66bd64862a583b4405a6934f8596202d18ad254a737e770a110cac553a0632fe2a994747f5983e4b0255ac69f59ca5dd167b30db320ca4db6e127aff97b620
+EBUILD cloud-init-9999.ebuild 2588 BLAKE2B 808a34a0a5db46fcbe280833a597a687e8087510048f4d8309dccaedcb463fb7cbfbaf00ddb0bd1f3caa02fb8b633f1f7224a50d45cf9680b384d0c15a4e4b6b SHA512 d04d81b95107de2c1362fe0ed8dd4deec7b2030ce0d5e5078492c1bdf64c094e5f5e8965a14e1e5338528ad367a141efdc6e8ceda38a0ba5b07799b5c0c868e5
MISC metadata.xml 583 BLAKE2B 24a5563ff0106a6992b0adb539bc12f34f4ceee97213a71c6b8c15701ff627dc914917dc32510b728a59e8014571ec9d86313b0016710308e317da4b28adbf1e SHA512 1424ff88b0a75fe1037471c4187f3a557f1d180acf7879b52696730b9e789e6bcb2e2d870b68ae0b6d4eab05fa0d11388f2fd9b6a64eb0bfbd54403a88b1f68b
diff --git a/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
index 8065d2ed4720..bcf44e1e85d3 100644
--- a/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-18.4-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/app-emulation/cloud-init/cloud-init-18.5.ebuild b/app-emulation/cloud-init/cloud-init-18.5.ebuild
index 51b52e32d6e9..eca1e9662d9f 100644
--- a/app-emulation/cloud-init/cloud-init-18.5.ebuild
+++ b/app-emulation/cloud-init/cloud-init-18.5.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index b5415723a60e..d573cb307977 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 7a027f327dd5..fc5db97b2d14 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -3,8 +3,10 @@ DIST containerd-1.2.10.tar.gz 4923354 BLAKE2B 6727fde9949ca96f351964df3c0c7481cb
DIST containerd-1.2.6.tar.gz 4874159 BLAKE2B 202e19cffbe2b5335558dc1db28ea28a05dcc9e9b3aad864e090d86f7590df9e67ae685c9fc6ab2b8abdd1762d001fa9b298b1d311c080449bc86087b6af8c36 SHA512 287b064cb3e57369e34f6debb434526d6bd4857e337e489c56e4ca484c66e161bbda911b4fc29cb49808a756f6ec7af5629e46d693644500e3bf2d9e45e87e73
DIST containerd-1.2.7.tar.gz 4877757 BLAKE2B 6cf98e370547d3ca5158f546e72e3ff5fdccc08c2e9f390988d080222195f95512dbf6f7dc042b7a966283a040000b7b8777b3fbeb4c5b861caae4f6209c59c5 SHA512 b96ca236d28933c1bf309fc7204af7d2c356e19af394d5c2274a178c8f15298faf6ca9bb8e7d04acb7c3c9c41035446643a8df0103017f7ed0320bfc37cb8ca9
DIST containerd-1.3.0.tar.gz 5697153 BLAKE2B c334cfd2aa11dd430c74bc9f3fe6f31d83faf752b9794da26021033bb6af492c48ed1665fc76ddfe5b858f04d45e9b77505f331e3c3da556af2d75e3cca3bb12 SHA512 cff9f0189b9fdc2b5492c92129af284aa8cd099e48de94cafd90aed191e2d20060c96008111b05fe081de0d4fc41d35f8cba5a3dc2d8cc0a5c37f695fd3cedc1
-EBUILD containerd-1.2.10.ebuild 1439 BLAKE2B 3d29e77e2873c2b6cd2460f2aecf664bd2d3f890b3a24448df1593be4f0312a4a40c99cb5a698d58719dc142217f846906744d412f6b832431b58f7b99679e36 SHA512 cd913ada2b1afd40f8834350ef8bd923e784b0eb9b7821da74da223b7f21ba133177c0cd39dfdf1397cd33be395e15046bb11f4e1836de5ae746b2644e0c9165
-EBUILD containerd-1.2.6.ebuild 1438 BLAKE2B 6f32e5e84deaa3af38aaccc5348eb3e2fcb03cdfb489902b0fdbca9365b711b99d5427521c44025ed8229ad029e7e11a3ae9a361157719c85bc6fe0b8737d307 SHA512 e72cc152933a436003d7f3403981e73026842069d5c35700d3c5b6b7893d69ab311fb7adc7ddcfc228d7c10b7d735c38c1af5e1bc758ddf3a4010eb691571fcf
-EBUILD containerd-1.2.7.ebuild 1439 BLAKE2B eb6c9a7402729bdb82762f44569ca8c99092872da4368f45dea7f8e5bfc72bf1769c77feff6059f83d2c258eebd075c350332ca9cff4fa3c227b0dd74f6b1d11 SHA512 c992f390a16e01f91780c98de084b495533eb7ad208f6e711ff79f3238237977247068d20df2332e8189dcc307c6ff8d0053a2ad558bfe8d74d77225b4cf0102
-EBUILD containerd-1.3.0.ebuild 1439 BLAKE2B ec5934cb16e2d2d4cdd4775b83a058bcd65be32ee326297570d0cc1095b93b0943129ab059130756f33951978dddbc5ba9ef938c5fe1dd8edd56b22dd54acdf3 SHA512 b7747d0981d4ed32db14dbc59fcd5e263b81d1f2a4c1736f665015dc8215a900980219634bae402b3759973c5e4686b51534bc3a3315f782d7229f12afa7a404
-MISC metadata.xml 1088 BLAKE2B c4002c4c1278d979180f2bb2819f5485f0d415b09e85f83e14969842b16ce93970743d2df77f2b72f9d1e7f253f1dfacc7dbdba6aa872c4f866df48cc3b723f7 SHA512 edd35f07b6ebb489442c514d078831409fca1be2e3da7e77bf8ee3e7f422e288f68373cbb59f83fadc6c707476d7909fe64563ae48a4ea972041c0d2a3aecda3
+DIST containerd-1.3.1.tar.gz 5703741 BLAKE2B 6eae3fe9714128e7a5378484115378629baf6c4f7ef4b795e625cc1fbc05323a123c2337c5b203a2c3c3b34486c81f7e5b3ad200c000c961931fc99347ef4513 SHA512 4991286d1a8a221dad24121c5e6cd31a00685d91e652546d0d97745624486450bc05ff4f889f2975c178c4c175fedd7b15f89121a7ce4e6687919aabd04501b4
+EBUILD containerd-1.2.10.ebuild 1436 BLAKE2B 2ee522bab38cd81a9ac23bd8f7a2021abde9ba2dfa972a57c35f67700b44b2f946a312cee5512ae62bae4cc43aebdc469e366d4280c287018db88074b0c24553 SHA512 07fde13f2d1809fc7f5bcc57e39c425bc4f61d18f7cef4acca7ebec45c9c758742a27ec8343235fc23a887092aa782bb3662528faffdf23a93aac255f413c096
+EBUILD containerd-1.2.6.ebuild 1436 BLAKE2B 15ec996c1e39e5907c80e161d64f0854e99bfd33d7ec0f91d53afcca3964fef23c52b89db1b42c99d976b0aca513c759038e2fa913b085f19c5ccad69e1c3e34 SHA512 1e43851c799501c712b5be468bb3469c89177e856dd4bea40c2b130cbcd3b2fb5acc1722285f1839562e837d7cd0243b0138fa418eda293843d4626e34b390a3
+EBUILD containerd-1.2.7.ebuild 1437 BLAKE2B 5483fceb26472d3b98e88d9d507b11b2ebb8cef7a8b254cfe106384cdb79975b3bd9804f63876e2b3f5b08d0ab96beeb50210ff850046bc98f13ee6781a38376 SHA512 e676267b0e4ca108735f16c1d3bee9d1edb3a4287a0b0e1ffd4a11005055162f76b11a0dad1e4d22ba57b48b2bbc7e862005d58c4861011c5d8f6047bddca47c
+EBUILD containerd-1.3.0.ebuild 1437 BLAKE2B 1d1303203e48395437fc53cc232571093de834e0b5b9dc7fa02c7864372adaa7340906cfac7c1c56e645a8d4d18a39d5a7e32e9f547c8a3905fee4fc019a681a SHA512 6689ab82a9b3d73764d7149e094781670148815e2b255ffbaa31887a3a0153ebe4930c49c2bcf73befb02410aea2ad023f33e26c4ab6a605e8097a84de76c36a
+EBUILD containerd-1.3.1.ebuild 1404 BLAKE2B 0d7036ff3f180cb2054d95263ec88d08e2628fe5a421d9967d4313966c858692e2c1a7c41122c9b2efea7b055af232c2e8fc2725fb8691944a0be2fa0fc9f6db SHA512 ec6c3514980b5037bcabe94202285ae90730baeeef0e6f8a6d120590647283be3ac5cfeddc7be4b948f962aa7f30fe030d18578faa62a554b591111898322b98
+MISC metadata.xml 1092 BLAKE2B 1c5fd4a96401beb153a27a1aa0729da7737f8caec11be9b1bd7d9b5bd46c5f1ccfda37ba1829bc63d844a3c0e046930938faf88459d87f0ebc8b855f1f3b132f SHA512 75c31c0feacf4f09862edbb1087a248b1238b9c206ae837f16b9f1a3f1290698ce33066d4fde815c2aa82193b07e54f55130f396668dd0a8bb399d5232f466bb
diff --git a/app-emulation/containerd/containerd-1.2.10.ebuild b/app-emulation/containerd/containerd-1.2.10.ebuild
index 95e25445893a..53b84c161278 100644
--- a/app-emulation/containerd/containerd-1.2.10.ebuild
+++ b/app-emulation/containerd/containerd-1.2.10.ebuild
@@ -13,12 +13,12 @@ else
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="b34a5c8af56e510852c35414db4c1f4fa6172339"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
fi
DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.2.6.ebuild b/app-emulation/containerd/containerd-1.2.6.ebuild
index 46e17e7be0b6..dcc5a7670301 100644
--- a/app-emulation/containerd/containerd-1.2.6.ebuild
+++ b/app-emulation/containerd/containerd-1.2.6.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.2.7.ebuild b/app-emulation/containerd/containerd-1.2.7.ebuild
index 21f2f7301c8d..c021436695f6 100644
--- a/app-emulation/containerd/containerd-1.2.7.ebuild
+++ b/app-emulation/containerd/containerd-1.2.7.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.3.0.ebuild b/app-emulation/containerd/containerd-1.3.0.ebuild
index 59441dac7e0b..0c5e0f6bd86c 100644
--- a/app-emulation/containerd/containerd-1.3.0.ebuild
+++ b/app-emulation/containerd/containerd-1.3.0.ebuild
@@ -18,7 +18,7 @@ else
fi
DESCRIPTION="A daemon to control runC"
-HOMEPAGE="https://containerd.tools"
+HOMEPAGE="https://containerd.io/"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-emulation/containerd/containerd-1.3.1.ebuild b/app-emulation/containerd/containerd-1.3.1.ebuild
new file mode 100644
index 000000000000..17258ef6de6a
--- /dev/null
+++ b/app-emulation/containerd/containerd-1.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+ inherit golang-vcs
+else
+ MY_PV="${PV/_rc/-rc.}"
+ EGIT_COMMIT="v${MY_PV}"
+ CONTAINERD_COMMIT="c7a4f87"
+ SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.io/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="apparmor +btrfs +cri hardened +seccomp"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )
+ seccomp? ( sys-libs/libseccomp )"
+RDEPEND=">=app-emulation/runc-1.0.0_rc9
+ seccomp? ( sys-libs/libseccomp )"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ if [[ ${PV} != *9999* ]]; then
+ sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+ -e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+ -e "s/-s -w//" \
+ Makefile || die
+ fi
+}
+
+src_compile() {
+ local options=( $(usex btrfs "" "no_btrfs") $(usex cri "" "no_cri") $(usex seccomp "seccomp" "") $(usex apparmor "apparmor" "") )
+ export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+ LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') BUILDTAGS="${options[@]}" emake
+}
+
+src_install() {
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ keepdir /var/lib/containerd
+ dobin bin/*
+}
diff --git a/app-emulation/containerd/metadata.xml b/app-emulation/containerd/metadata.xml
index a28d7bea81ae..11dca7fe67a0 100644
--- a/app-emulation/containerd/metadata.xml
+++ b/app-emulation/containerd/metadata.xml
@@ -26,6 +26,6 @@
<flag name="cri">Support for Kubernetes CRI</flag>
</use>
<upstream>
- <remote-id type="github">docker/containerd</remote-id>
+ <remote-id type="github">containerd/containerd</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-emulation/containers-storage/Manifest b/app-emulation/containers-storage/Manifest
index 6311278f54e5..671599512f95 100644
--- a/app-emulation/containers-storage/Manifest
+++ b/app-emulation/containers-storage/Manifest
@@ -1,4 +1,5 @@
-DIST containers-storage-1.13.5.tar.gz 5968281 BLAKE2B 9690ebc87ce32a82b7560d594e192e0ad4dc9e8885797593d8c9699c13b9ddf0814773bce081edafe3050aba5d2bc470855c0717874c091b1468d52f7ad08658 SHA512 7f9f65e3141b7843a42389c78b3fbcc55a205eb661968f85942ccc2751fa6eb3fdf1199e8d244264d1b8f392e290a1770f93d5a8fd58de98f9d9a277aa39155f
-DIST github.com-pquerna-ffjson-e517b90714f7c0eabe6d2e570a5886ae077d6db6.tar.gz 103470 BLAKE2B 81f0f6ea6648997cb61723d09d456802e60a3d1eb35134c4bbc8af5943b955b1402fe2b3f8d0d4d2d0293ab256a9be66d53262d5f79ca00bf8c18ded39dc44f4 SHA512 fadca5a7bd0c0578b23281720a08c505054f3497daeee8efa36b5acafa4118feb4b8a96c4acb4c279d72ebcd50846307cfbb846a355b62f350c961f9102c93a6
-EBUILD containers-storage-1.13.5.ebuild 3485 BLAKE2B 539646c67e3f3559b47d10f14924a708c6762ba2dedbb243e26507b1223cbb103d9e123d9c937dfe75af86885a2af5ce025ea5d5dc90c77bbbdc7e559baf8039 SHA512 4d23fee826634ab51e11f2208bb024ffab896143ce8027345e699e669ffb93ecbeffd1aa3c87c1a1f96741f963eecee0b997ad84cee0a37fda14adcaec6fdcb9
+DIST containers-storage-1.15.1.tar.gz 6037975 BLAKE2B e6d0d9adae829fd3d8cb40aa124b7149ee56ed13650b0dc57ba316ab2f03e754bdbb3e566c199b7768c612b159fa3051db39cd90127f4676255e452863aa7e24 SHA512 ea017e7dec840e5794f0ae61ebfc0cbf55b8de2c237286371eef3fd1808809e2bb149f08ba62126c741e0811839bf0af8f97bbda32e715132e42905f2ebd3a6c
+DIST containers-storage-1.15.2.tar.gz 6199303 BLAKE2B 76b950892d4a3016a6df2223c66d9720334205bb1c1b6d18f09b984df9c967391329a970d9d927206f37d4557fc6f4b6c366cb6f35711d2a7d8842f7e3bf7221 SHA512 b152e85e8ebdc5016955287c289390568865d60b2b034e5d32eaa3d11d775a12788465246ff7b75cd8a079758f5d2fd90bd1443191f6a089f54862951a26cdae
+EBUILD containers-storage-1.15.1.ebuild 1471 BLAKE2B 9990d85a89853309e601d27cb26093e7c9255b680907a952936ea234ff2a2974f9e78100b8a18b73f58cc3984a6efd387f00ec277511fb4052c09c17330c329c SHA512 04e5fed27bef4254b8ad07e6169f1eee023ff9693c4d4eddebf1f87f50e8bb4f70eee0b42585faa24cd1aaad1a909006135869dff4274533b8323c30a50238ad
+EBUILD containers-storage-1.15.2.ebuild 1471 BLAKE2B 9990d85a89853309e601d27cb26093e7c9255b680907a952936ea234ff2a2974f9e78100b8a18b73f58cc3984a6efd387f00ec277511fb4052c09c17330c329c SHA512 04e5fed27bef4254b8ad07e6169f1eee023ff9693c4d4eddebf1f87f50e8bb4f70eee0b42585faa24cd1aaad1a909006135869dff4274533b8323c30a50238ad
MISC metadata.xml 603 BLAKE2B 97f54132ebad8af6ff29ffd35644f68faeca3f387025e6bfd7529e7d61582e7bbd8f4279c3608b6b8187e1f6a78c552d1bb9e828cfb2f6fe5fa6710e0730d2f2 SHA512 f65876cdaac00b0d5ed7524467b9cde201da0a3fdf17d959bb19bc2d98344ca013b93dd0d2ebbb24b585a9754b8d06711e0085092a3820bdfe238e26a64d765b
diff --git a/app-emulation/containers-storage/containers-storage-1.13.5.ebuild b/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
deleted file mode 100644
index abe57aef3e08..000000000000
--- a/app-emulation/containers-storage/containers-storage-1.13.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_VENDOR=(
- "github.com/pquerna/ffjson e517b90714f7c0eabe6d2e570a5886ae077d6db6"
-)
-
-inherit golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-DESCRIPTION="containers/storage library"
-HOMEPAGE="https://github.com/containers/storage"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
-SLOT="0"
-IUSE="btrfs +device-mapper test"
-EGO_PN="${HOMEPAGE#*//}"
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
-RDEPEND="
- btrfs? ( sys-fs/btrfs-progs )
- device-mapper? ( sys-fs/lvm2:= )"
-DEPEND="${RDEPEND}
- dev-go/go-md2man
- test? (
- sys-fs/btrfs-progs
- sys-fs/lvm2
- sys-apps/util-linux
- )"
-RESTRICT="test? ( userpriv ) !test? ( test )"
-
-src_unpack() {
- golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
- default
-
- [[ -f ${S}/src/${EGO_PN}/hack/btrfs_tag.sh ]] || die
- use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- "${S}/src/${EGO_PN}/hack/btrfs_tag.sh" || die; }
-
- [[ -f ${S}/src/${EGO_PN}/hack/libdm_tag.sh ]] || die
- use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
- "${S}/src/${EGO_PN}/hack/libdm_tag.sh" || die; }
-
- sed -e 's:TestChrootUntarPath(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/chrootarchive/archive_test.go" || die
- sed -e 's:TestTarUntar(:_\0:' \
- -e 's:TestTarWithOptionsChownOptsAlwaysOverridesIdPair(:_\0:' \
- -e 's:TestTarWithOptions(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -e 's:TestTarWithBlockCharFifo(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_unix_test.go" || die
- sed -e 's:TestTarUntarWithXattr(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/archive_test.go" || die
- sed -e 's:TestApplyLayer(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/changes_test.go" || die
- sed -e 's:TestApplyLayerInvalidFilenames(:_\0:' \
- -e 's:TestApplyLayerInvalidHardlink(:_\0:' \
- -e 's:TestApplyLayerInvalidSymlink(:_\0:' \
- -e 's:TestApplyLayerWhiteouts(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/diff_test.go" || die
- sed -e 's:TestCopyCaseE(:_\0:' \
- -e 's:TestCopyCaseEFSym(:_\0:' \
- -e 's:TestCopyCaseG(:_\0:' \
- -e 's:TestCopyCaseGFSym(:_\0:' \
- -e 's:TestCopyCaseH(:_\0:' \
- -e 's:TestCopyCaseHFSym(:_\0:' \
- -e 's:TestCopyCaseJ(:_\0:' \
- -e 's:TestCopyCaseJFSym(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/archive/copy_unix_test.go" || die
- sed -e 's:TestMount(:_\0:' \
- -i "${S}/src/${EGO_PN}/pkg/mount/mounter_linux_test.go" || die
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME #678856
- mkdir -p "${S}/src/github.com/pquerna" || die
- ln -s "${S}/src/${EGO_PN}/vendor/github.com/pquerna/ffjson" "${WORKDIR}/${P}/src/github.com/pquerna/ffjson" || die
- mkdir -p "${S}/bin" || die
- cd "${S}/bin" || die
- GOPATH="${S}" GOBIN="${S}/bin" \
- go build -v -work -x ${EGO_BUILD_FLAGS} "${S}/src/github.com/pquerna/ffjson/ffjson.go" || die
- GOPATH="${S}" GOBIN="${S}/bin" PATH="${S}/bin:${PATH}" \
- emake -C "${S}/src/${EGO_PN}" containers-storage docs
-}
-
-src_install() {
- dobin "${S}/src/${EGO_PN}/${PN}"
- while read -r -d ''; do
- mv "${REPLY}" "${REPLY%.1}" || die
- done < <(find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]].1' -print0)
- find "${S}/src/${EGO_PN}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
-}
-
-src_test() {
- GOPATH="${S}" unshare -m emake -C "${S}/src/${EGO_PN}" FLAGS="-v -work -x" local-test-unit || die
-}
diff --git a/app-emulation/containers-storage/containers-storage-1.15.1.ebuild b/app-emulation/containers-storage/containers-storage-1.15.1.ebuild
new file mode 100644
index 000000000000..d094e8ef9e33
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.15.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs +device-mapper test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="
+ btrfs? ( sys-fs/btrfs-progs )
+ device-mapper? ( sys-fs/lvm2:= )"
+DEPEND="${RDEPEND}
+ dev-go/go-md2man
+ test? (
+ sys-fs/btrfs-progs
+ sys-fs/lvm2
+ sys-apps/util-linux
+ )"
+RESTRICT="test"
+
+S=${WORKDIR}/${P#containers-}
+
+src_prepare() {
+ default
+
+ sed -e 's:GO111MODULE=off:GO111MODULE=on:' -i Makefile || die
+
+ [[ -f hack/btrfs_tag.sh ]] || die
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ "hack/btrfs_tag.sh" || die; }
+
+ [[ -f hack/libdm_tag.sh ]] || die
+ use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+ "hack/libdm_tag.sh" || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #678856
+ emake containers-storage docs
+}
+
+src_install() {
+ dobin "${PN}"
+ while read -r -d ''; do
+ mv "${REPLY}" "${REPLY%.1}" || die
+ done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
+ find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
+}
+
+src_test() {
+ GOPATH="${S}" unshare -m emake local-test-unit || die
+}
diff --git a/app-emulation/containers-storage/containers-storage-1.15.2.ebuild b/app-emulation/containers-storage/containers-storage-1.15.2.ebuild
new file mode 100644
index 000000000000..d094e8ef9e33
--- /dev/null
+++ b/app-emulation/containers-storage/containers-storage-1.15.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+KEYWORDS="~amd64"
+DESCRIPTION="containers/storage library"
+HOMEPAGE="https://github.com/containers/storage"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+SLOT="0"
+IUSE="btrfs +device-mapper test"
+EGO_PN="${HOMEPAGE#*//}"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RDEPEND="
+ btrfs? ( sys-fs/btrfs-progs )
+ device-mapper? ( sys-fs/lvm2:= )"
+DEPEND="${RDEPEND}
+ dev-go/go-md2man
+ test? (
+ sys-fs/btrfs-progs
+ sys-fs/lvm2
+ sys-apps/util-linux
+ )"
+RESTRICT="test"
+
+S=${WORKDIR}/${P#containers-}
+
+src_prepare() {
+ default
+
+ sed -e 's:GO111MODULE=off:GO111MODULE=on:' -i Makefile || die
+
+ [[ -f hack/btrfs_tag.sh ]] || die
+ use btrfs || { echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ "hack/btrfs_tag.sh" || die; }
+
+ [[ -f hack/libdm_tag.sh ]] || die
+ use device-mapper || { echo -e "#!/bin/sh\necho btrfs_noversion exclude_graphdriver_devicemapper" > \
+ "hack/libdm_tag.sh" || die; }
+}
+
+src_compile() {
+ export -n GOCACHE XDG_CACHE_HOME #678856
+ emake containers-storage docs
+}
+
+src_install() {
+ dobin "${PN}"
+ while read -r -d ''; do
+ mv "${REPLY}" "${REPLY%.1}" || die
+ done < <(find "${S}/docs" -name '*.[[:digit:]].1' -print0)
+ find "${S}/docs" -name '*.[[:digit:]]' -exec doman '{}' + || die
+}
+
+src_test() {
+ GOPATH="${S}" unshare -m emake local-test-unit || die
+}
diff --git a/app-emulation/cri-tools/Manifest b/app-emulation/cri-tools/Manifest
index d5bb0562fc44..11889fb2f343 100644
--- a/app-emulation/cri-tools/Manifest
+++ b/app-emulation/cri-tools/Manifest
@@ -1,9 +1,7 @@
DIST cri-tools-1.14.0.tar.gz 3647742 BLAKE2B 1a308c87e7be05dd71cf11d79c841a837156529d398f1475323ff9585f9080cd0356a007f8b8c505a02943ff479a7c26869f35288d178ac8187ca6766032c488 SHA512 c8978e4380ebb2dd59ce533ade94486ae1e4091fda7acd8cf5cce662034a1d34a1851c43bf766a723c5ba71c15972733a2e80c6e82fb1c27e5a1dfc2e85476bf
DIST cri-tools-1.15.0.tar.gz 3672568 BLAKE2B d4e9a0b2ca43efdb61c7626de518801a124fb61991f1df6a7eac106f7516ab59effa70038db7c4cbfddaf1c345c648f359c86d298dae08abb34f4b801b82b2a1 SHA512 43115fad485c2c6603e724f3529371133bcea6de069dc58d36e7880f558fa1696244b6129fe3a96fd669b27a3d9bd07bda1219e89afa348e36a85087992adf7f
-DIST cri-tools-1.16.0.tar.gz 6912563 BLAKE2B 09ceaf0ebccfdd39d7a325989447ca8c4c9e94ec0f20e8c26a5c9447d1ad6591df1c237abf130edbc84b4b1b65f81f109976d20195b3b34afca1aac460ad48e2 SHA512 c577328e11e975b15302b49082592f065be389b384cebbaa4615ef5c4ea81a4bfc88e02de6ef2749beff75ea6a27bb9d72b30af47d0f9870b297e9da53b3e25f
DIST cri-tools-1.16.1.tar.gz 6915584 BLAKE2B eb2bc397b3bbeadb64d4d13610189f18bbf49ff93be1b1f3edf504305ed1a2ca8e271d3c041f5af01117f6c7403671a29df30d7aaab270cdb7ab84ac921fa914 SHA512 df15e6f3c4fe697070547d804bfa6755f780b3f0562f06312f39d3ee8756931bbec7c07482e2ef73413d85c1e9ca58064a769a15b04b3832da17044d180e8b4c
-EBUILD cri-tools-1.14.0.ebuild 917 BLAKE2B dad3bb3fbf2e3bcb2580c323a7efa715aaf1ac143c1775ed6c724b07791c8a124b21c73ffad628dd93517d9ab1c446add7c40d948c9830a9249e26ceebdc9bc4 SHA512 6d5b4c2306e2f8e5bbe30f83186000a4ee98aad4de91d7c6907e3726cb5aa193ddf7d243355fe5920ec20a76996c0cf771a590f1a181d05d5a446f7a66a34149
-EBUILD cri-tools-1.15.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.16.0.ebuild 918 BLAKE2B 41c384e555ac261604ab5d8613b04eb5c297007b13b0463b7665598a95457060ef95a694232207f4a7c58c6f665a454248b63f26dce8d9adce6ea87c3afe88e4 SHA512 0c9c35a4c7c7483ec94ad467c092b6949bcc7c22e1fe1f2e7251de46e85db2ee5c8dd17668a435b0fedae923ed3378102363eb4601232f827167ca2044b5c7ba
-EBUILD cri-tools-1.16.1.ebuild 1127 BLAKE2B affd783a11f2d267ab8f014ea323a2e14d651213fde9c8b7d2f8f27ea3daadf220aa7e9a25bb0aa407a1cbb4f534c3ec915020fefc4ff5e82e2e72bce14f2f59 SHA512 f1a99d8265fc5b5c445b9c79c7a7e3e76a7cfce8b05ec85478859859f281f941b9dc08a0b09514248717ff38471c2c8e98d2b93c3227145eedea3d940c94ee99
-MISC metadata.xml 345 BLAKE2B a0a36cc291e52c9625d8caf20d81a06d5a94d69987a912ff9b7cc50582b06df285544ba2e050deea23628c2de34ccec9cfbb7c9beeec486733b86e54d5f73081 SHA512 bb952b4fe9687fa36406793426a8f6c922db248d75794e4f17e31b4056b10e7ce17dddb5f47eb68045babfaa9e63005cc5d408f96d52eb7c67b78b034408e7d8
+EBUILD cri-tools-1.14.0.ebuild 956 BLAKE2B 370f1b353b625c26460a5ef81227711f8657f9dcdfcf3a327e1092666720ff09fa268c3c6d00c28c9ba7f607b47793b029f25d3b0ba74320ed4dfdb2fb385c96 SHA512 9cdb18d3ad1eee6ea6fd3e39a274c5aa42647e1283ad0349ac69f3e8aebaa8a51459d1b4045942647aa651f11f677f9a2a0acdd8ab36f697bf390f1cbcb64b23
+EBUILD cri-tools-1.15.0.ebuild 957 BLAKE2B 9bc931c2ee049ffe33875a898f9f7fa56b0f7f7c61452c748f8034b4f674d397575ec3f057bbc72a269dfac259208f0b6abc8bbd869bf4db4762ec7e73b0311b SHA512 6fcc00e79b73730805708061ac05b82257fa0427d73b0d0790248f2a04bd8f6d4546f2fca881dd929a9f428a8995f484430af65aec746a35e821869d68089a6f
+EBUILD cri-tools-1.16.1.ebuild 1166 BLAKE2B b9914e8ff5d7a3620bec87aa0c05b69c2550673f5cf539c83d6316c6d7260e23e27c83ba8cdf7bddc6fe22b4d1cce0d442a3902603013b4d5e495ec7ae9ca25a SHA512 087d6b46a5925d26e6223d5a344c1063a9694f41f0657b2281662c9ed27b49fa9419da298966edd6026b01d6f1dc3c810180f0caf06224716119c6054ea881da
+MISC metadata.xml 262 BLAKE2B 49e1602cd5ee2277d0a096d29fc8cf7207ac4d650a8dc26ed2db496a854e03d72e18cd86369e4260ca207592fdecd0c9ca8bc6c3db3167d67c6dc0a9af53a5b1 SHA512 01b8c964891da9e8707b95ebe390c0e673af592c77712e811bea3783d314f148d3ce843d41ef59fcecfe0b1cefebfe47070bfee6726cb5d1f3528e143d39d85c
diff --git a/app-emulation/cri-tools/cri-tools-1.14.0.ebuild b/app-emulation/cri-tools/cri-tools-1.14.0.ebuild
index 9c6fd7ec054c..3b5003937b29 100644
--- a/app-emulation/cri-tools/cri-tools-1.14.0.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.14.0.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="amd64"
DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-emulation/cri-tools/cri-tools-1.15.0.ebuild b/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
index a298fcbf5cbf..95fe02952654 100644
--- a/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.15.0.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-emulation/cri-tools/cri-tools-1.16.0.ebuild b/app-emulation/cri-tools/cri-tools-1.16.0.ebuild
deleted file mode 100644
index a298fcbf5cbf..000000000000
--- a/app-emulation/cri-tools/cri-tools-1.16.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2018 Sony Interactive Entertainment Inc.
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes-sigs/cri-tools"
-MY_PV="v${PV/_beta/-beta.}"
-ARCHIVE_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
-HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
- GOPATH="${S}" go test -c -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/critest ${EGO_PN}/cmd/critest || die
- GOPATH="${S}" go build -v -ldflags="-X ${EGO_PN}/pkg/version.Version=${MY_PV}" -o bin/crictl ${EGO_PN}/cmd/crictl || die
-}
-
-src_install() {
- dobin bin/*
- dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/cri-tools/cri-tools-1.16.1.ebuild b/app-emulation/cri-tools/cri-tools-1.16.1.ebuild
index 2ffbd0494217..c26dd52f60db 100644
--- a/app-emulation/cri-tools/cri-tools-1.16.1.ebuild
+++ b/app-emulation/cri-tools/cri-tools-1.16.1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64"
DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
IUSE=""
diff --git a/app-emulation/cri-tools/metadata.xml b/app-emulation/cri-tools/metadata.xml
index abacd7abac65..ded6fbaced72 100644
--- a/app-emulation/cri-tools/metadata.xml
+++ b/app-emulation/cri-tools/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
</upstream>
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest
new file mode 100644
index 000000000000..100c3e16c46e
--- /dev/null
+++ b/app-emulation/crun/Manifest
@@ -0,0 +1,3 @@
+DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15
+EBUILD crun-0.10.6.ebuild 1647 BLAKE2B e4833813915f61d9a56d889e729c6577dccbd00b2ee5895c0efe0103246fcdc2816e3a64af68413924c34af03cb6df57845705e6fe9134aa4f3bd7b8eeaedda4 SHA512 d1bfa49c236ddd41d2fd0f5079e5cd79aed195e8c57138ae5594490ad08b58da6851cd41b256f71435b398380a8a558523b60e20f7c8383ada223ddad8449436
+MISC metadata.xml 1222 BLAKE2B 7130b8aef5ee4e0a6ddf3a6c1fe40e4918ba2ace244dfad9626ba743553507d3405fca2ec450107bd353f9c2b2fbd8de265f358199dd26e19306fdc662c28906 SHA512 e8f6507a4de83775a04ebf3abddf893cdbde6f82a18e86f2575cd0711fce05650421d1ebd19c35963794fde743747db1cc4ed28d3ea3a3ef2908d1d8d9db2bd5
diff --git a/app-emulation/crun/crun-0.10.6.ebuild b/app-emulation/crun/crun-0.10.6.ebuild
new file mode 100644
index 000000000000..04f20e4287a3
--- /dev/null
+++ b/app-emulation/crun/crun-0.10.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-any-r1
+
+DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C"
+HOMEPAGE="https://github.com/containers/crun"
+SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bpf +caps doc seccomp systemd static-libs"
+
+DEPEND="
+ dev-libs/yajl
+ sys-libs/libseccomp
+ caps? ( sys-libs/libcap )
+ seccomp? ( sys-libs/libseccomp )
+ systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( dev-go/go-md2man )
+"
+
+# the crun test suite is comprehensive to the extent that tests will fail
+# within a sandbox environment, due to the nature of the priveledges
+# required to create linux "containers."
+RESTRICT="test"
+
+DOCS=README.md
+
+src_configure() {
+ econf \
+ $(use_enable bpf) \
+ $(use_enable caps) \
+ $(use_enable seccomp) \
+ $(use_enable systemd) \
+ $(usex static-libs '--enabled-shared --enabled-static' '--enable-shared --disable-static' '' '')
+}
+
+src_compile() {
+ pushd libocispec || die
+ emake
+ popd || die
+ emake crun
+ if use doc ; then
+ emake crun.1
+ fi
+}
+
+src_install() {
+ pushd libocispec || die
+ emake "DESTDIR=${D}" install-exec
+ popd || die
+ emake "DESTDIR=${D}" install-exec
+ if use doc ; then
+ emake "DESTDIR=${D}" install-man
+ fi
+
+ # there is currently a bug in upstream autotooling that continues to build static libraries despite
+ # explicit configure options
+ use static-libs || find "${ED}"/usr -name '*.la' -delete
+
+ einstalldocs
+}
diff --git a/app-emulation/crun/metadata.xml b/app-emulation/crun/metadata.xml
new file mode 100644
index 000000000000..1b7e66ca64b3
--- /dev/null
+++ b/app-emulation/crun/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dan@danmolik.com</email>
+ <name>Dan Molik</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
+ While most of the tools used in the Linux containers ecosystem are written in
+ Go, crun authors believe C is a better fit for a lower level tool like a
+ container runtime. runc; the most used implementation of the OCI runtime specs
+ written in Go, re-execs itself and use a module written in C for setting up
+ the environment before the container process starts.
+
+ crun aims to be also usable as a library that can be easily included in
+ programs without requiring an external process for managing OCI containers.
+ </longdescription>
+ <upstream>
+ <changelog>https://github.com/containers/crun/releases</changelog>
+ <remote-id type="github">containers/crun</remote-id>
+ </upstream>
+ <use>
+ <flag name="bpf">Enable in Kernel, eBPF (enhanced Berkley Packet Filter)
+ support for managing device controllers.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index e54f64d478a0..d810518e81be 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,8 @@
-DIST diskimage-builder-2.28.2.tar.gz 424565 BLAKE2B 77bad24f857de7fb17cb727f7f5168f86434e4cfeecef286da5b3351e9fdfeb0d1dc2472f800024a35adb40aa04155bb7cfa3a0772ed8186a21b31b582809312 SHA512 0bdce552a896834c97f2a982865a93f39f62d0ee68d001c60d320e831c25456a392b4510ed94d7123851dad262e5ccb38a541d0dda5d620f91cf9ab54776efaa
DIST diskimage-builder-2.29.1.tar.gz 426780 BLAKE2B cd5b9c2cce5c289ef7f76ad41bf4b51ba6319c782be91b97a82d828c177912696ce6f94774d7294aca0d4af401d4d4e0ddd5fdd6d799e4e560ab03f971498b03 SHA512 cb083024739486c7651ce97ab36a30461754aae226af23b2ce757eca7c71e0fec42af07b8973f9c8344012238c4ae9d6252189ce6288d6451e020302f2dc35bf
-EBUILD diskimage-builder-2.28.2.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
-EBUILD diskimage-builder-2.29.1.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+DIST diskimage-builder-2.30.0.tar.gz 428448 BLAKE2B 4cb4c47c07885713f160a958aa2d80d57b9ae496961bce976beddab59f0760abadaaccc1db8c4f29458dd8f247d7d5c21164a34ef91a4d4b48212f1fa612dadd SHA512 4ed6e745b1184c0462ce0500fa5e5dc8754a7185b76a6b5963c5ca9e20ca0bce7f2a5166b4472ca69498cc5f00e8a6e7ae17fd3794e830679e4f3a22e74956c7
+DIST diskimage-builder-2.32.0.tar.gz 435328 BLAKE2B 78f306430819d94045e3b8c424cdf7a0fee9a306a317e44cd363d53bbbcd1af1f06731b83b63e490bb8ad3903630daf84a544878b87d6c7f377786778229f276 SHA512 357b56aba979cabd7a857d6646412893361c05a83e4260d1ef468de1d6fb0fbc2582ab8bf37428c56a52fafcf708b86be470f2c885008b10368bc92a2b679a09
+EBUILD diskimage-builder-2.29.1.ebuild 1278 BLAKE2B 8a763c66fa85499b81a5f74315a87bb38573a5c03675d9201ebe22fc803db75bf84d5828dbbbb5008ea746da8a9a8340cee2e8dee7aadab91d4edf0f32c2d90f SHA512 9bfc9661ad8b4c27b32a9c15653bed831abd1d8a7923bf9c0468c8d3a2e8f5acf48d783689c20ac90f834344ee629a0d6525f43e19e68bbfe3044bcf219dbe37
+EBUILD diskimage-builder-2.30.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
+EBUILD diskimage-builder-2.32.0.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
EBUILD diskimage-builder-9999.ebuild 1280 BLAKE2B 82d085c4c67d556895ab02cee213e7914b08e2934907f4049308b3f2b1198e86661e9efe5621d3412a17a69543bef4e8fa90996bafecc648bf3231380b69ed52 SHA512 49f99b2bb3855d69595eb309675956ffc0a174f9f387eb1b508dcc6e1dcd0276db92355445f4f5604dd26f9bd93d56b0bd1cba78f0c475ae76aa71981d9b6f6a
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
index 86d3bb124b34..20cf3dfed3ae 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.29.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild
index 20cf3dfed3ae..86d3bb124b34 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-2.28.2.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.30.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
new file mode 100644
index 000000000000..86d3bb124b34
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.32.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_6 python3_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/networkx-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+ <dev-python/flake8-2.6.0[${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-compose/Manifest b/app-emulation/docker-compose/Manifest
index 6eade4287c94..45705a67769e 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,6 +1,9 @@
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
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
-EBUILD docker-compose-1.24.0.ebuild 2234 BLAKE2B 2b94a3071586d66a1e1ca477bbcc4d19f13f43446095df12fdc82148bfb246207e7017607fb010ad4edc5f2a15d04687c742b970888f22b396abdfc82b41732e SHA512 0099f3002d87799e0a678591078f29d67dd7545207763b170f168b5b8aed282daaba470dc802393142fb9b5185ba49dcee1d67440fef73a4afddf73b4df59d60
-EBUILD docker-compose-1.24.1.ebuild 2235 BLAKE2B 04f88a55d885551f875c3e572dcf77df389673ef64170f051e8827b0a6de499f2503e0eb199bdc1eb4623472c170090c806c0c53d769ef886f1f6edf90ac6043 SHA512 fa02d983aa04adf0b4f832fa68fd0ad0f0cd23bfeec5a4a852f8efcf946f59650c71fda4f080faeae8c89102654c9f9e5d3e62955a09cd19d1a4168cbb2ae5d2
+DIST docker-compose-1.25.0.tar.gz 320048 BLAKE2B a0615c9d81f897f551d664799e2a7cd4d72c3e0b70ceb0ff9bfb533a81799d2d524824ead27bff2391c5e98fc34430fb2ba724bba663ece66417ac72181241f0 SHA512 38be153a8ba1bf1a4a5c63dc794db3344c93c0819fba0c38feb791067e0aa72142205e4255b5fd31bf2f8159dfa04cde09fdcdabe0511bc0e2865974dff5433d
+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
MISC metadata.xml 326 BLAKE2B 264e99e7fdc551ca2a29d4295d21fb587cb1eeb0bf995b9df63e63015b01b22a51db9254b3a6cb3eb76b8a4eb9e8bf3a1a4c6a936212690fa996e7edf20167dd SHA512 0c50efc71462eb8b312b5bab5b5de85450478f3b7a548c7f3725a4be5514078fb125305f277d14b5fa082027c805171e640367b6094668c05660d426c65043fc
diff --git a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
index aacd6aa050a4..231ec1bd9f17 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.0.ebuild
@@ -15,6 +15,7 @@ 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}]
diff --git a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
index a9866c0a92e6..12ac42d6a193 100644
--- a/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.24.1.ebuild
@@ -15,6 +15,7 @@ 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}]
diff --git a/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
new file mode 100644
index 000000000000..a6f8868eab7b
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.25.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2018-2019 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/${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/pyyaml-5.1[${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.0-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.0-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
new file mode 100644
index 000000000000..a56ad638198b
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.25.0-setup-py.patch
@@ -0,0 +1,71 @@
+From bd58c42fd01829e0dbf475179710e5465655f4b1 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 18 Nov 2019 23:34:51 +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 23ae08a..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, < 5',
+- '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.23.0
+
diff --git a/app-emulation/docker-machine-kvm/Manifest b/app-emulation/docker-machine-kvm/Manifest
index 627efdd40cc1..d0bd43c7dea8 100644
--- a/app-emulation/docker-machine-kvm/Manifest
+++ b/app-emulation/docker-machine-kvm/Manifest
@@ -1,5 +1,5 @@
DIST docker-machine-kvm-0.10.0.tar.gz 12183 BLAKE2B cfc1c8286d23e7bdd3f98c542da5f9507dafd99aa37361265ac2774b910e5c900dca94cc0ac0f827715a390aea09762fd25423fe6e587990c667eda2af6935cf SHA512 d4725531e43814ae2b8c3826ad695cc853177d09aeae9c97aa24b5c0de8732bdef67b12f7218244cf44cdd589bb9878058e587c946e13481ba57cb418c535e9e
DIST github.com-docker-machine-v0.10.0.tar.gz 1605832 BLAKE2B d53e3dcd43af3ea9d1dd764ae5a409e1d4339576c35365e7e06a28f4e37ace3998fb8c909a0af8ed7fbfcead7dcde1a4e71d3b78b601a65e59aaa13256199cf7 SHA512 337ed74474b5e55e10ccd7c8bb3b778d06fc2c56c1646678715548ddeb41a0b7320212d498ad96cbdd08137f78013506b569c4e0aa0a2f28169264d64d814f7c
DIST github.com-libvirt-libvirt-go-c3209e4ba8b8dda65c85ca0ac04302e55895caf7.tar.gz 100068 BLAKE2B f57c460c6f833d77ea74908bbd0c72b0982b2ce24e47e68e1e509a526b1ba20f224c2492e1fd715431b13696b4110ba404f12b8bbc45deb5911438ce0b2bc6b6 SHA512 7ac5964349c90ac45f627f9c714b04c3ff07428ca2ef7edb1bd173cb7264040ddb49f9df57249a7dbc5f3500c7e1b4011b40faf4b8104f1ef56a1833cb020ab3
-EBUILD docker-machine-kvm-0.10.0.ebuild 974 BLAKE2B 4e41ec99e86481b54149a947b9ff764bbb0e6cf2774a0720880e4cf400fe99c4d3112cf484f7e11cf3ca77c65f20c79c9fc07c14705fa69f39306997b37463c4 SHA512 0e2ae335583e2510c5e9505e0ff6c92f66169042c87570ff24d8c3c51f48863209dc3b8d02749990fc6b73a02f69450eb48ba65235bbad0ca92ab8e83def769a
+EBUILD docker-machine-kvm-0.10.0.ebuild 967 BLAKE2B c51d97aae4b03c60d9d6e0fa54984b0bc6dc4d85fe9a25d88cab49e680c9062b6dad753a6f47dd58ce48794649ff306d50f1b4d2dba8774e198e3956ea42b732 SHA512 929b7010202a40481145e3e69c88121bcf915acaa8b8f9b4133f652a13e6ba2f57d1c94a07354dd275788965a43db025dddbb41babbf026b06245de5f720bb3b
MISC metadata.xml 310 BLAKE2B 4c96bb6f52227dc4839bf6e2f2142940d9840f15bed831a544f1cfab38489ac849ffc52cbda4b70fc95553629d2ed68c5ba6d8f9e7bdc12c03f04425fc19c264 SHA512 c300a073141c91ad01121660ed2aeb85deaac9308b6296fe261a6e9a5b24e676bfd25b7a52289e3e39b2b1885518eb4fd422c8da6ba77dfdfc68272922b06d66
diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
index 509420dad7c1..20d5054f6d83 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
src_compile() {
export GOPATH=${S}
cd "${S}"/src/${EGO_PN}/cmd/${PN/kvm/driver-kvm} || die
- emake build || die
+ emake build
}
src_install() {
diff --git a/app-emulation/docker-machine/Manifest b/app-emulation/docker-machine/Manifest
index 16acf2df5321..15d6731de981 100644
--- a/app-emulation/docker-machine/Manifest
+++ b/app-emulation/docker-machine/Manifest
@@ -1,3 +1,3 @@
DIST docker-machine-0.13.0.tar.gz 1730091 BLAKE2B 9268f55c1b2a630043be7875d6ab72eced67e5e5618c95666e9c31a4180b40bf770782405b4ecdc141c50398ace0de882a60922fcfb8068a498eb81f0e614da3 SHA512 c31b3505e475f5e55310cc3b8805db8b94522703956a640954c3898c584fc3a07830c346535855cbb2fb10016dd0e7ef72e7174e919a3651f05e18b652132121
-EBUILD docker-machine-0.13.0.ebuild 945 BLAKE2B 5388fcb415b576d0ab0b67588cce1ff70b9c26a594c61f311028571682d0bd0272b5d8cc2279257f8317c2efc5fdf79eec62341642b9fca597c4dfea04156737 SHA512 c88f5a68bb84d6abd1617f6f536a51f83e2b2781d8fd6f6604d43b29dc1b43c7ec9a86bbb05e54cad33e86db851eac36acafc47ad9be2494335db329fd6ee64d
+EBUILD docker-machine-0.13.0.ebuild 938 BLAKE2B 593249c592ba1af3dc9e85f1a69c11bfaede7df07e4717f052d1084660a8b608f65e765a4f2f887c7864c48fe97484dd26e2fdbccfc1a65a897f0f38234c2cfd SHA512 1120915aa310052d0e8a94ede302a341e9fb36ed1025a3074930cf7398985127c6d8ea0b129d4d0ed7f84a162f2470c8bfc993deec8e4c71202cb7e45b88ad68
MISC metadata.xml 305 BLAKE2B fa9558f67aa76f286e47eee66a77ecb8b2affbda16e67d2405423196bd73577681eb923d3786656d6dee73af3c34113e52e9a205793c28d27e855152729042fd SHA512 9d29b2f3f29ec6838395364bd85b38f0e54fc3a89f79041d5ddd492ef999018cff92e5ef6e6bcb5bc32cd7f57059531d10fd3ac5a5481da1fb1218081916a8bc
diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
index 974d8a443e7f..1cfa0ea229cc 100644
--- a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
}
src_compile() {
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die
+ CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build
}
src_install() {
diff --git a/app-emulation/docker-proxy/Manifest b/app-emulation/docker-proxy/Manifest
index a3dec19a5956..35837e9e01fb 100644
--- a/app-emulation/docker-proxy/Manifest
+++ b/app-emulation/docker-proxy/Manifest
@@ -5,5 +5,5 @@ DIST docker-proxy-0.8.0_p20191011.tar.gz 3377526 BLAKE2B 10dd1817ffa65dc75855dab
EBUILD docker-proxy-0.8.0_p20190513.ebuild 780 BLAKE2B 46a02fb28634760b3fb4b048eee895b152f53fde4f501df7896966bf7e8290d2438c61a0545a2c9782fb2b7bb308a1040c493b8f180991b05a581eda747d7d02 SHA512 bd52763fab7f7b59361e6acdd2249209e72bae8cc50542f0dfa3ea8010a65cc8ebee33c4bb5891a59840d35988048c6a8a3bafc82f6c735f01860a66c066ed95
EBUILD docker-proxy-0.8.0_p20190604.ebuild 770 BLAKE2B b89a0056ae26fa7e122bbf72b9a6b7688e44de38f1c6173d4c80641e4c1a98bb403349863fa16f05aedc30b658836748e85b28018a79f6345baa76dc5ea6536c SHA512 77d3f27c7beb8c2208774d81954f5b699ab685a0e6aa5d39d973be74050128fda2c753790c06976aebc2aa4e8f842d7df2bcebba897424d6b09ef3841fc93257
EBUILD docker-proxy-0.8.0_p20190807.ebuild 770 BLAKE2B 8a90022b2b412cc1e0d389b55e84bfac47c3d3965c5b0a1817b0b68acd9f2e446fe458e8c69aa1136f5c965f9b586b33251213aaca6fee5a1d3af64d3f374f39 SHA512 6b634b77da647e181ed5ba4d546919cc8dc068ddc6055fd7ebddba099b3f938b47aa862af3c2946c9221f20befadc626b05e86bb6417904c986e9fc61893b03e
-EBUILD docker-proxy-0.8.0_p20191011.ebuild 770 BLAKE2B 39d3de91ff99d885b952c9ce9c06a7d7c0e0805c814213a403ff05594e9600d7a0eafed0a0b8775ae44f4729dd6ce48ef122f64cfbbc70d64d0806593941cd46 SHA512 61c4b7115ea20f509e03d041f757b4cfd56689af6d8d06e1fcac684faf4d6b7cd823ec5c5c2e06d765a327adc237d6e09107c085e61cb636bf94ede813ef2830
-MISC metadata.xml 543 BLAKE2B 69df333c0432bae7b2211dfa93683e3aee83fd63283fd7e34e0917e3292bd5d8947580fe7977fbc6f5d60fa0ca2d7902416bf4b878e27cbf2cf3413abacd18d6 SHA512 8580076d68f5803bc66fb9cdc088d13be2610ce1f200e614efcdabe75cfbeae5b72bcc4d043ce18844b4774f18e7861c3b6c788fa294c29e856bbcdd091677f6
+EBUILD docker-proxy-0.8.0_p20191011.ebuild 769 BLAKE2B bd3349ee70d2fd788ff85fce12641243bdc9358f0b391182fe320b1906f13ca616e8cd6bbdb230a7d86f356aad62a751c3831b9f1229b7b351750d31065f14f8 SHA512 45e781542fce429a2eee2d8cc4c0029344afb7ae94466cbe3b8d641168a980e3812da44d7b74090ddd9daeec4fd4fd58b26e83fe40f41a408e0ab49f51c50fe7
+MISC metadata.xml 437 BLAKE2B e1e8e4680a6932366f93a597fbaa002026990819ee646be0c2590c7fb2bbf3975a4a828271ba0281c43815354de1b371b29cc7fd691d7dcd0838539f1e02fa45 SHA512 c1f8a89b90f7fa05cf838a6aaafbbd12a3193e3e91f7802ed9c24b177cb7fea4a067892821ce50d2efd4af0369a3196f329978f2c37608f6140b29f662ca74ce
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
index dbfc6c6a965b..7fb0f4d07d63 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20191011.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]]; then
else
EGIT_COMMIT="3eb39382bfa6a3c42f83674ab080ae13b0e34e5d"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
inherit golang-vcs-snapshot
fi
diff --git a/app-emulation/docker-proxy/metadata.xml b/app-emulation/docker-proxy/metadata.xml
index 8b8b32d1ade1..f40cbc947f07 100644
--- a/app-emulation/docker-proxy/metadata.xml
+++ b/app-emulation/docker-proxy/metadata.xml
@@ -6,10 +6,6 @@
<name>Tianon</name>
</maintainer>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
- <maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 261adfe93f60..c1aeb9365159 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,9 +1,7 @@
DIST docker-18.09.9.tar.gz 15299640 BLAKE2B 2a4fa670ddac0136e85300fd137a8ea91651c51c54fa3d52ddc5b1a640a1ee202a34f428fcf9eea286c581f49a2c28b711100e7541773e5bc1f2e37884cae2dc SHA512 d0235ae54e4d8d4d0893f6f35293f36177afabc71d0b3e6a74341260e52dcd9351a924efe8fa299cf9a51efdc68b6b284f6435d7210c44193a673f7fff71ce0b
-DIST docker-19.03.2.tar.gz 16657356 BLAKE2B 3e48ea67f1ef65786c30b4d47b29dbe92d7fb7b043d2c4f15c07cdc929554a07870ce5ade2c1fe26eebea74d28dc71752e9c96e86fe12e0d96608059b5c91f11 SHA512 6b594fdbb53dcc0228781375a3884eb370446738c44f7c1e42945c4ccc263e75f53d984bc8ea6a6a498446859e667305bd967299c12956f1cb925d868a4bf2b8
-DIST docker-19.03.3.tar.gz 16960782 BLAKE2B 8ce23ca22edf7c4435dbaca5a0321de52b108951b935d5ed82439c57409757cd054698934f9dbabbbbb0db74d5c9f6a6d04c5ca33e64212dedc0c9bf92d06ddb SHA512 251756ca8b5d8eb962fde447fdab8307ce8013e14dc3b955387af5d8bdfdee16ea170ecb37a59e5900fa5c2e366f0d4080e79c28e5b8ef945cc67cb959d88eef
DIST docker-19.03.4.tar.gz 16961040 BLAKE2B 15d88d6f97ff70f6a0220f3d62b2040b4d859414b323b07e54802cb8e8dbb8d074562635bbfd9d00df529d0792fb5767d28548843ec73ad21cf7d7fcb1ac0c6e SHA512 bcf79f82eb8433b8c04ceb2fd90a80101b148dd819f5bbda83d535ff2fad65d08aee2f72ac41c38ce879f3970a087555bb7ab63c5bb071a3c1cd6aa177621cac
-EBUILD docker-18.09.9.ebuild 8354 BLAKE2B 5e0ab831398f7c54025bb0d03001c13625758dfb3988e0828ad2b5cda246aa55ac4536396df8c62c14b7df353e32709d2306b50220d0b9f00c2ae32ad40b24c6 SHA512 62d3bfd28f0b4feb9846fc6befe15d2b926801a7b7015784b9ca7435874a3d974c85f3ec000b1ad8dde40141ed42de5dca5e2630db7028cfeec3ad662802a437
-EBUILD docker-19.03.2.ebuild 8355 BLAKE2B 5d2b42bfae72f37eccbeb127643f2757c2379fe1b5709aa9c3cd27e194835bfe059ee6e5bd2f9617d80222cd2ae659b1efb73cf3f9669de8042d5afe467b6a62 SHA512 c6d1c6bd79e51e728b38bbc6505020cdd650525edfb961c192fd5dd99a51962e6c3e6f1f5b1d7462a4f6ea8dd318e46b172410a8f432fc2bfdaeab7943e1b141
-EBUILD docker-19.03.3.ebuild 8358 BLAKE2B e3341a43f8d8f049ce5a2d47076ac612a15e68317b05274277dca827d3fd174f0ca2e5fabcacd08d80d4784668c41700b9cc0f8992590189d91a527e2bb26809 SHA512 f07974b7fac5f9563df351ca07519383edb1f877d56872621f27ae22b8d0e0a51548040fff7f3081c79b4cc3aecb375bd88842d5080b4136f9e4ed0595398721
-EBUILD docker-19.03.4.ebuild 8358 BLAKE2B 71fe7c49bd11c46b50860112f8b0437da38119c8fd3c185c218b783cbb360660c1268632cded26d3769697dd6b98729e25da0889826656e02a5751efc250dad3 SHA512 c5670282d4401bf2cf2a2685f88d14fb06e36b8dcf99f877d87915d902fe390abbab926c60ceca3b46bd332a98647b03eeaf05d7ea1976e2cec2d72bf44b072c
+DIST docker-19.03.5.tar.gz 16966994 BLAKE2B 7326ba17c0eef7bcebb5df1484992a30f696d2f238d149dbaf964004b725badfc1e9c85ed3ba76ac95b566cda9cb7018fe4fa7d282af1d1e36f4765e1445f25b SHA512 1afe41e740ae0e32a8210aac3c4b24ddb1ae00ff19e8ec435de2e61cfc25494d38129fd619bacf964e3e7a96e12dd44a0c57f6e2c36aa7c3bb67a3df0c237648
+EBUILD docker-18.09.9.ebuild 8347 BLAKE2B 40c70112dedb5bf1aad1d5898638164feb847ca523eb192bfb46f34400ac41042af67cc3d28ffc1b4f01b0c20d125f1d3f7f5d7bfdabf67ef441e0e4ae88ecb8 SHA512 210af162fea9a846dc78833bc35938ecb04d3fe1041cd64a423a914d3889bf993c69454844045b4ee3550a8ac6561185258483450c188e77561eae6de1368fa1
+EBUILD docker-19.03.4.ebuild 8351 BLAKE2B 8d3c4ab035f499676bc49328ced7168514ea5c5c8c85b6df18aeb8d366f40adbc1b5e175a947abab24eeaa60badee0f6661a5565c7f517726d8f92d232172fcf SHA512 4f3cb33347115ee6c7b41b1a606d8ead3367f4e42adcf9fe7cc3f5c0ffe90b9c05bc367b652249ce4e1f98926247a8378118c469f40033b8c4d2856cdbabfc91
+EBUILD docker-19.03.5.ebuild 8350 BLAKE2B d157e7367db6d229f0d17028f3f37e7502405c3193dc7cee983778e74d530cd4acafa2165cda8ba0a6dd5d45588322bcdb6090c2c8e4c67eca62016700abc7dd SHA512 30fe24c1b97d146d2d6d8f31b8387020036c0a21d4649fc46d4cb3116b60be8d6526baf9c4f69674aeaf782d7bdfafe7c3dac31bdc180a23d8cdfdcc8fcfb9b0
MISC metadata.xml 1576 BLAKE2B 7a378d4abcda0352c4c96108a238d693e9104a1de624f8fb4e808bfbf5ad4960c1f6155b1f6c78ff2bc6609653285e911e7eae9f319696e39c60b63e5127ef11 SHA512 9944178c2202c12bc7364f9722e70b71583bfc60a318348060d0ee8ba713c892259da46c222ce7fea4b1294be8b01b7d1b359976931e287f574733b65403e762
diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild
index 86284c9e3965..966a693d1a49 100644
--- a/app-emulation/docker/docker-18.09.9.ebuild
+++ b/app-emulation/docker/docker-18.09.9.ebuild
@@ -235,7 +235,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.2.ebuild b/app-emulation/docker/docker-19.03.2.ebuild
deleted file mode 100644
index c501202e523f..000000000000
--- a/app-emulation/docker/docker-19.03.2.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/docker/docker-ce"
-
-if [[ ${PV} = *9999* ]]; then
- # Docker cannot be fetched via "go get", thanks to autogenerated code
- EGIT_REPO_URI="https://${EGO_PN}.git"
- EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
- inherit git-r3
-else
- DOCKER_GITCOMMIT="6a30dfc"
- MY_PV=${PV/_/-}
- SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64"
- [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
- inherit golang-vcs-snapshot
-fi
-inherit bash-completion-r1 golang-base linux-info systemd udev user
-
-DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
-HOMEPAGE="https://dockerproject.org"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor aufs btrfs +container-init device-mapper hardened +overlay seccomp"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-CDEPEND="
- >=dev-db/sqlite-3.7.9:3
- device-mapper? (
- >=sys-fs/lvm2-2.02.89[thin]
- )
- seccomp? ( >=sys-libs/libseccomp-2.2.1 )
- apparmor? ( sys-libs/libapparmor )
-"
-
-DEPEND="
- ${CDEPEND}
-
- dev-go/go-md2man
-
- btrfs? (
- >=sys-fs/btrfs-progs-3.16.1
- )
-"
-
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
-RDEPEND="
- ${CDEPEND}
- >=net-firewall/iptables-1.4
- sys-process/procps
- >=dev-vcs/git-1.7
- >=app-arch/xz-utils-4.9
- dev-libs/libltdl
- ~app-emulation/containerd-1.2.6
- ~app-emulation/runc-1.0.0_rc8[apparmor?,seccomp?]
- ~app-emulation/docker-proxy-0.8.0_p20190604
- container-init? ( >=sys-process/tini-0.18.0[static] )
-"
-
-RESTRICT="installsources strip"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-# see "contrib/check-config.sh" from upstream's sources
-CONFIG_CHECK="
- ~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
- ~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
- ~KEYS
- ~VETH ~BRIDGE ~BRIDGE_NETFILTER
- ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
- ~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK ~NETFILTER_XT_MATCH_IPVS
- ~IP_NF_NAT ~NF_NAT ~NF_NAT_NEEDED
- ~POSIX_MQUEUE
-
- ~USER_NS
- ~SECCOMP
- ~CGROUP_PIDS
- ~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
-
- ~BLK_CGROUP ~BLK_DEV_THROTTLING
- ~CGROUP_PERF
- ~CGROUP_HUGETLB
- ~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
- ~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
-
- ~VXLAN
- ~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH ~XFRM_ALGO ~XFRM_USER
- ~IPVLAN
- ~MACVLAN ~DUMMY
-"
-
-ERROR_KEYS="CONFIG_KEYS: is mandatory"
-ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
-ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
-
-ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
-ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
-ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
-ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
-ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
-ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
-
-pkg_setup() {
- if kernel_is lt 3 10; then
- ewarn ""
- ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
- ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
- fi
-
- if kernel_is le 3 18; then
- CONFIG_CHECK+="
- ~RESOURCE_COUNTERS
- "
- fi
-
- if kernel_is le 3 13; then
- CONFIG_CHECK+="
- ~NETPRIO_CGROUP
- "
- else
- CONFIG_CHECK+="
- ~CGROUP_NET_PRIO
- "
- fi
-
- if kernel_is lt 4 5; then
- CONFIG_CHECK+="
- ~MEMCG_KMEM
- "
- ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
- fi
-
- if kernel_is lt 4 7; then
- CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES
- "
- fi
-
- if kernel_is lt 5 1; then
- CONFIG_CHECK+="
- ~NF_NAT_IPV4
- ~IOSCHED_CFQ
- ~CFQ_GROUP_IOSCHED
- "
- fi
-
- if use aufs; then
- CONFIG_CHECK+="
- ~AUFS_FS
- ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
- fi
-
- if use btrfs; then
- CONFIG_CHECK+="
- ~BTRFS_FS
- ~BTRFS_FS_POSIX_ACL
- "
- fi
-
- if use device-mapper; then
- CONFIG_CHECK+="
- ~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
- "
- fi
-
- if use overlay; then
- CONFIG_CHECK+="
- ~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
- "
- fi
-
- linux-info_pkg_setup
-
- # create docker group for the code checking for it in /etc/group
- enewgroup docker
-}
-
-src_compile() {
- export GOPATH="${WORKDIR}/${P}"
-
- # setup CFLAGS and LDFLAGS for separate build target
- # see https://github.com/tianon/docker-overlay/pull/10
- export CGO_CFLAGS="-I${ROOT}/usr/include"
- export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
- # if we're building from a tarball, we need the GITCOMMIT value
- [ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
-
- # fake golang layout
- ln -s docker-ce/components/engine ../docker || die
- ln -s docker-ce/components/cli ../cli || die
-
- # let's set up some optional features :)
- export DOCKER_BUILDTAGS=''
- for gd in aufs btrfs device-mapper overlay; do
- if ! use $gd; then
- DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
- fi
- done
-
- for tag in apparmor seccomp; do
- if use $tag; then
- DOCKER_BUILDTAGS+=" $tag"
- fi
- done
-
- pushd components/engine || die
-
- if use hardened; then
- sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
- grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
- sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
- -i hack/make/dynbinary-daemon || die
- grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
- fi
-
- # build daemon
- VERSION="$(cat ../../VERSION)" \
- ./hack/make.sh dynbinary || die 'dynbinary failed'
-
- popd || die # components/engine
-
- pushd components/cli || die
-
- # build cli
- emake \
- LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
- VERSION="$(cat ../../VERSION)" \
- GITCOMMIT="${DOCKER_GITCOMMIT}" \
- DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
-
- # build man pages
- go build -o gen-manpages github.com/docker/cli/man || die
- ./gen-manpages --root . --target ./man/man1 || die
- ./man/md2man-all.sh -q || die
- rm gen-manpages || die
- # see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
-
- popd || die # components/cli
-}
-
-src_install() {
- dosym containerd /usr/bin/docker-containerd
- dosym containerd-shim /usr/bin/docker-containerd-shim
- dosym runc /usr/bin/docker-runc
- use container-init && dosym tini /usr/bin/docker-init
-
- pushd components/engine || die
- newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
-
- newinitd contrib/init/openrc/docker.initd docker
- newconfd contrib/init/openrc/docker.confd docker
-
- systemd_dounit contrib/init/systemd/docker.{service,socket}
-
- udev_dorules contrib/udev/*.rules
-
- dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
- dodoc -r docs/*
-
- insinto /usr/share/vim/vimfiles
- doins -r contrib/syntax/vim/ftdetect
- doins -r contrib/syntax/vim/syntax
-
- # note: intentionally not using "doins" so that we preserve +x bits
- dodir /usr/share/${PN}/contrib
- cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
- popd || die # components/engine
-
- pushd components/cli || die
-
- newbin build/docker-* docker
-
- doman man/man*/*
-
- dobashcomp contrib/completion/bash/*
- insinto /usr/share/fish/vendor_completions.d/
- doins contrib/completion/fish/docker.fish
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/_*
- popd || die # components/cli
-}
-
-pkg_postinst() {
- udev_reload
-
- elog
- elog "To use Docker, the Docker daemon must be running as root. To automatically"
- elog "start the Docker daemon at boot, add Docker to the default runlevel:"
- elog " rc-update add docker default"
- elog "Similarly for systemd:"
- elog " systemctl enable docker.service"
- elog
- elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
- elog " usermod -aG docker youruser"
- elog
-
- elog " Devicemapper storage driver has been deprecated"
- elog " It will be removed in a future release"
-}
diff --git a/app-emulation/docker/docker-19.03.4.ebuild b/app-emulation/docker/docker-19.03.4.ebuild
index 8d52724b145c..af88214fce00 100644
--- a/app-emulation/docker/docker-19.03.4.ebuild
+++ b/app-emulation/docker/docker-19.03.4.ebuild
@@ -236,7 +236,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/docker/docker-19.03.3.ebuild b/app-emulation/docker/docker-19.03.5.ebuild
index 1cbb014cfdde..e6fb4da81b09 100644
--- a/app-emulation/docker/docker-19.03.3.ebuild
+++ b/app-emulation/docker/docker-19.03.5.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} = *9999* ]]; then
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
inherit git-r3
else
- DOCKER_GITCOMMIT="1576bd7"
+ DOCKER_GITCOMMIT="633a0ea"
MY_PV=${PV/_/-}
SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64"
+ KEYWORDS="amd64 ~arm ~arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
inherit golang-vcs-snapshot
fi
@@ -58,7 +58,7 @@ RDEPEND="
dev-libs/libltdl
~app-emulation/containerd-1.2.10
~app-emulation/runc-1.0.0_rc9[apparmor?,seccomp?]
- ~app-emulation/docker-proxy-0.8.0_p20190807
+ ~app-emulation/docker-proxy-0.8.0_p20191011
container-init? ( >=sys-process/tini-0.18.0[static] )
"
@@ -236,7 +236,7 @@ src_compile() {
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
- dynbinary || die
+ dynbinary
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
diff --git a/app-emulation/dynamips/Manifest b/app-emulation/dynamips/Manifest
index 8a69ecc22b14..df4681bc6eb5 100644
--- a/app-emulation/dynamips/Manifest
+++ b/app-emulation/dynamips/Manifest
@@ -1,4 +1,6 @@
AUX dynamips-0.2.18-docs.patch 533 BLAKE2B 765024fa4246c5efc576c91619d7c01c00b67cb6eddd3086b1670ea4f89e000dab6680e38cdbd384d9850477a682f42070d9a74c59ffea0a1a1f8d095703e625 SHA512 293059e7f4fc848362e5d6c881386bea9fcf616117d2723a216e510cbc23372f40a6d757f84bcdb429b5eb61f74e99d334e7507c2161c4d28ccb973c14aa7893
DIST dynamips-0.2.18.tar.gz 833554 BLAKE2B 8152b436e8fc43061c5603a44ceae8feebdd4593649d2fb6a1814ca22cfce2f671f6f98df5f03ee6eeef10cf09fc444d406edd8d3b4a6037a89cf0e8301774ac SHA512 d66e32d72ecc9ebff5232377ac9aa5b966ceb08884cc7f8dc4a8cf3f56305e7cefd677624ba66278f6603a3b275c384bd0ff3905932461b1f8056106cd272a4c
+DIST dynamips-0.2.21.tar.gz 833863 BLAKE2B a3162de26839a4c99fd1f147fe0a12e04f4b225b6539aa1599550c40c6a9e21deed950b47f7afbbc1cfbe2f61a351a4185a18f56c4b63c191eccc7122e2c0115 SHA512 c7251963897b65ed5696f47f03be727cea79fe2245850c86fa6b4d8718afa10002b1e39bccefe1c7f2ba86fe6b8f52fe8663ee34f72ca3d9f846522b9b9b4d29
EBUILD dynamips-0.2.18.ebuild 821 BLAKE2B 86ec42ec88cbbca52f6f50d9b703ad366452b730cf165714bcaf3a5a135c49872220e8fa6cc61b4d0ba0ce824fd0a100795a2f0493715e6080db1ec12ecce375 SHA512 a2a7ca16bb46b48ec1ef4e50bfabb0c6c420bb0baa43289dfeb83c11680f6a7f14be5957dcdedb8e48248192a8a054edeafb0a42135921d09168e9884b1248c0
-MISC metadata.xml 322 BLAKE2B 6c1fdcec350e68782be9e9e4dff8c9c0a71e05ffba537772dc86d0843b57d58ac2993e361daf84f3e3a8d4f1d25d5f841efbcc6a02e545ec0af1d3cc69155b37 SHA512 cfb689b938923b74a3ba4b7101da915c2e9a4f96f23e26d7a3baf69d1593cd8c063ee76911d90104f7cce91c5df98defbacc35e6526aef0e66af575125bd6fbc
+EBUILD dynamips-0.2.21.ebuild 835 BLAKE2B 523bbd9cf0edacd2993cfc30aefef3e86386545a9b6fad62ac038ec8ec0079be1144e4a4ba49c6599aaa5c6174a0f6a8f101327553eae93ea4287f109b3ce5a1 SHA512 9ebeac76aac14954daf3e01122aab5012ac81685c5b1d472df5bed6a3e35c0d9832128098ac531e3acdec9c5bc4be640d8c1bfd4366202f7ef12db807378d9aa
+MISC metadata.xml 375 BLAKE2B a7dbd13035f1fe8d48565d2bebe923992d8d8f8eac145a504ca13e416a30af978b836d29a58b0d80fb63190b6ebf511f3f6f8eba42aded724c5c6a1c61ee97c4 SHA512 e3917a92fba07b5e811a27425504ecb1c9a460ef9882fb9041cc5aa0a5fa5fc448f3906f431d7b8ac8bba134e6c0f669bf404872db8d6ef74a862e22149e90d2
diff --git a/app-emulation/dynamips/dynamips-0.2.21.ebuild b/app-emulation/dynamips/dynamips-0.2.21.ebuild
new file mode 100644
index 000000000000..21b04e6456e7
--- /dev/null
+++ b/app-emulation/dynamips/dynamips-0.2.21.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Cisco 7200/3600 Simulator"
+HOMEPAGE="https://github.com/GNS3/dynamips"
+SRC_URI="https://github.com/GNS3/dynamips/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ipv6"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="dev-libs/elfutils
+ net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README.md RELEASE-NOTES )
+
+PATCHES=( "${FILESDIR}/${PN}-0.2.18-docs.patch" )
+
+src_prepare() {
+ # comment out DYNAMIPS_FLAGS to respect CFLAGS
+ sed -e "s:^set ( DYNAMIPS_FLAGS:#&:" -i cmake/dependencies.cmake || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DANY_COMPILER=1
+ -DENABLE_IPV6="$(usex ipv6)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/app-emulation/dynamips/metadata.xml b/app-emulation/dynamips/metadata.xml
index a7daaaa0bc6f..2f5d95978a96 100644
--- a/app-emulation/dynamips/metadata.xml
+++ b/app-emulation/dynamips/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<remote-id type="sourceforge">gns-3</remote-id>
+ <remote-id type="github">GNS3/dynamips</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest
index e388fb66d160..deb1aec81cdf 100644
--- a/app-emulation/faudio/Manifest
+++ b/app-emulation/faudio/Manifest
@@ -1,7 +1,7 @@
AUX faudio.pc 245 BLAKE2B 8231bb42f6d90dd814eabd12d4d582d74ea0f154d6913fa710814d1bd75168d667463fd430d827ac7854aaa76bc07d16e5ccb3f6455e990ae0e2bc21bc633291 SHA512 bbdce2d90fcf848b8ef6a7a47a5bdf535d261aa833d6821de21907be05cca8693fede48c0e4161ae8087522297a2ec5af8c5ff5ed42efb814bbbc195ff963059
DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6
DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966
-EBUILD faudio-19.06.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
-EBUILD faudio-19.09.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
-EBUILD faudio-9999.ebuild 2423 BLAKE2B 821535d584103610f27a00f7353d0a0cf646cd2e5f5079b7e4c9031e6bd3d7348464c710b729231bea6d54fb42c7412f6eb9a29e59f3e454ec486ec69792f820 SHA512 1804c42d0af6a3b325a08de3f9ec2a6b8ed1553e432d6a1b6a9411debc081114d918af15742d25a33cfab70280517efc00aafb2efff81aaeafbff0d1548b04f8
+EBUILD faudio-19.06.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
+EBUILD faudio-19.09.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
+EBUILD faudio-9999.ebuild 2450 BLAKE2B 5da500f87ff5de76daf26967b333974af357656e2c9a36c8a0a27ddfe32f120dac884461731850fadc8e8309c7836d31e87b87a6c41aac3343f0144964ee2c7c SHA512 e7708fa8ec279e2f59fef965d0552058d67a5bd67c378054aaee6ed1319394c190881162749b1704fac8098ee74e2ab7b358e973c63a412a8ecd65810d78283f
MISC metadata.xml 1341 BLAKE2B a5fe79fca0c7f184466254e5f251c6248c20415795933b8797a4bd899535735ed93b54754937ed1003103cbbe3d5d6c5ffc5848c255cfd759cb06fb973065003 SHA512 8ad14c2ae094ff4ffd013458db62263b97cc5e616885cb229ef57ff8a4ab0dd943c2ab3840d086a81a4a10962c0d7411741ac6a8daaefb5167fe988a1dd8122a
diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild
index 5c40e2ec7566..b776945034dd 100644
--- a/app-emulation/faudio/faudio-19.06.ebuild
+++ b/app-emulation/faudio/faudio-19.06.ebuild
@@ -27,6 +27,7 @@ LICENSE="ZLIB"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
COMMON_DEPEND="
diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild
index 5c40e2ec7566..b776945034dd 100644
--- a/app-emulation/faudio/faudio-19.09.ebuild
+++ b/app-emulation/faudio/faudio-19.09.ebuild
@@ -27,6 +27,7 @@ LICENSE="ZLIB"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
COMMON_DEPEND="
diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild
index 5c40e2ec7566..b776945034dd 100644
--- a/app-emulation/faudio/faudio-9999.ebuild
+++ b/app-emulation/faudio/faudio-9999.ebuild
@@ -27,6 +27,7 @@ LICENSE="ZLIB"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 debug ffmpeg xnasong test utils"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
COMMON_DEPEND="
diff --git a/app-emulation/firecracker/Manifest b/app-emulation/firecracker/Manifest
index 74ac39d5f51c..ee83428a8bfa 100644
--- a/app-emulation/firecracker/Manifest
+++ b/app-emulation/firecracker/Manifest
@@ -4,26 +4,34 @@ DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e
DIST base64-0.9.3.crate 37993 BLAKE2B c0943b223d0d35438c647aa53fec5f85e65a78a5d272e4c65865bf182607b44c45b3ed1a0353e081a9dc5d9f4c9cda6cc6b8d68929a2676a512a7907cc94d8b6 SHA512 4790e4de201123e7b3e3c8a574c92089e38900a67f1bb4868987da4088785ea05e4258559c1c32be67341c2ba8a19deacd156492d8383949e1c9a6ae218b7eeb
DIST bitflags-0.5.0.crate 10940 BLAKE2B 69d9f52d1dfbec986034981f4629022b25b94c01d54424ae2399a0749c51f0f1c725ca312cfb3f953efc95732b7ca32e432e29b1e5bbba416cb4e0c21a266546 SHA512 220511ed57391bbbd4c8828cf485aed25d078a1cad6305367939072383e48468d545550002398a288d30d8501b9232fb9a91e7a3651f67103991677b9f25de0c
DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST byteorder-1.2.1.crate 17841 BLAKE2B 2e61c88911454fb787ddc7601ae7530980e9dd6be55eb4605dc257b0753ce69be8e3cf05655e9bf118e3a3c25d709f674acb6162fcd6f08d6b73619f4d434a62 SHA512 3b8822286a3973ef80309f30e169dee5fd87d98a0b4f5a44da7e29c2f14f5ce47a9f109087c84cab09078ad0c3507bb459bac243528bf4d8eae7a958394a4041
DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
+DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
DIST cpuid-0.1.0.crate 5473 BLAKE2B ff6536dd8fa1aeaf52b3ae28e5d0c3e0033383d7265eb91f376843516492e3f9d2c43bb6667538342158e6abb9c606b4e6129786d6cb48fe86f1c1effe005df2 SHA512 5b24b49acccaa393f351fca2a2cc7c5e5227e7e0f99680c109bff19377fa5822f37ad1561a33be25e34be654dd4f118ded974c7acc79608fe1efd8c19c4f8404
DIST device_tree-1.1.0.crate 7049 BLAKE2B 11236d709c7d35d6482eed7ccf8ac82dfbb4412bcf2fec98fd2a806bcf8740c1d0b2745c39b5971f5292ad00887f423afc28a4c674cdf37511cd8615ff654cbd SHA512 b671b582d9f5dc19d8ff28d18fd2ed77842191084c6acbb41362491ea3c994699044fe0b0505f927ad9569d933806f8129a4eb49bf25443c0806ddcb6ffefad7
DIST epoll-4.0.1.crate 8195 BLAKE2B 1ac732ade3c441a27832ef5f7cd75a4f80dcfbf42d195433a7bca91dcebd4f6a8ad0198daa3e3e12ef5ce50615dd85ef0d4cfe6670907ad0a65d55055b25da86 SHA512 b672091bc0b051c22a6217c37bf3986b2e173a1bf5d773590a1e181c9c0981baac656278f90aaa98f7a092e636e3bf68e5ea7a9edb6120cb90636f8db7e953d9
DIST firecracker-0.18.0.tar.gz 4064752 BLAKE2B 6d58ca099f5f891966e7ccf25e5f22836e4066847891cbacab328fcbbb44c5c9010dc47223a626cedfd1c9443a754fbcf1b333378f6947299d7abb745944f471 SHA512 af599401a9323219b9d07d7a146c382c1a7521e6dabd10d6a4282dcbb8ea7742268b7999ab6aedcdadfb5d7f07efbd03feb20ab225f5711abcd45121f4c89f09
+DIST firecracker-0.18.1.tar.gz 4065972 BLAKE2B 161e85a1e90b69db6bc153e4f04462e767057824cdb1bb6431ca69281cdd61890851e80eb45c0f5d9b5f38bb2b06385e6bf693c26995ca589dcf2a845c68fe92 SHA512 2af1e42ab2f9c218646d78907ca0d7a5ae2c24e8652d0d29124a4db0d862c5e805f50fdbee6499173d5a7f48178910e9a58dbb2c107dbcaea71c193c2e1570b3
+DIST firecracker-0.19.0.tar.gz 4093985 BLAKE2B e974581d3c213c26b058d6536eac05e109147b3f949d83a6a8d19cd63c07e44ca7b309bf634edc5a42ebbd492485a06f21eedebb5257dbe81dd912516b37ca20 SHA512 f718cc5ec7b658c4a336f829a2db912684e1c2e2209091afddca6bb347001714c41091a32ad46822f3efe1e019f862fa1890d5f12c5b7e3bb2952492b7cf347e
+DIST firecracker-0.19.1.tar.gz 4095338 BLAKE2B e27e2ae6ad968cc09145525b83ff72896ceab6d03c6f3f588d88bdb6101a3c823e21688c1c1a9f5be2dfde41c7b47337f4e1cf54ac5c3c527bc3596393fab73c SHA512 0bfd1aeaa0faaf36125067391a4e7bf7a89e52d373cbcde2e4b45247b9de5bb17285556c7b3138595c80946035953968baf0ee9a2b1b6e8767155005b44ed1cf
DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
DIST futures-0.1.18.crate 153738 BLAKE2B df33639193cdfdf7c5ae7323e5798cc6decfdbfb3f1d819caf794e68411241f25cc05c5eae09a09a1df6f3fa8ac5de7fce5af4536108e5b530dd639c18860679 SHA512 5782b37be2bcd4c9d0ddfafba7718a48144c0f8533acbfd0217e1bf25c3c04ba95320b35765f57224cdfe0ee3a7748d1109d6e680e64bdb1a16addeac422b12e
DIST futures-cpupool-0.1.8.crate 10583 BLAKE2B 5832359dc451551a3cb77e48b73054ec1505e28e04b2307af5d8e17a3be9e0552941deaaa94d477082b924daade1a2aeb15a0e095629e29ce983b0788a15251a SHA512 49d7a75e2e0a6a6d2103212a9ad9474119f4f33cf3748b605dfbb461ec822330115cada6bbf6457f2093f4af4cc04b4db63dbab8c0faa8b25ee31fea29f660e6
DIST getrandom-0.1.11.crate 23699 BLAKE2B 9239fb86a5d43a95821d5a378ef291842ac11616ebaa131130dad0bcc5edc632d9786f10c3a15654255461f9f6b221c70854c498ea82f7da24eba9074d49bdae SHA512 ddafcf536d72607edb1587e562dfe8d25091fb073377fe5dca2babfb56e6391b920c98c695ad74d5d2aabf6b28d50a4a54c305b41303250d58e01c4da46f210d
+DIST getrandom-0.1.12.crate 23809 BLAKE2B 9669147c455bd03bd15f304eb7019b218cbc482af850ac3cb4378327de5afabd50826a686d51b00437d740ac4e3a0bfc761c54ed295806ac8b77ae6848742346 SHA512 0577f21f0ff01154453da92dd125c3bdea12a2bb2e7f5581add4306e28dfc448a0c084e9e64a0ef1da7baf8415965ea4ee32a5ef38d5af8ce4c6addab3cb0518
DIST getrandom_package-0.1.20.crate 883 BLAKE2B b72ca1dac1e8745b3a8b49423c73340b0876eb507ecefb619bdc47c48b1320c2f2653bea9f370c0988b3103ff543ac6c22f915b7c48ab108af15126f8187047d SHA512 6152ce07fabbbb3176484e38493dc1099ebe4a56b573361a92fb624f8bb784ecd8f16f8ecdef988699156aace636548c8300b205371a90fbf14379cb257b41ae
DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
DIST httparse-1.3.4.crate 23739 BLAKE2B 3abeb8bd0ca381ec3e7ef73ae51e1ff803583094d0cb12f5f4641fc4b8a312c3e1bf176a5d500a9770057fc9f9e925d437ce5173d99052d97439e773b70773c4 SHA512 97ff294eaf55684412d4e5a00c4077bd517fb1d51c420231281af09cc1dfa65a64adb4a18441db426db41cca91bd7032fbeb9fda02c1b0343466caa9dea8d457
DIST hyper-0.11.16.crate 139464 BLAKE2B 4317ba59a217d40c56f145712394a1088a8ea2fd7f5aa1bea9314e9e4fdd7122526dbd0d1158b106646003d4ee83a2268605b6409a2257cc36eed7de0ce2efe7 SHA512 ce47fdc4b0e222ac17a03fbd1609fe692c77f70725a4f29782a7366391e0d8cd07ac085413ec27aed15b73c9b510ef67841dd6613a668ff42463dddd012f0d4b
DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
+DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
DIST ipnetwork-0.14.0.crate 12580 BLAKE2B 125321fa04e08983d94f80efc5ccf449214a119557d32e3188d861802e50746a490af3645db06e730b6c4bc97e359d9c1923020c0b7316e5e0fd9e6c669b9ce0 SHA512 28f9a73dd68c967ab285f4cc832011cd66b8e91dae8cfcd7938471c55a2fbeeb78a52778481fd62c8af22d1138c8bba32fd815f7cc8663998b401f329a178d47
DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
DIST kernel-0.1.0.crate 153163 BLAKE2B 5c1635a16f69567ceaed92c028ef92bac0a07d7dba9c4a4997710fdfa881e906a4756744b978240b35ed2ddc1ddeb0e4be3b375693c12a49e2f27dd1255afc0d SHA512 75c9dd43b9f00dacbb9a3771be458721498ef77dd74db4f2e5f116c761767a007730f028d0d7a137efb35917b264134bfdedeafb90b96d50461d98b0f11a93c5
@@ -38,6 +46,7 @@ DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb
DIST logger-0.1.0.crate 7908 BLAKE2B ba678076c287e6c45106689220481ca04a620293398cecc2f73217095592dc0d30345b98df45722c91996cd75dfbd4b3bf6a1649cb7d4ae2434bdc78f3d5fdeb SHA512 a907cfc8a17197f7889a0b4b15880acb1eaf12b1fdb60d77bfe258c883c83b0644ab4d45381070921d3a2d5109a88d2ec7c1977f6952896097ea6daf6f638453
DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
DIST mime-0.3.13.crate 14939 BLAKE2B e522741251fe764f685b5f240da3e32148e54bc0f94a2e234de477d792fb0652748410ae7e625a509706bf9ec635d2528fc14e5d58e576026d8706747fc68f8b SHA512 92805a4eaebb1f6146facf1edd0b9cc710731949141af6bfc2226edb7fbd749b04bd8a921e79c2f4a31b79d11053e36a4b7b9dba9be1405a1174a8600654e320
+DIST mime-0.3.14.crate 15035 BLAKE2B ab9fcc2247637465d99006899fc120ff60fb4b61f603ea65b15da594bef80ed2b9788e2d893126ed46c5e8cecc0aad2a93be855a043f9224ac07c07fd601734d SHA512 7079ac27a2a7c5534ab8af24f1d84ce78d9b3906a56107198e5ac43e7b6cc74a980a38bffee0f988e7b4a9b8d3bc052797bcbaecfae4c9470073ac34674f6471
DIST mio-0.6.19.crate 128192 BLAKE2B 26c821eef0aa49c80e4919d80a795971655b9726c24ce0a5b0716d89c0e254bfdf3a7d4e591ab70474dd9bdb92a48be9d74ff4d7beb3ae158accedcf780525cc SHA512 a6eeb93a34a4a4d486a821763cf660d6c5d3dcb08a7f1cd32a04d918d5196cd50cc29b30c5a97eeca68ab1cda50bf36a50c2c787e08ae3d2a2b9134350acd097
DIST mio-uds-0.6.7.crate 14389 BLAKE2B b01fbe5ba2e2f58d2bc513ef577c70890ab0a556313dc8e980d4f51d4622be9180215e2e9655e3f02aced40823bdf69b94a8b63c6b2624e28cd24fb5dd89b0c4 SHA512 fe16c8702eef599c2379a2b72a0408970c3318e240d6ed59077c7fcae142bfcda4d9e342e3185338671b82719f7c2ab156bb28a54818a54c249216dbb0f8bb04
DIST miow-0.2.1.crate 21133 BLAKE2B a60f04feb5bd98eaafe6123f7579ffb0287b0a3d1de0dbe1b504141d76dfbc247891eb6dd87753ce5d6e2ae0406387ccc8684a91980c5ef1ad6610c29ec9e3bc SHA512 b2639b1976274b7a01ec3ff7fd019087775e3bc5365101b24db480bf9c9b66e8a1aa34405d44db6c2be753265a5124054eb37870b84cae2c63fb6b36bd5c6d72
@@ -54,26 +63,33 @@ DIST pnet_sys-0.22.0.crate 3753 BLAKE2B c1e10c319d9bfc4152b8a2dc67d47afaf1609070
DIST pnet_transport-0.22.0.crate 4549 BLAKE2B 38332a8d8e7e25a5ae43aef08980d85b5b897b07c79af144c6a04b274f0010c5117955c821c7ca10bfd2224e68fc5bc3374c81f52f66727e78ae8e06e115fa38 SHA512 7cc764f5ba037e209cf4976bc50f522f6e66f97996eb5ec60a7692ebb31adc17d725eddfcd0f819fea33dcb5c56b4572af6252d6f1cb4b0d77cd78b709e2070e
DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
DIST proc-macro2-1.0.2.crate 34779 BLAKE2B c99119a8c2158712f16524c568a03d60f0f4a72f79ea310c823c7bbf809f91f5836f4bc3388e2add1e202207fa91c24b64be438c7ee6d0eb0f27175b739382f8 SHA512 012ef53dd8f5abffa10490c95197bd0d303c681fe0da54adee75a9328a194cf827acaddc286b2237a6665a0bf9dd4c94250bce7919994412185c9de3828f733c
+DIST proc-macro2-1.0.5.crate 35430 BLAKE2B 3bb45a1659cf7352120e066f095da7f91343d17198c4af4d4b2600b78e5bc7900f7b3c1fa72b4c707e80c05f6b91155015dc72ca317932195f727c333d34ae41 SHA512 0fd9cb01781b7fca910e905c0cddd0deebb6a862d84286b694b78b7210a586ff497a211eabd27b80c3714b2019736206f88d9d97dc21f3dfffe49ca041f98783
DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
+DIST rand-0.7.2.crate 111438 BLAKE2B c9e81a0b2bcf5a3d425865dad2babd90187da55b9c70fce4aea4ed2e2ffe9cfe4e66bb280f1acee11e1f1ad17d3a73e906ac6cd35e6a2124852b66093293bd48 SHA512 d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c
DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
DIST regex-1.0.6.crate 239455 BLAKE2B 0e81b18a220c6e81fb9185391f15faba2451b0fdebc7facc06a3ea76534ae32a76a6c573a686a72c62b30399939529fde08e6c33c4fe0d126df9cf5e11204456 SHA512 4779fe3896c131b418b07ec2622888b2b8dc64172744e6ff91c46a957646c796c46fcc5b1c37b5349f0c7a5adccee2e7af1e07121dfd2b59976bd0fde5b60bb4
DIST regex-syntax-0.6.11.crate 283238 BLAKE2B 37a535b47f90449f6d41d1a5a3de69ff21e74fd5268961ff9f7cffd620080fbb212a1bd315db9b25b20aaaaa4ecd4b1afbb88a45a96b7e23d4b9e4742c081aec SHA512 619e1118aaaab60dcfc653cdae8fe2a8dcf49f2b06e718710f30179b4c95f1e31c04b2289f1d05d0c88b1996a3d8a327180ccf13bbd1d0259a70af7c7f449651
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
DIST relay-0.1.1.crate 7331 BLAKE2B ca5d025d76f85b05a8453e264045871a5d552632db7f8bc61428798bd5b539ad27eec191ac153addbc86c77ec771df6058ad84d29395ddfc39558c416d8d9d91 SHA512 81b2aa587529ebf364d4b1a566acfd867623a33d32fe20c94551dc248ef28950de61094d7e1acfca618205c731cb3cb955bc8106d9a4c5c7c84f9c38b35b2261
DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
DIST rust-libcore-0.0.3.crate 4988 BLAKE2B 0d0e663d70a73afbd13f07bfe1072f76243561570ada2ee548f2811665326d530a02ed99dcaf047212efea6e451c49273d6795b56793d409a5eb5e09bb9d4616 SHA512 67c83402776606e5266c6cbba5eeb8e506a0aa8c6f5b5b310e3b289af453bdba80d32bf517a0d626405263622460fbedadbe7934836f6a0e51502d0957002db3
DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.1.crate 41990 BLAKE2B cbaa83c8d56196a5b4f76cfbc999c30e77e71435e47e0fe63fb2bb75e81f9a6e9818f8848a86a4bb9ac125d5efb7ab871690f820309e3c1d8adc515389b4036f SHA512 24210629d458b6775e252d5ce9c61bd5f45304d62a59422fafb4e10e6791559af2caeef8ef24815e897abbf48a226be55d768f4e643a2d97b534e1872e096b9d
DIST safemem-0.3.2.crate 6858 BLAKE2B f5a1b44da1289775e380b109bd458b7bbb17cc04ed718434cf05fbb7d75387c70b51c5d8f9078aebeae7e98d1873b972a70d65a345f632f42f5c67cbe9a421c0 SHA512 6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda
DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
DIST seccomp-0.1.0.crate 2750 BLAKE2B cac2a5b20e640d94474f4c3db5f6102f0c45a8211080e2cc806828d1c20220d847c8bd4cf770543be56a36de4f0486725241c63215e041d2a0c35b6523eead3a SHA512 a13d27ac138e6c9fe83d25f94dcf23ec5a2a326504290bc20efc379b05d24ea5dde06a371af7e52c62fec81b0c8dd26ffb3c0a0baa3b701ccfa4f09019c6e1c8
+DIST serde-1.0.101.crate 73115 BLAKE2B 6b80a6e7f8965c412c6f5db62cf3782329818c59c43c9947ad9a33be56b334feb0fc0afae4722f368d708236e2763ee2b1e71b323b3e961880f99f2e178a82a6 SHA512 3b6e2f8fc965ae2055a8eea007b3aa47715fdbd653cd0af81ada557559316ca65d7f3c75c3c5db0841aabcb2d4336092d339258829df11716b10a0c14597c678
DIST serde-1.0.99.crate 72436 BLAKE2B 564e206ea5363898300af959efda372115de54812553853679af173fa91562562f1508d4cb570d801ea657af3aabcf8c3bdb40b762d6dc1e6a24c4a02cb09021 SHA512 9e6e55fd38777ef238d7b6c0f9f74da1e0cdc204e4735f70e6644d81e615d90c5b245bb8f2edb88751d126b3d1ca3c1e9f6922dddb645b9a1bb40bb4a8c11a0d
+DIST serde_derive-1.0.101.crate 49736 BLAKE2B 247c6284e362d9a31eee6c92b257fd70733669627628cbdc921dbecc384d1a328fc8a37a8f5b96a84498d5fb4514374760ccccfcee1f3e809d35da5677cf4932 SHA512 08a014ff70718db11c5e3b8420d2b31379c14004b55c4521149030a00c3a623a358c3442815e492a2cd28d6a32002aa1c828cae2b5366f82d68c1e342eba0417
DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_json-1.0.41.crate 69870 BLAKE2B 328935ee765889b82cd88ac7eab921e279ea8ad41445a8344b194605e1571b30b6204add7dc4de1f87994d8162428eaf4d825e9744c9971349e8fee19507265f SHA512 63ac513a4813a65962d8f63476ce8e63ce71d1e6643da7443d774078e4a743835276c50c04ce535b2e43251383c537365581838a0bd5d4893a644e396eeec55b
DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
DIST syntex-0.42.2.crate 3173 BLAKE2B 40624fa9370cf2c5ef02c28fb158b34926c22942ace0855d284a2c8b0ebc968492b67440eb010df10fc3fc06ed01c894b2f5ac87456ef2b7cce933cff22f1764 SHA512 b03cf0edc5367e31215e187d5ab32b76d1e909e47a34b0b9f58fe620681b7d55eed0689eb6b6c9b7312bb791d03995ce60b7daa1035df87959aa2d3117aa82c1
@@ -92,17 +108,22 @@ DIST tokio-io-0.1.5.crate 33064 BLAKE2B d519c56dd896e25fe8134a0e57682c148a78215b
DIST tokio-service-0.1.0.crate 8376 BLAKE2B bb2193af371d14c19a7f79760d4544bc5ebcba46d38d9b2836e46b6041c4b0c68f7902af51dcd3c83970084f271b1f29591b1fa461b854cb1bcc46b4db2c4d4c SHA512 a22b5a33fc957abeb8556ad1f01c6574a855b24053f7bf1ec23376df42b1e83f2fa0a538828742f24f586456e0e1314abe74ca3ac62d364f905b74c2e45903c8
DIST tokio-uds-0.1.7.crate 15094 BLAKE2B 82b9eb1726c3f5c6c52e70c40be42618bf0bb42eb61f045999af04809d98a40afb64f9e0b31097c6d6ade4d7a2239d72f28462a126a204b4a8c318c341374c50 SHA512 2d21490ceef08554e5633d602ba1c15751a9e36d3a51b58358bb99ee117de1cb029b262ec0174545ef5c88f7cf2e54823c678715e8b83ca91e6491213eeeb9eb
DIST unicase-2.4.0.crate 20143 BLAKE2B c579faae980fc52693a229c2ca1fca62647b8dbd1566f58ed50726e3e31db238fb33da168527630c4e55a786e595ce62aaa0d0d0cdbff46d53b628d96b8d00eb SHA512 d4b7d0e217a8a9180cd01cbce4d1e2bc80a9dbeee735954968c0372c9679f4f84b73294952947890340f20f4f9158b70ec2c13adc11b1f0cb53aa893755cff22
+DIST unicase-2.5.1.crate 23105 BLAKE2B 70e6c6b61e4a1e4de56174eacd08cef19d68202d40f403a0958d56690546a4b72f2fd0957a1d591bbe49fe6f6f5acf8c1b03b7eb884873b469c61aee7466335d SHA512 fe77fe7dacc1a340a760f3f474b2bcaf3cc0ad1b71ae6b5811dab77faaaf8bdf4bc8158682254971702bd648769ec776689560f4c2ed5c8c544cc04ace4608fd
DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
DIST unicode-xid-0.0.3.crate 15998 BLAKE2B 2e112dbd311399836dd12ee37bbe7b9d83ed6fba89549784f1bf2ca9479b3e3cedd1bc2b15bf5e21b0cdb30fd3b88b973aadf37cb634024316ac33fc77d98d11 SHA512 268c1f3ec79ed2255c4e3759e4526b4892cb04f54ced07afbfff0ff8dcdec953e5b540fcb58b30bfec01b6401b58ef3b21320a0c1bf3a43aec22f0715568dcc5
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
DIST utf8-ranges-1.0.4.crate 8575 BLAKE2B 686bfd854cdcb7510b07751630089f4f0cb0884017792288a63a4a8fa00e6cf1a10b38c39142e57d5b4d1f494c95f3445f343f1b34fc1883dbacfd708d8c13b6 SHA512 acd7008c92ed23cc0ad3fbacecfba2169781687c6aaa475ef5388fe416391cd209218a2cb19b9d4fc87a2a616f1dd67129d39978fe1b58be134a013f90cd53d4
DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
DIST wasi-0.5.0.crate 31104 BLAKE2B 91bf384f8f9abbdd4f75d0690056568792b7aa6a16834b73e8a5fca98d12b008f2be8101cb4e55864d2e057ba8d169010785f2acd395b69d894f8c32a62ee1ea SHA512 3996da04af8d178a6a7a2129de59ca62e51e9ff0c4dc99000919489f258598c2d6c6264736588b711df22679e8aca103fcc9e13f5a429b33bb4a28f7b909c79e
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-EBUILD firecracker-0.18.0.ebuild 2766 BLAKE2B 993aed6a569e7ca25108c0443fa803d9f98bf3e84636fcac4abd57149100339ea0f74af214d7b1138da0626400d2ee0dd85185d3c08eeffe8e455965dd0c5af6 SHA512 5742507711b65aec724b9510665b167209678dc75b26f08f0715f740037582fea6222080447993f57345f33c6648e570dccb7e0f02164f5af333961d0d9d22b5
+EBUILD firecracker-0.18.0.ebuild 2817 BLAKE2B a72df42d4bca91d37f8d92bc20aecc848b0ccc7fee5ad7b2f7a20180f1b45aed6274f65567178e26f8d4cac0760d76b4d642ce23e7a26e9498d9435875e18bf4 SHA512 194d6f9f50db3464f1544a1ee616a8dd91d8f19acd890535c3aeb8ddc628d1a00e2b1168380de44e815ab88151032cf7dd1169992154373ac70586ebc96fd076
+EBUILD firecracker-0.18.1.ebuild 2817 BLAKE2B a72df42d4bca91d37f8d92bc20aecc848b0ccc7fee5ad7b2f7a20180f1b45aed6274f65567178e26f8d4cac0760d76b4d642ce23e7a26e9498d9435875e18bf4 SHA512 194d6f9f50db3464f1544a1ee616a8dd91d8f19acd890535c3aeb8ddc628d1a00e2b1168380de44e815ab88151032cf7dd1169992154373ac70586ebc96fd076
+EBUILD firecracker-0.19.0.ebuild 2758 BLAKE2B 83b55bc92d05a4059625f6b8e8643d615a756734b4612c0bd48a7828e4facb66205fc724b2e9dfd8bdf0e7f6eb9089b9fe8ddfddcf628373f04cf1dd60b51a00 SHA512 a93036e1916dacec9a564bc61cf36f14680b50278e2c490cfed670e9588bf177fb0adc9bcbdbddce8435180472114c91a445846ab41de7f6a19ddaf53524af5b
+EBUILD firecracker-0.19.1.ebuild 2758 BLAKE2B 83b55bc92d05a4059625f6b8e8643d615a756734b4612c0bd48a7828e4facb66205fc724b2e9dfd8bdf0e7f6eb9089b9fe8ddfddcf628373f04cf1dd60b51a00 SHA512 a93036e1916dacec9a564bc61cf36f14680b50278e2c490cfed670e9588bf177fb0adc9bcbdbddce8435180472114c91a445846ab41de7f6a19ddaf53524af5b
MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-emulation/firecracker/firecracker-0.18.0.ebuild b/app-emulation/firecracker/firecracker-0.18.0.ebuild
index d8166ac49973..1535788a9f3d 100644
--- a/app-emulation/firecracker/firecracker-0.18.0.ebuild
+++ b/app-emulation/firecracker/firecracker-0.18.0.ebuild
@@ -119,7 +119,7 @@ HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-m
SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
-LICENSE="Apache-2.0"
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
diff --git a/app-emulation/firecracker/firecracker-0.18.1.ebuild b/app-emulation/firecracker/firecracker-0.18.1.ebuild
new file mode 100644
index 000000000000..1535788a9f3d
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.18.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.1.0
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.41
+cfg-if-0.1.9
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.11
+getrandom_package-0.1.20
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.2
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.13
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.2
+quote-1.0.2
+rand-0.7.0
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.11
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.0
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.99
+serde_derive-1.0.99
+serde_json-1.0.40
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.4.0
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.5.0
+ws2_32-sys-0.2.1
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+rust-libcore-0.0.3
+"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+ case "$(tc-arch)" in
+ amd64) target_arch=x86_64 ;;
+ x86) target_arch=i686 ;;
+ esac
+}
+
+pkg_setup() {
+
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK+=" ~KVM_AMD" || \
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ ERROR_KVM="${P} requires KVM in-kernel support."
+ fi
+}
+
+src_compile() {
+ local target_arch
+ set_target_arch
+ cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/firecracker/firecracker-0.19.0.ebuild b/app-emulation/firecracker/firecracker-0.19.0.ebuild
new file mode 100644
index 000000000000..05c89111ba62
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.19.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.2.1
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.12
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.4
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.14
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.5
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.12
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.1
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.41
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.5.1
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+ case "$(tc-arch)" in
+ amd64) target_arch=x86_64 ;;
+ x86) target_arch=i686 ;;
+ esac
+}
+
+pkg_setup() {
+
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK+=" ~KVM_AMD" || \
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ ERROR_KVM="${P} requires KVM in-kernel support."
+ fi
+}
+
+src_compile() {
+ local target_arch
+ set_target_arch
+ cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/firecracker/firecracker-0.19.1.ebuild b/app-emulation/firecracker/firecracker-0.19.1.ebuild
new file mode 100644
index 000000000000..05c89111ba62
--- /dev/null
+++ b/app-emulation/firecracker/firecracker-0.19.1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.10
+backtrace-0.3.35
+backtrace-sys-0.1.31
+base64-0.9.3
+bitflags-0.5.0
+bitflags-1.2.1
+byteorder-1.2.1
+bytes-0.4.12
+c2-chacha-0.2.2
+cc-1.0.45
+cfg-if-0.1.10
+clap-2.33.0
+cpuid-0.1.0
+device_tree-1.1.0
+epoll-4.0.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.18
+futures-cpupool-0.1.8
+getrandom-0.1.12
+glob-0.2.11
+httparse-1.3.4
+hyper-0.11.16
+iovec-0.1.4
+ipnetwork-0.14.0
+itoa-0.4.4
+kernel-0.1.0
+kernel32-sys-0.2.2
+kvm-bindings-0.1.1
+kvm-ioctls-0.2.0
+language-tags-0.2.2
+lazy_static-1.4.0
+libc-0.2.62
+log-0.3.9
+log-0.4.8
+logger-0.1.0
+memchr-2.2.1
+mime-0.3.14
+mio-0.6.19
+mio-uds-0.6.7
+miow-0.2.1
+net2-0.2.33
+num_cpus-1.10.1
+percent-encoding-1.0.1
+pnet-0.22.0
+pnet_base-0.22.0
+pnet_datalink-0.22.0
+pnet_macros-0.22.0
+pnet_macros_support-0.22.0
+pnet_packet-0.22.0
+pnet_sys-0.22.0
+pnet_transport-0.22.0
+ppv-lite86-0.2.5
+proc-macro2-1.0.5
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
+regex-1.0.6
+regex-syntax-0.6.12
+relay-0.1.1
+remove_dir_all-0.5.2
+rustc-demangle-0.1.16
+rustc-serialize-0.3.24
+ryu-1.0.1
+safemem-0.3.2
+scoped-tls-0.1.2
+seccomp-0.1.0
+serde-1.0.101
+serde_derive-1.0.101
+serde_json-1.0.41
+slab-0.4.2
+syn-1.0.5
+syntex-0.42.2
+syntex_errors-0.42.0
+syntex_pos-0.42.0
+syntex_syntax-0.42.0
+sys_util-0.1.0
+tempfile-3.1.0
+term-0.4.6
+textwrap-0.11.0
+thread_local-0.3.6
+time-0.1.42
+timerfd-1.0.0
+tokio-core-0.1.12
+tokio-io-0.1.5
+tokio-service-0.1.0
+tokio-uds-0.1.7
+unicase-2.5.1
+unicode-width-0.1.6
+unicode-xid-0.0.3
+unicode-xid-0.2.0
+utf8-ranges-1.0.4
+version_check-0.1.5
+wasi-0.7.0
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1"
+
+inherit cargo linux-info toolchain-funcs
+
+DESCRIPTION="Secure and fast microVMs for serverless computing"
+HOMEPAGE="https://firecracker-microvm.github.io https://github.com/firecracker-microvm/firecracker"
+SRC_URI="https://github.com/firecracker-microvm/firecracker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( Apache-2.0 MIT Apache-2.0-with-LLVM-exceptions ) MPL-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="test"
+
+BDEPEND="acct-group/kvm"
+
+set_target_arch() {
+ case "$(tc-arch)" in
+ amd64) target_arch=x86_64 ;;
+ x86) target_arch=i686 ;;
+ esac
+}
+
+pkg_setup() {
+
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK+=" ~KVM_AMD" || \
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ ERROR_KVM="${P} requires KVM in-kernel support."
+ fi
+}
+
+src_compile() {
+ local target_arch
+ set_target_arch
+ cargo_src_compile --target ${target_arch}-unknown-linux-gnu
+}
diff --git a/app-emulation/flannel/Manifest b/app-emulation/flannel/Manifest
index b54e7820499f..4cfb0d80439b 100644
--- a/app-emulation/flannel/Manifest
+++ b/app-emulation/flannel/Manifest
@@ -6,4 +6,4 @@ AUX flanneld.logrotated 77 BLAKE2B 778f7289a6268cf6b150b1c58895514808c304b56baca
AUX flanneld.service 476 BLAKE2B ea838e26be0834943bafb985a37e71b45219bffbd68784b8442c065d9bafc8c9cb2b097c8a00629c19faf4b7bb1fb4ae33071e51d4bf6ffdd62cf5898de1f3cf SHA512 4a7d09f25f117b1cda9b02914a394c0d6d6ddd6c02503f61c0646ede1934cb4cad831992058c5738401b1ac7be6e4c7cd83b1c4a70c04084bb4bb01338c08220
DIST flannel-0.11.0.tar.gz 6443391 BLAKE2B 5358e513a73fec6d8fcdb0182ec814fcf204eb12830f7d60acb3d4432f821ccc9e174fcc7adb57584ab1782c3f285e46b51bb0f76635fab9cf851cb2bd40c1b3 SHA512 72d18cd4ec58ede3848da3b94b7f3e33f8dda59d9fceb13864757998a24f0b312bc5b5d7927d3da8a805475efee469095ac09390fa632eb0c6ef9dd0f5d38a3b
EBUILD flannel-0.11.0.ebuild 1419 BLAKE2B 46f7a12e4cd40fc39ec71e545ed31524b98902dbee1cbc3e2ad895eb28922949fd7671f81aab740f604d0721a0e4cd768ac1e4f81f0ffcbeda8ab73b24d726ba SHA512 ec22340ff8ae9195ba99cda97d34acf4d5f04aa394a2f383247941dba4eabe2009812adcf762ea0199a01bbc89f0581dd15d3f86f94c0bd1d000087540d68553
-MISC metadata.xml 417 BLAKE2B e6ca7a068ab883a47cd7bd9d1fcad86c0e2e76304225d17c1aa1f02ebed1fd58bd885e8484873b6c900717e78a7398339f49f5fd74f100467c7d09b5b5800bff SHA512 f776dd802b80a94b819998c46ce5adcd163942fade01f13b3ea6c718bab1fcc6b08cdd0630f51fea305deb760fe9e8b3dd750dab3b2d1e3b2c6a257e7d4b1595
+MISC metadata.xml 305 BLAKE2B d34792ab0473ba56a75b4e9dc559b4a12b2eed48313cfecac65ce7b13a9df59a651721fbdd72a744314181f4002b52510c9200b85c1fac6fa03d3d78573db842 SHA512 ff219bf7233d4659475fd4e25366d5eef5d3575cd1250d6c9bbddc7351515418ca17730a8df61d102c71b515813b20bb182b355448db16b5fb43a9a46401bd04
diff --git a/app-emulation/flannel/metadata.xml b/app-emulation/flannel/metadata.xml
index cfe71d5ee793..26007a60b41b 100644
--- a/app-emulation/flannel/metadata.xml
+++ b/app-emulation/flannel/metadata.xml
@@ -4,10 +4,6 @@
<maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
- <maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
<upstream>
<remote-id type="github">coreos/flannel</remote-id>
</upstream>
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 13a311b76468..3b16fd5efc0a 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,11 +1,14 @@
AUX free42-2.0.10-fix-build-intel-lib.patch 618 BLAKE2B 9039cdf8c78ff198ea9a4927621f7e23f362fffbd537a0a988030713fe061398d2b7b2fc6120cda280249807d9aee448095b1f5cdfb824909d7d381650daafbd SHA512 192eb5e78c50ce52449c5b859369ab7258a98162c5d924ab8b8f3566f52be7a3c4aba95c3cafd60af82d5dcf1b1ad784cf3fe6bf432839baa1b4ca994ddf416b
AUX free42-2.0.10-fix-makefile.patch 1888 BLAKE2B 113bfc1f296ea3d35d6b4f8aea5f590298c5a47f50a2a20f0ac5f1968b06be19d53f03e64dcf22134938c232f68a6b989250064f45e88196c7fc8e7e9e0fca71 SHA512 1c9a16e29087c492fe1ee5bba8dc118674f4c167b5bc138ffae9ee08ad735a5b5aa2eec2e25236e5aeb95b89c94d7903e08e22cfaa321cf3c458b54defe72af8
+AUX free42-2.5.12-fix-makefile.patch 1539 BLAKE2B 21bfe186c5c776607671af98a41a6f2ee02446af14e1b93746b952e34c4d2b442e9b66fc10393c3c20e58d82e55179799ba55c6a53ce168bc6b9434597654c73 SHA512 d17e8cf4828e4869e4dbbd69039c02417d4592d30b949d52ada69fd1ef416331fff2ba30baa176ef122ad2da8ad09ca4f58b10fc918ef26c4163684c430f5914
AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
AUX free42-2.5.3-fix-makefile.patch 1902 BLAKE2B 1d8ae0054275bba2f8fa46aa8c6086e5b41dae17a417d8f0fbf14bb63fe9504577f67bd92b612665d414e55396ed6bc7b1ac36983b4dcfb32b4eb98514d0f768 SHA512 895fe2a42a8e1129dbc2bd8b523ae9235eb606ae8d48f53fd2689d9991ee1818334f66d154218592d9bc92b9e1d080b148ff6fca6f80295b0dd0475d9e1bbad9
DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42
DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46
+DIST free42-nologo-2.5.12.tgz 7409287 BLAKE2B 9d2e244c1d7c7c728bfde6331badee412573239e3470e84f30776f62f9c6224ff3dc3d3cea8574349aeebd171c6682cfbc12b9bbdd2decbce6b6223aae705a1f SHA512 d93d55dfedfb33f91868f92e6ab9c1db48ff05e932c6628df5bb8237192aaeb104a2da56422cecfeab2ccc24d41fb518f6901ce2424739450d56a5ae7f90cda1
EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
EBUILD free42-2.5.10.ebuild 1039 BLAKE2B babccdc77920bbc8d34b991f3cd289324eec4f30b3810d1b3bd615492417e02b2e372c5548835477be9d7190d93cc370852abe99020769d6921f2872588a1891 SHA512 8c680066f1d7f235e5d0f3b69ce6f27fdacb8f950bc88076396f21f839a25ac6fb6fb28cbeb0e16c63c222819c882d6e912085956afaf980d8de4eae62700de6
EBUILD free42-2.5.11.ebuild 1039 BLAKE2B babccdc77920bbc8d34b991f3cd289324eec4f30b3810d1b3bd615492417e02b2e372c5548835477be9d7190d93cc370852abe99020769d6921f2872588a1891 SHA512 8c680066f1d7f235e5d0f3b69ce6f27fdacb8f950bc88076396f21f839a25ac6fb6fb28cbeb0e16c63c222819c882d6e912085956afaf980d8de4eae62700de6
+EBUILD free42-2.5.12.ebuild 990 BLAKE2B c86aacd65aedb7582088c9436cb2be461ca1f798be831df6f4d78e4c849362cbbdaa44633cd179a16ecd034672722dfb0ad6507d89692c59f91e6cd6970973c7 SHA512 bcf4b590169c07021f954078a0db7f5ae87983c67a9914f1742ce2cf09c9ba0af66278c2f217f34c6d6fbfe034b78cc42dcf23b4378c0073b119498256c30a09
MISC metadata.xml 525 BLAKE2B 19dca8c4cbe1777e905b4d4e6a410e08f6e22044428bc860534e98fbc31ab6b1469eaabd0e673c1b1229079871dbdbae267c01c211bcc85952ce0d79cbe61a22 SHA512 2bfe3994ec23d46f9cde4cf7dd66be9842315f2b104479114b3190edf7b09f0bbc5094c61eebe45b1a5330bf530ecb8505ccdff68b343a0bae048353b6efc24c
diff --git a/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch
new file mode 100644
index 000000000000..8a8fa437ba2d
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.5.12-fix-makefile.patch
@@ -0,0 +1,45 @@
+diff -Naur free42-nologo-2.5.12.orig/gtk/Makefile free42-nologo-2.5.12/gtk/Makefile
+--- free42-nologo-2.5.12.orig/gtk/Makefile 2019-11-28 20:11:51.000000000 +0100
++++ free42-nologo-2.5.12/gtk/Makefile 2019-11-29 17:59:58.292516949 +0100
+@@ -15,7 +15,7 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ -Wall \
+ -Wno-parentheses \
+ -Wno-write-strings \
+@@ -34,7 +34,8 @@
+ -DDECIMAL_GLOBAL_ROUNDING=1 \
+ -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++ ${CFLAGS}
+
+ ###############################################################################
+ ### Note that there are deprecation warnings while compiling shell_main.cc ###
+@@ -46,10 +47,11 @@
+ ### GTK+ 3.22 for testing. ###
+ ###############################################################################
+
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ -fno-exceptions \
+ -fno-rtti \
+- -D_WCHAR_T_DEFINED
++ -D_WCHAR_T_DEFINED \
++ ${CFLAGS}
+
+ LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0)
+
+@@ -125,7 +127,7 @@
+
+ symlinks:
+ for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
+- sh ./build-intel-lib.sh
++ +sh ./build-intel-lib.sh
+ ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
+ touch symlinks
+
diff --git a/app-emulation/free42/free42-2.5.12.ebuild b/app-emulation/free42/free42-2.5.12.ebuild
new file mode 100644
index 000000000000..a50835ba3990
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 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.12-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 5fa67b916c65..ca8c2ac513ef 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1,5 +1,5 @@
AUX fs-uae-launcher-2.8.3-QApplication.patch 457 BLAKE2B 814c7d04240bb3e90f18e0b4d1a8041b985fe6f3241e098b0d26f2d8b096ba79c33e04f0c938a3af2a12b55d080f831fbc9da404e8d62751b16021e3f229a530 SHA512 e1892b9a7f440ea373e7a7c8313d56328395fa054918cf402b9a8b5e96c15f48a3bee901aef4297774a79b5eb1d4f909ff4843da16a0f1a6f8a6343afe104162
AUX fs-uae-launcher-3.0.0-ROMs.patch 626 BLAKE2B 2662476f496345e6dc2f169b8c3e6e579ba68c3c7c1d9c782ce2dff39394520bde6dc1a52d9d43f562bddec9dc28daa3d0e7e1e93f1da48a0a932e1415ad40ea SHA512 8b607f64cd1c66601f7fccf5332377a85e905a6d9ba9fadb9a7234d5f36c350590011141602e093ee7a30dce4c9c6c0e9928b8b7a0be716eeaa15aeff1eacce0
-DIST fs-uae-launcher-3.0.0.tar.gz 9631352 BLAKE2B dc2f940cbde1fe9d2386e512bf5c0ca9a4ea19332826095cc5ba95e90c7f6cfaf0cd5dbaa692c192ac7d74a3ddf245062a0faeeccc9d8a135e544d304119e239 SHA512 76f9c48d2a46ece38aebb318a6d684ff40e85fef76bcc6ac57c7f397c828dae45541ba458a7792f102a8afc69a4183b9932b637318716a8b40ff3dbd3b37cad7
-EBUILD fs-uae-launcher-3.0.0.ebuild 2087 BLAKE2B 5263b455fdf32e2e0c0f3b14839a9963145355dd3de55aaa30d1e3f6cc3f4d81441e3566a9a968566611f34eaed232bac016cab57ba90837edb27bce54b4966c SHA512 02e08e7591e755eb53f98369565e813b803e30fcaf8e1eff2a99844b0172d0e92acb00ddc9ba03ded9f1b8536a22929f5ce68ae624a2b1fb6498c16aea36d96b
+DIST fs-uae-launcher-3.0.2.tar.gz 9633002 BLAKE2B 81e5a9cbdb4f094735fdbffa291c86bea74e3306ea1bc8365ba215daf970665ab45515c82dd180bfc965f5a2ff83c29a9cd8b21b343e6e6c7ebb4d95dbafd8d0 SHA512 6e9d5588b4cee79b7d5468b7d5e3d6c82e54957fcb0b05d3e9d1da8710336f0af82821fea37ee4cf4e0dc12ead6096183fe488afe860ce11573fd828718ba3d3
+EBUILD fs-uae-launcher-3.0.2.ebuild 2094 BLAKE2B 6dfc9c20608043626951638b1cc2b39716d7130970f0006c84571c10fe6587b0fb43d695d311a6d9030862f39164b813b2e76c63c2d5b94b535f99b2af5b573b SHA512 3b56ae48e66c27a8abbdf8753d031467e8abfeda2b69a857757d1c09319475b65fbb81fc744264eba287a05d60f0f077a867b7a29b12b809484250bf20d53106
MISC metadata.xml 408 BLAKE2B 8722a14caea4642a007f5baf0988f2a2463243b7a019b845ccf6c6a000aa0971fe92011e7b46a013980ef264986889d83a309914cb2465561812775c69461533 SHA512 1ff8604bcb75d5a36f10b0770d5b0983f2ce0674098d21464fc269d47784a261eec7d134b721be3fb49cdba0c01cb668a7b55046e46e67e6325b2cd70b8ffaf3
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
index 62652d3eb997..57269efa7162 100644
--- a/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.0.ebuild
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.2.ebuild
@@ -29,7 +29,7 @@ DEPEND="
"
PATCHES=(
- "${FILESDIR}"/${P}-ROMs.patch
+ "${FILESDIR}"/${PN}-3.0.0-ROMs.patch
"${FILESDIR}"/${PN}-2.8.3-QApplication.patch
)
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index c007ab5e3b49..6fd957d5689f 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.0.tar.gz 4841427 BLAKE2B 318bf457cca60e763a938d3d1a846e72a50f9b899dd8eefd79bc331f385a3529cb2bf2adc1616c1c5a04c1a1c92d4257c88593ada103d3e05847656a26a1c435 SHA512 3ceee2434b3aa3f545370a17149b3cda8d2eeb1bd093a45869a897a00b82ae4395efc52c129124e44262b47b7f56337e1adb9f58b0a1562efa73ee3ea3915b68
-EBUILD fs-uae-3.0.0.ebuild 2438 BLAKE2B cbd56c50a7fd699d8ab3726e7dab2ddbdf2c118dc0c3e10b3b589a509550e384f9caa72a4ad0cf29fdb90cfea4a54d16482e26eacbad986338f7b432e84ac492 SHA512 984248fec9239d526c6fd90fb68581675e0413a5751412ccef671d131a1f0f98bd26d87f758e25611e4212e88446dd020af946af0ef250517071b248b0a34657
+DIST fs-uae-3.0.2.tar.gz 4843019 BLAKE2B cc60ba5d7919b178b8119af750796c0d5c5e805a47de4546e4beebb6bf239a7d7f723af30cc6e49a9515c9312a69aeca6ccbd2896cd6b94d9f072ec40f3571de SHA512 4727e61276e75e7b622b7c22b3991955efff0cf371215a0c72158d1f78e78dad7e82680865891ce015472606e8f55ed568c22a157760cc0779bef39aefc8c416
+EBUILD fs-uae-3.0.2.ebuild 2438 BLAKE2B cbd56c50a7fd699d8ab3726e7dab2ddbdf2c118dc0c3e10b3b589a509550e384f9caa72a4ad0cf29fdb90cfea4a54d16482e26eacbad986338f7b432e84ac492 SHA512 984248fec9239d526c6fd90fb68581675e0413a5751412ccef671d131a1f0f98bd26d87f758e25611e4212e88446dd020af946af0ef250517071b248b0a34657
MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745
diff --git a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild b/app-emulation/fs-uae/fs-uae-3.0.2.ebuild
index 6d0c2446b7e8..6d0c2446b7e8 100644
--- a/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.0.2.ebuild
diff --git a/app-emulation/ganeti-instance-debootstrap/Manifest b/app-emulation/ganeti-instance-debootstrap/Manifest
index 9dc40df12528..d5b919987dd7 100644
--- a/app-emulation/ganeti-instance-debootstrap/Manifest
+++ b/app-emulation/ganeti-instance-debootstrap/Manifest
@@ -1,5 +1,5 @@
DIST ganeti-instance-debootstrap-0.11.tar.gz 67946 BLAKE2B 0dbf3d16ae4058f0093adcd0a33c473719cf6de267dbc4e99e3326a2885d57693e2d0408b1079681056be88c7db23ab168e38f38d4051e8847d3b552fa42d4a1 SHA512 d39ae29b49e3e0e25e9052ee5201d5aeeedfa229cc0b8674ea01a26b1b615b262c1464ca16b5268884a0fa28981e5126eec084d7bb9298a4b405574925b85b4e
DIST ganeti-instance-debootstrap-0.16.tar.gz 23020 BLAKE2B 8e96597ee94e5806de78ade571f5287e68c5442a91fb8ef3f6e2dbb95301e036fa79225b3c8a2517b05ff14eba0fb541c792556218d0f9a9346f1ebe524a6b38 SHA512 43197d034d719b81ea8737ea60763d43bf71bc9b15b0fbee60bd42e5b0c0f3821805986d4f564db91207a83c2396e87fe081180eec3a5da77d18f2d510fbff1f
EBUILD ganeti-instance-debootstrap-0.11-r1.ebuild 668 BLAKE2B 6c059e82edd5cc1c08b9af03e8758f75fc5c55210658032e76c1c147d703e3014d8020e45755134e09d9f70427fcabebcd65ee8d541b241e02cfaa728869738c SHA512 2afeeca81c5840dcfbb0b76d0dca9a62fb13d3788c573f2f37070385a7ad0d3b031a86b3b750f35b71fd66183862c133c220c9432c0b1222675954426656a9f5
-EBUILD ganeti-instance-debootstrap-0.16.ebuild 842 BLAKE2B fb7886377dcbdd7d72cb1e685f0771f8954fbb68423cfcebcdb35a93c40ffc110b7e9ff638366a3db5cc2195de6061883cc95a6c16fda46d84704eb857db0f87 SHA512 12ca8bc73f4b12dd30875555440001a86d706e4d8aadbd8badca822c4ece9bb8d0d0a143996f2766386e3208904b3e64e47a9391684567b3c5ddbc897d608f16
+EBUILD ganeti-instance-debootstrap-0.16.ebuild 841 BLAKE2B d648f5d4dc4a282f05ff40d7b75ae942315df4958f75a72fbd151534eacdcfda1c996f7d9e6d6601523217de5d56300e9daf6d23320352bd13de187e633e054f SHA512 95d79aa1c365a93540ce63a0c20ec6ed589f5c5d65f1a1e0c85512b63bd52f5cb02def60e23dc76a67ad3faa4ac9d328f9ffa109600589fab7fc368448ace46e
MISC metadata.xml 693 BLAKE2B 8e67678f49377a1e982361b80d67e2af5b4a093996d7416e1ac98925ee3cd9f3a79fcd23f9146df831c55b6aa9aa8ed4e7c5e735d9fd191b48406b256757d340 SHA512 5cc8e1aa819d16acfd1645a8f4921343e931423af0e4e6414d92599d3d9a0ea301b1549a767b9c768cb7f35d9bf580657ddf25d1165ccf59cdda54e0099fbcb3
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
index b6b769b1e5be..a5a08c013e87 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.ganeti.org/instance-debootstrap/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
${DEPEND}
diff --git a/app-emulation/ganeti-instance-image/Manifest b/app-emulation/ganeti-instance-image/Manifest
index 2efb11e319b7..9d80e64f4a85 100644
--- a/app-emulation/ganeti-instance-image/Manifest
+++ b/app-emulation/ganeti-instance-image/Manifest
@@ -1,4 +1,4 @@
DIST ganeti-instance-image-0.6.tar.gz 82534 BLAKE2B 8a16f1ead6307400031425c60dae2585ea9ad53e55276a73177b46652c9054c6c24ea7068347ecaeafa77cea27b1b97350420bd6cf0e69e5ac18692cede47bbc SHA512 92b5048fe8c40692e8e7c4cb73b21e764660d7cb5f585a8489fc4338eef7df8aae1147d38a849103585a884a0216a0bfb42473d5c1922130e5aada31f5d580c3
-EBUILD ganeti-instance-image-0.6-r2.ebuild 986 BLAKE2B 3e2d8bf945f8707b173170bf3013c903bf2096527fe3128d66bb3ca342dad604b274e5adb74cf351d533bfc9ede7e2e20f3d904320fc57c4552d167589cbcb45 SHA512 21fdc5ee8ae370c8b1daac3258c67c76ebb66a6f15eecf24cb1effb60c26b4929768bd00b16dd755596710b4290c022bc5f8e269ab09b948e8b5a040b6b07bbc
-EBUILD ganeti-instance-image-0.6.ebuild 990 BLAKE2B 79251b99b7a51045025577f5481c08cecbff9b8bfc860c243e83c6ab08f4f0d9b3d31f08fc78899bef632aa6bd7b362b139d75d9e421f263ca76a3105dd8c870 SHA512 98764555f1dfd871a16cc8cc65ce5e6682b01575b6746a6560c65434f2e95a1ddcade4ada125c75aa79f3bcdcf65c51d6c3eca40c1acedf1c7e682c38418b340
+EBUILD ganeti-instance-image-0.6-r2.ebuild 962 BLAKE2B 3f4fb1305c8582a2254eda5fa0d27b84ba830748658d376ba980d7beca005d6c710491b0680aa488871539cc99d554671f2511a1e598b93bcc3bb02ad5d0f985 SHA512 27c104fe48fcc68658aa85b65a2de282b1537df754d5bcdacd6950365201c02d8715263f76418fbc6953254a68c2395f2c767701d17412a05e606ceb7129e555
+EBUILD ganeti-instance-image-0.6.ebuild 966 BLAKE2B fe3400f7adf4ed2b44dc64d690f95f663d05403aea2659a4fe4ada334ce05a1990b912a96c9c2ed519465ab7cc5961482f3f71700549a1b338c5af0cdaca0997 SHA512 6457e094541bf40920506de80a3a2fcfbab6f34b37d26c5dd26da1b11c5acd794be744eae8ef47148e17c065ad0265f339ebfb24243ae36e8f9cff162339eab0
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
index d60896758bb0..45a28c15d3cb 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild
@@ -39,7 +39,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install
rm -rf "${D}"/usr/share/doc/${PN}
dodoc README.markdown NEWS ChangeLog
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index 760dd5928a14..e621e1ec228e 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -40,7 +40,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "install failed"
+ emake DESTDIR="${D}" install
rm -rf "${D}"/usr/share/doc/${PN}
dodoc README.markdown NEWS ChangeLog
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index df3487edf8fc..5800c89b9cfe 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -34,12 +34,8 @@ DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb
DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfdc46867f0e3eed276086de9ad2e86def1e7894012b89f3f9c111076c37ef37b857967e4bae5cf769eaabf5907b3a42bc806b4472 SHA512 1c992b9842f1a8492eeaaab8950939c96cc03abf679234211753b92f4753278b086a0a77e2e32b912d4a69635c11e8305d350cda8285734d706cce741d897aa3
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.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403
DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af
-EBUILD ganeti-2.15.2-r5.ebuild 9757 BLAKE2B caaa94ddb315b7b4ea5f93ce6015521c3e70d835f6aa339ead3a9f1c1da3645e0d603cb6dfa94339822c63bc85c095a88e630c34ba08df2bb6361dba95127c83 SHA512 ae8d599d9338b10e7fdfb22ae8a0c89a76380fee6a03692508294144953e5acc18ba76a9052824e22c09fc00f76a357aca5b0bb4afe5b0bfc25e971fef5f0499
-EBUILD ganeti-2.15.2-r6.ebuild 10209 BLAKE2B 17fe1545ce1866c40f188ec54b86f2cf709cdf6637a4227eaa633ddd00a565cf6b87ee99a152af1e426ce2b1fe4ce2cd765028dc108bb27ddc1e565ab5b14cdf SHA512 446cd91e65c576cb827f2b66f01d7cec1cd9ff57022d664fb2bfbb8b93cb4e02a9d57aacd4ddc2c4d691c3d7b730d751ec3d4c54e26ec2d07869f309f7d931ad
-EBUILD ganeti-2.15.2-r7.ebuild 11657 BLAKE2B c7961e5bf8ea1906e9dff5598f1bbaac496cd8b64d4ebb3f999f75a5d59f60bb6bf597958ddf6579129b1fbba65026cdf9d204fe81c49ef03022ca66f1cf7a1b SHA512 df09969e05a989261487f95af64962f5393714a9ebf33fe3df300e3ca35ee709d2bade6f58c409c8aca1aa158932f1f84881e7131ba5f167b9adccbdfda989aa
-EBUILD ganeti-2.15.2-r8.ebuild 12089 BLAKE2B 1d53ade7cb9f0d6a2c978bbb51a748267c2f3b326adc1af13cd8508dc7e034c5addb8c3acdf654e91fc0dba4d066cd157b51e69f9008a579479363fb8400d39f SHA512 f4bebbc46c0a4bd112af927201c59bf16a1796e33037fe9ed71451caa6ad349bcc3004e761f515799a3ca2bee8a832dcebca97da135d25e091289a00f8e21d35
-EBUILD ganeti-2.16.0_rc1.ebuild 10489 BLAKE2B d048e2ad9a3be59a865f763553c40d15d3c389dc501751769e8d4b320b638c0ef1db9e5a25c034d3f4ca391695bd32e9ed7630bc6aa83a16ec96eef416d7db73 SHA512 d5dc99300beaea18735a8d7987e059603eacd19a57707949f64ca0802edeb99602b5cda6a2570ae21077f39b9ef773ad278b2fd4fdd5b6c9f73db8a485084a30
-EBUILD ganeti-2.17.0_beta1.ebuild 10516 BLAKE2B b7439ef3b177ea60e2d3ebcf517480b582aedb484e895091fab1c9d684e80c6e56dd9050382f377a72b3df6477d1bca66388573fdd534f01d906fbd24806932b SHA512 fbca06fe26098d69c144754b1a81ba5c72631456e8d2033a3fd5b5c33b7a5a0c7d347114e995f6f2a86b20c2747257572b5e1e4b97b7c080dd5cf8cd6cc14052
+EBUILD ganeti-2.15.2-r8.ebuild 12087 BLAKE2B cbb379c5f4c623d29abb52c8d1d6c886c2acc1737846f100e1832293bfd4043feaf7832baf3ff0e1de8d30e32f8b81de16146500f2b20c8ad9131d26a657f85e SHA512 cb6f2e13214938cb249d32545e81fe98c79db597523205950ba94da317863bd96981ff8acfec6afbf41f6bb80820221f9ff5a43ecabb9d7c66564179afb6738d
+EBUILD ganeti-2.16.0_rc1.ebuild 10488 BLAKE2B 73c9dd53f4b4c2450aabf3b89c54c90aadb81b325194b4adfee83b19c63f8a50eeddd61f492ec4e0a4ba88567b30b61f2cd6af51ff7ac5970581279ad51aa755 SHA512 24f0b88d8540f3c0b96e89540c60f80896a4891c29c0e6e2c786046f30a3b6220529b0c212fef89b3a7e9754e0db18ee08a8232696fb6159a3bb4c61cdff1f6b
+EBUILD ganeti-2.17.0_beta1.ebuild 10515 BLAKE2B d528f54fa7cd81c2831b6f20d3aa9a89b8f5398417fe930fbca0bd04e51bf1c57e40a04b65dc3e1d3f6deb8de83a5abbc87c6de0525bc8af8935548c30898e4a SHA512 ac17b3840f87b2e8261579a2075f705c1ceb0bf6ea39758e027d9d1725352ab5f81852db51532ffe9bb55b45c83db36a7f5589aead7adef965eb198d9d0a9490
MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
deleted file mode 100644
index c1a37b6d764d..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-DEBIAN_PATCH=4
-SRC_URI="
- http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
- mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="amd64 x86"
-PATCHES=(
- "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
- "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
- "${WORKDIR}"/debian/patches/relax-deps
- "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
- "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
- test? ( ipv6 )
- kvm? ( || ( amd64 x86 ) )
- ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
- || (
- net-misc/iputils[arping]
- net-analyzer/arping
- )
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc:0=
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.14:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- >=dev-haskell/lens-3.10:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.7:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? ( sys-cluster/drbd-utils )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="
- sys-devel/m4
- app-text/pandoc
- <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
- media-fonts/urw-fonts
- media-gfx/graphviz
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8.3:2=
- sys-apps/fakeroot
- >=net-misc/socat-1.7
- dev-util/shelltestrunner
- )"
-
-PATCHES+=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
- "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
- "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
- "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
- "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- if has_version '>=dev-lang/ghc-7.10'; then
- # Breaks the build on 7.8
- PATCHES+=(
- "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
- )
- fi
- eapply "${PATCHES[@]}"
- # Upstream commits:
- # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
- # 24618882737fd7c189adf99f4acc767d48f572c3
- sed -i \
- -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
- cabal/ganeti.template.cabal
- # Neuter -Werror
- sed -i \
- -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
- Makefile.am
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- eapply_user
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable restricted-commands) \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
- --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
- --enable-socat-escape \
- --enable-socat-compress
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- use monitoring && bashcomp_alias gnt-instance mon-collector
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
- docinto html
- dodoc -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
deleted file mode 100644
index 646ff4ff3a53..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1 versionator
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(get_version_component_range 1-2)"
-
-DEBIAN_PATCH=4
-SRC_URI="
- http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
- mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
- "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
- "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
- "${WORKDIR}"/debian/patches/relax-deps
- "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
- "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
- test? ( ipv6 )
- kvm? ( || ( amd64 x86 ) )
- ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
- || (
- net-misc/iputils[arping]
- net-analyzer/arping
- )
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- sys-fs/lvm2
- >=sys-apps/baselayout-2.0
- dev-lang/ghc:0=
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.14:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- >=dev-haskell/lens-3.10:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-0.3.1.3:0=
- <dev-haskell/monad-control-1.1:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4.1:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.7:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-0.8.1:0=
- <dev-haskell/snap-core-0.10:0=
- >=dev-haskell/snap-server-0.8.1:0=
- <dev-haskell/snap-server-0.10:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? ( sys-cluster/drbd-utils )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="
- sys-devel/m4
- app-text/pandoc
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-fonts/urw-fonts
- media-gfx/graphviz
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8.3:2=
- sys-apps/fakeroot
- >=net-misc/socat-1.7
- dev-util/shelltestrunner
- )"
-
-PATCHES+=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
- "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
- "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
- "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
- "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
- "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- if has_version '>=dev-lang/ghc-7.10'; then
- # Breaks the build on 7.8
- PATCHES+=(
- "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
- )
- fi
- if use experimental; then
- ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
- PATCHES+=(
- # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
- # backport available for 2.15, but refused upstream due to RPC breakage.
- "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
- )
- fi
- eapply "${PATCHES[@]}"
- # Upstream commits:
- # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
- # 24618882737fd7c189adf99f4acc767d48f572c3
- sed -i \
- -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
- cabal/ganeti.template.cabal
- # Neuter -Werror
- sed -i \
- -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
- Makefile.am
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- eapply_user
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable restricted-commands) \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
- --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
- --enable-socat-escape \
- --enable-socat-compress
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- use monitoring && bashcomp_alias gnt-instance mon-collector
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
- docinto html
- dodoc -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
deleted file mode 100644
index 22e58cde08e7..000000000000
--- a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-PYTHON_REQ_USE="ipv6(+)?"
-
-inherit user autotools bash-completion-r1 python-single-r1
-
-MY_PV="${PV/_rc/~rc}"
-MY_PV="${MY_PV/_beta/~beta}"
-MY_P="${PN}-${MY_PV}"
-SERIES="$(ver_cut 1-2)"
-
-DEBIAN_PATCH=11
-SRC_URI="
- http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
- mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
-"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
- "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
- "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
- "${WORKDIR}"/debian/patches/relax-deps
- "${WORKDIR}"/debian/patches/zlib-0.6-compatibility
- "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5
- "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4
- "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch
- "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch
- "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch
- "${WORKDIR}"/debian/patches/ghc8-fixes
- "${WORKDIR}"/debian/patches/snap-server-1.0-compat
- "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch
- "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch
- "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch
- "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch
- "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch
- "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch
- "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch
- "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch
- "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch
- "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch
- "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch
- "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch
- #"${WORKDIR}"/debian/patches/THH-2.12.patch
- "${WORKDIR}"/debian/patches/sphinx-1.7.patch
- "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch
- "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch
- "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch
-)
-
-DESCRIPTION="Ganeti is a virtual server management software tool"
-HOMEPAGE="http://www.ganeti.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
-
-REQUIRED_USE="|| ( kvm xen lxc )
- test? ( ipv6 )
- kvm? ( || ( amd64 x86 ) )
- ${PYTHON_REQUIRED_USE}"
-
-USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}"
-GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}"
-
-DEPEND="
- dev-libs/openssl:0
- dev-python/paramiko[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/pycurl[${PYTHON_USEDEP}]
- dev-python/ipaddr[${PYTHON_USEDEP}]
- dev-python/bitarray[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/fdsend[${PYTHON_USEDEP}]
- || (
- net-misc/iputils[arping]
- net-analyzer/arping
- )
- net-analyzer/fping
- net-misc/bridge-utils
- net-misc/curl[ssl]
- net-misc/openssh
- net-misc/socat
- sys-apps/iproute2
- >=sys-fs/lvm2-2.02.181
- >=sys-apps/baselayout-2.0
- >=dev-lang/ghc-8.0:0=
- <dev-lang/ghc-8.1:0=
- dev-haskell/cabal:0=
- dev-haskell/cabal-install:0=
- !<app-emulation/ganeti-instance-image-0.6-r1
- >=dev-haskell/mtl-2.1.1:0=
- >=dev-haskell/old-time-1.1.0.0:0=
- >=dev-haskell/random-1.0.1.1:0=
- haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= )
- >=dev-haskell/transformers-0.3.0.0:0=
-
- >=dev-haskell/attoparsec-0.10.1.1:0=
- <dev-haskell/attoparsec-0.14:0
- >=dev-haskell/base64-bytestring-1.0.0.1:0=
- <dev-haskell/base64-bytestring-1.1:0=
- >=dev-haskell/crypto-4.2.4:0=
- <dev-haskell/crypto-4.3:0=
- >=dev-haskell/curl-1.3.7:0=
- <dev-haskell/curl-1.4:0=
- >=dev-haskell/hinotify-0.3.2:0=
- <dev-haskell/hinotify-0.4:0=
- >=dev-haskell/hslogger-1.1.4:0=
- <dev-haskell/hslogger-1.3:0=
- >=dev-haskell/json-0.5:0=
- >=dev-haskell/lens-3.10:0=
- >=dev-haskell/lifted-base-0.2.0.3:0=
- <dev-haskell/lifted-base-0.3:0=
- >=dev-haskell/monad-control-1.0.1.0:0=
- <dev-haskell/monad-control-1.0.2:0=
- >=dev-haskell/network-2.3.0.13:0=
- <dev-haskell/network-2.7:0=
- >=dev-haskell/parallel-3.2.0.2:3=
- <dev-haskell/parallel-3.3:3=
- >=dev-haskell/temporary-1.1.2.3:0=
- <dev-haskell/temporary-1.3:0=
- >=dev-haskell/regex-pcre-0.94.2:0=
- <dev-haskell/regex-pcre-0.95:0=
- >=dev-haskell/transformers-base-0.4:0=
- <dev-haskell/transformers-base-0.5:0=
- >=dev-haskell/utf8-string-0.3.7:0=
- >=dev-haskell/zlib-0.5.3.3:0=
- <dev-haskell/zlib-0.7:0=
-
- >=dev-haskell/psqueue-1.1:0=
- <dev-haskell/psqueue-1.2:0=
- >=dev-haskell/snap-core-1.0.1:0=
- <dev-haskell/snap-core-1.1:0=
- >=dev-haskell/snap-server-1.0.1:0=
- <dev-haskell/snap-server-1.1:0=
- >=dev-haskell/case-insensitive-0.4.0.1
-
- dev-haskell/vector:0=
- xen? ( >=app-emulation/xen-3.0 )
- kvm? (
- dev-python/psutil
- app-emulation/qemu
- )
- lxc? ( app-emulation/lxc )
- drbd? ( sys-cluster/drbd-utils )
- rbd? ( sys-cluster/ceph )
- ipv6? ( net-misc/ndisc6 )
- ${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !app-emulation/ganeti-htools"
-DEPEND+="
- sys-devel/m4
- app-text/pandoc
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-fonts/urw-fonts
- media-gfx/graphviz
- >=dev-haskell/test-framework-0.6:0=
- <dev-haskell/test-framework-0.9:0=
- >=dev-haskell/test-framework-hunit-0.2.7:0=
- <dev-haskell/test-framework-hunit-0.4:0=
- >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0=
- <dev-haskell/test-framework-quickcheck2-0.4:0=
- test? (
- dev-python/mock
- dev-python/pyyaml
- dev-haskell/haddock:0=
- >=dev-haskell/hunit-1.2.4.2:0=
- <dev-haskell/hunit-1.3:0=
- >=dev-haskell/quickcheck-2.4.2:2=
- <dev-haskell/quickcheck-2.8.3:2=
- sys-apps/fakeroot
- >=net-misc/socat-1.7
- dev-util/shelltestrunner
- )"
-
-PATCHES+=(
- "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch"
- "${FILESDIR}/${PN}-2.11-add-pgrep.patch"
- "${FILESDIR}/${PN}-2.15-daemon-util.patch"
- "${FILESDIR}/${PN}-2.9-disable-root-tests.patch"
- "${FILESDIR}/${PN}-2.9-skip-cli-test.patch"
- "${FILESDIR}/${PN}-2.10-rundir.patch"
- "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch"
- "${FILESDIR}/${PN}-2.11-tests.patch"
- "${FILESDIR}/${PN}-lockdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch"
- "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch"
- "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch"
- "${FILESDIR}/${PN}-2.13-process_unittest.patch"
- "${FILESDIR}/${PN}-2.15-python-mock.patch"
- "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch"
- "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
- "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"
- "${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"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-QA_WX_LOAD="
- usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d
- usr/lib*/${PN}/${SERIES}/usr/bin/htools
-"
-
-pkg_setup () {
- local user
- python-single-r1_pkg_setup
-
- if use multiple-users; then
- for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do
- enewgroup ${user}
- enewuser ${user} -1 -1 -1 ${user}
- done
- fi
-}
-
-src_prepare() {
- local testfile
- if has_version '>=dev-lang/ghc-7.10'; then
- # Breaks the build on 7.8
- PATCHES+=(
- "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch
- )
- fi
- if use experimental; then
- ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!"
- PATCHES+=(
- # QEMU Agent accepted upstream for 2.16, not yet in a tagged release
- # backport available for 2.15, but refused upstream due to RPC breakage.
- "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch
- )
- fi
- eapply "${PATCHES[@]}"
- # Upstream commits:
- # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb
- # 24618882737fd7c189adf99f4acc767d48f572c3
- sed -i \
- -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \
- cabal/ganeti.template.cabal
- # Neuter -Werror
- sed -i \
- -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \
- Makefile.am
-
- # not sure why these tests are failing
- # should remove this on next version bump if possible
- for testfile in test/py/import-export_unittest.bash; do
- printf '#!/bin/bash\ntrue\n' > "${testfile}"
- done
-
- # take the sledgehammer approach to bug #526270
- grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g'
-
- eapply_user
-
- [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh
- rm autotools/missing
- eautoreconf
-}
-
-src_configure () {
- # this is kind of a hack to work around the removal of the qemu-kvm wrapper
- local kvm_arch
-
- if use amd64; then
- kvm_arch=x86_64
- elif use x86; then
- kvm_arch=i386
- elif use kvm; then
- die "Could not determine qemu system to use for kvm"
- fi
-
- econf --localstatedir=/var \
- --sharedstatedir=/var \
- --disable-symlinks \
- --with-ssh-initscript=/etc/init.d/sshd \
- --with-export-dir=/var/lib/ganeti-storage/export \
- --with-os-search-path=/usr/share/${PN}/os \
- $(use_enable restricted-commands) \
- $(use_enable test haskell-tests) \
- $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \
- $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \
- $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \
- $(use_enable syslog) \
- $(use_enable monitoring) \
- $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \
- $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \
- --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
- --enable-socat-escape \
- --enable-socat-compress
-}
-
-src_install () {
- emake V=1 DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN}
- newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN}
-
- if use kvm; then
- newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
- newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
- fi
-
- # ganeti installs it's own docs in a generic location
- rm -rf "${D}"/{usr/share/doc/${PN},run}
-
- sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion
- newbashcomp doc/examples/bash_completion gnt-instance
- bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \
- h{space,check,scan,info,ail,arep,roller,squeeze,bal} \
- gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster}
-
- use monitoring && bashcomp_alias gnt-instance mon-collector
-
- dodoc INSTALL UPGRADE NEWS README doc/*.rst
-
- docinto html
- dodoc -r doc/html/* doc/css/*.css
-
- docinto examples
- dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf
-
- docinto examples/hooks
- dodoc doc/examples/hooks/{ipsec,ethers}
-
- insinto /etc/cron.d
- newins doc/examples/ganeti.cron ${PN}
-
- insinto /etc/logrotate.d
- newins doc/examples/ganeti.logrotate ${PN}
-
- # need to dodir rather than keepdir here (bug #552482)
- dodir /var/lib/${PN}
-
- keepdir /var/log/${PN}/
- keepdir /usr/share/${PN}/${SERIES}/os/
- keepdir /var/lib/ganeti-storage/{export,file,shared}/
-
- dosym ${SERIES} "/usr/share/${PN}/default"
- dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default"
-
- python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES}
-}
-
-pkg_postinst() {
- if use multiple-users; then
- elog "You have enable multiple user support, the users for this must"
- elog "be created. You can use the provided tool for this, which is"
- elog "located at:"
- elog " /usr/$(get_libdir)/${PN}/tools/users-setup"
- fi
-}
-
-src_test () {
- PATH="${S}/scripts:${S}/src:${PATH}" \
- TMPDIR="/tmp" \
- GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
-}
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 579f39cb3711..6e00659d3fde 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
PATCHES=(
"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
@@ -56,6 +56,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -374,5 +375,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 7902fba92c36..bd24dd3fff74 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -41,6 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -345,5 +346,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 053c5aff28a1..d4baca0d24bf 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -41,6 +41,7 @@ HOMEPAGE="http://www.ganeti.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands"
+RESTRICT="!test? ( test )"
REQUIRED_USE="|| ( kvm xen lxc )
test? ( ipv6 )
@@ -345,5 +346,5 @@ src_test () {
PATH="${S}/scripts:${S}/src:${PATH}" \
TMPDIR="/tmp" \
GANETI_MASTER="$(hostname -f)" \
- emake check || die "emake check failed"
+ emake check
}
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 59060a325395..5f269584995c 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
-DIST genymotion-3.0.2-linux_x64.bin 38744066 BLAKE2B 4c98cdc8d5a5cd98192260893b39dd838bba5903d590268d53223c1ebe712296cf25aa638c16de39ea4f83a5fd8717edbab7c043ff6a12e6455862ecd25ca7cc SHA512 5075d9a9c6c5e84ff90e05e4fa70db98cf89ad25e8765566176b94559f60cc170e383a02f50c752fb63859b757645390d977081d2f79ce0fab8607ebf3e08e01
-EBUILD genymotion-bin-3.0.2.ebuild 3577 BLAKE2B bd65ec9c26accd519712b538d50070ac7f2364bb4e853fe7005867974816357920120a65612b065419957cef1066870a65bcba283f18aab2005f546f00c23beb SHA512 fc1aca4352f2c04842ddb188d8e80d66992d26a794a10c06b42036b87c9f16eab4ad3945fa0c6430435169d9b2e9ba19d3c081e10c935aba53f38566f8bbde0d
+DIST genymotion-3.0.3-linux_x64.bin 38760629 BLAKE2B 1853f5f631c8343eafa92fcd7fd42ad7663e78cc8a3848f7aa9d2ccf61009fc4e8955930142af35c4f2f9bbb9704260882e65fa0dc5e43c5d8d45e14f43218bc SHA512 8a3d5f57cb6c5018ae78940187a8c48bc19a7627f72ab746fc361afd3400a14b4f6ce2d036c828bd238b65d5346cffdf2dd55b5177c6d909b7fd749f4088d748
+EBUILD genymotion-bin-3.0.3.ebuild 3598 BLAKE2B 7979b38824d77089bf8c2db8cc0b5f175b8ba3dc1a6f6bf35a22fb60e4bba70a6a428a8321e4be898bee406c793d9e615c7a721b517fc7f6eb1702d00e0ff64a SHA512 6c2aabfa4c09ca08da81515401e921ac4f4462777db985c1b3bc63a5ef2af0155a42ca0d5071c4d8ed3458133256aec53c11c0f8bcb9d96fbe3c1c1059c20d0b
MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.0.3.ebuild
index c43122636cd3..93ee154e77c5 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.0.3.ebuild
@@ -87,7 +87,7 @@ src_install() {
doins "${MY_PN}"/qt.conf
doins "${MY_PN}"/libicu*
- doexe "${MY_PN}"/{libcom,librendering}.so*
+ doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so*
# android library
doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
diff --git a/app-emulation/img/Manifest b/app-emulation/img/Manifest
index 1a5afffa41e4..cac8678977d5 100644
--- a/app-emulation/img/Manifest
+++ b/app-emulation/img/Manifest
@@ -1,3 +1,3 @@
DIST img-0.5.7.tar.gz 3875988 BLAKE2B dd8f13f6861eadc3a4c3d2d07ac826e53a8f3b83d66974717e9312c579967e0c9b57657c8fe6e86f03bb91fd7a82bc6d8d7d87a70be4dd85da10800d8909a51d SHA512 a42247c2ceac0ccfcc2cfd6a561a058855869f0219994cd8fa2bdd5092be17803057e4cb48a2d5277fdfded74dd06eb7c3c3db590fbde91502aebcaf593ddef7
-EBUILD img-0.5.7.ebuild 901 BLAKE2B 4defdbd3caba5453bbda0a639a0bba14c7632a413de03d03203b51697d16ff259a229c39a58d0ca807a3fa5303445bed714696b470e4e44dac5b43aa9b66db93 SHA512 d9d45aa49a391d8816789bf2b8985c0d233bf6979acf9ead6b2dd45b26a82fb2358ff5e881ec5f3f8f4e9019b6699c7d623dffc59f17fa039708e8feac4698f1
-MISC metadata.xml 248 BLAKE2B 65f712fa82650530a08edb7671e6c6104649422106cd65d55253bdf920e84cc64ed47038feca9da18e770997c52cc6fdec416a6d82eb4146677b78d8509048ca SHA512 0de2cc5b3231aa87bc19df0801003e020b1599bf4a006a991a2d46d84495569245bb04756c1537376293765593167f2c083c46470389a5438ca7b44abafb0a2c
+EBUILD img-0.5.7-r1.ebuild 866 BLAKE2B 10d5041a3b379840b8675490a7abf54e5dc9c437e5d9424e4f3dab670fc5df138f1f768afb18391e2ee6ae966134f05ad5c956a917337b01f305e9aa93f7a946 SHA512 e5f07e98f8bced65cdecebc1a0b827c47ddeecbcf45963202638ac71b7b13a28ded8b3c2b31d19a87395f37e5a1cb406185d3d313959601c817052b836a3f6e1
+MISC metadata.xml 442 BLAKE2B 9eabfb5043d4b0c579254b497e4fe9252068eef479dc238307a1b69fb395491c7802d9792325f38876ef3ec280d7879a7a06dd1523635c9873565576b1a8edb7 SHA512 3f8d4c2c15806151513d588239dfd365fa1857fd8eb296e460fbc78d31aa2c3488b4da1cfeb32d91fa1a20bc957506954db632142d99b0382b1883d23f7cd492
diff --git a/app-emulation/img/img-0.5.7-r1.ebuild b/app-emulation/img/img-0.5.7-r1.ebuild
new file mode 100644
index 000000000000..4b2367c13e4e
--- /dev/null
+++ b/app-emulation/img/img-0.5.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGO_PN="github.com/genuinetools/img"
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
+HOMEPAGE="https://github.com/genuinetools/img"
+SRC_URI="https://github.com/genuinetools/img/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="seccomp"
+
+DEPEND="seccomp? ( sys-libs/libseccomp )"
+RDEPEND="${DEPEND}
+ app-emulation/runc"
+
+src_compile() {
+ GOPATH="${S}:$(get_golibdir_gopath)" \
+ GOCACHE="${T}/go-cache" \
+ IMG_DISABLE_EMBEDDED_RUNC=1 \
+ go build -v -work -x -tags "noembed $(usev seccomp)" \
+ -ldflags="-s -w -X ${EGO_PN}/version.VERSION=${PV}" "${EGO_PN}" || die
+}
+
+src_install() {
+ dobin img
+ dodoc "src/${EGO_PN}"/{README.md,AUTHORS}
+}
diff --git a/app-emulation/img/img-0.5.7.ebuild b/app-emulation/img/img-0.5.7.ebuild
deleted file mode 100644
index 21373b5f486d..000000000000
--- a/app-emulation/img/img-0.5.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/genuinetools/img"
-GIT_COMMIT="d14bb92b69804443263d647647b0833013b8df91"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Standalone daemon-less unprivileged Dockerfile and OCI container image builder"
-HOMEPAGE="https://github.com/genuinetools/img"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE="seccomp"
-
-RESTRICT="test"
-
-src_compile() {
- local TAGS=$(usex seccomp 'seccomp' '')
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -mod vendor -tags "noembed ${TAGS}" -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/img . || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- dodoc -r src/${EGO_PN}/README.md
-}
diff --git a/app-emulation/img/metadata.xml b/app-emulation/img/metadata.xml
index 7213eb804f94..236a80be46df 100644
--- a/app-emulation/img/metadata.xml
+++ b/app-emulation/img/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>email@linxon.ru</email>
+ <name>Yury Martynov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">genuinetools/img</remote-id>
</upstream>
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 5dec3f96e309..cdf4b6a07d8e 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,5 +1,5 @@
DIST kompose-1.16.0.tar.gz 5241785 BLAKE2B 9958b200827b70c94a499981880cc7a5d8137354205d96657d854aefebbd877e332ac3047f59e13b62dd6b9a9235d1ed83bb8b8de973d59f81906b3f376176a0 SHA512 267601ba51f5cfcbb95b9fbf52bbb99f9c810de8edb301b635a50936d7a714dc8410352ff3a4aa8819de1659a45cbb42caf5e552023cfa594a0eb8e99db57522
DIST kompose-1.19.0.tar.gz 5314491 BLAKE2B c03f7ece6dc91979a147bb1689525318b7c31b22242e6fbf5387469d3196dfc569178235b5a52ccdd9647ceb626be313017484451f149e375edf3b48da063328 SHA512 571c5f23a19ba1f7a403e2369d74a5f6ba051c5e9c27b79bf5ab05f8dfc9abd523862dad7da3cd0d503e4de2e76666cd1eea8d8921b0bbe79db81f11a23fbe64
EBUILD kompose-1.16.0.ebuild 914 BLAKE2B 135028b699263569332cc9e7e1d9559ac448ddcae5517505bf170a17b591a581b3513eb9d29deda4d103a93b556ddc2bc77f052b80ab4f786f7f4003254f63e6 SHA512 ad339be916fe398edd62cab08a67c47b83eb91cd91603402520609e9e3dc4218d3ed5d206f386cad75c8b0b0b0a63efc13cf1514166b1eacab9b63663a2e6231
-EBUILD kompose-1.19.0.ebuild 911 BLAKE2B 9f272a27c96ff9d6b1698653dfca5a348bbdf2e85a7d8d174e4ed31451dcc047eea889c80e55faeff56101a00355f1ff46fc48463e9d4fc6e30616307947eedf SHA512 2cb175dbe11246b42b4e52099356d463f8d6993e34c8aa3d1c60e5ecd0f1015effaec6e9441456de29bafeea2efbcffcb1930b2d4ddda0f8bf0bf1d21b699c2f
+EBUILD kompose-1.19.0.ebuild 903 BLAKE2B d1f5a72ecb852fbb2e9f3467fa694b643787e65aba01b828f6ef2df55f8e75f803004d333fa24a78e40490373dfbbbcb2b053dc1039e85a749814f54bd3dfc10 SHA512 6fa7d0d3f2e22595ca8ba8f8b7912743202705707698caf190a97f1e678a01d5f803b353c15867109f7de94b6611af5cc1d0d8c9879370e1399ec81673eb0708
MISC metadata.xml 250 BLAKE2B 7269bb56889c307f4610c9e7e3e2444b8e08cb953745cc674df9bbe1c1d9acfad6f542314a5770439c3bd65fc91f78e1e82a3bc5d14ecb158c4fde6dd5b8b062 SHA512 4f70d3e271588e217f8ec4e0acc7b86a70a4b5380405a0a3a4ffc923806e0d086327534de893e82e28b72d5616b8b0904626010aa3591bc46ccbc540523c7443
diff --git a/app-emulation/kompose/kompose-1.19.0.ebuild b/app-emulation/kompose/kompose-1.19.0.ebuild
index 6262daaf7558..d6b2bc22f6a7 100644
--- a/app-emulation/kompose/kompose-1.19.0.ebuild
+++ b/app-emulation/kompose/kompose-1.19.0.ebuild
@@ -26,5 +26,5 @@ src_compile() {
src_install() {
dobin bin/*
- dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
+ dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,CHANGELOG,CONTRIBUTING}.md}
}
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 10ddce83885a..2be8b6ddf941 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,7 +13,7 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13.ebuild 4152 BLAKE2B 4f538260d3a230a074b127be380e5cda6d5261053facccdf01ad4608c7858793cbfba4bc0be1436107d39cc0df1af9722ce489cc61f6cd6281c9abc722c3c23d SHA512 af462fec03e48d58cf2ae58397d4c26fd397a1b6b883ee0b74705b03f7cac599d73cbed99ef423203d0358f982bc7a09cde6e2c3724d45943f3735fccf61dd83
-EBUILD libguestfs-1.36.15.ebuild 4356 BLAKE2B 96dc133fe3ffb6a0de46eea0f80c0ee8dc8c0c0b62adc7b2ac5da651cca0364c85d919416b21d191bec237fedf17fb79e83182b1590edb355dfc61546f0fb858 SHA512 eebec01fcfe0244e91542873857189c44d749f5973e5907e0da5517c0d47840d2775e275a3e1d3571e695780523f99ebd47ad80fde7276696eb8b2e623b1a091
-EBUILD libguestfs-1.38.6.ebuild 4091 BLAKE2B 7850f04f4a563c0c35293f873c4e20c048821ee19ed09a3e51a42d851f98e8dc2293d21ca277f2b832e920ed263b3c0284f3cda23a752c90ee85005e842b4ef0 SHA512 420b8f275c0f9add36d04cf6f6833efb5d504ce2ce7950184d856cb88c5e2db7cbd73719b9a3ccd82837fdef7059d0cdf6dce01fba5ffda5e39243d8cf1f4d30
-MISC metadata.xml 1087 BLAKE2B 73bbd9edbb966fc64bd0d16f5cfea2545d8df03fcfb59d25459b0808c99bec6ac4b84d948f5adb1dbeff60dd1c4e9fadcedc5e5f547820c777b4f9e6495f3518 SHA512 390fd28d878c9a099ec88553ea4a09a969f08b52285c4ce72dc36cac02cb6a75cf8b2e658370622372397035274eb3302641bdb2f2aee2c59eb5ea4eda739fbf
+EBUILD libguestfs-1.36.13.ebuild 4179 BLAKE2B 6893f8b49c20fd40ffeabd2bdd012662138f8629b50bacc0be6c22a61b5f0a535feae7f62d2b980a2aa3cf632c7757a763d67aa4eda81e730e3a578421b0d17f SHA512 21d9cd53ebf417c8b464d59d237db7bd2b51898d8cf62bf94904757679511a743c1df546937154907ec224a17dbdb178ebd052008e5df4d5fac21c2d024476e9
+EBUILD libguestfs-1.36.15.ebuild 4383 BLAKE2B 7fdb093c636ad1e114e1b5e977483c0e97a14d7e724641eee6e885556c7572701d600b29f14379c20c4cae329d1adee8f70dca234d8221af735451f6be22138f SHA512 7250199782f720e0c601f17efe0adc8b7e4fc8a97a3daf40715907ebf22723c1b057b5aa6354cfaeffe63f1c741255e54a24e2b191b663e236da3bff6887fb6d
+EBUILD libguestfs-1.38.6.ebuild 4118 BLAKE2B 787d6deadf461eba5ed3242d53e4ee1aac9cdcadd17a6757c2569e13fcd46eb49aef3804b4d2021cd75d40c6c24a47039b725360ee398d44c515dff67aadb641 SHA512 9c3e1665ba6de8c713ec70d5884518242d5b1bc8917ea4772b3b2fd30b19da501b598678afb8e084c036c43122929350a1086e29a8eb816e3fd6624771bae8f0
+MISC metadata.xml 979 BLAKE2B f21c4edfd2b5664034d663e74a201903519fe9602f7709011b3e2518656a3e15e2284533be3795d58aa5a17dbc515c46aa0cfd661dda03b42fe3f39e645384f4 SHA512 c4621ee60b018e690cfeee7342245f8345baaff9bc6c628cd7cb4f2d5ffc2fa34b5ccda51ea35c8620c8b30ec9ebacd054c996fe5dfc53168493bc96e21b5ca6
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
index e73ca816d645..16e538be3cb4 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13.ebuild
@@ -20,6 +20,7 @@ SLOT="0/"${MY_PV_1}""
KEYWORDS="~amd64"
IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
index c79d9557ecb5..e5873115439e 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild
@@ -20,6 +20,7 @@ SLOT="0/"${MY_PV_1}""
KEYWORDS="~amd64"
IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
index 2bc6b5cb0d6c..84afdbc5ad9a 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild
@@ -20,6 +20,7 @@ SLOT="0/"${MY_PV_1}""
KEYWORDS="~amd64"
IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 5978f915af33..e6a8901cc57b 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -10,10 +10,6 @@
<name>Richard Jones</name>
<description>Upstream - please CC on bugs that concerns upstream</description>
</maintainer>
-<maintainer type="person">
- <email>eva@gentoo.org</email>
- <name>Gilles Dartiguelongue</name>
-</maintainer>
<longdescription>Libguestfs is a library and tool set for accessing and
modifying virtual machine (VM) disk images</longdescription>
<use>
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 99ada4deed8a..3adfc8aea6f9 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,5 +1,8 @@
AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
+DIST containers-storage-1.14.0-vfs-user-xattrs.patch 14835 BLAKE2B 99c35933dcb25385ee83b80cf282c11c738d0e4d91216cc08a50522f6caa9bca5938299412908f16df404f99e80616a10b4c02c0ebc38240a987830ddaf15008 SHA512 62c7ed49728bd12b5706f59b0d4af3b18d90e8cfc2b06e681f84fe3f5d3e0cd5c0317147109c4e3ec4fec26f82c269af3c9813e47339ce102e4e97400b74627d
DIST libpod-1.6.3.tar.gz 8340471 BLAKE2B b017a29ab034d8432b3abe2d920e0a71ad6542a5f088ed0de8fc67e846b409efbfd5be2e72908b52b5d21f05ce30c31db3bd55f8d8974711eb8f48cf8c3553a5 SHA512 a4d9f4c74db42fade86c36f4b2c27b8b3ff42db90af21bccab2eae8e9d710ae102c05e1fa926ac1d8e67613e11fa40163800077b61e49d90de521ab472e9c8dd
-EBUILD libpod-1.6.3.ebuild 3642 BLAKE2B 842ab44923c9850213edb42c270ef015c42547e4b3863642651befef70d14a08d29da2e0017d354bdf858124887e10904d9b8238830aff9ca980f0d1cd577820 SHA512 facb44cd7f15957fa067e467630e0f8afa2a2a7f4fd79d3903061af3c8932d28289c7a0b7733674077371213bce26bdf611b63e9bd0d67dc8fcac6568f9d79c0
+DIST libpod-1.6.4.tar.gz 8340370 BLAKE2B f68f0e846a442aa0717d4918f24260560ee77c8abdecd5af3dec06ee95ab899d623b8797962ac416bf498f22643d45de5c6d86049eead9d5c93073957c3fd9bf SHA512 69322551ab196cd3859e03988178c59a47df6f00ef0768a56e40d785f6b2130df03ff0ea76d101e21e748ea9260ede144d31f3ec21922ffd70eb2969a77d4194
+EBUILD libpod-1.6.3-r2.ebuild 4103 BLAKE2B 7c364d2bc48b0cbc04e7bc055971e192aef47fc8f60d564455b566a3e99aa3a830ec4faa94637939cea68dca965ca9a6baa93bfafc00448968b19fad68cfee00 SHA512 74e9f53d0ae82357cca455e3297d34e7d376ca88be862862637001de04820373029545a0fb914d6aec95e339f0aadb46a4ed91fe493fbf400dd7b62ff5475cb4
+EBUILD libpod-1.6.4.ebuild 4103 BLAKE2B 12b545008c0fcea03f336f21de3419f8c2549bc38132a3885ab53913da53a3e52cde2abd52b147848db2ee39d3670447376a589505bee8fed898ea537a1c40c3 SHA512 259c1e276a1f6b418e3977476e481c85e17e68e89be7115b3142139f7d812ede442b41439645efa672ea641201ece7e773ad719a4ce40f459fef9e51be86411c
MISC metadata.xml 967 BLAKE2B 3fa19bf6148a1d6e7f2b73793d68a8cd22b612dc3f96356a967e01bd2cc9acf92b6aeebd4f299ab35841277a6ba3210a3014190672354c74d07733bf65fe262a SHA512 87c7701c60d07f8c3395dadf04ea52f5676d2f6cf845838ea300f2824203520f5b1229dd91da9ccd3c81c8cbbdddc320674e0075b4c1a7539cd863f7b8123555
diff --git a/app-emulation/libpod/libpod-1.6.3.ebuild b/app-emulation/libpod/libpod-1.6.3-r2.ebuild
index 029c6c1413fc..345becae9294 100644
--- a/app-emulation/libpod/libpod-1.6.3.ebuild
+++ b/app-emulation/libpod/libpod-1.6.3-r2.ebuild
@@ -9,7 +9,9 @@ inherit bash-completion-r1 flag-o-matic go-module
DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
HOMEPAGE="https://github.com/containers/libpod/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
SLOT="0"
@@ -21,7 +23,7 @@ RESTRICT="test"
COMMON_DEPEND="
app-crypt/gpgme:=
>=app-emulation/conmon-2.0.0
- >=app-emulation/runc-1.0.0_rc6
+ || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
dev-libs/libassuan:=
dev-libs/libgpg-error:=
sys-fs/lvm2
@@ -39,6 +41,10 @@ RDEPEND="${COMMON_DEPEND}"
src_prepare() {
default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
# Disable installation of python modules here, since those are
# installed by separate ebuilds.
@@ -77,7 +83,7 @@ src_compile() {
echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
fi
- export -n GOCACHE XDG_CACHE_HOME
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
GOBIN="${S}/bin" \
emake all \
GIT_BRANCH=master \
@@ -93,6 +99,9 @@ src_install() {
newins test/registries.conf registries.conf.example
newins test/policy.json policy.json.example
+ insinto /usr/share/containers
+ doins seccomp.json
+
newinitd "${FILESDIR}"/podman.initd podman
insinto /etc/logrotate.d
diff --git a/app-emulation/libpod/libpod-1.6.4.ebuild b/app-emulation/libpod/libpod-1.6.4.ebuild
new file mode 100644
index 000000000000..45bd559b5243
--- /dev/null
+++ b/app-emulation/libpod/libpod-1.6.4.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/libpod/"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="apparmor btrfs ostree +rootless selinux"
+REQUIRED_USE="!ostree"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ >=app-emulation/conmon-2.0.0
+ || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ sys-fs/lvm2
+ sys-libs/libseccomp:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ rootless? ( app-emulation/slirp4netns )
+ selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+ default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
+
+ # Disable installation of python modules here, since those are
+ # installed by separate ebuilds.
+ sed -e '/^GIT_.*/d' \
+ -e 's/$(GO) build/$(GO) build -v -work -x/' \
+ -e 's/^\(install:.*\) install\.python$/\1/' \
+ -i Makefile || die
+
+ sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+ -i hack/get_release_info.sh || die
+}
+
+src_compile() {
+ # Filter unsupported linker flags
+ filter-flags '-Wl,*'
+
+ [[ -f hack/apparmor_tag.sh ]] || die
+ if use apparmor; then
+ echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+ fi
+
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ if use btrfs; then
+ echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+ else
+ echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die
+ fi
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ if use selinux; then
+ echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+ fi
+
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
+ GOBIN="${S}/bin" \
+ emake all \
+ GIT_BRANCH=master \
+ GIT_BRANCH_CLEAN=master \
+ COMMIT_NO="${EGIT_COMMIT}" \
+ GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ insinto /etc/containers
+ newins test/registries.conf registries.conf.example
+ newins test/policy.json policy.json.example
+
+ insinto /usr/share/containers
+ doins seccomp.json
+
+ newinitd "${FILESDIR}"/podman.initd podman
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/podman.logrotated" podman
+
+ dobashcomp completions/bash/*
+
+ keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+ LIBPOD_ROOTLESS_UPGRADE=false
+ if use rootless; then
+ has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+ fi
+}
+
+pkg_postinst() {
+ local want_newline=false
+ if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+ elog "You need to create the following config files:"
+ elog "/etc/containers/registries.conf"
+ elog "/etc/containers/policy.json"
+ elog "To copy over default examples, use:"
+ elog "cp /etc/containers/registries.conf{.example,}"
+ elog "cp /etc/containers/policy.json{.example,}"
+ want_newline=true
+ fi
+ if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+ ${want_newline} && elog ""
+ elog "For rootless operation, you need to configure subuid/subgid"
+ elog "for user running podman. In case subuid/subgid has only been"
+ elog "configured for root, run:"
+ elog "usermod --add-subuids 1065536-1131071 <user>"
+ elog "usermod --add-subgids 1065536-1131071 <user>"
+ want_newline=true
+ fi
+}
diff --git a/app-emulation/libvirt-snmp/Manifest b/app-emulation/libvirt-snmp/Manifest
index 69921b45be1d..5916280600ca 100644
--- a/app-emulation/libvirt-snmp/Manifest
+++ b/app-emulation/libvirt-snmp/Manifest
@@ -2,4 +2,4 @@ AUX libvirt-snmp.confd 143 BLAKE2B 0781bbd4a4fc0f9f9f32347ae5b730ee643ccfacbc02d
AUX libvirt-snmp.initd-r1 639 BLAKE2B 46cc58e561aa341a27381cf1ff7925758dae2a8a119fb789645d5a602631b52d7d3325549da4b5b256f33c94e9a7d90200e5010d326184eab58a2d83d9bb72da SHA512 90db400497ea1ff10ffb0b8fe1ec9cfbbb066cdec0db9669924080ec64fd9b2e878c063eeb8ba7ffea0c3cd1f154a9074daab0bd6951de34e3d1183518dfdb18
DIST libvirt-snmp-0.0.4.tar.gz 157859 BLAKE2B e2c8fcdd97ba9b55bd4d318c63f7738024c1360ee10aa4e685c2ea6ca02478206febff30f3e1a82eb1a2dadaa52a377cfbce538e12e33f4ea2fe10b1a089945d SHA512 dbf47e7983f9bd6fcff205fffd1f6006268cca774cf427d39dec84dc7de37b545c0dfcbb2c6f171f55d73487cdec13341097137e24de2dea58ce90494d281162
EBUILD libvirt-snmp-0.0.4.ebuild 1027 BLAKE2B 2f67b60d540531b3a6e6a1d05dd811f35c963b20a8ee8704f6fdc489222a8846f95af61a39ed3a1b3a5c5169a2e87bbe163f97e6ccde936e2fd16b348c769aed SHA512 04c43c28a709c383535e0006abd75f25bccd1bba999a98c02c0c921497b4ff708056473df579ada3799fa8ccd23668585e46e207d3ed5dff0c2805a00d545a67
-MISC metadata.xml 256 BLAKE2B 6c2547727deeea210991f6aad9ba6c5c1e409a50652f665d0dcf12e239ce3beab612375e2c6bc75e1ee02026149d11519ced3974e60ae165b225adf0bdbcd260 SHA512 379c849f353da475a34564fec13fd0bb74e2029b0e00cbfbbf35eb37323a46a0d483788917cfeeeacb91a30867de199eeff9e1e280c2dc9ada84f32cf221dc09
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-emulation/libvirt-snmp/metadata.xml b/app-emulation/libvirt-snmp/metadata.xml
index acd00be69f92..1b2becffa26c 100644
--- a/app-emulation/libvirt-snmp/metadata.xml
+++ b/app-emulation/libvirt-snmp/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>dev-zero@gentoo.org</email>
- <name>Tiziano Müller</name>
- </maintainer>
+ <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index dbde2dcee8bd..ff8c2482e8e4 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -19,9 +19,9 @@ DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2f
DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
-EBUILD libvirt-5.2.0-r2.ebuild 9748 BLAKE2B a193479eb74f656a41a96eb134e05e32e464c85e421b720627318ba78ab0dbe95649941b5ffb03821b52f95010f26977d30cc0154de30f6e7b21fb653e4437ff SHA512 87b84568d861cecdfe106a7b6f31570890c77f6fb58484faf586dad7827f6ef8bb52b0f25f8dd92556cd811aadada99700612d1afaf603d32545d5a41eaa916f
-EBUILD libvirt-5.5.0-r1.ebuild 9481 BLAKE2B ccf8b08a0073e88ef5718cbe48b5bbf256cc25520f55d486c3a79da2f6b0ff5380c4e6cc680eba125a738655d2ecb7d8f24756ad51743990becb5f313aa64bc4 SHA512 84ecf64c0fcdde9cd7a40f745ea8cd69a6c5476acdf4804eb63048d2f31b9b0cd535ea4fb7ed062cd16844c2c8053786e652b9febfa091a93827459b6989ecb3
-EBUILD libvirt-5.6.0.ebuild 9474 BLAKE2B 0ef7d9e54a1005739b18a7a383b91a2067ce0d40450be9c1786f509be0034b019192edf56a31b6f00864f88d5dae944707450f781ebb3991b763ee628934981b SHA512 a70deffb64868dae879ee3282d3426114798a46f4e9c6c64f932a7544d4bc5093638fab914e9b6dd2b867b29a82fa9d2c7724ec5a8052d8477c4bb131d61e32d
-EBUILD libvirt-5.8.0.ebuild 9606 BLAKE2B 226fb93c598b9afa0d6b60a03cbe7bf414ff0f818b98f03d5e371e51e6453becb0a8a775f037bf7abab5c3edf09486b894a712e2969d89672edd2cbd9abd0760 SHA512 c04a324286074b91876f7a544235068c4322359f1712c33ca24afcf831777a0be6db6d4fc54b8729b97407c39c4fad710e1948007973e8891c2b9e45c0d48b90
-EBUILD libvirt-9999.ebuild 9498 BLAKE2B 90016d6cb9d864dd8522de41a4b1c83775a465762d7ee5d3af8102d3eec1e1c8e79accb96a10c1d3119f12ded8668145f272d702cbd91a10de25270fd7edfe2d SHA512 dcbcb4d2719b3377ffda32121efd7caf758e43b540949319916c495c81c88fbc488c3bff2ecbe54b503c8f3feb61fdd240efdf1235d39c8a02ac6e163b622ff9
-MISC metadata.xml 3947 BLAKE2B a848dbc3ec81fd6d97a4067b3a0b508b2cbb6154b42af9f29830b801c801bf2db4706be9ab5bbb256ceff34f47a4b5d04215f5990a3b864e2070c7479632d753 SHA512 5c2a17a277bf942c6a28013659c3fd7c9b9dffa7c9209cb370852e018dd572a1a7080e56909bf2245ea29cc889f61c47e466e8eb5cf2f701f4a3b2d2fbdcaef8
+EBUILD libvirt-5.2.0-r2.ebuild 9684 BLAKE2B b924aa51971a05e5880ce341f4ea0ebcef0039f179e1a98ac80af697e11056213374260d6f35490688d71fada7c3e60a1ea3f386abaece50dbad5ce5b944375c SHA512 e24179ffd4ca9636c9619c238791586272933b00337fe3a3d312bbfe8f17e49ef39e33f962e742090e2309256fe80d82df4b114eeba9079eb117eb7f22601c5d
+EBUILD libvirt-5.5.0-r1.ebuild 9417 BLAKE2B f80fa9dd2242d74622d18a3d0c535b83e2fdfc205ba5f7097c059d2b530657d19f969583e5f8f9cfd98a0ff5dcc744b79386a142b3ca40088bcf055d24294a82 SHA512 a37aa512494368ea4b52548ae75b795f13a2eb494ac5854b09d4ad85771b5ab481603f8af57ce52916b3278b2bd77569f820a5298e4bb2929e0b6bd82fdb3a52
+EBUILD libvirt-5.6.0.ebuild 9410 BLAKE2B 56af18c238368dea87e19860189ad1bb0eba13450ebd7e053500ac97393752b38e72d60f861946b8d3aad1516ec8ae7950f98b16839797a9420d12881b58315a SHA512 154670e242f160374ea73828a0cf43187ae9c22724e39d0547944bc535d9efbd76cc855e255fe1fe308effce150f0f6b1291e9ffd692854536763aadefe9d245
+EBUILD libvirt-5.8.0.ebuild 9551 BLAKE2B 00c47f20cb087616821f999c7dfa01ff639d009b30fe6bcddeb515b0e2fa8213ce16d26c7be4cd41a5381013003686eae6b00fc89a82be4d59c3523231bb0c0b SHA512 311a04e646b9c025a7d5247f62af35b5f4ded2c596c52d4a48eac915b5584c3a796555bd02c6297ff8a4fa6d557fe3dfb6a19e5ba8f272cc55e3f6adb93bfdd2
+EBUILD libvirt-9999.ebuild 9482 BLAKE2B 3566eb4fcbc43322ec314c50057c99c9765c1700411575579f415fb19ea43f0075c22042ffd7434f4f154cf7b8defe97c3bec96bfe8e489b99f28f89858bde04 SHA512 482f5b2eff2cb16271774dac3f1bf02fd99e753dcefa34fa2b281d43913208fff78c91d045ff51ff9d36a86f542981e1e6d4cd3f26c385826a0bbb73e1a13715
+MISC metadata.xml 3791 BLAKE2B 1371e5d5c24af397dbfc9df32bd9b11cd32e49a72e3aba48e586660570bfe98f0b8f9d71d2c8e624b0e4ac470c275fbf87a2e49635b85560009aaedb25780933 SHA512 2ed3df24aecc0c419b6d6c512025b80c5efb9743843664ebd54fae15113f6625333b00c9e9b1e0aab7a5f1918ae194b71e8d59be6fa3e26964a0c677b1fcafd2
diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
index 0d00aa14bca9..90133363bafa 100644
--- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild
@@ -327,7 +327,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -341,6 +341,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -349,16 +352,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
index db4043651ccd..5fd272b35627 100644
--- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -336,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -344,16 +347,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild
index 11ae2447b09c..5fd58c94d1c2 100644
--- a/app-emulation/libvirt/libvirt-5.6.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild
@@ -322,7 +322,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -336,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -344,16 +347,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild
index 696f81fcdc79..5bec3ede6039 100644
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@@ -60,7 +60,6 @@ RDEPEND="
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
- !sys-apps/systemd[-cgroup-hybrid(+)]
>=sys-apps/util-linux-2.17
sys-devel/gettext
sys-libs/ncurses:0=
@@ -77,6 +76,7 @@ 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
@@ -325,7 +325,7 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
src_install() {
@@ -340,6 +340,9 @@ src_install() {
rm -rf "${D}"/var
rm -rf "${D}"/run
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -348,16 +351,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 63900def37dc..4761c3ff2cfc 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
if [[ ${PV} = *9999* ]]; then
inherit git-r3
@@ -61,7 +61,6 @@ RDEPEND="
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
- !sys-apps/systemd[-cgroup-hybrid(+)]
>=sys-apps/util-linux-2.17
sys-devel/gettext
sys-libs/ncurses:0=
@@ -78,6 +77,7 @@ 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
@@ -239,7 +239,7 @@ src_prepare() {
eautoreconf
}
-src_configure() {
+my_src_configure() {
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
@@ -295,6 +295,7 @@ src_configure() {
--disable-werror
--localstatedir=/var
+ --enable-dependency-tracking
)
if use virtualbox && has_version app-emulation/virtualbox-ose; then
@@ -308,13 +309,11 @@ src_configure() {
if [[ ${PV} = *9999* ]]; then
# Restore gnulib's config.sub and config.guess
# bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
+ (cd ${S}/.gnulib && git reset --hard > /dev/null)
fi
}
-src_test() {
- cd "${BUILD_DIR}"
-
+my_src_test() {
# remove problematic tests, bug #591416, bug #591418
sed -i -e 's#commandtest$(EXEEXT) # #' \
-e 's#virfirewalltest$(EXEEXT) # #' \
@@ -323,10 +322,10 @@ src_test() {
tests/Makefile
export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
+ HOME="${T}" emake check
}
-src_install() {
+my_src_install() {
emake DESTDIR="${D}" \
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
@@ -337,6 +336,9 @@ src_install() {
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
@@ -345,16 +347,13 @@ src_install() {
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- newbashcomp "${S}/tools/bash-completion/vsh" virsh
- bashcomp_alias virsh virt-admin
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
diff --git a/app-emulation/libvirt/metadata.xml b/app-emulation/libvirt/metadata.xml
index 3b887d5ce0c5..16c0b4752e5c 100644
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@@ -76,9 +76,7 @@
</flag>
<flag name="macvtap">
Support for MAC-based TAP (macvlan/macvtap). For networking instead
- of the normal TUN/TAP. It has its advantages and disadvantages.
- macvtap support requires very new kernels and is
- currently evolving. Support for this is experimental at best.
+ of the normal TUN/TAP.
</flag>
<flag name="vepa">Virtual Ethernet Port Aggregator (VEPA) / 802.1Qbg
support. Relies on macvtap support.</flag>
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 4fd252de5b35..f4bd642818eb 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -4,6 +4,6 @@ AUX lxd.initd 853 BLAKE2B 0b48de1a596767db356850adcb5682c5c351e7477b0d49d81aebf8
AUX lxd.service 174 BLAKE2B 8686d57a79fbc3a9ec2e1a3197012599a5d6b81b62188e779cdb9a86f9f413fa485090c79dab8c4aa8891e0e35604b85fb1cdb1da313918b34a974b61699b24a SHA512 6f9d71d5c08c49653f28511bc793d1365604af6bf105789caea27f4685d721fbb283f888e3b7310997b73ff2fc5bb1a47e7500c4678cb3d39124cab723523140
DIST lxd-3.14.tar.gz 26141949 BLAKE2B 69004501012c9a873eef77a60df7e5dba25c692224d27b02cd2d2b27533012e71bd7562cb64a17920234746e8be2819bb773365c01422c0b776dd2b7c36b69fe SHA512 3d2d4e61298fc9fde49defad776a398fcccf7639485e810173c9c7f7d939c354a9ad8112a4a631b0850f6eb54435012d289236ff61839416caf95434eb23c8ff
DIST lxd-3.16.tar.gz 24863601 BLAKE2B 0087c00d86ea3f623ea31bc008176e4232bb432f5c431c288f5c5ff3e1658abe4e310509088ddc6b23d8db68f8e93997522b8a5c0b19fd243abee13e11d3deb9 SHA512 11c6c5c49ceb23c31979829937e1baad340b8920481ef5b89b2b6d0b6b05967ec1f446f8b0330c11008f6fecea077eed0858af7fe802c50b52148757584fdfb9
-EBUILD lxd-3.14.ebuild 6838 BLAKE2B 19767cc66314b0faa5270a51fb0f5db7264c6f55bec02ddbed3673b3c051d16f9556d59da592b55b638b0e93d76fe549ac1ab24a5fe997d0af19c71f0ae4cb47 SHA512 8f7309e0eb05b64e6dbaf2c048511737d7df96d35bb1d0a340c9e80b2a025b3d49a37795303b02b4c0429fdfb43e881be22d1f4b555949a25c4e51b9607f3dbd
-EBUILD lxd-3.16.ebuild 8078 BLAKE2B 48585fc59909c1d404fbc1cb44e4c7ed4c49b78e2685dac1a542c9be44efffdd679c6bea7997cc0e52f0e434a4d96d1cedaf3ff53fc9e2bf96018da770484780 SHA512 03cd8e9a1e2da16f6f1b6720556fe781c96bd9376135cfdfca17bbd4028d31a71ff490bae8a6317e8bfea89394a87fd5b9505a8803fd80cdecd60f03764f96a4
+EBUILD lxd-3.14.ebuild 6865 BLAKE2B 56a86d6bb704c3c562654d01953b566f34e9d57abf915972899b663b61e8d9fe1e50523a439a406b013e7396c3286e104859bf4ca23106306ee719ef41810d80 SHA512 aadb152acac7f5784028bbd89c8ebc105992dd6898e22ed36b26889969b7ce1cffdb79e8db1c0e0a43ca98cae7feee3f133165c3f624b87611dfed1dbe0c8511
+EBUILD lxd-3.16-r1.ebuild 8076 BLAKE2B 051b4da2220e7badf1a5b298ec47e9ce855e115d7dac17643c8e4f15f8537c10329986fe2f7f160fd90b388989ae7227a5926ed7946f6930755340af93261ad9 SHA512 4f631def5be1699989e9c63d36f32816e966be0b4e3724a7fbd41c3e3f2645a1ca84b92e58f2562430ff3c3d6354831bd947a63c0815cb98f10cb0e91a2375bb
MISC metadata.xml 925 BLAKE2B 74a89f515bf441f62686a9a2fc2576ec8986705b681e52c9e8267acd6839b06fdafe82dd27df43c39b5e09bba87e63bbb27cc4da18ed31931393946b90add05b SHA512 e4fc6d70a790e164366349e4980f5161db0ca1b4d1996c1ce32223a75926a38ea46f8e08e6c708c6f41c2c81aebde3dbe0d0ce5c63f9340f7ae6f895b5fde144
diff --git a/app-emulation/lxd/lxd-3.14.ebuild b/app-emulation/lxd/lxd-3.14.ebuild
index 4d7ff49b9d13..3639d12ad028 100644
--- a/app-emulation/lxd/lxd-3.14.ebuild
+++ b/app-emulation/lxd/lxd-3.14.ebuild
@@ -11,6 +11,7 @@ SLOT="0"
KEYWORDS="amd64"
IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+RESTRICT="!test? ( test )"
inherit autotools bash-completion-r1 linux-info systemd user
diff --git a/app-emulation/lxd/lxd-3.16.ebuild b/app-emulation/lxd/lxd-3.16-r1.ebuild
index 8c7e5f94a4d8..6f15ebbce927 100644
--- a/app-emulation/lxd/lxd-3.16.ebuild
+++ b/app-emulation/lxd/lxd-3.16-r1.ebuild
@@ -11,6 +11,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="+daemon +ipv6 +dnsmasq nls test tools"
+RESTRICT="!test? ( test )"
inherit autotools bash-completion-r1 linux-info systemd user
@@ -45,7 +46,7 @@ RDEPEND="
net-libs/libnsl:0=
net-misc/rsync[xattr]
sys-apps/iproute2[ipv6?]
- sys-fs/fuse
+ sys-fs/fuse:0=
sys-fs/lxcfs
sys-fs/squashfs-tools
virtual/acl
@@ -190,7 +191,7 @@ src_install() {
emake DESTDIR="${D}" install
cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir"
- dolib.so libco.so || die "Can't install libco.so"
+ dolib.so libco.so
cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir"
emake DESTDIR="${D}" install
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 4b556629cbfb..dcd74b075adc 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,6 +1,8 @@
DIST nemu-2.1.0.tar.gz 89117 BLAKE2B a44bf67990d79af0b73caf077266c4775f302ffc81d2394993da45870a72f462d487a92d63abdbe875c382d11b8d691f446a5e0b7270355770838ea86328fb1d SHA512 7e655227e22f5e2dd5ec1f77ef1635f1aaab2e57e417fb33d83d35cc67d7b802c35fa9174cf4282287213a1a825714743773260b96b452a382a8248fbef238bf
DIST nemu-2.2.0.tar.gz 94061 BLAKE2B 95304e8834f1d5c1e31065728363de5d797ae79554733dd3fecd90388b2766bc8907acfeded36676272967153eed5a7f30baba9ef2384fca67d19f3519461fa6 SHA512 2f427a560ea5ac4112b7d5cdd8524366521ca3d185676a4faa9bc480331c3381b7a362aed20025dc1acc0f576f07fb627b03137e1998926761a169c5be0eaf97
+DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a
EBUILD nemu-2.1.0.ebuild 1672 BLAKE2B 7120f2c3a00e22e6ff2e3535b8fbb51d1995e85075386e32782ab98799a9a6de36618493caef92022ef6bcbb1865cd559cc6282e50627256a5136f25b8df8c77 SHA512 f4f0b240a8716757a80564cf4f0cd65b8592a6c45276e4cb2a2c90c6e7a7aa3406fac0b91b7ab98f551b8482390571432063c062880488ffe589bb404b9f2f17
EBUILD nemu-2.2.0.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c
+EBUILD nemu-2.2.1.ebuild 1857 BLAKE2B 221d8ba7d1560fc554a14252d63308da6837a17371ee0efa9b48a8117c9c1ef560c480ed2a5b4d923903f80e6f84e4b3d1238216d43f23e5f4cf49ea5b7e06f2 SHA512 3e9e955c674b0a94e8ea5b5415ee52978ffc929ddfc61270c96dc61acac0f845bcdbc35cb24f1d34fbb58931222345bdeae368c53bbf66164644f35113bf620c
EBUILD nemu-9999.ebuild 1916 BLAKE2B 232c49c84167c44c6fc3afd2e1b26cb6f820b53d345956c4d92058368f095206e3351ac431728a6f8847a88e53f09af7e39b5ff24874635b231b9a1ca6df7abc SHA512 87b016f6a485c921222428b96b11687cfb906118cfc398318b14f45ebd1c09aeb710b0cdea389a41e5936478e31645925599b32fe203fe07559debb54d7ed9b4
MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/nemu-2.2.1.ebuild b/app-emulation/nemu/nemu-2.2.1.ebuild
new file mode 100644
index 000000000000..7b885f4f50c6
--- /dev/null
+++ b/app-emulation/nemu/nemu-2.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils linux-info
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://lib.void.so/nemu/ https://bitbucket.org/PascalRD/nemu/"
+SRC_URI="https://lib.void.so/src/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug network-map +ovf savevm spice +vnc-client"
+
+RDEPEND="app-emulation/qemu[vnc,virtfs,spice?]
+ dev-db/sqlite:3=
+ sys-libs/ncurses:0=[unicode]
+ virtual/libusb:1
+ virtual/libudev:=
+ network-map? ( media-gfx/graphviz )
+ ovf? (
+
+ dev-libs/libxml2:2
+ app-arch/libarchive
+
+ )
+ vnc-client? ( net-misc/tigervnc )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+pkg_pretend() {
+ if use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel"
+ else
+ CONFIG_CHECK="~VETH ~MACVTAP"
+ ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
+ ERROR_VETH+=" into your kernel or loaded as a module to use the"
+ ERROR_VETH+=" local network settings feature."
+ ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
+
+ check_extra_config
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DNM_DEBUG=$(usex debug)
+ -DNM_WITH_NETWORK_MAP=$(usex network-map)
+ -DNM_WITH_OVF_SUPPORT=$(usex ovf)
+ -DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+ -DNM_WITH_SPICE=$(usex spice)
+ -DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+ )
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ elog "For non-root usage execute script:"
+ elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
+ elog "and add udev rule:"
+ elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /lib/udev/rules.d"
+ if use savevm; then
+ elog ""
+ elog "QEMU must be patched with qemu-qmp-savevm-VERSION.patch"
+ elog "Get this patch from nEMU repository"
+ fi
+}
diff --git a/app-emulation/openstack-guest-agents-unix/Manifest b/app-emulation/openstack-guest-agents-unix/Manifest
deleted file mode 100644
index 384049868c17..000000000000
--- a/app-emulation/openstack-guest-agents-unix/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX 0513f013625b6a652d7dcb663eb396b9b5bb924e.patch 2829 BLAKE2B a7fa55afb736dcf48e86f9ece1a626017f8e8cb3911de5b5bc51bff1a98abaea57497f38b8cabe7d22d2b0cda0af4d23cb559d47f7f92cbf86ed14921da9f17d SHA512 4394b16194411c8b5d7c258681a9bfde8d384fffb0c254e2d3a5cd85ecf58af369c7d286d40dcf9b215c96b7ec29ec49f7a9640b3c525f9c718c8aabc428d211
-AUX 4453b4773688eef6c60736d9cf07100716308a5e.patch 2604 BLAKE2B f586e6341e95e5ce7a6e241463080892ba164f26333c832ee403edc8f4bf574adb57196092a5b78b4aeaac843a411a16f7fd219626611f13ba8a8c730069d325 SHA512 2841a9529649cdc1631bb95f52c8bd5ef440258d81ff07f77cf97c70bb1e554883a59116f806f05b5f4a7035a7ca2fa0abab9df4d0159ae202069894731a758b
-AUX openstack-guest-agents-unix-1.39.0-python2.patch 882 BLAKE2B 86e5e3c87e08e7d61b5199c161599be15f7153f2f0d45c34775084dec3f55851165d65dfd8ccdc40a1e77826d996b07e516d2cfb13b412e8228dc87734e93e58 SHA512 573dc02f578894c0df8f4c7ff9f4064ea94a2e17c35bef689dfe348f8611302cdc1a6a2126188cc2c4383e1a484e3acea180365ee555a5bdfac749c857828380
-AUX patches-1.39.0-20140621.patch 13058 BLAKE2B aa9ddf619bc57bc164aeb976545d2105e0fa105ea61f164d1b52357299febb19a5f501260dfee57e220dbd6154848c3488ba628a1f41dc24d5b9fb62246eb45a SHA512 562aaae73acfd92a7af5d1cb7dfed52c07a1b94ce1b1bb645002515344aeba6c0737eeb4db120986495c8f6558ebf68d9cbe3862da2f0fe14d4266d0470fe185
-DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 BLAKE2B 4245fb6fa2f8344469b264d1e9eee39e1914f76a33f54677d36ca854feb5a0548454af00cf02db9c5f2f0b6e68de9dc19fcf62a604b5d55fab96b20ed70a507e SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80
-DIST openstack-guest-agents-unix-1.39.1.tar.gz 75458 BLAKE2B 6afcf0cb40c7f24f7ea6ea8ca8af40373ce2fcbfffc5a8cae65e2ed8bf7003eb498b4592fa215e57a20e3c5d11064cfa4629b79eb94712ebb0ad5b09459fe815 SHA512 b1e88bb3492018375e7b2275829e2698d82d75c975a396ab7409c9b88f7787145b0da87c81a089aa8914fae30e996654b589bc1675bba769b661d7d1deb9590d
-DIST openstack-guest-agents-unix-1.39.1_p20170227.tar.gz 75309 BLAKE2B 3cd6f0bc3f5d7ae2ba4b1e8822e3c6659525dde4b7b9a9092bae4d825c965d88c5cba8f50f7e322cc08df1c4a113010645b2969eb1f4d3377db8279d58f56e8d SHA512 f36e40344a6a4debfa070d43177208edbeef7a829ace999b970e1423d7004d9255ab239c1feacdf9f3d14ddb469c67ccefe90a1bd83b1fb81c38a407c277832c
-EBUILD openstack-guest-agents-unix-1.39.0-r1.ebuild 939 BLAKE2B 851af6f0a387a4acc821768156aaee12fe15ddb42165830d864cd2d76afd88818b4ff445a758e2f45a722ea4466b77779b0889e64ca06aa9495587219be376e7 SHA512 df63509a304e16fbd222e3b6234be09fe04771f04a85e83d0638bf11ae1c22a79955e719f50917ecb367aff928226692e298e1c6b8bbfadaf461c9a18a39ad18
-EBUILD openstack-guest-agents-unix-1.39.0-r2.ebuild 1175 BLAKE2B d32e75df33806cb4e6a5a07c4270ebd717a8d9266fcbd5d5c1fad558715e5863ddd6e799e94c657fe21a8657865b58c72bbe5affc10d73453ca3e006390243cf SHA512 45fe477835854f74c4739ff58180ac12e59c76f20636d11e8a22fc27e13e897a76840f2ac847a3144808b4fa923d95696aafead0d069acc36132cd114c80f380
-EBUILD openstack-guest-agents-unix-1.39.0.ebuild 610 BLAKE2B ae5c7e6c520e9baf3db5f3a5b7f4210e292727e865c8cf2cb023ef4dece9bcc470e815a8cbec119201fe7cd45f4e2cc4877890fb560ff1df4bbef47cbe803863 SHA512 513e7e710b81cd33f3dec761baeb9c769b042014bc7a05275cb400cfef591e1dc71055cc3ebab195cb009be907645b0b00c317f15e0b1a944fda4cb76c0e393f
-EBUILD openstack-guest-agents-unix-1.39.1.ebuild 1461 BLAKE2B 6af82a08b86a7a24e49be92ae953158e278fe6ccf07e0d06d1f49bcae5e83daf8f11e99b7680b2e4786a3036a9452d08d4cfedecd3cfa6487e528147761abb54 SHA512 fc3b5a8fa6a1c4728dbf4114274ed8a02dabd4dd93b7a407a25a3ae0acc3a22adf86051022d1ed4ed9fcc6f1f4a618e9d1acc3472a4d0807979e41062ba7b09a
-EBUILD openstack-guest-agents-unix-1.39.1_p20170227.ebuild 1677 BLAKE2B 84f8ad2b62eb0057f01cdbfb2c278dee45b5d78d5aa0c9a92e03bdb411916d94fd99116e96e7b8376908cff8a0ec066d93b4a714b85795f8a1679b403ca03a75 SHA512 685d27c58f47bb9ab05107e9be55d5a7789f9ed7b977bbe408683f108f735d2e489bd0682c64250510383f8972433883f0c77b23273933d964b7a87440f13c48
-MISC metadata.xml 329 BLAKE2B a2fdd220d42ab64eceb8ed37e7646523856b3a3578a0e1e811fcc70730c6090234d2d270ddc6dc8175088eda91b73e3905b47d19fc2e118b11667b37215769a5 SHA512 853f823555872a4294c7c6aff0b51a9e348fde71767ecf24c8f6e83002caa8c26767c7ab36d4231d14520d8689994b4dc924e3d3721528a8bd697f44783dffab
diff --git a/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch b/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
deleted file mode 100644
index bf95287a86f9..000000000000
--- a/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 84e1a32ee2b8d0607f2868365aa46aaea58f014c Mon Sep 17 00:00:00 2001
-From: Nate House <nathan.house@rackspace.com>
-Date: Mon, 20 Oct 2014 18:50:52 -0500
-Subject: [PATCH] Updated regexp to work with config headers added sometime ago
-
----
- tests/test_resetnetwork_interfaces.py | 26 +++++++++++---------------
- 1 file changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
-index dc8e7e7..b12b84c 100644
---- a/tests/test_resetnetwork_interfaces.py
-+++ b/tests/test_resetnetwork_interfaces.py
-@@ -344,17 +344,13 @@ def test_gentoo_legacy_ipv4(self):
-
- generated = outfiles['net'].rstrip()
- # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-+ # (todo: naterh) Remove excessive unused kwargs
-+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
- '# Label public\n*' +
- 'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
- 'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
-- 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)').format(
-- ip=interface['ipv4'][0][0],
-- netmask=interface['ipv4'][0][1],
-- gateway=interface['gateway4'],
-- dns=interface['dns'][0]
-- )
-- expected_regex = re.compile(pattern, re.MULTILINE)
-+ 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)')
-+ expected_regex = re.compile(pattern, re.DOTALL)
-
- self.assertRegexpMatches(generated, expected_regex)
-
-@@ -373,17 +369,17 @@ def test_gentoo_legacy_ipv6(self):
-
- # (todo: naterh) Update tests to mock for both ifconfig/iproute2
- generated = outfiles['net'].rstrip()
-- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
-+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
- '# Label public\n*' +
- 'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
- 'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
- 'dns_servers_eth0=\(\s*"{dns}"\s*\)').format(
-- ip=interface['ipv6'][0][0],
-- netmask_len=interface['ipv6'][0][1],
-- gateway=interface['gateway6'],
-- dns=interface['dns'][0]
-- )
-- expected_regex = re.compile(pattern, re.MULTILINE)
-+ ip=interface['ipv6'][0][0],
-+ netmask_len=interface['ipv6'][0][1],
-+ gateway=interface['gateway6'],
-+ dns=interface['dns'][0]
-+ )
-+ expected_regex = re.compile(pattern, re.DOTALL)
-
- self.assertRegexpMatches(generated, expected_regex)
-
diff --git a/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch b/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch
deleted file mode 100644
index ea506845ed36..000000000000
--- a/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 4453b4773688eef6c60736d9cf07100716308a5e Mon Sep 17 00:00:00 2001
-From: Nate House <nathan.house@rackspace.com>
-Date: Sun, 19 Oct 2014 15:49:35 -0500
-Subject: [PATCH] Updated tests to check for either ifconfig/iproute2
-
----
- tests/test_resetnetwork_interfaces.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_resetnetwork_interfaces.py b/tests/test_resetnetwork_interfaces.py
-index f2b73bf..dc8e7e7 100644
---- a/tests/test_resetnetwork_interfaces.py
-+++ b/tests/test_resetnetwork_interfaces.py
-@@ -343,8 +343,8 @@ def test_gentoo_legacy_ipv4(self):
- self.assertTrue('net' in outfiles)
-
- generated = outfiles['net'].rstrip()
--
-- pattern = ('modules=\( "ifconfig" \)\n*' +
-+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
-+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
- '# Label public\n*' +
- 'config_eth0=\(\s*"192.0.2.42 netmask 255.255.255.0"\s*\)\n*' +
- 'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
-@@ -371,8 +371,9 @@ def test_gentoo_legacy_ipv6(self):
-
- self.assertTrue('net' in outfiles)
-
-+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
- generated = outfiles['net'].rstrip()
-- pattern = ('modules=\( "ifconfig" \)\n*' +
-+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
- '# Label public\n*' +
- 'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
- 'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
-@@ -399,8 +400,9 @@ def test_gentoo_openrc_ipv4(self):
-
- self.assertTrue('net' in outfiles)
-
-+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
- generated = outfiles['net'].rstrip()
-- pattern = ('modules="ifconfig"\n*' +
-+ pattern = ('modules="ifconfig|iproute2"\n*' +
- '# Label public\n*' +
- 'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
- 'routes_eth0="\s*default via {gateway}\s*"\n*' +
-@@ -429,8 +431,9 @@ def test_gentoo_openrc_ipv6(self):
-
- self.assertTrue('net' in outfiles)
-
-+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
- generated = outfiles['net'].rstrip()
-- pattern = ('modules="ifconfig"\n*' +
-+ pattern = ('modules="ifconfig|iproute2"\n*' +
- '# Label public\n*' +
- 'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
- 'routes_eth0="\s*default via {gateway}\s*"\n*' +
diff --git a/app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch b/app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch
deleted file mode 100644
index 0010e9ea5eae..000000000000
--- a/app-emulation/openstack-guest-agents-unix/files/openstack-guest-agents-unix-1.39.0-python2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar openstack-guest-agents-unix-1.39.0.orig/scripts/gentoo/nova-agent.in openstack-guest-agents-unix-1.39.0/scripts/gentoo/nova-agent.in
---- openstack-guest-agents-unix-1.39.0.orig/scripts/gentoo/nova-agent.in 2013-12-31 02:02:57.000000000 -0800
-+++ openstack-guest-agents-unix-1.39.0/scripts/gentoo/nova-agent.in 2014-06-21 17:20:01.527148493 -0700
-@@ -35,8 +35,9 @@
- NOVA_PYTHONPATH="${reallibdir}/${NOVA_PYTHONPATH}"
- NOVA_PYTHONPATH="${NOVA_PYTHONPATH}:${NOVA_PYTHONPATH}/site-packages"
-
--if [ `which python > /dev/null 2>&1 ; echo $?` -eq 0 ]; then
-- PYTHONPATH="$(python -c 'import sys; print ":".join(sys.path)')"
-+PYTHON=python2
-+if [ `which $PYTHON > /dev/null 2>&1 ; echo $?` -eq 0 ]; then
-+ PYTHONPATH="$($PYTHON -c 'import sys; print ":".join(sys.path)')"
- fi
- export PYTHONPATH="$NOVA_PYTHONPATH:$PYTHONPATH"
- export PYTHONHOME="$NOVA_PYTHONPATH:$PYTHONPATH"
diff --git a/app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch b/app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch
deleted file mode 100644
index c275982fa94b..000000000000
--- a/app-emulation/openstack-guest-agents-unix/files/patches-1.39.0-20140621.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-commit fc8c9fe076e321ff98cc6717abbb21ee57808c52
-Merge: eaaae09 1ecec49
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date: Wed Apr 30 15:33:43 2014 +0000
-
- Merge pull request #43 from gtmanfred/master
-
- sbindir changes to exec_prefix
-
-commit eaaae09c27a33998374a8d63702c75b04ab3e5c2
-Merge: 773e431 1505a5a
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date: Tue Apr 29 18:21:27 2014 +0000
-
- Merge pull request #45 from leader716/master
-
- Added addditional logic to deterine if the hardware address for and inte...
-
-commit 1505a5a8e180910c3307bf04ccfc4eed09c0f40a
-Author: John Ward <john.ward@rackspace.com>
-Date: Tue Apr 29 14:28:34 2014 +0000
-
- Added addditional logic to deterine if the hardware address for and interface is 0x0 if so go to the next interface.
- I put this into place to handle tun adapters that have a hardware address of 0x0 which was causing the agent to
- segfault when it encounterd this type of adapter.
-
-commit 1ecec499d5bea73980a8aec992b394339acc83c7
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date: Fri Apr 25 20:38:35 2014 -0500
-
- sbindir changes to exec_prefix
-
- Systemd requires a full path for the start of the command, and there
- isn't one that isn't a nice way to change this.
-
-commit 773e431997a6612cbda9f11ec9d57f5685a29eea
-Merge: 1ca2056 12c0294
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date: Fri Apr 25 18:41:56 2014 +0000
-
- Merge pull request #39 from Camisa/master
-
- nova-agent should replace the Slice or Image ID rather than append
-
-commit 1ca2056a455f8075ed951f0a82b92820c0b33b54
-Merge: 1b05c75 f9a365e
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date: Fri Apr 25 18:40:29 2014 +0000
-
- Merge pull request #42 from gtmanfred/master
-
- Do not add static routes that are the default route, if a default gateway already exists.
-
- Courtesy of gtmanfred. Thank you!
-
-commit f9a365e7a9543d407ca9d75164688faa0ff53528
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date: Fri Apr 25 10:54:29 2014 -0500
-
- remove extra and from debian network.py
-
-commit 387d4e77695598a07be9e4593c5b236b81a1aeea
-Author: Daniel Wallace <danielwallace@gtmanfred.com>
-Date: Fri Apr 25 09:31:15 2014 -0500
-
- Do not add static routes that are the default route
-
-commit 1b05c75530c8b4cbf5347e84815e275ee0bbacd4
-Author: teran-mckinney <teran.mckinney@rackspace.com>
-Date: Thu Feb 13 19:26:36 2014 +0000
-
- Fix nova-agent not starting on some systems
-
- data/host existing could cause a fault on xs_handle.mkdir(self.request_path) if request_path (data/host) already existed. Wrap it in a try/except clause to ignore the fault as if the directory already exists, there's no reason to throw an exception while trying to create it.
-
- Workaround without this patch is to xenstore-rm data/host from affected VMs, or to do it from dom0 with the full path.
-
-commit 12c02941ef02dc6645e6d4700e8a028decbf0c19
-Author: Christopher J. Camisa <cjc@operator.host>
-Date: Thu Jan 30 03:11:51 2014 -0600
-
- nova-agent should replace the Slice or Image ID rather than append
-
-commit ce388bf600136736fdb790edef58a57aad8adfc1
-Author: AbhishekKr <abhikumar163@gmail.com>
-Date: Tue Jan 21 17:22:23 2014 +0530
-
- shebang fixed for installer.sh and bintar script; gitignore updated
-
-commit 91fe7d0262fe8ad685a287df291b504250b1184c
-Author: AbhishekKr <abhikumar163@gmail.com>
-Date: Fri Jan 3 16:51:54 2014 +0530
-
- FreeBSD changed ports, so bintar creation script need to
-diff --git a/.gitignore b/.gitignore
-index ae1ae1b..6bdeda8 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -55,3 +55,4 @@ unix/scripts/generic/nova-agent
- unix/scripts/gentoo/nova-agent
- unix/scripts/freebsd/nova-agent
- .idea/*
-+**/.venv
-diff --git a/commands/arch/network.py b/commands/arch/network.py
-index 1d698ca..2bc0aff 100644
---- a/commands/arch/network.py
-+++ b/commands/arch/network.py
-@@ -373,6 +373,11 @@ def _update_rc_conf_legacy(infile, interfaces):
- ifaces.append((ifname.replace(':', '_'), ' '.join(line)))
-
- for i, route in enumerate(interface['routes']):
-+ if route['network'] == '0.0.0.0' and \
-+ route['netmask'] == '0.0.0.0' and \
-+ route['gateway'] == gateway4:
-+ continue
-+
- line = "-net %(network)s netmask %(netmask)s gw %(gateway)s" % \
- route
-
-@@ -499,7 +504,10 @@ def _get_file_data_netctl(ifname, interface):
- print >>outfile, 'Gateway6=%s' % gateway6
-
- routes = ['%(network)s/%(netmask)s via %(gateway)s' % route
-- for route in interface['routes']]
-+ for route in interface['routes'] if not
-+ route['network'] == '0.0.0.0' and not
-+ route['netmask'] == '0.0.0.0' and not
-+ route['gateway'] == gateway4]
-
- if routes:
- print >>outfile, 'Routes=(\'%s\')' % '\' \''.join(routes)
-@@ -552,7 +560,10 @@ def _get_file_data_netcfg(ifname, interface):
- print >>outfile, 'GATEWAY6="%s"' % gateway6
-
- routes = ['"%(network)s/%(netmask)s via %(gateway)s"' % route
-- for route in interface['routes']]
-+ for route in interface['routes'] if not
-+ route['network'] == '0.0.0.0' and not
-+ route['netmask'] == '0.0.0.0' and not
-+ route['gateway'] == gateway4]
-
- if routes:
- print >>outfile, 'ROUTES=(%s)' % ' '.join(routes)
-diff --git a/commands/debian/network.py b/commands/debian/network.py
-index d91d602..3b82d97 100644
---- a/commands/debian/network.py
-+++ b/commands/debian/network.py
-@@ -234,6 +234,11 @@ def _get_file_data(interfaces):
- ifname_suffix_num += 1
-
- for route in interface['routes']:
-+ if route['network'] == '0.0.0.0' \
-+ and route['netmask'] == '0.0.0.0'\
-+ and 'gateway4' in interface \
-+ and route['gateway'] == interface['gateway4']:
-+ continue
- file_data += " post-up route add -net %(network)s " \
- "netmask %(netmask)s gw %(gateway)s || true\n" % route
- file_data += " pre-down route del -net %(network)s " \
-diff --git a/commands/freebsd/network.py b/commands/freebsd/network.py
-index 2d5d7f1..87e5e9e 100644
---- a/commands/freebsd/network.py
-+++ b/commands/freebsd/network.py
-@@ -211,6 +211,10 @@ def _create_rcconf_file(infile, interfaces, hostname):
- ifname_suffix_num += 1
-
- for route in interface['routes']:
-+ if route['network'] == '0.0.0.0' and \
-+ route['netmask'] == '0.0.0.0' and \
-+ route['gateway'] == gateway4:
-+ continue
- if ':' in route['network']:
- # ipv6
- fmt = '-net %(network)s/%(netmask)s %(gateway)s'
-diff --git a/commands/gentoo/network.py b/commands/gentoo/network.py
-index f3ceff5..f3e5251 100644
---- a/commands/gentoo/network.py
-+++ b/commands/gentoo/network.py
-@@ -199,7 +199,11 @@ def _confd_net_file(interfaces):
- lines.extend([ " {0}/{1} via {2}".format(route['network'],
- commands.network.NETMASK_TO_PREFIXLEN[route['netmask']],
- route['gateway']
-- ) for route in interface['routes'] ])
-+ ) for route in interface['routes'] if not
-+ route['network'] == '0.0.0.0' and not
-+ route['netmask'] == '0.0.0.0' and
-+ 'gateway4' in interface and not
-+ route['gateway'] == interface['gateway4']])
- if 'gateway4' in interface and interface['gateway4']:
- lines.append(" default via {0}".format(interface['gateway4']))
- if 'gateway6' in interface and interface['gateway6']:
-@@ -247,7 +251,11 @@ def _confd_net_file_legacy(interfaces):
- lines.append("routes_{0}=(".format(name))
- lines.extend([ " \"{0} netmask {1} gw {2}\"".format(
- route['network'], route['netmask'], route['gateway']
-- ) for route in interface['routes'] ])
-+ ) for route in interface['routes'] if not
-+ route['network'] == '0.0.0.0' and not
-+ route['netmask'] == '0.0.0.0' and
-+ 'gateway4' in interface and not
-+ route['gateway'] == interface['gateway4'] ])
- if 'gateway4' in interface and interface['gateway4']:
- lines.append(" \"default via {0}\"".format(interface['gateway4']))
- if 'gateway6' in interface and interface['gateway6']:
-diff --git a/commands/redhat/network.py b/commands/redhat/network.py
-index a85ed6b..e853fbd 100644
---- a/commands/redhat/network.py
-+++ b/commands/redhat/network.py
-@@ -202,6 +202,11 @@ def _get_file_data(ifname_prefix, interface):
-
- route_data = ''
- for i, route in enumerate(interface['routes']):
-+ if route['network'] == '0.0.0.0' and \
-+ route['netmask'] == '0.0.0.0' and \
-+ 'gateway4' in interface and \
-+ route['gateway'] == interface['gateway4']:
-+ continue
- route_data += "ADDRESS%d=%s\n" % (i, route['network'])
- route_data += "NETMASK%d=%s\n" % (i, route['netmask'])
- route_data += "GATEWAY%d=%s\n" % (i, route['gateway'])
-diff --git a/commands/suse/network.py b/commands/suse/network.py
-index 2947974..baad7b2 100644
---- a/commands/suse/network.py
-+++ b/commands/suse/network.py
-@@ -191,6 +191,10 @@ def _get_file_data(ifname, interface):
-
- route_data = ''
- for route in interface['routes']:
-+ if route['network'] == '0.0.0.0' and \
-+ route['netmask'] == '0.0.0.0' and \
-+ route['gateway'] == gateway4:
-+ continue
- network = route['network']
- netmask = route['netmask']
- gateway = route['gateway']
-diff --git a/lib/agentlib.c b/lib/agentlib.c
-index ccba6e3..cced430 100644
---- a/lib/agentlib.c
-+++ b/lib/agentlib.c
-@@ -73,7 +73,10 @@ static PyObject *_agentlib_get_interfaces(PyObject *self, PyObject *args)
- goto next;
-
- #if defined(__linux__)
-- if (ifa->ifa_addr->sa_family != PF_PACKET)
-+ if (ifa->ifa_addr == NULL)
-+ goto next;
-+
-+ if (ifa->ifa_addr->sa_family != PF_PACKET)
- goto next;
-
- struct sockaddr_ll *sll = (struct sockaddr_ll *)ifa->ifa_addr;
-diff --git a/plugins/xscomm.py b/plugins/xscomm.py
-index e3faa2e..9b8a33b 100644
---- a/plugins/xscomm.py
-+++ b/plugins/xscomm.py
-@@ -41,7 +41,11 @@ class XSComm(object):
- XENSTORE_RESPONSE_PATH)
-
- self.xs_handle = pyxenstore.Handle()
-- self.xs_handle.mkdir(self.request_path)
-+ try:
-+ self.xs_handle.mkdir(self.request_path)
-+ except:
-+ pass
-+
- self.requests = []
-
- def _check_handle(self):
-diff --git a/scripts/gentoo/nova-agent.in b/scripts/gentoo/nova-agent.in
-index a043394..7f2687e 100755
---- a/scripts/gentoo/nova-agent.in
-+++ b/scripts/gentoo/nova-agent.in
-@@ -59,7 +59,7 @@ start() {
- /usr/bin/xenstore write data/host/system-init '{"name":"resetnetwork","value":""}'
- /usr/bin/xenstore watch -n 1 data/guest/system-init >/dev/null
- [ "$(/usr/bin/xenstore read data/guest/system-init | wc -l)" -gt "0" ] || eend 1
-- echo "UUID=\"$(/usr/bin/xenstore read name)\"" >> /etc/conf.d/nova-agent
-+ echo "UUID=\"$(/usr/bin/xenstore read name)\"" > /etc/conf.d/nova-agent
- fi
-
- eend $RET
-diff --git a/scripts/installer.sh.in b/scripts/installer.sh.in
-index 8ef793d..3fbf352 100755
---- a/scripts/installer.sh.in
-+++ b/scripts/installer.sh.in
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
-
- # vim: tabstop=4 shiftwidth=4 softtabstop=4
- #
-diff --git a/scripts/systemd/nova-agent.service.in b/scripts/systemd/nova-agent.service.in
-index 9d8a4a7..b73ebbe 100644
---- a/scripts/systemd/nova-agent.service.in
-+++ b/scripts/systemd/nova-agent.service.in
-@@ -4,7 +4,7 @@ Description=nova-agent service
- [Service]
- Environment=LD_LIBRARY_PATH=@prefix@/share/@PACKAGE@/@PACKAGE_VERSION@/lib
- EnvironmentFile=-/etc/nova-agent.env
--ExecStart=@sbindir@/nova-agent -n -l info @prefix@/share/@PACKAGE@/nova-agent.py
-+ExecStart=@prefix@/sbin/nova-agent -n -l info @prefix@/share/@PACKAGE@/nova-agent.py
-
-
- [Install]
-diff --git a/tools/nova-agent-builder.sh b/tools/nova-agent-builder.sh
-index 1823639..fcaa7c7 100755
---- a/tools/nova-agent-builder.sh
-+++ b/tools/nova-agent-builder.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- ##### NOVA AGENT BUILDER
- ##### how_to:$ sh nova-agent-builder.sh help
- ##### W.I.P. works fine for most of cases,
-@@ -202,7 +202,7 @@ install_pre_requisite_freebsd(){
- export INSTALL_D=""
- uname -a
-
-- pkg_add -r git autogen automake wget bash
-+ pkg_add -r git autogen automake wget bash libtool
- pkg_add -r py27-unittest2 py27-cryptkit py27-pycrypto py27-mox
-
- # re-install xen-tool :: required for pyxenstore install
diff --git a/app-emulation/openstack-guest-agents-unix/metadata.xml b/app-emulation/openstack-guest-agents-unix/metadata.xml
deleted file mode 100644
index 9ece78e0b73c..000000000000
--- a/app-emulation/openstack-guest-agents-unix/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>robbat2@gentoo.org</email>
- </maintainer>
- <upstream>
- <remote-id type="github">rackerlabs/openstack-guest-agents-unix</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
deleted file mode 100644
index ef90ea71bc02..000000000000
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
-
-inherit autotools eutils vcs-snapshot python-single-r1
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-util/patchelf
- dev-python/pycrypto[${PYTHON_USEDEP}]
- dev-python/pyxenstore[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/patches-1.39.0-20140621.patch \
- "${FILESDIR}"/openstack-guest-agents-unix-1.39.0-python2.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doinitd scripts/gentoo/nova-agent
-}
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
deleted file mode 100644
index d3efb5aa64c5..000000000000
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
-
-inherit autotools eutils vcs-snapshot python-single-r1
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-util/patchelf
- dev-python/pycrypto[${PYTHON_USEDEP}]
- dev-python/pyxenstore[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/patches-1.39.0-20140621.patch \
- "${FILESDIR}"/openstack-guest-agents-unix-1.39.0-python2.patch
- # Ignore the deps of install-exec-local
- sed -i -e '/^install-exec-local:/s,:.*,:,g' Makefile.am
- # bashism fix
- sed -r -i -e '/^export ([A-Z_]+)/{ s,^export ,,g; s,^([A-Z0-9_]+)(.*),\1\2; export \1,g; }' scripts/gentoo/nova-agent.in
-
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doinitd scripts/gentoo/nova-agent
-}
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
deleted file mode 100644
index 46959c8c3844..000000000000
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils vcs-snapshot
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- dev-util/patchelf
- dev-python/pycrypto
- dev-python/pyxenstore
- "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- doinitd scripts/gentoo/nova-agent
-}
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
deleted file mode 100644
index 0da3fbbb7ff5..000000000000
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1 vcs-snapshot
-
-DESCRIPTION="Openstack Unix Guest Agent"
-HOMEPAGE="https://github.com/rackerlabs/openstack-guest-agents-unix"
-SRC_URI="https://github.com/rackerlabs/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
- dev-python/pycrypto[${PYTHON_USEDEP}]
- dev-python/pyxenstore[${PYTHON_USEDEP}]
- dev-util/patchelf
- ${PYTHON_DEPS}
-"
-DEPEND="
- ${CDEPEND}
- test? (
- dev-python/mox[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="${CDEPEND}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/4453b4773688eef6c60736d9cf07100716308a5e.patch \
- "${FILESDIR}"/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
-
- # Note: https://github.com/rackerlabs/openstack-guest-agents-unix/issues/52
- ebegin 'patching tests/test_injectfile.py'
- sed \
- -e '97,127 d' \
- -i tests/test_injectfile.py
- STATUS=$?
- eend ${STATUS}
- [[ ${STATUS} -gt 0 ]] && die
-
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doinitd scripts/gentoo/nova-agent
-}
-
-pkg_postinst() {
- elog "If you would like to utilize openstack-guest-agents-unix, add 'nova-agent' to"
- elog "your 'default' runlevel:"
- elog " rc-update add nova-agent default"
-}
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
deleted file mode 100644
index 944e7f894497..000000000000
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
+++ /dev/null
@@ -1,73 +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 eutils autotools linux-info python-single-r1
-
-COMMIT="c9a4f15b8c8f2349601d3073cc95e30d3b91af13"
-
-DESCRIPTION="Unix Guest Agent for OpenStack"
-HOMEPAGE="https://wiki.openstack.org/wiki/GuestAgent"
-SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="mirror strip"
-
-DEPEND="
- app-emulation/xe-guest-utilities[-xenstore]
- dev-util/patchelf
- dev-python/pycrypto[${PYTHON_USEDEP}]
- test? ( dev-python/mox[${PYTHON_USEDEP}] )
- test? ( dev-python/unittest2[${PYTHON_USEDEP}] )
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-emulation/xe-guest-utilities
- dev-python/pyxenstore[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
-"
-S=${WORKDIR}/${PN}-${COMMIT}
-
-# Required for Emergency Console
-CONFIG_CHECK="~KEYBOARD_ATKBD"
-
-pkg_setup()
-{
- python-single-r1_pkg_setup
-}
-
-src_prepare()
-{
- # Note: https://github.com/rackerlabs/openstack-guest-agents-unix/issues/52
- ebegin 'patching tests/test_injectfile.py'
- sed -e '97,127 d' -i tests/test_injectfile.py
- STATUS=$?
- eend ${STATUS}
- [[ ${STATUS} -gt 0 ]] && die
-
- eapply_user
- eautoreconf
-}
-
-src_install()
-{
- emake DESTDIR="${D}" install || die
- doinitd scripts/gentoo/nova-agent
-}
-
-pkg_postinst()
-{
- if [ "$(rc-config list default | grep nova-agent)" = "" ] ; then
- elog "To start nova-agent automatically by default"
- elog "you should add it to the default runlevel :"
- elog "\`rc-update add nova-agent default\`"
- elog
- fi
-}
diff --git a/app-emulation/pcem/Manifest b/app-emulation/pcem/Manifest
new file mode 100644
index 000000000000..64e997f814c4
--- /dev/null
+++ b/app-emulation/pcem/Manifest
@@ -0,0 +1,4 @@
+AUX pcem-15-respect-cflags.patch 300 BLAKE2B 4531829e43d43501fe889b34381fc056ffa2734ca499686558cf39ef245f3808e6488c32d6938487d018175ab8a370a28e491cc957406ea6e430a9afff44dae2 SHA512 7800d9056fc1ab4b38f97a6021da7288b990ab9c562846be1ae4ec6636c888fd444c635076f070c50f39681202995a41575823a225c77017d389638feaf1a93c
+DIST PCemV15Linux.tar.gz 1741312 BLAKE2B fa8de8c98a57ac79be11921190960eaa1e5d53896db0749a7f53704362b6415544632a6f918a8f1ce57d2f75f28af52715856346421cc0a8355236a01bb7dcac SHA512 c2501827689acc0f3381d785dc3b008866e82d242bea3fa5af7e786fc58fdf72f76eafda98d12ce88c59ff338bc7dc441484af9c1bc9357c7cc75d94bbe0a7b6
+EBUILD pcem-15.ebuild 1474 BLAKE2B 313b607cffbb48c996e985679de5704a97e84a552f8a25cb3877e9c7c66993dd9ae4b68382be6e50aa8d96a5307469edae71692d9c7e8ae2261a2f7e7f1e3e9b SHA512 c350f1cf59b9fefa787853840b5655434fdf52b28137ddb40f4e5b061f1013329c2112b25585a079388beb8962b572a4f0a0df2b2f63e8c7be22173a6d7094af
+MISC metadata.xml 856 BLAKE2B 628963f0f0d30b7d95b5f7b9f23907fa37129397a5470bde252df40d4c40e57f6657db0d02c935414707537bbe995386c158d5ada56c32e4dd6f53b13a1e2fbb SHA512 e1bb08b4e216ab48ad0d52a59b38dba0db566104ffbb73c2e6cb5d12eee66f78bfaf32caa564aecbcce9ecab21d98d5514ff828dde734671b2c34523137a356e
diff --git a/app-emulation/pcem/files/pcem-15-respect-cflags.patch b/app-emulation/pcem/files/pcem-15-respect-cflags.patch
new file mode 100644
index 000000000000..734812a69daa
--- /dev/null
+++ b/app-emulation/pcem/files/pcem-15-respect-cflags.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac 2019-05-19 18:40:05.000000000 +0200
++++ b/configure.ac 2019-09-21 17:34:53.499993726 +0200
+@@ -31,8 +31,8 @@
+ CXXFLAGS="-Wall -O0 -g -D_DEBUG"
+ AC_MSG_RESULT([yes])
+ else
+- CFLAGS="-O3"
+- CXXFLAGS="-O3"
++ CFLAGS?="-O3"
++ CXXFLAGS?="-O3"
+ AC_MSG_RESULT([no])
+ fi
+
diff --git a/app-emulation/pcem/metadata.xml b/app-emulation/pcem/metadata.xml
new file mode 100644
index 000000000000..d949dbdb3e6e
--- /dev/null
+++ b/app-emulation/pcem/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <longdescription>
+ PCem (an acronym for Personal Computer emulator) is an open-source,
+ low-level PC emulator developed for Windows and Linux by Sarah Walker.
+
+ It focuses on PC hardware from the 1980's and 1990's.
+ A variety of operating systems can be installed in the emulator,
+ which can then be used to launch programs.
+ </longdescription>
+ <use>
+ <flag name="networking">Enable support for emulation of network cards.</flag>
+ </use>
+ <upstream>
+ <bugs-to>https://pcem-emulator.co.uk/phpBB3/viewforum.php?f=2</bugs-to>
+ <remote-id type="bitbucket">pcem_emulator/pcem</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-emulation/pcem/pcem-15.ebuild b/app-emulation/pcem/pcem-15.ebuild
new file mode 100644
index 000000000000..cf76b44d1f9c
--- /dev/null
+++ b/app-emulation/pcem/pcem-15.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop wxwidgets
+
+WX_GTK_VER="3.0"
+
+DESCRIPTION="A PC emulator that specializes in running old operating systems and software"
+HOMEPAGE="
+ https://pcem-emulator.co.uk/
+ https://bitbucket.org/pcem_emulator/pcem/
+"
+SRC_URI="https://pcem-emulator.co.uk/files/PCemV${PV}Linux.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa networking"
+
+S="${WORKDIR}"
+
+RDEPEND="
+ alsa? ( media-libs/alsa-lib )
+ media-libs/libsdl2
+ media-libs/openal
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+
+DEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-respect-cflags.patch" )
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-release-build
+ $(use_enable alsa)
+ $(use_enable networking)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/pcem
+ doins -r configs nvr roms
+
+ newicon src/icons/32x32/motherboard.png pcem.png
+ make_desktop_entry "pcem" "PCem" pcem "Development;Utility"
+
+ dodoc readme.txt
+}
+
+pkg_postinst() {
+ elog "In order to use PCem, you will need some roms for various emulated systems."
+ elog "You can either install globally for all users or locally for yourself."
+ elog ""
+ elog "To install globally, put your ROM file into '${ROOT}/usr/share/pcem/roms/<system>'."
+ elog "To install locally, put your ROM file into '~/.pcem/roms/<system>'."
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 44707eacb8d7..e6820cb0587c 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,7 +14,9 @@ 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
-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
+DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
+EBUILD qemu-4.0.0-r50.ebuild 24075 BLAKE2B a7b8bc7677572b90bced4305c81708f76aa84ccbe66a67abd688cddfee57720a97a5fbd5fddcd86645d6934c2176bbc173abf0074e5c5efcc1cd5cebf291ff9b SHA512 1d8c791eaf4044fad90bc37148a923adb71d4f4c3cdd3af34b49db17250567601afde7a13b445cbeef713f6efc670f12cf552061df018c06dd9c2d5b6f28c430
+EBUILD qemu-4.1.0.ebuild 24179 BLAKE2B 9d63e1de61dee8b2ead7f8d1a116cc0c48dbcca4da1b4a1964eb27d78af2102679531e1eeea39e5310deff357340f7cc9975af6e2779959e60ff8b093b96a4fd SHA512 ae06d34275cde9c17528f2354b50b3883381070d7d9fccb5575472689cbbb429d88bb17777427a756c07bb48f09cf09199b39c9891e18d404ceb477db1380322
+EBUILD qemu-4.2.0.ebuild 24214 BLAKE2B 24a1efdc5da39832800caba5366ec83a5bc65bfbb926221cc1ccf9e69768a3e5dc85836f8a414dddb70e1340f7b21be3b8e5f4e9caf64a1f218e1de40261154f SHA512 19419e16740ab256e37994166afb621f9921804f732044ff22d68ee568385b471dafe895e8548d0d85381ab14d2ae7a3308256c002897cdf38f255dedd3df181
+EBUILD qemu-9999.ebuild 24160 BLAKE2B 3ddd55b9e24c433a65bfc86cd98f0aa08ce36dcd518d7171cdf247d993fce17c9f67b9d3063c8ceae206b15c2b0bc1c7fe947b0e63127e90d8b188d7c6ad28de SHA512 229201029e102112fcaf9bb156b16c4c1d1662d0258c33e1e5bfbe5b8e92dc1342dfa3afdd7139fbe0f9a6fc4301047e8a42b2bd54c538eef7c50ffbb4bb936d
+MISC metadata.xml 4207 BLAKE2B 460760825ae5834b52401df08e5ca7d7f7509375a92bc4d850c6b6500f814e011ada333ef075c2dece1edfac5377a727f108ca11d24d84e3e0fb99e25c54dd4f SHA512 39250ec28edffc37f8af13550afe5febfbffb59ab473d3f896629c2dfca8adeaa5892dcfe4e84e503088e14f344aee16c662fb7fb417922c0811b9c621c10c8b
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 4c468733de52..c7c7fef2f08b 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -30,6 +30,7 @@
<flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release.
This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
+ <flag name="plugins">Enable qemu plugin API via shared library loading.</flag>
<flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag>
<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
<flag name="sdl">Enable the SDL-based console</flag>
@@ -46,6 +47,7 @@
<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
<flag name="vde">Enable VDE-based networking</flag>
<flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+ <flag name="vhost-user-fs">Enable shared file system access using the FUSE protocol carried over virtio.</flag>
<flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag>
<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
diff --git a/app-emulation/qemu/qemu-4.0.0-r50.ebuild b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
index d585d58e2726..428fbaafe4df 100644
--- a/app-emulation/qemu/qemu-4.0.0-r50.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r50.ebuild
@@ -47,6 +47,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+RESTRICT="!test? ( test )"
# Allow no targets to be built so that people can get a tools-only build.
# Block USE flag configurations known to not work.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-emulation/qemu/qemu-4.1.0.ebuild b/app-emulation/qemu/qemu-4.1.0.ebuild
index d0bec4380dbc..e8f34c66cab1 100644
--- a/app-emulation/qemu/qemu-4.1.0.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0.ebuild
@@ -53,6 +53,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+RESTRICT="!test? ( test )"
# Allow no targets to be built so that people can get a tools-only build.
# Block USE flag configurations known to not work.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-emulation/qemu/qemu-4.2.0.ebuild b/app-emulation/qemu/qemu-4.2.0.ebuild
new file mode 100644
index 000000000000..0c4b0cdd9a49
--- /dev/null
+++ b/app-emulation/qemu/qemu-4.2.0.ebuild
@@ -0,0 +1,826 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
+
+FIRMWARE_ABI_VERSION="4.0.0-r50"
+
+inherit eutils linux-info toolchain-funcs multilib python-r1 \
+ udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git"
+ EGIT_SUBMODULES=(
+ slirp
+ tests/fp/berkeley-{test,soft}float-3
+ ui/keycodemapdb
+ )
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
+
+LICENSE="GPL-2 LGPL-2 BSD-2"
+SLOT="0"
+
+IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
+ +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
+ kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
+ plugins +png pulseaudio python rbd sasl +seccomp sdl 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"
+
+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"
+IUSE_USER_TARGETS="${COMMON_TARGETS}
+ aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
+ tilegx"
+
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+
+RESTRICT="!test? ( test )"
+# Allow no targets to be built so that people can get a tools-only build.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ qemu_softmmu_targets_arm? ( fdt )
+ qemu_softmmu_targets_microblaze? ( fdt )
+ qemu_softmmu_targets_mips64el? ( fdt )
+ qemu_softmmu_targets_ppc64? ( fdt )
+ qemu_softmmu_targets_ppc? ( fdt )
+ qemu_softmmu_targets_riscv32? ( fdt )
+ qemu_softmmu_targets_riscv64? ( fdt )
+ static? ( static-user !alsa !gtk !opengl !pulseaudio !snappy )
+ virtfs? ( xattr )
+ vte? ( gtk )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# and user/softmmu targets (qemu-*, qemu-system-*).
+#
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected). This is because qemu supports using the C library's API
+# when available rather than always using the external library.
+ALL_DEPEND="
+ >=dev-libs/glib-2.0[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ python? ( ${PYTHON_DEPS} )
+ systemtap? ( dev-util/systemtap )
+ xattr? ( sys-apps/attr[static-libs(+)] )"
+
+# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
+# softmmu targets (qemu-system-*).
+SOFTMMU_TOOLS_DEPEND="
+ dev-libs/libxml2[static-libs(+)]
+ xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
+ >=x11-libs/pixman-0.28.0[static-libs(+)]
+ accessibility? (
+ app-accessibility/brltty[api]
+ app-accessibility/brltty[static-libs(+)]
+ )
+ aio? ( dev-libs/libaio[static-libs(+)] )
+ alsa? ( >=media-libs/alsa-lib-1.0.13 )
+ bzip2? ( app-arch/bzip2[static-libs(+)] )
+ capstone? ( dev-libs/capstone:= )
+ caps? ( sys-libs/libcap-ng[static-libs(+)] )
+ curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
+ gnutls? (
+ dev-libs/nettle:=[static-libs(+)]
+ >=net-libs/gnutls-3.0:=[static-libs(+)]
+ )
+ gtk? (
+ x11-libs/gtk+:3
+ vte? ( x11-libs/vte:2.91 )
+ )
+ infiniband? (
+ sys-fabric/libibumad:=[static-libs(+)]
+ sys-fabric/libibverbs:=[static-libs(+)]
+ sys-fabric/librdmacm:=[static-libs(+)]
+ )
+ iscsi? ( net-libs/libiscsi )
+ jemalloc? ( dev-libs/jemalloc )
+ jpeg? ( virtual/jpeg:0=[static-libs(+)] )
+ lzo? ( dev-libs/lzo:2[static-libs(+)] )
+ ncurses? (
+ sys-libs/ncurses:0=[unicode]
+ sys-libs/ncurses:0=[static-libs(+)]
+ )
+ nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ opengl? (
+ virtual/opengl
+ media-libs/libepoxy[static-libs(+)]
+ media-libs/mesa[static-libs(+)]
+ media-libs/mesa[egl,gbm]
+ )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
+ pulseaudio? ( media-sound/pulseaudio )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
+ sdl? (
+ media-libs/libsdl2[X]
+ media-libs/libsdl2[static-libs(+)]
+ )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+ smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
+ snappy? ( app-arch/snappy:= )
+ spice? (
+ >=app-emulation/spice-protocol-0.12.3
+ >=app-emulation/spice-0.12.0[static-libs(+)]
+ )
+ ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
+ usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+ usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
+ vde? ( net-misc/vde[static-libs(+)] )
+ virgl? ( media-libs/virglrenderer[static-libs(+)] )
+ virtfs? ( sys-libs/libcap )
+ xen? ( app-emulation/xen-tools:= )
+ xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+
+X86_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/edk2-ovmf-201905[binary]
+ ~sys-firmware/ipxe-1.0.0_p20190728[binary]
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ ~sys-firmware/sgabios-0.1_pre8[binary]
+ )
+ !pin-upstream-blobs? (
+ sys-firmware/edk2-ovmf
+ sys-firmware/ipxe
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ sys-firmware/sgabios
+ )"
+PPC64_FIRMWARE_DEPEND="
+ pin-upstream-blobs? (
+ ~sys-firmware/seabios-1.12.0[binary,seavgabios]
+ )
+ !pin-upstream-blobs? (
+ >=sys-firmware/seabios-1.10.2[seavgabios]
+ )
+"
+
+BDEPEND="
+ $(python_gen_impl_dep)
+ dev-lang/perl
+ sys-apps/texinfo
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ gtk? ( nls? ( sys-devel/gettext ) )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )
+"
+CDEPEND="
+ !static? (
+ ${ALL_DEPEND//\[static-libs(+)]}
+ ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
+ )
+ qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+ qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
+"
+DEPEND="${CDEPEND}
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+ static? (
+ ${ALL_DEPEND}
+ ${SOFTMMU_TOOLS_DEPEND}
+ )
+ static-user? ( ${ALL_DEPEND} )"
+RDEPEND="${CDEPEND}
+ acct-group/kvm
+ selinux? ( sec-policy/selinux-qemu )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.5.0-cflags.patch
+ "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
+ "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
+ "${FILESDIR}"/${PN}-4.0.0-sanitize-interp_info.patch
+ "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+)
+
+QA_PREBUILT="
+ usr/share/qemu/hppa-firmware.img
+ usr/share/qemu/openbios-ppc
+ usr/share/qemu/openbios-sparc64
+ usr/share/qemu/openbios-sparc32
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img
+ usr/share/qemu/s390-netboot.img
+ usr/share/qemu/u-boot.e500"
+
+QA_WX_LOAD="usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
+ usr/bin/qemu-alpha
+ usr/bin/qemu-arm
+ usr/bin/qemu-cris
+ usr/bin/qemu-m68k
+ usr/bin/qemu-microblaze
+ usr/bin/qemu-microblazeel
+ usr/bin/qemu-mips
+ usr/bin/qemu-mipsel
+ usr/bin/qemu-or1k
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
+ usr/bin/qemu-sh4
+ usr/bin/qemu-sh4eb
+ usr/bin/qemu-sparc
+ usr/bin/qemu-sparc64
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-s390x
+ usr/bin/qemu-unicore32"
+
+DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
+kernel module loaded before running kvm. The easiest way to ensure that the
+kernel module is loaded is to load it on boot.
+ For AMD CPUs the module is called 'kvm-amd'.
+ For Intel CPUs the module is called 'kvm-intel'.
+Please review /etc/conf.d/modules for how to load these.
+
+Make sure your user is in the 'kvm' group. Just run
+ $ gpasswd -a <USER> kvm
+then have <USER> re-login.
+
+For brand new installs, the default permissions on /dev/kvm might not let
+you access it. You can tell udev to reset ownership/perms:
+ $ udevadm trigger -c add /dev/kvm
+
+If you want to register binfmt handlers for qemu user targets:
+For openrc:
+ # rc-update add qemu-binfmt
+For systemd:
+ # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
+
+pkg_pretend() {
+ if use kernel_linux && kernel_is lt 2 6 25; then
+ eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+ elif use kernel_linux; then
+ if ! linux_config_exists; then
+ eerror "Unable to check your kernel for KVM support"
+ else
+ CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
+ ERROR_KVM="You must enable KVM in your kernel to continue"
+ ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
+ ERROR_KVM_AMD+=" your kernel configuration."
+ ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
+ ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
+ ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
+ ERROR_TUN+=" into your kernel or loaded as a module to use the"
+ ERROR_TUN+=" virtual network device if using -net tap."
+ ERROR_BRIDGE="You will also need support for 802.1d"
+ ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
+ use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
+ ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
+ ERROR_VHOST_NET+=" support"
+
+ if use amd64 || use x86 || use amd64-linux || use x86-linux; then
+ if grep -q AuthenticAMD /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_AMD"
+ elif grep -q GenuineIntel /proc/cpuinfo; then
+ CONFIG_CHECK+=" ~KVM_INTEL"
+ fi
+ fi
+
+ use python && CONFIG_CHECK+=" ~DEBUG_FS"
+ ERROR_DEBUG_FS="debugFS support required for kvm_stat"
+
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+ eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+ eerror "instances are still pointing to it. Please update your"
+ eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+ eerror "and the right system binary (e.g. qemu-system-x86_64)."
+ die "update your virt configs to not use qemu-kvm"
+ fi
+}
+
+# Sanity check to make sure target lists are kept up-to-date.
+check_targets() {
+ local var=$1 mak=$2
+ local detected sorted
+
+ pushd "${S}"/default-configs >/dev/null || die
+
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "${var}: ${sorted}"
+ eerror "$(printf '%-*s' ${#var} configure): ${detected}"
+ die "sync ${var} to the list of targets"
+ fi
+
+ popd >/dev/null
+}
+
+handle_locales() {
+ # Make sure locale list is kept up-to-date.
+ local detected sorted
+ detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
+ sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+ if [[ ${sorted} != "${detected}" ]] ; then
+ eerror "The ebuild needs to be kept in sync."
+ eerror "PLOCALES: ${sorted}"
+ eerror " po/*.po: ${detected}"
+ die "sync PLOCALES"
+ fi
+
+ # Deal with selective install of locales.
+ if use nls ; then
+ # Delete locales the user does not want. #577814
+ rm_loc() { rm po/$1.po || die; }
+ l10n_for_each_disabled_locale_do rm_loc
+ else
+ # Cheap hack to disable gettext .mo generation.
+ rm -f po/*.po
+ fi
+}
+
+src_prepare() {
+ check_targets IUSE_SOFTMMU_TARGETS softmmu
+ check_targets IUSE_USER_TARGETS linux-user
+
+ default
+
+ # Use correct toolchain to fix cross-compiling
+ tc-export AR LD NM OBJCOPY PKG_CONFIG
+ export WINDRES=${CHOST}-windres
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
+ # Run after we've applied all patches.
+ handle_locales
+
+ # Remove bundled copy of libfdt
+ rm -r dtc || die
+}
+
+##
+# configures qemu based on the build directory and the build type
+# we are using.
+#
+qemu_src_configure() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ local buildtype=$1
+ local builddir="${S}/${buildtype}-build"
+
+ mkdir "${builddir}"
+
+ local conf_opts=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --bindir=/usr/bin
+ --libdir=/usr/$(get_libdir)
+ --datadir=/usr/share
+ --docdir=/usr/share/doc/${PF}/html
+ --mandir=/usr/share/man
+ --with-confsuffix=/qemu
+ --localstatedir=/var
+ --disable-bsd-user
+ --disable-guest-agent
+ --disable-strip
+ --disable-werror
+ # We support gnutls/nettle for crypto operations. It is possible
+ # to use gcrypt when gnutls/nettle are disabled (but not when they
+ # are enabled), but it's not really worth the hassle. Disable it
+ # all the time to avoid automatically detecting it. #568856
+ --disable-gcrypt
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ $(use_enable debug debug-info)
+ $(use_enable debug debug-tcg)
+ $(use_enable doc docs)
+ $(use_enable plugins)
+ $(use_enable tci tcg-interpreter)
+ $(use_enable xattr attr)
+ )
+
+ # Disable options not used by user targets. This simplifies building
+ # static user targets (USE=static-user) considerably.
+ conf_notuser() {
+ if [[ ${buildtype} == "user" ]] ; then
+ echo "--disable-${2:-$1}"
+ else
+ use_enable "$@"
+ fi
+ }
+ conf_opts+=(
+ --disable-bluez
+ $(conf_notuser accessibility brlapi)
+ $(conf_notuser aio linux-aio)
+ $(conf_notuser bzip2)
+ $(conf_notuser capstone)
+ $(conf_notuser caps cap-ng)
+ $(conf_notuser curl)
+ $(conf_notuser fdt)
+ $(conf_notuser glusterfs)
+ $(conf_notuser gnutls)
+ $(conf_notuser gnutls nettle)
+ $(conf_notuser gtk)
+ $(conf_notuser infiniband rdma)
+ $(conf_notuser iscsi libiscsi)
+ $(conf_notuser jemalloc jemalloc)
+ $(conf_notuser jpeg vnc-jpeg)
+ $(conf_notuser kernel_linux kvm)
+ $(conf_notuser lzo)
+ $(conf_notuser ncurses curses)
+ $(conf_notuser nfs libnfs)
+ $(conf_notuser numa)
+ $(conf_notuser opengl)
+ $(conf_notuser png vnc-png)
+ $(conf_notuser rbd)
+ $(conf_notuser sasl vnc-sasl)
+ $(conf_notuser sdl)
+ $(conf_notuser seccomp)
+ $(conf_notuser smartcard)
+ $(conf_notuser snappy)
+ $(conf_notuser spice)
+ $(conf_notuser ssh libssh)
+ $(conf_notuser usb libusb)
+ $(conf_notuser usbredir usb-redir)
+ $(conf_notuser vde)
+ $(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
+ $(conf_notuser virgl virglrenderer)
+ $(conf_notuser virtfs)
+ $(conf_notuser vnc)
+ $(conf_notuser vte)
+ $(conf_notuser xen)
+ $(conf_notuser xen xen-pci-passthrough)
+ $(conf_notuser xfs xfsctl)
+ $(conf_notuser xkb xkbcommon)
+ )
+
+ if [[ ${buildtype} == "user" ]] ; then
+ conf_opts+=( --disable-libxml2 )
+ else
+ conf_opts+=( --enable-libxml2 )
+ fi
+
+ if [[ ! ${buildtype} == "user" ]] ; then
+ # audio options
+ local audio_opts=(
+ $(usev alsa)
+ $(usev oss)
+ $(usev sdl)
+ $(usex pulseaudio pa "")
+ )
+ conf_opts+=(
+ --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
+ )
+ fi
+
+ case ${buildtype} in
+ user)
+ conf_opts+=(
+ --enable-linux-user
+ --disable-system
+ --disable-blobs
+ --disable-tools
+ )
+ local static_flag="static-user"
+ ;;
+ softmmu)
+ conf_opts+=(
+ --disable-linux-user
+ --enable-system
+ --disable-tools
+ )
+ local static_flag="static"
+ ;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ --enable-tools
+ )
+ local static_flag="static"
+ ;;
+ esac
+
+ local targets="${buildtype}_targets"
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
+
+ # Add support for SystemTAP
+ use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+ # We always want to attempt to build with PIE support as it results
+ # in a more secure binary. But it doesn't work with static or if
+ # the current GCC doesn't have PIE support.
+ if use ${static_flag}; then
+ conf_opts+=( --static --disable-pie )
+ else
+ tc-enables-pie && conf_opts+=( --enable-pie )
+ fi
+
+ echo "../configure ${conf_opts[*]}"
+ cd "${builddir}"
+ ../configure "${conf_opts[@]}" || die "configure failed"
+
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+ local target
+
+ python_setup
+
+ softmmu_targets= softmmu_bins=()
+ user_targets= user_bins=()
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ if use "qemu_softmmu_targets_${target}"; then
+ softmmu_targets+=",${target}-softmmu"
+ softmmu_bins+=( "qemu-system-${target}" )
+ fi
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ if use "qemu_user_targets_${target}"; then
+ user_targets+=",${target}-linux-user"
+ user_bins+=( "qemu-${target}" )
+ fi
+ done
+
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
+
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
+ qemu_src_configure "tools"
+}
+
+src_compile() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ default
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ default
+ fi
+
+ cd "${S}/tools-build"
+ default
+}
+
+src_test() {
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ pax-mark m */qemu-system-* #515550
+ emake -j1 check
+ emake -j1 check-report.html
+ fi
+}
+
+qemu_python_install() {
+ python_domodule "${S}/python/qemu/qmp.py"
+
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/scripts/qmp/qmp-shell"
+ python_doscript "${S}/scripts/qmp/qemu-ga-client"
+}
+
+# Generate binfmt support files.
+# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
+# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
+generate_initd() {
+ local out="${T}/qemu-binfmt"
+ local out_systemd="${T}/qemu.conf"
+ local d="${T}/binfmt.d"
+
+ einfo "Generating qemu binfmt scripts and configuration files"
+
+ # Generate the debian fragments first.
+ mkdir -p "${d}"
+ "${S}"/scripts/qemu-binfmt-conf.sh \
+ --debian \
+ --exportdir "${d}" \
+ --qemu-path "${EPREFIX}/usr/bin" \
+ || die
+ # Then turn the fragments into a shell script we can source.
+ sed -E -i \
+ -e 's:^([^ ]+) (.*)$:\1="\2":' \
+ "${d}"/* || die
+
+ # Generate the init.d script by assembling the fragments from above.
+ local f qcpu package interpreter magic mask
+ cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
+ for f in "${d}"/qemu-* ; do
+ source "${f}"
+
+ # Normalize the cpu logic like we do in the init.d for the native cpu.
+ qcpu=${package#qemu-}
+ case ${qcpu} in
+ arm*) qcpu="arm";;
+ mips*) qcpu="mips";;
+ ppc*) qcpu="ppc";;
+ s390*) qcpu="s390";;
+ sh*) qcpu="sh";;
+ sparc*) qcpu="sparc";;
+ esac
+
+ # we use 'printf' here to be portable across 'sh'
+ # implementations: #679168
+ cat <<EOF >>"${out}"
+ if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
+ printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
+ fi
+EOF
+
+ echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
+
+ done
+ cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
+}
+
+src_install() {
+ if [[ -n ${user_targets} ]]; then
+ cd "${S}/user-build"
+ emake DESTDIR="${ED}" install
+
+ # Install binfmt handler init script for user targets.
+ generate_initd
+ doinitd "${T}/qemu-binfmt"
+
+ # Install binfmt/qemu.conf.
+ insinto "/usr/share/qemu/binfmt.d"
+ doins "${T}/qemu.conf"
+ fi
+
+ if [[ -n ${softmmu_targets} ]]; then
+ cd "${S}/softmmu-build"
+ emake DESTDIR="${ED}" install
+
+ # This might not exist if the test failed. #512010
+ [[ -e check-report.html ]] && dodoc check-report.html
+
+ if use kernel_linux; then
+ udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
+ fi
+
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
+
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+
+ # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+ pushd "${ED}"/usr/bin >/dev/null
+ pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
+ popd >/dev/null
+
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
+
+ cd "${S}"
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+
+ # Disallow stripping of prebuilt firmware files.
+ dostrip -x ${QA_PREBUILT}
+
+ if [[ -n ${softmmu_targets} ]]; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ rm "${ED}/usr/share/qemu/bios-256k.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+ dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
+ fi
+
+ # Remove vgabios since we're using the seavgabios packaged one
+ rm "${ED}/usr/share/qemu/vgabios.bin"
+ rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
+ rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
+ rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
+ rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
+ rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
+ # PPC64 loads vgabios-stdvga
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
+ dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
+ dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
+ dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
+ dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
+ dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
+ dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
+ fi
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+ fi
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}"/usr/share/qemu/pxe-*.rom
+ if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
+ dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
+ dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
+ dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
+ dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
+ dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
+ dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
+ fi
+ fi
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+firmware_abi_change() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
+ return 0
+ fi
+ done
+ return 1
+}
+
+pkg_postinst() {
+ if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+ udev_reload
+ fi
+
+ xdg_icon_cache_update
+
+ [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
+ fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
+
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_print_elog
+
+ if use pin-upstream-blobs && firmware_abi_change; then
+ ewarn "This version of qemu pins new versions of firmware blobs:"
+ ewarn " $(best_version sys-firmware/edk2-ovmf)"
+ ewarn " $(best_version sys-firmware/ipxe)"
+ ewarn " $(best_version sys-firmware/seabios)"
+ ewarn " $(best_version sys-firmware/sgabios)"
+ ewarn "This might break resume of hibernated guests (started with a different"
+ ewarn "firmware version) and live migration to/from qemu versions with different"
+ ewarn "firmware. Please (cold) restart all running guests. For functional"
+ ewarn "guest migration ensure that all"
+ ewarn "hosts run at least"
+ ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
+ fi
+}
+
+pkg_info() {
+ echo "Using:"
+ echo " $(best_version app-emulation/spice-protocol)"
+ echo " $(best_version sys-firmware/edk2-ovmf)"
+ if has_version 'sys-firmware/edk2-ovmf[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/ipxe)"
+ echo " $(best_version sys-firmware/seabios)"
+ if has_version 'sys-firmware/seabios[binary]'; then
+ echo " USE=binary"
+ else
+ echo " USE=''"
+ fi
+ echo " $(best_version sys-firmware/sgabios)"
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index d024b5020691..bef3b263a0ea 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -34,11 +34,11 @@ 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 +jpeg jemalloc kernel_linux
+ +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
+ plugins +png pulseaudio python rbd sasl +seccomp sdl selinux smartcard snappy
spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net virgl virtfs +vnc vte xattr xen xfs +xkb"
+ +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs +xkb"
COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
@@ -53,6 +53,7 @@ use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
+RESTRICT="!test? ( test )"
# Allow no targets to be built so that people can get a tools-only build.
# Block USE flag configurations known to not work.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -416,6 +417,7 @@ qemu_src_configure() {
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
$(use_enable doc docs)
+ $(use_enable plugins)
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
@@ -465,6 +467,7 @@ qemu_src_configure() {
$(conf_notuser usbredir usb-redir)
$(conf_notuser vde)
$(conf_notuser vhost-net)
+ $(conf_notuser vhost-user-fs)
$(conf_notuser virgl virglrenderer)
$(conf_notuser virtfs)
$(conf_notuser vnc)
diff --git a/app-emulation/reg/Manifest b/app-emulation/reg/Manifest
index ce08f301286f..3ce4b0121f34 100644
--- a/app-emulation/reg/Manifest
+++ b/app-emulation/reg/Manifest
@@ -1,9 +1,7 @@
AUX reg-0.16.0-config.patch 8488 BLAKE2B d1c60fe817ef722f522ecd7503a7000b065c01853a01c22c2c37b1c0d10f8062c73636b40565f65de885e8fb583d318230e0c0ed8ca8f958f48369d14595089d SHA512 05a30d6cd08ff823be993cba4089d2290f6f58272c50f79ed3d84c915cdf5154789f9f809e4225b39397eab16052d1a5f002e43794d992184bc9528c2d378ccf
AUX reg.confd 68 BLAKE2B 90fbc7677653b2e1389a0a0dd4c06f8a108fc70f6ae8d53fb94a5ef4669296679cf0f15bf985594837b0d455206f1b928df8a65596e81c0c717c5908c1987b0c SHA512 c0e7e68e8fd09cd46af3a01dc3507ef55dc25016b00e425e673734c864f05c63fcf3dc10b7ca987f166b33cfbfea62ca6c3458b73e28d3683d5bc81cbda84c4e
AUX reg.initd 595 BLAKE2B 36a5fd61c46810c1924c86c00392348e0907501f896114c3c523daebfd110e5ea292d4087fc4a41ba91ccd952c1c6b27fe1b1db60364575352a9eb9e4b207258 SHA512 96919a0d2f29631c4296bcf8adfb78d63f5d732ed350491f7df14f45744c945559110454a0c24726962da7519dd790a37a6c6a2e0d3586599dc7231743fbe03a
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-DIST reg-0.16.0.tar.gz 2991496 BLAKE2B e94a53c79ff062013e091d4c558870ef5c25af181cba201a44fa38b9dfe8816d6f3fd581f4e9a3dafe5b3753a3755c31f8b2f4a347da134a969fc93ac296897c SHA512 1e4d936e406998ffaa176e7834b28970b594f88a339fd8447bef2f944efa9b51c1d35bf71b384b3ed1b3e84be08db6d7fd487f4a3c65aa2de0308d6128cf0070
-DIST reg-0.16.0_p20190102.tar.gz 2994965 BLAKE2B c7cb8a0eaa1599a5464b7a98c3df0b146dbbfea884260b7c8cbf5393a9384c8875e38ea4e45c5f888c65b9bb8c326cf9934d9b3c32a4809fe8e3b23239e8f2a8 SHA512 90e92c15b7ca4f2a5f943cb80096af0eba50acd7691963609c25f15a6795f886843776180754ab7d28477f1fc3a4b8d916bc9ac99b768368471b31564d14769c
-EBUILD reg-0.16.0.ebuild 1126 BLAKE2B b061bda221d78e6104a5c8a00bc347d37f0d3b7462c1ece2bbaf07c3ad5fc6780a03523ffb745f3a642039dfaa6f8ee8d4320dc4f69280303769cfbd1fd960bd SHA512 9853a61cb5025252a2f08279775f79c3848b104fffb5201efd314fc4ecacbbf10ce5700f3d497caba3025c644c43094ea92daeca16dbcacab2d126b9c619e327
-EBUILD reg-0.16.0_p20190102.ebuild 1326 BLAKE2B a973bfe6b7348f5cc314933204ed2cc418b957e2cd2364aea78065cd1c014d41bfbeb9483abbd1ac2a3ebce56ce89e12bc13f19a1cf1ac3a21503517303e5265 SHA512 44711363dccbef18a9638147f63098dab41edcc77f46b43ba96e29d7ab4f31bd756495677a4ee6731b271fbfad2011527184ce05ab42c63a4a595cb3cb3caeff
-MISC metadata.xml 326 BLAKE2B 82f2440e792104c0c9e1afe4d95b9972efc7b233524637e32f11c2b5746aba7990d88f01a542e25f7a5c9c52aac0c5c1e25bc5703d3e855ea8e8ef4ffe87929c SHA512 9fea1224db7eb9316eff5bd89ebf748cbf35160516b33a9c9a3a07d1db6a2fa64dafcf8623a24af09429f7b76cc94ee02a39145162d0b039cb9d0137bc51a20e
+DIST github.com-go-yaml-yaml-eb3733d160e7.tar.gz 64789 BLAKE2B a59db73ba751c932695913770550e115d46df28c4cff402325cf5324c97069e3acccb9faf39826a5da416f8c5b0cc69377cef41a6b1451afa82c7ae8bd620544 SHA512 9e34c34c907d1177e072eb5f3b421b8a3af0e68b490508691d745cdcf1145d9bcfd2592d909a4b05e7f12bfb62355d49861f6d2e1bd29b69cf026ef631965289
+DIST reg-0.16.1.tar.gz 3163977 BLAKE2B b161200e7b96b26054e121853bafb4751865de1146f07fa48418a6624beeebd10eb8fcde1af90f9dd3c20ffd8d5807a106d012bf996944c96b5ff841b0079fb4 SHA512 77fbd543de6e94c504e98a0364895b19099e3cde55a85a4413730de58de8e84f50889fdcfaffa1c76ae412a603ed6d5f4b1d57566ec814cf88df70278e91aee6
+EBUILD reg-0.16.1.ebuild 1363 BLAKE2B 6ed76524b8f00b8669886f214f2cb702e93b89cf1d44db5373e7ff60830c1dd94e1a26ef95711cae8958a7a2ded0e1ce4b9638aa03fb22ba082a695961d6c080 SHA512 d31c2dcc3d1e1b1f1ddfc1563c49441670602a2ed345ffa78b0e7a3e1edc98ca1b04cc1c77395724704bf5331189e99683564176937df5cf8d98fffcd0e43f9f
+MISC metadata.xml 329 BLAKE2B c53497eb2cc3ce8f9cd548466b4e56ae194a02627065820c352d21b22a3fd746b930f11acda0b91f292e7bb29b6efcf2ed8ae4f50866fa518cac3ab8f8d94c5b SHA512 d4967fea58279c7c8efde8d4dada48c6cf3db21c417d741f72d3f777dedb7734ba6284a112534efa8d7a6374ab2a3013e33a759da27a91675c9b9f88c19cc8e3
diff --git a/app-emulation/reg/metadata.xml b/app-emulation/reg/metadata.xml
index e08ad1ff9a01..7496d961803e 100644
--- a/app-emulation/reg/metadata.xml
+++ b/app-emulation/reg/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
+ <email>williamh@gentoo.org</email>
+ <name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">genuinetools/reg</remote-id>
diff --git a/app-emulation/reg/reg-0.16.0.ebuild b/app-emulation/reg/reg-0.16.0.ebuild
deleted file mode 100644
index 2268e22b2171..000000000000
--- a/app-emulation/reg/reg-0.16.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot user
-
-EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="4a4d0e5d108ca9558879bdf1aba94d09e921cf1e"
-ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Docker registry v2 command line client"
-HOMEPAGE="https://github.com/genuinetools/reg"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup reg
- enewuser reg -1 -1 /var/lib/reg reg
-}
-
-src_prepare() {
- pushd src/${EGO_PN} || die
- default
- popd || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- GOPATH="${S}" go build -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- dodoc src/${EGO_PN}/README.md
- insinto /var/lib/${PN}
- doins -r src/${EGO_PN}/server/*
- newinitd "${FILESDIR}"/reg.initd reg
- newconfd "${FILESDIR}"/reg.confd reg
-
- keepdir /var/log/reg
- fowners -R reg:reg /var/log/reg /var/lib/reg/static
-}
diff --git a/app-emulation/reg/reg-0.16.0_p20190102.ebuild b/app-emulation/reg/reg-0.16.1.ebuild
index e1be9fc0449f..bfd5ac25d064 100644
--- a/app-emulation/reg/reg-0.16.0_p20190102.ebuild
+++ b/app-emulation/reg/reg-0.16.1.ebuild
@@ -3,12 +3,12 @@
EAPI=6
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml" )
+EGO_VENDOR=( "gopkg.in/yaml.v2 eb3733d160e7 github.com/go-yaml/yaml" )
inherit golang-build golang-vcs-snapshot user
EGO_PN="github.com/genuinetools/reg"
-GIT_COMMIT="d959057b30da67d5f162790f9d5b5160686901fd"
+GIT_COMMIT="4203e559f331009df04a3ca47820989c6c43e138"
ARCHIVE_URI="https://${EGO_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
${EGO_VENDOR_URI}"
KEYWORDS="~amd64"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64"
DESCRIPTION="Docker registry v2 command line client"
HOMEPAGE="https://github.com/genuinetools/reg"
SRC_URI="${ARCHIVE_URI}"
-LICENSE="MIT"
+LICENSE="MIT Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC"
SLOT="0"
IUSE=""
@@ -35,8 +35,9 @@ src_prepare() {
}
src_compile() {
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
pushd src/${EGO_PN} || die
- GOPATH="${S}" GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
+ GO111MODULE=on go build -mod=vendor -v -ldflags "-X ${EGO_PN}/version.GITCOMMIT=${GIT_COMMIT} -X ${EGO_PN}/version.VERSION=${PV}" -o "${S}"/bin/reg . || die
popd || die
}
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index 512ee0f6465b..5dc2e0b22e48 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,7 +1,5 @@
-DIST sen-0.5.1.tar.gz 70930 BLAKE2B 93758076d014a36996ece021f1de2f3ece749453d32554fe79ffec0ab1101bf4cc5c11d80934817fa5b10d73b811e738c87ce8e745a642507ec8406ad2eb59fa SHA512 0faf2c12e6361d3b4e9d093e0830867976a1fbd03cadc7a527c88460244532a8b636d8d4b732bb0c7f4041a0bb0819d20caabe62327b5edbf731b4eb8a4898a6
DIST sen-0.6.0.tar.gz 55113 BLAKE2B 5f6affbea94005c0adc9ac544d40d94cd9a9eca930b979c19174d21d73fdd887d21802a5241c02ba212a45c4a7873f22c7372aeb69955e1f97e444ef74d91929 SHA512 5573a0d6da5ae395e947bf34c54313e4e3a0251dc1868c52bbfe9ad11463397da83a0c9ac3f1912da2e6f49341c84d40dcab900d41b4a32ebac44d1dde3ac82b
DIST sen-0.6.1.tar.gz 55357 BLAKE2B 0d58f0ea11eeff29161925018425c918b3260c754d1b658e2ebd3c88e0c371feb0f1815af61979206bee529c369a90ace895d25e645ef0d76c563abd8b74c943 SHA512 2f1cadf745ca7e12d3e92534e76984072b9678055b9911f76b1a6d3cbd43266ad1eeb4d5e7bb8742db91c4da4aef684fa644c33de6fa2494c37688e9747e0efa
-EBUILD sen-0.5.1.ebuild 588 BLAKE2B 944872438b3e07ffb59f5e69705b677d36d50e2d9d5bb4bf2fcc1099ee746744c52914fa85c1b2f7a3bd8600da8ee8a3578d0e00b51039cee45672fad7763b86 SHA512 2d58195671a9bc06bd2b3b3c37e2ab429520cf9f94e42ecfa3a3a6a27cb7c6d85659e923d8be75304434ea9d87ce70e092c7a653eb9cfdc933188ca2c94635ff
-EBUILD sen-0.6.0.ebuild 752 BLAKE2B d9bbc7d574190670372286c08ad978ab3fe4152e843a7815de716e8c93d4861f2627b86f6e2d4a98ff6b7792562152dd8506d45bf7699c2d1200e95ca3773dcf SHA512 51a205a087e3b5e482383d5cac9698feb4a8d5d1bc8bdc31803c37a3c96fac326620a47ffc5aaec3980ab7455c1ea54223af8a4fc4d005e95289844a9b58ad1a
-EBUILD sen-0.6.1.ebuild 752 BLAKE2B 74b4795d560d65ad7e74406f8ad093936f22b353b2c20b0d55084f53438f106b52dd388c7a4705a246bcedec7acddf34fb16202ff5a1df44ba2acc66a867a44c SHA512 9bc301833275934d7f9a338cdd5ba38d27894e3545ff85ac667b5ae894d7eed11d8d43ce7fa0197dce88225d3311df008b933cde32cea721fbbbdd9b494e4552
+EBUILD sen-0.6.0.ebuild 779 BLAKE2B f7373ebb98e90f7078ad40b313b6f42f22e6055383ff3f7844be3669315c5aa04c88bfecfb6f45b10474a3023d485a73847b211a1d81b45524a4119d1ca65ce9 SHA512 19ff0fad2bc4fcb3cfa29ac802f4613bc1748ed8299f9dd16f28a904e25ac060919d2c675b9d7c786170e2b8ab27f14add27155e22446cab3a15e67b0f2fa547
+EBUILD sen-0.6.1.ebuild 779 BLAKE2B 1c58b549baa3852fb15d8b8547cbce0fa4b51111f2523e2415b10e31bf9f055a345d0ef0bc74f61fa0f13893878bf7c3e9f85f6a1383ef567690cfe7df0ce681 SHA512 46c3b7430eb968c4c01325759b3d855c77271fbf2f0f2e25daa455980d38113a0b016c4a8bf68f131155340ec699ad42cccb0bfb20e5e1bcd37c2a5b24edad6b
MISC metadata.xml 598 BLAKE2B 56052c4b881e934c97af30666df9f8364a2fad98fb855122fe22dda5f7b722c642d71440db2a483ee1b0f6afdb20ded677fb3b82ac6e88c8c2f66651e1db2298 SHA512 71e37148c40ccfce6fa1fa80632dd1143eb0462971b7758b724924ffd9739f81c7b341388b22b7b5f0862b266b83bb4adf6ceb95f0997efc4f7f3bd4a8f92910
diff --git a/app-emulation/sen/sen-0.5.1.ebuild b/app-emulation/sen/sen-0.5.1.ebuild
deleted file mode 100644
index 4ba87ce42c27..000000000000
--- a/app-emulation/sen/sen-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/urwidtrees[${PYTHON_USEDEP}]
- dev-python/docker-py[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
- distutils-r1_python_install_all
- dodoc docs/*
-}
diff --git a/app-emulation/sen/sen-0.6.0.ebuild b/app-emulation/sen/sen-0.6.0.ebuild
index d8c239c34073..1be5b7a36e50 100644
--- a/app-emulation/sen/sen-0.6.0.ebuild
+++ b/app-emulation/sen/sen-0.6.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
dev-python/urwidtrees[${PYTHON_USEDEP}]
diff --git a/app-emulation/sen/sen-0.6.1.ebuild b/app-emulation/sen/sen-0.6.1.ebuild
index a1159468c541..99d912fdad0c 100644
--- a/app-emulation/sen/sen-0.6.1.ebuild
+++ b/app-emulation/sen/sen-0.6.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
dev-python/urwidtrees[${PYTHON_USEDEP}]
diff --git a/app-emulation/skopeo/Manifest b/app-emulation/skopeo/Manifest
index 9445363caf48..e33ac3519aef 100644
--- a/app-emulation/skopeo/Manifest
+++ b/app-emulation/skopeo/Manifest
@@ -1,5 +1,6 @@
+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
EBUILD skopeo-0.1.39.ebuild 1451 BLAKE2B 9652f26926ef19838041dbb50d355aaaddb975e4a8896fc35b90cfb145b75411f8964222d10229d8df1c9f2b80821746573e4485e5df79493b7bfb07025e519e SHA512 3f91ec57eac22a82c9a5a7e9eb755d0933476554ccf9a223a40b01452c3d57c5996a6e1b204f58ca7189c3260cec5a31971775778ddbbe32f8c920068c8bbe9d
-EBUILD skopeo-0.1.40.ebuild 1330 BLAKE2B b8bdb403529f88d1d3f99a29f68ccebea176c0ddab364ed94dbcd8e11882571ac8d1257165854d2cccef9ea1deeb096bcd3ebc75d651cdd9a8b4df684480e56a SHA512 a40beb890444640523c70b3745dc82f7e0d935c6cfcfb86daae71daa79be1dd938c4089a7ad2bc8ce0f0f3db327d2c096d2527f045bdb87809b54a62893654aa
+EBUILD skopeo-0.1.40-r1.ebuild 1734 BLAKE2B 3ad25540278b444c94b7bbdda5684f74118afef56989e439efb8451217248b1a3062945c1b5a6d40844162b2ccb8e8981405df250a25e7c8475c020214adc816 SHA512 b4b45ae2bda0f877828edc0cdf6befd900d9d232f7416eff57724163401ca04f95ebec6a13d7c0d54810a5a7f994794d69be78a1528a7f36c5032ee2996e29ed
MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-emulation/skopeo/skopeo-0.1.40.ebuild b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild
index 3ee26d3ab1ad..c42103170fb0 100644
--- a/app-emulation/skopeo/skopeo-0.1.40.ebuild
+++ b/app-emulation/skopeo/skopeo-0.1.40-r1.ebuild
@@ -7,7 +7,9 @@ inherit go-module 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"
+CONTAINERS_STORAGE_PATCH="containers-storage-1.14.0-vfs-user-xattrs.patch"
+SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/containers/storage/pull/466.patch -> ${CONTAINERS_STORAGE_PATCH}"
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
SLOT="0"
@@ -25,6 +27,14 @@ RDEPEND="${COMMON_DEPEND}"
RESTRICT="test"
+src_prepare() {
+ default
+ sed -e 's| \([ab]\)/| \1/vendor/github.com/containers/storage/|' < \
+ "${DISTDIR}/${CONTAINERS_STORAGE_PATCH}" > \
+ "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}" || die
+ eapply "${WORKDIR}/${CONTAINERS_STORAGE_PATCH}"
+}
+
src_compile() {
local BUILDTAGS="containers_image_ostree_stub"
set -- env -u GOCACHE -u XDG_CACHE_HOME \
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 169238ffd7d5..e4db03bf5d8c 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,5 +1,7 @@
DIST slirp4netns-0.3.3.tar.gz 162154 BLAKE2B b4a477ca94ee17e14ae0d255eb1f22713388d32cee1faff308e902a8134bc52e08cfa92537c19fbfc9869d936637c1196fee462d9699c1b5f97a0d0138dc4792 SHA512 9cccbfd30348d895c8c3f6a80ebe7991131c5a5f4907733ec65df5ce70b63427e5f666bf7c4dcb08e8dd50f1769aff0f6642c23c29eb6b9921a2d10f62d46f63
DIST slirp4netns-0.4.1.tar.gz 168785 BLAKE2B 90e2510121177771fb77d5e48baa8a1acb95f9778e72add244b2df10d92c9cc6ef284bfbeef699bd8e58724b50254a4eb6fa485a58c7c8e6cca8469cf722e1f2 SHA512 bb2a0946f4e360eb08efb46e097d21ab1bf05d199d1e3d381e065617eb9ba15434bccb5d1e76ac27664f23c8da79349383095b4d28d2a1a8ddc0fb9675aebf34
+DIST slirp4netns-0.4.2.tar.gz 169120 BLAKE2B bbb809da871c885e910be771f3a6e90f7d18880d82ddeb0e569a1db33e38c80cbb1a7279341c0efcd514d88fa2874920ae89365f9fa97a38e3fb09f0eb8e5642 SHA512 87dd032afe6862fc8f7f5c3770a1d939832c29c2f55fa3579a4eac717979442e1b081aa886cc94c5638ec1339ccebe73ed1844af37a479fed2d5826bc761fc05
EBUILD slirp4netns-0.3.3.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
-EBUILD slirp4netns-0.4.1.ebuild 699 BLAKE2B cd64a2c4ccde108b925c8b3c302ab69d4c2b034ec6a271ca96b0f6c4faaf5bd91f6c737d472c8eca592656e48e2694bfe6d7687cf5ea37a091e306b69b822757 SHA512 b8ab41f281fb6992a446d44fd0fd71e77d11b52cce328f91eb4b0bed838b5be3383ab17e9f463fe92021504f0cfbe802219c1d504d8b3e04579302a61cf586b9
+EBUILD slirp4netns-0.4.1-r1.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
+EBUILD slirp4netns-0.4.2.ebuild 762 BLAKE2B bf04b7ace6f29e4d5f3172b49a5b38f1f438de246a1c53c2164f950885b92cb58d89a73da69e877f62f18ae686f5fd3078801537962da2d2e2b73491520b97a9 SHA512 f90e0500618de2cc8059fc33d8261f6050d43c95abd17806df46362b55730ecbc138f41c9895e8278f5daefa62de77e033df4db6ceccb311da361246abb466a4
MISC metadata.xml 601 BLAKE2B eac6bf1b21371c913f648e944a1ba75314e772c1f0f5fdeda9d4c49cf279a15c19c9f6347ec1a3df236a6147c3d01f4084e161a81c2ee1e4db55cc9f8508d26f SHA512 d81b6889e71bf3fdc539f6c5ca057a8900f13009eafb711c4d83bb0cb349cf49f9253c0b8207a4c1f4c3b084bc9c9b0b91e75109843662fb72d25a2485cbf7dd
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild
index a87e63fe9495..e12c5cc91bc5 100644
--- a/app-emulation/slirp4netns/slirp4netns-0.4.1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.1-r1.ebuild
@@ -9,14 +9,18 @@ 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"
-KEYWORDS="~amd64"
+RDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libpcre:=
+ sys-libs/libseccomp:=
+ sys-libs/libcap:="
-RDEPEND="dev-libs/glib:2=
- dev-libs/libpcre:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
RESTRICT="test"
src_prepare() {
diff --git a/app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild b/app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild
new file mode 100644
index 000000000000..e12c5cc91bc5
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-0.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 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:=
+ 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/spice-vdagent/Manifest b/app-emulation/spice-vdagent/Manifest
index 5d673ef61d40..d478d67608ca 100644
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@@ -6,4 +6,4 @@ DIST spice-vdagent-0.17.0.tar.bz2 130413 BLAKE2B b2fb522f491512d94ac15fa8d253e8e
DIST spice-vdagent-0.19.0.tar.bz2 151356 BLAKE2B b7a99a7205d955b27edfe483746e3f267a6e0b7885c4b8146ba42d99b581cf4e1748b503a37a3d6b66623ef2515b42756f2e6a5a4775d56def7aa396bd0dfb4f SHA512 f5056dfe66df3ee8205549be22bbc8c17d2196c8448eda97f01659ff30c34d9929f330767d7fafec557dc5f7fb9b65eaf85973193b38df774042de9b72d6e60d
EBUILD spice-vdagent-0.17.0_p20180319-r1.ebuild 1680 BLAKE2B 7a9019d3e5d3e303b09f2c31b79c7ca8fd44905b19ee9e722e83c1a7ca44a7ff61340da6fb00884d8d91f3f57a5065f022da6c768fc2615c73780422505ad582 SHA512 31050b50116202a58f075443c9eeed79960c1a98bfa1501811f4f69beb21ae10ac755eaa450ddc10552c0caf5a8731ff8499dfeda6b661b160ceb6e579fbd3c9
EBUILD spice-vdagent-0.19.0-r1.ebuild 1637 BLAKE2B 73e073f9fef1297af333154a8e5b28d169389ebc7f0b851a188cd54d1498d1b5b8989df4359cdd372ef73d912ce85cc1a5813321bf3bf22415555374a0832cb2 SHA512 28ad87eea84688392f17c49c930c8c7982731fa1aeb416126ca28c67dc4c0e0e9ab863d2f1ffcaa03c902f3a2ef7b962e5ec04cb719ad922c0da6fcb0208dff3
-MISC metadata.xml 557 BLAKE2B 03e0f3f159d333513fb7a575b46ad91167fc30e96b4e982cdb2bf545f19a53982e82698b03b02df0dc7dbfb90d9d05aa155c56aa1dc2cf6a13153145fd4231b3 SHA512 1f3892771740224f1275a9eb3507e1ac32be745340b50f983383e6b09e69de75d2e0562fd13465a588d08a4d049d0b33b233ada1a3a9883e1ee24c431fa7e236
+MISC metadata.xml 446 BLAKE2B 263e7a9d21436d2549384fe53b85c4cbeec35d55714a4bd1f926f68077641da84991a4c670b79057f3bc4bb62d419f1c18fa558fb9d290df5a6607f626f965f2 SHA512 7b47aee99363ac11c21733be4ce320e4dc704924c80372f28af7da08b975845aa11a96d7c48e01ab9ae78e77c89fbe71d177f41b474f84a3fa9c27c597ed3f1b
diff --git a/app-emulation/spice-vdagent/metadata.xml b/app-emulation/spice-vdagent/metadata.xml
index 50477de61e16..9099ec28e6d3 100644
--- a/app-emulation/spice-vdagent/metadata.xml
+++ b/app-emulation/spice-vdagent/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>dev-zero@gentoo.org</email>
- <name>Tiziano Müller</name>
- </maintainer>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 87272c778682..611b0cece333 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,5 +1,7 @@
DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613
DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
+DIST virt-what-1.20.tar.gz 459243 BLAKE2B c51bfc4366ba90e32548a5d1e0779fcc1835dae7a6bb2b6f67b4371c2d2e949339aa0ff67d64485cdb03592713a3ae04a6779e4dac0babf08bb268ce6403066f SHA512 edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4
EBUILD virt-what-1.18.ebuild 609 BLAKE2B c2e183482354a5623ee7ac84a0f50d36d80065f1f803a9086e687f16416be6f1b62482d67d99890f2f1f61c371f6053b03eb2eb71c099c309a049474494aa57b SHA512 56ee0708fa083bee61d82106227238cbce18027557b75ffed68fdaecf47f6cafe84766a03f0c55d0ed7060af90b929cd6fa80453ff355adb2f5f00e70dffa7ed
EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
-MISC metadata.xml 348 BLAKE2B 6f0d91006e793eb3ed8da45a845d5fb6ae09874c5a0c3fb1731b0b6c002c3188b4496a201af07b6c68004f33327b65374e23446c6ca28d93d7736f3388c0a773 SHA512 49f92316c1ac28eebeb160fa9cfc6c1956c25ffcb69b202eb3e9492ab023be6debd780f6aa6a7e6e6dd5f116308f34e2c1c16f131438c48d2634d13702ade0f6
+EBUILD virt-what-1.20.ebuild 613 BLAKE2B dc561d0ac5a889d5884afc8d2e31793f7571cdd2f26395327e0390bbd3db277c880ae96fe5cc9cf99ea0d86292a9ba77cfb0cc7b7126eee316314156caca63d0 SHA512 8c64ded91856ef2c1246ea3e160f84f822e871c08a09c8e8242c654058bc644bc33225774abe536b264be0c386a615379c16cf91d6f2f89bb7ba072f04ac2619
+MISC metadata.xml 463 BLAKE2B d2aeb047a6f3595cf1f064685fedb75876854c2361c084a909813d07fe7495882f9f6d400a896b3c67f578bae02fe89ec3cf8971478b15200a5486392e13b9d2 SHA512 85f83ce93888eb68982ce585aac6c29cfec62df4a5d76ac483d8946b0efe9dcabba271c7391aaa3c37247b228d06d21cb023efbcbd84cd48cf9733b918991b28
diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index be34d3dcfa08..5bdec46056c4 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -5,6 +5,10 @@
<email>eva@gentoo.org</email>
<name>Gilles Dartiguelongue</name>
</maintainer>
+ <maintainer type="person">
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
<use>
<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag>
</use>
diff --git a/app-emulation/virt-what/virt-what-1.20.ebuild b/app-emulation/virt-what/virt-what-1.20.ebuild
new file mode 100644
index 000000000000..9c1c37709d81
--- /dev/null
+++ b/app-emulation/virt-what/virt-what-1.20.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Detects if the current machine is running in a virtual machine"
+HOMEPAGE="https://people.redhat.com/~rjones/virt-what/"
+SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dmi"
+
+DEPEND="dev-lang/perl"
+RDEPEND="app-shells/bash
+ dmi? ( sys-apps/dmidecode )"
+
+src_prepare() {
+ default
+
+ # Pretends to be POSIX sh while it is not
+ sed -e 's:/bin/sh:/bin/bash:' -i virt-what.in || die
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index c7941c6c3b67..c54ff2850a87 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,8 +2,10 @@ DIST VBoxGuestAdditions_5.2.32.iso 49620992 BLAKE2B 04853f4b9a95898263ca7238a78b
DIST VBoxGuestAdditions_5.2.34.iso 49661952 BLAKE2B 2e1455d19e2e6be374b3ab4e2400b838202f8b978884a631317bcfd08ae3adfcb48dadc1ff1d26731c1c55df9e407de005291f37c28d020b7c72acc82fb77e87 SHA512 5e01d3f2692a0e0fa8651bcd4084761d67732f008d4438e3d8428e8ef39e8e5e10f0fb4637901fc733d2d773f9ddce6de7c62e471098824cf72b6fffdaf65f6f
DIST VBoxGuestAdditions_6.0.12.iso 77195264 BLAKE2B bc7956a8eaf4a3ddc92b20c52696e298af63980bc607f8caea51ac00b826f62a3214a30a232070c3ded7a2db9d81114a81de2f6d9b04bdec1ea5cfb26808287e SHA512 83c9703588f14b6a24d878cb929fc09dddd94510f8a63092ff91864275abf8dd47f10e8bd300128305e1ed2e8504c76260b72e5d534c6d45de1e0d64d038ec58
DIST VBoxGuestAdditions_6.0.14.iso 77195264 BLAKE2B 5f87fa4f561aaed80678eaadf3cb2b08edc5cc8de49aa6039c23621c736ad5b73b70ea5e4fcfb0a484dbd170010019350a1b1b4c712148648a9eb58d648f1682 SHA512 33b265b5a5635cb490a16ded64739ced39dcd4cc3c12d381f952b24ddac4ec2de9b36d34bc6e425f6d39f6a090250f64d3b517544f9b4ee91cbaf3de3984aea9
+DIST VBoxGuestAdditions_6.1.0.iso 59516928 BLAKE2B b5b5deac4a589fd56c6826d2191b3ddf72935de9f86f899ca5dc4a20b4339d750c5ccf2cbe614dc453ff03789e3eba90030856babddc6fc2d9dffc260c1ea2b6 SHA512 999679802fc5529a9ade01ebc1923296b247c833b71f0b6b99a4002078ecb1e7e4221d26f1e8e37caa1abbf804543e88e4933efaecbe6974f2efc6f01c6948dc
EBUILD virtualbox-additions-5.2.32.ebuild 710 BLAKE2B 300f594457535bad16e10b7242da27091ff0e8fe20e3db76b73f4b6a47e525f4a39f972c2ab80b0ddf6a1908d2e84996368d12e73e8feb3c7a16cee2e325f447 SHA512 ee73c7a249ae300709068273d0fbde262883334d079fe618d3fc8715112c3c52b8b07cde5229f8fe8312cc7611088ba0742fc4233a25fd75683e58dbe1376cb6
EBUILD virtualbox-additions-5.2.34.ebuild 712 BLAKE2B b5aec1c104906135655ac4a467d65620e52bc081143a40846649c693942624c944efcfc56e05dedc846070aa84032ac2dbcc2c9d7a28c33d96037d954d0728cc SHA512 42d1e17e8170e48bf493efebcbb7b9b0c0441c102af20b25b9f27c0823029d0b98f521dc47844825302f1d17c822104c83598619920cc063df6d83a4e8e87422
EBUILD virtualbox-additions-6.0.12.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
EBUILD virtualbox-additions-6.0.14.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
+EBUILD virtualbox-additions-6.1.0.ebuild 768 BLAKE2B 892da0a6f97f633f7df332d486850cdb20e4177680c3bd7650c4d78a5ae393dffe0dd3eebbe5a50851d89e72a73930ea61681e6b51db0b2855521a149d3a3164 SHA512 21b86b35c8c5cf002801321258bba06c9880e3f7271acc9fdeee795b00d2627453a861494dd20018f87adc0fcf238f62a0c6698dd62ca6be3c853e6080429e57
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.1.0.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.0.ebuild
new file mode 100644
index 000000000000..5124a818a150
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.1.0.ebuild
@@ -0,0 +1,34 @@
+# 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"
+[[ "${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-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 7f62e9e19cc2..51ed66df526d 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -8,18 +8,22 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.34-133893.tar.gz 26985633 BLAKE2B 718bb568a8819250f90d57d57115f84e09da5c2e29539a8585c6916fd794bf2715ea9fc340dc349dbabeab8674230bab2b311686bfb5d343b0a7bdb23578effc SHA512 b932768bbf652f29a4e4ded8e65b944da63b76a02206da77dddf2bf8504cb165c67e215d270cdb4d9ff81adc4a24c146ad9793e074b0cf4e3a3fe77619017716
DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.14-133895.tar.gz 23160651 BLAKE2B c140375bae78f4efe02744ac1b55c76e736eefe58e6adc9edf1fd232433cc572183590963789ab88490f56c6c95154a2755ef16f044b6948801d56ff63edea20 SHA512 fdeedfefeab884a546e7f477b28052c32ab2a2782a66b3afca1e56804552f54d310fbb5dcfd494e4bdb99e7fe1df5f9e4de5263a6db2dcaf9218002607f2967f
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.0-135406.tar.gz 10923164 BLAKE2B 8f09f2b0d6c290dffcdb8d1ee86a31b8ffa37653d198a3478cc96d2f276e6a0a359da82052fd53815509e2f4981279db237dd0287cf8bb78d7f92b747660975d SHA512 dd01cbaacf4dc606e83dfe964289718852e5d11fbb9f744ac19a5f525dd6c149ce292fa124336cede876e65aa32b1365b7f1601f102808dea4fe9f1d445a4657
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.34-133893-Linux_amd64.run 83895763 BLAKE2B 1f7212410c6cf1b2c58efcc0987980024a130a7d80f392ae5007c02aa7f5c3401f72c563c704a2e87282eb92d7d940e648cf6b4202010f068878005396474186 SHA512 ea369b80b8449280f7d605970f31784141bbc43420edde81ad394cb976eca19038455769d65fff9f9b2e4dd70a1c7ec406cc017dc7e50e1a6292bb7da074b845
DIST VirtualBox-5.2.34-133893-Linux_x86.run 82974159 BLAKE2B 30e4e41fa3e3e8aaf928638ad6665a3dc874373daf99032c40381ee0e7ab2146daaf02c5b1d65e32e1fa8286cec4f898d924a9b62fc253a097d1f568538a6939 SHA512 f5fb27bb6d338841357445823fbaa5893fa338d8ef7c146f800baf3ceebb778c29239a82a4d9ceb9e23980177c5d0ccf10b3fc9b63b8b2232f23077bda4332d7
DIST VirtualBox-6.0.12-133076-Linux_amd64.run 127118808 BLAKE2B b654fce2e9134390c7cf27e30e2c2e15e5d3bfd40df85627b266f250c112b0f4f60062d3f50dbb0e5bc0ac7f4b819694cdb65d2148b4b015b8e0c5c71c13e4ec SHA512 cce0e95de6e7ecb879807ec47cff0f4423c471132fc157e4c1656824ab5c914684db53bf73c77f9a98e72f654a7af13b21ad2954ef8f5a961b39ab9bb7c04990
DIST VirtualBox-6.0.14-133895-Linux_amd64.run 127200729 BLAKE2B dc39bcfd02d48bebba59eda8d70bed42c24ae68385b248f168b372a36145b8eb8043f2f59496ce6fa425c2eae4dcd1c78b0d6b44c147dba29ba1362bf6bd2f14 SHA512 4bb4cb398863ec812de9580a3a831cb5aed3ec8e471a519caf58dc988691deb5de7afe56b0c96d6295d2942da142786b4a014079fbc2f3dedae86680a4460cb1
+DIST VirtualBox-6.1.0-135406-Linux_amd64.run 117093835 BLAKE2B 7eae87d07c327552978736cf4b52cbddab57471503e4c803464364c172b0d95b8b46ff0834cc3de11ce9aab245424358b593001f9bdab508714d3364b88e1fdd SHA512 6b1008742c3bda13f7bc319b74e4fc3900c1ed03e7652869d91ae3ff86558200bae4f51b99880f6495fd9492bc8a140b36f6ff7bbb19e0d22e88bf70c21d5469
DIST VirtualBoxSDK-5.2.32-132073.zip 10200195 BLAKE2B 0de34e166b94889c605014233142887e7a8857d1915866156a0cc63850937730ec063e63b550f0d39ad241259158f033b028dbab7eec3f6f38c3715139413b3a SHA512 ccbe2af819bff46055bd6f079a03d69e721a09286e83d4f650583bc7692f5d19ae1a725cf3a6eb1b75167a2c73ff2e020d1f932bf9cfeee9ee709d1174c4cabf
DIST VirtualBoxSDK-5.2.34-133893.zip 10199934 BLAKE2B 4f1f82e374b90e002183272c467074608d437ed43b4a0cc6875f5560d7fafa7432c1fe32287e1afbfc5aac91cc65a226f7b164df2fd036c385c211aa11b24b04 SHA512 deaca4f2480771056079bd2f857ea4a4d834a77f19fd5fa04b6e959f6e54141e901de0387e77418fd8e6ba06de528a3dde1c7b335e9c6eb8bb3278ae08a44d7a
DIST VirtualBoxSDK-6.0.12-133076.zip 10799655 BLAKE2B 93fc5093454a21bf5da26d00f35ab107410cddfed63c9af8494cd194cdc080a70ec8cc8af57233be0472b84a25709a3719f51d399585c1b474ddb4d40e6488ab SHA512 f270a6c404f1bf49ca6bbbc8c4fdba70e6c65001e9731a689f391e6d4c18866ceb14c94a241c15a4e5dd01e08f2c5c61f0fe7feb43ffe36acc9868a72a75603c
DIST VirtualBoxSDK-6.0.14-133895.zip 10801711 BLAKE2B 30f8befbd52bee336f3a63029061d1ebd76975149af1a1960bca298de2e4fee95cde80f9a7e822e589a2cc0e5a7526d07c006575a0508328b2482034e2bd347a SHA512 fd9dc1f077f8c842e0c52e08750af456973eab534e3de4d771d2c212f6024ad953426a62e82ce89895ad77d8de65d1fb39defd9c370864cb16d3d37fd9a31699
-EBUILD virtualbox-bin-5.2.32.132073.ebuild 8335 BLAKE2B 95852652033916357d0f518bf215377d6223348973cab35ba706c2f2924974ceba3000e2f3910279b7f01440373e089fcf204cc4b1f3dcc4f02f8976d8087c23 SHA512 d429e0eecc1128a5db042c71cf20b121279688fbd7d26a612e9e2b9c38c328822bc3c0824896098d5d5965eec1b819559e1ba9c048e5a71b1dd55836afe2d89b
-EBUILD virtualbox-bin-5.2.34.133893.ebuild 8337 BLAKE2B a161528da30c953125f535bcf94ea252c58f3ec7b7b0f2e8c75124685246e195423a23f37ee948ebfd9c12f8b292330d7a6f156c6d771d64b86d0c4149349e50 SHA512 d8303f454165a287575b24496657208afafa680d2854df917127746fb6ef1ae2fd68195eeadd4e626ee4e26c1c0200b68134b0402f07278023982bf9ff4ecfa1
-EBUILD virtualbox-bin-6.0.12.133076.ebuild 8498 BLAKE2B 0d7ceb1c762a8fcaf5b57c2b13084ad4e6e1883ccd33f1505a324808b69c543ba9d40127ae1d649ea0459ebc2133529fbd323c9b7771ea9dcceac92bd233feae SHA512 7fba20a288e059bd415423df2ad5207a4b3f9d0aca363c5bc03fa60b44716c9e184ea800dd0f0ef0a0b4096eade613df73d5149d531b50be857fa4fe2970ca18
-EBUILD virtualbox-bin-6.0.14.133895.ebuild 8498 BLAKE2B 0d7ceb1c762a8fcaf5b57c2b13084ad4e6e1883ccd33f1505a324808b69c543ba9d40127ae1d649ea0459ebc2133529fbd323c9b7771ea9dcceac92bd233feae SHA512 7fba20a288e059bd415423df2ad5207a4b3f9d0aca363c5bc03fa60b44716c9e184ea800dd0f0ef0a0b4096eade613df73d5149d531b50be857fa4fe2970ca18
+DIST VirtualBoxSDK-6.1.0-135406.zip 11172803 BLAKE2B dc70b6cf571f5d4f4dc9eeb92d09a890607fe66a37cb39a7b8a3e496c60dadbf94fc0f1fda794383fd5483f4ebf58e461c7a300a1aba2552839ccc939464004b SHA512 c7e3f848ac85fae508dabf1b8add774394ef9541426d65c6043122d701e1cc3e2102cdd7422d70fe1e74c6b382ffae5f9616921f5e76ce6732498ad91e0678bd
+EBUILD virtualbox-bin-5.2.32.132073.ebuild 8328 BLAKE2B 7cbf1dc1c97c89206aed7d59ea9af49c1ed43335f98dd954001b891692f20ac77db051c1d0c9fa45094d99f5aa72cfb15a07e853a9c7542cabd8837c826adab1 SHA512 eaef0196a2d0bc5b0b50ba04125c33100821018a91149fd07e97e4cb85082f4d2df78536343905756608feb89fcb3b87a1a9aee07043555e72dde6b91c4f9c9b
+EBUILD virtualbox-bin-5.2.34.133893.ebuild 8330 BLAKE2B 063d472eec1e759fdae0c02b13e645a7de3d3cdee90fc7f215f209a2b8f5886ef076f4400a46d5f39bc8c644918ecc6b971704790069a2d0a2695534dccc3140 SHA512 63f7f7f08cb86bd3f13cee9a8cf023b6fefc0263e2fc8963d71f65f34f15a7a89977f122787f1bf75ac6993e34a791904ad9fe429ec0d4727db6250acf855e8a
+EBUILD virtualbox-bin-6.0.12.133076.ebuild 8491 BLAKE2B 700e0daa577bcc9a72ac22105ed0a1c1d364965363973bd3746adda65b4cc93a2da6cda4794fe7f0c533ad094f26ba29770128c587d37d371d3f8f8766466dd2 SHA512 f6b57b5e8e837a55e93e55d92dd754e61ee768d1400ca1bd532a86e331888e7650a099b5a18d172e388e23e090cbbc1d4ab44306bf79459554b67b24fc093ed1
+EBUILD virtualbox-bin-6.0.14.133895.ebuild 8491 BLAKE2B 700e0daa577bcc9a72ac22105ed0a1c1d364965363973bd3746adda65b4cc93a2da6cda4794fe7f0c533ad094f26ba29770128c587d37d371d3f8f8766466dd2 SHA512 f6b57b5e8e837a55e93e55d92dd754e61ee768d1400ca1bd532a86e331888e7650a099b5a18d172e388e23e090cbbc1d4ab44306bf79459554b67b24fc093ed1
+EBUILD virtualbox-bin-6.1.0.135406.ebuild 8491 BLAKE2B 38aad0a2ceeaea4825b25cc367b92b629854a404d32791119233b89d5715e87c5c810f55461366dd512c0ee6968d2d67497849e04fc69a9ea3d1f4fbe377619a SHA512 1e75efea1a17cab5774667c4e636a2d1c45aebc0e06b8a68b820cff286ec8ec91d7fd6fba9ac376b16b75b95d150d76371d525038ae89a38e10820480f139bca
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
index de48142651ba..2ed1560fbf7a 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
index cb4e5663f7c1..ba106a9145dd 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
index ea3b735a7474..d236726f6ef9 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
index ea3b735a7474..d236726f6ef9 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild
@@ -194,7 +194,7 @@ src_install() {
rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so
fi
- doins -r * || die
+ doins -r *
# create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.135406.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.135406.ebuild
new file mode 100644
index 000000000000..d9a9191934c6
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.135406.ebuild
@@ -0,0 +1,291 @@
+# 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-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
+ ~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 4e3a672c5a18..485a6bbc5028 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,8 +2,10 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.32-132073.tar.gz 26917593 BLAKE2B e
DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.34-133893.tar.gz 26985633 BLAKE2B 718bb568a8819250f90d57d57115f84e09da5c2e29539a8585c6916fd794bf2715ea9fc340dc349dbabeab8674230bab2b311686bfb5d343b0a7bdb23578effc SHA512 b932768bbf652f29a4e4ded8e65b944da63b76a02206da77dddf2bf8504cb165c67e215d270cdb4d9ff81adc4a24c146ad9793e074b0cf4e3a3fe77619017716
DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.12-133076.tar.gz 23160551 BLAKE2B 6174296d97f9e32a79f29e119804b15d288100017ea9da20235325f095e1d10a7ea5acf478d914b4a2e874da7640520691ad9a881228855b047f5c0c529ad120 SHA512 f7d4785ce8e53836cb4b87920765967cb3148ba09ee5921ab67fc4547d8a90923bfbb8a432d67ec6b878775fd67f1dbd826dcf993b57481f71d2f8a71ce13bfd
DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.14-133895.tar.gz 23160651 BLAKE2B c140375bae78f4efe02744ac1b55c76e736eefe58e6adc9edf1fd232433cc572183590963789ab88490f56c6c95154a2755ef16f044b6948801d56ff63edea20 SHA512 fdeedfefeab884a546e7f477b28052c32ab2a2782a66b3afca1e56804552f54d310fbb5dcfd494e4bdb99e7fe1df5f9e4de5263a6db2dcaf9218002607f2967f
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.0-135406.tar.gz 10923164 BLAKE2B 8f09f2b0d6c290dffcdb8d1ee86a31b8ffa37653d198a3478cc96d2f276e6a0a359da82052fd53815509e2f4981279db237dd0287cf8bb78d7f92b747660975d SHA512 dd01cbaacf4dc606e83dfe964289718852e5d11fbb9f744ac19a5f525dd6c149ce292fa124336cede876e65aa32b1365b7f1601f102808dea4fe9f1d445a4657
EBUILD virtualbox-extpack-oracle-5.2.32.132073.ebuild 1013 BLAKE2B 822e606ede4d2981350c5a553af7632bb310ad32bb57bd6ecd6c65c9c105f3c571243df92c0be0400b483488e063f6f8def5dd7c63ab2fb5b936bccb26cfb00e SHA512 5d68098ef54662639f62de3262297e912d8b786a9509c5692363830a2f343d6ff5f217bf8db25f53dd7d9f38a86a354de8948e920437acc0fa70f4ba9fdb5a07
EBUILD virtualbox-extpack-oracle-5.2.34.133893.ebuild 1015 BLAKE2B 49d996fa6acf74e1d4f47dfa0cde10f4673a6e5c704ce43f36d5c2f533148cfbeecab4721fd7c233167e1f5db946eff4399601c4d02de5b7dc8c9447ab62faa8 SHA512 7e81290872ad14b61ebcd21d83cac3b307b429be1babcd0304d4f8fa415426f638cc49a99a8d45cabbff84c5d9c355c7e411febdfa2df630d81920666d4e1448
EBUILD virtualbox-extpack-oracle-6.0.12.133076.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
EBUILD virtualbox-extpack-oracle-6.0.14.133895.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
+EBUILD virtualbox-extpack-oracle-6.1.0.135406.ebuild 1073 BLAKE2B 05694fdc8c4b39bf7b4f2953febcbc99305b3a8a8e1e50534b47130dca7782c6a9003d70c59f09b5ab92896d56a0ea0b6d9b29d148b4b08a7dff66656445680e SHA512 884d1e2a800342f1b21c2af0f295dc99c5bb92282595c731718536050667957dae8f872a394b9b2df4603a05e0b2c130281af93c62ef719f42b5dd4193d80a20
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.0.135406.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.0.135406.ebuild
new file mode 100644
index 000000000000..0252ea9c1872
--- /dev/null
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.0.135406.ebuild
@@ -0,0 +1,43 @@
+# 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-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-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index ad125cb86a38..4323de787cf9 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -10,11 +10,13 @@ DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452
DIST VirtualBox-5.2.34.tar.bz2 118268064 BLAKE2B 2ac0359e35012662e850e16e6ee74c4c00898a02eaa9a3dcf4299c444efaf56c17e02b33f165c37a22598ab3967169d32c03c383ca253aaaaa3d9d5bafc9b50f SHA512 a5f8771ddcdf2271006f2ce7de497cfb73cee46c51b0c761c9e79d03bbdf44441e3f1e4ce569967de5c33c469b7b664901c998ca9107acee7fe0ea83896bf0c2
DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
DIST VirtualBox-6.0.14.tar.bz2 154236138 BLAKE2B 18cd508269b2a809ec03b5bacc197131ebd775354e16b9141573ddd037de9ba180e3186347e77067a1767169d2ab1e9ff21590a2702b7705c87cf326204d3424 SHA512 e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
+DIST VirtualBox-6.1.0.tar.bz2 165322453 BLAKE2B ecd15bf1f454dd975562ce27fec9c87d266fcb509952492bd98e77101318149efbcf46b1e025157d569cf511e66b7b8d83dd0cfe5ff288b67010796064dd7685 SHA512 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618
DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994 SHA512 25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9
DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
-EBUILD virtualbox-guest-additions-5.2.32.ebuild 6114 BLAKE2B 894f6fc0a4f021a905b51c1d56f7bf06f692a84af7c5f37b6fe3dd138c30c7e005d78998610a4503e7032757f51dc002dd89d57be731cbad5733ecbd139e6b8c SHA512 e042d7159a77f10c8f671d77b30a83a27f61d96cb1d822218da5084e4932ae6c1df4d758c6b0bab0d7ed29be3f8c4cf92a8dd188fb8c54c53c35e1b13698ead5
-EBUILD virtualbox-guest-additions-5.2.34.ebuild 6116 BLAKE2B 2506803b2edc56d059895ebc363afd75243e1d6ebe26fad1fd07dbdf125e8b44bdecaec9d30478cc8353ab8836970c8fdfed780d01fe45745c7d1038fe76ab01 SHA512 4ac04c2189aecc34317e7abb893e53780be5bbcf2ca61d5b794af52e62e39e038c319a23d9bc15de9ac06a11c9242174d7415d00545f2357996c1bacbb2c8d8b
-EBUILD virtualbox-guest-additions-6.0.12.ebuild 6149 BLAKE2B 95db5659ab2b6b89dea567768ae31d15e1bdabe8614c692c0460c14bc3a3f4ea5c34409b1e69bd952bfc1083c6132e12663a48bd88ef22c649ac1bd415fa40cf SHA512 643dd0ff05d296f032b5832c63d8f730ac7df78e0157deca4ebc204dbdbb87a79c176e8d7c07a8cdd0873c084d63719077936e02dc0664a64500c25f1b279fb4
-EBUILD virtualbox-guest-additions-6.0.14.ebuild 6001 BLAKE2B 20cd1ce48e0c9fab06c8f486b23f9b5ac73b4881dad607e4a9c91c9275e375e656749008368f32d9d9db5066f7efe6422511897bc46217b9b3ad686482c80c73 SHA512 d8b9772b0ac02cb6fb2d7944cfa206869693b74d0406fb29d8a0b782b15bb98d33c4eedbe824ff58c6f13e61c119403fd9cb545184677ae11c55a3dbe10d5bfc
+EBUILD virtualbox-guest-additions-5.2.32.ebuild 6142 BLAKE2B 052c9424b2c54340900c0435929aff514e1f93194c24500854ee46951f186c4ce3f47a58a3b8ae3dedc787b7fe34ad913cfe7915e3b027124cdf9138b5656cba SHA512 21111797b8a8cb64c42715fa918940db187a509ef8600ed3a767f7f5b192e7f7925c59d6ea2049bcfe789d26c902b20fa82491aa9dd563e665b3fb5a1d3e1024
+EBUILD virtualbox-guest-additions-5.2.34.ebuild 6144 BLAKE2B 20cf22e083d59db620c26871f117d6cdbcc9f6bd2b18cfdc934197e40abf907ba10bcb99cc87c8bd48b2e50818c17851d9daa9e60c0983cdb9359316a85054a9 SHA512 c67312546c45bdde98315719ecc9e41c68acd7554f37ad0032fd1394677dbddb94ded524fb28bfb7f6699d6ca2350ce28af5f8d9b238949533ec38f3f0289245
+EBUILD virtualbox-guest-additions-6.0.12.ebuild 6177 BLAKE2B 17e8ec1cad17603da0905d947f645202237ccb28a7f61c2ac61fde31baca02390d6e095318e1002133fabe78f13ed616791400c12a1c6293dad7f78ef4647cdd SHA512 055befcf36d568069e71a991e08970dc6b14fd5f1f4c7cf6012cb56857f51c404d26419b3eac7ca3855770e20931444ba5be022593633d9c8b5f49c16d98f7b5
+EBUILD virtualbox-guest-additions-6.0.14.ebuild 6029 BLAKE2B 01ce31850fd68be3627d54e8a41961348af2c196804f7dd7d493b8327775597f266d864bc4d5cb3207774513564432ebe4b5e22e98b35cdc5ff9174e5fbf9d87 SHA512 38fbcf0f84665cc003cf188f82f846225e7c4dc9af232a360c1ca28c1dd5303f8df81cf857cfcf9df93ad57ddd4c875d717bba2d9b2355e82767f997957b85b3
+EBUILD virtualbox-guest-additions-6.1.0.ebuild 6029 BLAKE2B 01ce31850fd68be3627d54e8a41961348af2c196804f7dd7d493b8327775597f266d864bc4d5cb3207774513564432ebe4b5e22e98b35cdc5ff9174e5fbf9d87 SHA512 38fbcf0f84665cc003cf188f82f846225e7c4dc9af232a360c1ca28c1dd5303f8df81cf857cfcf9df93ad57ddd4c875d717bba2d9b2355e82767f997957b85b3
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
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
index e3a38e9dd881..25b3ec46f46d 100644
--- 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
@@ -178,8 +178,8 @@ src_install() {
doins "${FILESDIR}"/vboxclient.desktop
# sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
+ dodoc "${FILESDIR}"/xorg.conf.vbox
+ docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
systemd_dounit "${FILESDIR}/${PN}.service"
}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild
index c672d02986f6..fd6fa99b5dd3 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.34.ebuild
@@ -178,8 +178,8 @@ src_install() {
doins "${FILESDIR}"/vboxclient.desktop
# sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
+ dodoc "${FILESDIR}"/xorg.conf.vbox
+ docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
systemd_dounit "${FILESDIR}/${PN}.service"
}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
index 9ac2195b1e09..99b5d00e6fe9 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.12.ebuild
@@ -172,8 +172,8 @@ src_install() {
doins "${FILESDIR}"/vboxclient.desktop
# sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
+ dodoc "${FILESDIR}"/xorg.conf.vbox
+ docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
systemd_dounit "${FILESDIR}/${PN}.service"
}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild
index efbf2bd2fdf9..2e5fa67f810e 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.14.ebuild
@@ -168,8 +168,8 @@ src_install() {
doins "${FILESDIR}"/vboxclient.desktop
# sample xorg.conf
- insinto /usr/share/doc/${PF}
- doins "${FILESDIR}"/xorg.conf.vbox
+ dodoc "${FILESDIR}"/xorg.conf.vbox
+ docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
systemd_dounit "${FILESDIR}/${PN}.service"
}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.0.ebuild
new file mode 100644
index 000000000000..2e5fa67f810e
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.0.ebuild
@@ -0,0 +1,219 @@
+# 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-6.0.0_beta2-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+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}"
+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_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-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 63e588db763e..e627c92d0a2f 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,13 +1,17 @@
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.34.tar.xz 642756 BLAKE2B 8a1dacc71b0c033130db84f46ab6029839e4c95cd20b6c982716fde9a83070f4597a9418ef2747c5b5714eafd5c1453c67eb1477104cd1185baf408301bc0226 SHA512 2feefa7867c664f1a1af04181e6db4cf2ab18e8a42dc57afe5fe13d35de889c2a88b79eb43642e024d99decfdd79c42891989158016edb09d5001783c4cb7ac3
DIST vbox-kernel-module-src-6.0.12.tar.xz 669148 BLAKE2B 2291e3fcb9f049ce5657288151d182dfc9a3d6d6e8e1b32047e4b682f35e56f0a5bb5d3ad7efbc98082d2d1823aeb821099e9878b8a237322e8900fb2e2d65de SHA512 e9d8fcbfc076bf4e7d4dc5954e0c24509273c6358ee2de9ddfa87ea650b69fdc31d223595d610c1dd921efd6620ba5285f7f6a10170e90e706bf731e3629dc51
DIST vbox-kernel-module-src-6.0.14.tar.xz 669396 BLAKE2B e2dc77f33176af16be0fcad8851dd42eb2b7b21da35dc434951e3300e45fec4b516741f6122ae43aed2ee332323221098f047b5206ca63eb7741925a40682728 SHA512 1bcc78dff3305bb7186cec2a844188411a62fe32d0581c4de21843ee513925d5dfc9bd4dedb3cc90f0e1c165c7ae6d856590cc359e36cc8605b164c2c9979380
+DIST vbox-kernel-module-src-6.1.0.tar.xz 664268 BLAKE2B 9007242bdfcc407283d183132867bef8cfcf75960e7032f1541be39e33c15de68ae1f49c0022422d776fe0397c1411c62866990efb55fe29f9dce27bf7b95b71 SHA512 a5b9f740589ca09b4115275e01d0da7d68535a927550a57007b75726c715422724593f4debc2a123fb8de43a27e49b372aba3832f17dda3ecfd8813d440a0cff
EBUILD virtualbox-modules-5.2.32.ebuild 1187 BLAKE2B 87f131dcdde7d6acf35a48183ed2423c20366d1c57bfde56b9c6b265006b049d6d5cf2f058867150f30cddfda308512907702208c15d4ae5a868c6e8d6468091 SHA512 80d1deb4b4142e7a4b718a460829ed99e5a4c24e50d65266263a872d247de519972bb13623881382ca8e12a4387e94f327fb9491728dff65ce8449244df0199f
EBUILD virtualbox-modules-5.2.34.ebuild 1189 BLAKE2B 5edbc0952960db33bfa7f3d22266fac6785b6d01591e625e88818845667051e2a090ee34e7265dca082434d2da85dd84930bc71fab7e878f12dececa6320f0db SHA512 5701d91ab3bee88cfa0422f9d22c073f92faad72bbb8beb0ecee96ce78cdd51ef3b59c072c924b3ce267e31cbc4bcefc89376fe273de9dc35d508f3fbd6d59be
EBUILD virtualbox-modules-6.0.12.ebuild 1316 BLAKE2B 996e40c230c441f6a5ba9020e2236a311594b3a02f56b0f50482f91e3dcec936be021ef18470681483c6f6ed3934430184a4b9a241abf413c9af2ce57734600c SHA512 6cbb8bfe065b65093d9c7566e2601ce3464c61f0afae12f35584bb3ba5ec3e8b850c99f864c021b6da66170819bea68b87cad8d6c796ac9d57ea8aac5842074f
-EBUILD virtualbox-modules-6.0.14.ebuild 1245 BLAKE2B d604b453e51b534c7437a56d50ca248ac61362a27c782cb909c905061064859994c2a8fed83e36d43139c848ed494d30506af040e1fd4abd6685b8c50f146c34 SHA512 cc7e6095ca1d2d32e74d32ccf2a1d419b9a68aa8a9699cf7db60f5264f7515c5d17451801014776bdf6ebdf99183c66f82ef3ca304c3d586d0f79729b6078c9c
+EBUILD virtualbox-modules-6.0.14.ebuild 1299 BLAKE2B b5bc508eb0ff4f33c4b99217ae9b9b7d48e6506bd7440e790bd57d501a99878c5be6493cbae5c4095fa58213daf803150f8399b9e91f87b4f0ef5e4dbefe9967 SHA512 8c64966ce7f4e93783be079a1205cb7ddef010b0ec67eb92d12d7a700c1181d975b08105a4056718255ada775a762115403eac77c3ba96b857397977269cd9be
+EBUILD virtualbox-modules-6.1.0.ebuild 1372 BLAKE2B 6ded0a999d7e9dfdcddb961a4921a7a2bbeb7c8cbb8ee052c75dfcc993094dd9410184374f0928f7a6a9a347c724a1f44957f764e90294403ea1e962deecaf51 SHA512 0f4eb88c5dba50e6cd924e4d52809da6c5861a3183d2381c081ec707682943479dd64a0c5bd1bdd2e099f630616256eb71d1f244cc84130105d417cd5da525af
MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
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
new file mode 100644
index 000000000000..2c52aa6757cf
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-6.0.14-kernel-5.4_rc6.patch
@@ -0,0 +1,308 @@
+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/files/virtualbox.conf-r1 b/app-emulation/virtualbox-modules/files/virtualbox.conf-r1
new file mode 100644
index 000000000000..39b882494993
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/virtualbox.conf-r1
@@ -0,0 +1,3 @@
+vboxdrv
+vboxnetflt
+vboxnetadp
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
index 7257cb3b5812..e98eef5b938f 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.14.ebuild
@@ -27,6 +27,10 @@ BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
+PATCHES=(
+ "${FILESDIR}/${P}-kernel-5.4_rc6.patch"
+)
+
pkg_setup() {
enewgroup vboxusers
linux-mod_pkg_setup
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
new file mode 100644
index 000000000000..bd1f35d642f2
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 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 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"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+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})"
+
+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() {
+ # Remove vboxpci.ko from current running kernel
+ find /lib/modules/${KV_FULL}/misc -type f -name "vboxpci.ko" -delete || die
+ linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 4cd814447680..006e0e04752f 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -13,11 +13,14 @@ DIST VirtualBox-5.2.32.tar.bz2 118262502 BLAKE2B f42de23ddbef1bb5472f6730b711452
DIST VirtualBox-5.2.34.tar.bz2 118268064 BLAKE2B 2ac0359e35012662e850e16e6ee74c4c00898a02eaa9a3dcf4299c444efaf56c17e02b33f165c37a22598ab3967169d32c03c383ca253aaaaa3d9d5bafc9b50f SHA512 a5f8771ddcdf2271006f2ce7de497cfb73cee46c51b0c761c9e79d03bbdf44441e3f1e4ce569967de5c33c469b7b664901c998ca9107acee7fe0ea83896bf0c2
DIST VirtualBox-6.0.12.tar.bz2 154250538 BLAKE2B 1c0da29a1d4f4a9ce57280593b219d1fe507fa31dd419d5ef7e62fa8b76bc8b7b21a414edec79ce03b7b4471176e322cb5a0a592a7f61c1f6096c59ca16072ce SHA512 a2182750c6b7e2f7fe8548a923829c05167b739ad84ed025e6cfd85ce787aaa43d41c72c5a93f17e6b976561bae0aa538d81830c52c1d326b75f5a32ba3d441c
DIST VirtualBox-6.0.14.tar.bz2 154236138 BLAKE2B 18cd508269b2a809ec03b5bacc197131ebd775354e16b9141573ddd037de9ba180e3186347e77067a1767169d2ab1e9ff21590a2702b7705c87cf326204d3424 SHA512 e1a64c6633987e178b368dc17e738c6fbef4ab262c574188819f1186bf33f38d8c5accd6a566279a12ccd3544bab4ee5a1f8dce7c8c56d7373489c5ff7f8556d
+DIST VirtualBox-6.1.0.tar.bz2 165322453 BLAKE2B ecd15bf1f454dd975562ce27fec9c87d266fcb509952492bd98e77101318149efbcf46b1e025157d569cf511e66b7b8d83dd0cfe5ff288b67010796064dd7685 SHA512 3709d54861e75efc5b4998bda82ebb868790228f4e19f5e64221322efd8f17916872afa89cc2494faa445fed9ae01ef97af16e4ad111a0a04552f0fac5db3618
DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
DIST virtualbox-5.2.34-patches-01.tar.xz 2960 BLAKE2B e62ab64939e9251a715b3b54b479bc51315acf561ce3d542a4b1358cefb2158353a046003cb0a62e78015f01b626719afb39590090662dd58bfc587bd63cb994 SHA512 25f402c0f96ac25c4d1afdf5d9fff60292caabd2af032a7e2f3e1f70e85bb24f03bbe3625b8bdb7618f77d2890e4c0b9fa7ade2eed590f6658361cca3db4a4b9
DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
+DIST virtualbox-6.1.0_rc1-patches-01.tar.xz 2152 BLAKE2B 5ca1aa008d0a4bd2d8ff4e8b02e506f2bdd68d41b1ae6a733362925b12a82e4f26b4040817800342c69be8e1eec73477d1731e05eb677d09948ed59881be190c SHA512 31f5b77cc86e7fe83e08df956639f50b9936aeab32d98d8f8800c4fa762245a7e6784189409006f82f8ed4bbdadbad7249e2663063448f3f0b0e157acfba6c42
EBUILD virtualbox-5.2.32.ebuild 14473 BLAKE2B 4498464c3d219b3d89cd9e0c0e2e40f95e10024bd0c94e677cd1f96aa56b2f69c3278be9096eeead59c6433b0af1641eb84ba592d8eb4e76aa45b129d8f131dd SHA512 b0d156d10e8af35c19033ce1bdc9381b472c199406808789598b90b5c5fa3a694d258e06c28f712deda49bc02f258c6a0d86c070879846936b5b357f977a26b1
EBUILD virtualbox-5.2.34.ebuild 14425 BLAKE2B af138f1129ae76cc015215d9b8246eca2ab3bbb0e7407e302514335844b58a271396970af3be0ec3127baa20507867458d9e4814488fdd0b576f267b0fe5a2f2 SHA512 97cac7fcac7e4e82370a3fdff345c46fa501f1f99f9e095f36d2b84eeee459931062f5b7afbd3570191a0f9525adf83e7c78f50b4f9494614f02294ff3930665
EBUILD virtualbox-6.0.12.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
EBUILD virtualbox-6.0.14.ebuild 14580 BLAKE2B 8216a40e53ab0fbae65aa7043463b96944b8673bcfb36c753ffb525780af65c92904765d443dc157dfe39e62a0fc511c54df74233e183bf3417cc7ff77182ca2 SHA512 fe38948468c23d8fe7fcaa237570f390e1e6fa4ad8b0d7b52cada8d35355aee51f7cab7a7096ea351ca9ccb1ffe6814496729be840155eb7791e04c337e36364
+EBUILD virtualbox-6.1.0.ebuild 14357 BLAKE2B 16b5f024466f31ae166a06445daffb3bf51e5214e6318035ec75c26f3f1d7bf7e0922db5698e3ecd7351c6533acf648c72a420546568f9a63799721e4b5d0dcf SHA512 fa46554c88aa2d35bcc82818181ed8b044d80a7d1c8ef79c884c9e102e0be9d17dd3916578df37a0a1496847209c1c9f4e4f6f8763d18b52b7cdf5ecbbf2c122
MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.1.0.ebuild b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
new file mode 100644
index 000000000000..cf9b10836a27
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-6.1.0.ebuild
@@ -0,0 +1,504 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,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.0_rc1-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
+ ~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 \
+ 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} *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
+
+ 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/vkd3d/Manifest b/app-emulation/vkd3d/Manifest
index 9b8fbd87d09e..d5b952667093 100644
--- a/app-emulation/vkd3d/Manifest
+++ b/app-emulation/vkd3d/Manifest
@@ -2,5 +2,5 @@ DIST vkd3d-1.0.tar.xz 461884 BLAKE2B 4dbd729f9e795d3d81178abc1a8774c0bbe6a5257c9
DIST vkd3d-1.1.tar.xz 487452 BLAKE2B 834ca06d2159a5857dde457f27e541f06624e87633af6aca7445867abc38c56a1da1fe34b6795ffbd6aa73e983ac0e4301402ae35ef8358fa8cc79c12972b11d SHA512 e107612bdca95e998f9d819bdf74e4ffe1b4d400d250ab855c4ebf94b7d3f088b3221591fef03b1c6b8ecb030feb1673f74831bd8bd8edda2989d09a8846b0f7
EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466
EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4
-EBUILD vkd3d-9999.ebuild 962 BLAKE2B f0662cc50d650338b91c6421530f4624b6cd149bfc3c9b095474a80e6c37ff29bbecfab4338ffc5c6a19f8d24a48b4f0e26087d3caf70abf23d5facb7e5d1882 SHA512 1e13d585d846028661238d9d49595741ad1babfc0de0326f35dc1cc993a59c8fe389e6773c04f39fc8d701765739ab2a1b52281c37a28d4f81ee0273b36cd344
+EBUILD vkd3d-9999.ebuild 1013 BLAKE2B d69666c130b15fa5dea83b104a953b6ac0c79f3854a9b11b09079b64d20c08557e0cc37f87aba29ed7166136b7d14d1fd4599ca258a64819065dc2f1ee552394 SHA512 b6a8fd7302f21d1e5278ab521e8d01769214ba860c413b4981a7c933c457d75f4d2172ae296f8e4a951350632df411674434c8994ea50fdc33bea61695ce8b8b
MISC metadata.xml 562 BLAKE2B 2409531d0bc65f547844ae83bfd7aaea4d996f2cdf11ebbf7e95775465d4bed916a39a38a0aae0c6df91a417df484ecaf63b29ea4286fdcfd11b07c8177e3496 SHA512 2150c80fd4315d922521b43c650012008864b3ed1ff7d80e43622ad916e52411c6ef855b46693f96165e9d89fd6a6f18cdc88baab13bec9f7053c0c1795bcd71
diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild
index 56cb485915fe..8f9fdffa3c6b 100644
--- a/app-emulation/vkd3d/vkd3d-9999.ebuild
+++ b/app-emulation/vkd3d/vkd3d-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit multilib-minimal
+inherit multilib-minimal autotools
AUTOTOOLS_AUTORECONF="1"
@@ -32,6 +32,11 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/"
LICENSE="LGPL-2.1"
SLOT="0"
+src_prepare() {
+ default
+ eautoreconf
+}
+
multilib_src_configure() {
local myconf=(
$(use_with spirv-tools)
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
deleted file mode 100644
index 7197d6f82935..000000000000
--- a/app-emulation/wine-any/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
-DIST gentoo-wine-patches-20190316.tar.xz 58848 BLAKE2B 76e66749638589dd6d6eceb4b78690483d14353597a4e47fe9e5325d8bdb2bceff66040c110f63b8bae698bc5838c280c048ff7375ba2ed8cc387cbe0422c79a SHA512 de2cf844ae686144c3f95f0a360c7fa8a62185500758f994b5a65836798bdc3092138dcd9c36d0267a6fcfdc13585258d31b281244a97b45965f40e0f2b29eda
-DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
-DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.1.tar.xz 21680916 BLAKE2B 1a040606e34e1aec6f63d9692c6cbf915f5b32c817116aed68203e6bdedb8cb129dad440f7e51e9fb2ebaf1aa537d1584333f06b8b2c5d68f9ff37921d5b8b95 SHA512 2b28fc82111552009a042d682ea8f4e54d90f14bb99f1fbe12732090e7562527c229683562630edada0b1f4143de226734337b20d1b23d711191dcc0a834e4dc
-DIST wine-d3d9-3.20.tar.gz 50539 BLAKE2B 53549364113f9dd9d7c9383ec74cc7eafec61dca5bf1943bd87e51b810e6d85d5d0f86f426a22042ee8a23eb21b6b13c691c43d67de19e66550dd0abc3c0319b SHA512 67d452d46807ee9ca44414326a9b2b90403b5c4c611e34ade03a9b624066b62b056f3adde2c0b6d6bdd73066775a1b3eb43d7cf52f82456eb979f788c3e591b4
-DIST wine-d3d9-3.21.tar.gz 50545 BLAKE2B fec93df7a464feba5ebd5c1f9f9b511a89065cc668122c4ddb2c91027b68e2aa93fe58832c4e143832c5b5f4ace57c640ab218525f0749bd5f1c632e80009660 SHA512 b2263d26b671b45a59c03ca5dc88aff35444e4d47caccf3de1493fa86ac834bb178819b9a80aa52838e510f814ed404e6c3ce9724aa6eea6a6d5f019253e6248
-DIST wine-d3d9-4.0.tar.gz 50535 BLAKE2B a5815c4d1b8ea34a0afac565b01aaaa6af418a7d84bf12c4c0591e316d31987770d1d5e99837f1c63e91810db821a2cb76cba1b97c71d5fcee8060a48915e83d SHA512 98e2d4d47fdc376e4e8fed0624657d40ea0a077998baab1d89ef0320714e66f4899414b04fa747b78c172fb85732e9376553c0b20cfd1ae0807cb3de58cfe78a
-DIST wine-d3d9-4.1.tar.gz 50520 BLAKE2B 53f1c4a7fe077776d648a927e75f11a8fa627d3fa15b01e22c18da7a4489ebc883470901e75afc99e07b85201ec05132be4c357923b8ab2ce6ac5f0beedeadd0 SHA512 2e8e3dca86a919a6e6bbdf87f2ffa67f90febcd4ba11351a20785c8dcf732077e1ae1ec0f34f3a4743cb23bb3d8483fd67d9e746e2887d000dd9f0220404b672
-DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
-DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-DIST wine-staging-4.0.tar.gz 9945756 BLAKE2B bfd27d5677d01b4a14c4ef593b741b6fa6e75194de04a90659ecceaa8b087d594cafdd0a53cc2ad2d05e9c73928d70d0b6681ac0052df79f7b45cbb370b31d3d SHA512 4c2277449be17b83235bab7898818a886e84e82c0c5eb8216a5bc42e3d9a0e1dcf09d4522e1165d503fd9237673fa91c2c07d837cde58897f1b6fc8bc6fa5d33
-DIST wine-staging-4.1.tar.gz 9941329 BLAKE2B e455a411d782dcb52b29ad6150b108a4a9b3fd7cd548e35c1392ee3bce581206d99520df19a153ddb80f135156a8d33f6acbbfe086c28f6bfe404fe9eae96556 SHA512 8f52fdae4f98fe67053b00d03234e0937652a9a9506c9e94b717502244eb741c062990678ede11342dc182a4fe9c066227814ebe394ef5f6aedec73983c08554
-EBUILD wine-any-3.20.ebuild 21103 BLAKE2B 2688854f4b6fde18e1704879219a565afb69a62a9c9cd4d74e9087f3627586c6c114f7188930cdddb82c23e0027068ec7a07cfdf8e096a9a876a963a0553e838 SHA512 04ed9492c5aaedf3b34bdfd31c58f15cb632a691aa3da59e68463f9877d4f1f757f78b87618786f85efe87675576d58049fbbe2354991120f4df10796dbe79fa
-EBUILD wine-any-3.21.ebuild 21103 BLAKE2B 2688854f4b6fde18e1704879219a565afb69a62a9c9cd4d74e9087f3627586c6c114f7188930cdddb82c23e0027068ec7a07cfdf8e096a9a876a963a0553e838 SHA512 04ed9492c5aaedf3b34bdfd31c58f15cb632a691aa3da59e68463f9877d4f1f757f78b87618786f85efe87675576d58049fbbe2354991120f4df10796dbe79fa
-EBUILD wine-any-4.0.ebuild 21134 BLAKE2B 1d887eead788371e903561cf292be6a9e010348b13f8ee35cf0c308e2b08f528f057ccfde7e5ab432ffc456c19e268fb93204cac453c0c067ff97d47b36903ce SHA512 777d01dbbf9f7e68bf7e083a8f287a5daafe072b787ebc2088b472531643cbb8ddf0b1b0c3fb0e3c3fd7693f922b011a1cba95c0d14e7ecb6e5658df8689efac
-EBUILD wine-any-4.1.ebuild 21110 BLAKE2B bdf2d7506017315596e79fa8b0ddde97996c779326bf1fbc047f92c2e8712e216b1efb9b0780382dc1e543bebfaceb6d722942a019f5abf1435c4bfbb2876e9d SHA512 d76ef4701ff97d654f7f95c9336311c0c71d33a38b7f98650f34995a46a6f95dbf9cb42c2a3c65f769e0f4d68ef8d198ddfa5baaf2a27aa3423c11b356c88021
-EBUILD wine-any-9999.ebuild 21166 BLAKE2B 620fc472c546d54838cbd250e026ce763932984d552357be061ee543c41d7c56374aca2b09333fbe4c1ba0d91a9f7ee4b8ebd556b52cc22c9932dc61ca5ff8b2 SHA512 cc14fe3949e986d18f4f2405dfc8480dd55f14d32aa03fd34db3864f9db93b09d2e650a4881a6928efd46abfaa2a1d172e992d57e7e6159794730204480b4ad2
-MISC metadata.xml 3844 BLAKE2B 95bb006c1635ae34e88097f588585809785bbe45b333eb618baa7ee71b64ada59b13c7d16bf138395e1e72ddecb430c07a75b3edbf4bd74948e97415a375fe78 SHA512 43160447d94163a67d9e356ad9fa887e35f2a27e8b496e034a3e8fb2b047b1cf1deda9596f6d7ea9b5f52cc7005ffd2e7fb37983d6ddd33fb699fab5fe6d50b2
diff --git a/app-emulation/wine-any/metadata.xml b/app-emulation/wine-any/metadata.xml
deleted file mode 100644
index 04e20b914190..000000000000
--- a/app-emulation/wine-any/metadata.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <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.
-
-Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-
-This variant of the wine packaging allows for the use of the Wine-Staging patchset and the Gallium Nine patchset.
- </longdescription>
- <use>
- <flag name="capi">Enable ISDN support via CAPI</flag>
- <flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
- <flag name="d3d9">Apply highly experimental patches for Gallium Nine support.
- This patch may break some applications.</flag>
- <flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
- <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag>
- <flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
- <flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
- <flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
- <flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
- <flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
- <flag name="opencl">Enable OpenCL support</flag>
- <flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
- <flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
- <flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
- <flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag>
- <flag name="prelink">Run prelink on DLLs during build;
- For Gentoo hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
- <flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
- <flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
- <flag name="samba">Add support for NTLM auth. See:
- https://web.archive.org/web/20160108123008/http://wiki.winehq.org:80/NtlmAuthSetupGuide and
- https://web.archive.org/web/20150906013746/http://wiki.winehq.org/NtlmSigningAndSealing
- (these pages are not currently in the updated WineHQ Wiki).</flag>
- <flag name="sdl">Add support for gamepad detection using SDL</flag>
- <flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
- <flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>
- <flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
- <flag name="vkd3d">Use <pkg>app-emulation/vkd3d</pkg> to provide Direct3D 12 support</flag>
- <flag name="vulkan">Enable Vulkan drivers</flag>
- </use>
- <upstream>
- <remote-id type="github">sarnex/wine-d3d9-patches</remote-id>
- <remote-id type="github">wine-compholio/wine-staging</remote-id>
- <remote-id type="sourceforge">wine</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/app-emulation/wine-any/wine-any-3.20.ebuild b/app-emulation/wine-any/wine-any-3.20.ebuild
deleted file mode 100644
index 23b93ceac9f9..000000000000
--- a/app-emulation/wine-any/wine-any-3.20.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2018 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 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 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}"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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
-"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +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 )
- ffmpeg? ( staging )
- 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}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${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[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.3 )
- 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}-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 ${pn_live_val} ]]; then
- if use staging || use d3d9; 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use staging; then
- local CURRENT_COMMIT_WINE=${EGIT_VERSION}
-
- EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
- local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
- if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 EGIT_OVERRIDE_COMMIT_WINE."
- einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine"
- fi
- fi
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- 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
- if use d3d9; then
- if use staging; then
- PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
- else
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- fi
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- 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}"
- --docdir="${MY_DOCDIR}"
- --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 ffmpeg)
- $(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)
- )
-
- use staging && myconf+=(
- --with-xattr
- $(use_with themes gtk3)
- $(use_with vaapi va)
- )
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- 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
- else
- if use staging; then
- eselect wine register --staging ${P} || die
- fi
- if use d3d9; then
- eselect wine register --d3d9 ${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
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-any/wine-any-3.21.ebuild b/app-emulation/wine-any/wine-any-3.21.ebuild
deleted file mode 100644
index 23b93ceac9f9..000000000000
--- a/app-emulation/wine-any/wine-any-3.21.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2018 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 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 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}"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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
-"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +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 )
- ffmpeg? ( staging )
- 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}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${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[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.3 )
- 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}-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 ${pn_live_val} ]]; then
- if use staging || use d3d9; 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use staging; then
- local CURRENT_COMMIT_WINE=${EGIT_VERSION}
-
- EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
- local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
- if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 EGIT_OVERRIDE_COMMIT_WINE."
- einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine"
- fi
- fi
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- 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
- if use d3d9; then
- if use staging; then
- PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
- else
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- fi
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- 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}"
- --docdir="${MY_DOCDIR}"
- --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 ffmpeg)
- $(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)
- )
-
- use staging && myconf+=(
- --with-xattr
- $(use_with themes gtk3)
- $(use_with vaapi va)
- )
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- 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
- else
- if use staging; then
- eselect wine register --staging ${P} || die
- fi
- if use d3d9; then
- eselect wine register --d3d9 ${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
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-any/wine-any-4.1.ebuild b/app-emulation/wine-any/wine-any-4.1.ebuild
deleted file mode 100644
index 0a8c0641c7c3..000000000000
--- a/app-emulation/wine-any/wine-any-4.1.ebuild
+++ /dev/null
@@ -1,644 +0,0 @@
-# Copyright 1999-2019 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 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}-2"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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
-"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}-2.tar.gz -> ${STAGING_P}.tar.gz )
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +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 )
- ffmpeg? ( staging )
- 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}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${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[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 )
- 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}-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 ${pn_live_val} ]]; then
- if use staging || use d3d9; 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use staging; then
- local CURRENT_COMMIT_WINE=${EGIT_VERSION}
-
- EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
- local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
- if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 EGIT_OVERRIDE_COMMIT_WINE."
- einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine"
- fi
- fi
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- 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
- if use d3d9; then
- if use staging; then
- PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
- else
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- fi
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- 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}"
- --docdir="${MY_DOCDIR}"
- --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 ffmpeg)
- $(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)
- )
-
- use staging && myconf+=(
- --with-xattr
- $(use_with themes gtk3)
- $(use_with vaapi va)
- )
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- 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
- else
- if use staging; then
- eselect wine register --staging ${P} || die
- fi
- if use d3d9; then
- eselect wine register --d3d9 ${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
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-any/wine-any-9999.ebuild b/app-emulation/wine-any/wine-any-9999.ebuild
deleted file mode 100644
index af955b3caf31..000000000000
--- a/app-emulation/wine-any/wine-any-9999.ebuild
+++ /dev/null
@@ -1,645 +0,0 @@
-# Copyright 1999-2019 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 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}"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
-GWP_V="20190316"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional 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
-"
-
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +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 )
- ffmpeg? ( staging )
- 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}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${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[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 )
- 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}-4.4-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 ${pn_live_val} ]]; then
- if use staging || use d3d9; 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use staging; then
- local CURRENT_COMMIT_WINE=${EGIT_VERSION}
-
- EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
- local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
- if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 EGIT_OVERRIDE_COMMIT_WINE."
- einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine"
- fi
- fi
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- 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
- if use d3d9; then
- if use staging; then
- PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
- else
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- fi
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- 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}"
- --docdir="${MY_DOCDIR}"
- --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 ffmpeg)
- $(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)
- $(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)
- )
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
- 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
- else
- if use staging; then
- eselect wine register --staging ${P} || die
- fi
- if use d3d9; then
- eselect wine register --d3d9 ${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
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index bf826550f2a6..d2d54242740c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
-DIST wine-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
-DIST wine-staging-4.17.tar.gz 9914906 BLAKE2B a5a430588aaede6f6ac2e30710bf58d57100a37444a2610b57529116b2d9b88a6f4bcfb56ad71153734d8f1a99a70eab4cb568d3cfb6d5ce6198eb662e3cc201 SHA512 1f27511c8ff6619f4138eb3b2cd0cc1cdf42c0cd4206c68bdf792ae17c339611016e32babad121f0decf20331f7ce4400033be03c4db26cb6a4dc601c9c4b14d
+DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
DIST wine-staging-4.18.tar.gz 9917480 BLAKE2B 477da02f5177e7efad33ca30267b2a8755c493972c2ff4ebec32275b699a4c08fd9d4b72181f8ad87c58b1c120b7a7b47951057db36963bcd161afe10b1a89aa SHA512 e5ddb7ac09322b5f2c8e8facff9639699a6a3e72a96f4028e88e23e81f73c766bde1479e54a9a80bd7f33c7747a8220e2699f4dcfe55117b9832ff4cdba60a04
DIST wine-staging-4.19.tar.gz 9908545 BLAKE2B 36674228de808ac9d1f3f66e9274fd9de68173a6a1acca405eb08836a8a787e4e78465442ef6769c02f8fd2e20c3f059d59a1408ed3a8add8a91a68efd07b7bc SHA512 a47ae16dd39797b54011f942fe7e722897af7ddc0bed2bf2e39c46aecf60a02769f7287609c63b4c0c3f1c8e40172e0cdf3bdb53562a07d7a2b7ac53e570dbdc
DIST wine-staging-4.20.tar.gz 9899451 BLAKE2B a90a71f8f68874822c7326eb13cd26e66dfce8afc6d8fc60f1cf86a20c1a8074178bbc618b540a4bac5168fb0242a0fe46c9167bab3e587462d78b706eaad15c SHA512 2ce4f6fa83fc275c83bc7f7bbd4b1a4ca65f7e55e16af40958635b8b2efc2b174baa79ed576ed09c4c13b572756fb6262f19281e5b72797c7e0f1f6c4dd1a4ee
-EBUILD wine-staging-4.17.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
-EBUILD wine-staging-4.18.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
-EBUILD wine-staging-4.19.ebuild 20292 BLAKE2B 4c1ba41598f20b35edd662146668490724a427cf376365bafb3bf9d40d1b59f7f1f69e0dfb3bcb10470f44f6f72428b18db488fba9c1c9a8062b3887caf6f0dd SHA512 067376270208bed03c1dbc932e74913db737555b72d1d4e879d102214e309969d276eafbdf4b69f033e239b8a99ed3a507ac267b3c43cd0236df4933e7ef8da4
-EBUILD wine-staging-4.20.ebuild 20292 BLAKE2B 73cc0437ec8cb6117a65bef1a48578ac5148634803a63b1491f94690f3ef98331505e56e7898ecb0fb96c84e14d7224ab9c94b4e0cfadcc088ad11f89d2a7861 SHA512 96bd9c1b21febb63516c47f8a8e8f460db1d1fa89c9340121891a69c81aaae18d1ddcfc2b535bc2e13109f8d8849acec35ad3dbb0083498e000e90899aa807c9
-EBUILD wine-staging-9999.ebuild 20292 BLAKE2B 73cc0437ec8cb6117a65bef1a48578ac5148634803a63b1491f94690f3ef98331505e56e7898ecb0fb96c84e14d7224ab9c94b4e0cfadcc088ad11f89d2a7861 SHA512 96bd9c1b21febb63516c47f8a8e8f460db1d1fa89c9340121891a69c81aaae18d1ddcfc2b535bc2e13109f8d8849acec35ad3dbb0083498e000e90899aa807c9
-MISC metadata.xml 3712 BLAKE2B e42b36bfa8f6d0f4c9b2538c04bb0b7650c411b621a1be5cba58ca8f6f64a1bc68517eeef385351461ef72e33152b05df14775777de14e848802ee8eb4980909 SHA512 1a904083074cad42013d9a8798ea32898332fa0697f79a1a11e6a0f5b6dcf35cb42dbb52a3b5baaeb3fe2012f80dfbbafbd874df4eef783e8a151b13b98afe77
+DIST wine-staging-4.21.tar.gz 9904765 BLAKE2B 43f15cd96c7f5ca9cf5aad120c73a3aa534dce33797a4a4e707bea668cfc93e077ad112055dc428263775a30c6447620eed8650a9828ac487bf36c6490a7b73d SHA512 0c6c32f86d252f827ebb8d5df2b046c4f0a49aa7c0ca47939b33844786e561d5f676db1e199ec3cd9969757985f66b865099061f5e77234c3aabd4fd29d3a063
+EBUILD wine-staging-4.18.ebuild 20185 BLAKE2B 026f4177a87d74d44099f8fbb4b12bb00ae84ba09fe27c8c371af4cb74f57b009ff50fc110e4834c2cc1039cccd652feca8607bae87f2fa4c5c4784a642e5907 SHA512 38cbf199cf69ad6eea696944676e6ebac5a8c4deaaa4c2b5f5cfb2c850ca4e3b7fb2a22c1bfba5493edee8b0c0bd8277345b115e9bcefa960b51dea616736b70
+EBUILD wine-staging-4.19.ebuild 20185 BLAKE2B 026f4177a87d74d44099f8fbb4b12bb00ae84ba09fe27c8c371af4cb74f57b009ff50fc110e4834c2cc1039cccd652feca8607bae87f2fa4c5c4784a642e5907 SHA512 38cbf199cf69ad6eea696944676e6ebac5a8c4deaaa4c2b5f5cfb2c850ca4e3b7fb2a22c1bfba5493edee8b0c0bd8277345b115e9bcefa960b51dea616736b70
+EBUILD wine-staging-4.20.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
+EBUILD wine-staging-4.21.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
+EBUILD wine-staging-9999.ebuild 20185 BLAKE2B 10e08743d08d98fb2ee5b4aa5afe3eada3c9ad45851cc84108f89a770024206ce1f0da2aac0609089004322cdbe33a94d5707e11be7a5246bd1009b8aeea088f SHA512 2604573ff2f999397d6810e18cb0e224fec38f0124f10025979e090ec0c817b942c71e60b958eabeb312f97db09d18dc2ce66a478ee1cdf9f309fab87117bdfc
+MISC metadata.xml 3627 BLAKE2B 42dd4bb0f3127c1f7403c62e9999900915d86692e571ad4ecde63362d7327ecdaa5ee3d68206b54ad7bd858ccac9049f5c172fc9faf2cadc6af5209598883bd9 SHA512 02fab3eae9d3eb21fc80c0d4950902aacebf0306b99447906760053247e2b0e5bc407b7ec52a2df46de0d3a96d3f6e543a9e94c7878bda115a13fde1d98955f6
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 2021448c4735..8a734247ae2a 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -21,7 +21,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
<flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
- <flag name="ffmpeg">Use <pkg>media-video/ffmpeg</pkg> to decode WMA formats</flag>
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
diff --git a/app-emulation/wine-staging/wine-staging-4.18.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild
index 2d1bd8b5970e..4376738049f0 100644
--- a/app-emulation/wine-staging/wine-staging-4.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild
@@ -44,11 +44,10 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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"
+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 )
- ffmpeg? ( staging )
osmesa? ( opengl )
pipelight? ( staging )
test? ( abi_x86_32 )
@@ -73,7 +72,6 @@ COMMON_DEPEND="
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -443,7 +441,6 @@ multilib_src_configure() {
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild
index 2d1bd8b5970e..4376738049f0 100644
--- a/app-emulation/wine-staging/wine-staging-4.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
@@ -44,11 +44,10 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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"
+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 )
- ffmpeg? ( staging )
osmesa? ( opengl )
pipelight? ( staging )
test? ( abi_x86_32 )
@@ -73,7 +72,6 @@ COMMON_DEPEND="
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -443,7 +441,6 @@ multilib_src_configure() {
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild
index a2a1c5872a75..018e0d7d63fe 100644
--- a/app-emulation/wine-staging/wine-staging-4.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
@@ -44,11 +44,10 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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"
+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 )
- ffmpeg? ( staging )
osmesa? ( opengl )
pipelight? ( staging )
test? ( abi_x86_32 )
@@ -73,7 +72,6 @@ COMMON_DEPEND="
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -443,7 +441,6 @@ multilib_src_configure() {
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-staging/wine-staging-4.17.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild
index 2d1bd8b5970e..018e0d7d63fe 100644
--- a/app-emulation/wine-staging/wine-staging-4.17.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild
@@ -44,11 +44,10 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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"
+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 )
- ffmpeg? ( staging )
osmesa? ( opengl )
pipelight? ( staging )
test? ( abi_x86_32 )
@@ -73,7 +72,6 @@ COMMON_DEPEND="
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -130,7 +128,7 @@ RDEPEND="${COMMON_DEPEND}
!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.9.3 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -443,7 +441,6 @@ multilib_src_configure() {
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index a2a1c5872a75..018e0d7d63fe 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -44,11 +44,10 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +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"
+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 )
- ffmpeg? ( staging )
osmesa? ( opengl )
pipelight? ( staging )
test? ( abi_x86_32 )
@@ -73,7 +72,6 @@ COMMON_DEPEND="
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -443,7 +441,6 @@ multilib_src_configure() {
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 4494eec281f7..8b1efa8565ea 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,17 +2,19 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969
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-4.17.tar.xz 22230616 BLAKE2B 428d9b781acbadabb2ce677b08c1a38f130c39d2acb95364dc0ac4cfef8f7c9efe4199846bf0bfc745dc25ba632847f224da1b0a09b8ee6c4927154771a538cf SHA512 f762aab2596a4b5cf73d3282be561d25a2fe69e5d4a5ec2e29db47b3eda7496ca9eb7e57ff7765853d258422898bfa775bf9b458e61eef837b213e422bd748b8
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701
+DIST wine-4.21.tar.xz 22395844 BLAKE2B 1b9c1fd8f4a1ff0527b4d4a02b1dfffa4f6887f2f261b7d4b5afa12e65a8ea18f544c91397cfc71039db7736d33cd0219aaab82cc4564ecd0cb9c74a2e39d6e5 SHA512 f962e47577db2de4e74022b8d51e81e30a004f98b37d8eee5889334271f013123e3ff53e5ac1416c2dd93ec90bee8a2d300b3842c20124df99ef067ac5c72f53
EBUILD wine-vanilla-4.0.1.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
-EBUILD wine-vanilla-4.0.2.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
+EBUILD wine-vanilla-4.0.2.ebuild 17333 BLAKE2B de24979de56828f96c53353f02cc44940e7f524eb76bdf9a832d08e21d04eb8e7f3f5a174f20f04e3dcba24a53414822987805ea046066da05824a04a6aab486 SHA512 f5fde5c2ab86543c9e0dfbec9d1e0234c5b0a0e66cf71201a94c7b7be82062c7b2551d6ab4719f7e371d49d22bdaf2fe02b190d145c79923f3024d28b87e0f97
+EBUILD wine-vanilla-4.0.3.ebuild 17335 BLAKE2B 6c313ee907ba258f737b19a9e2c1ab3bf04555649c558d569d7372170704ce2134b6a9d009cfb0e8040ebaf7d50a68c5e8a44fd109557a0e0d77c8293fa0f8ff SHA512 e8b8fae470d371aae55cd69677dadf14da758443f4be3ca19a9782ae8ec51696a1c7e113be38ffeef3270160d155c383daf6482e283def2ccebb5df0cfd3a803
EBUILD wine-vanilla-4.0.ebuild 17330 BLAKE2B 1dbe6a5dc59af64bfebf087f84efdcad0a1ad56b3f29e567926d4f036ed36ba53bed1ad5072363cde853b18e1ecc848a2804e716b35e85f0ea04faf7e7306d82 SHA512 5535dd99e33a4895d8e6cc9a42c4fe47ccc69e44ff7270e0ebd89701cee1262a1270d2a781f0ac35ef708d9e1c194c02e43c98b1fec7895bd6f83d4b88c02353
-EBUILD wine-vanilla-4.17.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
EBUILD wine-vanilla-4.18.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
EBUILD wine-vanilla-4.19.ebuild 17552 BLAKE2B 48bdadd0a5f2e4eb55a6db288f527718b2fa9fea34ecb55190f7ea39db379ba1d5c1cab188894ac8968ab72613c344644697279e1f108140b2784f041d4f7bff SHA512 168ccb8c38467d6978af5f05aa180d8e529d3f559e5424b1d50e50c55d357c43ee0ea8ea684ff3bc276fa19380125834dabb748a682c7e46274bdfadc5407f63
EBUILD wine-vanilla-4.20.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
+EBUILD wine-vanilla-4.21.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
EBUILD wine-vanilla-9999.ebuild 17552 BLAKE2B 49ff2aabb9bb739ab4e407283c567800913cab97e65fac9219c429dca7112e670643f471f92945f0962b1f78c2e50f75dad68ed883070280cb122700ec8b0493 SHA512 13d9f9e437b2bbda1ae93519b3b8421834f3d9eeb4849b4af065ffe391d30ca138eec5c442d199d506b1eb719519746a3e75b71963eb20377925ed5661fb2c1d
MISC metadata.xml 3259 BLAKE2B b750a29db90841c9fa04e19ce9e5811945bb1d1d3b6a3b4a071087bf73f9386706ab28b7af29e7e89afcff2e1b68ca79944546e5f68c0d0f248b95fb1a5ac2fc SHA512 84fb94a9a9e4c9e8bf59391c9c1414e55994f80df0b264fdff77f43defa13ef0becdfc24316ef9eb3d824ea8edca5af3aed0586224a96b25fc3e90d7dfc32394
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 78f6dd16ff0e..fde52036375d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -21,7 +21,7 @@ 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"
+ KEYWORDS="-* amd64 x86"
fi
S="${WORKDIR}/${MY_P}"
diff --git a/app-emulation/wine-any/wine-any-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
index 618c9dd15249..78f6dd16ff0e 100644
--- a/app-emulation/wine-any/wine-any-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
@@ -3,7 +3,7 @@
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 sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+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 multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
@@ -25,40 +25,23 @@ else
fi
S="${WORKDIR}/${MY_P}"
-STAGING_P="wine-staging-${PV}"
-STAGING_DIR="${WORKDIR}/${STAGING_P}"
-D3D9_P="wine-d3d9-${PV}"
-D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
GWP_V="20180120"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
+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
"
-if [[ ${PV} == "9999" ]] ; then
- STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
- D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
-else
- SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
- d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
-fi
-
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc ffmpeg +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"
+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 )
- ffmpeg? ( staging )
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
@@ -77,13 +60,6 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- d3d9? (
- media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libxcb[${MULTILIB_USEDEP}]
- )
- ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -93,7 +69,7 @@ COMMON_DEPEND="
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
)
jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5: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}] )
@@ -114,17 +90,10 @@ COMMON_DEPEND="
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}] )
@@ -160,10 +129,6 @@ DEPEND="${COMMON_DEPEND}
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
@@ -275,23 +240,9 @@ 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 || use d3d9; 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
- 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 " EGIT_OVERRIDE_COMMIT_SARNEX_WINE_D3D9_PATCHES"
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "EGIT_OVERRIDE_COMMIT_WINE"
eerror
return 1
fi
@@ -331,22 +282,6 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- if use staging; then
- local CURRENT_COMMIT_WINE=${EGIT_VERSION}
-
- EGIT_CHECKOUT_DIR="${STAGING_DIR}" EGIT_REPO_URI="${STAGING_EGIT_REPO_URI}" git-r3_src_unpack
-
- local COMPAT_COMMIT_WINE=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
-
- if [[ "${CURRENT_COMMIT_WINE}" != "${COMPAT_COMMIT_WINE}" ]]; 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 EGIT_OVERRIDE_COMMIT_WINE."
- einfo "Example: EGIT_OVERRIDE_COMMIT_WINE=${COMPAT_COMMIT_WINE} emerge -1 wine"
- fi
- fi
- if use d3d9; then
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}" git-r3_src_unpack
- fi
fi
default
@@ -365,31 +300,6 @@ src_prepare() {
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
- if use d3d9; then
- if use staging; then
- PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
- else
- PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
- fi
- PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
- fi
-
default
eapply_bin
eautoreconf
@@ -465,7 +375,6 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
- $(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
@@ -506,13 +415,6 @@ multilib_src_configure() {
$(use_with xml xslt)
)
- use staging && myconf+=(
- --with-xattr
- $(use_with themes gtk3)
- $(use_with vaapi va)
- )
- use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
-
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
@@ -597,13 +499,6 @@ 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
- if use d3d9; then
- eselect wine register --d3d9 ${P} || die
- fi
fi
eselect wine update --all --if-unset || die
@@ -628,13 +523,6 @@ 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
- if use d3d9; then
- eselect wine deregister --d3d9 ${P} || die
- fi
fi
eselect wine update --all --if-unset || die
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
index d502188edebb..ecb350c90718 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.17.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
@@ -109,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!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.9.3 )
+ mono? ( app-emulation/wine-mono:4.9.4 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 6aa0cb692a60..3615c322cac7 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,7 +1,5 @@
-DIST winetricks-20190310.tar.gz 673467 BLAKE2B b6c6a6d28e49f9b2745ac623f9a9d35bdcaa402c11b3f2055f3d2ef2d13ccff6adcda47261447aff7b70bfcd9bc65ea2a278368616df93f031fe212aa3201a5d SHA512 4f08228306a84cd2e1ecf0df46e951dfc5844716fadab903eca7ed09f15ed2bbba7ca5bf48384f934783be6a85b812129427a296a580561ee5b8483df0e64025
DIST winetricks-20190912.tar.gz 679544 BLAKE2B 633c407f8560fa3aa38806befded957d0bf1276164483b08fb3ef285fe873531d6362ae6305f5a33a85891d75990e6e0271fe954358e49425c4f36f0f918f48d SHA512 a0017cc08c56a511e523116daf2024b1462460d00b3d07de87720c7912dccab3d953db3653d7d611c5ae3b457a45de8d36688ee703e805c1e1f5be5c0fa7739f
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
-EBUILD winetricks-20190310.ebuild 1910 BLAKE2B ce6174352c8370e08edb836801010698fc2b717c438e8661818e2f0b6538f3af4ff647b7693e6a56e07b1d7db8732dd3e651d24ecd186e135603c521d8d0c6e0 SHA512 9fec59c039413af08fff8d8ee301607683fd9645f79b1bd4e4fdc52a0e93e40a1cc126dd160a7387722e22bddab1e8a2d90e4afc58558e3d3a7532176b0f7d26
-EBUILD winetricks-20190912.ebuild 1911 BLAKE2B 5cdbf7f9364a82f7319f654fb0a118ab53abba5f8dfa56ac8598431ab501347de75b3d27ae4acf88b863d152761481ac24c1d8494e7a20ec81a7e2ded4c74b7e SHA512 2af034e96ac2f78b298895eb45d993b9a744c1faa1efb80b28bb660b180339de8c3158697900abe898616a675f316442535d9498e4acbafdf169b3b8abd95752
-EBUILD winetricks-99999999.ebuild 1912 BLAKE2B fe3c652325f6d428cacbc22f74ae0fd93e397e8b4b81287e7611608cbf7f3c0261e5844d722ddc1823a94be344b4e3c1d3bafb07e958afd7568cfc1b576f105a SHA512 b10f311f6be55a688021dc83821b0c78e8305271e3bc1a982fab034b9b0c8f489a26df94140c2c4f545d79b0639930f90ea7380cbfccdcc460ee0e88d2a5b946
+EBUILD winetricks-20190912.ebuild 1937 BLAKE2B 231d6da06a48480219664c749f5c032135444bb8490ab49387a37f97ce1b7dfe27a8815bc0cbc3e9e3d74d764af4b0d4d0e395e89ff4a6d698770f3638abc3b8 SHA512 ecaf370db1513bd7119fbbf85710f1a7d22c250e60d51946ddea8efd885136e18012add92bb3283664ecb3995af235a1ee7cccbfee8e215950a9a08141956dd4
+EBUILD winetricks-99999999.ebuild 1939 BLAKE2B 99a9a25d9981607a9f1de4c0c934c1d13659037fb5665c0b8b8c9d249e93cde40f347575b5c58dee10325fc98feeeb257905cff7e08cc4b30c8a4595fb95d715 SHA512 eb76845444cc9e93089371db14d22abe9acc6ec1ddc5d11c9b6a88354b42eeacaade10924354a5f854818b320445b0d0d05e2e89548c7f66994cd6a6b6d635c1
MISC metadata.xml 713 BLAKE2B 144bf83fd445c85df10c852a798f8e6f049923489e039fceb81989279eba2f869fb5b660482cd2f0be872761bdee3fb1104df207f44daa060dee1aab6cddd9f4 SHA512 f1fc5650abbff4a82a006461932d765d775cdbd630ebcbfdd02488b2f1999d41e89b2a45d6142175e715e186392f4bc4820f501c4064e4a9aa9c8dabbc1ce6a9
diff --git a/app-emulation/winetricks/winetricks-20190310.ebuild b/app-emulation/winetricks/winetricks-20190310.ebuild
deleted file mode 100644
index dab00adc9eb3..000000000000
--- a/app-emulation/winetricks/winetricks-20190310.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-fi
-
-wtg="winetricks-gentoo-2012.11.24"
-
-SRC_URI="${SRC_URI}
- gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
- kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
-"
-
-DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
-HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk kde rar test"
-
-BDEPEND="
- test? (
- dev-python/bashate
- dev-util/checkbashisms
- dev-util/shellcheck
- )
-"
-DEPEND=""
-RDEPEND="${DEPEND}
- app-arch/cabextract
- app-arch/p7zip
- app-arch/unzip
- net-misc/wget
- virtual/wine
- x11-misc/xdg-utils
- gtk? ( gnome-extra/zenity )
- kde? ( kde-apps/kdialog )
- rar? ( app-arch/unrar )
-"
-
-# Test targets include syntax checks only, not the "heavy duty" tests
-# that would require a lot of disk space, as well as network access.
-
-# This uses a non-standard "Wine" category, which is provided by
-# '/etc/xdg/menus/applications-merged/wine.menu' from the
-# 'app-emulation/wine-desktop-common' package.
-# https://bugs.gentoo.org/451552
-QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
-
-src_unpack() {
- if [[ ${PV} == "99999999" ]]; then
- git-r3_src_unpack
-
- if use gtk || use kde; then
- unpack ${wtg}.tar.bz2
- fi
-
- else
- default
- fi
-}
-
-src_test() {
- ./tests/shell-checks || die "Test(s) failed."
-}
-
-src_install() {
- default
-
- if use gtk || use kde; then
- cd "${WORKDIR}/${wtg}" || die
- domenu winetricks.desktop
- insinto /usr/share/icons/hicolor/scalable/apps
- doins wine-winetricks.svg
- fi
-}
diff --git a/app-emulation/winetricks/winetricks-20190912.ebuild b/app-emulation/winetricks/winetricks-20190912.ebuild
index 3daf509e39bf..3cb7eb82c4b2 100644
--- a/app-emulation/winetricks/winetricks-20190912.ebuild
+++ b/app-emulation/winetricks/winetricks-20190912.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
SRC_URI=""
else
SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
wtg="winetricks-gentoo-2012.11.24"
@@ -27,6 +27,7 @@ HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winet
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
BDEPEND="
test? (
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 900a5b539221..b189cfcbaca7 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -27,6 +27,7 @@ HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winet
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
BDEPEND="
test? (
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 15f0cd468b6f..3fbb459340ae 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -6,11 +6,12 @@ DIST lwip-1.3.0.tar.gz 398933 BLAKE2B 3567a593eec3d247213daaaab57d9456c9cae50329
DIST newlib-1.16.0.tar.gz 12024353 BLAKE2B 26d3308148fb99baf8ad02eee4cc699cfac690100ea63aaa4be03b86d12dade238478342514bd083cbc3d27964ac42eb8dae3873fdac5ff2c593fc4fb39b2309 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3
DIST pciutils-2.2.9.tar.bz2 212265 BLAKE2B 014b664e90c64e7255c9e21fc25a2cc60d57f47ce282fc0331a0481a460b237783bd3774dd0689e1596d4a0be0d2889faad904da01a6f02147464bce1d1b1bc0 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5
DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c907c3c6b352eed3d9e500fc5739e62eb4f6fc32ff02579c6a6de9bd49fcd2c8bd8b2d158a5050cbaa82118d61ef0 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
+DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
+DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
+DIST xen-4.13.0-rc4.tar.gz 39003881 BLAKE2B 21352f0984f1c46f8f3a4e8420ec9eabeff65d47c61bbb16dadca6087a53a975285fd58f3c9d810a874b95059eb2538d989921e2acd0b23f46baa3668c4737e9 SHA512 cbea9cc6cbc2b80ba9bec840b9c08d90884e908ec9675000df75a483ee1f2c70ce09c97d69d923a6530726b92fe6bee7b22aeee71ce5e9530c2eba984c7f57f4
DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
-EBUILD xen-pvgrub-4.11.2.ebuild 5106 BLAKE2B 611e4797e596f5e7c5117fa284e7841319119bdf2745a63bdd743da993140225fa5e1dd026c8966dedec0a976bcd1c8419b7cac08f5efbad5d3243ac5653a7c5 SHA512 1dc318e1179a8e8bee5212c323ff887fd991b39f5803499cb8472d2d963eb7928ecb676fec674aedad34bd07a82d9188f1759e1a6751c5223eb52a703b410977
+EBUILD xen-pvgrub-4.11.3.ebuild 5107 BLAKE2B f5c4402f205984badd0cca4d9402b0968bd88c23e73c91abc6fad12f9bd32e1ab33c6ec13e77bc47774784da5f6d3921b72d440a9375c9fc4a4c2c89bc367cf5 SHA512 3d92a23ffd35b0078fee6b155fe11ff78365f2e3d9bb0e341d7d56666031b43d4845838bde500942dc9aab378b764b5ffa300e8b45a21c5f7c8dd84157356a31
EBUILD xen-pvgrub-4.12.1.ebuild 4464 BLAKE2B e1194d9348aa2aeb0c269b86b658f2bf515f7cc15ac12836748a31e331e2714381ab8b266d7bd69947d33f9ddb48670dee6dd98dafa6a09d919ecfc64800d4fb SHA512 1ecddb92301bb9af5b9a30e0f978e8cb6768cd74b09b8ff7015c8b36b03cba53d81704d2f344b40918cd5ab4034056c9001051a8433d89c7642f8c18bd3d8a15
-EBUILD xen-pvgrub-4.13.0_rc2.ebuild 4503 BLAKE2B fd9752ef20e0dccdc551ae1313b81a36c48edc73aa13a7cc34bfc5d29c2a20343b761f79319864003588b65476f6d17d18c02bcfed01654d72ac3f8707591da4 SHA512 f7cbdc4be93d0de30617404cfd3273bf350ae5ada504b97482a871abb5ff2c785e87a14f132494acc3136a19d4119899c06edc760d68043bd210458479253cd7
+EBUILD xen-pvgrub-4.13.0_rc4.ebuild 4503 BLAKE2B fd9752ef20e0dccdc551ae1313b81a36c48edc73aa13a7cc34bfc5d29c2a20343b761f79319864003588b65476f6d17d18c02bcfed01654d72ac3f8707591da4 SHA512 f7cbdc4be93d0de30617404cfd3273bf350ae5ada504b97482a871abb5ff2c785e87a14f132494acc3136a19d4119899c06edc760d68043bd210458479253cd7
MISC metadata.xml 477 BLAKE2B 663101aa83713fa70e98a41985f3ec3d4c78765b862fb9df1f35ed31d1b32640bc093a0d680252d7b0116eca7f758145bb6337618ac4fea8a0ed108df83ca57a SHA512 907e17ebf2262b71644a8b2d863f5d4cdaee775026eb1a9da736a4ef003a45e8c6eaa2439184865706e57aea0afdf5f3f363e98dc63762ea8706ffad640c9046
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
index b9022166805e..8e9696b63248 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.11.2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.11.3.ebuild
@@ -12,7 +12,7 @@ XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
GRUB_URL=mirror://gnu-alpha/grub
-UPSTREAM_VER=
+UPSTREAM_VER=0
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz
https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc4.ebuild
index a6ce1762a973..a6ce1762a973 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc2.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.13.0_rc4.ebuild
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 21076fbd729f..68617790521b 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 1842 BLAKE2B 0063e35773060d507ac2bbf2f3988a82bb7eda2e196242432db195074126ee5c6c9f8a351dc97a745aaa78785050d348d2e98510253a89fafe9c76c19794e200 SHA512 5995f495b2a0b59098b345655704e2866a25606c038912140845c16c6828bf6bf1bf099877c97bfa8ef20b3ea4115e2161acf9144a9d7b1adbe37cff944b72d3
+AUX gentoo-patches.conf 1842 BLAKE2B 640d267cd03a9ea3ab3ab704eb1fc3432df4d1c76793bb40dc1dd97fe7ce0d33cc50640bba93a72a2e2d35277d2ccc6b5fffed5b52c20f89e4f870435234c35b SHA512 3e62c01237fb447e9402205fdfdc0a8131c21f7653e0cdfba445060958c6fada477041753ed88be30b75894e3b24a7d6e9f2038268634428c7ef171dbf9af822
AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
@@ -19,14 +19,14 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
DIST ipxe-git-d2063b7693e0e35db97b2264aa987eb6341ae779.tar.gz 3792227 BLAKE2B 720ac29ab3187d7abaec33823dda967caab7eea9631123a7619d2f83d3ad6c7bb47db01665a4c54548fe367866606936d36690a06ecf42323b9bd0ef00e41569 SHA512 2b4ae8e65cd678dbb376f24001294eb54aead8d66456e06fc270dec178d90b282c1eb19731234d8b458054e49c5b8b8c4a89345c63ed0a4dafaf205e642b00b7
DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96ebc158f34303b122b7bf209408c567665d8691364df8d8e886f63e0e72a3f3cd319dfa86ef581023201b5d94e53 SHA512 e52c5363e5bb37b5286e55545aa06bd126218f9d0e3a06ac2e189de68fe3de3256c11ca1bb13357a9c384d7e3af6284083ff3aa587688b5de04ef11b97bdfa27
DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
-DIST xen-4.11.2-upstream-patches-1.tar.xz 77556 BLAKE2B f95af370f8a99a27bfc762e661364da6f1ef1b08dd5a6b81a5421d32bcad820097a694c5656e174cec7ed53ff140f80d63f57ac31867edf12e68ef4d87ea8b44 SHA512 f41f2ff20648eed76918c865958d42b99d2743188514c63e27797c80e9169f7f5843ac48195e38d269d02edcb9889f042b992b85773ca61c267282e41ea8dae6
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
+DIST xen-4.11.3-upstream-patches-0.tar.xz 3692 BLAKE2B f1fb200020b6e8767cb4b900e3468edbebbd61c8147a13d2102e425f8c5f0016b95a1f51fb26bd3560c97b73bbd2935d117ce08f92744fd02a97658cd0168ff8 SHA512 ebb64219b62e418276056eae6c47561366c0a22afaa8750a56a252e84b84c4644189a22788cf176d7d2ca5ceb84d307afa884f373f54db693f0182d951353ab2
+DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
DIST xen-4.12.1-upstream-patches-1.tar.xz 62920 BLAKE2B a7f070e4b48c04fa26b75ccbd46aa1172df306060ae180f29f5ea61a5f0b4c2e854a5d1127ed42c05b21977a0e43b36b7e137c1758496b242f48626c5a00e22b SHA512 d7094b86f297a4b1da7007d73752ca8478a26c675ec5d93ade4599935cd51ebd80220a4ea7223d878e0d2c2209336577d196017c463abe9e47ff20914ffa5021
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
+DIST xen-4.13.0-rc4.tar.gz 39003881 BLAKE2B 21352f0984f1c46f8f3a4e8420ec9eabeff65d47c61bbb16dadca6087a53a975285fd58f3c9d810a874b95059eb2538d989921e2acd0b23f46baa3668c4737e9 SHA512 cbea9cc6cbc2b80ba9bec840b9c08d90884e908ec9675000df75a483ee1f2c70ce09c97d69d923a6530726b92fe6bee7b22aeee71ce5e9530c2eba984c7f57f4
DIST xen-gentoo-patches-18.tar.xz 16840 BLAKE2B 7243b363c78250ae1928d75813cfd6035a87ca03f1605cbe02233e009a19105a0712711d622eef8606f3e7e1a5db5203342e56a1b00496d5ce37ddc4ffb9e4ea SHA512 328d7b1a57ab6bf9c7200b934aeb241f6d4fecccc600130d1c80460540212eb658cb74ae0502c008e040fdb2d95db20c2a3d71a8e73fd1361070d70adeab6e30
DIST xen-gentoo-patches-19.tar.xz 17460 BLAKE2B 6f25c4c9bb438ba0ceded75d04ba6c05ca74e6319d14cf744ea23ecbed2e8283c3c00275a4609b583402d352216520a10197fd4ab9e056eac1c841b0f79bc6b8 SHA512 586e88eea0f2dcc5bae0eb4691cc1d722a8b1a7ca849fd8992d72c0990b2832b3e78738c936e8e46bc9623aa1c8e8afa341a22608479629ea012474d5ff6b69a
-EBUILD xen-tools-4.11.2-r1.ebuild 13855 BLAKE2B 60dd1de7438f5d1a0dc265baa413aa0ec2eca47c9d6ca31661d878b89fe5bdc07e3c27b0ee205fbba01f85522be0f99d792c091e6ebaf3be115aa7277036552b SHA512 7c98ff40a82cb23a9009e82c22dd267b2ee9697274d15f2af1b60fdc2e9e3606b2dd0a0dc7a7f8f6cb05578b1ff50182c438f83b1e2208ded5addd0089a2a0ab
+EBUILD xen-tools-4.11.3.ebuild 13855 BLAKE2B 238160d48c54f0b87a3daac6da01a07c52cedd5baa1ab4f786015eecd15eb584bedfe48f7063f3d59af48919c719f3d7d1f59d790c7a0faa24f8e81449bd0344 SHA512 1a39d72ab79563e7097aa349d09376e15b64fc4f40a96639735cc734db2f48797d472c7b9ebb88709871c7d4145a5a9926cbc7d4f0875eaa59cce621b977977b
EBUILD xen-tools-4.12.1-r1.ebuild 14581 BLAKE2B 2f1635d7037e9b099340c707231bfaca085dcd06b2d6da54683ecb4e8b5fd6580013cc748d650a1617f0af45e84bce7052992d46b6ecfc814acd6916dfd9ab89 SHA512 61a2a47a702d48508036c9e67815d366b4bd4eba897779d2e99fc6c3d474043566dc0156345dcc5cb85ba1330146b80e256553755c13529ff540b787423deabd
-EBUILD xen-tools-4.13.0_rc2.ebuild 14396 BLAKE2B 3a42d032b046b5d3f061263ea7b06f39603985a15f72bbfa767802328b7a53dbce964c16e3cea4d004a4e6b39e84efd9118cd647d5ad92b53c5023413b28bb3c SHA512 23ca66cf8b18d5fc932eaf1fdc82d84375b6531c37e0b2f3b10ecfbd5bc26f4447a81827f3b0200f990243b1a2672a3211546ad1b29e243bdac15618f449ef0a
+EBUILD xen-tools-4.13.0_rc4.ebuild 14396 BLAKE2B 3a42d032b046b5d3f061263ea7b06f39603985a15f72bbfa767802328b7a53dbce964c16e3cea4d004a4e6b39e84efd9118cd647d5ad92b53c5023413b28bb3c SHA512 23ca66cf8b18d5fc932eaf1fdc82d84375b6531c37e0b2f3b10ecfbd5bc26f4447a81827f3b0200f990243b1a2672a3211546ad1b29e243bdac15618f449ef0a
MISC metadata.xml 1707 BLAKE2B becd24142b3d885f0a26c1444e5191c3906c260ba57755257d04eee76be5a21aede5741ca0bea12a77e9c0c872cd5f8436fc5c11fec3f3f5f543f4fda75fb5be SHA512 137f36f883e4476f1820e630fa1f5feb52244cad235885bff09c838755feba1df8428f631e255de25b29ce7dac8aa62e0df37517875cce3a26e5114dee7a70f7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 8df9a094dfc9..bf0071948535 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -43,8 +43,8 @@ _gx055=" xen-tools-4.11.2-gcc9.patch"
# Fix pdf document generation, bug #650396
_gx049=" xen-tools-4.10.1-pdfdoc.patch"
-# xen-tools-4.11.2 patches set
-_gpv_xen_tools_4112_0="
+# xen-tools-4.11.3 patches set
+_gpv_xen_tools_4113_0="
${_gx038} ${_gx017} ${_gx043}
${_gx027}
${_gx028} ${_gx029}
@@ -64,7 +64,7 @@ ${_gx054}
"
# xen-tools-4.13.0 patches set
-_gpv_xen_tools_4130_rc2_0="
+_gpv_xen_tools_4130_rc4_0="
${_gx038}
${_gx027}
${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
index ac40bea35e0c..a089de2905e2 100644
--- a/app-emulation/xen-tools/xen-tools-4.11.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.3.ebuild
@@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
S="${WORKDIR}/${REPO}"
else
KEYWORDS="amd64 ~arm ~arm64 x86"
- UPSTREAM_VER=1
+ UPSTREAM_VER=0
SECURITY_VER=
# xen-tools's gentoo patches tarball
GENTOO_VER=19
diff --git a/app-emulation/xen-tools/xen-tools-4.13.0_rc2.ebuild b/app-emulation/xen-tools/xen-tools-4.13.0_rc4.ebuild
index d0908764bb57..d0908764bb57 100644
--- a/app-emulation/xen-tools/xen-tools-4.13.0_rc2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.13.0_rc4.ebuild
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index cecf4a9b50db..433591f44857 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,10 +1,11 @@
+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.11.2-upstream-patches-2.tar.xz 86812 BLAKE2B c2dcb7e031f9dd0a18fed5705f1c81901e94264d8bc0993a8e6c10108ac01efc6a52487076ece078a96395608c6233f26696c6b9d4f89d0f034f5e14dd546793 SHA512 c11b848396258a403c8148c054f9ac5650e149a50aba3ee1554bbacda6e2fcc4c84b8e02a1bb1bcfaf406c637165ac3fe6ea6826365875444098fce30112136e
-DIST xen-4.11.2.tar.gz 25164925 BLAKE2B 11adea16d93235af5807e6e3784e0fc36ce34f274a85d1976a5c8ad36a323437216b0cf6bb6cb13b00e1e838e319a9f8f4b9c417870eef9ed660f22274d81310 SHA512 48d3d926d35eb56c79c06d0abc6e6be2564fadb43367cc7f46881c669a75016707672179c2cca1c4cfb14af2cefd46e2e7f99470cddf7df2886d8435a2de814e
-DIST xen-4.12.1-upstream-patches-2.tar.xz 72316 BLAKE2B 6297a52ba39363b71115d1582af7ee05e5fb7aea7b0fb8717d717d212949ce2f249764f5dc3f992ce16b1f82118a8de2018e8dd3e8306bb18e82db6d141b9f9a SHA512 ff4c804c094bd86896e14f8288499a1cf86d7ddb10c566c3998b432787937d782f9ba94b9f0d7affc6ada891c1abeb0012f541d07ab93428b2bbff71c06eae20
+DIST xen-4.11.3-upstream-patches-1.tar.xz 30200 BLAKE2B c63fd2d15efda1ae9aab534c13cd1826a87a5fbd2757f3d82461b1ef2dada0ee23dbb814328e3f8695e0819094d80584fc388536c927c386f02201d4d26a8287 SHA512 e48c60f724fa0f2d5e2bbea3d71590d7c3be2973c35c4b73ff0737f03207dcbfd7f9e43b43783bb739f7059778862693a50354178ae2fd53b04e5d39429e59cf
+DIST xen-4.11.3.tar.gz 25180826 BLAKE2B 56041bcef9adec754ee21032cf849745c6011224463f73b763ea186b37460f8456cb1f10614cb51ee4d2d77f03cba311f025e8999687888d15ac59cc122cd172 SHA512 2204e490e9fc357a05983a9bf4e7345e1d364fe00400ce473988dcb9ca7d4e2b921fe10f095cbbc64248130a92d22c6f0d154dcae250a57a7f915df32e3dc436
+DIST xen-4.12.1-upstream-patches-4.tar.xz 128244 BLAKE2B 881a4efe2552cdcff705325eeb1eee19338dc69e110efa8bf3e7fb57d5a6ca306c4848d61149a74c6827e938934963bc54f7ff8b939fc43198e8a892ac8f0708 SHA512 cec14e2000d6686c46c286e70bb4af29a13e06fc7aaca9bd1008564d346c99ea8909a1175eaf9a771524c6cfe4b313a3e35c9fd8bbf4f1a6778dc0cbe3134bc5
DIST xen-4.12.1.tar.gz 26970584 BLAKE2B ceab2af3d36b72d838d7b4f58f6855c97cf05282a4ea3c82eda29b8945ee20563845b7be02884bf0a061a633fb2b3016a2f7396ce34d9b3d93f90d6ee6d449ed SHA512 be15d3af6b109771aaf59b3621e4e1560b7d9a963d9b7f6a1f6f4a1c907fd97434b060c15f75849b44fbda33f26eb51b030d14d068c6ad5103ad240fe7a98f40
-DIST xen-4.13.0-rc2.tar.gz 38995585 BLAKE2B 195dda8383965f79345338b1117aab64052a0473b24363f743b23bae9a0695462b99fac172a19d7a4e5dd8f4a93cee389b84f774261c0385e7f28a2a20895e55 SHA512 510293aad135d492ecdcd51521bd09915068c636b12d32615353996c9e10ae4323ede0a88002328e4e1a26ea3725e3b59a56833b728642b2198e126caa5eda7e
-EBUILD xen-4.11.2-r2.ebuild 4043 BLAKE2B f6078b8db946729457635852ba3abb93756afeb69f1021f2a68de434f0f8884c05103457957ba39a79937a1b46dac863dea8b2664445792c79d5a355fc448247 SHA512 8e1c63ed394eb742c77f2eaf3420c257ef44040721292cf5d075646dad778c0d7736040ce219ea0fc07371598dad77127e6eab54184a2a9a91ec116ee7633933
-EBUILD xen-4.12.1-r2.ebuild 4044 BLAKE2B d9ae35c3f6c563b96503f56029c5942a8b61aeec8d3f2099fa4715e88edf923737ff17d60e3e1f414864f2431367158dacda17594c091439c7c192f2959fedff SHA512 3edfc7fb349c512ce337377e2aa1c10b928d984f50c22661f25f199a077a988df395a8eb286d920864542ee00576944a0eb46ed29bc23cd0191b02494282df7d
-EBUILD xen-4.13.0_rc2.ebuild 4057 BLAKE2B 047c8bc7dabf02fb6b7b8487254b858547d53a8522de2f11b3d7b7fe3d9375eeef100321d6a610febb3bd9323e5b3ce862b99011a1fd0301e5646c0e737a5a36 SHA512 76e26c992c5b406dc03741d32ff99adcbfbf177e9cf6d148fd6819a65ed9b6da8b0206f4a17b3e576e28d0416d16c8cee99981216c10154a30f1e1aade8e6ff7
+DIST xen-4.13.0-rc4.tar.gz 39003881 BLAKE2B 21352f0984f1c46f8f3a4e8420ec9eabeff65d47c61bbb16dadca6087a53a975285fd58f3c9d810a874b95059eb2538d989921e2acd0b23f46baa3668c4737e9 SHA512 cbea9cc6cbc2b80ba9bec840b9c08d90884e908ec9675000df75a483ee1f2c70ce09c97d69d923a6530726b92fe6bee7b22aeee71ce5e9530c2eba984c7f57f4
+EBUILD xen-4.11.3-r1.ebuild 4078 BLAKE2B c2d4cecd045f3d5581fad3270903fde3113c19a035e27b0840db436d903ef6b78b125d0ba61cc6b8250d325720862089133bc2b53f345c271047a3681830fb59 SHA512 130e127d07fa13f83e3cfce7b7e6a685ed2daaeea76752259658f45b70cb27a5f13903fae783876bf55aae025aa03eb66ad792373c138b8facc60295a9908e35
+EBUILD xen-4.12.1-r4.ebuild 4079 BLAKE2B a9475769b32c2c3934ae65ceb3932837be44847f610f3c0c67f338b8173f43261a291c1716c7910c272696700c367b4022500f5b3dbda6ab025efcdac2badb07 SHA512 b5472680cb6c1fe7471c7132bc28c7ece293271875fdc1874bc92e009509314142d3f708477fe15f13bedfff3be92cda0c56e67baf950c29ab695c8575d33d50
+EBUILD xen-4.13.0_rc4.ebuild 4057 BLAKE2B 047c8bc7dabf02fb6b7b8487254b858547d53a8522de2f11b3d7b7fe3d9375eeef100321d6a610febb3bd9323e5b3ce862b99011a1fd0301e5646c0e737a5a36 SHA512 76e26c992c5b406dc03741d32ff99adcbfbf177e9cf6d148fd6819a65ed9b6da8b0206f4a17b3e576e28d0416d16c8cee99981216c10154a30f1e1aade8e6ff7
MISC metadata.xml 645 BLAKE2B ad902c521cc93a54b16faaea212f23c7bdf83a9efe19606eca7bf00b49104386dbc095ff30c4287bb79d5fcd073b77e7c1bbf929ee7b025039a50f8238572f17 SHA512 313d501abeb906c360d7965e35a18d9851e38af73a72a95351517c60a1a39553555a0a250f0bee5bfc8f6496312d6e9c70874be267c14edab45cb4841e34c248
diff --git a/app-emulation/xen/files/xen-4.11-efi.patch b/app-emulation/xen/files/xen-4.11-efi.patch
new file mode 100644
index 000000000000..c7173d91b244
--- /dev/null
+++ b/app-emulation/xen/files/xen-4.11-efi.patch
@@ -0,0 +1,36 @@
+diff --git a/xen/Makefile b/xen/Makefile
+index af27147777..a5299b3868 100644
+--- a/xen/Makefile
++++ b/xen/Makefile
+@@ -57,9 +57,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)
+ $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map
+diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
+index ec02972f2b..628c245564 100644
+--- a/xen/arch/x86/Makefile
++++ b/xen/arch/x86/Makefile
+@@ -156,7 +156,7 @@ note.o: $(TARGET)-syms
+ --rename-section=.data=.note.gnu.build-id -S $@.bin $@
+ rm -f $@.bin
+
+-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.11.2-r2.ebuild b/app-emulation/xen/xen-4.11.3-r1.ebuild
index aa1b1efd6311..e5c3b8002e9d 100644
--- a/app-emulation/xen/xen-4.11.2-r2.ebuild
+++ b/app-emulation/xen/xen-4.11.3-r1.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="amd64 ~arm -x86"
- UPSTREAM_VER=2
+ UPSTREAM_VER=1
SECURITY_VER=
GENTOO_VER=
@@ -98,7 +98,7 @@ src_prepare() {
# Gentoo's patchset
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -120,6 +120,8 @@ src_configure() {
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
}
src_compile() {
diff --git a/app-emulation/xen/xen-4.12.1-r2.ebuild b/app-emulation/xen/xen-4.12.1-r4.ebuild
index ffe55e4ccfcc..3ee8dd94a9ce 100644
--- a/app-emulation/xen/xen-4.12.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.12.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
- UPSTREAM_VER=2
+ UPSTREAM_VER=4
SECURITY_VER=
GENTOO_VER=
@@ -98,7 +98,7 @@ src_prepare() {
# Gentoo's patchset
[[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
- eapply "${FILESDIR}"/${PN}-4.6-efi.patch
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
@@ -120,6 +120,8 @@ src_configure() {
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
}
src_compile() {
diff --git a/app-emulation/xen/xen-4.13.0_rc2.ebuild b/app-emulation/xen/xen-4.13.0_rc4.ebuild
index c18edd05ce4a..c18edd05ce4a 100644
--- a/app-emulation/xen/xen-4.13.0_rc2.ebuild
+++ b/app-emulation/xen/xen-4.13.0_rc4.ebuild
diff --git a/app-emulation/xtrs/Manifest b/app-emulation/xtrs/Manifest
index ada747a689ca..8b605bec37b0 100644
--- a/app-emulation/xtrs/Manifest
+++ b/app-emulation/xtrs/Manifest
@@ -2,6 +2,5 @@ AUX xtrs-4.9d-lcmod.patch 3717 BLAKE2B 1172d6bd65ab10f983cd7793157a45505e16d6300
DIST ld4-631.zip 106955 BLAKE2B 1c0e04186f14fcc840568521b09c7b55318a87dc49e394d516aa742fe7e5c499ac79771782f9b7ee687cdf55df159cef09897d19976879d4c60fff2a33f7f7c6 SHA512 8c6a24bc0af9326b5b935d7cdb1932b4cb714ab336167fed36f4f6d976cd80fe1d4d6a76e6374366fdc3fce623b2bdd6f9059a964bd6d29f59d6a052a1924c4a
DIST ld4-631l.xd3 692 BLAKE2B 7870135e999cd358d7a3e5c254908757fa059a61654403ba146b8b866bda450b53fd1821dd3e3f8fc5c0acd17d0935d83b5df814c8e12eb5748bfcdf5688c509 SHA512 401d36fdfbceaf90673c5e9f821d26aa0a58b901d7e950d34361e5cde3252a070ff902019fcc1eb820fb1b2d3277e4c1da57ccc442ee407b0be4e5ca26dc2d13
DIST xtrs-4.9d.tar.gz 455355 BLAKE2B b7ffda48f9a9bb534e33711b85c02734b7d3f8cee8d3cf2c2bc0a801954dcc1851b12451da03a14a7196368a9066cbaea953e871e8b68b4951f7439412e9e34e SHA512 5d6a2e1d4c2f2df63eaec8d015ea9e485615d82b7923af5c03c394862a31b1e6be2329aca18c0fa0c7d6b984164bb9b4d18f94a3d8cd140a683c5197ddff2249
-EBUILD xtrs-4.9d-r4.ebuild 2227 BLAKE2B fab124629b0c93011d20b714b17fa3fa32feb0350257f088a710113c3639b22dc4d18799683e69b4e0fc4d9d58427a05953e27c54a49756b31bcba944b83f5fd SHA512 14ba99a2142aded7beb5e3d46f9af5511223158372684c5ee851779d7712442023bb7ca7037c18f9db321371bc6d8fd91c654828f0a378813546b7f1d8e12037
-EBUILD xtrs-4.9d-r5.ebuild 2268 BLAKE2B 02ebaf0413321add42a85d3698171ab464696bc3d3504e33a2ac9db8e6739ecc6988c62705cd28445806f4a2fdebfc6f4c8560dd948b12badeb749ee8f22d8ed SHA512 1714f366904a4a4d6a6fbba8600c9c655d2d7dd4acde97eb124ecae6f104f4f709e8ecac4a8612c25000ac244dee372bada0f93f8c564866fec25fea86a84f8c
+EBUILD xtrs-4.9d-r5.ebuild 2262 BLAKE2B 6985dd489ca79968ce445b8a247db8370cfb7d9ebc12dc543f28467121160af0a8db95f80711379eba1d232a26ae13f1545a14a4927dbb7ea1ea66fc1bd8abd5 SHA512 ce5dc1899a0de416862f0bf2c2adaee90adc54f25d4b124a5d328a6a9e789734a6e035c783eab229bf2f11413be87692234732183794a2f08c2bf9dc9b6fee3d
MISC metadata.xml 1106 BLAKE2B c19193deafa9ffc2b7e00df6386b1633b9180bad0ac7a6884822d38d8539f3734375a3ba5ce74c5cef895bb41d54c0b252971bd8dd03da7faa79c327c1db1b22 SHA512 fc12b813ea60239dbf8a94d98263cd77d4e35051fc7f9772547c0f52e37c02ed466f72eb5f63070d67bc86a6c546cfab4b2b01e4f994a91ae4e88569cb1beacd
diff --git a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
deleted file mode 100644
index fd2008dfbd37..000000000000
--- a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs readme.gentoo-r1
-
-DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
- ls-dos? (
- http://www.tim-mann.org/trs80/ld4-631.zip
- https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
- )"
-
-LICENSE="xtrs ls-dos? ( freedist )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ls-dos"
-RESTRICT="ls-dos? ( bindist )"
-
-RDEPEND="sys-libs/ncurses:0=
- sys-libs/readline:0=
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"
-
-src_prepare() {
- sed -i -e 's/$(CC) -o/$(CC) $(LDFLAGS) -o/' Makefile || die
- eapply_user
- if use ls-dos; then
- cd "${WORKDIR}" || die
- xdelta3 -d -s ld4-631.dsk "${DISTDIR}"/ld4-631l.xd3 out.dsk || die
- mv out.dsk ld4-631.dsk || die
- fi
-}
-
-src_compile() {
- case $(tc-endian) in
- little) ;;
- big) append-flags -Dbig_endian ;;
- *) die ;;
- esac
- emake CC="$(tc-getCC)" DEBUG="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dodir /usr/bin /usr/share/xtrs/disks /usr/share/man/man1
- emake PREFIX="${D}"/usr install
-
- insopts -m0444
- insinto /usr/share/xtrs/disks
- doins cpmutil.dsk utility.dsk
-
- if use ls-dos; then
- doins "${WORKDIR}"/ld4-631.dsk
- dosym disks/ld4-631.dsk /usr/share/xtrs/disk4p-0
- dosym disks/utility.dsk /usr/share/xtrs/disk4p-1
- fi
-
- dodoc ChangeLog README xtrsrom4p.README cpmutil.html dskspec.html
-
- DOC_CONTENTS="For copyright reasons, xtrs does not include actual ROM
- images. Because of this, unless you supply your own ROM, xtrs will
- not function in any mode except 'Model 4p' mode (a minimal free ROM
- is included for this), which can be run like this:
- \n\nxtrs -model 4p -diskdir /usr/share/xtrs
- \n\nIf you already own a copy of the ROM software (e.g., if you have
- a TRS-80 with this ROM), then you can make yourself a copy of this
- for use with xtrs, using utilities available on the web. To load
- your own ROM, specify the '-romfile' option, or the 'Xtrs.romfile'
- X resource. ROM files can be in Intel hex or binary format."
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
index ac298ae303fe..34629601e862 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
LICENSE="xtrs ls-dos? ( freedist )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="ls-dos"
RESTRICT="ls-dos? ( bindist )"