Sync with portage [Tue Feb 15 21:53:58 MSK 2022].

2022-02-15 21:53:59 +03:00 · 2022-02-15 21:53:59 +03:00 · 49643903b0
commit 49643903b0
parent ff28fb0785
1413 changed files with 12542 additions and 5166 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -3,3 +3,4 @@ DIST awscli-1.22.37.tar.gz 2148283 BLAKE2B 0355bac3b0710af5ce6938a59c1e93115fb10
 DIST awscli-1.22.46.tar.gz 2160630 BLAKE2B 628f60975b66fb60b4a91edb98856d9cc8cf7b88a1819048dfa25e8a4e3e3b73eade8bfd00355b7bd36a3c61d7028c8226071616aa325021a9e7805a65ff1eda SHA512 0a3eb819a5b34ae0b777f4e35b58ffe165e712bcbe4364643cb5a278f982138e0a4749944d312fd8d5998796758465f4814b67d7a230eb421cb04cf9193dcd5d
 DIST awscli-1.22.49.tar.gz 2161874 BLAKE2B de97f0f9aeb075049e69c5bbd4bc67d59ba964f6508c92f8c2d1574f77dd4f2d602cd16b07270242c516e68d4119f8df95834935bfbcb16eccc3c1bc0a6cb08a SHA512 d55cf65bb8f70e4f98bd1eb0a79385d0959985b1b969e6f0269e7185c4af2cf3b40e0cd6d736431a489e21e4ec5b055ac0727dd1b2226b6d4dc6b19c4609ff11
 DIST awscli-1.22.54.tar.gz 2164355 BLAKE2B 86f103c0ab646f78b77ca35740af816d1e36b2a4055f5f3283a7ce70eea2e3f4c481f2fa0b82f964ad1e725705c3c1adde7f365b2e21b3a435b5766da3d4b645 SHA512 63e95c767cd38fd7b68a4a74acac72abeb02c220ef16941b6d9069c74f9eca1ad29c6f63a89da2873b65b45999017dfe667dab4864cf7877405ac6328865c811
+DIST awscli-1.22.55.tar.gz 2164540 BLAKE2B 7e69d2810ba3a829522e4ada836f70d229ac62d1dae6f9fb087f932ab356b9be98cfd85ab8fe80d7ea2cf1e886def41b11b4d30031784b1ff68bd00ba05798b2 SHA512 1f08c624739e59d416a0a1642e38da3230f6df2d4b2b497b704949965a17d955c0c7c65fde29b037a3176487ba6c5d86e6017aaadf980253fff19d44f410ea5b
--- a/app-admin/awscli/awscli-1.22.55.ebuild
+++ b/app-admin/awscli/awscli-1.22.55.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
+}
--- a/app-admin/eselect/eselect-1.4.20.ebuild
+++ b/app-admin/eselect/eselect-1.4.20.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 DEPEND="sys-apps/sed
--- a/app-admin/mongosh-bin/Manifest
+++ b/app-admin/mongosh-bin/Manifest
@ -1,4 +1,2 @@
-DIST mongosh-1.0.7_arm64.tgz 59235420 BLAKE2B c1993ca1b697eac8c5ed8d2b9ec7af0b28a46021c368d14585736f5fa0a8874db8c6bfb1d362eb62b97c3331c6902c925687f4d8548f6a209dabd698a378151a SHA512 885f86fa15c2ffb596d36bbdee5d3526e7ff0ea53d0530e8066bcfbd430dac678047914de9239a49d6cb6fb1e1d21b336de2a8dae3929af8f0504bebad9265f2
-DIST mongosh-1.0.7_x64.tgz 63269269 BLAKE2B 0403db9fd437a832bc37790ac38ae43b1aa0add711283d0f40631f9c7f8ba7f590d083a53e5ac5403b90d22b34e2a461304593702f876e75a6867e543ce0f152 SHA512 fd232c46dbde02bda22a36300c49748860902d51bd2b01f24464168d0e2b76083369f201900783b4a8c698a77f2a344b903f6c05f0914f9cd94be3fa01270b2f
-DIST mongosh-1.1.7_arm64.tgz 60598298 BLAKE2B 77817d970ddde690c49337d3e39d3f88fe50c442b698ea8d4aca3f7b9626d3f6f96e1094d08011e1c64caf616b9478ea7d275fc5e778b1afe1dfe762e71eff75 SHA512 b842fdc10f53eca4c310fc077340f87f22d2bff9550f8e865846fa6e503d8a8807d1b5e2cf113a636026c2fa233acf313a63bca0853fad91643cb9ce4df515c4
-DIST mongosh-1.1.7_x64.tgz 61852105 BLAKE2B c929806debbf73ba603e716c78a187626c963b6880fff1b8a853092a682c49dee9e07d51705ee365ac57f6e93bac59975d2268761ea473265460437d37dabff0 SHA512 9f89a0f50eae7a33e96d82017ae69c19ab67ff443c156ff3c809564e1a9bf41209c49bb2b04395aeba5c4604b8eb92b870bd6dc76eba0208e03ad0f30fe0a7c5
+DIST mongosh-1.1.9_arm64.tgz 60765908 BLAKE2B 9658285f084b22ea60eaaf0c6aca78362e483b65a0153da1da37ea4d2d233509a145e2aa7f88425169815dda4443eeae9a890fc2a91020294118089260419e20 SHA512 35d7bc3409e5bec874203d8868b863ad13f6b66e82ac933848b245aaae4ab85a7c0db3879e262e62435af44f7aa0f6c46ec27e6b21f5e0d227cda5dfd623f7e2
+DIST mongosh-1.1.9_x64.tgz 62020005 BLAKE2B 2b634fe864bef24bd93f6676acf57d877d745e1407ec150a75e26c498affa39dbfb5918d6645ac33a3c0990a2c33dc464ad2748e7bd9b536111a86dc856a21cb SHA512 99f2b66a7adbd8a395d46e610fa493eff974ace54b2e5cf395b572e023270e5ce3fdf7e7b73bedd3f7f31c2f46964647920920c32ac7460def71dfc5630c26b8
--- a/app-admin/mongosh-bin/mongosh-bin-1.1.7.ebuild
+++ b/app-admin/mongosh-bin/mongosh-bin-1.1.7.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The MongoDB Shell"
-HOMEPAGE="https://github.com/mongodb-js/mongosh https://www.mongodb.com/products/shell"
-
-SRC_URI_BASE="https://downloads.mongodb.com/compass/${MY_P}-linux"
-SRC_URI="amd64? ( ${SRC_URI_BASE}-x64.tgz -> ${MY_P}_x64.tgz )
-		arm64? ( ${SRC_URI_BASE}-arm64.tgz -> ${MY_P}_arm64.tgz )"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 ISC MIT WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="dev-libs/cyrus-sasl[kerberos]"
-
-# Do not complain about CFLAGS etc since we don't use them
-QA_FLAGS_IGNORED='.*'
-
-src_unpack() {
-	if use amd64; then
-		S="${WORKDIR}/${MY_P}-linux-x64"
-	elif use arm64; then
-		S="${WORKDIR}/${MY_P}-linux-arm64"
-	fi
-
-	default
-}
-
-src_install() {
-	dobin bin/mongosh
-}
--- a/app-admin/mongosh-bin/mongosh-bin-1.1.9.ebuild
+++ b/app-admin/mongosh-bin/mongosh-bin-1.1.9.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=8
+EAPI="8"

 MY_PN="${PN%-bin}"
 MY_P=${MY_PN}-${PV}
--- a/app-admin/pass/pass-1.7.3-r2.ebuild
+++ b/app-admin/pass/pass-1.7.3-r2.ebuild
@ -17,7 +17,7 @@ IUSE="+git X emacs dmenu importers"

 RDEPEND="
 	app-crypt/gnupg
-	media-gfx/qrencode
+	media-gfx/qrencode[png(+)]
 	>=app-text/tree-1.7.0
 	git? ( dev-vcs/git )
 	X? ( x11-misc/xclip )
--- a/app-admin/pass/pass-1.7.4-r2.ebuild
+++ b/app-admin/pass/pass-1.7.4-r2.ebuild
@ -17,7 +17,7 @@ IUSE="+git wayland X emacs dmenu importers"

 RDEPEND="
 	app-crypt/gnupg
-	media-gfx/qrencode
+	media-gfx/qrencode[png(+)]
 	>=app-text/tree-1.7.0
 	git? ( dev-vcs/git )
 	wayland? ( gui-apps/wl-clipboard )
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.ebuild
@ -23,7 +23,7 @@ IUSE="+git wayland X emacs dmenu importers"

 RDEPEND="
 	app-crypt/gnupg
-	media-gfx/qrencode
+	media-gfx/qrencode[png(+)]
 	>=app-text/tree-1.7.0
 	git? ( dev-vcs/git )
 	wayland? ( gui-apps/wl-clipboard )
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="encode mad vorbis"
+
+DEPEND="app-cdr/cdrtools
+	encode? ( >=media-sound/lame-3.99 )
+	mad? (
+		media-libs/libao
+		media-libs/libmad
+	)
+	vorbis? (
+		media-libs/libao
+		media-libs/libvorbis
+	)"
+RDEPEND="${DEPEND}
+	!app-cdr/cue2toc"
+BDEPEND="gnome-base/gconf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ax_pthread.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local myeconfargs=(
+		--without-gcdmaster
+		$(use_with vorbis ogg-support)
+		$(use_with mad mp3-support)
+		$(use_with encode lame)
+	)
+	econf "${myeconfargs[@]}"
+}
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
-	CD command line recording, ripping and copying tool.	Especially ISOs- and
-	bin/cue-files are handled very well.
+		CD command line recording, ripping and copying tool. Especially ISOs and bin/cue-files are handled very well.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">cdrdao</remote-id>
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/containerd/containerd-1.4.12.ebuild
+++ b/app-containers/containerd/containerd-1.4.12.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/containerd/containerd/archive/v${PV}.tar.gz -> ${P}.

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="apparmor btrfs device-mapper +cri hardened +seccomp selinux test"

 DEPEND="
--- a/app-containers/docker-cli/docker-cli-20.10.12.ebuild
+++ b/app-containers/docker-cli/docker-cli-20.10.12.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="hardened"

 RDEPEND="!<app-containers/docker-20.10.1"
--- a/app-containers/docker/docker-20.10.12-r1.ebuild
+++ b/app-containers/docker/docker-20.10.12-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor aufs btrfs +cli +container-init device-mapper hardened overlay seccomp"

 DEPEND="
--- a/app-containers/runc/runc-1.0.3.ebuild
+++ b/app-containers/runc/runc-1.0.3.ebuild
@ -17,7 +17,7 @@ SRC_URI="https://github.com/opencontainers/${PN}/archive/v${MY_PV}.tar.gz -> ${P

 LICENSE="Apache-2.0 BSD-2 BSD MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv ~x86"
 IUSE="apparmor hardened +kmem +seccomp test"

 DEPEND="seccomp? ( sys-libs/libseccomp )"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@ -1 +1,2 @@
 DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
+DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
--- a/app-crypt/pesign/files/pesign-114-format-string.patch
+++ b/app-crypt/pesign/files/pesign-114-format-string.patch
@ -0,0 +1,111 @@
+https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch
+
+From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 1 Feb 2022 17:37:14 -0500
+Subject: [PATCH] Fix format strings for 32-bit arches
+
+Sadly, in 2022, this remains a thing.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ src/cms_pe_common.c | 16 +++++++++-------
+ src/password.c      |  7 ++++---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c
+index 964f0d9..3a3921b 100644
+--- a/src/cms_pe_common.c
+++ b/src/cms_pe_common.c
+@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size)
+ 
+ 	if (p + size > m + map_size)
+ 		cmsreterr(0, cms,
+-			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)",
+			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)",
+ 			  (void *)((uintptr_t)p + size),
+ 			  (void *)((uintptr_t)m + map_size),
+ 			  p + size - m,
+@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 	if (!check_pointer_and_size(cms, pe, hash_base, hash_size))
+ 		cmsgotoerr(error, cms, "PE header is invalid");
+ 	dprintf("beginning of hash");
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 	generate_digest_step(cms, hash_base, hash_size);
+ 
+ 	/* 5. Skip over the image checksum
+@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		cmsgotoerr(error, cms, "PE data directory is invalid");
+ 
+ 	generate_digest_step(cms, hash_base, hash_size);
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 	/* 8. Skip over the crt dir
+ 	 * 9. Hash everything up to the end of the image header. */
+@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		cmsgotoerr(error, cms, "PE relocations table is invalid");
+ 
+ 	generate_digest_step(cms, hash_base, hash_size);
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
+	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 	/* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */
+ 	hashed_bytes = pe32opthdr ? pe32opthdr->header_size
+@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		}
+ 
+ 		generate_digest_step(cms, hash_base, hash_size);
+-		dprintf("digesting %lx + %lx", hash_base - map, hash_size);
+		dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 		hashed_bytes += hash_size;
+ 	}
+@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 			memset(tmp_array, '\0', tmp_size);
+ 			memcpy(tmp_array, hash_base, hash_size);
+ 			generate_digest_step(cms, tmp_array, tmp_size);
+-			dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size);
+			dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
+				tmp_size);
+ 		} else {
+ 			generate_digest_step(cms, hash_base, hash_size);
+-			dprintf("digesting %lx + %lx", hash_base - map, hash_size);
+			dprintf("digesting %tx + %zx", hash_base - map,
+				hash_size);
+ 		}
+ 	}
+ 	dprintf("end of hash");
+diff --git a/src/password.c b/src/password.c
+index 644f362..05add9a 100644
+--- a/src/password.c
+++ b/src/password.c
+@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ 	dprintf("non-whitespace span is %zd", span);
+ 
+ 	if (line[span] == '\0') {
+-		dprintf("returning %ld", (line + span) - start);
+		dprintf("returning %td", (line + span) - start);
+ 		return (line + span) - start;
+ 	}
+ 	line[span] = '\0';
+@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ 	dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass);
+ 	dprintf("token:\"%s\"", tp->token);
+ 	dprintf("pass:\"%s\"", tp->pass);
+-	dprintf("returning %ld", (line + span) - start);
+	dprintf("returning %td", (line + span) - start);
+ 	return (line + span) - start;
+ }
+ 
+@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg)
+ 		if (c != '\0')
+ 			span++;
+ 		start += span;
+-		dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]);
+		dprintf("start is file[%td] == '\\x%02hhx'", start - file,
+			start[0]);
+ 	}
+ 
+ 	qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp);
--- a/app-crypt/pesign/files/pesign-114-no-werror.patch
+++ b/app-crypt/pesign/files/pesign-114-no-werror.patch
@ -0,0 +1,13 @@
+diff --git a/Make.defaults b/Make.defaults
+index fdb961a..cdbb064 100644
+--- a/Make.defaults
+++ b/Make.defaults
+@@ -58,7 +58,7 @@ cflags	= $(CFLAGS) $(ARCH3264) \
+ 	-Wall -Wextra -Wsign-compare -Wno-unused-result \
+ 	-Wno-unused-function -Wno-missing-field-initializers \
+ 	-Wno-analyzer-malloc-leak \
+-	-Werror -Wno-error=cpp -Wno-free-nonheap-object \
+	-Wno-error=cpp -Wno-free-nonheap-object \
+ 	-std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
+ 	-D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
+ 	'-DRUNDIR="$(rundir)"' \
--- a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
+++ b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
@ -0,0 +1,19 @@
+https://github.com/rhboot/pesign/issues/78
+
+daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
+  922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+      |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+--- a/src/daemon.c
+++ b/src/daemon.c
+@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds)
+ 	free(pollfds);
+ }
+ 
+-/* GCC -fanalyzer has trouble with realloc
+- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+ static int
+ handle_events(context *ctx)
+ {
--- a/app-crypt/pesign/pesign-114.ebuild
+++ b/app-crypt/pesign/pesign-114.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/openssl:=
+	dev-libs/popt
+	sys-apps/util-linux
+	>=sys-libs/efivar-38
+"
+DEPEND="${RDEPEND}
+	sys-boot/gnu-efi
+"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch
+	"${FILESDIR}"/${PN}-114-no-werror.patch
+
+	"${FILESDIR}"/${P}-format-string.patch
+)
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		ARFLAGS="-cvqs" \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		rundir="${EPREFIX}/var/run"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
+	einstalldocs
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
+}
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot

 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE=""

 RDEPEND="
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}/MathJax-docs-${COMMIT}"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"

 BDEPEND="
 	$(python_gen_any_dep '
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/hexedit/hexedit-1.5.ebuild
+++ b/app-editors/hexedit/hexedit-1.5.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 EGIT_REPO_URI="https://github.com/pixel/hexedit.git"
 else
 SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi

 LICENSE="GPL-2"
--- a/app-editors/zile/Manifest
+++ b/app-editors/zile/Manifest
@ -1,2 +1,2 @@
-DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9
 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575
+DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761
--- a/app-editors/zile/files/zile-2.3.24-gets.patch
+++ b/app-editors/zile/files/zile-2.3.24-gets.patch
@ -1,30 +0,0 @@
-https://bugs.gentoo.org/623218
-Backported from gnulib in zile-2.4.11.
-
--- zile-2.3.24-orig/lib/stdio.in.h
-+++ zile-2.3.24/lib/stdio.in.h
-@@ -717,22 +717,11 @@
- # endif
- #endif
- 
-#if @GNULIB_GETS@
-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gets
-#   define gets rpl_gets
-#  endif
-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (gets, char *, (char *s));
-# else
-_GL_CXXALIAS_SYS (gets, char *, (char *s));
-#  undef gets
-# endif
-_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
--- a/app-editors/zile/files/zile-2.3.24-userhome.patch
+++ b/app-editors/zile/files/zile-2.3.24-userhome.patch
@ -1,26 +0,0 @@
-http://lists.gnu.org/archive/html/bug-zile/2011-08/msg00030.html
-
--- zile-2.3.24-orig/src/file.c
-+++ zile-2.3.24/src/file.c
-@@ -177,14 +177,15 @@ compact_path (astr path)
-     {
-       /* Replace `/userhome/' (if found) with `~/'. */
-       size_t homelen = strlen (pw->pw_dir);
-      if (astr_len (path) >= homelen &&
-          !strncmp (pw->pw_dir, astr_cstr (path), homelen))
-+      if (homelen > 0 && pw->pw_dir[homelen - 1] == '/')
-+        homelen--;
-+
-+      if (astr_len (path) > homelen &&
-+          !strncmp (pw->pw_dir, astr_cstr (path), homelen) &&
-+          astr_get (path, homelen) == '/')
-         {
-           astr buf = astr_new_cstr ("~/");
-          if (STREQ (pw->pw_dir, "/"))
-            astr_cat_cstr (buf, astr_cstr (path) + 1);
-          else
-            astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-+          astr_cat_cstr (buf, astr_cstr (path) + homelen + 1);
-           astr_cpy (path, buf);
-           astr_delete (buf);
-         }
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@ -11,8 +11,4 @@
  or quick editing sessions, especially on remote machines or as a different
  user, e.g. root.
 </longdescription>
-<use>
-  <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg>
-    in tests</flag>
-</use>
 </pkgmetadata>
--- a/app-editors/zile/zile-2.3.24-r2.ebuild
+++ b/app-editors/zile/zile-2.3.24-r2.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Zile is a small Emacs clone"
-HOMEPAGE="https://www.gnu.org/software/zile/"
-SRC_URI="mirror://gnu/zile/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="test valgrind"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch)
-
-src_configure() {
-	# --without-emacs to suppress tests for GNU Emacs #630652
-	econf \
-		--without-emacs \
-		$(use test && use_with valgrind || echo "--without-valgrind") \
-		CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-}
-
-src_test() {
-	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
-		# We have a sane terminal that can move the cursor
-		emake check
-	else
-		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
-		ewarn "Running the tests with TERM=vt100 instead"
-		TERM=vt100 emake check
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# FAQ is installed by the build system in /usr/share/zile
-	dodoc AUTHORS BUGS NEWS README THANKS
-
-	# Zile should never install charset.alias (even on non-glibc arches)
-	rm -f "${ED}"/usr/lib/charset.alias
-}
--- a/app-editors/zile/zile-2.6.2.ebuild
+++ b/app-editors/zile/zile-2.6.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION=0.52
+
+inherit toolchain-funcs vala
+
+DESCRIPTION="Zile is a small Emacs clone"
+HOMEPAGE="https://www.gnu.org/software/zile/"
+SRC_URI="mirror://gnu/zile/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libgee:0.8=
+	sys-libs/ncurses:0="
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="dev-lang/perl
+	sys-apps/help2man
+	virtual/pkgconfig
+	$(vala_depend)"
+
+# AUTHORS, FAQ, and NEWS are installed by the build system
+DOCS="README THANKS"
+
+QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
+
+src_prepare() {
+	default
+	rm *_vala.stamp || die
+	vala_src_prepare
+}
+
+src_configure() {
+	econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_test() {
+	if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then
+		# We have a sane terminal that can move the cursor
+		emake check
+	else
+		ewarn "Terminal type \"${TERM}\" is too stupid to run zile"
+		ewarn "Running the tests with unset TERM instead"
+		( unset TERM; emake check )
+	fi
+}
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/dash/dash-2.19.1.ebuild
+++ b/app-emacs/dash/dash-2.19.1.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"

 BDEPEND="sys-apps/texinfo"

--- a/app-emacs/edit-server/Manifest
+++ b/app-emacs/edit-server/Manifest
@ -1 +1,2 @@
 DIST emacs_chrome-1.15.tar.gz 315059 BLAKE2B 12aee8ddabcaa2c843c6315e510f757a54495affcbdccc315199270270905b3c25409f6a0aee859e0d835e16f0c8c6dab18ee147cd82864d49a6f4e4942fb99e SHA512 c91c6785d92607b2e7f6bba20176048fe8893ac7e672d860ba3befc910825bbae478104b7ba53cd8253a4f354eb26bc0a993f23fed5888c3b8c9cdf00e116c30
+DIST emacs_chrome-1.16.tar.gz 316669 BLAKE2B 07d2c61541510a584a27522902ce86d36fef774cd00d7e1f0edc7dd86edc6d185b5b76f9b4a0fb684083e40518ae731b0945189e338c673c8df2043dec4f9ccc SHA512 8d8093b6ac7b68b2b5d022b5289d99a95fda57b71c0a6b20bcd34ebd8a5dc482a4b21e863a1336f07e9f0dc3d58411946dc519698b376f85f6ea83f49efb6395
--- a/app-emacs/edit-server/edit-server-1.16.ebuild
+++ b/app-emacs/edit-server/edit-server-1.16.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+MY_PN="emacs_chrome"
+DESCRIPTION="Service edit requests from a web browser for editing of textareas"
+HOMEPAGE="https://github.com/stsquad/emacs_chrome"
+SRC_URI="https://github.com/stsquad/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}/servers"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="edit-server-ert.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README"
--- a/app-emacs/ghub/ghub-3.5.4.ebuild
+++ b/app-emacs/ghub/ghub-3.5.4.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
@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"

 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
--- a/app-emacs/helm-system-packages/Manifest
+++ b/app-emacs/helm-system-packages/Manifest
@ -1 +1,2 @@
 DIST helm-system-packages-1.10.1.tar.gz 2683305 BLAKE2B 91c8d939ea04c37a07b9e9761e02e688fb3af81ead00a87ae980fd8da25bde4b87d37486ef5f612aa96723ae92419374f7d4f383784dd32c630993d95cf774d9 SHA512 2ac6daf408a408bec550ddf5469917d93b844cd66bc5567c255bc3aca9d0cc46410d1608deb15e01c5b8c9043a574415f7f848ba901a5ca59bc43deeed8283d7
+DIST helm-system-packages-1.10.2.tar.gz 2685580 BLAKE2B d8f3ea6a1a2f8e32244d85225ea35b7abee1911bc81d88590ad6ca433c8167cd1d2c413d9a656e9f98c25441e2805c565d876792f6f4ca973b1959e6abfbdd88 SHA512 291bb1a8c790b76adc78eb6537935e4ce21e7060289327f072fd4747f2db8a109c60d29c99e484e81c1abc79fb317489b8e6826aa8d8afecefc68228923ed85c
--- a/app-emacs/helm-system-packages/helm-system-packages-1.10.2.ebuild
+++ b/app-emacs/helm-system-packages/helm-system-packages-1.10.2.ebuild
@ -0,0 +1,20 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="A Helm interface to the package manager of your operating system"
+HOMEPAGE="https://github.com/emacs-helm/helm-system-packages"
+SRC_URI="https://github.com/emacs-helm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-emacs/helm"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="readme.org"
--- a/app-emacs/helm/Manifest
+++ b/app-emacs/helm/Manifest
@ -1,2 +1,2 @@
-DIST helm-3.6.0.tar.gz 2302677 BLAKE2B e9a83a1a4f46c1256090ff458ffc3cb158aaa320a067fb1474c9f62bd0cceaf98c53191790113c8af228d8a47fc7d2585a528ffed3e6e06030a4308f9c65e095 SHA512 1cfaf5cdef9203bb92b80c684b21ec7ca92df00aa2e82815e8f39c623648232405273fb272244d7d2b2756f4699f82f93e9a669a13a71da9410f0c0f9df30393
 DIST helm-3.8.0.tar.gz 3943168 BLAKE2B cee9ed8eafdf01cb2109dcf5289522f4a0d9db9a8626097a1ffc3bdeaee792b072b7b27e635ef360815a354c9796b55fc4b3921784e2fd0d655387507df208b6 SHA512 0aec3d4270205c61cabc991dd39d5bac3b10e827f362819e9fb85880985ce2c7e7c7b8f73d2f0cde5b5c168d4b9857e0379f1e4ca9395dbd8f083c1a707ad3f2
+DIST helm-3.8.4.tar.gz 2346120 BLAKE2B 2f554a6a3fc3a42ba2761c267d085ad1e6679f4913bc19cdbbff11130922d93d2fbe75bcae8230748c39148b6e42d45d4c2c711f731ebd4a1984c5927d93d290 SHA512 011cc4eb79a0a6916404428b9f645e4401b8a0b8b473bec88ac4211d4157b78cc673922c1b74dc93d60cf036135a67bd9c174198b63edd63a6d26a40ba9c1b9d
--- a/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch
+++ b/app-emacs/helm/files/helm-3.6.0-no-autoload-check.patch
@ -1,24 +0,0 @@
-https://bugs.gentoo.org/800177
-
--- helm-3.6.0/emacs-helm.sh
-+++ helm-3.6.0/emacs-helm.sh
-@@ -137,19 +137,6 @@
- 
- cd "${0%/*}" || exit 1
- 
-# Check if autoload file exists.
-# It may be in a different directory if emacs-helm.sh is a symlink.
-TRUENAME=$(find . -samefile "$0" -printf "%l")
-if [ ! -z "$TRUENAME" ]; then
-    AUTO_FILE="${TRUENAME%/*}/helm-autoloads.el"
-else
-    AUTO_FILE="helm-autoloads.el"
-fi
-if [ ! -e "$AUTO_FILE" ]; then
-    echo No autoloads found, please run make first to generate autoload file
-    exit 1
-fi
-
- 
- cat > $CONF_FILE <<EOF
- (setq initial-scratch-message (concat initial-scratch-message
--- a/app-emacs/helm/helm-3.6.0-r1.ebuild
+++ b/app-emacs/helm/helm-3.6.0-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 inherit elisp

@ -17,7 +17,7 @@ RDEPEND="app-emacs/async
 	app-emacs/popup"
 BDEPEND="${RDEPEND}"

-PATCHES="${FILESDIR}/${P}-no-autoload-check.patch"
+PATCHES="${FILESDIR}/${PN}-3.8.0-no-autoload-check.patch"
 SITEFILE="50${PN}-gentoo.el"

 src_compile() {
--- a/app-emacs/howm/Manifest
+++ b/app-emacs/howm/Manifest
@ -1 +1,2 @@
 DIST howm-1.4.5.tar.gz 565221 BLAKE2B a28e98e9b955c6172c7b9e51d8f157e22e87846cb2a2955d956f434c2a36fad7e0692c951ef3d37f57363d500d118c2eeaad55276656a8e543b72b8276317fa4 SHA512 b448bf8caeaf21bf1980862ed12541bd793369494a3e321bc5b77bb99ef63cc5ed2f70c54eaa60b427489e9b3fa9b0037d5cbe06449f87af924f245b7f8f2615
+DIST howm-1.4.8.tar.gz 566903 BLAKE2B 0c4dee89147acb40051be18833ec4027bebc81102af2571e15fc06a9c6cefd3d1f0334008550321ad81ec28b44151bc9bc5ab4db8ad376cc4726fd571a77076d SHA512 e95a7e3287cd1cdb1c51d99b00627f8824e1c2a470a1a986910b8e79cd79234a0032c9d92dd5009bb6c09911c1d8848cb0fc585ecce8f5d1020cd5bbe2d36aa8
--- a/app-emacs/howm/howm-1.4.8.ebuild
+++ b/app-emacs/howm/howm-1.4.8.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Note-taking tool on Emacs"
+HOMEPAGE="https://howm.sourceforge.jp/"
+SRC_URI="http://howm.sourceforge.jp/a/${P}.tar.gz"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_configure() {
+	default
+}
+
+src_compile() {
+	emake -j1 </dev/null
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install </dev/null
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog
+}
--- a/app-emacs/magit-popup/magit-popup-2.13.3.ebuild
+++ b/app-emacs/magit-popup/magit-popup-2.13.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit-popup/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"

 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
--- a/app-emacs/magit/magit-3.3.0.ebuild
+++ b/app-emacs/magit/magit-3.3.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=8
@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"

 S="${WORKDIR}/${P}/lisp"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/mmm-mode/Manifest
+++ b/app-emacs/mmm-mode/Manifest
@ -1 +1,2 @@
 DIST mmm-mode-0.5.7.tar.gz 176034 BLAKE2B 23fed0f260c9f46134d83d29e96b96ff331aa0fbe8d121663b74de944489d1a51948f6fba729129e47a34e1ef48cfb0f8bbc45f6ab8f548001bbe0e88a61aeca SHA512 3afb77b3351c8ea5844cd57bb873e6ebe91ce1e268d0d585581482f5039c64ea80fc7aa620e45330eca0eb7839223764164ccc09e932b54f23f3f37c9953cb39
+DIST mmm-mode-0.5.8.tar.gz 176287 BLAKE2B 8dbcf1c1eda543ae52947c220d9adcfc497b060b0a2010e8e0f71d7ee0bfa9bacc2c6eae0c5b2a3260a7492e034bf4f63b24f8bcb00b05d16cc4293f8a49594f SHA512 f27d4dcd46b9db282184252287ab68b7f7fdae5d2522da5c369850ef30f741bac2323ca1a2cc1414aed013202397a6362b31f488e06b0c3de33324514b9e9161
--- a/app-emacs/mmm-mode/mmm-mode-0.5.8.ebuild
+++ b/app-emacs/mmm-mode/mmm-mode-0.5.8.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Enables the user to edit different parts of a file in different major modes"
+HOMEPAGE="http://mmm-mode.sourceforge.net/"
+SRC_URI="https://github.com/purcell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-apps/texinfo"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="mmm.texinfo"
+DOCS="AUTHORS FAQ NEWS README README.Mason TODO"
--- a/app-emacs/queue/Manifest
+++ b/app-emacs/queue/Manifest
@ -0,0 +1 @@
+DIST queue-0.2.el.xz 2168 BLAKE2B 4c6c89ffa66d1bc5da11b78b6965077922384090327360c5b787508d9248051a6e3371b1e6ae5dd0fc8337d4623cbcb07d44d0f6147b29f14da8a3900868bd94 SHA512 62e43482db9828fe6f6d58c95389cd93642a6019211b190dd8f862efa6011708ad8e9a6c025ddb2e663effe0a8aec2f72f42f1afcaaf4c7d64fe698c274eef39
--- a/app-emacs/queue/files/50queue-gentoo.el
+++ b/app-emacs/queue/files/50queue-gentoo.el
@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
--- a/app-emacs/queue/metadata.xml
+++ b/app-emacs/queue/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Provides queues can be used both as a first-in last-out (FILO) and
+    as a first-in first-out (FIFO) stack, i.e. elements can be added to
+    the front or back of the queue, and can be removed from the
+    front. (This type of data structure is sometimes called an
+    "output-restricted deque".)
+  </longdescription>
+  <stabilize-allarches/>
+</pkgmetadata>
--- a/app-emacs/queue/queue-0.2.ebuild
+++ b/app-emacs/queue/queue-0.2.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Queue data structure"
+HOMEPAGE="https://elpa.gnu.org/packages/queue.html"
+SRC_URI="https://dev.gentoo.org/~matthew/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/transient/transient-0.3.7.ebuild
+++ b/app-emacs/transient/transient-0.3.7.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
@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/transient/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"

 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="docs/*.texi"
--- a/app-emacs/treepy/treepy-0.1.2.ebuild
+++ b/app-emacs/treepy/treepy-0.1.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}.el-${PV}"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"

 SITEFILE="50${PN}-gentoo.el"
 DOCS="README.md"
--- a/app-emacs/undo-tree/Manifest
+++ b/app-emacs/undo-tree/Manifest
@ -1 +1,2 @@
 DIST undo-tree-0.6.6.el.xz 31520 BLAKE2B 01ddd3283ab257de91bd3f38969b7426f21df58e010302d21ea093c9428481a4595ea7806c107c7f87f46825bf379e22423004a72d73fedf8c2a6138afeba510 SHA512 0510ca0020515d0afaf13dcfd1878fa527472a4115534b8f72ed907507a700b34fe7151f0f9aca3e9977f9d48a6fae231483beb14b63f1ce734dd6b3b0322a7a
+DIST undo-tree-release-0.8.1.tar.gz 39499 BLAKE2B 0a47ab86889d1d043ff94ced330f9d9e82a9c6914d44633af85ff7e02d80d8914a59345f50a600eb676a9c46619a7ef13b18e4abb02186e6fd39ab9197cf81a6 SHA512 7a5cb7e949d8dd62ce54b7b7ba136f5c6ffcc5ca998af6552e8c9daddf13e38ddfe4de8c2b5d4732d193990018e003bc0eb6b732d913178efba15bb01064a745
--- a/app-emacs/undo-tree/metadata.xml
+++ b/app-emacs/undo-tree/metadata.xml
@ -28,4 +28,7 @@
  best ideas from their competitors!
 </longdescription>
 <stabilize-allarches/>
+<upstream>
+  <remote-id type="gitlab">tsc25/undo-tree</remote-id>
+</upstream>
 </pkgmetadata>
--- a/app-emacs/undo-tree/undo-tree-0.8.1.ebuild
+++ b/app-emacs/undo-tree/undo-tree-0.8.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit readme.gentoo-r1 elisp
+
+DESCRIPTION="Undo trees and visualization"
+HOMEPAGE="http://www.dr-qubit.org/undo-tree.html"
+SRC_URI="https://gitlab.com/tsc25/${PN}/-/archive/release/${PV}/${PN}-release-${PV}.tar.gz"
+S="${WORKDIR}"/${PN}-release-${PV}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable undo trees globally, place '(global-undo-tree-mode)'
+	in your .emacs file."
+
+DEPEND="app-emacs/queue"
+RDEPEND="${DEPEND}"
--- a/app-emacs/websocket/Manifest
+++ b/app-emacs/websocket/Manifest
@ -1,2 +1,2 @@
-DIST websocket-1.10.tar.gz 27108 BLAKE2B b164b3ca47e0705322d9bcd0d9535c8e84777487e8783bf599f5391c88ee6193a1ef1750ec4b3cbd4fac2968c449c4f3a140255a434f3de38e66ad7364c192ba SHA512 ef1a34eccd173eb206cd9eeb4ea988a5b076f178bd4ca903e03b2f2301a34c2cbd08e43a13c8d24a64d10da28b3a77c15b2321978460db7a6b23c601abe31197
 DIST websocket-1.12.tar.gz 27378 BLAKE2B d0aa576333c96e403d4507f25be5661b94de71afea1a39e6abbf0fc57c68dff109336c4c735ae15be336f620b6a09240fdfd4e016a19fc2b92f5836e83181a44 SHA512 c0cdcf407227914a94e24ef90146c3c394e0bc16f131c5b626a6ce49ee235e2519dc7c2dc174e6b87426eba8ce21e84e816b8074866e25be681ca626c51044de
+DIST websocket-1.13.tar.gz 27421 BLAKE2B 1098cd1ba294a2829e7c2b14685514ef2a9426742846159a157f9068714a8d21d0cd2b893a1312cae29ae92231a0685e51832e5bc8715c1c20e62854ec5c81eb SHA512 3f4c9131650992be2992ca646268f01eef2407256c517a26940aabb673c13a6741c1e15cf0832e42c9ee7ffbe3e7b5e6532fcd2d4d77e0d9fae0c6d4f2613354
--- a/app-emacs/websocket/websocket-1.13.ebuild
+++ b/app-emacs/websocket/websocket-1.13.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8
 NEED_EMACS=24

 inherit elisp
--- a/app-emacs/with-editor/with-editor-3.0.5.ebuild
+++ b/app-emacs/with-editor/with-editor-3.0.5.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
@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"

 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="*.texi"
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@ -1 +1,2 @@
+DIST xclip-1.11.el.xz 4500 BLAKE2B 19983f20979bfa96b15d88c9404664c9467cb7254c3eadcf57237ed733db516a5892f9b80d6289c6c4634ec34e16c4f09d0d17bdd35d1912455d79b4b4764f53 SHA512 8370f7bc695198004608e2348ded21a602ff6f062e2d3369a8ebc0c8d17e3d75da975160830b31e5ecaca67247c51f3950a8dfaf0357db5ff5f0e2296358547d
 DIST xclip-1.9.el.xz 5120 BLAKE2B a2cdfda709d51d7cb8cc3792d23d97fee5b03d1a1fbcf8dfb7810aa91080b0e4af47854ec1fc9e184055c50590d181639c0da100bf4e0a0d41dd856c2f75269d SHA512 96df6cc4257125876b57f3aba469c78136c2366d045b5be38c1f2d8ba69752e6625ec6deacc25da013da2a1bff54821d2171bab9308b24ab3e49a18c3d39ddbb
--- a/app-emacs/xclip/xclip-1.11.ebuild
+++ b/app-emacs/xclip/xclip-1.11.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs Interface to XClip"
+HOMEPAGE="https://elpa.gnu.org/packages/xclip.html"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-misc/xclip"
+
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="To enable xclip-mode, add (xclip-mode 1) to your ~/.emacs file."
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r1.ebuild
+++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.12.1-r1.ebuild
@ -42,7 +42,7 @@ src_prepare() {
 		de/xzless.1
 		de/xzmore.1
 		# sys-apps/shadow
-		{de,es,nl,pl}/groups.1
+		{cs,de,es,hu,nl,pl}/groups.1
 		de/su.1
 		# sys-process/procps
 		{de,fr,pl}/free.1
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@ -20,8 +20,10 @@ DIST libcmis-0.5.2.tar.xz 484404 BLAKE2B 7de242393c28fc8289bb598b34e704eb2affaaa
 DIST libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz 5005888 BLAKE2B 836ec268c19c27ac079ea1084587c3e999f39ad2188be1a5cf8337ad0473ffda6c32d0695254d3797d1607707329befa88da6043f424544487238e550eda8590 SHA512 4159dfb4d08e359feb23127e12db590260913e70774161ac9513abb5183ad6ed6d2bdfbe56fc8aa68e2fc57ee29eae67aa0180e1a7d955016884ecba2ca60ff8
 DIST libreoffice-7.2.5.2.tar.xz 252977224 BLAKE2B c8221824ed4747ad7fd9534c6c3d612fa711f78b382587345c5a5604a263b7697fb03c77c1927343052ebcd0aa8db2d693208599137bc8884eeb1bf408951463 SHA512 a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8
 DIST libreoffice-7.3.0.3.tar.xz 254873208 BLAKE2B 08eff5890ca882e3aad688575f3114d461922c497c3397a5ff24c331d74564d0fe2d39e0bf195cd4bc2beadb63ca19914433cf5119990c54ae895cdd89059120 SHA512 408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47
+DIST libreoffice-7.3.1.1.tar.xz 255263512 BLAKE2B abc2893a05a83dae41fcbdb1d22c665e0ffa61c89971a02c910bf98d96e71e88fe53b8049bc0de79c848c5b1c03a84959aa459cc9cf13de7b98f125bd4a55ae5 SHA512 186c4037b3b8e9bc225baf6dffa3604f17fa2340b32286e4557346b119a64bd93d4c62ee1451b3c0bfd88fcebcd5ba7b161680592e8723f686b98d36cba12993
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 DIST libreoffice-help-7.2.5.2.tar.xz 112080572 BLAKE2B 9c07cec6cd6c639335c38af65f3dccf331200422f670fa225e355117062f5ad2a8173c5f59ee63137aa480e8db307b0671e4a7a0ff503ea3a034e126e0464120 SHA512 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00
 DIST libreoffice-help-7.3.0.3.tar.xz 112208912 BLAKE2B 445c0923296010fbbe9a6409596e8bf453ced7989d0a82989f5eb70fcc167039a72783aa85d6c7587e9cba07def80ca5a9e1af450039f7ddaae6233021530c7e SHA512 6d6fb4968ce7b40291c9426183d2d031761e5d3421d66adda0b0e1cf57c1aeb68252cec561119935c68b6239add8ba7ee686ce6365ce84cc2ce4f85346fe2aec
+DIST libreoffice-help-7.3.1.1.tar.xz 112208076 BLAKE2B 0eb13e4143bdc3417baa0c22ffc54db42ee27ec9d476097e681f15f3ceec7a3b657657031ed5d93e59de4867b499095e8bbab1dfafad5cf3ddb1128dde0bc894 SHA512 c9517d94ad18554fb1e35b755fce7863fcc85c54ec8f3719cf55aafddfba8dca10e4ee6a328501da828dd5647960e41ac153f0152d9630c90779f84eb756cff9
 DIST skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz 10630696 BLAKE2B a3d42d08a0622de591d177184b6225cf62e3048d02d8f2012b6b02aae186b644c899c4e73b528b3528a4acec6cec07e3576dd6d97b130fedf3b2ec5b2ddf4ed7 SHA512 625ed461d85ce5c5c73ffd20bc3f2c9b5fe6ba557693b793b387ffb434d4f0d9056bd9befe6760c55e9e47f09c02373a49b8ac106162a40d940ea351e8c873c0
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
--- a/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.1.1.ebuild
@ -0,0 +1,663 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+),xml"
+
+MY_PV="${PV/_alpha/.alpha}"
+MY_PV="${MY_PV/_beta/.beta}"
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make everyone happy.
+DEV_URI="
+	https://dev-builds.libreoffice.org/pre-releases/src
+	https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/
+	https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src
+"
+ADDONS_URI="https://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${MY_PV} == *9999* ]] && inherit git-r3
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}"
+
+# Split modules following git/tarballs; Core MUST be first!
+# Help is used for the image generator
+# Only release has the tarballs
+if [[ ${MY_PV} != *9999* ]]; then
+	for i in ${DEV_URI}; do
+		SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz"
+		SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz"
+	done
+	unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC=(
+	# not packaged in Gentoo, https://github.com/efficient/libcuckoo/
+	"${ADDONS_URI}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz"
+	# broken against latest upstream release, too many patches on top:
+	# https://github.com/tdf/libcmis/pull/43
+	"${ADDONS_URI}/libcmis-0.5.2.tar.xz"
+	# not packaged in Gentoo, https://www.netlib.org/fp/dtoa.c
+	"${ADDONS_URI}/dtoa-20180411.tgz"
+	# not packaged in Gentoo, https://skia.org/
+	"${ADDONS_URI}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz"
+	"base? (
+		${ADDONS_URI}/commons-logging-1.2-src.tar.gz
+		${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+		${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+		${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+		${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+		${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+		${ADDONS_URI}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+		${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+		${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+		${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+		${ADDONS_URI}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+		${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+	)"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
+
+unset ADDONS_URI
+unset ADDONS_SRC
+
+# Extensions that need extra work:
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+
+IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird
+googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test vulkan
+$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	base? ( firebird java )
+	bluetooth? ( dbus )
+	gtk? ( dbus )
+	libreoffice_extensions_nlpsolver? ( java )
+	libreoffice_extensions_scripting-beanshell? ( java )
+	libreoffice_extensions_scripting-javascript? ( java )
+	libreoffice_extensions_wiki-publisher? ( java )
+"
+
+RESTRICT="!test? ( test )"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+
+#[[ ${MY_PV} == *9999* ]] || \
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
+
+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/abseil-cpp:=
+	>=dev-cpp/clucene-2.3.3.4-r2
+	>=dev-cpp/libcmis-0.5.2
+	dev-db/unixODBC
+	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.17.2:0/0.17
+	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]
+	>=games-engines/box2d-2.4.1:0
+	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/openjpeg:=
+	media-libs/zxing-cpp
+	>=net-libs/neon-0.31.1:=
+	net-misc/curl
+	sci-mathematics/lpsolve
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	accessibility? (
+		$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	)
+	bluetooth? (
+		dev-libs/glib:2
+		net-wireless/bluez
+	)
+	coinmp? ( sci-libs/coinor-mp )
+	cups? ( net-print/cups )
+	dbus? ( sys-apps/dbus[X] )
+	eds? (
+		dev-libs/glib:2
+		gnome-base/dconf
+		gnome-extra/evolution-data-server
+	)
+	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1[server] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	gtk? (
+		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
+	)
+	ldap? ( net-nds/openldap )
+	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
+	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+	mariadb? ( dev-db/mariadb-connector-c )
+	!mariadb? ( dev-db/mysql-connector-c )
+	pdfimport? ( app-text/poppler:=[cxx] )
+	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+"
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
+#        tests apparently also need google-carlito-fonts (not packaged)
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libatomic_ops-7.2d
+	dev-perl/Archive-Zip
+	>=dev-util/cppunit-1.14.0
+	>=dev-util/gperf-3.1
+	dev-util/mdds:1/2.0
+	media-libs/glm
+	sys-devel/ucpp
+	x11-base/xorg-proto
+	x11-libs/libXt
+	x11-libs/libXtst
+	java? (
+		dev-java/ant-core
+		|| (
+			dev-java/openjdk:11
+			dev-java/openjdk-bin:11
+		)
+	)
+	test? (
+		app-crypt/gnupg
+		dev-util/cppunit
+		media-fonts/dejavu
+		media-fonts/liberation-fonts
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/libreoffice-bin
+	!app-office/libreoffice-bin-debug
+	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:* )
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bison
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	clang? (
+		|| (
+			(	sys-devel/clang:13
+				sys-devel/llvm:13
+				=sys-devel/lld-13*	)
+			(	sys-devel/clang:12
+				sys-devel/llvm:12
+				=sys-devel/lld-12*	)
+			(	sys-devel/clang:11
+				sys-devel/llvm:11
+				=sys-devel/lld-11*	)
+		)
+	)
+	odk? ( >=app-doc/doxygen-1.8.4 )
+"
+if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
+	PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
+else
+	# Translations are not reliable on live ebuilds
+	# rather force people to use english only.
+	PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+PATCHES=(
+	# "${WORKDIR}"/${PATCHSET/.tar.xz/}
+
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
+	"${FILESDIR}/${PN}-7.2.0.4-qt5detect.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+_check_reqs() {
+	CHECKREQS_MEMORY="512M"
+	if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		CHECKREQS_DISK_BUILD="22G"
+	else
+		CHECKREQS_DISK_BUILD="6G"
+	fi
+	check-reqs_$1
+}
+
+pkg_pretend() {
+	if use x86; then
+		elog "Unfortunately for packaging reasons on x86, various Java-based wizards,"
+		elog "most notably Report Builder in LibreOffice Base, will not be available."
+		elog "See also: https://bugs.gentoo.org/785640"
+	else
+		use base ||
+			ewarn "If you plan to use Base application you must enable USE base."
+		use java ||
+			ewarn "Without USE java, several wizards are not going to be available."
+	fi
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend
+}
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+	xdg_environment_reset
+
+	[[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${MY_PV} = *9999* ]]; then
+		local base_uri branch mypv
+		base_uri="https://anongit.freedesktop.org/git"
+		branch="master"
+		mypv=${MY_PV/.9999}
+		[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}"
+		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
+		git-r3_checkout "${base_uri}/${PN}/core"
+		LOCOREGIT_VERSION=${EGIT_VERSION}
+
+		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
+		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
+	fi
+}
+
+src_prepare() {
+	default
+
+	# sandbox violations on many systems, we don't need it. Bug #646406
+	sed -i \
+		-e "/KF5_CONFIG/s/kf5-config/no/" \
+		configure.ac || die "Failed to disable kf5-config"
+
+	AT_M4DIR="m4" eautoreconf
+	# hack in the autogen.sh
+	touch autogen.lastrun
+
+	# sed in the tests
+	sed -i \
+		-e "s#all : build unitcheck#all : build#g" \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
+		Makefile.in || die
+
+	sed -i \
+		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
+		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
+		bin/distro-install-desktop-integration || die
+
+	if use branding; then
+		# hack...
+		mv -v "${WORKDIR}/branding-intro.png" "icon-themes/colibre/brand/intro.png" || die
+	fi
+
+	# Don't list pdfimport support in desktop when built with none, bug # 605464
+	if ! use pdfimport; then
+		sed -i \
+			-e ":MimeType: s:application/pdf;::" \
+			-e ":Keywords: s:pdf;::" \
+			sysui/desktop/menus/draw.desktop || die
+	fi
+}
+
+src_configure() {
+	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
+	# Note: these are for Gentoo use ONLY. For your own distribution, please get
+	# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+
+	# Show flags set at the beginning
+	einfo "Preset CFLAGS:    ${CFLAGS}"
+	einfo "Preset LDFLAGS:   ${LDFLAGS}"
+
+	if use clang ; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+		LDFLAGS+=" -fuse-ld=lld"
+	else
+		# Force gcc
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if use custom-cflags ; then
+		elog "USE=custom-cflags has been selected. You are on your own to make sure that"
+		elog "the build succeeds. Good luck!"
+	else
+		strip-flags
+	fi
+
+	export LO_CLANG_CC=${CC}
+	export LO_CLANG_CXX=${CXX}
+
+	# Show flags set at the end
+	einfo "  Used CFLAGS:    ${CFLAGS}"
+	einfo "  Used LDFLAGS:   ${LDFLAGS}"
+
+	# Ensure we use correct toolchain
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	if use vulkan && ! use clang ; then
+		ewarn "Building skia with gcc may lead to performance issues. Disable vulkan or enable clang."
+	fi
+
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	use kde && export QT5DIR="$(qt5_get_bindir)/.."
+
+	local gentoo_buildid="Gentoo official package"
+	if [[ -n ${LOCOREGIT_VERSION} ]]; then
+		gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})"
+	fi
+
+	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
+	# --enable-cairo: ensure that cairo is always required
+	# --enable-*-link: link to the library rather than just dlopen on runtime
+	# --enable-release-build: build the libreoffice as release
+	# --disable-fetch-external: prevent dowloading during compile phase
+	# --enable-extension-integration: enable any extension integration support
+	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+	# --disable-report-builder: too much java packages pulled in without pkgs
+	# --without-system-sane: just sane.h header that is used for scan in writer,
+	#   not linked or anything else, worthless to depend on
+	# --disable-pdfium: not yet packaged
+	local myeconfargs=(
+		--with-system-dicts
+		--with-system-epoxy
+		--with-system-headers
+		--with-system-jars
+		--with-system-libs
+		--enable-build-opensymbol
+		--enable-cairo-canvas
+		--enable-largefile
+		--enable-mergelibs
+		--enable-python=system
+		--enable-randr
+		--enable-release-build
+		--disable-breakpad
+		--disable-bundle-mariadb
+		--disable-ccache
+		--disable-epm
+		--disable-fetch-external
+		--disable-gtk3-kde5
+		--disable-online-update
+		--disable-openssl
+		--disable-pdfium
+		--disable-qt6
+		--with-extra-buildid="${gentoo_buildid}"
+		--enable-extension-integration
+		--with-external-dict-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-thes-dir="${EPREFIX}/usr/share/myspell"
+		--with-external-tar="${DISTDIR}"
+		--with-lang=""
+		--with-parallelism=$(makeopts_jobs)
+		--with-system-abseil
+		--with-system-openjpeg
+		--with-system-ucpp
+		--with-tls=nss
+		--with-vendor="Gentoo Foundation"
+		--with-webdav
+		--with-x
+		--without-fonts
+		--without-myspell-dicts
+		--with-help="html"
+		--without-helppack-integration
+		--with-system-gpgmepp
+		--without-system-cuckoo
+		--without-system-jfreereport
+		--without-system-libcmis
+		--without-system-sane
+		$(use_enable base report-builder)
+		$(use_enable bluetooth sdremote-bluetooth)
+		$(use_enable coinmp)
+		$(use_enable cups)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable eds evolution2)
+		$(use_enable firebird firebird-sdbc)
+		$(use_enable gstreamer gstreamer-1-0)
+		$(use_enable gtk gtk3)
+		$(use_enable kde kf5)
+		$(use_enable kde qt5)
+		$(use_enable ldap)
+		$(use_enable odk)
+		$(use_enable pdfimport)
+		$(use_enable postgres postgresql-sdbc)
+		$(use_enable vulkan skia)
+		$(use_with accessibility lxml)
+		$(use_with coinmp system-coinmp)
+		$(use_with googledrive gdrive-client-id ${google_default_client_id})
+		$(use_with googledrive gdrive-client-secret ${google_default_client_secret})
+		$(use_with java)
+		$(use_with odk doxygen)
+	)
+
+	if use eds || use gtk; then
+		myeconfargs+=( --enable-dconf --enable-gio )
+	else
+		myeconfargs+=( --disable-dconf --disable-gio )
+	fi
+
+	# libreoffice extensions handling
+	for lo_xt in ${LO_EXTS}; do
+		if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt}) )
+		else
+			myeconfargs+=( $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt}) )
+		fi
+	done
+
+	if use java; then
+		# hsqldb: system one is too new
+		myeconfargs+=(
+			--without-junit
+			--without-system-hsqldb
+			--with-ant-home="${ANT_HOME}"
+		)
+		if has_version "dev-java/openjdk:11"; then
+			myeconfargs+=( -with-jdk-home="${EPREFIX}/usr/$(get_libdir)/openjdk-11" )
+		elif has_version "dev-java/openjdk-bin:11"; then
+			myeconfargs+=( --with-jdk-home="/opt/openjdk-bin-11" )
+		fi
+
+		use libreoffice_extensions_scripting-beanshell && \
+			myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) )
+
+		use libreoffice_extensions_scripting-javascript && \
+			myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) )
+	fi
+
+	is-flagq "-flto*" && myeconfargs+=( --enable-lto )
+
+	MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# more and more LO stuff tries to use OpenGL, including tests during build
+	# bug 501508, bug 540624, bug 545974 and probably more
+	addpredict /dev/dri
+	addpredict /dev/ati
+	addpredict /dev/nvidiactl
+
+	default
+}
+
+src_test() {
+	make unitcheck || die
+	make slowcheck || die
+}
+
+src_install() {
+	# This is not Makefile so no buildserver
+	emake DESTDIR="${D}" distro-pack-install -o build -o check
+
+	# bug 593514
+	if use gtk; then
+		dosym libreoffice/program/liblibreofficekitgtk.so \
+			/usr/$(get_libdir)/liblibreofficekitgtk.so
+	fi
+
+	# bash completion aliases
+	bashcomp_alias \
+		libreoffice \
+		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+
+	if use branding; then
+		insinto /usr/$(get_libdir)/${PN}/program
+		newins "${WORKDIR}/branding-sofficerc" sofficerc
+		dodir /etc/env.d
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die
+	fi
+
+	# bug 703474
+	insinto /usr/include
+	doins -r include/LibreOfficeKit
+
+	local lodir=/usr/$(get_libdir)/libreoffice
+	# patching this would break tests
+	cat <<-EOF > "${T}"/uno.py
+import sys, os
+sys.path.append('${EPREFIX}${lodir}/program')
+os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:${EPREFIX}${lodir}/program/fundamentalrc')
+EOF
+	sed -e "/^import sys/d" -e "/^import os/d" \
+		-i "${D}"${lodir}/program/uno.py || die "cleanup dupl imports failed"
+	cat "${D}"${lodir}/program/uno.py >> "${T}"/uno.py || die
+	cp "${T}"/uno.py "${D}"${lodir}/program/uno.py || die
+
+	# more system pyuno mess
+	sed -e "/sOffice = \"\" # lets hope for the best/s:\"\":\"${EPREFIX}${lodir}/program\":" \
+		-i "${D}"${lodir}/program/officehelper.py || die
+
+	python_optimize "${D}"${lodir}/program
+	# link python bridge in site-packages, bug 667802
+	local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
+	for py in uno.py unohelper.py officehelper.py; do
+		dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
+		while IFS="" read -d $'\0' -r pyc; do
+			pyc=${pyc//*\/}
+			dosym8 -r ${loprogdir}/__pycache__/${pyc} $(python_get_sitedir)/__pycache__/${pyc}
+		done < <(find "${D}"${lodir}/program -type f -name ${py/.py/*.pyc} -print0)
+	done
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/zsh/zsh-5.8.1.ebuild
+++ b/app-shells/zsh/zsh-5.8.1.ebuild
@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
 		https://www.zsh.org/pub/old/${P}.tar.xz
 		mirror://sourceforge/${PN}/${P}.tar.xz
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@ -1,3 +1 @@
-DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
-DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
 DIST LanguageTool-5.4.zip 202761711 BLAKE2B b23c2944bf40dbef70d43391761849fb83b55538ac1cf0312c82079caef0a91f177f67c0e5818ea558c485d0bc2f4425f6cd32064095aede755a3b1233cf62d7 SHA512 08048f5bb8c5f7050ca2081a9f00405b0b397c37511a8297675f031bbb59e19863195e3b624dabb0964d436ad1570112e8c85225905ae22f2bde2a0200fcd883
--- a/app-text/languagetool/languagetool-4.5.ebuild
+++ b/app-text/languagetool/languagetool-4.5.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
-	rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
-	# Loads of bundled stuff :(
-	#java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar libs/*.jar
-
-	local DIR=/usr/share/${PN}/lib/language-modules
-	java-pkg_addcp "${EPREFIX}${DIR}"
-	insinto ${DIR}
-	doins -r org META-INF
-
-	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
-	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-
-	dodoc CHANGES.md README.md
-
-	unset MY_DEPEND
-	java-pkg_gen-cp MY_DEPEND
-	java-pkg_register-dependency "${MY_DEPEND}"
-}
--- a/app-text/languagetool/languagetool-4.6.ebuild
+++ b/app-text/languagetool/languagetool-4.6.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit java-pkg-2 desktop xdg-utils
-
-MY_PN=LanguageTool
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A proof-reading tool for many languages"
-HOMEPAGE="https://www.languagetool.org/"
-SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CP_DEPEND="
-	dev-java/commons-cli:1
-	dev-java/commons-collections:4
-	dev-java/commons-io:1
-	dev-java/commons-lang:2.1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-	dev-java/hamcrest-core:1.3
-	dev-java/jcommander:0
-	dev-java/jna:4
-	dev-java/slf4j-api:0
-	dev-java/slf4j-nop:0
-"
-
-RDEPEND=">=virtual/jre-1.8
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	rm libs/commons-{cli,collections4,io,lang,logging}.jar || die
-	rm libs/{hamcrest-core,guava,jcommander,jna,junit,slf4j-api}.jar || die
-
-	# Loads of bundled stuff :(
-	#java-pkg-2_src_prepare
-}
-
-src_compile() { :; }
-
-src_install() {
-	java-pkg_dojar *.jar libs/*.jar
-
-	local DIR=/usr/share/${PN}/lib/language-modules
-	java-pkg_addcp "${EPREFIX}${DIR}"
-	insinto ${DIR}
-	doins -r org META-INF
-
-	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
-	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
-	java-pkg_dolauncher ${PN}-server --main org.${PN}.server.HTTPServer
-	newicon -s scalable "${FILESDIR}"/logo.svg ${PN}.svg
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	dodoc CHANGES.md README.md
-
-	unset MY_DEPEND
-	java-pkg_gen-cp MY_DEPEND
-	java-pkg_register-dependency "${MY_DEPEND}"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
--- a/app-text/sigil/sigil-1.8.0.ebuild
+++ b/app-text/sigil/sigil-1.8.0.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"

 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@ -1 +1,2 @@
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
+DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
--- a/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.9.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils optfeature
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-arch/libarchive:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@ -1 +1,2 @@
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
+DIST zathura-ps-0.2.7.tar.xz 4488 BLAKE2B 4513173a2f9ca725abf8444516a78fd789286b082a1146ab5d0dee504cdda92962f3e6cef46f24e0307bc5ea6bb6595577fac2dfbd2d4ef0cf8e69d34337baf5 SHA512 86cf4cea8f32e446960c7727745711d6bb6723bb41127ccba335fbdaeb78e9f681ce4104b2be8718a2f19e06aef30d49ae7c90091fa0774b5ffe22303cf37d5f
--- a/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.7.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura-ps/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild
+++ b/dev-cpp/eigen/eigen-3.4.0-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=7
@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"

 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector

 # Tests failing again because of compiler issues
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
--- a/dev-db/oracle-instantclient-basic/metadata.xml
+++ b/dev-db/oracle-instantclient-basic/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Transition package moving to single ${CATEGORY}/oracle-instantclient package"
-HOMEPAGE="https://bugs.gentoo.org/show_bug.cgi?id=524922#c12"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-db/oracle-instantclient-12[sdk]"
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Transition package moving to single ${CATEGORY}/oracle-instantclient package"
-HOMEPAGE="https://bugs.gentoo.org/show_bug.cgi?id=524922#c12"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=dev-db/oracle-instantclient-basic-12
-	>=dev-db/oracle-instantclient-12[jdbc]
-"
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
--- a/dev-db/oracle-instantclient-odbc/metadata.xml
+++ b/dev-db/oracle-instantclient-odbc/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.ebuild
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Transition package moving to single ${CATEGORY}/oracle-instantclient package"
-HOMEPAGE="https://bugs.gentoo.org/show_bug.cgi?id=524922#c12"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=dev-db/oracle-instantclient-basic-12
-	>=dev-db/oracle-instantclient-12[odbc]
-"
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
--- a/dev-db/oracle-instantclient-sqlplus/metadata.xml
+++ b/dev-db/oracle-instantclient-sqlplus/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Transition package moving to single ${CATEGORY}/oracle-instantclient package"
-HOMEPAGE="https://bugs.gentoo.org/show_bug.cgi?id=524922#c12"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	>=dev-db/oracle-instantclient-basic-12
-	>=dev-db/oracle-instantclient-12[sqlplus]
-"
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/emma/emma-2.0.5312-r3.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r3.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="http://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-CDEPEND="
-	dev-java/ant-core
-	launcher? ( !sci-biology/emboss )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="build"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-java15api.patch"
-	# bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
-	sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	java-pkg_dojar "dist/${PN}_ant.jar"
-	java-pkg_register-ant-task
-
-	use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
-	# One of these does not have java sources
-	use source && java-pkg_dosrc */*/com 2> /dev/null
-}
--- a/dev-java/emma/emma-2.0.5312-r4.ebuild
+++ b/dev-java/emma/emma-2.0.5312-r4.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"

 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 IUSE="+launcher"

--- a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="gnu.regexp-${PV}"
+
+DESCRIPTION="GNU regular expression package for Java"
+HOMEPAGE="https://savannah.gnu.org/projects/gnu-regexp"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+CDEPEND="dev-java/java-getopt:1"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.8:*
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="java-getopt-1"
+
+src_compile() {
+	java-pkg-simple_src_compile
+	java-pkg_addres "${PN}.jar" src -name "*.properties"
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST queue-0.2.el.xz 2168 BLAKE2B 4c6c89ffa66d1bc5da11b78b6965077922384090327360c5b787508d9248051a6e3371b1e6ae5dd0fc8337d4623cbcb07d44d0f6147b29f14da8a3900868bd94 SHA512 62e43482db9828fe6f6d58c95389cd93642a6019211b190dd8f862efa6011708ad8e9a6c025ddb2e663effe0a8aec2f72f42f1afcaaf4c7d64fe698c274eef39`