Sync with portage [Thu Apr 20 21:45:31 MSK 2023].

1 year ago · dd7523143a
parent 109f78ff87
commit dd7523143a
1520 changed files with 21369 additions and 10429 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch
+++ b/app-accessibility/speech-tools/files/speech-tools-2.5.0-musl-isnan.patch
@ -0,0 +1,65 @@
+See https://bugs.openjdk.org/browse/JDK-8178689 for some analysis - we can
+safely replace the deprecated/obsolete isnanf (which musl doesn't immplement)
+with isnan.
+
+https://bugs.gentoo.org/896170
+https://bugs.gentoo.org/829344
+--- a/intonation/tilt/tilt_utils.cc
+++ b/intonation/tilt/tilt_utils.cc
+@@ -133,7 +133,7 @@ float rfc_to_t_tilt(EST_Features &e)
+ {
+     float t_tilt;
+     t_tilt = (rfc_to_a_tilt(e) + rfc_to_d_tilt(e)) / 2;
+-    if (isnanf(t_tilt))
+    if (isnan(t_tilt))
+ 	t_tilt = 0.0;
+     return t_tilt;
+ }
+--- a/sigpr/pda/smooth_pda.cc
+++ b/sigpr/pda/smooth_pda.cc
+@@ -112,7 +112,7 @@ void smooth_portion(EST_Track &c, EST_Features &op)
+ 
+     for (i = 0; i < c.num_frames(); ++i)
+     {   // occasionally NaNs result...
+-	if (isnanf(a[i]))
+	if (isnan(a[i]))
+ 	{
+ 	    c.set_break(i);
+ 	    c.a(i) = 0.0;
+--- a/sigpr/sigpr_frame.cc
+++ b/sigpr/sigpr_frame.cc
+@@ -314,7 +314,7 @@ void lpc2cep(const EST_FVector &lpc, EST_FVector &cep)
+     for (n = 0; n < cep.length(); n++) 
+     {
+ 	// check if NaN -- happens on some frames of silence
+-	if (isnanf(cep[n]) ) cep[n] = 0.0;
+	if (isnan(cep[n]) ) cep[n] = 0.0;
+ 	
+ 	if (cep[n] >  MAX_ABS_CEPS){
+ 	    cerr << "WARNING : cepstral coeff " << n << " was " << 
+--- a/stats/confusion.cc
+++ b/stats/confusion.cc
+@@ -138,7 +138,7 @@ void print_confusion(const EST_FMatrix &a, EST_StrStr_KVL &list,
+ 	cout.precision(3);
+ 	cout.setf(ios::right);
+ //	cout.setf(ios::fixed, ios::floatfield);
+-	if (isnanf(correct(i)))
+	if (isnan(correct(i)))
+ 	    cout << endl;
+ 	else
+ 	    cout << correct(i) << endl;
+--- a/include/EST_math.h
+++ b/include/EST_math.h
+@@ -81,12 +81,6 @@ extern "C" {
+ #define isnanf(X) isnan(X)
+ #endif
+ 
+-/* Linux (and presumably Hurd too as Linux is GNU libc based) */
+-/* Sorry I haven't confirmed this cpp symbol yet              */
+-#if defined(linux)
+-#define isnanf(X) __isnanf(X)
+-#endif
+-
+ /* OS/2 with gcc EMX */
+ #if defined(__EMX__)
+ #define isnanf(X) isnan(X)
--- a/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r2.ebuild
@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_P=${P/speech-/speech_}
+PATCHSET="r3"
+
+DESCRIPTION="Speech tools for Festival Text to Speech engine"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
+SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
+	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
+S="${WORKDIR}/speech_tools"
+
+LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nas openmp X"
+
+RDEPEND="
+	media-libs/alsa-lib
+	sys-libs/ncurses:=
+	nas? ( media-libs/nas )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXt
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md lib/cstrutt.dtd lib/example_data )
+
+PATCHES=(
+	"${WORKDIR}/patch/02_all_gcc42.patch"
+	"${WORKDIR}/patch/03_all_GentooLinux.patch"
+	"${WORKDIR}/patch/05_all_sharedlib.patch"
+	"${WORKDIR}/patch/06_all_gcc43-include.patch"
+	"${WORKDIR}/patch/09_all_remove-shared-refs.patch"
+	"${WORKDIR}/patch/10_all_base_class.patch"
+	"${WORKDIR}/patch/81_all_etcpath.patch"
+	"${WORKDIR}/patch/91_all_gentoo-config.patch"
+	"${WORKDIR}/patch/92_all_ldflags_fix.patch"
+	"${WORKDIR}/patch/94_all_ncurses_tinfo.patch"
+
+	# Fix underlinking, bug #493204
+	"${FILESDIR}/${PN}-2.1-underlinking.patch"
+	"${FILESDIR}/${PN}-2.5.0-fno-common.patch"
+	"${FILESDIR}/${PN}-2.5.0-drop-curses.patch"
+	"${FILESDIR}/${P}-warnings.patch"
+	"${FILESDIR}/${P}-musl-isnan.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	sed -i -e '/^CXXFLAGS  =/s|CC_OTHER_FLAGS|CXX_OTHER_FLAGS|' \
+		config/compilers/gcc_defaults.mak || die
+
+	sed -i -e 's,{{HORRIBLELIBARCHKLUDGE}},"/usr/$(get_libdir)",' \
+		main/siod_main.cc || die
+
+	# bug #309983
+	sed -i -e "s:\(GCC_SYSTEM_OPTIONS =\).*:\1:" \
+		"${S}"/config/systems/sparc_SunOS5.mak || die
+
+	sed -i -e "s|\$(OMP_OPTS)|$(use openmp && echo -fopenmp)|g" \
+		-e "s|\$(OMP_DEFS)|$(use openmp && echo -DOMP_WAGON=1)|g" \
+		-e "/MAKE_SHARED_LIB =/s|-shared|$(use openmp && echo -fopenmp) -shared|" \
+		config/compilers/gcc_defaults.mak || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local CONFIG=config/config.in
+
+	sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die
+
+	if use nas; then
+		sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \
+			${CONFIG} || die
+	fi
+
+	if ! use X; then
+		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die
+	fi
+
+	econf
+}
+
+src_compile() {
+	# Lacks prototypes, bug #881863
+	append-cflags -std=gnu89
+	# Uses 'register' keyword removed in C++17, bug #894184
+	append-cxxflags -std=c++14
+
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CC_OTHER_FLAGS="${CFLAGS}" \
+		CXX_OTHER_FLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+	default
+
+	dolib.so lib/libest*.so*
+
+	insinto /usr/share/speech-tools
+	doins -r config base_class
+
+	insinto /usr/share/speech-tools/lib
+	doins -r lib/siod
+
+	mv include speech-tools || die
+	doheader -r speech-tools
+	dosym ../../include/speech-tools /usr/share/speech-tools/include
+
+	for file in bin/*; do
+		[ "${file}" = "bin/Makefile" ] && continue
+		dobin ${file}
+		dstfile="${ED}/usr/${file}"
+		sed -i -e "s:${S}/testsuite/data:/usr/share/speech-tools/testsuite:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/bin:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+		sed -i -e "s:${S}/main:/usr/$(get_libdir)/speech-tools:g" \
+			${dstfile} || die
+
+		# This just changes LD_LIBRARY_PATH
+		sed -i -e "s:${S}/lib:/usr/$(get_libdir):g" ${dstfile} || die
+	done
+
+	exeinto /usr/$(get_libdir)/speech-tools
+	for file in `find main -perm /111 -type f`; do
+		doexe ${file}
+	done
+
+	# Remove bcat (only useful for testing on windows, see bug #418301).
+	rm "${ED}/usr/bin/bcat" || die
+	rm "${ED}/usr/$(get_libdir)/speech-tools/bcat" || die
+}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -4,3 +4,4 @@ DIST aws-cli-1.27.112.gh.tar.gz 2398322 BLAKE2B aad52e0df4da8c59441b6540f0ce3ac2
 DIST aws-cli-1.27.113.gh.tar.gz 2398657 BLAKE2B 00fc53140bb5085713fecfb4182bb37a032d8cd02de4328435a04e2052ee058ca64ab05666562dd9665c86f95afccb94d1230b248408412a024c973b05ddadcd SHA512 238fd1743b008e76a50edbf688020ecf5d0a302f66d288cdc440893a40471525f9cdd85b8f3fa48370d235de2cafed9b616b335541194e5312e3869c5db746dd
 DIST aws-cli-1.27.114.gh.tar.gz 2406530 BLAKE2B a566214d83d0238c74e306d82829bc9a512aa03def8a4f3ccffc819ded588427051c524fbd91c32f1dd6f6eafd54e6fe40a1e701c9985a1ec587f362fe1c2920 SHA512 60df892a996b5b5c36478e86f321ae9abe3c2d3faafc3187d0b9442d060633ddeddbeeab7ee42a0eca7cb45b07f8c86bbf9d626362a26c503f10b1c693dd1f2a
 DIST aws-cli-1.27.115.gh.tar.gz 2406947 BLAKE2B ef5ac62ef273d92b19d1ef2ea755b35f2353a3aea66e935e44408f11c84320701b7419cfbf36f3ed220d62f3ca3d95ee455b50db4fbed70da7cdef885401090b SHA512 878da56008e5c8cd8347571187713c0624dfedae58bcf02df2082560cdcd082721cd215c4e4bce0b82281bdc61979f4006dd3b860bde65adbf072b45ec89130b
+DIST aws-cli-1.27.116.gh.tar.gz 2408827 BLAKE2B 5b0f0df52ce6772a393f8e31f0161a516ff3abdb2f170ecda587ecc740058ed6b1085a223802374511c8bbd7064dbeeebe1df3282d03c4f48bdb7d93ab46301a SHA512 52ed834dc11e9aed8b50ee2d8a3d3c56a7f1748884323eaaf1337965d11f07867c0a97b5becb397536aee996e556caf57215208883d79684a6df500341414c1b
--- a/app-admin/awscli/awscli-1.27.116.ebuild
+++ b/app-admin/awscli/awscli-1.27.116.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${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() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2-r1.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
 SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
 LICENSE="AGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.2.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Make tinydns and dnscache logs human-readable"
-HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# djbdns-logparse pipes the logs through the "tai64nlocal" program
-# that comes with sys-process/daemontools.
-RDEPEND="sys-process/daemontools"
-BDEPEND="test? ( ${RDEPEND} )"
-
-python_install_all() {
-	doman "doc/man1/${PN}.1"
-	local DOCS=( doc/README )
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	esetup.py test
-}
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,6 +1,8 @@
 DIST rsyslog-8.2208.0.tar.gz 3262298 BLAKE2B c13920c755a24d8060335f3281a349d2f32c3c99de7351991e09e62302f6d9f61f4390b7945e30816c7d28afe5f757f6a49b2855e40e3f2f518a423662196b1b SHA512 e63f2465011722eb1bc99676ef6afd66e655af4fb9d751b3d8776499d054c422b195c65fef9ea6b9012d9fb334b7ed8a1c918167fecff389cbb79aa6b74acb73
 DIST rsyslog-8.2210.0.tar.gz 3266727 BLAKE2B fc94e7d9b7d828c35e6117ff44d40aa421b79ecd9072cc143177cb77ac6e84adaa5e2b9ae9a66e4bb70d8b93411715f63f0e3707e53c965ef892d9146ec43c92 SHA512 c665b7f7a3c5ef31c9b62b50f815cfbb52db0cbe4a06934f4f1c3cd2a56fb49c319d33857ee92ab843aa5894cac16c16b8eccdf83714f31ab57a95049c4af231
 DIST rsyslog-8.2302.0.tar.gz 3273655 BLAKE2B 41ab639dcc93e325b6e092bc7c2c8fa60ce6192ec20033665930573ed5944af5830fc91aa3e607501c2b4759775efcd55631f82096e18ff1df67f00c3e956d6b SHA512 ebdf179c320425a137d1d20eef15163b342165435879e55531aa0dd9ae459fa35266696cc80fecae63a7e1eef31be51ba4154360e5dbe3c00471a84883c03168
+DIST rsyslog-8.2304.0.tar.gz 3274047 BLAKE2B 13c0e200acf750e9b40b14153270b0f45358ac8be7a9d0e1fa879e686da9f5a3be3b7915e3c90757a42dbdfbf4c36301cfea213aafe5a0481e1b117f28cf3cf6 SHA512 ca8df2d1d38c78d853b1081c731d9f94cad653a915259b699f3a78a88bcf9c9d1d18b91667ef954fc96a0bd251aa3afd2b6264ce5a6b4ca700687a654507b64f
 DIST rsyslog-doc-8.2208.0.tar.gz 6563848 BLAKE2B ec68684f1d7d895833f656ba6224a8013213a12b1bc7a28a268f2f629c25a3fbac7c379091f17eae24b6d71278c087e4a4cbed1656554de743fe5616a96559bf SHA512 428c2fe9e5025928d4a9d33f05f4eb20ac1bbde052b7fa2a8a0e45bfffe111eecc94eb2b6ec129de1011f0eabb106b4fb41d402b2a270e4148d3b1081e3b1da0
 DIST rsyslog-doc-8.2210.0.tar.gz 6572454 BLAKE2B feb865e3585ee441117f38de61748a6ca99767dae113cfcf2cd0d0a124cc692889be713134163fc91f4ab43b9fe530e3c7c0b84e4bd4e70081c4539297ae1406 SHA512 e7847a9307a91fdf87d6cf91d2391eb75869679905b9598310c456fb3fe1864fc06dbdc649778f5b3788e47ffda0a6d89cb894258e55db441f7df7e74b0ae9f4
 DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbee05129dcd5bfe36d74595ce90e91ed8efa2d32cc817dadc9634a67eab7b9e640ad686685495cff75ebb1ff16730c8e904 SHA512 b922a4ed3e7b7235aa4a00c26a45b3b9f3a092679a7ce324543eea0c59cb34ad5a0ee2cac3a37e8964a4bc059cbcc661932496c7ff5765ef4f2da19cb6d35ee2
+DIST rsyslog-doc-8.2304.0.tar.gz 6586061 BLAKE2B 4680db37eaa8583e21865fafb62ba07ffa235f4184a43bf9a1930166aa26a3bccdc15c43ba26504d157339eb02b05ea95076cf738abc3323eef16e07b42de2af SHA512 1ce8a8cf40cb767e4e62016aa2513f93535a3bd3c47ef34bc1efca007f7afe5c84ca4d30e911903dc8ba529ede0a07feb05ace075b5ef6c1757e5727d11f112e
--- a/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2304.0.ebuild
@ -0,0 +1,496 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+	sys-apps/lsb-release
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	imhttp? (
+		dev-libs/apr-util
+		www-servers/civetweb
+		virtual/libcrypt:=
+	)
+	impcap? ( net-libs/libpcap )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? (
+		>=dev-libs/hiredis-0.11.0:=
+		dev-libs/libevent[threads(+)]
+	)
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		>=dev-libs/openssl-0.9.8y:0=
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			dev-libs/openssl:0=
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-4:=[drafts]
+	)"
+
+DEPEND="
+	${RDEPEND}
+	elibc_musl? ( sys-libs/queue-standalone )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	BDEPEND+=" >=sys-devel/bison-2.4.3"
+	BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+PATCHES=( "${FILESDIR}"/${PN}-8.2112.0-pr5024-configure.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		--disable-imfile-tests  # Some imfile tests fail (noticed in version 8.2208.0)
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without dependencies
+		--enable-imbatchreport
+		--enable-imdiag
+		--enable-imdocker
+		--enable-imfile
+		--enable-improg
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without dependencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmtaghostname
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		--enable-fmunflatten
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmdb2diag
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis imhiredis)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable imhttp)
+		$(use_enable impcap)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	systemd_newunit "${FILESDIR}/${PN}.service" ${PN}.service
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/${PN}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/${PN}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	if ! hash certtool &>/dev/null; then
+		die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" || die
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" || die
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
--- a/app-admin/su-exec/su-exec-0.2.ebuild
+++ b/app-admin/su-exec/su-exec-0.2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit toolchain-funcs

--- a/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-4.1.1-r1.ebuild
@ -32,7 +32,12 @@ RDEPEND="
 	json? ( >=dev-libs/json-c-0.9:= )
 	kafka? ( >=dev-libs/librdkafka-1.0.0:= )
 	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
-	python? ( ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
 	redis? ( >=dev-libs/hiredis-0.11.0:= )
 	smtp? ( net-libs/libesmtp:= )
 	snmp? ( net-analyzer/net-snmp:0= )
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/vimball/vimball-0.5.1-r1.ebuild
+++ b/app-arch/vimball/vimball-0.5.1-r1.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/radhermit/vimball.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	inherit pypi
 fi

--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/burp/burp-3.1.4.ebuild
+++ b/app-backup/burp/burp-3.1.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="acl test xattr"

 RESTRICT="!test? ( test )"
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"

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

 src_install() {
--- a/app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
+++ b/app-backup/untangle-https-backup/untangle-https-backup-0.1.0.ebuild
@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(  python3_9 python3_10 )
-PYTHON_REQ_USE="ssl(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1
-
-DESCRIPTION="Back up Untangle configurations via the web admin UI"
-HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-src_install() {
-	distutils-r1_src_install
-	doman "doc/man8/${PN}.8"
-	dodoc "doc/${PN}.example.ini"
-}
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@ -1 +1 @@
-DIST stress-ng-0.15.06.tar.gz 3813785 BLAKE2B ebed2b6b087afc615e3a94ae239df32a7847f1ddc5db83a733ce8415d76818000bb742604643ebdd06d13e584a66c6814feb660752738f3fe7e714670e4ad396 SHA512 a999ecb813504cdcd56cb3f9ac6633c91ee3df2c203866d29fb04b61c41ee5e7738ca84cdbdb2cb8c6fe969f29a64d21a8df17419901266efc7f1170eb18013a
+DIST stress-ng-0.15.07.tar.gz 3830971 BLAKE2B 15e4aec04313a1c286c080a9a4d646a7908e213fe8680fd105017a23843f094185ee2564b497d8d3103389b6b9d6a512ec150a47202a59c4a4dad554425f655b SHA512 f6ff566aecaff1b98ce74a95c4bf9fab3fd2085c2d9805e6b1c2d1a1477e0af8514f37cab9575b4b4d5079e3d26dffd16d852c72ca0b98b840c2d84ec19bef66
--- a/app-benchmarks/stress-ng/stress-ng-0.15.07.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.15.07.ebuild
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"

 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/codegroup/codegroup-20080907-r1.ebuild
+++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild
@ -1,23 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit toolchain-funcs

 DESCRIPTION="encode / decode binary file as five letter codegroups"
-HOMEPAGE="http://www.fourmilab.ch/codegroup/"
-SRC_URI="http://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+HOMEPAGE="https://www.fourmilab.ch/codegroup/"
+SRC_URI="https://www.fourmilab.ch/${PN}/${PN}.zip -> ${P}.zip"
+S=${WORKDIR}

 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""

-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"

-S=${WORKDIR}
 PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )

 src_configure() {
--- a/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
+++ b/app-crypt/gifshuffle/gifshuffle-2.0-r1.ebuild
@ -1,23 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=8

 inherit toolchain-funcs

 DESCRIPTION="GIF colourmap steganography"
-HOMEPAGE="http://www.darkside.com.au/gifshuffle/"
-SRC_URI="http://www.darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://darkside.com.au/gifshuffle/"
+SRC_URI="https://darkside.com.au/gifshuffle/${PN}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}"

 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"

 src_compile() {
 	echo $(tc-getCC) -o ${PN} ${CFLAGS} ${LDFLAGS} *.c || die
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,2 +1,4 @@
+DIST kicad-doc-6.0.11.tar.bz2 79253772 BLAKE2B 904c01cd00b1669620018194e98303c00ba2ba32b44fed2f36966edf40487c26b6a7ed827a0c35908eb74ea04054a0c7cc39d371e5c6013bee484bf2b67f6177 SHA512 1c942a53dfcf071e83d5b7674df446b55818961da69586fe772467e4cf7ea64a13de01af20ec087c8a73f9d101a5a48680d840415e1a278e2ef5b22952980180
 DIST kicad-doc-6.0.9.tar.gz 81321926 BLAKE2B 0885d0210afcc83c2ccaad3a0caac912e8f756e69c4569e543a81440e14b6e3ead68ccc427f4dcd9026ebf86a8e3c45487955479bf8c43ce9bb6680de9da777c SHA512 be8ae3bbebce334d7d7ab0e24bf3712aaa83b078f1a4495b755cdd9a5ff8e55951dbd82c5ac17c5aeba66008a9e6ef1b9f104f51ad340cb7cb88abdd86e5853d
 DIST kicad-doc-7.0.0.tar.bz2 104561946 BLAKE2B 1f19b489a3b40e15f9f4a775582caf192180b345bf559d8e2b1954b2c72301ad25264e7bf27df46ba9b2a52848478441df383f5766c7111340b04aa45720f40a SHA512 b3cd797751b3183eabadd71e02031ff0b3e5d4744e1c55c16ae5b22bdc45f7cb874defde407d6d819b7c00b06daad84260b980f9afca1f5805c17ebf177300b8
+DIST kicad-doc-7.0.1.tar.bz2 104103280 BLAKE2B dbdcd82e65c9d3a2bff629f8fa4e3cc34c2adbfa3fe9a808e3802addc3d75f3875ad52c4f5e79cb2bfb7563a6288d0c2eb6f119adf4f7fd2f31360cea82d1ea7 SHA512 5274ef673db9e415d5b82522681acdd4ee2b2f615bb52abdd11ebd17b72f36852ee297fdb98f9cf1dee12671a23adc24a6a8a03be720b579bbee7a9ead167e41
--- a/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-6.0.11.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +pdf once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=app-text/asciidoc-8.6.9
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		# May not always work?
+		# https://gitlab.com/kicad/services/kicad-doc/-/issues/808
+		-DADOC_TOOLCHAIN="ASCIIDOC"
+		# Note: need EAPI 8 usev here, not pre-EAPI 8 behaviour
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
+	)
+	cmake_src_configure
+}
--- a/app-doc/kicad-doc/kicad-doc-7.0.1.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-7.0.1.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Electronic Schematic and PCB design tools manuals"
+HOMEPAGE="https://docs.kicad.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/kicad/services/kicad-doc.git"
+	inherit git-r3
+	# x11-misc-util/macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://gitlab.com/kicad/services/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="|| ( GPL-3+ CC-BY-3.0 ) GPL-2"
+SLOT="0"
+# TODO: Change default back to +pdf once asciidoctor-pdf is packaged?
+IUSE="+html pdf"
+
+LANG_USE=" l10n_ca l10n_de l10n_en l10n_es l10n_fr l10n_id l10n_it l10n_ja l10n_pl l10n_ru l10n_zh"
+IUSE+=${LANG_USE}
+REQUIRED_USE="|| ( html pdf ) ^^ ( ${LANG_USE} )"
+unset LANG_USE
+
+# TODO: need asciidoctor-pdf for pdf
+# bug #697450
+BDEPEND="
+	>=dev-ruby/asciidoctor-2.0.12
+	>=app-text/dblatex-0.3.10
+	>=app-text/po4a-0.45
+	>=sys-devel/gettext-0.18
+	dev-perl/Unicode-LineBreak
+	dev-util/source-highlight
+	l10n_ca? ( dev-texlive/texlive-langspanish )
+	l10n_de? ( dev-texlive/texlive-langgerman )
+	l10n_en? ( dev-texlive/texlive-langenglish )
+	l10n_es? ( dev-texlive/texlive-langspanish )
+	l10n_fr? ( dev-texlive/texlive-langfrench )
+	l10n_it? ( dev-texlive/texlive-langitalian )
+	l10n_ja? ( dev-texlive/texlive-langjapanese media-fonts/vlgothic )
+	l10n_pl? ( dev-texlive/texlive-langpolish )
+	l10n_ru? ( dev-texlive/texlive-langcyrillic )
+	l10n_zh? ( dev-texlive/texlive-langchinese )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPDF_GENERATOR="DBLATEX"
+		-DBUILD_FORMATS="$(usev html);$(usev pdf)"
+		-DSINGLE_LANGUAGE="${L10N}"
+		-DKICAD_DOC_PATH="${EPREFIX}"/usr/share/doc/${P}/help
+	)
+	cmake_src_configure
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/joe/files/joe-4.6-c99.patch
+++ b/app-editors/joe/files/joe-4.6-c99.patch
@ -0,0 +1,59 @@
+https://bugs.gentoo.org/900164
+Patch from https://sourceforge.net/p/joe-editor/mercurial/merge-requests/3/
+
+commit 26e83257075789d901cadbe280ff7f1bd7602983
+Authored by: Nikita Popov 2023-01-31
+
+   Port to C99
+
+   Ensure that functions are declared before use for compatibility
+   with newer compiler versions.
+
+--- a/acinclude.m4
+++ b/acinclude.m4
+@@ -9,7 +9,7 @@
+ int main() {
+   int a = 0;
+   isblank(a++);
+-  exit(a != 1);
+  return a != 1;
+ }
+ 			],
+ 			[joe_cv_isblank=yes],
+@@ -34,7 +34,7 @@
+ #endif
+ int main() {
+ 	/* exit succesfully if setpgrp() takes two args (*BSD systems) */
+-	exit(setpgrp(0, 0) != 0);
+	return setpgrp(0, 0) != 0;
+ }],
+ 			[joe_cv_setpgrp_void=no],
+ 			[joe_cv_setpgrp_void=yes],
+@@ -95,7 +95,7 @@
+ 	kill((int)getpid(), SIGINT);
+ 	kill((int)getpid(), SIGINT);
+ 	/* exit succesfully if don't have to reinstall sighandler when invoked */
+-	exit(nsigint != 2);
+	return nsigint != 2;
+ }],
+ 			[joe_cv_reinstall_sighandlers=no],
+ 			[joe_cv_reinstall_sighandlers=yes],
+--- a/joe/selinux.c
+++ b/joe/selinux.c
+@@ -6,6 +6,7 @@
+ 
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
+#include <error.h>
+ static int selinux_enabled = -1;
+ #endif
+ 
+@@ -108,7 +109,7 @@
+ 		return 0;
+ 
+ 	if (setfscreatecon(0) < 0) {
+-		error(0, errno, joe_gettext(_("Could not reset default security context")));
+		error(0, errno, "%s", joe_gettext(_("Could not reset default security context")));
+ 		return 1;
+ 	}
+ #endif
--- a/app-editors/joe/joe-4.6-r2.ebuild
+++ b/app-editors/joe/joe-4.6-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3-tinfo.patch"
 	"${FILESDIR}/${P}-db.patch"
 	"${FILESDIR}/${P}-prototypes.patch"
+	"${FILESDIR}/${P}-c99.patch"
 )

 DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
--- a/app-editors/joe/metadata.xml
+++ b/app-editors/joe/metadata.xml
@ -15,7 +15,7 @@
  user should expect: full use of termcap/terminfo, excellent screen update
  optimizations, simple installation, and all of the UNIX-integration features
  of VI.
-</longdescription> 
+</longdescription>
 <use>
  <flag name="xterm">Enable full xterm clipboard support</flag>
 </use>
--- a/app-editors/pyvim/pyvim-3.0.3.ebuild
+++ b/app-editors/pyvim/pyvim-3.0.3.ebuild
@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"

 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"

 RDEPEND="
 	dev-python/docopt[${PYTHON_USEDEP}]
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
+++ b/app-emacs/all-the-icons-ivy-rich/all-the-icons-ivy-rich-1.9.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz

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

 RDEPEND="
 	app-emacs/all-the-icons
--- a/app-emacs/buttercup/Manifest
+++ b/app-emacs/buttercup/Manifest
@ -1,4 +1,4 @@
-DIST buttercup-1.26.tar.gz 87554 BLAKE2B ee5d37360b6c9daa8b790f7ea6ae5bf7ff4266b1fcbe913877aefd4ede2e7d6561e48eae533c17c906e19b498d9d127692597ee728bd1fa791430f5f6ab508c8 SHA512 fb491e1db33ffaeca52529630c538040487a7bdf7766faab2c6a1bc39d1060c5bbbb7a259006b741abbec9b9a6911f8390b2513e0a4dddf856b79274ed24307c
 DIST buttercup-1.28.tar.gz 87689 BLAKE2B 510741e02c5973c80f3b6d9374d179b132ead8aefddee530f9a5f2cd5e6603bcb925060e40d614ec6804bc6aa918e6dea568d47ad3295c427066ab4c4953b37e SHA512 b83f1a9e14bce6e6e63047788bfa4e34b8d958c6422a52829c8752e6af7622764021c1574f812160472de123f0cdc68edb6daa0703d3b2633e84fe7df6ddeacc
 DIST buttercup-1.29.tar.gz 87693 BLAKE2B f42b98303a058dc3435b00dc5b50eb7217cfd70b48f982cb8823401b4d603ba2292a3235077d1263ddeba69284f6d7a37e407869dd3d4357102f1e765b14bf4e SHA512 3d400dfe5020fffefa5e8b32b9d5b8191a4882d790a9c5d48267cb021ffd0d6e9256116dca0d6118e920a2a0a2902bba7a2f73504c165cad71a4fc7f9867542f
 DIST buttercup-1.30.tar.gz 91126 BLAKE2B d9024aa154d5408bb6c200099be2d8d9a96df61e421f0d602bcc4ef0350665e250362384d3cd931bdf72f74cb9d95cdd62fda3bba4171f2de764876d1716f69d SHA512 e7dd6e0823216e593943545ef0ff6ac81322a6d0317f8517d14ddc65059638ef4435539e0722c6ba340eee7c32473310af62a2341e30d43effd1d787dad6ab61
+DIST buttercup-1.31.tar.gz 91816 BLAKE2B 2a2569a3750b4ebf7ffdf7a0812be322b1f71b3579e35e55de5097a221ab342808349b8cc0e5f958b855aca709fe0b1e83efd005895c52e8dcf59a25960c05e9 SHA512 b7a779b610295d4ce24e537c4a3b4fd8b23c2fa8bcbd3ca622fe96681cf294dcc9eaea082441f23efa75a13c54cc768c63bcff1e0bb8bd7d1971c75c10c21e5e
--- a/app-emacs/buttercup/buttercup-1.31.ebuild
+++ b/app-emacs/buttercup/buttercup-1.31.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}"/emacs-${P}

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

 DOCS=( docs/{running,writing}-tests.md  )
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/citar/citar-1.2.0.ebuild
+++ b/app-emacs/citar/citar-1.2.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/emacs-citar/${PN}/archive/v${PV}.tar.gz

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

 RDEPEND="
 	app-emacs/citeproc-el
--- a/app-emacs/doom-modeline/Manifest
+++ b/app-emacs/doom-modeline/Manifest
@ -1 +1,2 @@
 DIST doom-modeline-3.3.2.tar.gz 61363 BLAKE2B 2b80748265f911954e1726dc30e6bacf4ba7ffb6eb589e8f67c366b818e212376039eb025d380937b327f7d3d4a980ec6bfe0589ac38af1e0d678a8f6038b97f SHA512 ff0b41c5f8dc7e5a4a5bccaa710b445a1894948893cd7dea6c564d3a9b1be5cd7cd005e6a28613a6800526d5158faebfef51d21b9e911d97416821210954f0b3
+DIST doom-modeline-3.4.0.tar.gz 62357 BLAKE2B d3af3875b25f9ef8d2b75e1acd4ed9c7f8e3d5ba306731f019ae076d14339c97b9f7f59bbb0806e5443c39d855aa0af9c2f9509ca93b11a9a275aa341e4d431b SHA512 1ed7c061e43fdb1e5a9fbe1cc5f87021a90796057206c64ff4f590089e0b5bd835d27f95129c92e1deb50012dc033608b071fadd294df4f102d67cb2872b8b86
--- a/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
+++ b/app-emacs/doom-modeline/doom-modeline-3.4.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Fancy and fast mode-line for Emacs inspired by minimalism design"
+HOMEPAGE="https://seagle0128.github.io/doom-modeline/
+	https://github.com/seagle0128/doom-modeline/"
+SRC_URI="https://github.com/seagle0128/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND="
+	app-emacs/all-the-icons
+	app-emacs/compat
+	app-emacs/shrink-path
+"
+BDEPEND="${RDEPEND}"
+
+elisp-enable-tests ert test
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
--- a/app-emacs/marginalia/Manifest
+++ b/app-emacs/marginalia/Manifest
@ -1,2 +1,3 @@
 DIST marginalia-1.0.tar.gz 29142 BLAKE2B 99048ebca2156981aa77eb10bbd914648932bfc328f41abdda8196361542e7550895f5263b04a239fca3ef79a2cc87ff7e9a9d315ab46ef6d87846117a325cd5 SHA512 82b7220bce1d8804be9a4783518f4492d66e039a50c0fb064bbfe18acf119600a9f3c9cc2dede038b390c4522c1163ea1982e9f3f8a3f170c0f4f86ef1ec87d5
 DIST marginalia-1.1.tar.gz 30058 BLAKE2B 9d2b792383ed3c67ce1611ce0eab31edfc0769ee2243a7d8e189a398076d977b0a5db60ecd28d3ea8483a91fd27088d6b4fbbe0d9c5e16a3348b7cd7e211f05c SHA512 83cf7a4dce4a4f0064ef2a7c51beb6ced73aa4f8951d2920fbaf6f879ec5ff9431890840f2afcc0741b3cccc6842a68461ccdf51450b6b4d2877477731796be2
+DIST marginalia-1.2.tar.gz 30235 BLAKE2B 65027b482333086dc3a328741df772b5ab8435bc576c46602194c6373c812cc956a4936205b071e71453f5634b4481aa8ed8d3b08c3687788b6b92385a1cc54c SHA512 708effbeec74e0ef24f307d8a93f9d6e7b6936c343a79e72bc333520bbe0ec9d101fecf84793ef3f3b274b2c3bca88ee01d52ff37d154128a46eb774f9775c82
--- a/app-emacs/marginalia/marginalia-1.2.ebuild
+++ b/app-emacs/marginalia/marginalia-1.2.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=27.1
+
+inherit elisp
+
+DESCRIPTION="Marginalia in the minibuffer"
+HOMEPAGE="https://github.com/minad/marginalia"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
+
+RDEPEND=">=app-emacs/compat-29.1.4.0"
+BDEPEND="${RDEPEND}"
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@ -3,3 +3,4 @@ DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d13
 DIST org-mode-release_9.6.1.tar.gz 2207262 BLAKE2B 1e5880b9a3eab54e0a6f94cd630bff1ad00f58a24f0f46c203de01ee12c0ce652a8dd820b4a71c2d011d1cca55c08830cdf5e33410e2bccba95845ae05a20408 SHA512 0bf1e4879ade377276b438d7f71cfa28a75b70380db16d79fb698f7ff4f79b80684bc28a69dd23bbcd94844365a0cec36d70bd4097cc12e2b942ad6a97a5af6a
 DIST org-mode-release_9.6.2.tar.gz 2208663 BLAKE2B f76e48f058a2a32cb09c14041b6781c385e1267eb2c80e39d0c2b3432ff7555e27b21ce33e1e5e0c0a99ded31b6d3b3ed678e41ff00752f97d2feda8b0111911 SHA512 2dfbcaa8c720b628770ae3bee223c51c270220395b5d1659dc529bd60b20f7308091b565d90d53ebb9462edd6207a1652059623dc80b0bf8b2799b3beac5a2fe
 DIST org-mode-release_9.6.3.tar.gz 2208740 BLAKE2B 77d8e7de2230a3d4b5f3e85336519de1b2d55481522bedc206c5edb2cd56963f729d1e48fe483717fd4c295c6eb1b73e9335ab6a56c2903dd9ee54e15da0a8a0 SHA512 4a7040bab029c8384fa8689782672887baec7eea66ea99a32fd026eddb1659fa15e6c8ba99546fb7b8a16492d1fa476542acba3adef745079f583bd0e2b834e0
+DIST org-mode-release_9.6.4.tar.gz 2208733 BLAKE2B 4ac49b4af872750453dd29eb0fb7de75a140246defb98a1ee62b693fe5083b892eff32ffda6a87cdc4d22486c8246134bb7483e3ec335e23ee131e0f6894475d SHA512 fa117500e0618f20b55af6e7f3cee2d24bbcf396649fabc1420299d99599335c0697e865ac38e49a30d5f2cd00e6daf163f340364e51c306583a7198852df059
--- a/app-emacs/org-mode/org-mode-9.6.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.6.4.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake -j1 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README.org CONTRIBUTE.org etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+		so you may have to install one or more additional packages.
+		A non-exhaustive list of these dependencies may be found at
+		<http://orgmode.org/worg/org-dependencies.html>."
+	readme.gentoo_create_doc
+}
--- a/app-emacs/osm/Manifest
+++ b/app-emacs/osm/Manifest
@ -1,2 +1,2 @@
 DIST osm-0.10.tar.gz 31628 BLAKE2B 6cb3d4fcee65b93787507fcdc15afce521e4d65c2fcea9f729e5292bfc57ec065604c8439bc5d0d744969c36fcba14204257a93546d1c67a9d3d8a816e26e9e7 SHA512 03ad03b9b64244c53c2b9a7329b9d741f33102e41684488385bdc60e5398b9cba7d3950cb0937b4bdecb93017cb2c1b5f99324195349b88ae7eed66431149ba6
-DIST osm-0.9.tar.gz 31248 BLAKE2B ac9bc39ad42046bbec408006a375ad5bda2f561ed5fec7c489c5448ec9f4867ee2d3a7aeecfafbcf078cb4f4780c0e43442e7fa7c7fbe03755835bd56b9312e1 SHA512 4fe88be3bf99175cab4f90d516ef99e3ee7e5209d0046675c92f29a4786fccd92470560771fcfd8887e214b776fac9b75cdd8a0334d2de2d6b42d4313cacd4bd
+DIST osm-0.11.tar.gz 31935 BLAKE2B d4cb18a9ab17d0d982db94a1dcfb37bdf3676b2b6bf367f249ccc2475783ce4f7eda8bb01beff8ac59e4a963e7800402f3fe9a99832f9072396d679a4fa0bd56 SHA512 02faba5200897b78b1e8d616d3f21a607645e401b80e13d016be8317cc92dcd7458d6b968066f088d9ee202d477e183c9d93bf1475710f6a6c249608cb68b0d6
--- a/app-emacs/osm/osm-0.11.ebuild
+++ b/app-emacs/osm/osm-0.11.ebuild
@ -16,7 +16,10 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"

-BDEPEND=">=app-editors/emacs-${NEED_EMACS}:*[jpeg,json,libxml2,png,svg]"
+BDEPEND="
+	>=app-editors/emacs-${NEED_EMACS}:*[jpeg,json,libxml2,png,svg]
+	>=app-emacs/compat-29.1.4.0
+"
 RDEPEND="
 	${BDEPEND}
 	net-misc/curl[ssl]
--- a/app-emacs/projectile/projectile-2.5.0-r1.ebuild
+++ b/app-emacs/projectile/projectile-2.5.0-r1.ebuild
@ -6,21 +6,22 @@ EAPI=8
 inherit elisp

 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"

 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )

+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
--- a/app-emacs/projectile/projectile-2.6.0.ebuild
+++ b/app-emacs/projectile/projectile-2.6.0.ebuild
@ -6,21 +6,22 @@ EAPI=8
 inherit elisp

 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"

 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )

+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
--- a/app-emacs/projectile/projectile-2.7.0.ebuild
+++ b/app-emacs/projectile/projectile-2.7.0.ebuild
@ -6,21 +6,22 @@ EAPI=8
 inherit elisp

 DESCRIPTION="A project interaction library for Emacs"
-HOMEPAGE="https://docs.projectile.mx"
-SRC_URI="https://github.com/bbatsov/projectile/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://docs.projectile.mx
+	https://github.com/bbatsov/projectile/"
+SRC_URI="https://github.com/bbatsov/projectile/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( app-emacs/buttercup )"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"

 SITEFILE="50projectile-gentoo.el"
 DOCS=( README.md )

+elisp-enable-tests buttercup test
+
 src_test() {
 	mkdir -p "${HOME}"/.emacs.d || die  # For "projectile--directory-p" test
-	buttercup -L . -L test --traceback full || die
+
+	elisp-test
 }
--- a/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
+++ b/app-emacs/shrink-path/shrink-path-0.3.1.ebuild
@ -13,29 +13,22 @@ S="${WORKDIR}"/${PN}.el-v${PV}
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"

 RDEPEND="
 	app-emacs/s
 	app-emacs/dash
 	app-emacs/f
 "
-BDEPEND="
-	${RDEPEND}
-	test? ( app-emacs/buttercup )
-"
+BDEPEND="${RDEPEND}"

 DOCS=( README.org )
 SITEFILE="50${PN}-gentoo.el"

+elisp-enable-tests buttercup test
+
 src_prepare() {
 	sed -i 's|it "same as shrink-path"|xit "same as shrink-path"|' \
 		"${S}"/test/shrink-path-test.el || die

 	default
 }
-
-src_test() {
-	buttercup -L . -L test --traceback full test || die
-}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cloud-hypervisor/Manifest
+++ b/app-emulation/cloud-hypervisor/Manifest
@ -0,0 +1,2 @@
+DIST cloud-hypervisor-31.0-vendor.tar.gz 36783838 BLAKE2B 6087223f6cf17954bbe81a792233e735672da97e7b83515ce705b6b789afefcdee1d5a6c3a8f9aded27fd842eab0d1c31b1d09c0e56391ba4422ae4360befd5d SHA512 3595445a765a3571fe3597488940f7fa01576063de2324aa7a212f69b09b9fb0163ff922e3f789696702626ca51df4512fe9e60fe0cd59c3ea191c421718bf4f
+DIST cloud-hypervisor-31.0.tar.gz 849675 BLAKE2B b88f1cb53fde6085c33e969d508fbccf29d54e2f04cee143340d0a43547a967d7cdea6bc880c24c84e34bfc4a4d8c4e4478aeb54e858d4518e528f07b521b9b3 SHA512 9ddb8bce534331f609d00703e1c47e4359723432661aef4e0b920f8b289f13c9fda68d0f3320bcbc80824f699df1e456375b6268355c8a79d69c78e5d7659f52
--- a/app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild
+++ b/app-emulation/cloud-hypervisor/cloud-hypervisor-31.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+CRATES=" "
+inherit cargo
+
+DESCRIPTION="Open source Virtual Machine Monitor (VMM) that runs on top of KVM"
+HOMEPAGE="https://www.cloudhypervisor.org"
+SRC_URI="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~jsmolic/distfiles/${P}-vendor.tar.gz"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+	cargo_src_unpack
+	mkdir  "${S}"/{vendor,.cargo} || die
+	ln -s "${WORKDIR}/vendor/"* "${S}"/vendor || die
+	cp "${FILESDIR}"/${P}-vendor-config "${S}"/.cargo/config.toml || die
+}
+
+src_prepare() {
+	default
+	sed -i 's/strip = true/strip = false/' Cargo.toml || die
+}
+
+src_configure() {
+	cargo_gen_config
+	cargo_src_configure --frozen
+}
+
+src_test() {
+	# Intergration tests require root
+	# https://github.com/cloud-hypervisor/cloud-hypervisor/issues/5388
+	cargo_src_test --bins
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r docs
+}
--- a/app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild
+++ b/app-emulation/cloud-hypervisor/cloud-hypervisor-9999.ebuild
@ -0,0 +1,44 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+inherit cargo git-r3
+
+DESCRIPTION="Open source Virtual Machine Monitor (VMM) that runs on top of KVM"
+HOMEPAGE="https://www.cloudhypervisor.org"
+EGIT_REPO_URI="https://github.com/cloud-hypervisor/cloud-hypervisor.git"
+
+LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
+SLOT="0"
+
+# rust does not use *FLAGS from make.conf, silence portage warning
+QA_FLAGS_IGNORED="usr/bin/.*"
+
+src_unpack() {
+	git-r3_src_unpack
+	cargo_live_src_unpack
+}
+
+src_prepare() {
+	default
+	sed -i 's/strip = true/strip = false/' Cargo.toml || die
+}
+
+src_configure() {
+	cargo_gen_config
+	cargo_src_configure --frozen
+}
+
+src_test() {
+	# Integration tests require root
+	# https://github.com/cloud-hypervisor/cloud-hypervisor/issues/5388
+	cargo_src_test --bins
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r docs
+}
--- a/app-emulation/cloud-hypervisor/files/cloud-hypervisor-31.0-vendor-config
+++ b/app-emulation/cloud-hypervisor/files/cloud-hypervisor-31.0-vendor-config
@ -0,0 +1,45 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source."https://github.com/cloud-hypervisor/kvm-bindings"]
+git = "https://github.com/cloud-hypervisor/kvm-bindings"
+branch = "ch-v0.6.0-tdx"
+replace-with = "vendored-sources"
+
+[source."https://github.com/cloud-hypervisor/versionize_derive"]
+git = "https://github.com/cloud-hypervisor/versionize_derive"
+branch = "ch"
+replace-with = "vendored-sources"
+
+[source."https://github.com/firecracker-microvm/micro-http"]
+git = "https://github.com/firecracker-microvm/micro-http"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/acpi_tables"]
+git = "https://github.com/rust-vmm/acpi_tables"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/mshv"]
+git = "https://github.com/rust-vmm/mshv"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vfio"]
+git = "https://github.com/rust-vmm/vfio"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vfio-user"]
+git = "https://github.com/rust-vmm/vfio-user"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source."https://github.com/rust-vmm/vm-fdt"]
+git = "https://github.com/rust-vmm/vm-fdt"
+branch = "main"
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
--- a/app-emulation/cloud-hypervisor/metadata.xml
+++ b/app-emulation/cloud-hypervisor/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cloud-hypervisor/cloud-hypervisor</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@ -1,2 +1,3 @@
 DIST install-crossover-22.0.1.bin 334913889 BLAKE2B e30c14b14adb0db4bb0b8e840aed89f82f59fc918ba697f8cdd86eea330b60d81020ec9ad498a511858de6fae10d74fcf572753295536cbbb98e067496029bb4 SHA512 825f1eeb10efcbf3bff0e4e6f91c709d3bbecdb5635839b580c79ff77e54333db4a84e9e6abfd08a0ea4e57729c4489e149366d5a5c7da6773a5a0d413905d48
 DIST install-crossover-22.1.0.bin 335571332 BLAKE2B 72ea09886a927eadaf6dead1d711723990e27cb845d514007d3433c9924e289ff3465a4dfdc02458e20cbcdba598ba65cea37453a0c16e3b13d790480bcaf9d3 SHA512 4de0eda5bbb68d8a5adde652c1254325a8a454eb1d2f7a84289b6d90373d7534b0821b706db08cef92c74b4286b6cceae0fc8033acccd276af5734579bad7fed
+DIST install-crossover-22.1.1.bin 335606941 BLAKE2B 3c5eada7190283f348348ef4d3b044db8e24e0dc3588d847854feb712d39bc9013e4f958a80c3f46e84b32f6b5c7d419ef6ab4fa1e946d308ba546140fb95504 SHA512 54bb40941baea184aa824c371a2eb73cdda26fa7c0765e242384e2c29a78f6b600c7455640b9888fd28ad482bf14f53a0308cbd55d9453f76d6eeb75cf0abfc7
--- a/app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-22.1.1.ebuild
@ -0,0 +1,194 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support"
+HOMEPAGE="https://www.codeweavers.com/products/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="bindist test"
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+DEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	app-arch/cpio
+	app-arch/unzip
+	dev-lang/perl
+	dev-util/bbe
+"
+
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	!prefix? ( sys-libs/glibc )
+	capi? ( net-libs/libcapi[abi_x86_32(-)] )
+	cups? ( net-print/cups[abi_x86_32(-)] )
+	gsm? ( media-sound/gsm[abi_x86_32(-)] )
+	jpeg? ( media-libs/libjpeg-turbo:0[abi_x86_32(-)] )
+	lcms? ( media-libs/lcms:2 )
+	ldap? ( net-nds/openldap[abi_x86_32(-)] )
+	gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[abi_x86_32(-)]
+		jpeg? ( media-plugins/gst-plugins-jpeg:1.0[abi_x86_32(-)] )
+		media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)]
+	)
+	mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+	nls? ( sys-devel/gettext[abi_x86_32(-)] )
+	openal? ( media-libs/openal[abi_x86_32(-)] )
+	opencl? ( virtual/opencl[abi_x86_32(-)] )
+	opengl? (
+		virtual/glu[abi_x86_32(-)]
+		virtual/opengl[abi_x86_32(-)]
+	)
+	pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+	png? ( media-libs/libpng:0[abi_x86_32(-)] )
+	scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+	ssl? ( net-libs/gnutls:0/30.30[abi_x86_32(-)] )
+	v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+	vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] )
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	|| (
+		dev-libs/openssl-compat:1.1.1
+		=dev-libs/openssl-1.1.1*
+	)
+	dev-util/desktop-file-utils
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/freetype:2[abi_x86_32(-)]
+	media-libs/mesa[abi_x86_32(-),osmesa?]
+	media-libs/tiff-compat:4[abi_x86_32(-)]
+	sys-auth/nss-mdns[abi_x86_32(-)]
+	sys-apps/util-linux[abi_x86_32(-)]
+	sys-libs/libunwind[abi_x86_32(-)]
+	sys-libs/ncurses-compat:5[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libSM[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXau[abi_x86_32(-)]
+	x11-libs/libXcursor[abi_x86_32(-)]
+	x11-libs/libXdmcp[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libXi[abi_x86_32(-)]
+	x11-libs/libXrandr[abi_x86_32(-)]
+	x11-libs/libXxf86vm[abi_x86_32(-)]
+	x11-libs/libxcb[abi_x86_32(-)]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/vte:2.91[introspection]
+	sys-libs/libxcrypt[compat]
+"
+
+src_unpack() {
+	# self unpacking zip archive; unzip warns about the exe stuff
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+
+	# Remove unnecessary files, license.txt file kept as it's used by
+	# multiple files (apart of the menu to show the license)
+	rm -r guis/ || die "Could not remove files"
+	use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+	sed -i \
+		-e "s:xdg_install_icons(:&\"${ED}\".:" \
+		-e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+		-e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+		"${S}/lib/perl/CXMenuXDG.pm" || die
+
+	# Install crossover symlink, bug #476314
+	dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+	# Install documentation
+	dodoc README changelog.txt
+	rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+	# Install files
+	dodir /opt/cxoffice
+	#cp -r ./* "${ED}/opt/cxoffice" \
+	find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+		|| die "Could not install into ${ED}/opt/cxoffice"
+
+	# Disable auto-update
+	sed -i -e 's/;;\"AutoUpdate\" = \"1\"/\"AutoUpdate\" = \"0\"/g' share/crossover/data/cxoffice.conf || die
+
+	# Install configuration file
+	insinto /opt/cxoffice/etc
+	doins share/crossover/data/cxoffice.conf
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/opt/cxoffice/etc/cxoffice.conf" >> "${ED}"/etc/env.d/30crossover-bin || die
+
+	# Konqueror in its infinite wisdom decides to try opening things for
+	# writing, which are sandbox violations. This breaks the install process if
+	# it is installed, so we ninja edit it to false so it so doesn't run.
+	sed -i -e 's/cxwhich konqueror/false &/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Install menus
+	# XXX: locate_gui.sh automatically detects *-application-merged directories
+	# This means what we install will vary depending on the contents of
+	# /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+	XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+		"${ED}/opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+		|| die "Could not install menus"
+
+	# Revert ninja edit
+	sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}/opt/cxoffice/bin/locate_gui.sh" \
+		|| die "Could not apply workaround for konqueror"
+
+	# Drop Uninstall menus
+	rm "${ED}/usr/share/applications/"*"Uninstall"* \
+		|| die "Could not remove uninstall menus"
+
+	# Fix PATHs
+	sed -i \
+		-e "s:\"${ED}\".::" \
+		-e "s:${ED}::" \
+		"${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+		|| die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+	sed -i -e "s:${ED}::" \
+		"${ED}/usr/share/applications/"*"CrossOver.desktop" \
+		|| die "Could not fix paths of *.desktop files"
+
+	# Workaround missing libs
+	#
+	# It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900
+	# https://bugs.gentoo.org/721108
+	if use pcap; then
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" >tmp || die
+		bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" >tmp64 || die
+		mv tmp "${ED}/opt/cxoffice/lib/wine/i386-unix/wpcap.so" || die
+		mv tmp64 "${ED}/opt/cxoffice/lib/wine/x86_64-unix/wpcap.so" || die
+	fi
+
+	# Remove libs that link to openldap
+	if ! use ldap; then
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/wldap32.so
+	fi
+
+	# Remove libs that link to opencl
+	if ! use opencl; then
+		rm "${ED}"/opt/cxoffice/lib/wine/{i386,x86_64}-unix/opencl.so || die
+	fi
+}
--- a/app-emulation/dxvk/dxvk-1.10.3.ebuild
+++ b/app-emulation/dxvk/dxvk-1.10.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -32,6 +32,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return

--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ b/app-emulation/dxvk/dxvk-2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -42,6 +42,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return

--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1.ebuild
@ -48,6 +48,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return

--- a/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
+++ b/app-emulation/dxvk/dxvk-2.1_p20230207.ebuild
@ -50,6 +50,10 @@ BDEPEND="
 	dev-util/glslang
 	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10.3-gcc13.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} == binary ]] && return

--- a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
+++ b/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch
@ -0,0 +1,17 @@
+https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a
+--- a/src/util/config/config.h
+++ b/src/util/config/config.h
+@@ -1,4 +1,5 @@
+ #pragma once
+ 
+#include <cstdint>
+ #include <string>
+ #include <unordered_map>
+--- a/src/util/util_bit.h
+++ b/src/util/util_bit.h
+@@ -17,4 +17,5 @@
+ #include "util_math.h"
+ 
+#include <cstdint>
+ #include <cstring>
+ #include <iterator>
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@ -1,3 +1,4 @@
 DIST proton-wine-7.0-5.tar.gz 45724439 BLAKE2B d5ad4f00ca658b31c562c2ff4eb5ae33707126eee44ccfd9f33084ab5d184743034541efe3f9d18eb2a6941111da4c5134555f93769e8370b118b6f04e00ae1e SHA512 b16ace9c0bfa6d2685ea53617be2bba7e82c5c8da604f9e188bf782219785cfaed4317578c4314f2bde89d363a2e115f3bceeaa69d4a85f078a5fdb1ec64d33b
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
 DIST proton-wine-8.0-1c.tar.gz 48204851 BLAKE2B 5a746cf4d10e605ce30e93a5116e73c4ae893a6ccb105984afa3e65e0ec64780ca58462fe5fc89e51aef0499fdc52be9756254878d8f7f28160a1cf4ed0ee3a9 SHA512 67dbd73287409aaecd5cfab29f79ddf455bbbd25e79289c66828bd4f0fac3003e68afe3e65ea39e18e2390b825342a52285c4be1368928606628b72a274b5456
+DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d807777fcd01c101199f922d SHA512 4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7
--- a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
@ -0,0 +1,329 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit autotools flag-o-matic multilib multilib-build python-any-r1
+inherit readme.gentoo-r1 toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.1
+WINE_PV=$(ver_rs 2 -)
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ValveSoftware/wine.git"
+	EGIT_BRANCH="experimental_$(ver_cut 1-2)"
+else
+	SRC_URI="https://github.com/ValveSoftware/wine/archive/refs/tags/proton-wine-${WINE_PV}.tar.gz"
+	S="${WORKDIR}/${PN}-wine-${WINE_PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Valve Software's fork of Wine"
+HOMEPAGE="https://github.com/ValveSoftware/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug
+	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
+	perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l
+	+xcomposite xinerama"
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	dev-libs/libgcrypt:=[${MULTILIB_USEDEP}]
+	media-libs/freetype[${MULTILIB_USEDEP}]
+	media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+	media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? (
+		dev-libs/gmp:=[${MULTILIB_USEDEP}]
+		net-libs/gnutls:=[${MULTILIB_USEDEP}]
+	)
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[opengl,${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	x11-base/xorg-proto"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900332)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.4-musl.patch
+	"${FILESDIR}"/${PN}-7.0.4-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.0.4-restore-menubuilder.patch
+	"${FILESDIR}"/${PN}-8.0.1c-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				eerror "--> Note that mingw builds are default for ${PN} even without this USE."
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# similarly to staging, append to `wine --version` for identification
+	sed -i "s/wine_build[^1]*1/& (Proton-${WINE_PV})/" configure.ac || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+	dlls/winevulkan/make_vulkan -x vk.xml || die # python, needed for proton's
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+
+		# upstream (Valve) doesn't really support misc configurations (e.g.
+		# adds vulkan code not always guarded by --with-vulkan), so force
+		# some major options that are typically needed by games either way
+		--with-freetype
+		--with-mingw # needed by many, notably Blizzard titles
+		--with-opengl
+		--with-vulkan
+		--with-x
+
+		# ...and disable most options unimportant for games and unused by
+		# Proton rather than expose as volatile USEs with little support
+		--without-capi
+		--without-cups
+		--without-gphoto
+		--without-gssapi
+		--without-krb5
+		--without-netapi
+		--without-opencl
+		--without-pcap
+		--without-sane
+		ac_cv_lib_soname_odbc=
+
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with alsa)
+		$(use_with fontconfig)
+		$(use_with gstreamer)
+		$(use_with nls gettext)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pulseaudio pulse)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		# CROSSCC is no longer recognized by Wine, but still use for now
+		# (future handling for CROSS* variables is subject to changes)
+		conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+		# use *FLAGS for mingw, but strip unsupported
+		: "${CROSSCFLAGS:=$(
+			# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+			append-cflags '-fno-strict-aliasing'
+			filter-flags '-fstack-clash-protection' #758914
+			filter-flags '-fstack-protector*' #870136
+			filter-flags '-mfunction-return=thunk*' #878849
+			CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+		: "${CROSSLDFLAGS:=$(
+			filter-flags '-fuse-ld=*'
+			CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+		export CROSS{C,LD}FLAGS
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+	use debug ||
+		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	has_version ${CATEGORY}/${PN} && WINE_HAD_ANY_SLOT=
+}
+
+pkg_postinst() {
+	[[ -v WINE_HAD_ANY_SLOT ]] || readme.gentoo_print_elog
+
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -1,5 +1,6 @@
 DIST wine-7.0.1.tar.xz 27167768 BLAKE2B 9bf74e7077fe4b77611f8195feeb53fc6475bdaeac97dab5221942115d6108d8786f93d4a96745bad72afb074b15129fec9b0b2f10261d91c9a9b57bd2240ded SHA512 5a5258132fe30bfb5313454598b85e7d97a74d1e0c7ca7af16aa8c486e316ad34ab74a25fd9a403c98ad1f3280385232f7d159bb824f713e920a4a0dae62c944
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
+DIST wine-8.0.1.tar.xz 29057128 BLAKE2B f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4 SHA512 9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a
 DIST wine-8.0.tar.xz 29054044 BLAKE2B baf8f96b665119c9f38a148a2472dbe8f6ca8d4641d9d09d48cb72cb4de2585c274b8b7981c2fa622ead6da2f087c57652e9b48edc8a17c0cfd6be9a36732f02 SHA512 53ba813b260a65a271ec575822725b97631f60038fb026dcc0fe66862711eedcc29a8feb29ff54ae4f64458f85c290d8f3838eff5e4c77a5420a7d2b951fef77
 DIST wine-8.3.tar.xz 28983532 BLAKE2B b811a13aaa87f186c744254059d40fdf0740da42cf788acb2375c04cf3ecc281c92afc7bb7830d5797624d96f803edcb2d2778c5da378d89938fe0b68e72a287 SHA512 9c0c86f1d523cc65fe6bcb2f98e73f8909282eda1c04516ff35a32833e469421e099fe1351c3078ac96aa7884fc194a77fcf2ba8863e2a227316fd84562f1f5a
 DIST wine-8.4.tar.xz 29031312 BLAKE2B 0b91267a68e4e332544d273646bb1e9389c3af3f48069ab7942096af5512e86a61d39788d91c221b4ae96e81858cfdff1e43a658ba407ff1450b6d752b8a3235 SHA512 8de144a65c0a3a2984fabc1294b647b8581da5fa8bd28a9ff756ab59256ee2b453d898453fc902bbc372a4e017a8e29b1eeef917f137ec1134ac08b671eccc7d
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild
@ -0,0 +1,329 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit autotools flag-o-matic multilib multilib-build toolchain-funcs wrapper
+
+WINE_GECKO=2.47.3
+WINE_MONO=7.4.0
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.winehq.org/wine/wine.git"
+else
+	(( $(ver_cut 2) )) && WINE_SDIR=$(ver_cut 1).x || WINE_SDIR=$(ver_cut 1).0
+	SRC_URI="https://dl.winehq.org/wine/source/${WINE_SDIR}/wine-${PV}.tar.xz"
+	S="${WORKDIR}/wine-${PV}"
+	KEYWORDS="-* ~amd64 ~x86"
+fi
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="
+	https://www.winehq.org/
+	https://gitlab.winehq.org/wine/wine/"
+
+LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
+SLOT="${PV}"
+IUSE="
+	+X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups dos
+	llvm-libunwind debug custom-cflags +fontconfig +gecko gphoto2
+	+gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl
+	osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl
+	+truetype udev udisks +unwind usb v4l +vulkan +xcomposite xinerama"
+REQUIRED_USE="
+	X? ( truetype )
+	crossdev-mingw? ( mingw )" # bug #551124 for truetype
+
+# tests are non-trivial to run, can hang easily, don't play well with
+# sandbox, and several need real opengl/vulkan or network access
+RESTRICT="test"
+
+# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
+WINE_DLOPEN_DEPEND="
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXrender[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+		opengl? (
+			media-libs/libglvnd[X,${MULTILIB_USEDEP}]
+			osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+		)
+		xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+	cups? ( net-print/cups[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+WINE_COMMON_DEPEND="
+	${WINE_DLOPEN_DEPEND}
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	capi? ( net-libs/libcapi:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		dev-libs/glib:2[${MULTILIB_USEDEP}]
+		media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+	)
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
+	scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] )
+	udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+	unwind? (
+		llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] )
+		!llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] )
+	)
+	usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	${WINE_COMMON_DEPEND}
+	app-emulation/wine-desktop-common
+	dos? ( games-emulation/dosbox )
+	gecko? ( app-emulation/wine-gecko:${WINE_GECKO}[${MULTILIB_USEDEP}] )
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] )
+	mono? ( app-emulation/wine-mono:${WINE_MONO} )
+	perl? (
+		dev-lang/perl
+		dev-perl/XML-LibXML
+	)
+	samba? ( net-fs/samba[winbind] )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="
+	${WINE_COMMON_DEPEND}
+	sys-kernel/linux-headers
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	dev-lang/perl
+	sys-devel/binutils
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	mingw? ( !crossdev-mingw? (
+		>=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}]
+	) )
+	nls? ( sys-devel/gettext )"
+IDEPEND=">=app-eselect/eselect-wine-2"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__clear_cache # unused on amd64+x86 (bug #900338)
+	res_getservers # false positive
+)
+QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
+	"${FILESDIR}"/${PN}-7.20-unwind.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
+		local mingw=-w64-mingw32
+		for mingw in $(usev abi_x86_64 x86_64${mingw}) $(usev abi_x86_32 i686${mingw}); do
+			if ! type -P ${mingw}-gcc >/dev/null; then
+				eerror "With USE=crossdev-mingw, you must prepare the MinGW toolchain"
+				eerror "yourself by installing sys-devel/crossdev then running:"
+				eerror
+				eerror "    crossdev --target ${mingw}"
+				eerror
+				eerror "For more information, please see: https://wiki.gentoo.org/wiki/Mingw"
+				die "USE=crossdev-mingw is enabled, but ${mingw}-gcc was not found"
+			fi
+		done
+	fi
+}
+
+src_prepare() {
+	# sanity check, bumping these has a history of oversights
+	local geckomono=$(sed -En '/^#define (GECKO|MONO)_VER/{s/[^0-9.]//gp}' \
+		dlls/appwiz.cpl/addons.c || die)
+	if [[ ${WINE_GECKO}$'\n'${WINE_MONO} != "${geckomono}" ]]; then
+		local gmfatal=
+		[[ ${PV} == *9999 ]] && gmfatal=nonfatal
+		${gmfatal} die -n "gecko/mono mismatch in ebuild, has: " ${geckomono} " (please file a bug)"
+	fi
+
+	default
+
+	# ensure .desktop calls this variant + slot
+	sed -i "/^Exec=/s/wine /${P} /" loader/wine.desktop || die
+
+	# always update for patches (including user's wrt #432348)
+	eautoreconf
+	tools/make_requests || die # perl
+}
+
+src_configure() {
+	WINE_PREFIX=/usr/lib/${P}
+	WINE_DATADIR=/usr/share/${P}
+
+	local conf=(
+		--prefix="${EPREFIX}"${WINE_PREFIX}
+		--datadir="${EPREFIX}"${WINE_DATADIR}
+		--includedir="${EPREFIX}"/usr/include/${P}
+		--libdir="${EPREFIX}"${WINE_PREFIX}
+		--mandir="${EPREFIX}"${WINE_DATADIR}/man
+		$(use_enable gecko mshtml)
+		$(use_enable mono mscoree)
+		--disable-tests
+		$(use_with X x)
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with cups)
+		$(use_with fontconfig)
+		$(use_with gphoto2 gphoto)
+		$(use_with gstreamer)
+		$(use_with kerberos gssapi)
+		$(use_with kerberos krb5)
+		$(use_with mingw)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		--without-oss # media-sound/oss is not packaged (OSSv4)
+		$(use_with pcap)
+		$(use_with pulseaudio pulse)
+		$(use_with scanner sane)
+		$(use_with sdl)
+		$(use_with ssl gnutls)
+		$(use_with truetype freetype)
+		$(use_with udev)
+		$(use_with udisks dbus) # dbus is only used for udisks
+		$(use_with unwind)
+		$(use_with usb)
+		$(use_with v4l v4l2)
+		$(use_with vulkan)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(usev !odbc ac_cv_lib_soname_odbc=)
+	)
+
+	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
+	filter-lto # build failure
+	use mingw || filter-flags -fno-plt # build failure
+	use custom-cflags || strip-flags # can break in obscure ways at runtime
+	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+	# temporary workaround for tc-ld-force-bfd not yet enforcing with mold
+	# https://github.com/gentoo/gentoo/pull/28355
+	[[ $($(tc-getCC) ${LDFLAGS} -Wl,--version 2>/dev/null) == mold* ]] &&
+		append-ldflags -fuse-ld=bfd
+
+	# build using upstream's way (--with-wine64)
+	# order matters: configure+compile 64->32, install 32->64
+	local -i bits
+	for bits in $(usev abi_x86_64 64) $(usev abi_x86_32 32); do
+	(
+		einfo "Configuring ${PN} for ${bits}bits in ${WORKDIR}/build${bits} ..."
+
+		mkdir ../build${bits} || die
+		cd ../build${bits} || die
+
+		pe_arch=i386
+		if (( bits == 64 )); then
+			pe_arch=x86_64
+			: "${CROSSCC:=${CROSSCC_amd64:-x86_64-w64-mingw32-gcc}}"
+			conf+=( --enable-win64 )
+		elif use amd64; then
+			conf+=(
+				$(usev abi_x86_64 --with-wine64=../build64)
+				TARGETFLAGS=-m32 # for widl
+			)
+			# _setup is optional, but use over Wine's auto-detect (+#472038)
+			multilib_toolchain_setup x86
+		fi
+		: "${CROSSCC:=${CROSSCC_x86:-i686-w64-mingw32-gcc}}"
+
+		if use mingw; then
+			# CROSSCC is no longer recognized by Wine, but still use for now
+			# (future handling for CROSS* variables is subject to changes)
+			conf+=( ac_cv_prog_${pe_arch}_CC="${CROSSCC}" )
+
+			# use *FLAGS for mingw, but strip unsupported
+			: "${CROSSCFLAGS:=$(
+				# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+				append-cflags '-fno-strict-aliasing'
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-mfunction-return=thunk*' #878849
+				CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
+			: "${CROSSLDFLAGS:=$(
+				filter-flags '-fuse-ld=*'
+				CC=${CROSSCC} test-flags-CCLD ${LDFLAGS})}"
+			export CROSS{C,LD}FLAGS
+		fi
+
+		ECONF_SOURCE=${S} econf "${conf[@]}"
+	)
+	done
+}
+
+src_compile() {
+	use abi_x86_64 && emake -C ../build64 # do first
+	use abi_x86_32 && emake -C ../build32
+}
+
+src_install() {
+	use abi_x86_32 && emake DESTDIR="${D}" -C ../build32 install
+	use abi_x86_64 && emake DESTDIR="${D}" -C ../build64 install # do last
+
+	# symlink for plain 'wine' and install its man pages if 64bit-only #404331
+	if use abi_x86_64 && use !abi_x86_32; then
+		dosym wine64 ${WINE_PREFIX}/bin/wine
+		dosym wine64-preloader ${WINE_PREFIX}/bin/wine-preloader
+		local man
+		for man in ../build64/loader/wine.*man; do
+			: "${man##*/wine}"
+			: "${_%.*}"
+			insinto ${WINE_DATADIR}/man/${_:+${_#.}/}man1
+			newins ${man} wine.1
+		done
+	fi
+
+	use perl || rm "${ED}"${WINE_DATADIR}/man/man1/wine{dump,maker}.1 \
+		"${ED}"${WINE_PREFIX}/bin/{function_grep.pl,wine{dump,maker}} || die
+
+	# create variant wrappers for eselect-wine
+	local bin
+	for bin in "${ED}"${WINE_PREFIX}/bin/*; do
+		make_wrapper "${bin##*/}-${P#wine-}" "${bin#"${ED}"}"
+	done
+
+	# don't let portage try to strip PE files with the wrong
+	# strip executable and instead handle it here (saves ~120MB)
+	if use mingw; then
+		dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
+		use debug ||
+			find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
+				-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS README* documentation/README*
+}
+
+pkg_postinst() {
+	eselect wine update --if-unset || die
+}
+
+pkg_postrm() {
+	eselect wine update --if-unset || die
+}
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -1,7 +1,10 @@
 DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
+DIST OpenSSL_1_1_1t.tar.gz 10061233 BLAKE2B aef89c338644230305bcc75dbc13d6799a04ed8c712b6aed07a782703031e977c3e300924f26e5854d0b89ecf39d2d516a50838167754e8f63322fba51de9478 SHA512 f28a323fd78be0b16ae6db9a8f163e64c74410e12ddd1a9836dfdda34c264112184f4e22583c84b6fa56716e5aaac9cb860cb183bd3d0cb064091eea1e21815e
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
+DIST brotli-f4153a09f87cbb9c826d8fc12c74642bb2d879ea.tar.gz 512229 BLAKE2B cd86cc2cc7eefad24f87cda8006409bf764922b5f23ccfb951e7a41214b12004ce532b11f94f5fb858b3bf71f9abf8ef17ba219fa96bd5be23b51873afad0fd5 SHA512 7f48e794e738b31c2005e7cef6d8c0cc0d543f1cd8c137ae8ba14602cac2873de6299a3f32ad52be869f513e7548341353ed049609daef1063975694d9a9b80b
 DIST edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz 13998677 BLAKE2B 3614ceb69e295a6afb37c7905d0aec3534d8daf3d9f22137c1b722da6dc764a3669d99af03f96155d45feb5058a6f725acf37d1048186fecff4232d64f96e97c SHA512 a1933d815b947fd4f13c96970a6dc36c3048e3ddf27c897684104b0129cf58331e46d3147062ae1fb8973f08cd373c319788dd850ac5e45da385eed8368571a4
+DIST edk2-b16284e2a0011489f6e16dfcc6af7623c3cbaf0b.tar.gz 15245558 BLAKE2B 33876c08040fa876b4e3741fe859d113654013c948fa8a8b391955226e6215bbbe26fc484e56ba5b399d2c4e4d198900f2de42eccfbac6901e01cd73a80e803b SHA512 7d71ec3d98c652b86194607dbcab767160c708991f49f69eda1f5d844ced0c4842e849d19bf99ea09b1db523b91ced1e5552a4ddcea32b94b9db6b8f6f5c5931
 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
 DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490c6c136377f6dccf02c88100b0644bc13d210b4a517a8be6002d5671b0fba77120a2aca3a9bafbad5e88d037e40 SHA512 9daefcfb1c9edda4462a4b080c9bac552154d577ae19703a914928e43005e7a52edd86869c6507e94a7f0c61ce8b3e6f5dea38cd5146628cb138a130947c522f
--- a/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.4_pre1.ebuild
@ -17,10 +17,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"

 	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
+	EDK2_OPENSSL_VERSION="1_1_1t"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"

 	XEN_GENTOO_PATCHSET_NUM=2
@ -268,15 +268,6 @@ src_prepare() {
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
 		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
 	fi

 	# ipxe
@ -385,11 +376,11 @@ src_prepare() {

 	# Remove -Werror
 	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		 -exec sed -i \
-		 -e 's/-Werror //g' \
-		 -e '/^CFLAGS *+= -Werror$/d' \
-		 -e 's/, "-Werror"//' \
-		 {} + || die
+		-exec sed -i \
+		-e 's/-Werror //g' \
+		-e '/^CFLAGS *+= -Werror$/d' \
+		-e 's/, "-Werror"//' \
+		{} + || die

 	default
 }
--- a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
@ -17,10 +17,10 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"

 	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
+	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
+	EDK2_OPENSSL_VERSION="1_1_1t"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
 	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"

 	XEN_GENTOO_PATCHSET_NUM=0
@ -268,15 +268,6 @@ src_prepare() {
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
 		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
 		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
 	fi

 	# ipxe
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20230114-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~sam/distfiles/app-eselect/eselect-wxwidgets/${P

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"

 RDEPEND=">=app-admin/eselect-1.4.13"

--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/g810-led/files/g810-led-0.4.2_gcc13.patch
+++ b/app-misc/g810-led/files/g810-led-0.4.2_gcc13.patch
@ -0,0 +1,21 @@
+From 0ca17e2ba8c8f01e51a360903a2009186ff78a1c Mon Sep 17 00:00:00 2001
+From: Olav Reinert <seroton10@gmail.com>
+Date: Sun, 26 Mar 2023 13:48:10 +0200
+Subject: [PATCH] fix: compilation error with GCC 13
+
+---
+ src/helpers/help.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/helpers/help.h b/src/helpers/help.h
+index 1d176f0..b7d02fd 100644
+--- a/src/helpers/help.h
+++ b/src/helpers/help.h
+@@ -18,6 +18,7 @@
+ #define HELP_HELPER
+ 
+ #include <iostream>
+#include <cstdint>
+ 
+ namespace help {
+ 	
--- a/app-misc/g810-led/g810-led-0.4.2.ebuild
+++ b/app-misc/g810-led/g810-led-0.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -22,6 +22,10 @@ DEPEND="${RDEPEND}"

 DOCS=("README.md" "sample_profiles" "sample_effects")

+# Fix for GCC 13; Bug #895426
+# See https://github.com/MatMoul/g810-led/pull/302
+PATCHES=( "${FILESDIR}/g810-led-0.4.2_gcc13.patch" )
+
 src_prepare() {
 	default
 	# See
--- a/app-misc/lirc/lirc-0.10.2.ebuild
+++ b/app-misc/lirc/lirc-0.10.2.ebuild
@ -28,7 +28,7 @@ fi

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86"
 IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"

 REQUIRED_USE="
--- a/app-misc/media-player-info/media-player-info-24-r1.ebuild
+++ b/app-misc/media-player-info/media-player-info-24-r1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""

 # This ebuild does not install any binaries
--- a/app-misc/media-player-info/media-player-info-24.ebuild
+++ b/app-misc/media-player-info/media-player-info-24.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 udev
-
-DESCRIPTION="Repository of data files describing media player capabilities"
-HOMEPAGE="https://gitlab.freedesktop.org/media-player-info/media-player-info"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-# Upstream commit d83dd01a0a1df6198ee08954da1c033b88a1004b
-RDEPEND=">=virtual/udev-208"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-DOCS=( AUTHORS NEWS )
-
-pkg_postinst() {
-	# Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
-	udevadm hwdb --update --root="${ROOT}"
-	# Upstream commit 1fab57c209035f7e66198343074e9cee06718bda
-	if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
-		return 0
-	fi
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
--- a/app-misc/openrgb/openrgb-0.8-r1.ebuild
+++ b/app-misc/openrgb/openrgb-0.8-r1.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi

--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
 	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~loong ~x86"
 	PATCHES=( "${FILESDIR}"/OpenRGB-0.5-build-system.patch )
 fi

--- a/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
+++ b/app-misc/resolve-march-native/resolve-march-native-2.2.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""

 DEPEND=""
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
+++ b/app-office/ledger/files/ledger-3.2.1-fix-build-boost-1-76.patch
@ -1,29 +0,0 @@
-https://bugs.gentoo.org/790176
-https://github.com/ledger/ledger/issues/2030
-
-From fa37f595b3c44dc7ac86b29d105ae6417c3e0080 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Jun 2021 12:37:58 +0000
-Subject: [PATCH] Fix compilation with Boost 1.76
--- a/src/expr.cc
-+++ b/src/expr.cc
-@@ -35,6 +35,8 @@
- #include "parser.h"
- #include "scope.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- expr_t::expr_t() : base_type()
--- a/src/format.h
-+++ b/src/format.h
-@@ -45,6 +45,8 @@
- #include "expr.h"
- #include "unistring.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- class unistring;
--- a/app-office/wps-office/Manifest
+++ b/app-office/wps-office/Manifest
@ -1,2 +1 @@
-DIST wps-office_11.1.0.11664_amd64.deb 413652340 BLAKE2B 5bca47eef4c0c6a418ff5d79cef46ddd8841400333e72d3ac6fb5337d81fc7265503226da7d78b9a1df0cccf8d021852c69d2f65ed88ed74fc531638ef557f08 SHA512 6dbe7df259d989389df9d3c5730966693538ab1ef95c18a66cd50609894c83b028190f7381e1c998b0470d389c8c6969d8528ef88bc6428fdb0123586880de08
 DIST wps-office_11.1.0.11691_amd64.deb 413557282 BLAKE2B f3e9149c0c1e43956da47c1e5faba4a10ed5e6964760dcc42b4e6e4a56777a9c6ba810c7b477a8bfc70ebc8e8ef11f9dee588be6f1243439edccc56fef0aaab0 SHA512 e19a2d6dc05b5ecc070966f92b9218749266e4d4255620e376c6888044bed83d06455d16372f081b7a7067b6c1e63e67bb3270468ec0731ebb7e308e1afaffc6
--- a/app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild
+++ b/app-office/wps-office/wps-office-11.1.0.11664-r3.ebuild
@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit unpacker xdg
-
-MY_PV="$(ver_cut 4)"
-
-DESCRIPTION="WPS Office is an office productivity suite"
-HOMEPAGE="https://www.wps.com/office/linux/"
-
-KEYWORDS="~amd64"
-
-#SRC_URI="https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${MY_PV}/${PN}_${PV}.XA_amd64.deb"
-SRC_URI="https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${MY_PV}/${PN}_${PV}_amd64.deb"
-
-SLOT="0"
-RESTRICT="bindist strip mirror" # mirror as explained at bug #547372
-QA_PREBUILT="*"
-LICENSE="WPS-EULA"
-IUSE="systemd"
-
-# Deps got from this (listed in order):
-# rpm -qpR wps-office-10.1.0.5707-1.a21.x86_64.rpm
-# ldd /opt/kingsoft/wps-office/office6/wps
-# ldd /opt/kingsoft/wps-office/office6/wpp
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46:2
-	app-arch/bzip2:0
-	app-arch/xz-utils
-	app-arch/lz4
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libbsd
-	|| ( dev-libs/libffi:0/7 dev-libs/libffi-compat:7 )
-	dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	dev-libs/libpcre:3
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	|| ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libvorbis
-	media-libs/libpng:0
-	media-libs/libpulse
-	|| ( media-libs/tiff:0/0 media-libs/tiff-compat:4 )
-	net-libs/libasyncns
-	net-print/cups
-	sys-apps/attr
-	sys-apps/util-linux
-	sys-apps/dbus
-	sys-apps/tcp-wrappers
-	sys-libs/libcap
-	sys-libs/zlib:0
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXv
-	x11-libs/libxcb
-	dev-libs/libxslt
-	x11-libs/pango
-	virtual/glu
-	systemd? ( sys-apps/systemd )
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m0755
-	doexe "${S}"/usr/bin/*
-
-	insinto /usr/share
-	# Skip mime subdir to not get selected over rest of office suites
-	doins -r "${S}"/usr/share/{applications,desktop-directories,icons,templates}
-
-	insinto /opt/kingsoft/wps-office
-	doins -r "${S}"/opt/kingsoft/wps-office/{office6,templates}
-
-	# https://bugs.gentoo.org/878451
-	rm "${S}"/opt/kingsoft/wps-office/office6/libstdc++.so* || die
-
-	# https://bugs.gentoo.org/813138
-	use systemd || { rm "${S}"/opt/kingsoft/wps-office/office6/libdbus-1.so* || die ; }
-
-	fperms 0755 /opt/kingsoft/wps-office/office6/{et,wpp,wps,wpspdf}
-}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/elogv/elogv-0.7.9-r3.ebuild
+++ b/app-portage/elogv/elogv-0.7.9-r3.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 PLOCALES=( "de" "es" "it" "pl" )
 IUSE="${PLOCALES[*]/#/l10n_}"

--- a/app-portage/flaggie/flaggie-0.99.3.ebuild
+++ b/app-portage/flaggie/flaggie-0.99.3.ebuild
@ -19,7 +19,7 @@ SRC_URI="

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"

 RDEPEND="
 	>=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}]
--- a/app-portage/metagen/metagen-0.7.3-r2.ebuild
+++ b/app-portage/metagen/metagen-0.7.3-r2.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~riscv x86 ~amd64-linux ~x86-linux"

 IUSE=""
 DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
--- a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz ->

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"

 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/crengine-ng/Manifest
+++ b/app-text/crengine-ng/Manifest
@ -1 +1,2 @@
 DIST crengine-ng-0.9.7.tar.bz2 3594561 BLAKE2B 65adf26be6198a29c26a506e5e00dde809a6bd9371e7f226ca954a89e0dfc68f314891f9e060a3055e5313673c266a26954353479f486abcf1bb87951202f64c SHA512 94775722f8ff3680c36278e2cecd864b5e3f9de7940aa0e681b683cc5136c8098650e495c3f0729af187839e45d6409993fdc2fc2738250cacd406f2540fdc31
+DIST crengine-ng-0.9.8.tar.bz2 3407775 BLAKE2B f4e2c49ac0ee690f658f549e26bf29a61ec3c9fcb18b86ef3f7fb5d998560ecf99b61e08c438f9336dc0ec78bc3c22cb0753ef182a3e328c2734f54a9d37b324 SHA512 9cd234caddfe6cd651fbf4e2f2eb1ce143f21505a194af8e87bf79c41cd1082a4319383d47e2fcdd8aef22da2bf20f46b9db2a617fdcb4eb3e87982b2660094e
--- a/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
+++ b/app-text/crengine-ng/crengine-ng-0.9.8.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake
+
+DESCRIPTION="Cross-platform library designed to implement e-book readers"
+HOMEPAGE="https://gitlab.com/coolreader-ng/crengine-ng"
+SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/5"
+KEYWORDS="~amd64 ~x86"
+IUSE="+png +jpeg +gif +svg +chm +harfbuzz +fontconfig +libunibreak +fribidi +zstd +libutf8proc lto static-libs"
+
+CDEPEND="sys-libs/zlib
+	png? ( media-libs/libpng:0 )
+	jpeg? ( media-libs/libjpeg-turbo )
+	>=media-libs/freetype-2.10.0
+	harfbuzz? ( media-libs/harfbuzz:= )
+	libunibreak? ( dev-libs/libunibreak:= )
+	fribidi? ( dev-libs/fribidi )
+	zstd? ( app-arch/zstd:= )
+	libutf8proc? ( dev-libs/libutf8proc:= )
+	fontconfig? ( media-libs/fontconfig )"
+
+RDEPEND="${CDEPEND}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	${CDEPEND}"
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	local mycmakeargs=(
+		-DCRE_BUILD_SHARED=ON
+		-DCRE_BUILD_STATIC=$(usex static-libs)
+		-DUSE_COLOR_BACKBUFFER=ON
+		-DWITH_LIBPNG=$(usex png)
+		-DWITH_LIBJPEG=$(usex jpeg)
+		-DWITH_FREETYPE=ON
+		-DWITH_HARFBUZZ=$(usex harfbuzz)
+		-DWITH_LIBUNIBREAK=$(usex libunibreak)
+		-DWITH_FRIBIDI=$(usex fribidi)
+		-DWITH_ZSTD=$(usex zstd)
+		-DWITH_UTF8PROC=$(usex libutf8proc)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_NANOSVG=$(usex svg)
+		-DUSE_CHM=$(usex chm)
+		-DUSE_ANTIWORD=ON
+		-DUSE_FONTCONFIG=$(usex fontconfig)
+		-DUSE_SHASUM=OFF
+		-DBUILD_TOOLS=OFF
+		-DENABLE_UNITTESTING=OFF
+		-DENABLE_LTO=$(usex lto)
+	)
+	cmake_src_configure
+}
--- a/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
+++ b/app-text/crqt-ng/crqt-ng-1.0.11-r1.ebuild
@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"

-CDEPEND=">=app-text/crengine-ng-0.9.7[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5"
--- a/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
+++ b/app-text/crwx-ng/crwx-ng-0.2.0-r3.ebuild
@ -9,12 +9,12 @@ DESCRIPTION="Cross-platform e-book reader"
 HOMEPAGE="https://gitlab.com/coolreader-ng/crwx-ng"
 SRC_URI="https://gitlab.com/coolreader-ng/${PN}/-/archive/${PV}/${P}.tar.bz2"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gif +svg +chm +harfbuzz +libunibreak +fribidi +zstd +libutf8proc"

-CDEPEND=">=app-text/crengine-ng-0.9.3[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
+CDEPEND=">=app-text/crengine-ng-0.9.7:0=[png,jpeg,fontconfig,gif=,svg=,chm=,harfbuzz=,fribidi=,zstd=,libutf8proc=]
 	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 BDEPEND="${CDEPEND}"
 RDEPEND="${CDEPEND}
--- a/app-text/gspell/gspell-1.12.0.ebuild
+++ b/app-text/gspell/gspell-1.12.0.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gspell"

 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"

 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@ -5,7 +5,7 @@ EAPI=7

 LUA_COMPAT=( lua5-{1..4} luajit )

-inherit lua-single qmake-utils toolchain-funcs
+inherit lua-single qmake-utils toolchain-funcs xdg

 DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
 HOMEPAGE="http://www.andre-simon.de/"
--- a/Show More
+++ b/Show More