Sync with portage [Wed Jan 19 08:40:28 MSK 2022].

acct-group/stdiscosrv/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>

acct-group/stdiscosrv/stdiscosrv-0-r1.ebuild

@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Syncthing discovery server"
-ACCT_GROUP_ID=497

acct-group/strelaysrv/metadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>

acct-group/strelaysrv/strelaysrv-0-r1.ebuild

@@ -1,9 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-group
-
-DESCRIPTION="Group for the Syncthing relay server"
-ACCT_GROUP_ID=496

acct-user/stdiscosrv/stdiscosrv-0-r1.ebuild

@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing discovery server"
-ACCT_USER_ID=497
-ACCT_USER_HOME=/var/lib/stdiscosrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( stdiscosrv )
-
-acct-user_add_deps

acct-user/strelaysrv/strelaysrv-0-r1.ebuild

@@ -1,14 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit acct-user
-
-DESCRIPTION="User for the Syncthing relay server"
-ACCT_USER_ID=496
-ACCT_USER_HOME=/var/lib/strelaysrv
-ACCT_USER_HOME_PERMS=0770
-ACCT_USER_GROUPS=( strelaysrv )
-
-acct-user_add_deps

app-admin/awscli/Manifest

@@ -10,4 +10,5 @@ DIST awscli-1.22.33.tar.gz 2146397 BLAKE2B d78f92b077141d7204b2e3c7b2eda589e4430
 DIST awscli-1.22.34.tar.gz 2146588 BLAKE2B 794fc2b579126e9c37eaca6aeb8f750cf91769e05ef7222b579e286ef6248d05d49e372abb5af63e1827f804127bfbd78cfe767b715a7f907e26e9c0af6f08a2 SHA512 5fc5f4f929fb64b494422db794cbd4dd2e8adf3d0a3436bc2368a2e9d036bac42e29beab13ee5f00c46b97bc875dbb3f1a7af684006a9dd96be7fcc61ff282fc
 DIST awscli-1.22.35.tar.gz 2147435 BLAKE2B 24fdb6d273dfeddeb7ef8adb15fad843a25edae0cc6dfd37465c294421de6cda0c0c0d49c931f5c2b28ac337d44c3be63f6fd15e7ce84ed493baa0a5c5aa8cc7 SHA512 64f297981987f8f6ab75c43f645624f1794b411f82885e3784c3dd55da0e0ed98ab6395edea7319cbc2c7a320451a6722bd558431a3acb1b7aaf94c2521b4c2d
 DIST awscli-1.22.37.tar.gz 2148283 BLAKE2B 0355bac3b0710af5ce6938a59c1e93115fb109f5aa6b05fe7bd2b5341a11c9e4bf35b826addaa1a7f8e404fd58c15cd2056802c192abe6d5acfc4ff4facd42fc SHA512 3cb1acead139329774565a5aed818eb2bc1e444627d6448c1c31eb431a6aae1e07af273c8b24a1910522764d5898946629197606e0b2762fb89d1bc163641d73
+DIST awscli-1.22.38.tar.gz 2148993 BLAKE2B 5adeb94f6edcb679a00dbae8708893a50c302ef7eec049573b478103dbe50194f62bf3486e2d1e2c0d5b09ba0f08b7d988e5c2c2c70056394751beae944213e2 SHA512 4aa071bd692fbdceb6e06dcf99d7306dd26971d993a487a6ce908864411c06e01085b8ea1a8acea1bc1994dafa1bcb72f92bb43863e2b584a16b17209057c06f
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494

app-admin/awscli/awscli-1.22.38.ebuild

@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}

app-admin/cdist/cdist-6.9.8.ebuild

@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+
 DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
@@ -17,6 +18,8 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=( "${FILESDIR}"/test.patch )
+
 distutils_enable_sphinx docs/src dev-python/sphinx_rtd_theme
 distutils_enable_tests unittest
 

app-admin/cdist/files/test.patch

@@ -0,0 +1,47 @@
+https://code.ungleich.ch/ungleich-public/cdist/commit/3a321469a8ba5aea55220bd70bd4900de732e917
+https://bugs.gentoo.org/831362
+From 3a321469a8ba5aea55220bd70bd4900de732e917 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
+Date: Tue, 16 Nov 2021 11:11:45 +0100
+Subject: [PATCH] Python 3.10: collections.X -> collections.abc.X
+
+---
+ cdist/integration.py     | 2 +-
+ cdist/util/fsproperty.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cdist/integration.py b/cdist/integration.py
+index 17b65f09..04470ea7 100644
+--- a/cdist/integration.py
++++ b/cdist/integration.py
+@@ -84,7 +84,7 @@ def _process_hosts_simple(action, host, manifest, verbose,
+     """
+     if isinstance(host, str):
+         hosts = [host, ]
+-    elif isinstance(host, collections.Iterable):
++    elif isinstance(host, collections.abc.Iterable):
+         hosts = host
+     else:
+         raise cdist.Error('Invalid host argument: {}'.format(host))
+diff --git a/cdist/util/fsproperty.py b/cdist/util/fsproperty.py
+index 09e9cc19..6bf935e8 100644
+--- a/cdist/util/fsproperty.py
++++ b/cdist/util/fsproperty.py
+@@ -33,7 +33,7 @@ class AbsolutePathRequiredError(cdist.Error):
+         return 'Absolute path required, got: {}'.format(self.path)
+ 
+ 
+-class FileList(collections.MutableSequence):
++class FileList(collections.abc.MutableSequence):
+     """A list that stores it's state in a file.
+ 
+     """
+@@ -102,7 +102,7 @@ class FileList(collections.MutableSequence):
+         self.__write(lines)
+ 
+ 
+-class DirectoryDict(collections.MutableMapping):
++class DirectoryDict(collections.abc.MutableMapping):
+     """A dict that stores it's items as files in a directory.
+ 
+     """

app-admin/eselect/Manifest

@@ -1,4 +1,4 @@
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 DIST eselect-1.4.18.tar.xz 179968 BLAKE2B ce54e54dd406c0d5a7a012ff7cf111709e7a51c510aaaa1d0145dade7bc9678e5f67081dfaef0743c86324adddb5468b093f9612e9932198d1bc9428a2dc93f6 SHA512 8e7afae4d383ddcc38c51f947fdaff267cc7ed87e26d236ff84585e4037764fd553f61c205fdc412ebc5170d80fa60a83cd93aa6fe39230ebff10a903af12ae2
-DIST eselect-1.4.19.tar.xz 180240 BLAKE2B eaf1cee4cdca7963f4bdf0ceaab7431e1fd2fd07a05747db7b3437841602b302224701988b6cbd24ffa2ee30a58e6f4b34810b46f272e4d2bb032aec0a1512cc SHA512 18e0e769ad95ce67904e3ae95351463f00f1b255f390da7d54383d04f27e76cd32616b79c0fcd60d3f3aaab40c7cffd34a9348c55a1484224713f72a55e072d7
+DIST eselect-1.4.20.tar.xz 180272 BLAKE2B 424653d00eda45335c3aaae50f6fbf2e89486da4529f657596516352f3b7fcb9859ceb2dc5b9762a34c44fb64e645fa27c46b86453bf50be6e8ae820664a4289 SHA512 9589ed89c4d5d31f71d535886eb50da67b84dec8a13a5df081e7569efee861dede4eaa43a0bfb9930c5b95d4f334e19245cb8820a73f7361527da262da1d1fb2

app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild

@@ -27,7 +27,7 @@ RDEPEND="
 	$(: multiple --quiet, --format and anti-slot support)
 	>=app-portage/portage-utils-0.80_pre20190620
 "
-DEPEND=""
+DEPEND="app-arch/xz-utils[extra-filters]"
 
 src_prepare() {
 	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\

app-admin/mcelog/Manifest

@@ -1,2 +1 @@
-DIST mcelog-179.tar.gz 315590 BLAKE2B 14de21330af412847ba627fccd41d20bdeb0f2f926ca81e7a564c4915cedccb8a2fe7c97227527a73ee0bfcc14757c30f67df47f26890319f4f6dae44551df4f SHA512 f9384abba55d5e6b181786feb28c72ba813d1d7b672b948f2e5c6cd6eaa11dd2ae6597301cd812f45a162f12fdabf7cb670daa325e5ab0cd072d99a880917981
 DIST mcelog-180.tar.gz 314605 BLAKE2B 0cf4f25dc26901bee56ddd437ad3d56874ba70f2323d9d6821432bf744b78392e871c9632e44a7bef7a1954eb6605cf72f6d9268397741cecd5066b6bcafe54a SHA512 89b2b1c2f7ab03bb358926f10fa2c3e8f048bb5cf2d6f4453de63ecfd44daebe771087522c69ade5638248ab79c80122448efef798e4ea8d1a5f88308e8bfd32

app-admin/mcelog/files/mcelog-179-fix-logrotate.patch

@@ -1,21 +0,0 @@
-Should be in the next release:
-https://github.com/andikleen/mcelog/commit/2261c74a88f9bc9e87c9ffaae5a98261087730ae.patch
-
-From: Andi Kleen <andi@firstfloor.org>
-Date: Sat, 6 Nov 2021 07:22:24 -0700
-Subject: [PATCH] Fix logrotate syntax
-
-Fixes #102
-
-Signed-off-by: Andi Kleen <andi@firstfloor.org>
---- a/mcelog.logrotate
-+++ b/mcelog.logrotate
-@@ -3,7 +3,7 @@
-     dateext
-     maxage 365
-     rotate 99
--    size=+2048k
-+    size +2048k
-     notifempty
-     missingok
-     copytruncate

app-admin/mcelog/mcelog-179-r1.ebuild

@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch \
-		"${FILESDIR}"/${PN}-179-fix-logrotate.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}

app-admin/mcelog/mcelog-180-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-mcelog )"

app-admin/mcelog/mcelog-180.ebuild

@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="A tool to log and decode Machine Check Exceptions"
-HOMEPAGE="http://mcelog.org/"
-SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
-
-# TODO: add mce-inject to the tree to support test phase
-RESTRICT="test"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		local CONFIG_CHECK="~X86_MCE"
-		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
-		"${FILESDIR}"/${PN}-129-debugflags.patch
-	eapply_user
-	tc-export CC
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d/
-	newins ${PN}.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-	systemd_dounit ${PN}.service
-
-	dodoc *.pdf
-}

app-admin/tmpreaper/Manifest

@@ -1,2 +1,2 @@
 DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
-DIST tmpreaper_1.6.15.tar.gz 158755 BLAKE2B 8f95e11de947bf436b92c2fb73b82b86134aed32eb4053af2c8065c3fe1f584f6d126a3a1ddf5e2837ca88060c499eb424670049420ec702d0a989e6e246ca69 SHA512 323a9998b1e3cfe99ead433de25d2b0db31f9ae2ddd3cd8f5e81dc5f04c977953cb930ded8860088504318cb0b42c6ca804b1ddd663818b1d3fabef8e3fff891
+DIST tmpreaper_1.6.16.tar.gz 158816 BLAKE2B cd0bbb3bc414800d73c49a5fd724af21e7f81d4ad07256f6a1f8f4943d53d74580dc11066938f417ea7a2c6105159f262363457c6ba082eeaa11817ef7128c96 SHA512 2f155a2c081f6af73e164dc1698b74430e4839864c6773b74d239ccc2f0aea5dbfbf5904c1738ef34a735a2451173b0000190ff8f3af291574b09b119410d412

app-containers/cri-tools/Manifest

@@ -1,3 +1,4 @@
 DIST cri-tools-1.18.0.tar.gz 5295512 BLAKE2B 9dda4a401b858e98aa60521d3268d8f6ff6a2c1bd2c219a0e5e9e5360fba58d41e97258c636da26ee57bbfc3286798c74107c7de92d3e3398bdf53b7d9078e94 SHA512 849b496e6d19eec29e0e56f0b37c094649311b80514f319b0c68c6519e3ddd48e1973c3d288144db998826676416644ec705b7ea0916c21898b40928ea800af1
 DIST cri-tools-1.21.0.tar.gz 6739482 BLAKE2B 365e3e9b220e63713dd21af4154b2282c20db1d19ba6b32da616c5d73957a375ab12ed2a86694abb9d90e1020be1fd89c128ed3e469d2f7524dcf42139e7df56 SHA512 a307f5526fb8b7b23a1635b168a8f3b9b9b4bd6ccb94d461dc5af2065e6d1be527dadcb1c86e04808b244d0851a4901ee78a0263f58cf673f6ca503621d5eb61
 DIST cri-tools-1.22.0.tar.gz 6821114 BLAKE2B 48bf99488cd3a65ac5ff14d8b46359f2ce7163f9810b255dfeeacea9aa2b86310d242dd174fc29490ae24a985d0cbf51bd1f4d9a752bd5828fdfae73eab2be31 SHA512 4a2751ebe0b1ed7cb739a71230272ace0cbddc516abba39c6bf07d5e2648bd60e2139935b77a5388028887915162c957f652ea05434ff7865256721d10f863df
+DIST cri-tools-1.23.0.tar.gz 6823865 BLAKE2B 75d394ec1f9ccf2122476c9b845499212d668f8170ae8551913e3e057271986ab77454bdd0fa646127bfadda203fabdc57cc448dfe1e64dd7cdbedc8f5ee8cf6 SHA512 36700eaf872da14921e0b2c8fa68f91e3e0226364e29a5b8e132fbd52504e130e0bc2cce30aba21e7def576a4682f150b0b051d44b78aa694c225c10999d7155

app-containers/cri-tools/cri-tools-1.23.0.ebuild

@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
+SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+
+RESTRICT+=" test"
+
+src_compile() {
+	emake VERSION="${PV}"
+	./build/bin/crictl completion bash > "${PN}.bash" || die
+	./build/bin/crictl completion zsh > "${PN}.zsh" || die
+}
+
+src_install() {
+	dobin ./build/bin/crictl
+
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
+}

app-crypt/gcr/files/gcr-3.40.0-meson-0.61-build.patch

@@ -0,0 +1,47 @@
+https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
+https://bugs.gentoo.org/831428
+
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+GitLab

app-crypt/gcr/gcr-3.40.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/3.38.0-optional-vapi.patch
+	"${FILESDIR}"/${P}-meson-0.61-build.patch
 )
 
 pkg_setup() {

app-emacs/nxml-libvirt-schemas/Manifest

@@ -1 +1,2 @@
 DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
+DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32

app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-7.10.0.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/docs/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}

app-emulation/protontricks/Manifest

@@ -1,2 +1,3 @@
 DIST protontricks-1.6.0.tar.gz 61220 BLAKE2B 8a9af6f8cc134ad0e74b4c5e6c35bc8344687e65cc9811ca54402b16f723264cef8def6e733a532fd412db51d0ec63533baec52699ae994a97ecad0a25ebe847 SHA512 7276d7de1f0c18afc5c67552290888e3851bd5f073bbbf684000be66c2e65abac84b079373b120ff0ab6e4f4919caf8ee1288a2320de6c37629cb1185dfbea29
 DIST protontricks-1.6.2.tar.gz 137643 BLAKE2B 09e6c37291eb47224d8f7cfcb5e864c86f6ea7ddcbbd11d1d64fbd24b2eed35aacfacad72e8481d7a3c76a915727e7dd8a58e80af9d208892a434dafb4098c17 SHA512 d0acf685c0f4480360bdf9c4e6444d51262316710d1dc6b0ca612da26a56efca647e9cdc030639bcaaa929077062cfa04a024b657a9456677d751758fe7d8552
+DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff

app-emulation/protontricks/protontricks-1.7.0.ebuild

@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="app-emulation/winetricks
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity
+		|| (
+			app-emulation/winetricks[gtk]
+			app-emulation/winetricks[kde]
+		)
+	)"
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+')"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}

app-emulation/qemu-riscv64-bin/Manifest

@@ -1 +0,0 @@
-DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40

app-emulation/qemu-riscv64-bin/metadata.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>riscv@gentoo.org</email>
-		<name>RISC-V</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>virtualization@gentoo.org</email>
-		<name>Gentoo Virtualization Project</name>
-	</maintainer>
-</pkgmetadata>

app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild

@@ -1,22 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
-
-HOMEPAGE="http://www.qemu.org"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin qemu-riscv64
-}

app-emulation/wine-staging/Manifest

@@ -1,10 +1,10 @@
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
-DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
 DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
 DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
 DIST wine-6.23.tar.xz 27057236 BLAKE2B 9e438a1f2200c59517b05eb4ea6d6c26594b3fd442caa11d9ccabd8e0c016d1a721f2579c36fcfb18bb1185edfb11480d65d732d435d44f5dea0bcb345fa1476 SHA512 3e459b305f472ece00cbf467e14e6cfa7422381cb9242d05e9624487d559f438039aa8c780986469591c9d0f05e384380133dc6fb4ed694355ae42744a78d9b7
-DIST wine-staging-6.20.tar.gz 9643278 BLAKE2B b5f0a74c575541303eaf12e9706f8917b795fc0d5f065e7292329cec7da145f9c7db25bebfcf4d703bf561206f22c9a49a95e8471629009dac4679c6f028b918 SHA512 9b5650d065976ab5b0bcb2f65895bf7b6bf139d376fc5cff421d493a6f6a849cb57e33243d1fad9ca1943cfbfdee8d8a3a4d530722163b15a0830d616f06e1e3
+DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c
 DIST wine-staging-6.21.tar.gz 9627829 BLAKE2B b743b67c6f26871894b16d8cd9e7ed39a1d1dd6204516453628435ee23df7644433508edc7c7dd2881686926427e683c36a29acdc744c89d2c2bd4c5f50a13ea SHA512 b74ad7f96f2831b2635557c16cb616754e31c490b5b935d1d197d6cc8e61ca75805f801e22223b936a3794af57be94344d3a06dcfce92db7e036b6c3751ef294
 DIST wine-staging-6.22.tar.gz 9608891 BLAKE2B b1fb62e82ea746a4872c4dcb8e243a44248732e4d3512e8c489e230422fc51861b5a8f1996ae12e432c5ef7eeb8cae693f9afe862d2bde150f1d6eab46534f6a SHA512 3839cdcd7ffead2cf933b59eb038856eccde7b28e599b61e10e2745ff4d2bfeefcc43262bbc96c97510560584de759ef0616b0f5e391de608fb08176502cb830
 DIST wine-staging-6.23.tar.gz 9609149 BLAKE2B abc9f4134293c91759311fbc91230f3a7f41455cc35a70bda4bf61f088520cb520b139b1c92bf2f18c6f885caf9397835a01f6bfa9d46c1d1bd49a4918ba330d SHA512 32bee187b9c7bdd026e64263083f3d92eb01c72f2d29a7d006616fb0713a0668c3d5ce3b5d523e09b650cfe77c1080e0478113afabd02352d66af53e60e0b31e
+DIST wine-staging-7.0.tar.gz 9614226 BLAKE2B f1263abde0fcb83f1784805df13e32db18758167f58e2370f3bbc16fdd6c0ad9b158c6e106e75183a42e42c29ef2971f2f297b2a733090727c1249a4914b45af SHA512 fbec2de7a13c7e59a041d8102d69b803d4475b743068d215cce510af905b81903aa028604068af0d309fe1708eb1ab62aad42887ac079af5206635bee0045952

app-emulation/wine-staging/metadata.xml

@@ -20,8 +20,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 		<flag name="capi">Enable ISDN support via CAPI</flag>
 		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
 		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-		<flag name="faudio">Pull in <pkg>app-emulation/faudio</pkg> to provide XAudio2 functionality</flag>
-		<flag name="gcrypt">Add support for the Diffie-Hellman key exchanges using dev-libs/libgcrypt</flag>
 		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
 		<flag name="gssapi">Use GSSAPI (Kerberos SSP support)</flag>
 		<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;</flag>
@@ -43,7 +41,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
 						(these pages are not currently in the updated WineHQ Wiki).</flag>
 		<flag name="sdl">Add support for gamepad detection using SDL</flag>
 		<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
-		<flag name="themes">Support GTK+:3 window theming through Wine-Staging</flag>		
 		<flag name="udev">Use <pkg>virtual/libudev</pkg> to provide plug and play support</flag>
 		<flag name="unwind">Use <pkg>sys-libs/libunwind</pkg> to unwind the stack</flag>
 		<flag name="usb">Use <pkg>virtual/libusb</pkg> to provide USB support</flag>

app-emulation/wine-staging/wine-staging-6.20.ebuild → app-emulation/wine-staging/wine-staging-7.0.ebuild

@@ -30,7 +30,7 @@ S="${WORKDIR}/${MY_P}"
 
 STAGING_P="wine-staging-${MY_PV}"
 STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -48,15 +48,13 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="${MY_PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
 	osmesa? ( opengl )
 	pipelight? ( staging )
 	test? ( abi_x86_32 )
-	themes? ( staging )
-	vaapi? ( staging )
 	vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
 
 # FIXME: the test suite is unsuitable for us; many tests require net access
@@ -75,21 +73,18 @@ COMMON_DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	)
 	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
 	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -100,32 +95,21 @@ COMMON_DEPEND="
 	)
 	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
 	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
 	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	themes? (
-		dev-libs/glib:2[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-		x11-libs/gtk+:3[${MULTILIB_USEDEP}]
-	)
 	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
 	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
 	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}]  )
 	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
-	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
 
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -133,7 +117,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -167,10 +151,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()
 
@@ -293,8 +276,8 @@ pkg_pretend() {
 		# Verify OSS support
 		if use oss; then
 			if ! has_version ">=media-sound/oss-4"; then
-				eerror "You cannot build wine with USE=oss without having support from"
-				eerror ">=media-sound/oss-4 (only available through external repos)"
+				eerror "You cannot build wine with USE=oss without having support from a"
+				eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 				eerror
 				die
 			fi
@@ -472,26 +455,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(use_with udisks dbus)
-		$(use_with faudio)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
-		$(use_with gcrypt)
 		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
 		$(use_with gssapi)
 		$(use_with gstreamer)
 		--without-hal
-		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@@ -500,7 +477,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@@ -517,14 +493,10 @@ multilib_src_configure() {
 		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
 	)
 
 	use staging && myconf+=(
 		--with-xattr
-		$(use_with themes gtk3)
-		$(use_with vaapi va)
 	)
 
 	local PKG_CONFIG

app-emulation/wine-vanilla/Manifest

@@ -2,7 +2,7 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
 DIST gentoo-wine-patches-20210925.tar.xz 59836 BLAKE2B c6d41db309bf0470d0e8ef771d791240209f77d967031943232218e8e737987a4a74847d89d6bf8739ff0698b28b656a8b9ac830ee1da457be2aab27ededb123 SHA512 721d4d7b6a2c4336555a7faed7202a8ad6872ee37e4daea6fab2b5ff5bf5d73ce41f25d0bd4fd9b45e2c522cb19c1349144a40be32ccdd7ded7f61055d6d85c8
 DIST gentoo-wine-patches-20211122.tar.xz 59796 BLAKE2B 21460e6adf4934a52f8841f76f234a764c2dc1ac77eeed1cee10adafec3aa723640ebd4b51559e9ef433070ac731c4648620bd9e75e99f31b2e2f494cf01f02d SHA512 a18cb320617e2157977032c38c322177a2d248f14e43051d38de595af171495546c93d5e71e0dbe1a4f326a2dc819bb03dcfd04454ac85bbcd6b1975ae5d9d96
 DIST wine-6.0.2.tar.xz 24217772 BLAKE2B 176614736055892b7203313edc52e2926807c93b0bb97d59f65fbf284fd9cb138e4555fb7cd5a6c7c867367fdc50c89f12d7360ca0db947a7f04594f35f14775 SHA512 6cf002c6a06161665614c9f977dfa402bae8e657c0744dd824575066cdeb676bb9d61ebfc3c4b6f76486077a7457fe91cbe5bbadb467279a61e5a320da587696
-DIST wine-6.20.tar.xz 26921644 BLAKE2B 2db2bdd0b0c65855d96bc407ea54aa289dd0324715eb7fc068dd57b6b90ee7b331997fd9f68942f02ef45ef9f6eb10e7efaad79d0f97721626fc50ef2e47cc49 SHA512 dc0c29194ffd0ddcc2e34d8f7ac236f039e21cdde8cb959ddf16b4b67eb1d6332c9d1a780d0872669a1083db55e105eebaf3d7a6cc5aa749e91efab88bd1f958
 DIST wine-6.21.tar.xz 26973172 BLAKE2B 7e73e04419d50b12269c281b68b002fb7ef29519c63e6c45074fa919b067ee145d328aad6507578db84940c3ac379c0469758d1a211d7d213d1833ee8c15c096 SHA512 2c6d58c8c5c37497b2b3935f71afd636c274d1d4ad3f9ca2fd9982a9ed5910888cc20841bd9175446aab2fef7813d7700458edbaad6028ad34e7444a887a9220
 DIST wine-6.22.tar.xz 27031604 BLAKE2B ed1cf0499f8f827e88a1a899db3c5243d016696fdb1189b321cac398749f9360956f0cd473b2ee04052f0db750550a983b089c4f151edac535b7d440c9a2e048 SHA512 5326d500a2c5884e3ff004557a0360f8ff5c29ae42fdc256a13012ab746371dd403c87715efa00e43bf181fbc6d0647372e3e40944e5673b069f6e4f4cc700b5
 DIST wine-6.23.tar.xz 27057236 BLAKE2B 9e438a1f2200c59517b05eb4ea6d6c26594b3fd442caa11d9ccabd8e0c016d1a721f2579c36fcfb18bb1185edfb11480d65d732d435d44f5dea0bcb345fa1476 SHA512 3e459b305f472ece00cbf467e14e6cfa7422381cb9242d05e9624487d559f438039aa8c780986469591c9d0f05e384380133dc6fb4ed694355ae42744a78d9b7
+DIST wine-7.0.tar.xz 27120912 BLAKE2B 84bfeb28d56f0f40bb93b1b5bf8954c8be2fd90fde5a61608e7c35f48addcce7a4d660e63c3caa3ca2c365d1e83b55a1c3485872b2d6bfa8941e2bce44c4aca6 SHA512 eec17b046ed5447eb540f421c9b2748d9419ce087496c2743a9914fd27bbe5ff9da0cfe47d3cd76fa97323bd1188a1d82b1eef4968d86ed1957dc1a95e28529c

app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild → app-emulation/wine-vanilla/wine-vanilla-7.0.ebuild

@@ -19,12 +19,12 @@ if [[ ${PV} == "9999" ]] ; then
 	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
-	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
 	KEYWORDS="-* ~amd64 ~x86"
 fi
 S="${WORKDIR}/${MY_P}"
 
-GWP_V="20210925"
+GWP_V="20211122"
 PATCHDIR="${WORKDIR}/gentoo-wine-patches"
 
 DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	X? ( truetype )
 	elibc_glibc? ( threads )
@@ -59,20 +59,18 @@ COMMON_DEPEND="
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
 	capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
 	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
-	faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
 	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
-	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
-	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	gphoto2? (
+		media-libs/libgphoto2:=[${MULTILIB_USEDEP}]
+		virtual/jpeg:0=[${MULTILIB_USEDEP}]
+	)
 	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	gstreamer? (
 		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
 		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
 	)
-	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
 	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
 	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -83,7 +81,6 @@ COMMON_DEPEND="
 	)
 	osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
 	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
-	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
 	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
 	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
 	sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
@@ -97,11 +94,7 @@ COMMON_DEPEND="
 	vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
 	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
-	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	xml? (
-		dev-libs/libxml2[${MULTILIB_USEDEP}]
-		dev-libs/libxslt[${MULTILIB_USEDEP}]
-	)"
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
 
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/wine-desktop-common
@@ -109,7 +102,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.4.0 )
+	mono? ( app-emulation/wine-mono:7.0.0 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@@ -139,10 +132,9 @@ usr/share/applications/wine-uninstaller.desktop
 usr/share/applications/wine-winecfg.desktop"
 
 PATCHES=(
-	"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
+	"${PATCHDIR}/patches/${MY_PN}-6.22-winegcc.patch" #260726
 	"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
 	"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-	"${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
 )
 PATCHES_BIN=()
 
@@ -252,8 +244,8 @@ pkg_pretend() {
 	# Verify OSS support
 	if use oss; then
 		if ! has_version ">=media-sound/oss-4"; then
-			eerror "You cannot build wine with USE=oss without having support from"
-			eerror ">=media-sound/oss-4 (only available through external repos)"
+			eerror "You cannot build wine with USE=oss without having support from a"
+			eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
 			eerror
 			die
 		fi
@@ -400,25 +392,20 @@ multilib_src_configure() {
 		--sysconfdir="${EPREFIX}/etc/wine"
 		$(use_with alsa)
 		$(use_with capi)
-		$(use_with lcms cms)
 		$(use_with cups)
 		$(use_with udisks dbus)
-		$(use_with faudio)
 		$(use_with fontconfig)
 		$(use_with ssl gnutls)
 		$(use_enable gecko mshtml)
 		$(use_with gphoto2 gphoto)
-		$(use_with gsm)
 		$(use_with gssapi)
 		$(use_with gstreamer)
 		--without-hal
-		$(use_with jpeg)
 		$(use_with kerberos krb5)
 		$(use_with ldap)
 		# TODO: Will bug 685172 still need special handling?
 		$(use_with mingw)
 		$(use_enable mono mscoree)
-		$(use_with mp3 mpg123)
 		$(use_with netapi)
 		$(use_with nls gettext)
 		$(use_with openal)
@@ -427,7 +414,6 @@ multilib_src_configure() {
 		$(use_with osmesa)
 		$(use_with oss)
 		$(use_with pcap)
-		$(use_with png)
 		$(use_with pulseaudio pulse)
 		$(use_with threads pthread)
 		$(use_with scanner sane)
@@ -444,8 +430,6 @@ multilib_src_configure() {
 		$(use_with X xfixes)
 		$(use_with xcomposite)
 		$(use_with xinerama)
-		$(use_with xml)
-		$(use_with xml xslt)
 	)
 
 	local PKG_CONFIG

app-i18n/transifex-client/Manifest

@@ -1,2 +1 @@
-DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d
 DIST transifex-client-0.14.3.tar.gz 211428 BLAKE2B cab17d7103016a78b226df6ca9905a0ddfd1b8765fb7b161c7390911ac5693d97e7a872a00cbc86e9c8e7d84fbcd85904768f463885bb679e22ab052463db418 SHA512 9034111fa0253ce8799c5ba181d6d35e2addd14b8c2edb7822d8d572255c27f49e4cfce9d82e7e70e352c32e87f2e7bdc6bf09c2a591e689606b0831414dd863

app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild

@@ -1,40 +0,0 @@
-# Copyright 1999-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 distutils-r1
-
-DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client"
-SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
-	<dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-python/six-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	default
-
-	sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \
-		tests/test_utils.py || die
-	sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die
-}

app-office/libreoffice-bin-debug/Manifest

@@ -1,9 +1,18 @@
 DIST amd64-debug-libreoffice-7.1.7.2.tar.xz 1441939592 BLAKE2B 207d3522d3fca71d9e0fbffcc0186b429e444aed4a7495b708526321273ccee7054bcb7cec3138ebe4e20c4921fd78287af4be6ea5077898c4adf0bdf0520d4e SHA512 2e319688317442fad66ff2a77d92ac4b9ed5e2f5b9722a569eecd842a1d38d1fd98dd4b3ac2f9dc5e91feae79c2431da7e4baef164b7248a432406008e2d6d0b
+DIST amd64-debug-libreoffice-7.2.5.2.tar.xz 1468341700 BLAKE2B 6838ec1d4b2e43aaa171b800c72848d9ca8e2a57b4686269c1c6890f87febb2504e591f5eaa4c15a88be4f899eebf836f0146713fdb2e24598cd8ecbab7991ca SHA512 a70c6402b8a4743f0cd0bdd06d4b6974669a7b6853b0269e9872d5c82d767bc251602f963413f96efa6c353c3b6639b9e17da6513ef4d1f04c4f3e900c2cc430
 DIST amd64-debug-libreoffice-gnome-7.1.7.2.xd3 1380242 BLAKE2B 5c69abece7929c5dee0b5c0a37f75bf1006ac6eaaf6d61c77c0e733e7ed7b3aca063c6a949388c6200d09a6a17661a8e95066416f4b47b011c7be786405bf99f SHA512 f08b7bc561ef3e8cbb06ec8cab0f507c6f2a20f2c6ca859b72aebb04d41007eddb1d41a3908129568c34915119bc884005687ec102c123906c25bc1627a0e93d
+DIST amd64-debug-libreoffice-gnome-7.2.5.2.xd3 1374344 BLAKE2B 563d88c5eac92d0c0402a0f46e406cde412b32b790a40b8a8aefd73a31ad5f9a8fb5180e4a518b296dbacfa10e88dd998fa662965fa20ea26b4c1ead83b583d8 SHA512 5e33b1a35f40f62f43d4f10256d3c54ab7d917a08d7e6a18837c26355b3688aea9996b6eece6e7f82827efd99885b242c7749d762568e10fec56fe910d9b35b7
 DIST amd64-debug-libreoffice-gnome-java-7.1.7.2.xd3 731690461 BLAKE2B a2f7af005c86bb754d3bc86d5c1abcb043d78f023adef3f0a3e347dd66e9b8f7bd086014e28aaf2a4cb3c8555eb6ee54171f634ea57f6576ca552cb77306aea1 SHA512 882f62f2557cc39d68de80f15beb33eeea21af357d2bd87d5943bb635734180e922676a0e04d0152a6b3f80d43a3ff8d47efeead59ef1f7d9db23d8b62f792a5
+DIST amd64-debug-libreoffice-gnome-java-7.2.5.2.xd3 753187527 BLAKE2B ad0367bb2a4a0aba4d999724f6386cd469474f9a998748c0eda2f6e1109fa2fb06f7d71a0ea9b1bf3bcb383249b546197ca05bf0a2a63057d81f01ee35b682bd SHA512 7159ae06cb294f4323905f9aaf2c495e735e749acee8960eca9bcf72ca25718cf66c6de2811bfe538b0fa948b427873a42f0ea39af27d19bc306e68d4419ce27
 DIST amd64-debug-libreoffice-java-7.1.7.2.xd3 730327939 BLAKE2B 0b2bee88dacc1c186355645ffcae7aa7f6b96ac0e28f8ecdebcda878133709dddd1f53df955adb64b7e3a5738361a0c661961ed36f7fc7658e4718aab4a1d2ff SHA512 3e417a5d31028f2ffc9995c742d620f96aa88123ad75ffb70d52b12718b83ca56ffee184b08194530753876654a041426c7b9531c1775743dad903a246260de2
+DIST amd64-debug-libreoffice-java-7.2.5.2.xd3 751807644 BLAKE2B 103f01604bd2606566482b6be9b58acae1d82ecbfe035b73bbec87e7f7ddd9649007ea3911ce395987d34bdfb252397c98617ff3c6da4792ae7df9e726ed59d6 SHA512 47e9725f46465680535520383b27e64d29f84df1b6152a312f070f84157e88ca32767a2c2e352623df5c29ed978b624696b217fda943dea07879d2f05e1c5360
 DIST amd64-debug-libreoffice-kde-7.1.7.2.xd3 476280495 BLAKE2B db7457b75111ca0a55eb0cae888f9d8e9322ed882bf5a7786d214c09ba8cc7c327d6cea1bd1a02508d71f25e8a3c29ffe49d1d95845b45c486cb8f9061ae3bfd SHA512 ba216570e618101cb5f09c951600574454bf5d7a124168bfbb5857e5a2a8aff0c6ebcaf97eb546a121814ba99820f845da98081b125d74a4d62b0e1b21d3dc0a
+DIST amd64-debug-libreoffice-kde-7.2.5.2.xd3 460040481 BLAKE2B b2eabce2b53944997367c5158c8c1ca7bfb2e82e17b58e9142ca3bfa53fb3c848eb719f0e8b11cf3967ff034ead48548f5624a449bbb358eae247df5d1da9639 SHA512 734856278ef502f638e85a2da731e39e464ee7fce13f598f8e01fd8ff3ad7deb4266c1c9249c072bf5b28814ebf98dd57afc9c2f808471a77232769aa4649527
 DIST amd64-debug-libreoffice-kde-java-7.1.7.2.xd3 734480017 BLAKE2B 8854d13e7001e40b2202a0bcc149851f600ef5ed7bdfd96fa50d84066819a8425410860125b593fdbedc9dd8443a759946a15586d683c08bf4a55e56a9d3ed56 SHA512 bbff8c1b3c3d01d0b33967dcf40f36d5a746ba373cef535431047dc7eb4c3437c825228a62e6fafefa3bbca4c68c39b322a9de0c7ac5264efe3fcf0372346e58
+DIST amd64-debug-libreoffice-kde-java-7.2.5.2.xd3 756364946 BLAKE2B 62606d4852549494f1907490453c7c2d51b45f8c237a875aca0cbe68873bad5dee4a8660d7477477eb5695c3dfd9363d0c19ef4cffd238eb2e8b4725199b4783 SHA512 8cf360bf8614da8e88dcba711218b6352df6b90fafe6a3e0e4c5bdd8365fe484161391a6b73ecf8ca2b15694b483754d244972f7069a5fe18acfc58eccb28088
 DIST x86-debug-libreoffice-7.1.7.2.tar.xz 1410535408 BLAKE2B 286a778236dee80a2e8079a612613c0197970847b51a98d041bcf7705ee0b17b0d1489e60e8747ca9aa4b5150928ae020a5d9d761b73e2dba7b59be494a9fdb7 SHA512 050295166f081e5b7f24d100a751862fd4e279a7fb0ab8f8388dd21caa93e60b5a40eb723233c799117b5fa574b9ffec5ead91761af7c521b137e035f582813c
+DIST x86-debug-libreoffice-7.2.5.2.tar.xz 1437665708 BLAKE2B 693afa40cf054bd0a6b84e3f610dcc22147925cc635b671b79812a224384895d15acb8529c5f42ba5ce77891b4383d5f519e74584b0fbd5ee8253f4089a811e1 SHA512 f9e7fc0fc90193aa1d969943986c118af12eee284748dfec689833deaaceaa4c2d716ff54862a901c38a744ee4386ff09bcd78ef3453f40e9ddc609d61185d11
 DIST x86-debug-libreoffice-gnome-7.1.7.2.xd3 1338001 BLAKE2B 15cff9f5b02b45c7eb9d7504476748ff034b34dac599526a20b0538ddc745b86c40953ce7f3b16bc15425b1336e70766fee51f6b4bf778d71171d0f5d619cd54 SHA512 f0eb6469b3cfbd5bd6e76d5b9b225303c52c25dd1c9c3ddb10c1a0cad3df9bd39f1efd814697b4fa4d749189d88b199f0ca0328d99a1cb6f110fafb7d55208cf
+DIST x86-debug-libreoffice-gnome-7.2.5.2.xd3 1332559 BLAKE2B f87725b3bdae2a60f071d44479c1b9f8734661761a91dc328210855b583011a603b66c1eb9842bb3ea55a445028b328950d4de4d4cac91ca0c7cff787ce8ff26 SHA512 d1490cfc5a0d29165393ed36564b2228f84a37cb031410dc533f843743eafcce67b8fc6fc43bac12a010fe6a4afacf65fc2f9327057c30069169a16916fdc1bf
 DIST x86-debug-libreoffice-kde-7.1.7.2.xd3 454011246 BLAKE2B 62ec25f753eacec0a729fd35bfc2f7286a19bd17d97f0463574303e7b9fe74e0d987de19d3956967caebc0efe2fe444062e6aea7a9b2ea8145b7123aceb419d0 SHA512 f6fce013620d5fb1fe96b60e5c41ab61436182751323af354c9b0cb34610c294b175cc131d7e07d472702475b100ea9362086aaa463f0055c304d2a803084f57
+DIST x86-debug-libreoffice-kde-7.2.5.2.xd3 437928491 BLAKE2B fbf1ba96d82cdfb68670b2e1be55b4c9f26b4b0dad77e2b524433bdef06e8693761918db0547182e9bde59d2474511ebf0f5dda11c23e7cee03a98198d6aade5 SHA512 79c7c31c83b582f736ce2c520041354dc11bd7274701eb26fad93d76090d9d10b443183402b4253621fae35f87b33da3ccd645f5a5cfc27e9e7c001291d07668

app-office/libreoffice-bin-debug/libreoffice-bin-debug-7.2.5.2.ebuild

@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}

app-office/libreoffice-bin/Manifest

@@ -1,9 +1,18 @@
 DIST amd64-bin-libreoffice-7.1.7.2.tar.xz 136085032 BLAKE2B ef4493c580726d26d3bf05a289acc2f030ba77f7924bab265e9c74f22f79616b61f3f51380526d934f1e3c9d697765f427676ffb483a5547f0fa79b99de17d7d SHA512 b45503b8e8105ede3e02c32ea50c602bdf79238cdd8e1d7c8abb503538ecfe9d359f59c174666cab3d4621e740525d6e2f002fa28c9f77989cbc3c963cb10135
+DIST amd64-bin-libreoffice-7.2.5.2.tar.xz 141659504 BLAKE2B 3f8004e28c52ba2894d3ab4c643291b3ab307818599ad17af062a7cbd6d0ce096fae610aef955cda730344699ba6d025d532c95233b13c7d4083bfbbb227e517 SHA512 4083a0e6c0321478453eaa3a4fe5473325dc375900b3631876cb1695f4b6f6e81b2c79045eab92d76ddcea13ae7100f115a3f2b7da86afa20d4ff1ef67018dfd
 DIST amd64-bin-libreoffice-gnome-7.1.7.2.xd3 1468305 BLAKE2B 117776d451dd580af3448fc109475d09fd4f8cec2e3d7d8d2b628a4bc469aaa18b96c1217e69a43197553b373a1eeee314100ba90e6283c938cbaf9f8029f667 SHA512 6a989daac6215de1029136b5723bdead79afa3f420d4f4a1149c31ce1a6ec69a38443f7ff74f9d87cb594895810009a110a758323a3ccf1d1f8c7160377aacb4
+DIST amd64-bin-libreoffice-gnome-7.2.5.2.xd3 1454525 BLAKE2B 2037e87a38b2cd8d30583b6145c99d884692e053f3e0d7002a2e8e461af288c0a122786ecfcd9e82a6c5c4f4bb98b2c59474874eed23272fce66cff9d282e68b SHA512 dbb2c1f5ede93d3ade9932ba1c0f4709e54280f171cf7a6efe1ec67a716ff6370f994ccc3ac62432d3503b9cd840027cf4b865ad31ad095ff2614f4ea93583a6
 DIST amd64-bin-libreoffice-gnome-java-7.1.7.2.xd3 31065813 BLAKE2B c7a561fb69a79a5da02b52db989e36baa2e158cc81b4a03c77484b0191feb6a4b21aeefbc17a5242c0b8817483476ea089791d14682f342d30bc44e587aff004 SHA512 71b8b0ccc93bef2da88c481c6f832147f542af41d9858ad4c7763de6b35fa95d971db28609a6ef0d03bd98b5c27d23e0196889b94f9150ff337853ce2b4665c6
+DIST amd64-bin-libreoffice-gnome-java-7.2.5.2.xd3 30819131 BLAKE2B a6cd99dbff624338c33cd00fdda1b010acbc2a5aa3d0025a8481bd047d8f74235e5026421885244fbd800fd8af4d4218d4dafc32afea10a48e3171e60109cdf5 SHA512 c9c0266ffd557c6551fd663d7bda186d9a434fea4c7e6fc26bf3d2afa3eac74191d3837dd49d4447209c53baf18c6fe3394c2362c5d3e011de70ba75332d8237
 DIST amd64-bin-libreoffice-java-7.1.7.2.xd3 30876880 BLAKE2B ab1eebacd6f338a5d17a71f04fb04ee485fb68cac54bf008b58675013c77dd0be407fa053a48821d6fc98ebd2f22fd58a21f4c646c49d5c31431e073cd308ac1 SHA512 2ab214cb5f776d15b420adee25ae529acff785735e0f3af2af700769952c41b299d4aa2becd8804d11b48c96b7ff093884b62de758e69574ee829a89ce16c8ea
+DIST amd64-bin-libreoffice-java-7.2.5.2.xd3 30704441 BLAKE2B 7ce0ad8b709f6331f94c56b29e45047c320502797fe23175f9c517cad8e1b192e5f8f2d92d4ddaa0a551accf33b587ed6493369366ae4496473e9e666d6df134 SHA512 6522aa848195b602681d972902e485bfcb018e578f8b0a693aea35a0afa772d054b62f3eefb3e53d54c9791fbfaf275104dd2d95e8c7f8b08c5f55a29247e410
 DIST amd64-bin-libreoffice-kde-7.1.7.2.xd3 21776147 BLAKE2B aa3b38ee9254199f3e23241697340650608786db2789723a0ab306b260a27b12a2171d1218434b7cc9d79a39a4335881fc8f1607da46dac643e6ef4f50afa3b9 SHA512 35f016d5b7b06cbc85c754588e074e5eda5f3f0aa92a36659381bff18c493bcb3ee7c2b366364928b1a3716c0b4819b8b5b17013c84862a93331c9bed92287f2
+DIST amd64-bin-libreoffice-kde-7.2.5.2.xd3 20966714 BLAKE2B 9a9503a191259ad054d72582b88e5923738bdd7bf3008493e6064b4fb84973c5763d8c29bf88db438b5772f11b63ad029ee7a32d791a99c640a56a1e1ae94195 SHA512 2ea0bb46e19548e9c24f0f9713d1c9368619d4d83fb8332ee85a3bc72497d70110a2954b93c51411c83b691195a17861b17657884d73e87f5699fb7d8c40072a
 DIST amd64-bin-libreoffice-kde-java-7.1.7.2.xd3 31001312 BLAKE2B 7fa7e30a355cdda02fcbb138a8898fe4251643480e7b82290f50186e57837e6b9ea9f59c7b6314aa9b64ca8a80be3a337e90bb262fb986d93e530cf83ba04d79 SHA512 d680c553f899ca3af5b76bf33d40e548e435016a7b3d5c0ee24cfde57b0ec4ef0362a302123ce79d0cd6b686ea60523e0320e8041e37538e52f68b9c62ce9929
+DIST amd64-bin-libreoffice-kde-java-7.2.5.2.xd3 30833000 BLAKE2B 20b8c90984db7f61f92d4e27503231efd88f04fee92743e1e80f5d5ba760b08ca77984dc63411d10219b88be50b5140ca0bdf161077aeee3e921dcb2e4f2cfaf SHA512 60d065c777cc922b6ce04c7f5a7d5eb7caeb76356cd4cbd574a4a1e70df8eee387898ab98f6c669dbc19d5b615ee31d0a13d50b02cdf9ea0b3ae8d209c0bf8f6
 DIST x86-bin-libreoffice-7.1.7.2.tar.xz 137617724 BLAKE2B 919be7e29ac3f5c6eb11ac26a10b5005ab64e31a8873cdc5eae896afd3b6ca197c18f90d55c5ec2f6e02e1a03e8929076df9f55d78b356fc13f40fc8ac62c5d1 SHA512 ace271ded273c9b081193d7d31a82ee4474c9b070969d9e848415fa47caf0b314342335cf5dac7a14ae758641f9073ad56057dc5d7e3bc6683bf4e2285b6642f
+DIST x86-bin-libreoffice-7.2.5.2.tar.xz 143261716 BLAKE2B e9b147d79265d5e73c4af998808b12c0c07efd23ccc234f49f26db1827b94ef6fade8e692955e36cda8e3a067ce4ac03eb400f92526ef33082c347c2540ccf90 SHA512 b436c2cf330c2770b2bf7e80d8645ad55204b5920d41ca0c8506d3b0277ed967ade55bec1affbc42cb2b28f7723e42ce5207c4d2bdf293e0777eef31d9675202
 DIST x86-bin-libreoffice-gnome-7.1.7.2.xd3 1455549 BLAKE2B cfe2c9bb8ef2b237b8f672c54d2a4a062cf2d4385a3268d17610334eaf43f7fa1c669ae0e7562a4c551ef757a60fb533af14bcde425fd70a96bdf3bbc1090c4b SHA512 63262258b34cd10b0f2adf528a8d3368552c975b6f40cab2db1f86e768d721d4d78ff6559165928d2f6d920daaaee14234abc1588106a00634cc8b4f7b57315f
+DIST x86-bin-libreoffice-gnome-7.2.5.2.xd3 1459128 BLAKE2B 041da1b99e451933ffcf2f9d8652b080c41b3fa0ac31d38c0cd7b23d25e3e519c190feb114c430453107ea402867128497b36bae2467e3473aad68e134b530a9 SHA512 8c1821b788655a337e1dd19d4fb020729befb47f36f76bad0521f65ff96863ff5920e70e0f59c7964adf609603d64f521a61862e9434c85a9f6520aeb173be3f
 DIST x86-bin-libreoffice-kde-7.1.7.2.xd3 20180804 BLAKE2B 2db3f8240f3bcfa1c719f98dd8fcdf9f93bf0e755211d06ffdbb456743dcaba05a5062563c7b6fd0b92e29f9a73c2752e532e7479cc7dc33f608a81fc10025c6 SHA512 0383a87693a09ddea3466ef60e98df2838852cb32c136ffa7c68687f637d7a056f426bd3cf478d6552be511cd7dc3824d95ce070fc7e14bc56f0c46ed19a389b
+DIST x86-bin-libreoffice-kde-7.2.5.2.xd3 19655768 BLAKE2B 5dc888bc468bd4458752200ff437bca544e83b18c4f0de000228dbc1e8a738fb992ee97add1fd2f0f3bdb8896d72eee2d7d07aabec3c301c6e588f2e1a5ceed0 SHA512 544e3a3da7362621b4044a47180f1959080f42fd20c5b5361d09da239c3ec6f2cee2bacbf57dc1e4da6076fca58345a3a8ac1a9cf1f7001140b891242785822f

app-office/libreoffice-bin/libreoffice-bin-7.2.5.2.ebuild

@@ -0,0 +1,254 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_9 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+	${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+	)
+	gnome? (
+		!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+		java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+	)
+	!kde? ( !gnome? (
+		java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+	) )
+"
+SRC_URI_X86="
+	${BASE_X86_URI}libreoffice-${PV}.tar.xz
+	kde? (
+		${BASE_X86_URI}libreoffice-kde-${PV}.xd3
+	)
+	gnome? (
+		${BASE_X86_URI}libreoffice-gnome-${PV}.xd3
+	)
+"
+
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+	app-text/hunspell:0/1.7
+	=app-text/libexttextcat-3.4*
+	=app-text/libmwaw-0.3*
+	dev-libs/boost:0/1.78.0
+	dev-libs/icu:0/70.1
+	dev-libs/liborcus:0/0.16
+	>=media-gfx/graphite2-1.3.10
+	media-libs/harfbuzz:0/3.0.0[icu]
+	media-libs/libpng:0/16
+	>=sys-devel/gcc-11.2.0
+	>=sys-libs/glibc-2.33
+	virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+	${BIN_COMMON_DEPEND}
+	${PYTHON_DEPS}
+	app-arch/unzip
+	app-arch/zip
+	app-crypt/gpgme[cxx]
+	app-text/hunspell:=
+	>=app-text/libabw-0.1.0
+	>=app-text/libebook-0.1
+	app-text/libepubgen
+	>=app-text/libetonyek-0.1
+	app-text/libexttextcat
+	app-text/liblangtag
+	>=app-text/libmspub-0.1.0
+	>=app-text/libmwaw-0.3.1
+	>=app-text/libnumbertext-1.0.6
+	>=app-text/libodfgen-0.1.0
+	app-text/libqxp
+	app-text/libstaroffice
+	app-text/libwpd:0.10[tools]
+	app-text/libwpg:0.3
+	>=app-text/libwps-0.4
+	app-text/mythes
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	>=games-engines/box2d-2.4.1:0
+	dev-lang/perl
+	>=dev-libs/boost-1.72.0:=[nls]
+	dev-libs/expat
+	dev-libs/hyphen
+	dev-libs/icu:=
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	dev-libs/liborcus:0/0.16
+	dev-libs/librevenge
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/nspr
+	dev-libs/nss
+	>=dev-libs/redland-1.0.16
+	>=dev-libs/xmlsec-1.2.28[nss]
+	media-gfx/fontforge
+	media-gfx/graphite2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.11.0-r1:2
+	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+	media-libs/lcms:2
+	>=media-libs/libcdr-0.1.0
+	>=media-libs/libepoxy-1.3.1[X]
+	>=media-libs/libfreehand-0.1.0
+	media-libs/libpagemaker
+	>=media-libs/libpng-1.4:0=
+	>=media-libs/libvisio-0.1.0
+	media-libs/libzmf
+	media-libs/zxing-cpp
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	net-print/cups
+	sys-apps/dbus[X]
+	gnome? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	!kde? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		gnome-base/dconf
+		media-libs/mesa[egl(+)]
+		x11-libs/gtk+:3[X]
+		x11-libs/pango
+	)
+	kde? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kconfig:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kio:5
+		kde-frameworks/kwindowsystem:5
+	)
+	dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice
+	!app-office/openoffice
+	media-fonts/liberation-fonts
+	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+	java? ( || (
+		dev-java/openjdk:11
+		dev-java/openjdk-jre-bin:11
+		>=virtual/jre-1.8
+	) )
+	kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+	=app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+	xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+	use x86 && use java && die "There is no build for x86 with Java support."
+
+	local patchname
+	use kde && patchname="-kde"
+	use gnome && patchname="-gnome"
+	use java && patchname="${patchname}-java"
+
+	if [[ -n "${patchname}" ]]; then
+		einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+		xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+		mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+	fi
+
+	einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+	unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+	cp "${FILESDIR}"/50-${PN} "${T}"
+	eprefixify "${T}"/50-${PN}
+	default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr
+	cp -aR "${S}"/usr/* "${ED}"/usr/
+
+	# prevent revdep-rebuild from attempting to rebuild all the time
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+
+	ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}

app-shells/mcfly/Manifest

@@ -30,8 +30,8 @@ DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52
 DIST libsqlite3-sys-0.10.0.crate 2175426 BLAKE2B dc7cbbcb632e2de1e8fcd6372cb0a82ed044db1d8634fa88b4294efb01470528fc86cece8c1ba6c4800a97c39d78bebb4b858efaf7c3c74510f5cf675ca2a1f0 SHA512 df030105952e8e0ca9def15d914a2eb7fb81754c85465788f7a3df5626b647d4af7f93b11f2f6d6e3dba286fd101c779dd51de7f2732084ba9542120cbc0e299
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
 DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1
-DIST mcfly-0.5.10.tar.gz 207639 BLAKE2B 90ad658fca16201b541cb45a01919170371ed8435e846d971a213c8890c703fe707607241ef4533bb728a136cc58d2a78b2de4dd15e2de1d0697df9790aa3539 SHA512 7f9da24ad27d95d2e073bf31550f957c70d5f3f800a1473beb4da49d59b579056c4b097b29e79612b57f18fa0e5639d0de44f4074c652f0e5a3daeef28b72562
 DIST mcfly-0.5.11.tar.gz 208182 BLAKE2B ebdde50be976fa13f4edc558d6afa203aa40cbe169e03d249068c7d662b8fd563bf9f62909b97caabe3a5607410c7c4cbc85ccf010c353b6e79499c27869389c SHA512 9c3d4062b3aab7e6656b8c3dddb1102a54092d3f0bf87b898ee9a63976335fa0c3fe0de1cd1da4ea1322b1b970938703f8eeb82919ceecf015f465eca0871c8e
+DIST mcfly-0.5.12.tar.gz 208419 BLAKE2B 20faefb68a6ac4ad40cfc8d98b901b5c0aaf2cbd1d8c002ff44f389f19f005e1a57b21e4fbedf93a17664ccc38f446511fce33081283e43b57f4f2a76c9e770e SHA512 1a5946520d6887afbaf4969d8a3a3ab266f32672ba63189164d245015b3d1224e627658bda3b6868f19099246a884fa7bf95e50bc4a1b2ac186f3209331cd678
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e

app-shells/mcfly/mcfly-0.5.10.ebuild → app-shells/mcfly/mcfly-0.5.12.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2017-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

app-text/build-docbook-catalog/Manifest

@@ -1,2 +1,2 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-DIST build-docbook-catalog-2.1.tar.bz2 4731 BLAKE2B 38864866f03052386a0ba2fe832c750b851a5a0730df54fbac5253da682e92c0d865333c136d9c169a843e2a1ce291b2e5b5af657e7dba0dbf8d2fda213f6891 SHA512 8399652841f25feefa9ad3c138580f31da34410a44f2bdbdb4d63cb6efd1be445c7c4df6ed93629e53df4a4c6d988ed32a6a709f1abb059ccac0bc35b3b516a5
+DIST build-docbook-catalog-2.2.tar.bz2 4711 BLAKE2B c93f6c14450e9308dce82724c305846b1635e96470ecb72c240d502b6f7ed360ee013bf40e3cda204e784c034b8a522f6247b3dbc24fe92a9e12d0ca5c28acb7 SHA512 2e6895f8d3564dbef0dc4882448ee5f4457ac01c58be09e2939a364676a52f7d44899cab621101fb4a3161292d15d9df898e076e412ff50fb88d2861ca554b1e

app-text/build-docbook-catalog/build-docbook-catalog-2.1.ebuild → app-text/build-docbook-catalog/build-docbook-catalog-2.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,7 +33,5 @@ src_configure() {
 pkg_postinst() {
 	# New version -> regen files