summaryrefslogtreecommitdiff
path: root/app-emulation
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/Manifest.gzbin20355 -> 20367 bytes
-rw-r--r--app-emulation/cloud-init/Manifest3
-rw-r--r--app-emulation/cloud-init/cloud-init-20.4.ebuild96
-rw-r--r--app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch86
-rw-r--r--app-emulation/conmon/Manifest2
-rw-r--r--app-emulation/conmon/conmon-2.0.22.ebuild51
-rw-r--r--app-emulation/docker/Manifest4
-rw-r--r--app-emulation/docker/docker-19.03.13-r2.ebuild2
-rw-r--r--app-emulation/docker/docker-19.03.14.ebuild2
-rw-r--r--app-emulation/dosemu/Manifest3
-rw-r--r--app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild8
-rw-r--r--app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch44
-rw-r--r--app-emulation/free42/Manifest2
-rw-r--r--app-emulation/free42/free42-2.5.22.ebuild50
-rw-r--r--app-emulation/libpod/Manifest2
-rw-r--r--app-emulation/libpod/libpod-2.2.1.ebuild160
-rw-r--r--app-emulation/qemu-guest-agent/Manifest5
-rw-r--r--app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch17
-rw-r--r--app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild82
-rw-r--r--app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild82
-rw-r--r--app-emulation/qemu/Manifest2
-rw-r--r--app-emulation/qemu/qemu-5.1.0-r3.ebuild2
-rw-r--r--app-emulation/sen/Manifest4
-rw-r--r--app-emulation/sen/sen-0.6.0.ebuild38
-rw-r--r--app-emulation/sen/sen-0.6.1.ebuild38
-rw-r--r--app-emulation/slirp4netns/Manifest2
-rw-r--r--app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild40
-rw-r--r--app-emulation/virt-what/Manifest2
-rw-r--r--app-emulation/virt-what/virt-what-1.18.ebuild2
-rw-r--r--app-emulation/x48/Manifest2
-rw-r--r--app-emulation/x48/x48-0.6.4-r2.ebuild2
31 files changed, 556 insertions, 279 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 560b60c35993..14cd93edc606 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
Binary files differ
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 32d3a4c82731..3bb127e50867 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -5,9 +5,12 @@ AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63
AUX cloud-init-19.4-gentoo-support-upstream-templates.patch 3445 BLAKE2B e7a7e9d3d36d78ab00f2d495f9a3fad795b142c755c797c4cfaf93263c98392b6a03f14bfd38fe4f3a332b108d3c5624051c267e60d0bad1c3469457a0f2f937 SHA512 b88f71c2131e15ead8638f0e094930c76eb1da213443402b4ac15fd735a307393952d4970f6584a2d0199cf58f535956ffa8226a0ce0b51a309299f4424b2f5d
AUX cloud-init-19.4_CVE-2020-8631.patch 821 BLAKE2B 1c684ab25b44ab35d027d342647070c2558f4740d2117316790ef244a3fac0cd47d205f4af9968c7b6438602172a4f383d211ac58726431e7d1eeeb4bafb4600 SHA512 057158b90890bd14c8252da2c53f04f818f1e7ac7146f39fcbd90fa9cc6ab4914881804bfdf552bc8af589f6f297a8c96584131f648165d9dbbe42a3ce6f3617
AUX cloud-init-20.1-gentoo-support-upstream-templates.patch 3505 BLAKE2B 6f4b75493e6354c73ad87546337d4520f334883cd0bcd7f3f7eb34276a5c6d57dfbd46f5dc22306ab9843164b56638196238025431a319ad67c9e3d03945ef05 SHA512 3151504396a55baca141a8f509e93007bfe93e4e5945cfcd17ef98a2394ba64564cd7233e792233389776c5baa0b1fd3609a868a5f386dcf5d84563e00d7885b
+AUX cloud-init-20.4-gentoo-support-upstream-templates.patch 3467 BLAKE2B 0d6185373ef7de03de60f3ae277a808a8457c8bbce23ab5a10ff3382c0ace244fe5d054285d2eeeb99956863156f3ff0000b7f6f84b706489d19c29cb1dbeadf SHA512 d5209c78ede276b6d614baad2ff586008694e4533114394207f377a67cbb8cd9a73547c8e0a9daa55051fa56ccb099b3a0f2bcf824cda0cbef0de858332c95f8
DIST cloud-init-19.4.tar.gz 1091893 BLAKE2B 2ab8fef70b420c066d6d8f83871568eeac24f00879ecf3d58c3768dd809cff6a3b79c7e72d9a10204002101049ab86ab64f0c524362e00497a9222960ef380df SHA512 e69ea47eab41d69d64fa44102fbde59319da5f71a68f28a0f6ac65cd6866542b4fe58a71b84c903cfa9b1d2f26eb648cdf4de633b8df61e4f89c9fa4c2a2b1d3
DIST cloud-init-20.1.tar.gz 1088152 BLAKE2B 1c075676bcf7454965beafaaa38f3cdf08f321ddd0303b7f710c49d2a69e0fb2ec8a81870a632b7504c47af6436555c97ea9fa9c8416955de78f8f551b5509b7 SHA512 ad28e4a0290165308ef2cdb8a935778ad99039978a204bee1098460de006bc3f375a3b81d0d72971fc4f4195d5d2ade9c648fb19e6d6eba12decf750dc54b6eb
+DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
EBUILD cloud-init-19.4.ebuild 2544 BLAKE2B 01532bf72141708fae2b5731c37987c2eae5e22687c0ef6235d2a2a15330e48d0d08f6d2c3c9d4355efbefe54186f4db2f9bfc22cb9f2a03464f0813da379e53 SHA512 d79fae60f1fb36e51193e4b066a9f1075627f43a219a2769d5922f397a0f5fa6eb0cb7d7914f7eb24011777d8ba890d98fb01e55a35152165b6e7e8e2d10eb8b
EBUILD cloud-init-20.1.ebuild 2718 BLAKE2B 9586c5d6cf9b4936ea0b4e4f2de5dc3b6ee5dbc0b45284b517c8fb55a43fa0c8ca834708a42f81f236ed5911de045e2d908eda7b4d911e750d2cd35a00dc6750 SHA512 a0bb10a25b1ed1ef9fb26222b5ab2c17bb9fde398ad471de6cd166db06195327d76946287ee9725fcf70a6b585406468cbe83a66e54b5e6bb542537582696b86
+EBUILD cloud-init-20.4.ebuild 2704 BLAKE2B 34f99d78fc0c362a3457570148c8ad581c6ac12c7e0a93f12f9b2f00bcefc025d4781b1ac60b251c52756f1a7df06ad77053fd0e40dfeb7f10723da960a5c4d3 SHA512 7e60238cf053547d764cdb9229eafb9470d90a114ef5fe344dbf8e1a7f70f95df915898952d22bd653d7daa5762230466617bcb8274a34a56b12ee2f8a26e0cf
EBUILD cloud-init-9999.ebuild 2713 BLAKE2B ac4c332041fc76f3f47b6f677867803389af0ef99c4003660d408a5d6b8f923e805fb8a8e57a84b9819a26a48a3fb358b8f2dfd324a52236c0d5a905f1eeb017 SHA512 161abf356202ae21551f04ae7a54387152c657939e842aec279f357f8f817abb18d1a42ab57e32d99f20c9a2d22224f3f5d479eea3629a0a2f6cf6b6a4dfa444
MISC metadata.xml 769 BLAKE2B 4a6e831e4cd77a81826f3d8a1f16603ece81cb75261a0dfb0b4ff2cea47a4458abf3f7fb5d61672a3bbe38d538b8ba827fd50a7c9c12ef69a69107216e923c29 SHA512 760c8e7a756438fc511eb6959b0ce50cf58e0df6e553e3634a233c2bd95ad0a04310be96ee6ce392eb97e12d2d8760399ab135c4c9eb97b0dd9cd62aeecd1859
diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild
new file mode 100644
index 000000000000..9ad56e71193d
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/oauthlib[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/jsonpatch[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+ test? (
+ ${CDEPEND}
+ >=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/contextlib2[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ net-analyzer/macchanger
+ sys-apps/iproute2
+ sys-fs/growpart
+ virtual/logger
+"
+
+PATCHES=(
+ # Fix Gentoo support
+ # https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+ "${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
+ "${FILESDIR}/${PN}-20.4-gentoo-support-upstream-templates.patch"
+ "${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
+ "${FILESDIR}"/18.4-fix-update_package_sources-function.patch
+ "${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
+)
+
+python_prepare_all() {
+ # Fix location of documentation installation
+ sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+ sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Do not use Makefile target as it does not setup environment correclty
+ esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+}
+
+python_install() {
+ distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+ keepdir /etc/cloud
+
+ distutils-r1_python_install_all
+
+ # installs as non-executable
+ chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+ elog "cloud-init-local needs to be run in the boot runlevel because it"
+ elog "modifies services in the default runlevel. When a runlevel is started"
+ elog "it is cached, so modifications that happen to the current runlevel"
+ elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch
new file mode 100644
index 000000000000..ec6063d0c68a
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-20.4-gentoo-support-upstream-templates.patch
@@ -0,0 +1,86 @@
+From 823454f1ea140ec47f5f9c5c3c5ad62eb458eb8a Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 24 Oct 2018 10:52:46 +0200
+Subject: [PATCH 2/5] Add support for gentoo in cloud.cfg and templates
+
+---
+ config/cloud.cfg.tmpl | 8 ++++++--
+ templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
+ tools/render-cloudcfg | 2 +-
+ 3 files changed, 31 insertions(+), 3 deletions(-)
+ create mode 100644 templates/hosts.gentoo.tmpl
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 1fef133a..3f5a41a2 100644
+--- a/config/cloud.cfg.tmpl 2020-12-27 18:35:39.107000000 +0000
++++ b/config/cloud.cfg.tmpl 2020-12-27 18:38:23.982000000 +0000
+@@ -154,7 +154,7 @@ cloud_final_modules:
+ system_info:
+ # This will affect which distro class gets used
+ {% if variant in ["alpine", "amazon", "arch", "centos", "debian",
+- "fedora", "freebsd", "netbsd", "openbsd", "rhel",
++ "fedora", "freebsd", "gentoo", "netbsd", "openbsd", "rhel",
+ "suse", "ubuntu"] %}
+ distro: {{ variant }}
+ {% else %}
+@@ -206,7 +206,7 @@ system_info:
+ primary: http://ports.ubuntu.com/ubuntu-ports
+ security: http://ports.ubuntu.com/ubuntu-ports
+ ssh_svcname: ssh
+-{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
++{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora", "gentoo",
+ "rhel", "suse"] %}
+ # Default user name + that default users groups (if added/used)
+ default_user:
+@@ -221,6 +221,10 @@ system_info:
+ {% endif %}
+ {% if variant == "suse" %}
+ groups: [cdrom, users]
++{% elif variant == "gentoo" %}
++ groups: [users, wheel]
++ primary_group: users
++ no_user_group: true
+ {% elif variant == "alpine" %}
+ groups: [adm, sudo]
+ {% elif variant == "arch" %}
+diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
+new file mode 100644
+index 00000000..cd045fa6
+--- /dev/null
++++ b/templates/hosts.gentoo.tmpl
+@@ -0,0 +1,24 @@
++## template:jinja
++{#
++This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
++if enabled in cloud-config. Specifically, in order to enable it
++you need to add the following to config:
++ manage_etc_hosts: True
++-#}
++# Your system has configured 'manage_etc_hosts' as True.
++# As a result, if you wish for changes to this file to persist
++# then you will need to either
++# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
++# b.) change or remove the value of 'manage_etc_hosts' in
++# /etc/cloud/cloud.cfg or cloud-config from user-data
++#
++# The following lines are desirable for IPv4 capable hosts
++127.0.0.1 {{fqdn}} {{hostname}}
++127.0.0.1 localhost.localdomain localhost
++127.0.0.1 localhost4.localdomain4 localhost4
++
++# The following lines are desirable for IPv6 capable hosts
++::1 {{fqdn}} {{hostname}}
++::1 localhost.localdomain localhost
++::1 localhost6.localdomain6 localhost6
++
+diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
+index 8b7cb875..d109044e 100755
+--- a/tools/render-cloudcfg 2020-12-27 18:44:22.032049636 +0000
++++ a/tools/render-cloudcfg 2020-12-27 18:44:41.632619051 +0000
+@@ -5,7 +5,7 @@ import os
+ import sys
+
+ VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
+- "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
++ "freebsd", "gentoo", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
+ "unknown"]
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index e9f3761b9168..66a0f136eab3 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,3 +1,5 @@
DIST conmon-2.0.20.tar.gz 64716 BLAKE2B d7eb464f5be0b117824571134f08077955f56e1637dd2cbc6b70413dc9a6f109a1b9b207f5523103f205659ac20cc65f5f2340475d771fdf4b852d6895887975 SHA512 b719e41e1ead0d38c0874a30901c5660dc8612dc7aa1c025068480846a1e458a744b55bb8d5d74d2c2ce38fdbbe03505fce216a2f2c0748740983e3272a82f0e
+DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
EBUILD conmon-2.0.20.ebuild 991 BLAKE2B 0f8d190d49a770b2438332c85b5de73427ff9b7f7ad1af199d63b972abb3003c5fdc9004be4a9e0bd8898257c80d26a533f5f5aafd99be6baf480ca4851cdc46 SHA512 8a6ceb7f1b5fc42638b5e43545a963676619884591950897a1e2ed001e1813de8a015f6e22e4b66502a31d69918d149c43c9fdb84481c2320ad9d26a1b028c09
+EBUILD conmon-2.0.22.ebuild 1184 BLAKE2B 75c40011ce14d692ab11310ba9e32a9bece265c4f636680bec93186fc9d751e916ef2ad4b9e6cf9f7ebcb6a6d38ff7d37f6f7ba68a50a73cc17564ad1b9a6b73 SHA512 22244dd45ac55b9231b685f0fdd7dcb62d9f4f08f7aea114cc2eb161e3911435f7042d47a7464130d240fe065871694c46f6caace4b6876dd3598dafbe154d6a
MISC metadata.xml 326 BLAKE2B 88e40bbfd92c360f7ed559dc1f3ebe8d35a4905c413de8208a72e255e531d32f61dea3ad710b3a2743df01b29f3f5426440beff3ffcd59139d6f5ce118c17557 SHA512 0709bf7dd7300225974bbf974a3c90c27a368ae6862e080c95f0fb30f314b94c0502258773649fe2cdeba22ad9f5c0d29d000f95e8f7d961e9cdfbea108b4775
diff --git a/app-emulation/conmon/conmon-2.0.22.ebuild b/app-emulation/conmon/conmon-2.0.22.ebuild
new file mode 100644
index 000000000000..22d66f80a279
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.22.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+EGIT_COMMIT="9c34a8663b85e479e0c083801e89a2b2835228ed"
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+ systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+ dev-go/go-md2man"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+ default
+
+ if ! use systemd; then
+ sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+ -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+ -i Makefile || die
+ fi
+ sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+ sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+ tc-export CC
+ emake GIT_COMMIT="${EGIT_COMMIT}" \
+ all
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="/usr" \
+ install
+ dodir /usr/libexec/podman
+ ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+ dodoc README.md
+}
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index 47bc01a68220..c18be328c394 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -1,5 +1,5 @@
DIST docker-19.03.13.tar.gz 18242693 BLAKE2B c19afed62694274298b42fc9af3b36c4cc6429b40f7e5447a996b87636a0d2e916476875652e20abd7aeab4e5e0e1cf887a04dcade1de03ded549fc36d911ac4 SHA512 5f34a14ef0b36a309d4a08926ac482ca82d24cdd873aa359c5ba7c65473cbb2e987fe615c38c1bc1c50135284da78a7eb98a8a0106d7d073aeda0cd8f1c31873
DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28
-EBUILD docker-19.03.13-r2.ebuild 9208 BLAKE2B e0fdb980ed5a99cef22fa76160634f0caca5251982a724ef5714a9282a06512f98fb7c88bf18fc7b0ff2da5cb16d243f5390b37f0bcd17ba60d199dff9ee0adb SHA512 5682caacdaaaa8ed1cb068957415d2b770bc75aa5000742249ae4741f9733fa1d533c9bd614bdd9450cbfedac4b6bcf7d587b7a8e063998eb25d6a4a88c02955
-EBUILD docker-19.03.14.ebuild 9207 BLAKE2B e5bbea70b2dc25438365f456acd4c090268ffe3dfd4a754eb9be302f4db020d39d966bf387416233198c679c59e8c85351dac3fa5068573b26817930964fdcbc SHA512 e0151c90a66de719d2149365e3badde2d5b49f4edc3881b288f6a83dc9a037724266341fef36f5d802b982f9bc21fa1bb9ff1922870e746b634cc83558ae0a85
+EBUILD docker-19.03.13-r2.ebuild 9217 BLAKE2B c75a45738a89c1205a6515e3c9796cdffa63776cc54ba6f345579ecaae9642dbb8c8246af1b78b0cd14002a25a1bb8ff8238a4eca874bdfd30ea23bf1c5ff5c1 SHA512 65f016b40849652aea58353a6a3045c0aaac8793891db727ab597a97e885a27ba8380413b108ce090afa66474fa3502b74c8278722bcae454fc98b4a3c226bf4
+EBUILD docker-19.03.14.ebuild 9216 BLAKE2B 01bb9dde2f897bc65e4eabefc07be637118e19d512e4a0c46e8ba6d5aec6b5b2aba8f1e702eda11a4641f08acc3c91661348b89561b3d2f11e7e59bf6991ec3e SHA512 cf68f486054ed21d6a690f364e84db2e8b8efab22d8eb1a8de0e381d1011c221f0ab664be5e22973d82cc1a98fac29135cc3baa0171362b7152e80da1d5a186b
MISC metadata.xml 1480 BLAKE2B d55259087f20646d81686efc1def000be31b841eb450b16b41de984955688282c541dbf127d3638cabc1219f22d2dad77c6c0431a374148329f73f0ab91f8ca7 SHA512 2ca140b93f15f63d3e07989f4ff1e702b61e4ef62d199564e1fd91f995750740c08f28aafe35f0a0945fa588bc6240e3f02aa84aa06c6be7944ad5f5d2764bfa
diff --git a/app-emulation/docker/docker-19.03.13-r2.ebuild b/app-emulation/docker/docker-19.03.13-r2.ebuild
index 0e9fcd9f79b3..b4de621c665c 100644
--- a/app-emulation/docker/docker-19.03.13-r2.ebuild
+++ b/app-emulation/docker/docker-19.03.13-r2.ebuild
@@ -170,7 +170,7 @@ pkg_setup() {
~AUFS_FS
~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
"
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
fi
if use btrfs; then
diff --git a/app-emulation/docker/docker-19.03.14.ebuild b/app-emulation/docker/docker-19.03.14.ebuild
index fa355dcabb81..7524b7a23f46 100644
--- a/app-emulation/docker/docker-19.03.14.ebuild
+++ b/app-emulation/docker/docker-19.03.14.ebuild
@@ -170,7 +170,7 @@ pkg_setup() {
~AUFS_FS
~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
"
- ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+ ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
fi
if use btrfs; then
diff --git a/app-emulation/dosemu/Manifest b/app-emulation/dosemu/Manifest
index 2043259cb3c5..f9589707edb3 100644
--- a/app-emulation/dosemu/Manifest
+++ b/app-emulation/dosemu/Manifest
@@ -5,8 +5,9 @@ AUX dosemu-1.4.1_pre20130107-flex-2.6.3.patch 463 BLAKE2B d4bc8b47ce97742b0f162a
AUX dosemu-1.4.1_pre20130107-fortify.patch 1961 BLAKE2B ec1e9a8d78ac041c33ae4b4c534a028fa47fc84b8383183006b2830cf28d1a4c227324d2dd0f6aa07c138fbbe3fb991d3ad76012ccd85da973c65b851d965f50 SHA512 90a5dbc6b00d2b13086c15997cf056e1a54721518a76a85425c7adb6d859782e26391c28386e847fd914a01f0c243615c21c1317a58c19ed9603133e0256971a
AUX dosemu-1.4.1_pre20130107-ia16-ldflags.patch 1787 BLAKE2B a265263de5ccb12df7224343daba5d43786d7f522ae071057105e710d9cfab384a7020c0cdbb305f9da57ecf5ed8ae745ebf115f3cd0b370962e7054dc6690dc SHA512 53fe8b40bc57a2459dcd16d3fba9d81d1cdab498232afe0c19f612737861f88b2f98c584d4fa1a4548e273a38fc17d254f890a64f3112cb0433d7679e7afcdb3
AUX dosemu-1.4.1_pre20130107-lto.patch 921 BLAKE2B 6b36f4e5502fb8b8202ab4396e6c9394d073a88843f3ad67d49bfc02130e6f15f793019e2532b98836975467951d6cf50b008b6401292d9495d55992f636b2fb SHA512 f8b2326abdff86b41e8125e9df242c08834c9f4d28c42ac90b45b409806fc9d453c951d22c2f61d5069844d6f0743600df42ca45d98e103798fbffc28485a0d5
+AUX dosemu-1.4.1_pre20130107-nm.patch 1491 BLAKE2B b4a493a882ee82b5e8ae9ba9397b8bcaaff9b77cd585cfcb65af77125231538a993c6303da0271087da9048e3f3e5865ca8abb5c0738a6838252a21e14267ff8 SHA512 ce33f6cc1ba9e1e0ed9947098a8ee6740efe3aae3b7b129f55bac6e41519dc2ac46059e6164faaeee139c890924ee4bb5b382f4453d80a68c5add611f3179b23
AUX dosemu-1.4.1_pre20130107-no-glibc.patch 559 BLAKE2B 93ba50a5acda4b0b556e5393c34babe0b9172a8c9c1b168432f454ff120673496d279496d76821eda49886aaa998244bd411d4db6b465517712c4f6683d2850d SHA512 c53e3f7ed1b7a74e1112ea5507d0912ef1d16ff657aa5a03132f6b4c35ddb638ecde40ef554254f429316ffd74fc2d8afb59548d97547eeed231c80c0c057eed
DIST dosemu-1.4.1_pre20130107.zip 2767256 BLAKE2B 068c38108257b83d046682d4e9bda6f2da84195cff3aa5eb73764e88ba48bd415a6af9fa1b57059dee12ddd75b379df730fe6957014b554cc13b12ac029eed8d SHA512 eb8dcb914a74b235f2b37ff4dd5c1c84b4916ff195c7bf76cdbe6a4d5e6247c57297eef0c579f219ff7f475e727d66fa5a0f314da46d79cc97a0d794e9ad5864
DIST dosemu-freedos-1.0-bin.tgz 1205628 BLAKE2B e88a23b14cf1ccccb4f648b3c3af39330d8af29940e228b951cc7e48595f9838236066b67f841328e75ee7aee18f9e7814ea33382bb48902ca7947806b646852 SHA512 d0c4235ceac55de63ce5f72e51b7d57a82b8104f4bf2df6f4dc25c9889d3337b40d75665c2dfc98492ec7123e0959a725f5c7579e145895024bd80a07036e3bd
-EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 2955 BLAKE2B e7685142e60dc5556ded4f452802bdea49ad52e3bb5aa1e45b31cb074ce8d3cf9d354002ab646ebb1d4e420af9284016733bb9e66ded3911797eb6be4c928b5e SHA512 6221a00a8d3663fbc1ba2839a63ffc9f923cc8f150428b76805089a6e81ed3fab85940dd2435bc437704c38b1d5c8dafb35bde48ab67186083228dd70a0841c6
+EBUILD dosemu-1.4.1_pre20130107-r5.ebuild 3114 BLAKE2B 5dae907f386553ba268787d3b937fbd12e5f2e7a74bbfaff31617f18c50f75fc101b5e794554db068f4ad14f0cadd42871165a8b99dd2877d032fdb96dbf10e5 SHA512 cd3cad9ee92d866e473513841c2cb82efc2bb6772d202392a83950441fc526c3155d5a72d89332cc6772e8a9e699c7b8deae51e1f462cba806aa3f7de1f21c2a
MISC metadata.xml 432 BLAKE2B 06cd4821f41961fdcf266bb1175ee118cd181d17c3b38508e2a30dbbfab9e5cb02608e2b8e5af905abc24718d410a24d112c073fd6ee460b33d904c975358a61 SHA512 da0538836dc326d714141ab6c7b9f00bc1604fa5b51df7d9d548a8e3d889072b3ee8890a25705e2a7c2c1c31645c0b9af85ce6a2d1e4aa142a4d83a08fd6f9d8
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
index 61a15bd1f53c..409834bb73d2 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r5.ebuild
@@ -56,6 +56,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-inline.patch
"${FILESDIR}"/${P}-lto.patch
"${FILESDIR}"/${P}-as.patch
+ "${FILESDIR}"/${P}-nm.patch
)
pkg_pretend() {
@@ -90,6 +91,8 @@ src_configure() {
fi
# sndfile support is unconditionally disabled in src/plugin/sndfile/snd_o_wav.c
+ # CPP has to be set explicitly to workaround autoconf-2.69
+ # CPP detection (fixed in 2.70). bug #762748.
econf $(use_with X x) \
$(use_with svga svgalib) \
$(use_enable debug) \
@@ -100,11 +103,12 @@ src_configure() {
--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
--sysconfdir="${EPREFIX}"/etc/dosemu/ \
--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
- IA16_LDFLAGS_EXTRA=${nopie_flag}
+ IA16_LDFLAGS_EXTRA=${nopie_flag} \
+ CPP="$(tc-getCPP)"
}
src_compile() {
- # src/makefile.common is fritten manually, uses AR=ar
+ # src/makefile.common is written manually, uses AR=ar
emake AR=$(tc-getAR)
}
diff --git a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch
new file mode 100644
index 000000000000..73bfd9dfbc5b
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-nm.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/762778
+--- a/Makefile.conf.in
++++ b/Makefile.conf.in
+@@ -82,6 +82,8 @@ REQUIRED:=@REQUIRED@
+ OS=@CONFIG_HOST@
+ RANLIB:=@RANLIB@
+
++NM:=@NM@
++
+ @ASPI_SUPPORT@
+ @USE_DL_PLUGINS@
+ @USE_APBUILD@
+--- a/configure.ac
++++ b/configure.ac
+@@ -39,6 +39,7 @@ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++AC_CHECK_TOOL(NM, nm)
+ dnl The bison problem
+ if test -z "`echo $YACC | grep bison`" ; then
+ AC_MSG_WARN( )
+--- a/src/arch/linux/Makefile.main
++++ b/src/arch/linux/Makefile.main
+@@ -80,7 +80,7 @@ emu.o: emu.c
+ $(BINPATH)/bin/$(DOSBIN): emu.o $(LIBS_)
+ $(LD) $(ALL_LDFLAGS) $(DOSBIN_LDFLAGS) -o $@ emu.o \
+ -Wl,--whole-archive $(LIBS_) -Wl,--no-whole-archive $(LIBS)
+- @nm $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
++ @$(NM) $(BINPATH)/bin/$(DOSBIN) | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)' | \
+ sort > $(BINPATH)/bin/dosemu.map
+ @ln -sf $(DOSBIN) $(BINPATH)/bin/dos
+ ifdef X_SUPPORT
+--- a/src/plugin/term/Makefile
++++ b/src/plugin/term/Makefile
+@@ -33,7 +33,7 @@ SLANGLIB:=`relaytool --partial-map partial.map --relay slang \
+ libslang.so.1-UTF8 libslang-utf8.so.1 libslang.so.1 $(SLANGLIB)`
+
+ partial.map: $(OBJS)
+- nm $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
++ $(NM) $(OBJS) | LC_ALL=C grep SL | LC_ALL=C sort | LC_ALL=C uniq | \
+ LC_ALL=C sed -e 's/ *U \(SL[^_]*_[a-z0-9].*\)/F \1/' \
+ -e 's/ *U \(SL[^_]*_[A-Z0-9].*\)/V \1/' > $@
+ echo 'F SLsmg_write_nwchars' >> $@
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index d12bbbff77f1..c479d3261fdf 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -5,7 +5,9 @@ AUX free42-2.5.3-fix-build-intel-lib.patch 758 BLAKE2B 800005751f0cbe9e89ffe94d5
DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
DIST free42-nologo-2.5.20.tgz 7414358 BLAKE2B f1e0963e6a808121efc4d9bd82863d8c7898f65504d4c59f6a6beadc0c4e5c1335ce4c65d25550a3f4d5c080e1933ad30f6325661af4a513f69941c48adda1a5 SHA512 04a01f29ed5a3c9374de98ead6c54191dbde6b0e3d9923b5c89f18f868630b50235711820e751e4a1e3efc0600b1a7a105e8800f660d67124458a8f2826c840f
DIST free42-nologo-2.5.21.tgz 7416422 BLAKE2B e86d24a9d2a1fb10e2e1ed0ec9abb43fa5bab3717432402968682ac7e18b27ea0876c72466942220d234d720fc76cd239bafa993d1aba21ab845be26b53d3132 SHA512 25cec0ca7c5b9271de3d6ebf6254dbf54c6127b958e19a0c5b824c3aeffe0c84edfb6dd75eef8930c7db15c46c052bf01cdb06b0c60ac7cd2272492fe4016924
+DIST free42-nologo-2.5.22.tgz 7418457 BLAKE2B 18086ef181d846291b9f8762c9c293997e3d61e92a80e5556c41b7a777c4324151b0662d6b8a79e9b191b83312c97e46691e90577eed276ea315a12d73c5a5d4 SHA512 16c7cfb44f0fac12e3516b065f085af884b2652af9c1acb61251c8ede5c45b34f65bc8a3e53f0aa685ff5e1a74c7a17d9c8f76bc89537d790f878d8924a1080c
EBUILD free42-2.0.20.ebuild 947 BLAKE2B 24fb1ce5c86a3dca83f459cb992aa238c3f25848be5ff00b505956d8118ecf0c0574b9647df02821f20ab47c0f8505f2c89dff9951b9b7307b114e5351cea715 SHA512 cce77ea9b6e4e5367f147091eb70cbf4e980885343510d424cba9fa8265ab0087cdaacd3f49673979fc4256219201bd9fda281a992d7bd7ea898111ae3b160d5
EBUILD free42-2.5.20.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
EBUILD free42-2.5.21.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
+EBUILD free42-2.5.22.ebuild 990 BLAKE2B ae4c5c831b2c5555cf9254366a74899eba2c737d79bbeeeea8c401672047ea99f214bd594ae49022961b51251f19f90731781efe4a02d4922297534cacda889b SHA512 10f30a591d3dc75f170b5dd0ffd8a41eccfbe3f2ee61883090a17d6f90536b0326fa9c5e64399be978646238a6218e14994bd3ae353837fbea03383dfe39b32f
MISC metadata.xml 345 BLAKE2B 2693f9fd6f59806e57f9691b8b77ec0979e3ee819866bc1d9e3b3f311995a0b1fb7ae00a23b50f603064e1d35215fdd8fa6eb715fc83cd613eb828fd87f78eb2 SHA512 afbf038baa3610520f7d9b63b54acc98552b16241bf3f7efebe4048b572bf65098c74896647eed4611c29444f7d16914233744f08069468eededf34ba7a5d758
diff --git a/app-emulation/free42/free42-2.5.22.ebuild b/app-emulation/free42/free42-2.5.22.ebuild
new file mode 100644
index 000000000000..bd3148a0b387
--- /dev/null
+++ b/app-emulation/free42/free42-2.5.22.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="https://thomasokken.com/free42/"
+SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa"
+
+DEPEND="dev-libs/atk
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( CREDITS HISTORY README )
+S="${WORKDIR}/${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.16-fix-makefile.patch"
+ "${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
+)
+
+src_prepare() {
+ default
+}
+
+src_compile() {
+ local myconf
+ use alsa && myconf="AUDIO_ALSA=yes"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
+ emake -C gtk clean
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
+}
+
+src_install() {
+ default
+ dobin gtk/free42bin gtk/free42dec
+}
diff --git a/app-emulation/libpod/Manifest b/app-emulation/libpod/Manifest
index 37d0d9894db2..6b7cfe792e66 100644
--- a/app-emulation/libpod/Manifest
+++ b/app-emulation/libpod/Manifest
@@ -1,5 +1,7 @@
AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
DIST podman-2.1.0.tar.gz 9444707 BLAKE2B 62dacd316a8d6ae8aab0523338d818c69cf1228120e828a89301c9fdbb98082b85328c03c61f9f2a36c7a50105ce5fd025ad2b0e9ba2705c86b0d7e263fc92a6 SHA512 eb9b0cb184138af022e6d8e145fc6c4188c75c0695e0c6e62d54112a6b143424dd0caf9686f83637d08ff1fdbc24afca564c89f8cb4ab68b8f8d07345856398e
+DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367
EBUILD libpod-2.1.0.ebuild 4448 BLAKE2B 8fe2d70f01eb523fca83759bfe089736ee771dd9a40d0988a2635160b93e2358a713bf379c539152df4f8c8018c894f5e712d5d11214aad6ebfa815d02eaeee7 SHA512 7a646fb9ff678f49cd5ec0efd3cf2016f8e8a9c3cd467798cba9138e8f4669d2b1d49bf2fd9d6de855e88feb0599bccca2e30f5651dce6a25d350b092b01f57e
+EBUILD libpod-2.2.1.ebuild 4586 BLAKE2B d4336e52bb51f2a1e04720a1bb66a58b4f1d07396be19b278854f1438db0153a203fd7778256ce722b14ea558559b61a302aed34b3c5cdc184b3740ce5e87db0 SHA512 68c19e424528a23dcf60def1baaeb4c60bf9fc311b6618e61388d1068d379ca99192aa74e20b59b9a88afad9fef4c79cb3b3380b69beb5346eb1f6f5516e57e6
MISC metadata.xml 999 BLAKE2B 4cc701468adb97983a347a94a76ad7966a54a5d4d5e3dcdae0a87e6bc81a45eac46ff120c576d16ea1f8145d6ab86b51b3671d9baa35945d4f104a7f8237854e SHA512 679b1a932037e7f7d209e7f6485dac8c3f2cd7be161fd342dc8158567f03c5692e487d23de4dda62c4ff629c96f0e2ea715dd9c8523e457b090bae5824bd3646
diff --git a/app-emulation/libpod/libpod-2.2.1.ebuild b/app-emulation/libpod/libpod-2.2.1.ebuild
new file mode 100644
index 000000000000..fc16a6b258ee
--- /dev/null
+++ b/app-emulation/libpod/libpod-2.2.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="d8868746fd3f45b9bfd79e37bf2aa0c7103245fd"
+
+inherit bash-completion-r1 flag-o-matic go-module
+
+DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
+HOMEPAGE="https://github.com/containers/podman/"
+MY_PN=podman
+MY_P=${MY_PN}-${PV}
+SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm64"
+IUSE="apparmor btrfs +fuse +rootless selinux"
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-crypt/gpgme:=
+ >=app-emulation/conmon-2.0.0
+ || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
+ dev-libs/libassuan:=
+ dev-libs/libgpg-error:=
+ >=net-misc/cni-plugins-0.8.6
+ sys-fs/lvm2
+ sys-libs/libseccomp:=
+
+ apparmor? ( sys-libs/libapparmor )
+ btrfs? ( sys-fs/btrfs-progs )
+ rootless? ( app-emulation/slirp4netns )
+ selinux? ( sys-libs/libselinux:= )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ dev-go/go-md2man"
+RDEPEND="${COMMON_DEPEND}
+ fuse? ( sys-fs/fuse-overlayfs )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ # Disable installation of python modules here, since those are
+ # installed by separate ebuilds.
+ local makefile_sed_args=(
+ -e '/^GIT_.*/d'
+ -e 's/$(GO) build/$(GO) build -v -work -x/'
+ -e 's/^\(install:.*\) install\.python$/\1/'
+ -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
+ )
+
+ has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
+
+ sed "${makefile_sed_args[@]}" -i Makefile || die
+
+ sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
+ -i hack/get_release_info.sh || die
+}
+
+src_compile() {
+ # Filter unsupported linker flags
+ filter-flags '-Wl,*'
+
+ [[ -f hack/apparmor_tag.sh ]] || die
+ if use apparmor; then
+ echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
+ fi
+
+ [[ -f hack/btrfs_installed_tag.sh ]] || die
+ if use btrfs; then
+ echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
+ else
+ echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
+ hack/btrfs_installed_tag.sh || die
+ fi
+
+ [[ -f hack/selinux_tag.sh ]] || die
+ if use selinux; then
+ echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
+ else
+ echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
+ fi
+
+ # Avoid this error when generating pkg/varlink/iopodman.go:
+ # cannot find package "github.com/varlink/go/varlink/idl"
+ mkdir -p _output || die
+ ln -snf ../vendor _output/src || die
+ GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
+ rm _output/src || die
+
+ export -n GOCACHE GOPATH XDG_CACHE_HOME
+ GOBIN="${S}/bin" \
+ emake all \
+ GIT_BRANCH=master \
+ GIT_BRANCH_CLEAN=master \
+ COMMIT_NO="${EGIT_COMMIT}" \
+ GIT_COMMIT="${EGIT_COMMIT}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+ insinto /etc/containers
+ newins test/registries.conf registries.conf.example
+ newins test/policy.json policy.json.example
+
+ insinto /usr/share/containers
+ doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
+
+ newinitd "${FILESDIR}"/podman.initd podman
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/podman.logrotated" podman
+
+ dobashcomp completions/bash/*
+
+ insinto /usr/share/zsh/site-functions
+ doins completions/zsh/*
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins completions/fish/*
+
+ keepdir /var/lib/containers
+}
+
+pkg_preinst() {
+ LIBPOD_ROOTLESS_UPGRADE=false
+ if use rootless; then
+ has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+ fi
+}
+
+pkg_postinst() {
+ local want_newline=false
+ if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
+ elog "You need to create the following config files:"
+ elog "/etc/containers/registries.conf"
+ elog "/etc/containers/policy.json"
+ elog "To copy over default examples, use:"
+ elog "cp /etc/containers/registries.conf{.example,}"
+ elog "cp /etc/containers/policy.json{.example,}"
+ want_newline=true
+ fi
+ if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+ ${want_newline} && elog ""
+ elog "For rootless operation, you need to configure subuid/subgid"
+ elog "for user running podman. In case subuid/subgid has only been"
+ elog "configured for root, run:"
+ elog "usermod --add-subuids 1065536-1131071 <user>"
+ elog "usermod --add-subgids 1065536-1131071 <user>"
+ want_newline=true
+ fi
+}
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 7b41f41a1c7e..75067070a15e 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -3,15 +3,10 @@ AUX qemu-ga-systemd.udev 130 BLAKE2B 3bd450476eb4e7b31e3c21a231b83219def32481110
AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a6138bf23aaf9a7b36604a651107236f9cb08fb44b3a055b5bc01b34243dadd6dc6dde8c0478bdaa38f SHA512 c339ddad3e94e1cd009d9f6819b7fbaddda0c8d5ad7736704cdf8efd0f802df9b905c3529ecd2a1e5831bc8e9e6e7be94ac816097f97c92deb6a3816328dba39
AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
-AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
AUX qemu-guest-agent-4.2.0-fix-shutdown.patch 515 BLAKE2B b70f9f67464b91042ced22a2e3e9712c62d51d5f7bb2a6e1579f44efbf877a0e4accf1b6af0e7f87cedc05bc3059ff5318524f9d00e7c513147b4d24348d6724 SHA512 d286c115f7be53f5de35068c6f2925323dde7f034f32c9e993929111591068236e21c9d85b1e9b727077f38a773b978b71a6a851dd1ff8f3b4a9d32b9b9f333a
AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd37218f8e61d5a2e245ba3908f054891420c7626a8df7ecd0329edf1d11246d38e5591cb4530d63969134a34a5065c5ef041004b4 SHA512 41cb67cb02cf5a8eb5a5b929e2a6adcb6dfe376d6ea512d404edf18d0ca85fbec93140f83ee5d8f4980095fc46040cfd27b22f378cc61dcd6e147badd8b1a045
-DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
-DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
-EBUILD qemu-guest-agent-3.1.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
-EBUILD qemu-guest-agent-4.0.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1784 BLAKE2B 31524abc404888ac6a08708965573ce2bf49493b5e3d2696ee2ee6b324ce1a194f8946477294111f1c3248d4400b4b57cefde0073a61737ddd43a658dc8065f9 SHA512 42b9bfcaa90a650806cbbfd1a7694563a09a503ba731766f60bdf5601d4f44fbc838729846328e2dc8563a8dce101d35d34c6dc9c082622927b16a36be4200fe
EBUILD qemu-guest-agent-5.0.0.ebuild 1786 BLAKE2B ddbd42e2d0e941a8456c0e1fa2c5bed62cf7c213fb5f8bc919f3f18e76837f581deb287914343ef76b6a7de9c90f5eb751bf8803cbb4e92de8e34ad447fb7c52 SHA512 9cb8eb0748c02590f220b8e08048db96c1c1fb4a6f3ef2dde8c18e09a691f0a4298944f1cb979a27fa4f38a82e60a0434bc167c20b61a5d353eb6951b9352e10
MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch b/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
deleted file mode 100644
index 4d5690c59ae4..000000000000
--- a/app-emulation/qemu-guest-agent/files/qemu-guest-agent-2.5.0-sysmacros.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/580924
-
-Linux C libs are moving away from implicit header pollution with sys/types.h
-
---- a/include/qemu/osdep.h
-+++ b/include/qemu/osdep.h
-@@ -78,6 +78,10 @@ extern int daemon(int, int);
- #include <assert.h>
- #include <signal.h>
-
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
-+
- #ifdef __OpenBSD__
- #include <sys/signal.h>
- #endif
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
deleted file mode 100644
index bef260b3de02..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd toolchain-funcs udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
- tc-export AR LD OBJCOPY RANLIB
-
- local myconf=(
- --prefix=/usr
- --sysconfdir=/etc
- --libdir="/usr/$(get_libdir)"
- --localstatedir=/
- --disable-bsd-user
- --disable-linux-user
- --disable-system
- --disable-strip
- --disable-tools
- --disable-werror
- --enable-guest-agent
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- )
- echo "./configure ${myconf[*]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
- emake V=1 qemu-ga
-}
-
-src_install() {
- dobin qemu-ga
-
- # Normal init stuff
- newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
- newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
- # systemd stuff
- udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
- systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
- qemu-guest-agent.service
-}
-
-pkg_postinst() {
- elog "You should add 'qemu-guest-agent' to the default runlevel."
- elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
deleted file mode 100644
index bef260b3de02..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils systemd toolchain-funcs udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
- tc-export AR LD OBJCOPY RANLIB
-
- local myconf=(
- --prefix=/usr
- --sysconfdir=/etc
- --libdir="/usr/$(get_libdir)"
- --localstatedir=/
- --disable-bsd-user
- --disable-linux-user
- --disable-system
- --disable-strip
- --disable-tools
- --disable-werror
- --enable-guest-agent
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- )
- echo "./configure ${myconf[*]}"
- ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
- emake V=1 qemu-ga
-}
-
-src_install() {
- dobin qemu-ga
-
- # Normal init stuff
- newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
- newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
- # systemd stuff
- udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
- systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
- qemu-guest-agent.service
-}
-
-pkg_postinst() {
- elog "You should add 'qemu-guest-agent' to the default runlevel."
- elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 495741daa4ad..04e38bdd4026 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,7 +14,7 @@ AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5
DIST qemu-5.1.0.tar.xz 62911540 BLAKE2B 6a3ecbda2d9274f2736ffbc88d2006be31f153e7687e1425c1a297975f0e828cd2eafc11d11b589991acda87a489dd256ccf5a8947f91bb9431e515e979d8f29 SHA512 e213edb71d93d5167ddce7546220ecb7b52a7778586a4f476f65bd1e510c9cfc6d1876238a7b501d9cc3fd31cc2ae4b7fb9e753bc3f12cc17cd16dfce2a96ba3
DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
EBUILD qemu-5.1.0-r2.ebuild 25362 BLAKE2B fb87a664b35972a7da2ad8bf73c0f67051cbd0bec154cf3f74d9e6f4339f833aded63323799982a5ae34e05daee981a3511112320572635beeb953838677e732 SHA512 f25ce8c1fe9ad7d6e098bfff7e94ce49b0cc2c00d25997bb33f22763c1ba5fb6ae4be9149187be9493c82d9329b620298a271bfc3bb5e154493fa4c006ee5545
-EBUILD qemu-5.1.0-r3.ebuild 25438 BLAKE2B a023caadb2b30e53d68e661ecfa780a88eb2d35bd34d76f88705618e723051fe03c7d86a3be98ed66d7c5f4149c10828bbd738aeeeb1af0faad87e24a78f90c0 SHA512 566da034ace7591f735a3943c81c7e47c28c42ab73f3eaa432418e1bcb6f7eff43b5d9378f7fa3a1815716bb3011bbd98938024c04526829c8374ae9e1c18ab4
+EBUILD qemu-5.1.0-r3.ebuild 25437 BLAKE2B aeaefc91ac2a3e0c8e6efefb9aa3be98b017c5957e56955755d71acd47b0b9eb12447f9ae0f9454a7057fe1b5a7944ce8e11e278eff9ab3ee460eb37aba9cd93 SHA512 a7e394010c778f367ff6898c8dfc5ef0b45f48003bcd5f43c1cdb34eb65446a6078345083a450ed752326c238821e3e1e3f75f82efeff4029f3b80ccd164569b
EBUILD qemu-5.2.0-r1.ebuild 25150 BLAKE2B a99105b89fc0b6dd01681c7c64927d138ca49224b8bcc0939d56b710d527b96375b094cd6ff73ff71d567ae65704ac537b36ee8688ab40da21b0593c0bd61c0e SHA512 153f82f7988c248d4c3f74af35ee20ce8948f0862db711c002e0890ba2fb949cfeef0165456bb50347dd85b9f5f341ec963aba22d2ed880afc11ed4f2b4b091e
EBUILD qemu-9999.ebuild 25054 BLAKE2B ebf3e591a99bdbf91b8c600a09946542eddf14edf179c224ca0f9db842ffeae1033b8fef9ece14b8d03216b729bd71583e72e6071276e903f9364d55fd610050 SHA512 00ce262e208a39c34888767be788979cadbcd6d46056440e3c6f146d03bd987c793410757ae862597974b38ab0a28515a2b819b6ebb72e7a170284a28590c5ec
MISC metadata.xml 4458 BLAKE2B 521a9c7b7c3371ca4352decbaf2324ef22822a176bf22b4f26761dfc40535cb4a6d6438f39ae6803804fdac8891bd2ded0f972279eec9076b80803826946f954 SHA512 9ba9e2805b6fa423fad3da849f57fdc328e8d6276a0a3d15a8970fc117d8174a76a20be96cf9eaa2a92149de922aa0c9b807cd4f2412f335375088dc32a79b61
diff --git a/app-emulation/qemu/qemu-5.1.0-r3.ebuild b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
index a0db186f9839..edc4ce863840 100644
--- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/sen/Manifest b/app-emulation/sen/Manifest
index 1d58fa8778b9..e72918d41836 100644
--- a/app-emulation/sen/Manifest
+++ b/app-emulation/sen/Manifest
@@ -1,7 +1,3 @@
-DIST sen-0.6.0.tar.gz 55113 BLAKE2B 5f6affbea94005c0adc9ac544d40d94cd9a9eca930b979c19174d21d73fdd887d21802a5241c02ba212a45c4a7873f22c7372aeb69955e1f97e444ef74d91929 SHA512 5573a0d6da5ae395e947bf34c54313e4e3a0251dc1868c52bbfe9ad11463397da83a0c9ac3f1912da2e6f49341c84d40dcab900d41b4a32ebac44d1dde3ac82b
-DIST sen-0.6.1.tar.gz 55357 BLAKE2B 0d58f0ea11eeff29161925018425c918b3260c754d1b658e2ebd3c88e0c371feb0f1815af61979206bee529c369a90ace895d25e645ef0d76c563abd8b74c943 SHA512 2f1cadf745ca7e12d3e92534e76984072b9678055b9911f76b1a6d3cbd43266ad1eeb4d5e7bb8742db91c4da4aef684fa644c33de6fa2494c37688e9747e0efa
DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
-EBUILD sen-0.6.0.ebuild 775 BLAKE2B 5af2c1f181c39ebe4f7cc6be83d7855d3461bf5f6ae0d16a09c230e8cc7d7e892276e3157e1eac2d0f7287c1c3cbb21c0ebe6511bc0562199e03d49121497bc9 SHA512 d1926d9d2ab2155e7911907679d99a673d945730dca5d72c6db7a7b2222a664b06aba39a54aacba99c391308ec28694e2e62e67eb33985bf7213bfabc95be3a5
-EBUILD sen-0.6.1.ebuild 775 BLAKE2B fdfb833510d89cfbf124f48818e7367019cb1bab65d6085a85c4cab4d83609eeb054ad2b417659de841a941ad4c6215a3e8c3bfe15769fb2667f28093e47865d SHA512 b0f3702fa096d00e058ac1a541ce5c0ff7e17c8b30199972ad41102daea5936da86dac496d54b2a1625176b29ec9fb3a41e3e1529b9ac46880e32fe54f48b1ef
EBUILD sen-0.6.1_p20200905.ebuild 930 BLAKE2B 4d5c2bb3eac1a04f1edf68715402b3c1063f14b134a9664cdde6bbb1cf3840027fa1975886ea20806d7c9e2e95064cc93a52f6189404423399a7813fe5bc4565 SHA512 884a86533f966b1296cc311e91e7f4415d399362e443e62b3abcc016a5866bab40aaae002c8654a001cc89f26cf05ce1818b9deae5864525aa9aceff812c1362
MISC metadata.xml 598 BLAKE2B 56052c4b881e934c97af30666df9f8364a2fad98fb855122fe22dda5f7b722c642d71440db2a483ee1b0f6afdb20ded677fb3b82ac6e88c8c2f66651e1db2298 SHA512 71e37148c40ccfce6fa1fa80632dd1143eb0462971b7758b724924ffd9739f81c7b341388b22b7b5f0862b266b83bb4adf6ceb95f0997efc4f7f3bd4a8f92910
diff --git a/app-emulation/sen/sen-0.6.0.ebuild b/app-emulation/sen/sen-0.6.0.ebuild
deleted file mode 100644
index 6a712924ffc1..000000000000
--- a/app-emulation/sen/sen-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/urwidtrees[${PYTHON_USEDEP}]
- dev-python/docker-py[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/flexmock[${PYTHON_USEDEP}]
- )
- "
-
-python_install_all() {
- distutils-r1_python_install_all
- dodoc -r docs
-}
-
-python_test() {
- pytest -vv tests || die "pytest failed"
-}
diff --git a/app-emulation/sen/sen-0.6.1.ebuild b/app-emulation/sen/sen-0.6.1.ebuild
deleted file mode 100644
index 4bad3d1cae6d..000000000000
--- a/app-emulation/sen/sen-0.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Terminal User Interface for docker engine"
-HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
- dev-python/urwidtrees[${PYTHON_USEDEP}]
- dev-python/docker-py[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/flexmock[${PYTHON_USEDEP}]
- )
- "
-
-python_install_all() {
- distutils-r1_python_install_all
- dodoc -r docs
-}
-
-python_test() {
- pytest -vv tests || die "pytest failed"
-}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 0c848e272917..0cc41fe424c7 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,3 +1,5 @@
DIST slirp4netns-1.1.4.tar.gz 55346 BLAKE2B 86716ec9f42ae0087e9e7d142683f53b986275bce20b5ab0a33d0cdd63778adfeeadc86e5abb52d4a7e3e89baa0440c1a99bde920eeb2ed5293046e451d8ad01 SHA512 a6a26c55bdd4f50e668f7feeee3cd1d077e1ca9bd5bad5bbb8c47b15d366af4b1f2900241bedcd5a974a7597f43b17f970662271ec1987fbb6291c50470fa0a8
+DIST slirp4netns-1.1.8.tar.gz 58022 BLAKE2B cb65af6a5298411c158dd3da8160f8e4999ce5cb6bafc85f233d4d64a58c545ff7e9db21501f718ce7990d2497a6960853ecb9ff548859b1be19f3d74e86610b SHA512 28b2dd73cfd0a0fc71338c55a7f4ae448456620a0d27eb1e7c79f2d58da2a90f2f9af363c9abf5148d4d6435f69ea26809e5f20721fec5daf4c9897bb29c3547
EBUILD slirp4netns-1.1.4.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
+EBUILD slirp4netns-1.1.8.ebuild 949 BLAKE2B 386ac222a7ddb0ed2d4ab6f90674904d0e97ad548034a73dae4a5e695378968bab976675cf910bcdcd26c2fdec28bb297eb3a408a06b3d3c1e0f266e6a815eff SHA512 5404cd12a3bdbc88a23ccd5f5769345f70e40f9fd68ca4c44278447eb35c0d5eab8307c0f70cd33e2b94fd43553fe0f3f181ba0ebc213970a06497595a7202b9
MISC metadata.xml 459 BLAKE2B e33a3af85acb845c8dde439efb0cc6cc87f5fb04e17d67af393a06f8b4b44242c434f3fae231118d2233c45ad733dcbeed3ed273fd4f66ff70292c39e5ad11ef SHA512 012156833690e44656fae463045a5559e564959904436adcac0af92bae8867c71bb7c24fa0fc416da890b0bad4d53e29a9b6d354b81e673e16d8b1956e9a0d04
diff --git a/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild b/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild
new file mode 100644
index 000000000000..ab7c659fa363
--- /dev/null
+++ b/app-emulation/slirp4netns/slirp4netns-1.1.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="User-mode networking for unprivileged network namespaces"
+HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
+SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm64"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libpcre:=
+ net-libs/libslirp:=
+ sys-libs/libseccomp:=
+ sys-libs/libcap:="
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RESTRICT="test"
+
+src_prepare() {
+ # Respect AR variable for bug 722162.
+ sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+ -i configure.ac || die
+ eautoreconf
+ default
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You need to have the tun kernel module loaded in order to have"
+ elog "slirp4netns working"
+ fi
+}
diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest
index 611b0cece333..ba4d56cd9b4c 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,7 +1,7 @@
DIST virt-what-1.18.tar.gz 173703 BLAKE2B c1ab6f331ca370572cedef06fd3eb9177ca8ef4302446eb46c737446a001e77a0825ec8771aade903e6194af3f4f745c3f35f1d9dbbb8a0550b493296878ade3 SHA512 8085a38111d5664f411f5bb9d2ee221bc22e5b0f2d993e8d518718b3f63b16ba73e052b1623c090493cf8fef52fd237ba823377503a32b4b7d03cc5380d5c613
DIST virt-what-1.19.tar.gz 183594 BLAKE2B 36b58cbe41f195cf81e0b0cf35ab881c3746ac352c57f470e1fe0005d65534f38886d7688ee9393837e667fd1c8bf41af013f3a12748db5f8615b9b5c944f7a9 SHA512 7b6e6c00e3f35cea236cc5f5fdf28d13e9e38143f280dfcbf083ebf0dca2cb677752b8daec5b2956a08405d1fe5368f9f633ce11a854928c31121a35ee4c6820
DIST virt-what-1.20.tar.gz 459243 BLAKE2B c51bfc4366ba90e32548a5d1e0779fcc1835dae7a6bb2b6f67b4371c2d2e949339aa0ff67d64485cdb03592713a3ae04a6779e4dac0babf08bb268ce6403066f SHA512 edf74903122bfb422c7a5ecba711bb64d6ef668828f208dfc0571ef14f2643456c14bc9a77dfea209df3d93869ac0a2c9fd039779922eddc6ebd9d988585dea4
-EBUILD virt-what-1.18.ebuild 609 BLAKE2B c2e183482354a5623ee7ac84a0f50d36d80065f1f803a9086e687f16416be6f1b62482d67d99890f2f1f61c371f6053b03eb2eb71c099c309a049474494aa57b SHA512 56ee0708fa083bee61d82106227238cbce18027557b75ffed68fdaecf47f6cafe84766a03f0c55d0ed7060af90b929cd6fa80453ff355adb2f5f00e70dffa7ed
+EBUILD virt-what-1.18.ebuild 610 BLAKE2B 8e8cacd1b74212ef1aada2102323f86b74ae8c15da54be191757f57182042f2a98c380ed4dd956ecfb61e97c7798570ecf0aa5b83ac4831e3f8a8cdffe18c545 SHA512 b47766c54839bce195ab5e19ff653e2d50d0c920710939fb6fac807a28ad3469ea9da6b9e89ec686106b40ab13317eb53923ed2e1c2c6088a7d03f390f87fd70
EBUILD virt-what-1.19.ebuild 613 BLAKE2B 7ca204c642e7d587100829db36311d0c1711dcfcca0304c889eb21c2b6ff5049e6865cea646903659240c8689a23ae734d1e0021f817db4505502aa867b05905 SHA512 81f456788def5e4b3b5792b22f2e217aeb2c1cdf43bb3613d38e7df7a96e53e90fa3005e948a8023d90bf8a7a036cdfb1f00afb34d5c06e8e4b16b2a709ad3a9
EBUILD virt-what-1.20.ebuild 613 BLAKE2B dc561d0ac5a889d5884afc8d2e31793f7571cdd2f26395327e0390bbd3db277c880ae96fe5cc9cf99ea0d86292a9ba77cfb0cc7b7126eee316314156caca63d0 SHA512 8c64ded91856ef2c1246ea3e160f84f822e871c08a09c8e8242c654058bc644bc33225774abe536b264be0c386a615379c16cf91d6f2f89bb7ba072f04ac2619
MISC metadata.xml 463 BLAKE2B d2aeb047a6f3595cf1f064685fedb75876854c2361c084a909813d07fe7495882f9f6d400a896b3c67f578bae02fe89ec3cf8971478b15200a5486392e13b9d2 SHA512 85f83ce93888eb68982ce585aac6c29cfec62df4a5d76ac483d8946b0efe9dcabba271c7391aaa3c37247b228d06d21cb023efbcbd84cd48cf9733b918991b28
diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild
index 59adce2a2542..8001d3e820a0 100644
--- a/app-emulation/virt-what/virt-what-1.18.ebuild
+++ b/app-emulation/virt-what/virt-what-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 sparc x86"
IUSE="dmi"
DEPEND="dev-lang/perl"
diff --git a/app-emulation/x48/Manifest b/app-emulation/x48/Manifest
index e049aa31e8e3..bcbe19d2b15b 100644
--- a/app-emulation/x48/Manifest
+++ b/app-emulation/x48/Manifest
@@ -1,5 +1,5 @@
AUX x48-0.6.4-static.patch 317 BLAKE2B 0ba80504f6dfdb992735496198808445778d6f75ecd7d21f276801857efcbf5a6d215d081b8ea79031fe5fcadf2dc1875854f80f6003575d9e2be03c2f7cb21f SHA512 22c97b2236b78c148cab19386718ea0be333eef8ab356da20f80d7805fdae4e73a1552faab15bd86a4644e2b149a924f65ba57cba5bef8f740ecb69930e7b794
AUX x48-0.6.4-void_return.patch 657 BLAKE2B d72125691d4cabe90ea326f03204061ef3eca46e2b47cc43c91a67b3a994f8f995fbc313d368bbec1d3782d1aff46ff7064ebaf65f503efa28f0d468874f1256 SHA512 48d8fffff6f7a9727c813dbbc6332577d8d9f8622466af9658c135a2503a2b5b961f4c193cab3127352308716a9ab92bb6eb120897bdca9ae52482eacd12ac6e
DIST x48-0.6.4.tar.bz2 227991 BLAKE2B 8db2962860eeb161a8efc9d46730c71d95d0331157e3e2481a978385ad54b04b7a4eb601c68e7df966194b23e0cd04bed4e80511d22695bb7ccdd3959d8fd8d7 SHA512 60fdba1171a02e4a5f9bcefb29fff9398fdbda50553c3d3b952fab0b4ebf87b219d4615139ca3673b1c61ff6d6559aab3e93218334aa6cdb442d4861347138ce
-EBUILD x48-0.6.4-r2.ebuild 1659 BLAKE2B 0563a9afe94bc637528c92ed63968023877031529daa67e8cb5086ac1fb2fab124666278e95cec50a1ea0e9c75de408ab6626c9c79c9d6deac1ed3e58fb96b66 SHA512 ebf6faa4954df214b72082c0b22b34734ccac4a5909a6e6b0996ba1a05050e9c80d4dd9e756e2b8eddaf80877bc8aa948b4f8dc3e51acf5a29757669819f05ee
+EBUILD x48-0.6.4-r2.ebuild 1660 BLAKE2B 13cf2d17bae53b169509d6b6941b1600afe6a27336d1b22425f16105aa41bf07071dfd477a74503f1cef68debb3f28d2f7fdf01ad27b568330bfaab9534569c2 SHA512 52200cbfcf623c23cc4a703975ca1ce8f178b4aea06a461b4c87fd636ca483d7c22e05ce1d0e7e229f573cd4a425eba5fad92c544cbee9cecb762d31136a42f5
MISC metadata.xml 425 BLAKE2B 570bd59e39bc0f9cd7045b9fb6e6f938d2b8e36bde5b5717bcfa92ff3b4b7face5105a9c7e5694b42303f8f4a1711dc7b882f5a6b9dfa2d9e1c20021b1075ec1 SHA512 1acc742db15315ae35eb04c56b3425a8cb766f3a7d5c40651f8f2172987a1ceb2b5df516a506341c31a9b14981c7104ec3b618432b15d845a68f9b3332f7ec61
diff --git a/app-emulation/x48/x48-0.6.4-r2.ebuild b/app-emulation/x48/x48-0.6.4-r2.ebuild
index 9e603e25e582..74f99e360606 100644
--- a/app-emulation/x48/x48-0.6.4-r2.ebuild
+++ b/app-emulation/x48/x48-0.6.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/x48.berlios/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="readline"
RDEPEND="