gentoo resync : 12.07.2021

10 files changed, 68 insertions, 141 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8fe53755ba31..10bf13f4d087 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index d93647e4483d..17bea4ffffc2 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -2,7 +2,6 @@ AUX 18.4-add-support-for-package_upgrade.patch 1734 BLAKE2B 1eb4fd07bec989b1584e
 AUX 18.4-fix-filename-for-storing-locale.patch 1045 BLAKE2B 0167101d78f821fefc3d05447d3fe35d7328cdebcb3a0eebdaaf2f14b8e2f46efe7c0fb4031baa3a8600546a47f98641719112992c8e50cc1ab0181851937f81 SHA512 8a3b1bf35a445cbc7c3d4849c4c9ebd716209bc3b38bc060cd3b27b1b09749da8dcf35c8e0963300f7cc21f43fda96e5928f9f3c86c22a784cc60b840a1cc419
 AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c177de8e65369203e4d3b94de98126b85fca22ee4a89f9568c6081078b03dd4bb6cdcd07c51bc55b093e94092a06fd7eeec610ce22780f67 SHA512 8b82d0e565a9f8b4f6464382e01b79c95ad0ced600bf2ba1c6377eea704f86108cf68bc20c99f65e68c6b2d7a7ccc02624bfef400dd76990ef18f00f1e220f6c
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
-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
 AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9fa872cc1d148861be1d1fb0615a68e69c6acbec8173580590c8d2c5e50df44e067d3b8ea77dd0b23ef658837a2a317c98712f8b42e9a14398d4cfe996 SHA512 9d436f223dacfd018df4caf407b0da3de5e9cc1932d3aad56f455c664d2b9f3dc8ab40d8607f9ef4481ee778ae897717161d3cb1a7d4d99041585a00a97d8774
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
diff --git a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch b/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
deleted file mode 100644
index c840f4fde3eb..000000000000
--- a/app-emulation/cloud-init/files/cloud-init-20.1-gentoo-support-upstream-templates.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-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
-+++ b/config/cloud.cfg.tmpl
-@@ -134,7 +134,7 @@ cloud_final_modules:
- # (not accessible to handlers/transforms)
- system_info:
-    # This will affect which distro class gets used
--{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel", "suse", "ubuntu"] %}
-+{% if variant in ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "gentoo", "rhel", "suse", "ubuntu"] %}
-    distro: {{ variant }}
- {% else %}
-    # Unknown/fallback distro.
-@@ -172,7 +172,7 @@ system_info:
-          primary: http://ports.ubuntu.com/ubuntu-ports
-          security: http://ports.ubuntu.com/ubuntu-ports
-    ssh_svcname: ssh
--{% elif variant in ["amazon", "arch", "centos", "fedora", "rhel", "suse"] %}
-+{% elif variant in ["amazon", "arch", "centos", "fedora", "gentoo", "rhel", "suse"] %}
-    # Default user name + that default users groups (if added/used)
-    default_user:
-      name: {{ variant }}
-@@ -180,6 +180,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 == "arch" %}
-      groups: [wheel, users]
- {% else %}
-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
-+++ b/tools/render-cloudcfg
-@@ -4,7 +4,7 @@ import argparse
- import os
- import sys
- 
--VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd", "rhel",
--            "suse", "ubuntu", "unknown"]
-+VARIANTS = ["amazon", "arch", "centos", "debian", "fedora", "freebsd",
-+            "gentoo", "rhel", "suse", "ubuntu", "unknown"]
- 
- if "avoid-pep8-E402-import-not-top-of-file":
-     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
--- 
-2.19.1
-
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 015ae8615f09..8853634eeaac 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -2,6 +2,6 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037
 DIST containerd-1.4.6.tar.gz 6266709 BLAKE2B 3187ff003da7c1d6023ff9516c7aa510de49ad1188750b9cb782feae638ef1c4c74834f62344324eec8983feb6e881013b56ceb112e91ca0995878b08f20d69f SHA512 4693e67d17a21fe9413add39173981f484c461c7e228b05a8a886052bc445617116808db6321a134bcfdf853f382a6f228e979669588a375b434d1425853b143
 DIST containerd-1.5.2.tar.gz 7667262 BLAKE2B 52f61a7d5a423e1e0fbada6084dacf1df49e3e16af034bd35914b35bed4d27f334f0b07e87681d1353eb7da05a301625326adc841be7a2900aea0640a0441f26 SHA512 e4f03e77f2d8f823680629efc8cf41db70a656edf46807dca69652e6500dc51b0ceb0fd174768a8a5069c8af3e78853c20d214d135e36d4f3559399894e2cdf1
 DIST containerd-man-1.5.2.tar.xz 7424 BLAKE2B 647e61a88c81ebb3087026adb0201b4a71c4e0fe763a37b8d146b3964d9d59aa47ea96d5c5069b7637251fe1fbe5ecc63d72a802673b526b5496d02b2ff5842c SHA512 32ac9e9a91bbea24bbdb63220efc6082bb5dd1db956b558942f5b3b9aa758b9c1c5e8a5eb5e3d950be6de25bc03b20d420a566ecdaa859a8e72e3e2564a9ab84
-EBUILD containerd-1.4.6.ebuild 1889 BLAKE2B e25f303304770b47a22814a28af0a1d6933f45ecb98e93f0d660b3788dec61cd2741c1ab36645765f8b6ab627aacb92146b5a199714cb40275668ab3204782b4 SHA512 d766c94f94782fd4354c46c1988936ec9e89fc8285ccf9e1b66ceb7e419bdabd8e9107b1c8be9e8d5603c3b1343a28ec67683151f9b6ab54ab14a95b68e2de26
-EBUILD containerd-1.5.2.ebuild 1753 BLAKE2B 0b373938a4b37d42aa0a98ef4e38b61269576eed4fdb437d9320962b4c5f7e6ea815be8f208b7e7dd4d00eb252b5f3635df82666335489e3aae8854901dff354 SHA512 6e261742c69d6db6b39c11a8830bc2843a8b98ecb9be14d1ef0f5c6c5bbdab78015fc538f6d45b348c73af1316f84b84a541f913514124176557537b356e7de9
+EBUILD containerd-1.4.6.ebuild 1957 BLAKE2B 37e70d8fb5f2f719762719547696196619185ad50c471d53123e8d85c5fefa5d66f7cfaa1b7eaba1ffed382e6b907057e82ebd755b19a47033e9f261f1d79b64 SHA512 65f9428b86d7ac0720e4354a0d200c15a7305d3042e99919bd773001efbaa4b413d8930a11137a7277584bbde7c8e0f6a1ce54eee4ec8a74639b97486a1a0bdf
+EBUILD containerd-1.5.2.ebuild 1821 BLAKE2B a2ec9993e78a72e2331a51087f6c6e727a5eb9b4a1168316b9c640424a182624feb0d918beeff2ceb707f4cd3356062ec73e66a809641be5db2e29d86fa9a124 SHA512 92f10036925446ad3bc9a90386c34bb96d3ccf52a1747a8c36e156e0f008beaff2f0d1c592288fbc6f9a1edb871d1b6f94bfc82aa9860ca060e02697c35cc0a7
 MISC metadata.xml 1143 BLAKE2B 2e3705605579b406365f0faca9238c1cfa1047ebbbe04686281d6b161aeb9bd947641116a755070fff9aa01dd8010ee36d570075a1ac7e87e29c727c2b06be7c SHA512 bddfb97b70466a3ff7442a1249708680b960456e6d1058dea59f09a34bcdf262c7b13430ec0fd3a16b0f060d48ffeda569c8ae4d9d9dbca93e4af2ee13ec1a1e
diff --git a/app-emulation/containerd/containerd-1.4.6.ebuild b/app-emulation/containerd/containerd-1.4.6.ebuild
index f0cb4195bf52..8e9b81b35d7d 100644
--- a/app-emulation/containerd/containerd-1.4.6.ebuild
+++ b/app-emulation/containerd/containerd-1.4.6.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	seccomp? ( sys-libs/libseccomp )
 "
 
+# recommended version of runc is found in script/setup/runc-version
 RDEPEND="
 	${DEPEND}
 	~app-emulation/runc-1.0.0_rc95
diff --git a/app-emulation/containerd/containerd-1.5.2.ebuild b/app-emulation/containerd/containerd-1.5.2.ebuild
index 7f7c816464f6..7ebc5b203744 100644
--- a/app-emulation/containerd/containerd-1.5.2.ebuild
+++ b/app-emulation/containerd/containerd-1.5.2.ebuild
@@ -19,6 +19,7 @@ DEPEND="
 	seccomp? ( sys-libs/libseccomp )
 "
 
+# recommended version of runc is found in script/setup/runc-version
 RDEPEND="
 	${DEPEND}
 	~app-emulation/runc-1.0.0_rc95
diff --git a/app-emulation/uade/Manifest b/app-emulation/uade/Manifest
index 7aabe2d84d77..e8c3f666a55f 100644
--- a/app-emulation/uade/Manifest
+++ b/app-emulation/uade/Manifest
@@ -1,4 +1,4 @@
 AUX uade-2.13-configure.patch 620 BLAKE2B 4266246e968f5bcbfee755896047c5c0587a5199d8fc7882b4f9665175865a94491d6bfceaf3549b6f825e46688ab2f6164f6b4111101212f907d9bdec3f2b28 SHA512 08d5caa315054553414961cd44149f949099341f9c91b4dd7ee957649fa029b9c1927f583bd581e6b213f381b3eb43fe5097a87747ce7e36e94487fafdc96c76
 DIST uade-2.13.tar.bz2 2897931 BLAKE2B 7d5ba128fc53bb683a6a21616e3c9c2a7376361086f3d91a59026ac89eb48d9520f89342914078ccb4614a16826a8c90f86a6052caffc9d5cc4e1e0ab6b092f0 SHA512 675c3369ed55a314cab81ae7ba8a09b277ab1cfe2354eac92194f746803ec2464b7603d665cf30da41caef5997c21515e69f0313d8d2b079c242a08fef786183
-EBUILD uade-2.13-r1.ebuild 821 BLAKE2B 56bbaf3dc9be81d371389e55a72a7affdd2d22bb92459a2cd57ce7e3a7df265febcd173a5ce7a0ef33b5ef0536d86890b0413cc003fe3de986ba0412eed731f1 SHA512 7947a265d8589cc2e7d4d57bf0139f3344235ab8764f0e2eff329ac1b04cd2d6948f8c63ee2f70a1ed249465b1ca03f5f9ac9072303a9ed12c43b7eb5dd92e6b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD uade-2.13-r2.ebuild 1094 BLAKE2B 5190440d95bdf09b30a86213a2c606711c54fa8b42cc56aaacd9fbad66e13f326d5644654ceba1dae7a81ff22673166cdcd2cd12b376d622f476755290ff8605 SHA512 0d880e1cf49d0911861454c7bd2adfcabfa4a22ae0abac0b912bbb3c9800338471d860782dac2e4c17288087d5308296f80fc7924329c3c9088bea2e1640c768
+MISC metadata.xml 458 BLAKE2B 7d6d4f3e6ab3457edd8025f2605766f225fb7d9ef2bd9501b0459fe4d2f853bbd27745fb400d15b9e6a2db617d0f5b7808cb59ab3530e4fadf4bc7cdcb3921b9 SHA512 9f47cbb66ea75cb7f4769c282afef9c522e06154b198b7d757644ad9888da291b09ae92890a2e7b4b483473ee23a8794f9c570200de3e16ca210a0dc21d7b0d3
diff --git a/app-emulation/uade/metadata.xml b/app-emulation/uade/metadata.xml
index 78274e0fa550..c4c4b8d8413a 100644
--- a/app-emulation/uade/metadata.xml
+++ b/app-emulation/uade/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Enable <pkg>sys-fs/fuse</pkg> uadefs frontend for on-the-fly WAV conversion</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">uade-music-player/uade</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-emulation/uade/uade-2.13-r1.ebuild b/app-emulation/uade/uade-2.13-r1.ebuild
deleted file mode 100644
index 28ceda581e45..000000000000
--- a/app-emulation/uade/uade-2.13-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
-HOMEPAGE="https://zakalwe.fi/uade"
-SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="media-libs/libao"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
-
-PATCHES=( "${FILESDIR}"/${P}-configure.patch )
-
-src_configure() {
-	tc-export CC
-
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--package-prefix="${D}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-text-scope \
-		--without-xmms \
-		--without-audacious || die
-}
-
-src_install() {
-	default
-	doman doc/uade123.1
-}
diff --git a/app-emulation/uade/uade-2.13-r2.ebuild b/app-emulation/uade/uade-2.13-r2.ebuild
new file mode 100644
index 000000000000..262a54d90331
--- /dev/null
+++ b/app-emulation/uade/uade-2.13-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Unix Amiga Delitracker Emulator - plays old Amiga tunes through UAE emulation"
+HOMEPAGE="https://zakalwe.fi/uade"
+SRC_URI="https://zakalwe.fi/uade/uade2/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="fuse"
+
+RDEPEND="
+	media-libs/libao
+	fuse? ( sys-fs/fuse:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+DOCS=( AUTHORS ChangeLog doc/BUGS doc/PLANS )
+
+src_prepare() {
+	default
+
+	# needed to avoid ${D} VariableScope undefined behavior in src_configure
+	find . -name Makefile.in -exec sed -i 's|{PACKAGEPREFIX}|$(DESTDIR)|' {} + || die
+}
+
+src_configure() {
+	tc-export CC
+
+	# not autotools generated
+	local configure=(
+		./configure
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-text-scope
+		--without-audacious
+		--without-xmms
+		$(use_with fuse uadefs)
+		${EXTRA_ECONF}
+	)
+	echo ${configure[*]}
+	"${configure[@]}" || die
+}