summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-03-27 06:06:27 +0000
commit8d5dbd847cbc704a6a06405856e94b461011afe3 (patch)
tree4d26462d027b14926335894749d2e01d982234d0 /app-emulation
parent5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (diff)
gentoo resync : 27.03.2021
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/Manifest.gzbin20549 -> 20554 bytes
-rw-r--r--app-emulation/bochs/Manifest2
-rw-r--r--app-emulation/bochs/bochs-2.6.9.ebuild83
-rw-r--r--app-emulation/crossover-bin/Manifest4
-rw-r--r--app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild211
-rw-r--r--app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild220
-rw-r--r--app-emulation/docker-compose/Manifest3
-rw-r--r--app-emulation/docker-compose/docker-compose-1.28.6.ebuild73
-rw-r--r--app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch67
-rw-r--r--app-emulation/docker/Manifest8
-rw-r--r--app-emulation/docker/docker-19.03.15.ebuild2
-rw-r--r--app-emulation/docker/docker-20.10.3-r2.ebuild2
-rw-r--r--app-emulation/docker/docker-20.10.4.ebuild2
-rw-r--r--app-emulation/docker/docker-20.10.5.ebuild2
-rw-r--r--app-emulation/free42/Manifest2
-rw-r--r--app-emulation/free42/free42-3.0.1.ebuild50
-rw-r--r--app-emulation/glean/Manifest2
-rw-r--r--app-emulation/glean/glean-1.18.2.ebuild2
-rw-r--r--app-emulation/libvirt-glib/Manifest6
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild46
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild46
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild48
-rw-r--r--app-emulation/nemu/Manifest2
-rw-r--r--app-emulation/nemu/nemu-2.5.0.ebuild77
-rw-r--r--app-emulation/qemu/Manifest8
-rw-r--r--app-emulation/qemu/qemu-5.2.0-r1.ebuild3
-rw-r--r--app-emulation/qemu/qemu-5.2.0-r2.ebuild3
-rw-r--r--app-emulation/qemu/qemu-5.2.0-r3.ebuild3
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild3
-rw-r--r--app-emulation/virtualbox-guest-additions/Manifest2
-rw-r--r--app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd-r125
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild221
-rw-r--r--app-emulation/wine-desktop-common/Manifest2
-rw-r--r--app-emulation/wine-desktop-common/metadata.xml6
-rw-r--r--app-emulation/wine-staging/Manifest4
-rw-r--r--app-emulation/wine-staging/wine-staging-6.4.ebuild2
-rw-r--r--app-emulation/wine-staging/wine-staging-9999.ebuild3
-rw-r--r--app-emulation/wine-vanilla/Manifest4
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild2
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-9999.ebuild3
-rw-r--r--app-emulation/winetricks/Manifest2
-rw-r--r--app-emulation/winetricks/metadata.xml4
-rw-r--r--app-emulation/xen-tools/Manifest4
-rw-r--r--app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild512
-rw-r--r--app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild512
-rw-r--r--app-emulation/xen/Manifest4
-rw-r--r--app-emulation/xen/xen-4.13.2-r7.ebuild165
-rw-r--r--app-emulation/xen/xen-4.14.1-r3.ebuild165
48 files changed, 1973 insertions, 649 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f011662d95a9..71a6c462e6c9 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/bochs/Manifest b/app-emulation/bochs/Manifest
index 79ae840889a2..d06bf725cc12 100644
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@@ -1,6 +1,4 @@
DIST bochs-2.6.10.tar.gz 5282176 BLAKE2B 9f75d5afd6bad9f91eb18dc0bd5c9ed998bf12077d3e8d944769055f0def1eed019756346071d3809d492c54177ec798e739259ee13f67ff4760744377dc877c SHA512 eff422cadc3e0db7a47c4015a59ca0fa8caf88ed3026706c1f766e802449ec8e4798e5f147a583e1cfbbc578f71da8800542c0e1f4d04bc2dea77955855e8689
-DIST bochs-2.6.9.tar.gz 5169187 BLAKE2B 49824a96a48294d8d507bc15128103e9c2839515554657d282c7c9533aa299cb6289581e760ea40a6c659adfb7ebdac0d273d2a9e7b598c95b145d65e8cdc977 SHA512 dfecf3a1bad07f06c2f7bb989d146e4a8eaeca493b598d415f5a4aec2a85eb5524ba417422157608c8b0828832611df487c6923c8f4ad98a147ac089fc514c46
EBUILD bochs-2.6.10.ebuild 1785 BLAKE2B a19e6aa898f4aaea6ed3f4874a31e28f1e01c513409de2fe6d1fd00a2badb64dbb5d980d7127841c93789af72a28a18a011481afc34232d6cd166e5f162e207e SHA512 e6c2fddefdba565ec2686ad6503be3304463007a918f9693b30ed4883932b4662e951a3f11a5d2438abc0b862fea02126eaac1bb314f63f1ebf428ff41d33750
-EBUILD bochs-2.6.9.ebuild 1776 BLAKE2B ed0856066057c1e31272b17bb2133864cac4c6bccf954b471219764a535cb5bde293fa8970e7ed494d0022e153c6755f5453d3441de8d3ff9d10d87945bfb22b SHA512 0a68372737dad8f465996caf4308b200efbb3be5854fc018b269f38d7017ffa40715be83eea143abd902e46f13f07445585db3dafccc904f9878d14b6214fe06
EBUILD bochs-9999.ebuild 1839 BLAKE2B ef1221afa5924d0acbc0473d3d7cb41c8574f8c22783efffad4525da3bf516c537e1142cfad4cc6f01704430dc35fd3bf6916693a02ea588dd808b1da5550db3 SHA512 e2d8d015b657a336b6a77b6b37609ff7d99c119f9c6f3831b366b17e5356cceb7f3af30c5104f0ddc5b0b40ec980023ac1d2e1862ac77ef582b60f119257aaae
MISC metadata.xml 694 BLAKE2B 5800f617f2bbcceb04ec0398182dd7dd025fc98991e25009fa0fab64ee7e4ce516cc4dc69ef84e8bf3804f52732ce35463295ff2621edbe8848620739cdbef5e SHA512 f485e816ba644c74965808ba68a2a4077ee7d8b6dc12777f7018fa27de0a8219d71ef513686fadd927dce8f1e9b0e011106b24b00b1cb88b2cdccef2f525ec19
diff --git a/app-emulation/bochs/bochs-2.6.9.ebuild b/app-emulation/bochs/bochs-2.6.9.ebuild
deleted file mode 100644
index 80e103e7f589..000000000000
--- a/app-emulation/bochs/bochs-2.6.9.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LGPL-ed pc emulator"
-HOMEPAGE="http://bochs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64"
-REQUIRED_USE="
- avx? ( x86-64 )
- gdb? ( !debugger !smp )
- debugger? ( !gdb )
-"
-
-RDEPEND="
- X? ( x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXpm )
- sdl? ( media-libs/libsdl )
- svga? ( media-libs/svgalib )
- readline? ( sys-libs/readline:= )
- ncurses? ( sys-libs/ncurses:= )
-"
-DEPEND="${RDEPEND}
- doc? ( app-text/docbook-sgml-utils )
- X? ( x11-base/xorg-proto )
- sys-apps/sed
- >=app-text/opensp-1.5
-"
-
-src_prepare() {
- default
- sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
- Makefile.in || die
-}
-
-src_configure() {
- econf \
- --enable-all-optimizations \
- --enable-idle-hack \
- --enable-cdrom \
- --enable-clgd54xx \
- --enable-cpu-level=6 \
- --enable-disasm \
- --enable-e1000 \
- --enable-gameport \
- --enable-iodebug \
- --enable-monitor-mwait \
- --enable-ne2000 \
- --enable-plugins \
- --enable-pci \
- --enable-pnic \
- --enable-raw-serial \
- --enable-sb16=linux \
- --enable-usb \
- --enable-usb-ohci \
- --enable-usb-xhci \
- --prefix=/usr \
- --with-nogui \
- --without-wx \
- $(use_enable 3dnow) \
- $(use_enable avx) \
- $(use_enable debugger) \
- $(use_enable doc docbook) \
- $(use_enable gdb gdb-stub) \
- $(use_enable readline) \
- $(use_enable smp) \
- $(use_enable x86-64) \
- $(use_with ncurses term) \
- $(use_with sdl) \
- $(use_with svga) \
- $(use_with vnc rfb) \
- $(use_with X x) \
- $(use_with X x11) \
- ${myconf}
-}
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index fb1a0cddfbd3..0f2bdc3cddb9 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -1,7 +1,3 @@
-DIST install-crossover-19.0.2.bin 227350041 BLAKE2B aeb5424ac02e05662cb4baca2caf0978296bf24184cd40e62fb351dd8420f20707d6c8c0ec683f61b63eee896b58ee923853179c8e933faf3a38384605f4c962 SHA512 6f2cf7c5f64744121b12e2d3f58742df957fbb12c95e15eaf752c0ef56094305265f3ac78b74acecbe1032f6cd42427beb70aae434b29640e7051630d9977903
-DIST install-crossover-20.0.2.bin 221393525 BLAKE2B c74db640952002364729c8884234e5fb369a00315d0cfd99276a4294e19953417e1ecc1c60887b3de45bd617570825279d278e69112eddd06d188c890435bcff SHA512 b8d10ef499833cb6158eec22cc635f3e4ecd0a5ebdd9b86df79e23d7f4e4ae1f6a7a2f36d9116e4ba17fd86adfa20bcd19cce66eaa1427fb8ed9667593e5422b
DIST install-crossover-20.0.4.bin 221436226 BLAKE2B 486494455759d92f8e7e5d35968a603e41a0674cb0752e7d5ba4893d33e77b3e31fea2ebe75d471e2478e7f3cce9be2f712840f1f50bfe790fec5ec936b804a5 SHA512 78252d29f8a72a8742d57a65a60d09a81a70a98517b67468dac96af94ee8af7a313f164af6717f9a9c657095e66466809e08584c7a0fde3bd58c27ff00f41067
-EBUILD crossover-bin-19.0.2.ebuild 7234 BLAKE2B 61666e4d1e3dcc81147c347a02a72498cfe1353f0e76200ae65f9b7e6cad5d105ab2c3b18c444abd8dc02461dc457ad160bd3092c82f8654b149355078e2a6be SHA512 43bba4659f10f3219d522c11cc0ad2aa36d8da02ad8df8cc8abfbf402b1ca6465e3024e8f87fe58d5a016eb73b4e87840078072a1e422ef98ab9e036a45a1896
-EBUILD crossover-bin-20.0.2-r1.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c
EBUILD crossover-bin-20.0.4.ebuild 7571 BLAKE2B 0c215fca2810d2adedac3ae3d2676e676cd793a95bbb39ec968aaeda1ff6234669863663a774859948a69557bb6153a02bf28ac43ba6f18b70f9f705c7188d92 SHA512 7673f71bd38b04a6dd8933c4a7e3777ba399a9a5102e7bc64da2e33ae0c3d9b76a8439b4290a8f2f2324bfb53cb5bc36390cce33b80629f0c23b5d32e335a36c
MISC metadata.xml 495 BLAKE2B 09ff077822c1862d7f7d20bee57ebf1dcc48831a9539b280e8b09344e278bdc35d122debdca7cdab10d10cd546eb005a157e896670eba3206af2281dc7228f90 SHA512 da97a48eb9e984ee10581e455be37ac9adb2ab897d837f9ed91e5b368ce1800ff3468a5290fff53b3d93e7c56d6c5cb56936d0d09168c10f19356fa5729dcf0d
diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild
deleted file mode 100644
index db4587a294ef..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-19.0.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
- opt/cxoffice/lib/.*
- opt/cxoffice/lib64/.*
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/bin/wineserver64
- opt/cxoffice/bin/wine64-preloader
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxdiag64
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
- opt/cxoffice/lib/wine/*
- opt/cxoffice/lib/libwine.so*
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- dev-lang/perl
- dev-util/bbe
-"
-
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- !prefix? ( sys-libs/glibc )
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- gstreamer? (
- media-libs/gstreamer:1.0[abi_x86_32(-)]
- jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
- media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
- )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- pcap? ( net-libs/libpcap[abi_x86_32(-)] )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
- dev-libs/gobject-introspection
- dev-util/desktop-file-utils
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/freetype:2[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-),osmesa?]
- media-libs/tiff:0[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXcursor[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
-"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files, license.txt file kept as it's used by
- # multiple files (apart of the menu to show the license)
- rm -r guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}/opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}/opt/cxoffice"
-
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-
- # Workaround missing libs
- # https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
- if use gphoto2; then
- bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
- mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
- bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
- mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
- fperms a+x "/opt/cxoffice/bin/cxdiag"
- fi
- # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
- # https://bugs.gentoo.org/721108
- if use pcap; then
- bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
- bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
- mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
- mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
- fi
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild
deleted file mode 100644
index 931771d2ae57..000000000000
--- a/app-emulation/crossover-bin/crossover-bin-20.0.2-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit python-single-r1 unpacker
-
-DESCRIPTION="Commercial version of app-emulation/wine with paid support"
-HOMEPAGE="https://www.codeweavers.com/products/"
-SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
-
-LICENSE="CROSSOVER-3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="bindist test"
-
-QA_FLAGS_IGNORED="opt/cxoffice/.*"
-QA_PRESTRIPPED="
- opt/cxoffice/lib/.*
- opt/cxoffice/lib64/.*
- opt/cxoffice/bin/cabextract
- opt/cxoffice/bin/cxburner
- opt/cxoffice/bin/cxntlm_auth
- opt/cxoffice/bin/wineserver
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/bin/wineserver64
- opt/cxoffice/bin/wine64-preloader
- opt/cxoffice/bin/unrar
- opt/cxoffice/bin/wine-preloader
- opt/cxoffice/bin/cxdiag
- opt/cxoffice/bin/cxdiag64
- opt/cxoffice/bin/cxgettext
- opt/cxoffice/bin/wineloader
- opt/cxoffice/bin/wineloader64
-"
-QA_TEXTRELS="
- opt/cxoffice/bin/wineserver32
- opt/cxoffice/lib/wine/*
- opt/cxoffice/lib/libwine.so*
-"
-
-S="${WORKDIR}"
-
-DEPEND=""
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- dev-lang/perl
- dev-util/bbe
-"
-
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- !prefix? ( sys-libs/glibc )
- !app-emulation/crossover-office-pro-bin
- !app-emulation/crossover-office-bin
- capi? ( net-libs/libcapi[abi_x86_32(-)] )
- cups? ( net-print/cups[abi_x86_32(-)] )
- gsm? ( media-sound/gsm[abi_x86_32(-)] )
- jpeg? ( virtual/jpeg:0[abi_x86_32(-)] )
- lcms? ( media-libs/lcms:2 )
- ldap? ( net-nds/openldap[abi_x86_32(-)] )
- gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
- gstreamer? (
- media-libs/gstreamer:1.0[abi_x86_32(-)]
- jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
- media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
- )
- mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
- nls? ( sys-devel/gettext[abi_x86_32(-)] )
- openal? ( media-libs/openal[abi_x86_32(-)] )
- opencl? ( virtual/opencl[abi_x86_32(-)] )
- opengl? (
- virtual/glu[abi_x86_32(-)]
- virtual/opengl[abi_x86_32(-)]
- )
- pcap? ( net-libs/libpcap[abi_x86_32(-)] )
- png? ( media-libs/libpng:0[abi_x86_32(-)] )
- scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
- ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] )
- v4l? ( media-libs/libv4l[abi_x86_32(-)] )
- vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-libs/openssl
- dev-util/desktop-file-utils
- media-libs/alsa-lib[abi_x86_32(-)]
- media-libs/freetype:2[abi_x86_32(-)]
- media-libs/mesa[abi_x86_32(-),osmesa?]
- media-libs/tiff:0[abi_x86_32(-)]
- sys-auth/nss-mdns[abi_x86_32(-)]
- sys-apps/util-linux[abi_x86_32(-)]
- sys-libs/libunwind[abi_x86_32(-)]
- sys-libs/ncurses-compat:5[abi_x86_32(-)]
- sys-libs/zlib[abi_x86_32(-)]
- x11-libs/libICE[abi_x86_32(-)]
- x11-libs/libSM[abi_x86_32(-)]
- x11-libs/libX11[abi_x86_32(-)]
- x11-libs/libXau[abi_x86_32(-)]
- x11-libs/libXcursor[abi_x86_32(-)]
- x11-libs/libXdmcp[abi_x86_32(-)]
- x11-libs/libXext[abi_x86_32(-)]
- x11-libs/libXi[abi_x86_32(-)]
- x11-libs/libXrandr[abi_x86_32(-)]
- x11-libs/libXxf86vm[abi_x86_32(-)]
- x11-libs/libxcb[abi_x86_32(-)]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- x11-libs/vte:2.91[introspection]
-"
-
-pkg_nofetch() {
- einfo "Please visit ${HOMEPAGE}"
- einfo "and place ${A} into your DISTDIR directory"
-}
-
-src_unpack() {
- # self unpacking zip archive; unzip warns about the exe stuff
- unpack_zip ${A}
-}
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:xdg_install_icons(:&\"${ED}\".:" \
- -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
- -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
- "${S}/lib/perl/CXMenuXDG.pm"
-
- # Remove unnecessary files, license.txt file kept as it's used by
- # multiple files (apart of the menu to show the license)
- rm -r guis/ || die "Could not remove files"
- use doc || rm -r doc/ || die "Could not remove files"
-}
-
-src_install() {
- # Install crossover symlink, bug #476314
- dosym ../cxoffice/bin/crossover /opt/bin/crossover
-
- # Install documentation
- dodoc README changelog.txt
- rm README changelog.txt || die "Could not remove README and changelog.txt"
-
- # Install files
- dodir /opt/cxoffice
- #cp -r ./* "${ED}/opt/cxoffice" \
- find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
- || die "Could not install into ${ED}/opt/cxoffice"
-
- # Disable auto-update
- sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
- # Install configuration file
- insinto /opt/cxoffice/etc
- doins share/crossover/data/cxoffice.conf
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
-
- # Konqueror in its infinite wisdom decides to try opening things for
- # writing, which are sandbox violations. This breaks the install process if
- # it is installed, so we ninja edit it to false so it so doesn't run.
- sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- # Install menus
- # XXX: locate_gui.sh automatically detects *-application-merged directories
- # This means what we install will vary depending on the contents of
- # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
- XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
- "${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
- || die "Could not install menus"
-
- # Revert ninja edit
- sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
- || die "Could not apply workaround for konqueror"
-
- rm "${ED}/usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
- || die "Could not remove uninstall menus"
- sed -i \
- -e "s:\"${ED}\".::" \
- -e "s:${ED}::" \
- "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
- || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
- sed -i -e "s:${ED}:/:" \
- "${ED}/usr/share/applications/"*"CrossOver.desktop" \
- || die "Could not fix paths of *.desktop files"
-
- # Workaround missing libs
- # https://www.codeweavers.com/support/forums/general/?t=26;mhl=198658;msg=198658
- if use gphoto2; then
- bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" >tmp || die
- mv tmp "${ED}/opt/cxoffice/lib/wine/gphoto2.ds.so" || die
- bbe -e 's/libgphoto2_port.so.10/libgphoto2_port.so.12/' "${ED}/opt/cxoffice/bin/cxdiag" >tmp || die
- mv tmp "${ED}/opt/cxoffice/bin/cxdiag" || die
- fperms a+x "/opt/cxoffice/bin/cxdiag"
- fi
- # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
- # https://bugs.gentoo.org/721108
- if use pcap; then
- bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die
- bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die
- mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die
- mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die
- fi
-}
-
-pkg_postinst() {
- einfo "${P} is open source software with the exception of the GUI."
- einfo "Source code can be obtained from:"
- einfo
- einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
-}
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 7b88e508120a..a74a621a75e2 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,10 +1,13 @@
AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23
AUX docker-compose-1.28.4-setup-py.patch 1844 BLAKE2B 5e9d683c5e90d30662555c050a07a3d13dd646028b62b9abfa19c84b9e3d0395fe2cedccbc8c352d6c2b89aca0244c750942ba7fb5e25fd2721c18bb47b6d008 SHA512 c60a3d56def25bdf9e884f0af8dcbba8e30d6aa05a8fc3efbef170807f007e67c2177340d6992688d531a937fbd2671656ddf74273dd4c8b4b5511dd73795cd1
AUX docker-compose-1.28.5-setup-py.patch 1844 BLAKE2B 5fee25a003a6c0b2afcb17a38959a8f0c2284ec3f6a8ff2e09afee946dd68a4ef36d66b629922867baf7e16db26ec9b89aa943b7f1f4ee134d0881fa76024290 SHA512 fdc35b95a3a43c250aec3f71b5322badaac45a03ab17dce789ae114b0a9a5f2a493d07d3b177e295cd0ad94f0bda191eaae139517a50e229de1de599216e888e
+AUX docker-compose-1.28.6-setup-py.patch 1899 BLAKE2B 391331a3b425cde6657151f35883fcba40641a04063624ab49b6dfe3a4a376211d01547731d810d404c69befca083eb1116265ffdaf0fc4577255233f8391539 SHA512 94000982e32db3a874868565d326b5738ddb642e09759545f7652e2abc55fcd654ad7438ebaad3e19417c9b25fbc3cd93bf005c22ac9dab22f1bc25e01f0be3a
DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367
DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9
+DIST docker-compose-1.28.6.tar.gz 319216 BLAKE2B 6f35f13fd35e08223fd17406b219fcd8c97fe9a2e96a3210607d23d54923496a9a51271f359b1537b73bc5e407d175822075835f44406fcfe028cc23d8eaf9f9 SHA512 0aef0066e58ee3e9ac6ddfef71cd29ae46ba52ed641b6da7ffc74b9e9a60b3974593173e84ac863475bb5d2a3896a0d453fda4decb69101c91abc04f33e50d45
EBUILD docker-compose-1.27.4.ebuild 2108 BLAKE2B 9d7a0dfad313a4311a188076d2cb06975f15a36d98d030c9f5bda18f0d5d7d35d70d65e0ddfa817eef560e575004e7c05f9b06e3a2a0582096f3d8476d480916 SHA512 e378202a4f2ae68eda0750a391d74c7fc9a2bc7614d4db4fffd32b6ca683989ef71e73c72a1d00e5e687296500c06a072c82c3b959b1c794f8942fdd94c33096
EBUILD docker-compose-1.28.4.ebuild 2106 BLAKE2B aca5e45b0979591607a9468e4dfd1d74cdc46a6ca37f1bee0efd7ff74a043fe5d70f7a1d6b0e88f494f3be8791054a8c58afcf99a4ff45665599f2a59a92cef1 SHA512 29ac7efdddf077305e3aafed0786cfaa0af39c839e7fe129d20f540b17ad7b1d1ef276d574201be3e619aa2506b31d3909fbc709d097b59bfd59e4abe700c615
EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be6f720ed4399735428abc46aba3e02b9ea11f3a34796f6fd89bce60e4ad614ec232293aa57c884412c5fa314bd3e9d1b65 SHA512 9310c2ac24b9d0d31505f78b1bfeaa0c87017c91bac5008de531f283fc4fd0a98343c8c80037616f427e9ed5d59e18dc6dfa96de297d19a580597727cfeff1a9
+EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd
MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
diff --git a/app-emulation/docker-compose/docker-compose-1.28.6.ebuild b/app-emulation/docker-compose/docker-compose-1.28.6.ebuild
new file mode 100644
index 000000000000..d9f80948b759
--- /dev/null
+++ b/app-emulation/docker-compose/docker-compose-1.28.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${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}]"
+
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.28.6-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+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.28.6-setup-py.patch b/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch
new file mode 100644
index 000000000000..63ecd7f9642a
--- /dev/null
+++ b/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch
@@ -0,0 +1,67 @@
+From 0efc455303f08b6a41df021972dfa337c527b9cb Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 23 Mar 2021 17:25:23 +0100
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 7669979..59df626 100644
+--- a/setup.py
++++ b/setup.py
+@@ -25,33 +25,33 @@ def find_version(*file_paths):
+
+
+ install_requires = [
+- 'docopt >= 0.6.1, < 1',
+- 'PyYAML >= 3.10, < 6',
+- 'requests >= 2.20.0, < 3',
+- 'texttable >= 0.9.0, < 2',
+- 'websocket-client >= 0.32.0, < 1',
+- 'distro >= 1.5.0, < 2',
+- 'docker[ssh] >= 4.4.4, < 5',
+- 'dockerpty >= 0.4.1, < 1',
+- 'jsonschema >= 2.5.1, < 4',
+- 'python-dotenv >= 0.13.0, < 1',
++ 'docopt >= 0.6.1',
++ 'PyYAML >= 3.10',
++ 'requests >= 2.20.0',
++ 'texttable >= 0.9.0',
++ 'websocket-client >= 0.32.0',
++ 'distro >= 1.5.0',
++ 'docker[ssh] >= 4.4.4',
++ 'dockerpty >= 0.4.1',
++ 'jsonschema >= 2.5.1',
++ 'python-dotenv >= 0.13.0',
+ ]
+
+
+ tests_require = [
+- 'ddt >= 1.2.2, < 2',
+- 'pytest < 6',
++ 'ddt >= 1.2.2',
++ '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.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+- ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
+- ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+- 'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
++ ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
++ ':python_version < "3.8"': ['cached-property >= 1.2.0'],
++ ':sys_platform == "win32"': ['colorama >= 0.4'],
++ 'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+ 'tests': tests_require,
+ }
+
+--
+2.30.2
+
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 22640fa10e9a..b382a9f6930a 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -2,8 +2,8 @@ DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8
DIST docker-20.10.3.tar.gz 11063792 BLAKE2B 9309573dd83d0746bb492cf68e06d69e60550718f8f934a065b33d1538847a4effcf6310638daa9b535515bc43cc1b47636482c90d4499f2b46b74aa37882dd7 SHA512 8389980e0b47e34872301bbe703d7abfc7819946736bab0ef4fee983daa4f798c7c6373d823dc62a3995076e71ca6bc86dc793f736b68e8ec1040332193cfdb8
DIST docker-20.10.4.tar.gz 11068487 BLAKE2B 2bff1f36f646de8664731650590d06b4d3b0cc2538aee216f049df6ba394d837154fed4f4b29047f11514eb1bff19c0862a170461be681afd8ab00c4ffbe358b SHA512 6cbead817d37dc3a4d2686556562d3b52f802ac2cd611a1ff6e373db0464080d8babefd3af31175487b700905fbc876ec8ce235989780b037a4408febdf70985
DIST docker-20.10.5.tar.gz 11068359 BLAKE2B 16021065f20b6298e47f7b235f522a81ee1cbf046420edf43b241750f39ae19ddee8250090710c124ce09d9c0b20de58378b7df056b37d040a44884e32c5d12d SHA512 620a5345d99be16b4c6ba7321e91e4896128f7d638dfe2220554a6cadeb78b21dd3003cff6db60ed5ffd671ea243b310b21cc1123543b0e0cbfa93eec2900973
-EBUILD docker-19.03.15.ebuild 9217 BLAKE2B 8f0eeca1ce67fd8507ff2b8e5e21aaa3191325c3a27acc50d9749bcc235cc0e40d5fa3b47c4076e0a2b00699e1583a5dbe913a3661eb552816076f27f4b9c39c SHA512 a6a6e934368ab9a16635e5e4ef610ef8df087126e33ca59c90f253c5e8357ef761e60d58e275eca012176c65576d90f4213913137f84bb3d063278efe6173c6c
-EBUILD docker-20.10.3-r2.ebuild 8086 BLAKE2B 7fa72ac26cdcebcd77fad1cddb2b513abf1b5feb5ef188fa5dbf0d26dfb113eb03321affafa4d763a5f29d474e0900117f8e39981512b62be602b0c05c070805 SHA512 b9991fb207a6b02a311ea320695a5b2567abb5616a938dbdaa3abf3f16aee01c0ae4083d692a8a3f20589fcfabdf203c66255da4283e48d3af9ad940656acd2b
-EBUILD docker-20.10.4.ebuild 7670 BLAKE2B 6ffe919c9d05084024456aad42dded4c3495e981b1c6116a73178d22130fb25803b9db8935a0231097cbfbbe45382660ed63706ca8fec4bc2423b34801e2a04b SHA512 e7bcb7bd361041a03f6bcc55fc3866125e621fa8666cc531f67e0747cb634d23a5f656d15bc81209b4eb75a54befb448053b7eaef0e4a6f84778977f560561c4
-EBUILD docker-20.10.5.ebuild 7670 BLAKE2B be79d600994632f60617c0cb3e1224e3af52a6622902676ccfcf3a6e935b3f55b6203faacc5aa569e3f4188895bc14fb25e81bcf6d0036b965e8d5149af9a015 SHA512 e2c4ceb516a971c886fa030f4d535f4e51ba22a75935516de469f3e12f7f94efd6651496c2d80a62ee6e808525030955e5a5a489bce23040d0f70e567a7f0bd7
+EBUILD docker-19.03.15.ebuild 9201 BLAKE2B 4a63e5bb20c76949bbd7b525b307282a4e2ceac515662202a78c6e9d88a24a72e88813fc272d9087a14423a4e7b92e87dfc87cded413f5d55be481082c19c6c8 SHA512 de0134000bd218b07d87b2d721952ec0fbaa2a98882205d4cf435c07e5cc7d284d3f4823b88adb9ab2b09c0c1ae1ae2e2489e66dcfee32fd9caaa5c9a2146bf5
+EBUILD docker-20.10.3-r2.ebuild 8070 BLAKE2B 24732b5b2f657567041663590e17ef39daf4d7cfb3f6de3dab417f155091ecbe2d4d4dab2dde7886f6d90a6a87dfd948d43ac8af25d669045f51723041714fae SHA512 1663d06712c79a83f5f7922f0b9a2cb89e7ccbab95550415085aef9f985bc898ac37321cce797b0e181c84488517504e8fdce88479a01472b9e3345d39f0c6d6
+EBUILD docker-20.10.4.ebuild 7654 BLAKE2B 885f42ec98a5df8e80425861c47997e6aab6c750b578d81e135cc36f1526052edcbb3aa6599ed855366b832d2823bc8115c7e65cf0ff8a003a894a7b18f10595 SHA512 f949ebb6c49bbba87d9dc16be7e26ff776b6865bfaf837d9aef4412289ddf361ec6b848e0c418e9af1c79a60e1befcedfb645e01ff5b166c16a6fa6ce3ad9edf
+EBUILD docker-20.10.5.ebuild 7654 BLAKE2B f093b14285116a69ba908f0af642c9ab9c330e0f3f4a8c8cd3a98de9f7127786bda89afd7b60350e2cf44ac7390ffd26b14c4000620709ab262a0b75e05ca2fd SHA512 d50bf0fa637ebf9c116f90f617866ff4eadff8ca9cb4d427ff96bed00ea029390b217352081c020035115296f50b43ba0baa76b1823d1f0d40d23f1ef2895d68
MISC metadata.xml 1730 BLAKE2B 119ca97015c54afc8ea75d64e41d550afbcad5a3a6951f059d005e9a5086b467b26b348f6d29a7af4ff86016ecd8978fd20c9cacad41eb85a18756fc395d8a1b SHA512 c204ff1a267cbf386fa35d08b6a3ed91dae745d6bcadcad6e4cb085a510c53c37bda488ec077cfb9cbe57f2387e52a0fd00c153b7ef8d88225dd3c7d4b26f7e3
diff --git a/app-emulation/docker/docker-19.03.15.ebuild b/app-emulation/docker/docker-19.03.15.ebuild
index ac8fee3a6cc3..848e9be75a8f 100644
--- a/app-emulation/docker/docker-19.03.15.ebuild
+++ b/app-emulation/docker/docker-19.03.15.ebuild
@@ -85,7 +85,7 @@ CONFIG_CHECK="
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
~VXLAN
diff --git a/app-emulation/docker/docker-20.10.3-r2.ebuild b/app-emulation/docker/docker-20.10.3-r2.ebuild
index 9af60440140a..7f4e790bf850 100644
--- a/app-emulation/docker/docker-20.10.3-r2.ebuild
+++ b/app-emulation/docker/docker-20.10.3-r2.ebuild
@@ -74,7 +74,7 @@ CONFIG_CHECK="
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
~VXLAN
diff --git a/app-emulation/docker/docker-20.10.4.ebuild b/app-emulation/docker/docker-20.10.4.ebuild
index ee31e1085124..5691d4f83eba 100644
--- a/app-emulation/docker/docker-20.10.4.ebuild
+++ b/app-emulation/docker/docker-20.10.4.ebuild
@@ -75,7 +75,7 @@ CONFIG_CHECK="
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
~VXLAN
diff --git a/app-emulation/docker/docker-20.10.5.ebuild b/app-emulation/docker/docker-20.10.5.ebuild
index b444365e4a9d..46bb5af09cda 100644
--- a/app-emulation/docker/docker-20.10.5.ebuild
+++ b/app-emulation/docker/docker-20.10.5.ebuild
@@ -75,7 +75,7 @@ CONFIG_CHECK="
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
- ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+ ~CFS_BANDWIDTH ~FAIR_GROUP_SCHED
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
~VXLAN
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index f3d051f757a0..98f185bb89d8 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -2,6 +2,8 @@ AUX free42-2.5.16-fix-makefile.patch 1144 BLAKE2B 9bb78c5b5bde9fef99eace62c55e32
AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5d25ab0a30cc1329ba79442d687f9fcd22e2edd080a43d816c8843e58827592c8c1932714fdd0012f8e643bb4c28d5cf23f9ade4 SHA512 73107855344c054318c678cffff9e39c89718d7d7d6445fc158109b8f678ebb95780a80584aa556c6076bf4c98c1d788dca09c9b727992374543c245c7400976
DIST free42-nologo-2.5.24.tgz 7423183 BLAKE2B e10425af8d5c30be6ab5b728130bbe3068c414e24f033b65623951f915bcfeea0672857ff8def3e9f2766aba79411a1022d4b83592281567de38e82613d8a832 SHA512 a0702c3e4b2f3f38f73c54de4e51da8d1dc90585b253d1ae087d59dfabbe83be9c80086df8540cb6420dae8c6e766cd1ccce875d9bcb94ecbc85791e3fa89b8b
DIST free42-nologo-2.5.25.tgz 7423321 BLAKE2B 23d69045df8e7a96669a14e5760da4e1f8578b050ff6ddb19b000c8254b04883449c38e78c5af93a9341485363ae52ce41e6398b9954a6eac61aae6276e20488 SHA512 cedc05ad60cf56b4634e0b1525ef75fac8ad16ce14ae80752fda12a6373cc2cf42d4b696e99c121b1dc42087e477ca2d948f173c9128acc91d5bc266259b2836
+DIST free42-nologo-3.0.1.tgz 7438742 BLAKE2B 1cbfe038d63a5cc77e20e8ae257f7edfb891a109d8e49e79a149942d318788879df0b61f037caf9609a36766648fd34909fa3f41f439fb2ac2d4e14837b1bdd2 SHA512 73fd32289a191a40f3fd5cbef1f85f28ca6da62c38eeb2c1adc5e58b5cd620985f5f78ce110ff90156e5986a5e1e067aa265bbabdffd6f250440a9d766f214c2
EBUILD free42-2.5.24.ebuild 988 BLAKE2B 018e42a0d178fddad32220fb80a8052b883341ed595aeacb8c62189167b92354df147821701c496010a2d41d4492b9c8f9591e3dc3726277fca9032f22877b7b SHA512 558ca798068bb404d040e4f95ef2a404f8184d23f1b91c03801dd29599b2615f8bbaef509edac11d958a641ba103e2871cc7d5e4f1e2b7be47f6cfdc22d3cdac
EBUILD free42-2.5.25.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
+EBUILD free42-3.0.1.ebuild 990 BLAKE2B 313b1f02771b0172bcd9486729715afc0c4e6f9871ad4e1b43bd66aae50d65e8c405e841089729d3b4266814e676533f2b68d77df3aa99bab2407a00ffb77d0f SHA512 c512648cc35589d9602b8135492bfad8c0c9b2af7b83b15cb494a3444029ae68dcdc021d5bd297dd5f4d1768bbe86d3c69d3aba808977aab9e580ec4cd35a304
MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/free42-3.0.1.ebuild b/app-emulation/free42/free42-3.0.1.ebuild
new file mode 100644
index 000000000000..d25a89b2d1c4
--- /dev/null
+++ b/app-emulation/free42/free42-3.0.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+ "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+ default
+}
+
+src_compile() {
+ local myconf
+ use alsa && myconf="AUDIO_ALSA=yes"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+ emake -C gtk clean
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+ default
+ dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest
index 955dfec9574e..6f5fe72b2ebe 100644
--- a/app-emulation/glean/Manifest
+++ b/app-emulation/glean/Manifest
@@ -2,5 +2,5 @@ AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce
DIST glean-1.17.0.tar.gz 62791 BLAKE2B 6429bd721655499732f84dc8db4bd31bdb128289956ab65fab78ea5461cf7945ced893fd832ac6a3cdcedb331f3885004eaa530be1ee4fcc4168870b5c345dd3 SHA512 55c8ceae941296c038acff3f40cf4d6b783d7c6530ebd6fbd6d87938de11a1be1403741a559802c9135d3fc4d904b1936319dcf7a0179f95ac3f909667f5622c
DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7
EBUILD glean-1.17.0.ebuild 591 BLAKE2B f42dff5a8cbac31b082979defc0cea3d18824507e250fb54894d120c7c26855f331cf65115c09b095d0fdf5957b152ebec4bfe7de8c52b1e6b2ae1d201bdeb2b SHA512 749093c476103e3758fe48e6ed1adaec783a2940f0e5af5fea0845a5d72562a4810e7d1b5ecd43c74f3d2083e325c6d35afd3e5e62e8f992b00a4aaa0221b591
-EBUILD glean-1.18.2.ebuild 596 BLAKE2B 3661a2eb7d55d29cedb9ca17e97ed56fb67fc20d96cc3a0454a0fa6424e63b459204fee7fa80d4ed32cfefdd483770aa4962dbf0030233dfeb67871def824bf2 SHA512 8c8e6f43644281548c975f390a00176e769cad3685b6b40e50a308ddf9ddbab11c9dcb2c22755a0ba54ce7ffdb4a4d8340f527bd051133e6a1d4fc95773d9deb
+EBUILD glean-1.18.2.ebuild 594 BLAKE2B 37d1256760eebac23b04623ac55a053f3b736239c04398da7c04e1a6c18a73c0d8ed77166dcd24497d0d803c659637a844810d4d1e522f6887c2a118003ccabb SHA512 31c863490274f539320ca4dc202c435354d28f8bc5c5bfe4926f1a33102b32c444e6843753593a63272ad1a47cf442c3842a4fc8a306f4d83b22815ae211f2a5
MISC metadata.xml 697 BLAKE2B 475d277a4631376b578b5323416f5f026036435857185732be7186e590228dfb65aaf6b9474768c36f978530e176ecc05e79976c63d4a0af3bb1056b836d731e SHA512 9afd02fefae0e5c428ffd5ab64f0706d94c5d4fadfbd7d3bbe42afa5213bcf6deab5ba07abec9779a818439b8bf7a0f307b609c2c59871fd95a8dd39338773cc
diff --git a/app-emulation/glean/glean-1.18.2.ebuild b/app-emulation/glean/glean-1.18.2.ebuild
index 053b990f8ad6..edd0b4838797 100644
--- a/app-emulation/glean/glean-1.18.2.ebuild
+++ b/app-emulation/glean/glean-1.18.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
diff --git a/app-emulation/libvirt-glib/Manifest b/app-emulation/libvirt-glib/Manifest
index eea47e897771..27ad22e55f1c 100644
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@@ -1,7 +1,5 @@
-DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04649db02192ef9c80bf42214a112a050a9f054c81549a114e7a1236c86e0066e8002f0c7f09317abb672fe5f6a76789 SHA512 72f53a90d3e40aa93d4afe5b29f631afe859532fbdb4e27086da3bd4cdaf0fb25fc808a82a1994b7c2648a1e864876ce95de28acb3b4876dac47b0f4d1c97ba5
-DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
DIST libvirt-glib-3.0.0.tar.gz 899180 BLAKE2B ef10b3d9bad48e49dd1898733aacb2f51f1826330eda9c63a7f8df5f11c96812f8cc7fe6a867961efa85a433f45c934d75cf605eb523ec723459da4646335b1a SHA512 b9e7d782c25b5c3a9b2829f1be8162352438ab3505510a1ca7dd64d741eaab158dc9206fdd4b0e3e27b0c049e4bcfc47db0c9a7fa1a84888864e23d3c35c079e
-EBUILD libvirt-glib-1.0.0-r1.ebuild 1032 BLAKE2B 1f60d87c17a1e64ec297634266ed782cc1593a21b586e463c2afb5f4864d3fba4f3df0821faa5ddb863b479cb902b30cad897c2638c932e06fc1eff060add4cc SHA512 2d62a2730433fea1ca9de2dfe475c984202183412c04bf01450cde72b05b2fef1139441d37ea2ec28414949999166a2edea2b61f8da906e8335a2624ddfa365b
-EBUILD libvirt-glib-2.0.0.ebuild 1039 BLAKE2B 39ff2af30015a7cb37423f15a0a9ff82c5a2a3a44182b5c6a197580e1147395a80c80ba8f2e95b433031c73f20045319438de95d3a8cd9a95563a608995c7631 SHA512 25c52551f1707362d21a688b310865229a29720cd895b58e03589e4c04a8c1145693fdf7c37dc5c5605592b99ae1fad55ff487863161af8d5407c79698696092
+DIST libvirt-glib-4.0.0.tar.xz 161836 BLAKE2B e196d1f02f6f202b1883500241bbfda963b34ee12bd945b3fa897f84f55a049f98e0429132ccfad7168e5ba2b41245e9e7e3817a7f057e0dc40b674ca6c9b661 SHA512 e1b99e80aa671fa5a4d7f7f7a4ea70ce7c5fdaf97574407f79aa11a75dd177e1e3f92027728a83ded62e305852bbda76eb90326aaa1f5f19b77272b008351810
EBUILD libvirt-glib-3.0.0.ebuild 975 BLAKE2B 1ea53e40c805b2d2de91f7c1a7a0690bc8bf768919b0c3706a05ae557dd4d4f6040e6df9e0e75fcb16bcf2caa411eb2570028e2937ceb377cd0c74002f7fbbcd SHA512 ef198cbd6313dd117b62f95cd5884b0254f90f638f42818f29217e926d0f0eefd293416afeda704bd38f77f13d400dcd16a4c1e2e318e6e34def2a80aa7c4911
+EBUILD libvirt-glib-4.0.0.ebuild 1051 BLAKE2B 2e604c2224e005a6b7356d061d64062404c94c638fd8e0d4137b7561282ddf2c02d3b70fe84ff493e3d489311806d21f86729791fee977885352d424f5239c38 SHA512 0c991f47f15bb6fe2246f82ccb6914a90932fc9e4b5e0cd7528b842f04c8d153cbdae9132b703e946ae7095d445c04dc03164c2b47a63a05dc4f290c906b872f
MISC metadata.xml 353 BLAKE2B 84d64fcb26b450371bcdd9ce737aeb5b0337a23d8cd5401094793fc73e63610cda3c04853a6ea98a8d352d990a5067515bff049b86c305d48ed2828e98765e4a SHA512 b32b362e0267da5954557ffde2722311523b93bd84b0f8023671cf12ccd178577007b900e745671ec1aec5cb3c7bf8f538803669efb44865380a0d5010ee8d74
diff --git a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
deleted file mode 100644
index c18bd71005a4..000000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection nls +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libxml2:2
- >=app-emulation/libvirt-1.2.6:=
- >=dev-libs/glib-2.38.0:2
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-src_prepare() {
- gnome2_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-test-coverage \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable nls) \
- $(use_enable vala)
-}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
deleted file mode 100644
index 219f71992ece..000000000000
--- a/app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 vala
-
-DESCRIPTION="GLib and GObject mappings for libvirt"
-HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
-SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="+introspection nls +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/libxml2:2
- >=app-emulation/libvirt-1.2.6:=
- >=dev-libs/glib-2.38.0:2
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- vala? ( $(vala_depend) )"
-
-src_prepare() {
- gnome2_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-test-coverage \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable nls) \
- $(use_enable vala)
-}
diff --git a/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
new file mode 100644
index 000000000000..15bc2925d9cf
--- /dev/null
+++ b/app-emulation/libvirt-glib/libvirt-glib-4.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson vala
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="https://libvirt.org/ https://gitlab.com/libvirt/libvirt-glib/"
+SRC_URI="https://libvirt.org/sources/glib/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="gtk-doc +introspection test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+BDEPEND="
+ dev-util/glib-utils
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ vala? ( $(vala_depend) )
+"
+RDEPEND="
+ >=dev-libs/libxml2-2.9.1
+ >=app-emulation/libvirt-1.2.8:=
+ >=dev-libs/glib-2.48.0:2
+ introspection? ( >=dev-libs/gobject-introspection-1.48.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature gtk-doc docs)
+ $(meson_feature introspection)
+ $(meson_feature test tests)
+ $(meson_feature vala vapi)
+ )
+
+ meson_src_configure
+}
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index ceea8f1c46b3..0763fe417d10 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,4 +1,6 @@
DIST nemu-2.2.1.tar.gz 94600 BLAKE2B 16060ee1ed00f97a442d9f6b9a3f940d9777d24dea70336e382071ce7e9f7e077d58827110f4b0d64091c5777d516e95968ed0e1d4886b9fe2a3709fb466229d SHA512 e6f244c01582351f9e0f61a0a6848937a68b8d077500d0f8095784b871e9c9809bf5830c27918e84a77a64fcee3d6f81d8a06a031160f0beddc48614eb86624a
+DIST nemu-2.5.0.tar.gz 108742 BLAKE2B e68cbf50d56983873656d8e3428cb3ffaa09cafc9cbc8e545d72bf9dfb61e64a06bdc41c3f50011c4c488017efe33afe9fa1d634aae6e9151c45a7d3971c60db SHA512 081199413c41e545d23704091760c4a10b8dcdb21d9d0e6add1e549fa33bdd988490034767e08dee681eee6d06899104b8282cafc4578e06a0eabc505325bbdc
EBUILD nemu-2.2.1.ebuild 1860 BLAKE2B ebf283bb548989ac7ce577f795af1989ca0153c36e93a0f26089c51e730f4db118d9e88fd13d46c6df5b21f431fbfa421f89f6a6ad0d0ca259bdd70e1e3a9259 SHA512 408fd8685a06b5d4f0d384d4115bb66825ec540370152f39a14545415dd798605839426ebd3292ff3516ec6e5422bb6e7744c88b8195b59dc1f8e47670c246ba
+EBUILD nemu-2.5.0.ebuild 2124 BLAKE2B 8957ff9b7fa1ff385bd7f5509c3b5e6d3ca054e479ae0e54a8d6b0ca62b6cf143ac8d20d6ccf0392cdb55a489c42007c3293668450338cc4ba69a09cad160655 SHA512 bd8e64614f83c494c1bf32d91fea2a556a00998fa5ca36bc171a9f45c41c55a15d7407173ebbcb92616309f01fedc204d514e701c9982e9c53b7b58cfc0bcb67
EBUILD nemu-9999.ebuild 1807 BLAKE2B 184913b0d41c88acc6861ca2cd1f1dca5d82c6646ae7066465e82782eb610712e75a0ddfb1431fdf414e4aa57f66438a80e61fc5f266d3204be08bd0e3fb7a21 SHA512 c36e0f8285d7131ae2d72b9ec9c061f2f32749565537f7863ffce35eb7f52a7d438b33ce06d451e15e4490f7cc188c382641e4b21fc4a2bbb946f7fafa70aa8d
MISC metadata.xml 638 BLAKE2B a90b3636fe59b93525c49d40bd9875d068f11b10dfb582e64aecefcfd77d3d87dfc0b4d0621038e3075219b0e0bcc0add96aa2b6eb840b6fec1240962824419d SHA512 663fbac22b8df6daecda876b76105da92c985bf3f767f4f3477ce71d74e8ada3ef93e84072fd845b07622ea76860a1f3af0cbf67081e6e9e68d192caf4c81315
diff --git a/app-emulation/nemu/nemu-2.5.0.ebuild b/app-emulation/nemu/nemu-2.5.0.ebuild
new file mode 100644
index 000000000000..7747ae0c73a6
--- /dev/null
+++ b/app-emulation/nemu/nemu-2.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+MY_PV="${PV/_rc/-RC}"
+
+DESCRIPTION="ncurses interface for QEMU"
+HOMEPAGE="https://github.com/nemuTUI/nemu"
+SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus 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:=
+ dbus? ( sys-apps/dbus )
+ network-map? ( media-gfx/graphviz[svg] )
+ ovf? (
+ dev-libs/libxml2:2
+ app-arch/libarchive
+ )
+ spice? ( app-emulation/virt-viewer )
+ vnc-client? ( net-misc/tigervnc )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+S="${WORKDIR}/$PN-${MY_PV}/"
+
+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() {
+ # -DNM_USE_UTF: Enable unicode unconditionally. We already
+ # depended on ncurses[unicode].
+ # -DNM_WITH_QEMU: Do not embbed qemu.
+ local mycmakeargs=(
+ -DNM_SAVEVM_SNAPSHOTS=$(usex savevm)
+ -DNM_USE_UTF=on
+ -DNM_WITH_DBUS=$(usex dbus)
+ -DNM_WITH_NETWORK_MAP=$(usex network-map)
+ -DNM_WITH_OVF_SUPPORT=$(usex ovf)
+ -DNM_WITH_QEMU=off
+ -DNM_WITH_SPICE=$(usex spice)
+ -DNM_WITH_VNC_CLIENT=$(usex vnc-client)
+ )
+ cmake_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 /etc/udev/rules.d"
+ elog "Afterwards reboot or reload udev with"
+ elog "udevadm control --reload-rules && udevadm trigger"
+}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 90a84c8daffe..dcdc0fca468e 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -11,8 +11,8 @@ AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896
AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
-EBUILD qemu-5.2.0-r1.ebuild 25165 BLAKE2B 719c716e10dab3e845e15497eaace296318d29987efd8f6f8eb1f1ece9d82138c442c1bbb600516f8aaab2886c52caad69006d06bdff39cc90fe772810a9a9c7 SHA512 5be5db0d809ded76014ddd863915ccfb5d8dec0154c1bea2720d8e06a007f882cc6fdc451b18ce2db39b58dd8e3f3e501bd074edb4690a47c3c17bb3a070a46e
-EBUILD qemu-5.2.0-r2.ebuild 25346 BLAKE2B f24ae658c04435b88982aa96445ea6037c337125ddc8dcd1067f6bd5c142d5b6cc9c4035d9c62e849abbe9135115d53ad53f1c1ce23bb1b2c82e00ca19ebd253 SHA512 0f4b343844aee4942a491efc18893a5bc63545fad04c8c0583b51256fbd0be4b3a0f16281ab45877fe98f57cc77935fa8e6714bfc67928d5c583125569072ac9
-EBUILD qemu-5.2.0-r3.ebuild 25349 BLAKE2B 6e5d1270efbb846cab4b21aea6bc864ad9aa19059bb4a60e7ab120c9243b9db6ebd7e26364054f875438d511ef3ebb68e5f7c1bc6dcf5f9d302f374344a4af52 SHA512 64004e9efc5afc945f96f21ecb05241da109ee89bd265f54977f2fe3f3a9bba9c429eeaf5696ffc51201f07086cdaaa8ae1bc74886d80bd5a76baf3c55124b65
-EBUILD qemu-9999.ebuild 25305 BLAKE2B 1c4bda060af3bca672dc7df26b9deef8078217878e14cbe943224f1b52289a4091fe055af6eddcf5a810656af5f51efc1cc7a804313b30ffda5546840bc0b3ef SHA512 282ee0b547ce3c6d077ae32d23b02319f88650defbcfa92445c6d102d3c6e7e65880443b6334d7e32db8ec455f8c4100e52b39cdf640ded3baaece5090b632d8
+EBUILD qemu-5.2.0-r1.ebuild 25296 BLAKE2B a6065977dbf62f928c6dd2bf0c83fbd42f86e23ebcae2c5be2252919d8ad5aeada2cfb82363dd057521ec9436b0f6e3c5ae5d34dbf3ea897d26036b4357990a5 SHA512 8adc01f7f10faa67ebd7ace07bc58c1d6ece5923e6d2a4927bf20e0ffcafb6d3a9f9711630a91346fe9ef56a3f978587f34ecd169b008280aef91bdb2888a84d
+EBUILD qemu-5.2.0-r2.ebuild 25477 BLAKE2B a86e886a8395d18d9ea8affbe55807f8418448607a683cc17940a350a0ca120c31b4ec81b18a24bd070487083bfe079707168b7096bbaf29d1bed0572b096957 SHA512 b0459a9c5e1f90793ba531ae9f86321bc779976fe481bf234f551d275b8af188d2cb6041149bcdecf0983c6c3e0621a92fc0aac9f2f2fab03bde56577871a57a
+EBUILD qemu-5.2.0-r3.ebuild 25480 BLAKE2B 6cae7d698846231a0b954620b7c198c2ae8f4274fc0a6f5336b6e8accd1455b69ff689efd5b04d31b6cab3355356ab54aa92f2f13dc40cf2540d293b3088d501 SHA512 1687a32a88ac40b8a47f52fc162201959fca3a5f128abe1c2ef31e036d2884b8b2bfba1fac19c66968deaed7f4df6b347db94244b2d40d730c879fb214d7ad1d
+EBUILD qemu-9999.ebuild 25436 BLAKE2B 00f618df8f5e63d888562d47f1447fed057fea221896a8ca5ab14e06123e4b26a8b4da39a673718aa36a4d722321bbd76fcf5a369701bb6ac31429969536fdd0 SHA512 7e1803b9a1b300f8bc69e0da5c96ed4e6104e9ef021c4813b983245b0478816ac9d194dbd2e3ff7e59aae5b213803c7fa39b435e15e37400be7ba10476668b63
MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d
diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
index 5050c1ffb140..40e426156511 100644
--- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@@ -570,6 +570,9 @@ qemu_src_configure() {
tc-enables-pie && conf_opts+=( --enable-pie )
fi
+ # Meson will not use a cross-file unless cross_prefix is set.
+ tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
# Plumb through equivalent of EXTRA_ECONF to allow experiments
# like bug #747928.
conf_opts+=( ${EXTRA_CONF_QEMU} )
diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild
index ead6c2bb774f..38fe3834e894 100644
--- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild
@@ -573,6 +573,9 @@ qemu_src_configure() {
tc-enables-pie && conf_opts+=( --enable-pie )
fi
+ # Meson will not use a cross-file unless cross_prefix is set.
+ tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
# Plumb through equivalent of EXTRA_ECONF to allow experiments
# like bug #747928.
conf_opts+=( ${EXTRA_CONF_QEMU} )
diff --git a/app-emulation/qemu/qemu-5.2.0-r3.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
index 063ad7becb49..62b50afd5d93 100644
--- a/app-emulation/qemu/qemu-5.2.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild
@@ -573,6 +573,9 @@ qemu_src_configure() {
tc-enables-pie && conf_opts+=( --enable-pie )
fi
+ # Meson will not use a cross-file unless cross_prefix is set.
+ tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
# Plumb through equivalent of EXTRA_ECONF to allow experiments
# like bug #747928.
conf_opts+=( ${EXTRA_CONF_QEMU} )
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 1104aacd55d0..b46e4085ed53 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -572,6 +572,9 @@ qemu_src_configure() {
tc-enables-pie && conf_opts+=( --enable-pie )
fi
+ # Meson will not use a cross-file unless cross_prefix is set.
+ tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" )
+
# Plumb through equivalent of EXTRA_ECONF to allow experiments
# like bug #747928.
conf_opts+=( ${EXTRA_CONF_QEMU} )
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index aa923037ca68..c1186224bb59 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -2,11 +2,13 @@ AUX vboxclient.desktop 145 BLAKE2B c01f4c307cd965d271e19f31cab5f902126bdf49bd947
AUX vboxguest-6.0.6-log-use-c99.patch 282 BLAKE2B df1d521c39ab6b3fa421f866fd83545bfea972dbbb1a952ce6aa388845175a4a3f71bc1cd34151f537994713ad1144fb0497f1383ed116357e7971f02c38ada9 SHA512 31fc13e5bb6286f80fde312aeb7917f662addc5b889ca1aeafa4f3545bece46eccface3b94df01c25a33d60302a14b3ae5b1eef87f25a4eef9a9dd4a75b3d7cb
AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c03b77fb1a4df5279e38929c4e6e446387f30eef9fd8f32b9f877db1074c0e28f9a461ec3114e7120f636e02ce41a72a81b1e69c62e SHA512 ccbc2db825060fd5044e42bf4e53271d6e64a7a400b09705230006367e696dd3bff384f1e4873bf2aedfec8e6fdc8f8ecc537cd5a1fe629727c2943371d13e40
AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
+AUX virtualbox-guest-additions-8.initd-r1 547 BLAKE2B 1b26fc26e95baa74d551f8a9cf62f698485d63a0487c4cc4fc9906b8ced191f078e2b794ef9db9488de9e92188c73812c16e37ff542f06e0d52a4dc62b631960 SHA512 81ccc8d3edd965feb55290cf1281a97a485f14fd1de07cd59479bd7746291d41abc45c2e7e209f17f7df057528be83c48f3e270b526e6b86d85c5ec4be2d3944
AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
DIST VirtualBox-6.1.18.tar.bz2 165507486 BLAKE2B 3cf18f30671426f533838eb0579928b08ce022b832d509e70274978efce2e3e0e14dc8fbf258ef9a1ce8a3d666081863aa6971340e04600434f58136fe5c221a SHA512 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
+EBUILD virtualbox-guest-additions-6.1.18-r1.ebuild 6207 BLAKE2B 4b06a2e8c1e0c9c4959a5cc1c47e6901ae99cf06f07ab67013558f09976130f1f5d13ad6da16f5e72dbb110306d8dedacd735d789c32f831d7b463569b0920ab SHA512 3563a5efa78257a211d4aaa9a4ed1639cedc7af6b9457d5a54a9711010130eedcdf9b914d00b03c9d87a4d22e40f8bd773c1c4bfe5636cee0d0a42545340450e
EBUILD virtualbox-guest-additions-6.1.18.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
MISC metadata.xml 259 BLAKE2B 348a110a37bf774248a59c7e7e450e9b5890f8d650650e459a7a7dd0eea5fb2b172d95a6d73fcdcd6659d85b48c4ff7f66a747e841a637f2df4dbcc920bae7e3 SHA512 b5e2418af2f399cb314f632b7c26cddcac2b7f622a1a09400cb7a895beb6bcbf0e3f9df560e02394c9b4555ddfabf2f6d08941251824f2118e684f0603269509
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd-r1 b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd-r1
new file mode 100644
index 000000000000..17c90bb9d819
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-8.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/var/run/vboxguest-service.pid"
+command="/usr/sbin/vboxguest-service"
+command_args="--foreground"
+command_background="true"
+
+depend() {
+ need dbus localmount
+ before display-manager
+}
+
+start_pre() {
+ einfo "Loading kernel modules"
+ /sbin/modprobe vboxguest 2>&1
+ /sbin/modprobe vboxsf 2>&1
+}
+
+stop_post() {
+ einfo "Removing kernel modules"
+ /sbin/modprobe -r vboxsf 2>&1
+ /sbin/modprobe -r vboxguest 2>&1
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild
new file mode 100644
index 000000000000..d767c7658ddd
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.18-r1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod systemd toolchain-funcs
+
+MY_PN="VirtualBox"
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+[[ "${PV}" == *a ]] && DIR_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
+HOMEPAGE="https://www.virtualbox.org/"
+SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
+RDEPEND="
+ acct-group/vboxguest
+ acct-group/vboxsf
+ acct-user/vboxguest
+ X? ( x11-apps/xrandr
+ x11-apps/xrefresh
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libSM
+ x11-libs/libICE )
+ sys-apps/dbus
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-util/kbuild-0.1.9998.3127
+ >=dev-lang/yasm-0.6.2
+ sys-devel/bin86
+ sys-libs/pam
+ sys-power/iasl
+ x11-base/xorg-proto
+"
+PDEPEND="
+ X? ( x11-drivers/xf86-video-vboxvideo )
+"
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+
+S="${WORKDIR}/${MY_PN}-${DIR_PV:-${PV}}"
+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} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
+}
+
+src_prepare() {
+ # Remove shipped binaries (kBuild,yasm), see bug #232775
+ rm -r kBuild/bin tools || die
+
+ # Provide kernel sources
+ pushd src/VBox/Additions &>/dev/null || die
+ ebegin "Extracting guest kernel module sources"
+ kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
+ eend
+ popd &>/dev/null || die
+
+ # PaX fixes (see bug #298988)
+ pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
+ eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
+ popd &>/dev/null || die
+
+ # Disable things unused or splitted into separate ebuilds
+ cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
+ use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
+
+ # Remove pointless GCC version check
+ sed -e '/^check_gcc$/d' -i configure || die
+
+ eapply "${WORKDIR}/patches"
+
+ eapply_user
+}
+
+src_configure() {
+ # build the user-space tools, warnings are harmless
+ local cmd=(
+ ./configure
+ --nofatal
+ --disable-xpcom
+ --disable-sdl-ttf
+ --disable-pulse
+ --disable-alsa
+ --with-gcc="$(tc-getCC)"
+ --with-g++="$(tc-getCXX)"
+ --target-arch=${ARCH}
+ --with-linux="${KV_OUT_DIR}"
+ --build-headless
+ )
+ echo "${cmd[@]}"
+ "${cmd[@]}" || die "configure failed"
+ source ./env.sh
+ export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
+}
+
+src_compile() {
+ MAKE="kmk" emake \
+ VBOX_BUILD_PUBLISHER=_Gentoo \
+ TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
+ TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
+ 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-r1 ${PN}
+
+ insinto /usr/sbin/
+ newins VBoxService vboxguest-service
+ fperms 0755 /usr/sbin/vboxguest-service
+
+ insinto /usr/bin
+ doins VBoxControl
+ fperms 0755 /usr/bin/VBoxControl
+
+ # VBoxClient user service and xrandr wrapper
+ if use X ; then
+ doins VBoxClient
+ fperms 0755 /usr/bin/VBoxClient
+
+ pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
+ || die
+ newins 98vboxadd-xclient VBoxClient-all
+ fperms 0755 /usr/bin/VBoxClient-all
+ popd &>/dev/null || die
+ fi
+
+ # udev rule for vboxdrv
+ local udev_rules_dir="/lib/udev/rules.d"
+ dodir ${udev_rules_dir}
+ echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+ || die
+ echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+ >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
+ || die
+
+ # VBoxClient autostart file
+ insinto /etc/xdg/autostart
+ doins "${FILESDIR}"/vboxclient.desktop
+
+ # sample xorg.conf
+ dodoc "${FILESDIR}"/xorg.conf.vbox
+ docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ if ! use X ; then
+ elog "use flag X is off, enable it to install the"
+ elog "X Window System video driver."
+ fi
+ elog ""
+ elog "Please add users to the \"vboxguest\" group so they can"
+ elog "benefit from seamless mode, auto-resize and clipboard."
+ elog ""
+ elog "The vboxsf group has been added to make automount services work."
+ elog "These services are part of the shared folders support."
+ elog ""
+ elog "Please add:"
+ elog "/etc/init.d/${PN}"
+ elog "to the default runlevel in order to start"
+ elog "needed services."
+ elog "To use the VirtualBox X driver, use the following"
+ elog "file as your /etc/X11/xorg.conf:"
+ elog " /usr/share/doc/${PF}/xorg.conf.vbox"
+ elog ""
+ elog "Also make sure you use the Mesa library for OpenGL:"
+ elog " eselect opengl set xorg-x11"
+ elog ""
+ elog "An autostart .desktop file has been installed to start"
+ elog "VBoxClient in desktop sessions."
+ elog ""
+ elog "You can mount shared folders with:"
+ elog " mount -t vboxsf <shared_folder_name> <mount_point>"
+ elog ""
+ elog "Warning:"
+ elog "this ebuild is only needed if you are running gentoo"
+ elog "inside a VirtualBox Virtual Machine, you don't need"
+ elog "it to run VirtualBox itself."
+ elog ""
+}
diff --git a/app-emulation/wine-desktop-common/Manifest b/app-emulation/wine-desktop-common/Manifest
index 74cd300e56db..b563132f76ca 100644
--- a/app-emulation/wine-desktop-common/Manifest
+++ b/app-emulation/wine-desktop-common/Manifest
@@ -1,3 +1,3 @@
DIST wine-desktop-common-20150204.tar.gz 99491 BLAKE2B 7427c08d00a7ec11319908c908c5833e1a3fc297ec2ebfd942ccdf2adb9e657d1fd751da74bd67e7efb3d4b8ad769a11b1aa5e1a56e33e181f149f4f6245fac3 SHA512 1f3d7022c5cff87ed3b8fd3b7cd14397c6f23b98fe6a7c583ac0d2f439ff29d943f57375f23687aa6519ff1d84ff07624a9a712d6f19fa207fd26d01edcb6688
EBUILD wine-desktop-common-20150204-r1.ebuild 957 BLAKE2B 7fc9059805ae68d1da70b13144808641035719a0b64184dfedc8352b0cf328d01b54e11b82577a8dd0b7fd636f664f51a2f63b88969a36e413dc7e75b28d259d SHA512 98932bfe14ee4a20b54d80744b959df25a6d635dedba80f1eec4e6014f34edeb197a3f77672e58c2df95469fcc52a748c72585b430dc53820936971828c24722
-MISC metadata.xml 439 BLAKE2B bff337f2c333a31513cc2859e72aeb5f57a06cc6a25905973c713d1b6b312ae7f4c4071afcfcdb4cae7d494d7ebd1fd4b4a9e7fcc808065fc1289ab6e81c7d45 SHA512 6edd6afb236786be8e48e06733d0274ddf3431ff01872e61a3d37ca1004a325b1cf734158b5f59541a1a10b6ca7f8a577dbf8bddc7b779ffc76879805a47205f
+MISC metadata.xml 441 BLAKE2B 81e2329121c1c10594af9fe8f507c75f11ff87c1e8d46acc84bb1112b49c1f7a0322cb8c49d343ba639bd1f4cd739606f7df05c016f44ad2d700f3773ba4626a SHA512 65a86b8ff9c72ae38fb27ed736c2d0e4702968275c6b7c42f9030b95004408d366f02a553b3e0e935baa41a7c7ce352c0611df602ea32dd1e2ee2bda185d8af6
diff --git a/app-emulation/wine-desktop-common/metadata.xml b/app-emulation/wine-desktop-common/metadata.xml
index 2b2167344616..993fd1797745 100644
--- a/app-emulation/wine-desktop-common/metadata.xml
+++ b/app-emulation/wine-desktop-common/metadata.xml
@@ -2,14 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
- <name>NP-Hardass</name>
+ <email>np-hardass@gentoo.org</email>
+ <name>Adam Feldman</name>
</maintainer>
<maintainer type="project">
<email>wine@gentoo.org</email>
<name>Wine</name>
</maintainer>
<upstream>
- <remote-id type="github">NP-Hardass/wine-desktop-common</remote-id>
+ <remote-id type="github">np-hardass/wine-desktop-common</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index af1b289dd657..2427c9c66acd 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -11,6 +11,6 @@ DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4
EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
-EBUILD wine-staging-6.4.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
-EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
+EBUILD wine-staging-6.4.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
+EBUILD wine-staging-9999.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/wine-staging-6.4.ebuild b/app-emulation/wine-staging/wine-staging-6.4.ebuild
index 9bb1565d0057..f88a6cd506be 100644
--- a/app-emulation/wine-staging/wine-staging-6.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@@ -181,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
fi
wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 0d4d6cdf1e7b..f88a6cd506be 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -16,6 +16,7 @@ if [[ ${MY_PV} == "9999" ]] ; then
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
+ #KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
MINOR_V=$(ver_cut 2)
@@ -180,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
fi
wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f86d4e3bd69d..41f734aaa57b 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -9,6 +9,6 @@ EBUILD wine-vanilla-6.0.ebuild 18908 BLAKE2B 3940b795b6b9ccf31f286a8efb99fa2a754
EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
EBUILD wine-vanilla-6.3-r1.ebuild 18975 BLAKE2B 0d00607ee6c7faaf3396aab0fbfade31f681195faf593d453702b11da214ba78b7596472d54cbd625f0e6a3c1425b4069107f1939f7e66db02af472da1a715c9 SHA512 d2e7e68d564f1d27fba83225e039f231718ea3db574b86a37364cb4f0be2faa5d91dc2dbe7fdd893ee44cf05769bc9de45f65d6b4e9244390a48db5b6600290c
-EBUILD wine-vanilla-6.4.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
-EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
+EBUILD wine-vanilla-6.4.ebuild 18879 BLAKE2B 3cc03505916d3202ca418375b739d5164b3858a20d3916f5dd1a055ac182ce918e680fb57d076805e3e6cd9386fba3ff752804b1ee5298682a7a1cfaa58f517c SHA512 20f385a55ec43f9bdaaf77cd45abb9597983279f968299e5f565280a36e45ba69ef86fd2f641ed19c7b380a2c30774024923359da768af5f34f0fb0bf1c6fae9
+EBUILD wine-vanilla-9999.ebuild 18879 BLAKE2B 3cc03505916d3202ca418375b739d5164b3858a20d3916f5dd1a055ac182ce918e680fb57d076805e3e6cd9386fba3ff752804b1ee5298682a7a1cfaa58f517c SHA512 20f385a55ec43f9bdaaf77cd45abb9597983279f968299e5f565280a36e45ba69ef86fd2f641ed19c7b380a2c30774024923359da768af5f34f0fb0bf1c6fae9
MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
index 045e3bfde6b8..21840c208905 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@@ -153,8 +153,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
fi
wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 5aefd6ebbfac..21840c208905 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -16,6 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
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"
@@ -152,8 +153,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
fi
wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
# GCC-specific bugs
if tc-is-gcc; then
# bug #549768
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 7877875d5a42..f880028979ff 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -4,4 +4,4 @@ DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e
EBUILD winetricks-20200412.ebuild 2051 BLAKE2B d37bffe1f2386eb52a2cd1697b7e9c8ea67807ac400fa4474b22e76a83aeeae04176215d9fa64845e1627723d9ba3c18c03c6b0e020e1db3a50fb04ce378e50b SHA512 bde6f11832da7d9efcbdf226ed7f37b9a2b7da1eb79001dc00ea398c5eadc41f0bc5821d19cbdbf9a1c4df80a395dc5cf718b2e51ad051a64141a41758eacc5e
EBUILD winetricks-20210206.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
EBUILD winetricks-99999999.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
-MISC metadata.xml 713 BLAKE2B 7d9673350201c49de4651ecb8975ed21387259f3375c1b531b63b2a0e0e65f0b2540806db5f6d1d47953911ca36b0d06bf8edaa57ad5e546d242eebcd96f869f SHA512 2a4c5a6ecfc558f3c7382538b8701ab95c3d771a02c51f5dae852a0e90b7df51be65200b337bcc3c92ef9bf827c23954097b3b5e8c99004db729ed6d77e64cfc
+MISC metadata.xml 715 BLAKE2B 64777067da16d6553a5a05cf2e6d62859c554230c16d599fbb5665a66e3f7ecfa49c4045d965ae1671b724e1b15ee25c08d51aaa48b28820a3845112d9fc5994 SHA512 552c5af325f62bef5f3c4e1dc7e8b6a829fc3339de8603b1fb7af17f9c7b8c0f28fdea4cf28bcca52bbaacddfa9f876260104bec8ed5478b912ed312f75d7f14
diff --git a/app-emulation/winetricks/metadata.xml b/app-emulation/winetricks/metadata.xml
index 15c062872f15..1f2cd68b5095 100644
--- a/app-emulation/winetricks/metadata.xml
+++ b/app-emulation/winetricks/metadata.xml
@@ -6,8 +6,8 @@
<name>Jimi Huotari</name>
</maintainer>
<maintainer type="person">
- <email>NP-Hardass@gentoo.org</email>
- <name>NP-Hardass</name>
+ <email>np-hardass@gentoo.org</email>
+ <name>Adam Feldman</name>
</maintainer>
<maintainer type="project">
<email>wine@gentoo.org</email>
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 86053003d91d..744001efd025 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -21,11 +21,15 @@ DIST ipxe-git-1dd56dbd11082fb622c2ed21cfaced4f47d798a6.tar.gz 3810726 BLAKE2B b9
DIST seabios-1.12.1.tar.gz 613450 BLAKE2B cb926b650c41a9962db407945cb5b6558079b061bd61f32ea56aedf0d37a00d10ad4434acbe717ffbc0dd1d1c0767304af8e640a53b0fc3784969dfa1590f681 SHA512 58755ce842adcb99c0f2f3ebbf9ec6d4a5072753966ab46805a96db1570847b109a90e6e03d61f9088ef877ca8ba96a8006777dc38ec434fce6b487f6c1f91d0
DIST seabios-1.13.0.tar.gz 620952 BLAKE2B 460a7dd2b2775b981bbd890ed0a50fe905794c68b0b895799667dd1378bb84125712330c2f6945112709d42cfb7b01196c7fff99051e44b6211d47d19531cfae SHA512 7f158badf7deecc2998eab2a08f3615dfe5a7c0a51323f7b4568a4d1280935bc32bb466c8226d87d2ca7e13f9f117ff0092befcc0699bc31c5018e84754e8393
DIST xen-4.13.2-upstream-patches-2.tar.xz 58992 BLAKE2B 535d67ae6a30e23feb975172a9e4abd6d7feb6c8c969aa243fdf672ed6580fe46bf57ea5530eab70457e22af9163f95061fdf97d10faa3be9f4c92033187c950 SHA512 6b6cdf72d13c0e595be65e3107c0f68299e932b74d4a1c4d59bfe3be8b76840c47f6adeaddd0efac71d5158cee8d778a0be863eea8f032cb9acf4191f629d8ae
+DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115
DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
+DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd
DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
DIST xen-gentoo-patches-21.tar.xz 18280 BLAKE2B 95446da72fc16cb82e4e51df8796c64db05a30894a351a98dbd6700ce354c34956ca09a1af98125a4e56c337936e8fae296d806519b8afa23a82b078aa0db8f1 SHA512 3cffac162606a09b10b47dca604f167897e6ac8d153411d3464ef29a7a4d46ac5b92340884cb21279cb2d053b131f1ea5cb2111e3e9a21b3298b5ab3320ee34d
DIST xen-gentoo-patches-22.tar.xz 18764 BLAKE2B e0da49b39fbc6b689db47e40a4fbb4f6568644fe192b114cce01b0406cba4bf23339ad1bf39b972f895df004916827b6e774f97fc079aeb8ac436763efda5fc3 SHA512 5b7959af4ed30edd2526698ab60a86353e35d9dc48dc941b6df7659a7c4904260461e0decbd8d788542bd69384736f2175861d4943c3738618d20788b19ea9b1
DIST xen-security-patches-29.tar.xz 1536 BLAKE2B 7723e9d971a2385f7a4a85dd63412afc41ba20991d15732423f03d0c5455c504ecccec08102edbec0db47ed019c88cc86f4146e080075d829aff03ccded362bc SHA512 eff572fed812c38bc3c014d47b951d3614bfb1255d41a2d35ddcbe9228cf9550aaf867adde0f2365f49d0d4e5229c19a78aa538eb64de7cd3d1ef5f7f0c4a079
EBUILD xen-tools-4.13.2-r2.ebuild 16589 BLAKE2B e0dcea110a807bd7c565b41c0d3a016a04b684dfecfa01870951ea606759fa067a3f7a78d655a5decda409f54663c722c499cd98753ba8b3210f5b87efd39731 SHA512 9673f9fa78c6860688213fd21fb015111b6c23f355f89f8f63d0076adde5e87c749f7a44d53323d2fa4894644b04cc069cfd3a949265efe82e0276ddf1abc609
+EBUILD xen-tools-4.13.2-r3.ebuild 16591 BLAKE2B 22a9641ecec838c4ac214be533e01e58a48c1493bf98451c9ed986f623564d4c182ffd5f195785cfb3073400bcaf6722bb0f7678e8223151ba8c1e21211e3d62 SHA512 c68f394c97b4d32b84dd86e85249f06db6f94a4ad17b416882b769846156a23ca10930daa4fc8bf2307945b1dc92ba558997d6fd3dba46563e2f0b5b46d1996d
+EBUILD xen-tools-4.14.1-r1.ebuild 16588 BLAKE2B 1a23c7536d3d9955674d1b041a8e693b5124c9ca5bca9d207065272756a21bd5fcb273a88a4ad3dbb63dc943773cdd81612096f58eb7da70122b12709a75daa4 SHA512 57bd8b8589519d201aa8b37e073c5ffb428e47549dcc567aab8599a9dd861e1e15ba05c170c9c79d03d45925fc030e0598f24e203a7123ccf22f9db635458927
EBUILD xen-tools-4.14.1.ebuild 16587 BLAKE2B 91b60db2a81fcdc88d2523bbfbf8a6125df1d66d2c12016bb48b71486946186ada12b2567f5c1d2b0f2576b3ea30bc8b439c7e7338ee15a1b482420103dac87d SHA512 237b5271694e0aa408f024de90d3672d24224d1a9e12fb779d7a820c1762579bb023543ffe3bcd27890edd71eb987a0f7b188ff2a16da2f10837261ff0ba56ff
MISC metadata.xml 1626 BLAKE2B 64ae7edd26ed6c4fc3777d042dc16b7848b52d5915ce6fc024cbd3b773301ff308b364e993750153bbcd8bb92d11d3d3fbbcc923f71464924e2fddcbbb7081b9 SHA512 d703b590e650ea9e8c2d70fd118c0c1420b2a90d799669ebe32f94e552888e9f9fbda7a0a06f158fe83615e0251559ebb1c3bb475f80efd11f5ba1d50e635299
diff --git a/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild
new file mode 100644
index 000000000000..7159688a1ac3
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.13.2-r3.ebuild
@@ -0,0 +1,512 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+ S="${WORKDIR}/${REPO}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ UPSTREAM_VER=6
+ SECURITY_VER=29
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=21
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=1
+ # xen-tools ovmf's patches
+ OVMF_VER=
+
+ SEABIOS_VER="1.12.1"
+ EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+ EDK2_OPENSSL_VERSION="1_1_1g"
+ EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+ EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+ IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+ https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+ ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+ https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+ https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+ https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ sys-apps/pciutils
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+ ${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+ >=sys-kernel/linux-headers-4.11
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
+ x86? ( sys-devel/dev86
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ sys-power/iasl )
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+
+ ovmf? (
+ !arm? ( !arm64? ( dev-lang/nasm ) )
+ $(python_gen_impl_dep sqlite)
+ )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-power/iasl
+ system-seabios? ( sys-firmware/seabios )
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+ dev-lang/perl
+ app-misc/pax-utils
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/pandoc
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-texlive/texlive-latexextra
+ media-gfx/transfig
+ )
+ hvm? ( x11-base/xorg-proto )
+ qemu? (
+ app-arch/snappy:=
+ x11-libs/pixman
+ sdl? (
+ media-libs/libsdl[X]
+ media-libs/libsdl2[X]
+ )
+ )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )
+ python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2[-minimal]
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+ usr/libexec/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+ usr/libexec/xen/bin/elf2dmp
+ usr/libexec/xen/bin/ivshmem-client
+ usr/libexec/xen/bin/ivshmem-server
+ usr/libexec/xen/bin/qemu-edid
+ usr/libexec/xen/bin/qemu-img
+ usr/libexec/xen/bin/qemu-io
+ usr/libexec/xen/bin/qemu-keymap
+ usr/libexec/xen/bin/qemu-nbd
+ usr/libexec/xen/bin/qemu-pr-helper
+ usr/libexec/xen/bin/qemu-system-i386
+ usr/libexec/xen/bin/virtfs-proxy-helper
+ usr/libexec/xen/libexec/xen-bridge-helper
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/s390-netboot.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ local i
+
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ eapply "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes"
+
+ source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ eapply "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ eapply "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ source "${FILESDIR}"/gentoo-patches.conf || die
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ eapply "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if use ovmf; then
+ if [[ -n ${OVMF_VER} ]];then
+ einfo "Try to apply Ovmf patch set"
+ pushd "${WORKDIR}"/edk2-*/ > /dev/null
+ eapply "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ fi
+ mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+ rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+ # gcc 10
+ cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+ echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # drop flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ if use qemu; then
+ if use sdl; then
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+ tools/Makefile || die
+ else
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+ tools/qemu-xen-traditional/xen-setup || die
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+ tools/Makefile || die
+ fi
+ else
+ # Don't bother with qemu, only needed for fully virtualised guests
+ sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # fix bashishm
+ sed -e '/Usage/s/\$//g' \
+ -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ # disable capstone (Bug #673474)
+ sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+ -i tools/Makefile || die
+
+ # disable glusterfs
+ sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+ -i tools/Makefile || die
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_enable api xenapi) \
+ $(use_enable ipxe) \
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+ $(use_enable ocaml ocamltools) \
+ $(use_enable ovmf) \
+ $(use_enable pam) \
+ $(use_enable rombios) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+ "
+
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+ use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ tc-ld-disable-gold # Bug 669570
+ econf ${myconf}
+}
+
+src_compile() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Created at runtime
+ rm -rv "${ED}/var/run" || die
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"/tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ dodoc -r docs/{pdf,txt}
+ else
+ emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+ fi
+ dodoc ${DOCS[@]}
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+ newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+ keepdir /var/lib/xen/dump
+ keepdir /var/lib/xen/xenpaging
+ keepdir /var/lib/xenstored
+ keepdir /var/log/xen
+
+ if use python; then
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+ fi
+
+ python_optimize
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config system at boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild
new file mode 100644
index 000000000000..0e0c29c4bf2e
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.14.1-r1.ebuild
@@ -0,0 +1,512 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='ncurses,xml,threads(+)'
+
+inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ REPO="xen.git"
+ EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+ S="${WORKDIR}/${REPO}"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ UPSTREAM_VER=3
+ SECURITY_VER=
+ # xen-tools's gentoo patches tarball
+ GENTOO_VER=22
+ # xen-tools's gentoo patches version which apply to this specific ebuild
+ GENTOO_GPV=0
+ # xen-tools ovmf's patches
+ OVMF_VER=
+
+ SEABIOS_VER="1.13.0"
+ EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
+ EDK2_OPENSSL_VERSION="1_1_1g"
+ EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
+ EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+ IPXE_COMMIT="1dd56dbd11082fb622c2ed21cfaced4f47d798a6"
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ [[ -n ${OVMF_VER} ]] && \
+ OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+ https://github.com/qemu/seabios/archive/rel-${SEABIOS_VER}.tar.gz -> seabios-${SEABIOS_VER}.tar.gz
+ ipxe? ( http://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
+ ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
+ https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
+ https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
+ https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
+ ${OVMF_PATCHSET_URI} )
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+
+ S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README )
+
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api debug doc flask +hvm +ipxe ocaml ovmf +pam pygrub python +qemu +qemu-traditional +rombios screen sdl static-libs system-ipxe system-qemu system-seabios"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ipxe? ( rombios )
+ ovmf? ( hvm )
+ pygrub? ( python )
+ rombios? ( hvm )
+ system-ipxe? ( rombios )
+ ?? ( ipxe system-ipxe )
+ ?? ( qemu system-qemu )"
+
+COMMON_DEPEND="
+ sys-apps/pciutils
+ dev-libs/lzo:2
+ dev-libs/glib:2
+ dev-libs/yajl
+ dev-libs/libaio
+ dev-libs/libgcrypt:0
+ sys-libs/zlib
+ ${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+ app-misc/pax-utils
+ dev-lang/perl
+ >=sys-kernel/linux-headers-4.11
+ x11-libs/pixman
+ $(python_gen_cond_dep '
+ dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+ pam? ( dev-python/pypam[${PYTHON_MULTI_USEDEP}] )
+ ')
+ x86? ( sys-devel/dev86
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ sys-power/iasl )
+ api? ( dev-libs/libxml2
+ net-misc/curl )
+
+ ovmf? (
+ !arm? ( !arm64? ( dev-lang/nasm ) )
+ $(python_gen_impl_dep sqlite)
+ )
+ !amd64? ( >=sys-apps/dtc-1.4.0 )
+ amd64? ( sys-power/iasl
+ system-seabios? ( sys-firmware/seabios )
+ system-ipxe? ( sys-firmware/ipxe[qemu] )
+ rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
+ doc? (
+ app-text/ghostscript-gpl
+ app-text/pandoc
+ $(python_gen_cond_dep '
+ dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-texlive/texlive-latexextra
+ media-gfx/transfig
+ )
+ hvm? ( x11-base/xorg-proto )
+ qemu? (
+ app-arch/snappy:=
+ sdl? (
+ media-libs/libsdl[X]
+ media-libs/libsdl2[X]
+ )
+ )
+ system-qemu? ( app-emulation/qemu[xen] )
+ ocaml? ( dev-ml/findlib
+ >=dev-lang/ocaml-4 )
+ python? ( >=dev-lang/swig-4.0.0 )"
+
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/iproute2[-minimal]
+ net-misc/bridge-utils
+ screen? (
+ app-misc/screen
+ app-admin/logrotate
+ )"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+ usr/libexec/xen/boot/hvmloader
+ usr/share/qemu-xen/qemu/hppa-firmware.img
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+ usr/libexec/xen/bin/elf2dmp
+ usr/libexec/xen/bin/ivshmem-client
+ usr/libexec/xen/bin/ivshmem-server
+ usr/libexec/xen/bin/qemu-edid
+ usr/libexec/xen/bin/qemu-img
+ usr/libexec/xen/bin/qemu-io
+ usr/libexec/xen/bin/qemu-keymap
+ usr/libexec/xen/bin/qemu-nbd
+ usr/libexec/xen/bin/qemu-pr-helper
+ usr/libexec/xen/bin/qemu-system-i386
+ usr/libexec/xen/bin/virtfs-proxy-helper
+ usr/libexec/xen/libexec/xen-bridge-helper
+ usr/share/qemu-xen/qemu/s390-ccw.img
+ usr/share/qemu-xen/qemu/s390-netboot.img
+ usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+ python_setup
+ export "CONFIG_LOMOUNT=y"
+
+ #bug 522642, disable compile tools/tests
+ export "CONFIG_TESTS=n"
+
+ if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+ if use x86 && use amd64; then
+ die "Confusion! Both x86 and amd64 are set in your use flags!"
+ elif use x86; then
+ export XEN_TARGET_ARCH="x86_32"
+ elif use amd64 ; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+}
+
+src_prepare() {
+ local i
+
+ # Upstream's patchset
+ if [[ -n ${UPSTREAM_VER} ]]; then
+ einfo "Try to apply Xen Upstream patch set"
+ eapply "${WORKDIR}"/patches-upstream
+ fi
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ EPATCH_SUFFIX="patch"
+ EPATCH_FORCE="yes"
+
+ source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+
+ # apply qemu-xen/upstream patches
+ pushd "${S}"/tools/qemu-xen/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUU}; do
+ eapply "${WORKDIR}"/patches-security/qemuu/$i
+ done
+ popd > /dev/null
+
+ # apply qemu-traditional patches
+ pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+ for i in ${XEN_SECURITY_QEMUT}; do
+ eapply "${WORKDIR}"/patches-security/qemut/$i
+ done
+ popd > /dev/null
+ fi
+
+ # move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+ mv ../seabios-rel-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+ pushd tools/firmware/ > /dev/null
+ ln -s seabios-dir-remote seabios-dir || die
+ popd > /dev/null
+
+ # Gentoo's patchset
+ if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+ einfo "Try to apply Gentoo specific patch set"
+ source "${FILESDIR}"/gentoo-patches.conf || die
+ _gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+ for i in ${!_gpv}; do
+ eapply "${WORKDIR}"/patches-gentoo/$i
+ done
+ fi
+
+ # Ovmf's patchset
+ if use ovmf; then
+ if [[ -n ${OVMF_VER} ]];then
+ einfo "Try to apply Ovmf patch set"
+ pushd "${WORKDIR}"/edk2-*/ > /dev/null
+ eapply "${WORKDIR}"/patches-ovmf
+ popd > /dev/null
+ fi
+ mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
+ rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
+ mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
+ cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
+ cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
+ fi
+
+ # ipxe
+ if use ipxe; then
+ cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
+
+ # gcc 10
+ cp "${WORKDIR}/patches-gentoo/xen-tools-4.13.0-ipxe-gcc10.patch" tools/firmware/etherboot/patches/ipxe-gcc10.patch || die
+ echo ipxe-gcc10.patch >> tools/firmware/etherboot/patches/series || die
+ fi
+
+ mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+ # Fix texi2html build error with new texi2html, qemu.doc.html
+ sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+ use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+ sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+ -i tools/firmware/Makefile || die
+
+ # Drop .config, fixes to gcc-4.6
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ # drop flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+ unset CPPFLAGS
+
+ if ! use pygrub; then
+ sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+ fi
+
+ if ! use python; then
+ sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+ fi
+
+ if ! use hvm; then
+ sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+ # Bug 351648
+ elif ! use x86 && ! has x86 $(get_all_abis); then
+ mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+ touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+ export CPATH="${WORKDIR}"/extra-headers
+ fi
+
+ if use qemu; then
+ if use sdl; then
+ sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+ tools/Makefile || die
+ else
+ sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+ tools/qemu-xen-traditional/xen-setup || die
+ sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+ tools/Makefile || die
+ fi
+ else
+ # Don't bother with qemu, only needed for fully virtualised guests
+ sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
+ fi
+
+ # Reset bash completion dir; Bug 472438
+ sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+ -i Config.mk || die
+ sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+ # xencommons, Bug #492332, sed lighter weight than patching
+ sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+ -i tools/hotplug/Linux/init.d/xencommons.in || die
+
+ # fix bashishm
+ sed -e '/Usage/s/\$//g' \
+ -i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+ # respect multilib, usr/lib/libcacard.so.0.0.0
+ sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+ -i tools/qemu-xen/configure || die
+
+ #bug 518136, don't build 32bit exactuable for nomultilib profile
+ if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+ sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+ fi
+
+ # uncomment lines in xl.conf
+ sed -e 's:^#autoballoon=:autoballoon=:' \
+ -e 's:^#lockfile=:lockfile=:' \
+ -e 's:^#vif.default.script=:vif.default.script=:' \
+ -i tools/examples/xl.conf || die
+
+ # disable capstone (Bug #673474)
+ sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
+ -i tools/Makefile || die
+
+ # disable glusterfs
+ sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
+ -i tools/Makefile || die
+
+ default
+}
+
+src_configure() {
+ local myconf="--prefix=${PREFIX}/usr \
+ --libdir=${PREFIX}/usr/$(get_libdir) \
+ --libexecdir=${PREFIX}/usr/libexec \
+ --localstatedir=${EPREFIX}/var \
+ --disable-werror \
+ --disable-xen \
+ --enable-tools \
+ --enable-docs \
+ $(use_enable api xenapi) \
+ $(use_enable ipxe) \
+ $(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '') \
+ $(use_enable ocaml ocamltools) \
+ $(use_enable ovmf) \
+ $(use_enable pam) \
+ $(use_enable rombios) \
+ --with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+ "
+
+ use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+ use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+ use amd64 && myconf+=" $(use_enable qemu-traditional)"
+ tc-ld-disable-gold # Bug 669570
+ econf ${myconf}
+}
+
+src_compile() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+ use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
+
+ if test-flag-CC -fno-strict-overflow; then
+ append-flags -fno-strict-overflow
+ fi
+
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
+
+ if use doc; then
+ emake -C docs build
+ else
+ emake -C docs man-pages
+ fi
+}
+
+src_install() {
+ # Override auto-detection in the build system, bug #382573
+ export INITD_DIR=/tmp/init.d
+ export CONFIG_LEAF_DIR=../tmp/default
+
+ # Let the build system compile installed Python modules.
+ local PYTHONDONTWRITEBYTECODE
+ export PYTHONDONTWRITEBYTECODE
+
+ emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+ XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+ # Created at runtime
+ rm -rv "${ED}/var/run" || die
+
+ # Fix the remaining Python shebangs.
+ python_fix_shebang "${D}"
+
+ # Remove RedHat-specific stuff
+ rm -rf "${D}"/tmp || die
+
+ if use doc; then
+ emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+ dodoc -r docs/{pdf,txt}
+ else
+ emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
+ fi
+ dodoc ${DOCS[@]}
+
+ newconfd "${FILESDIR}"/xendomains.confd xendomains
+ newconfd "${FILESDIR}"/xenstored.confd xenstored
+ newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+ newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+ newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+ newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+ newinitd "${FILESDIR}"/xencommons.initd xencommons
+ newconfd "${FILESDIR}"/xencommons.confd xencommons
+ newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+ newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+ newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+ if use screen; then
+ cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+ cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+ keepdir /var/log/xen-consoles
+ fi
+
+ # For -static-libs wrt Bug 384355
+ if ! use static-libs; then
+ rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
+ fi
+
+ # for xendomains
+ keepdir /etc/xen/auto
+
+ # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+ -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+
+ keepdir /var/lib/xen/dump
+ keepdir /var/lib/xen/xenpaging
+ keepdir /var/lib/xenstored
+ keepdir /var/log/xen
+
+ if use python; then
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
+ python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+ fi
+
+ python_optimize
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide and the offical wiki page:"
+ elog "https://wiki.gentoo.org/wiki/Xen"
+ elog "https://wiki.xen.org/wiki/Main_Page"
+ elog ""
+ elog "Recommended to utilise the xencommons script to config system at boot"
+ elog "Add by use of rc-update on completion of the install"
+
+ if ! use hvm; then
+ echo
+ elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+ elog "support enable the hvm use flag."
+ elog "An x86 or amd64 system is required to build HVM support."
+ fi
+
+ if use qemu; then
+ elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+ elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
+ elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
+ elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+ fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 3fbe3456621f..ffe0bcbb1970 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,10 +2,14 @@ AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3
AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
+DIST xen-4.13.2-upstream-patches-6.tar.xz 80980 BLAKE2B a20643c4f89f197e4001c0181249bc1a22b60874bc077ba2abee716b8e64bbbea0885a64632f3120960425a741328ceba1b44dc10a7a24039b328e1ded28f752 SHA512 0b097dfb04404ec6c609d35d924b3d2306c5f2de0501aa0b8e007e0af9a4ef394fae2d736435401bf8bd1fd661171c71ba712585bdb195649e3350ef9f953115
DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
+DIST xen-4.14.1-upstream-patches-3.tar.xz 27864 BLAKE2B 69a67e863a30c0079f7955dd5306f69890a4f6db91d4cf2d1806a2bbd8afad88db7789c7eda8da0ff2a945da04916ff4ab5eaa9e529a417112ae01e31151d0dc SHA512 19e5ef39616fffbff20b2f658d61e50e21741fe3c5c4ca89f67e72a1606b3a593f93e9090fb0b5c76c1c801f931c237d2be6329bd174fa911d66b81ad4a332dd
DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
EBUILD xen-4.13.2-r6.ebuild 4461 BLAKE2B 51ec4190284c97258c5eee7769b0bd049fb63be964dc1077010a432b922ec484659e09864006a4186b0b177c9933da0bfc9e3c82cd018107ff46db5631710bcb SHA512 fc3dc7a4e67118f1d744d197111fdc8d9f74832a27d0142282fbc59f7a064421ec7e4913a179ffa293987434ac6b7d30e917c0fedb6d9c0a8f547d050c5c9bdd
+EBUILD xen-4.13.2-r7.ebuild 4461 BLAKE2B 937b7c55ade61f88f6399a190c7e6ceb73c809563b391843a1f9c3fc2ad36b64f5ffa8314cc33cb75898af95e778b5d1fc1c93c331fe1d33c7812fcd965311e5 SHA512 5b77d97f4345da17720b01c3245f507119dd29f7aa336b3cf737080e86aac11990dfa74136b8d821c783da628d608bd815a9603bf32fa89ce9df3a68b4f29d00
EBUILD xen-4.14.1-r2.ebuild 4461 BLAKE2B dba0b2e36c540adcef17e9ad611b15937f139cdea43732397f1825b8a2d5b03bf3c30d7b86e335cadbabf3dd4993e8a911e90789898d0900f0664e872c41c1d2 SHA512 32d97681abf3a0a9e17825e088a7221b577ec7902060c3b7a420de388c6ae48657350ec214886802479591a5111f1c6aece6430b38b5afa20e91ed07e272bf17
+EBUILD xen-4.14.1-r3.ebuild 4461 BLAKE2B ce6b3d356ca85e1d55465dc5f72c8fca29b9446fc010d8eb25ee837eb941fca1e5093c5be6330a115c20793d6c2ff82b6264a80992dc86a1dc92dac91f210d1f SHA512 1de68efb23d4efd211dcd557ee375355186854e43c8f202b873d1ddb4574fbac387eee48ee74a1ddb60af149967a380b807f9ea653dc3c866f9b24fb4b818e53
MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/xen-4.13.2-r7.ebuild b/app-emulation/xen/xen-4.13.2-r7.ebuild
new file mode 100644
index 000000000000..b1c2f8918a01
--- /dev/null
+++ b/app-emulation/xen/xen-4.13.2-r7.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+ UPSTREAM_VER=6
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ source "${WORKDIR}"/patches-security/${PV}.conf
+
+ local i
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+ fi
+
+ # Gentoo's patchset
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+ eapply "${FILESDIR}"/${PN}-4.11-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="/boot"
+ fi
+
+ default
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ # remove flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+
+ use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+ ewarn
+ ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+ ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+ ewarn "to work fine."
+ ewarn
+ ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+ ewarn
+ ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}
diff --git a/app-emulation/xen/xen-4.14.1-r3.ebuild b/app-emulation/xen/xen-4.14.1-r3.ebuild
new file mode 100644
index 000000000000..603655bdcde0
--- /dev/null
+++ b/app-emulation/xen/xen-4.14.1-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm -x86"
+ UPSTREAM_VER=3
+ SECURITY_VER=
+ GENTOO_VER=
+
+ [[ -n ${UPSTREAM_VER} ]] && \
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz
+ https://github.com/hydrapolic/gentoo-dist/raw/master/xen/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+ [[ -n ${SECURITY_VER} ]] && \
+ SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+ [[ -n ${GENTOO_VER} ]] && \
+ GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+ SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+ ${UPSTREAM_PATCHSET_URI}
+ ${SECURITY_PATCHSET_URI}
+ ${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+ efi? ( >=sys-devel/binutils-2.22[multitarget] )
+ !efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ if [[ -z ${XEN_TARGET_ARCH} ]]; then
+ if use amd64; then
+ export XEN_TARGET_ARCH="x86_64"
+ elif use arm; then
+ export XEN_TARGET_ARCH="arm32"
+ elif use arm64; then
+ export XEN_TARGET_ARCH="arm64"
+ else
+ die "Unsupported architecture!"
+ fi
+ fi
+
+ if use flask ; then
+ export "XSM_ENABLE=y"
+ export "FLASK_ENABLE=y"
+ fi
+}
+
+src_prepare() {
+ # Upstream's patchset
+ [[ -n ${UPSTREAM_VER} ]] && eapply "${WORKDIR}"/patches-upstream
+
+ # Security patchset
+ if [[ -n ${SECURITY_VER} ]]; then
+ einfo "Try to apply Xen Security patch set"
+ # apply main xen patches
+ # Two parallel systems, both work side by side
+ # Over time they may concdense into one. This will suffice for now
+ source "${WORKDIR}"/patches-security/${PV}.conf
+
+ local i
+ for i in ${XEN_SECURITY_MAIN}; do
+ eapply "${WORKDIR}"/patches-security/xen/$i
+ done
+ fi
+
+ # Gentoo's patchset
+ [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo
+
+ eapply "${FILESDIR}"/${PN}-4.14-efi.patch
+
+ # Drop .config
+ sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
+
+ if use efi; then
+ export EFI_VENDOR="gentoo"
+ export EFI_MOUNTPOINT="/boot"
+ fi
+
+ default
+}
+
+src_configure() {
+ use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+ use debug && myopt="${myopt} debug=y"
+
+ # remove flags
+ unset CFLAGS
+ unset LDFLAGS
+ unset ASFLAGS
+
+ tc-ld-disable-gold # Bug 700374
+}
+
+src_compile() {
+ # Send raw LDFLAGS so that --as-needed works
+ emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+ local myopt
+ use debug && myopt="${myopt} debug=y"
+
+ # The 'make install' doesn't 'mkdir -p' the subdirs
+ if use efi; then
+ mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+ fi
+
+ emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
+
+ # make install likes to throw in some extra EFI bits if it built
+ use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+ elog "Official Xen Guide:"
+ elog " https://wiki.gentoo.org/wiki/Xen"
+
+ use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
+
+ elog "You can optionally block the installation of /boot/xen-syms by an entry"
+ elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+ elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+
+ ewarn
+ ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
+ ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
+ ewarn "to work fine."
+ ewarn
+ ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
+ ewarn
+ ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
+}