diff --git a/app-admin/cpulimit/cpulimit-9999.ebuild b/app-admin/cpulimit/cpulimit-9999.ebuild
index db67b8f89..d8ecf954c 100644
--- a/app-admin/cpulimit/cpulimit-9999.ebuild
+++ b/app-admin/cpulimit/cpulimit-9999.ebuild
@@ -14,6 +14,16 @@ SLOT="0"
 
 PATCHES="${FILESDIR}/${P}-makefile.patch"
 
+src_prepare() {
+	default
+	sed -r \
+		-e '/sys\/sysctl.h/d' \
+		-i src/cpulimit.c
+	sed -r \
+		-e '/signal.h.*$/a#include <libgen.h>' \
+		-i src/process_group.c
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" || die "emake failed"
 }
diff --git a/app-admin/heroku-cli/Manifest b/app-admin/heroku-cli/Manifest
index bd4bf4f80..ddb3beb60 100644
--- a/app-admin/heroku-cli/Manifest
+++ b/app-admin/heroku-cli/Manifest
@@ -1 +1 @@
-DIST heroku-cli-7.67.1.tar.gz 17028 BLAKE2B f68bf6dcdebc16105ec904c415dab12b90634c8a65ed9e6c4869fa517efa15c0682a583142552ce7c1c74cb76bbb303b7ed367031c8df023846b9ba9a5980ae5 SHA512 681c08612c2797ddfa155bc757568fb6c0eac4846fcbbb53f5e4573945f654f54596ef71c407528f4af4269c8e609655e7575b715dca136d06f856e9dce0ffb0
+DIST heroku-cli-9.1.0.tar.gz 286771 BLAKE2B b14d40aedcc550d6154cd91fa0ca5e91f4cf308cb355eec44e01c8b299c2144686fe3c2709f5dcc8c780ce5636f2ad94717d1e3a54e9b45312a9d6ade1557961 SHA512 c41afeb84abf038863cf7499ef9cf5702039a270bfbc0b537c625835179344944b28e8d5f8b8dd9d2c1030aa7770a5f35d021c4ef8bf33832ca65fac9d5a6856
diff --git a/app-admin/heroku-cli/heroku-cli-7.67.1.ebuild b/app-admin/heroku-cli/heroku-cli-9.1.0.ebuild
similarity index 83%
rename from app-admin/heroku-cli/heroku-cli-7.67.1.ebuild
rename to app-admin/heroku-cli/heroku-cli-9.1.0.ebuild
index 8c6fde75c..47fcee6cb 100644
--- a/app-admin/heroku-cli/heroku-cli-7.67.1.ebuild
+++ b/app-admin/heroku-cli/heroku-cli-9.1.0.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="A tool for creating and managing Heroku apps from the command line"
 HOMEPAGE="https://devcenter.heroku.com/articles/heroku-cli"
 SRC_URI="https://registry.npmjs.org/${MY_PN}/-/${MY_P}.tgz -> ${P}.tar.gz"
 
+S="${WORKDIR}"
+
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -18,14 +20,6 @@ RESTRICT="network-sandbox strip"
 RDEPEND="dev-vcs/git"
 BDEPEND="net-libs/nodejs[npm]"
 
-S="${WORKDIR}"
-
-# src_unpack() {
-# 	mkdir -p "${S}"
-# 	cp -s "${DISTDIR}/${A}" "${S}"
-# }
-
 src_install() {
 	npm install -g --user root --prefix "${D}/usr" "${DISTDIR}/${A}" || die
-	# find "${D}/usr" -type d -exec chmod 755 '{}' +
 }
diff --git a/app-admin/wp-cli/Manifest b/app-admin/wp-cli/Manifest
index 04f687bfe..cfa2abcc1 100644
--- a/app-admin/wp-cli/Manifest
+++ b/app-admin/wp-cli/Manifest
@@ -1 +1 @@
-DIST wp-cli-2.7.1.phar 6729511 BLAKE2B 47297cf4be5fb31f45f8c22d316238337343ab4624ba6d06cb55434eb00089f96b0213ebbd8643bcbbfaba57432c75f8a85d34baa992494432c5f75959a0fd28 SHA512 956b5e3e1a076bd5441c082ee754e3ff4517ec965b93c621f455c2bf5719358c36e67d52f676492700b59d42cacb34a50d382535c035f19da7a0b98bc41860de
+DIST wp-cli-2.11.0.phar 7048108 BLAKE2B bab025ad5ae385f512b65e37a4dfd4af1f67188d06ca9af988cfc5a4b5511d99ad5241460f5951487984eca90e75f14f9df120a66e975db71ecb4659ac828637 SHA512 adb12146bab8d829621efed41124dcd0012f9027f47e0228be7080296167566070e4a026a09c3989907840b21de94b7a35f3bfbd5f827c12f27c5803546d1bba
diff --git a/app-admin/wp-cli/wp-cli-2.7.1.ebuild b/app-admin/wp-cli/wp-cli-2.11.0.ebuild
similarity index 100%
rename from app-admin/wp-cli/wp-cli-2.7.1.ebuild
rename to app-admin/wp-cli/wp-cli-2.11.0.ebuild
index ccf28fd12..267137fc8 100644
--- a/app-admin/wp-cli/wp-cli-2.7.1.ebuild
+++ b/app-admin/wp-cli/wp-cli-2.11.0.ebuild
@@ -7,6 +7,8 @@ DESCRIPTION="The command line interface for WordPress"
 HOMEPAGE="https://wp-cli.org/"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.phar"
 
+S="${WORKDIR}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
@@ -14,8 +16,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 DEPEND="dev-lang/php:*"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 src_install() {
 	newbin "${DISTDIR}/${A}" wp
 }
diff --git a/app-crypt/cprocsp/cprocsp-5.0.12000.ebuild b/app-crypt/cprocsp/cprocsp-5.0.12000.ebuild
index b4cd7b037..9250a7a49 100644
--- a/app-crypt/cprocsp/cprocsp-5.0.12000.ebuild
+++ b/app-crypt/cprocsp/cprocsp-5.0.12000.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit rpm systemd xdg udev
 
 DESCRIPTION="CryptoPro Crypto Provider"
+HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 
 SRC_URI="
 	x86? ( ${P}_x86.tgz )
@@ -14,11 +15,10 @@ SRC_URI="
 	arm64? ( ${P}_arm64.tgz )
 "
 
-HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 LICENSE="Crypto-Pro"
-RESTRICT="bindist fetch mirror strip"
 SLOT="0/5.0.12000"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist fetch mirror strip"
 
 DEPEND="
 	app-accessibility/at-spi2-core
diff --git a/app-crypt/cprocsp/cprocsp-5.0.12900.ebuild b/app-crypt/cprocsp/cprocsp-5.0.12900.ebuild
index ffc0dd180..c51309793 100644
--- a/app-crypt/cprocsp/cprocsp-5.0.12900.ebuild
+++ b/app-crypt/cprocsp/cprocsp-5.0.12900.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit rpm systemd xdg udev
 
 DESCRIPTION="CryptoPro Crypto Provider"
+HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 
 SRC_URI="
 	x86? ( ${P}_x86.tgz )
@@ -14,11 +15,10 @@ SRC_URI="
 	arm64? ( ${P}_arm64.tgz )
 "
 
-HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 LICENSE="Crypto-Pro"
-RESTRICT="bindist fetch mirror strip"
 SLOT="0/5.0.12900"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist fetch mirror strip"
 
 DEPEND="
 	app-accessibility/at-spi2-core
diff --git a/app-crypt/etoken-sac/etoken-sac-9.1.7_p0.ebuild b/app-crypt/etoken-sac/etoken-sac-9.1.7_p0.ebuild
index 4b51e573e..788b77e60 100644
--- a/app-crypt/etoken-sac/etoken-sac-9.1.7_p0.ebuild
+++ b/app-crypt/etoken-sac/etoken-sac-9.1.7_p0.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit rpm
 
 DESCRIPTION="SafeNet (Aladdin) eTokens Middleware (PRO, NG OTP, Flash, Java)"
+HOMEPAGE="https://aladdin-rd.ru"
 
 #MAGIC_DATE="10.12.2013"
 
@@ -21,12 +22,13 @@ SRC_PV=${SRC_PV/./_}
 
 SRC_URI="https://online.payment.ru/drivers/SAC_${SRC_PV}_Linux.zip"
 
-HOMEPAGE="https://aladdin-rd.ru"
+S="${WORKDIR}/SAC_${SRC_PV}_Linux"
+
 LICENSE="EULA"
-RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ssl multilib minimal"
+RESTRICT="mirror"
 
 # TODO:
 # - minimal useflag (I can't do it now, since
@@ -51,8 +53,6 @@ QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib32/.* usr/lib64/.*"
 QA_MULTILIB_PATHS="usr/lib32/.* usr/lib64/.* lib32/.* lib64/.*"
 
-S="${WORKDIR}/SAC_${SRC_PV}_Linux"
-
 #pkg_nofetch() {
 #	einfo "Please send mail to Aladdin eToken TS <support.etoken@aladdin-rd.ru> and"
 #	einfo "ask them to provide a ${MY_PV} version of eToken driver. Then put RPMs from"
diff --git a/app-crypt/keybase/keybase-9999.ebuild b/app-crypt/keybase/keybase-9999.ebuild
index 08dd2c74a..9e3b9d29d 100644
--- a/app-crypt/keybase/keybase-9999.ebuild
+++ b/app-crypt/keybase/keybase-9999.ebuild
@@ -8,6 +8,8 @@ inherit go-module systemd
 DESCRIPTION="Client for keybase.io"
 HOMEPAGE="https://keybase.io/"
 
+S="${WORKDIR}/${P}/go"
+
 LICENSE="BSD"
 SLOT="0"
 
@@ -41,8 +43,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${P}/go"
-
 src_unpack() {
 	git-r3_src_unpack
 	go-module_live_vendor
diff --git a/app-crypt/tcplay/tcplay-3.3.ebuild b/app-crypt/tcplay/tcplay-3.3.ebuild
index bf8761b21..91d1de3da 100644
--- a/app-crypt/tcplay/tcplay-3.3.ebuild
+++ b/app-crypt/tcplay/tcplay-3.3.ebuild
@@ -9,11 +9,12 @@ DESCRIPTION="Free and simple TrueCrypt Implementation based on dm-crypt"
 HOMEPAGE="https://github.com/bwalex/tc-play"
 SRC_URI="https://github.com/bwalex/tc-play/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}"/${P}
+
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs test"
-S="${WORKDIR}"/${P}
 
 # Tests need root privileges, access to /dev/loop0 and mostly fail
 RESTRICT="test"
diff --git a/app-eselect/eselect-gradle/eselect-gradle-0.1.ebuild b/app-eselect/eselect-gradle/eselect-gradle-0.1.ebuild
deleted file mode 100644
index 7854ff0bc..000000000
--- a/app-eselect/eselect-gradle/eselect-gradle-0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manage multiple Gradle versions on one system"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-
-RDEPEND="app-admin/eselect"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}/gradle.eselect"
-}
diff --git a/app-eselect/eselect-gradle/files/gradle.eselect b/app-eselect/eselect-gradle/files/gradle.eselect
deleted file mode 100644
index a9db41c22..000000000
--- a/app-eselect/eselect-gradle/files/gradle.eselect
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2013-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-# $Id: $
-
-DESCRIPTION="Manage the /usr/bin/gradle symlink"
-MAINTAINER="flo@geekplace.eu"
-VERSION=0.1
-
-# find a list of gradle symlink targets
-find_targets() {
-	local f
-	for f in "${EROOT}"/usr/bin/gradle?(-bin)-[[:digit:]]*; do
-		[[ -x ${f} ]] && basename "${f}"
-	done
-}
-
-remove_symlink() {
-	rm "${EROOT}/usr/bin/gradle" \
-		|| die -q "Could not remove symlink"
-}
-
-set_symlink() {
-	local target=$1
-
-	if is_number "${target}"; then
-		local targets=( $(find_targets) )
-		target=${targets[target-1]}
-	fi
-
-	[[ -z ${target} ]] \
-		&& die -q "Target \"${1}\" doesn't apper to be valid!"
-
-	[[ ! -x ${EROOT}/usr/bin/${target} ]] \
-		&& die -q "${EROOT}/usr/bin/${target} is not an executable"
-
-	ln -s "${target}" "${EROOT}/usr/bin/gradle" \
-		|| die -q "Could not set symlink"
-}
-
-describe_show() {
-	echo "Shows the current gradle symlink"
-}
-
-do_show() {
-	write_list_start "Current gradle symlink:"
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		local gradle=$(cannonicalise "${EROOT}/usr/bin/gradle")
-		write_kv_list_entry "${gradle}" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-describe_list() {
-	echo "list available gradle symlink targets"
-}
-
-do_list() {
-	local i targets=( $(find_targets) )
-
-	write_list_start "Available gradle symlink targets:"
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		# highligh the target where the symlink is pointing to
-		[[ ${targets[i]} = \
-			$(basename "$(canonicalise "${EROOT}/usr/bin/gradle")") ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-describe_set() {
-	echo "Set a new gradle symlink target"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		# existing symmlink
-		remove_symlink
-		set_symlink "$1"
-	elif [[ -e ${EROOT}/usr/bin/gradle ]]; then
-		# we have someting strange
-		die -q "${EROOT}/usr/bin/gradle exists but is not a symlink"
-	else
-		set_symlink "$1"
-	fi
-}
-
-describe_update() {
-	echo "Automatically update the gradle symlink"
-}
-
-describe_update_options() {
-	echo "ifunset: Do not override currently set version"
-}
-
-do_update() {
-	[[ -z $1 || $1 == ifunset ]] || die -q "Usage error"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		if [[ $1 == ifunset && -e ${EROOT}/usr/bin/gradle ]]; then
-			return
-		fi
-		remove_symlink
-	elif [[ -e ${EROOT}/usr/bin/gradle ]]; then
-		die -q "${EROOT}/usr/bin/gradle exists but is not a symlink"
-	fi
-
-	local targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		set_symlink "${targets[${#targets[@]}-1]}"
-	fi
-}
-
-test_for_root() {
-	[[ -w ${EROOT}/usr/bin ]] || die -q "${EROOT}/usr/bin not writeable by current user. Are you root?"
-}
diff --git a/app-eselect/eselect-lua/eselect-lua-2.ebuild b/app-eselect/eselect-lua/eselect-lua-2.ebuild
deleted file mode 100644
index 188fbd6dd..000000000
--- a/app-eselect/eselect-lua/eselect-lua-2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Lua eselect module"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-DEPEND="
-	!dev-lang/lua:0
-	>=app-admin/eselect-1.2.4
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules/
-	newins "${FILESDIR}"/lua.eselect-${PV} lua.eselect
-}
diff --git a/app-eselect/eselect-lua/files/lua.eselect-2 b/app-eselect/eselect-lua/files/lua.eselect-2
deleted file mode 100644
index 05de202b4..000000000
--- a/app-eselect/eselect-lua/files/lua.eselect-2
+++ /dev/null
@@ -1,172 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2014-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit config multilib
-
-DESCRIPTION="Manage lua symlinks"
-MAINTAINER="mabi@gentoo.org, lua-eclass@mva.name"
-
-HEADER_FILES="lauxlib.h luaconf.h lua.h lua.hpp lualib.h"
-
-remove_symlinks() {
-	rm -f "${EROOT}"/usr/bin/{lua,luac} &>/dev/null 
-	for dir in $(get_libdirs) ; do
-		rm -f "${EROOT}"${dir}/liblua.so &>/dev/null && \
-		rm -f "${EROOT}"${dir}/pkgconfig/lua.pc &>/dev/null
-	done
-	for f in $HEADER_FILES ; do
-		rm -f "${EROOT}"/usr/include/${f}
-	done
-	rm -f "${EROOT}"/usr/share/man/man1/{lua,luac}.1{,.gz,.bz2,.lzma} &>/dev/null
-}
-
-_dup() {
-	dirname ${1}/.
-}
-
-set_symlinks() {
-	local ver=$1
-	ln -s lua${ver} $(_dup "${EROOT}"/usr/bin/lua)
-	ln -s luac${ver} $(_dup "${EROOT}"/usr/bin/luac)
-	for dir in $(get_libdirs) ; do
-		if has 'jit*' ${ver}; then
-			type -p lua${ver} &>/dev/null || die -q "It's something wrong with your lua${ver} installation: it's binary leads to broken symlink"
-			local abi=$(lua${ver} -e 'print(_VERSION:match("%d.%d"))')
-			local libname=libluajit-${abi}.so.${ver##jit-}
-			test -f "${EROOT}/${dir}/${libname}" || die -q "Can't find libluajit for lua${ver} (lua abi: ${abi})"
-			ln -s ${libname} $(_dup "${EROOT}/${dir}"/liblua.so)
-		else
-			ln -s liblua${ver}.so $(_dup "${EROOT}/${dir}"/liblua.so)
-		fi
-		ln -s lua${ver}.pc $(_dup "${EROOT}/${dir}"/pkgconfig/lua.pc)
-	done
-	for manpage in "${EROOT}"/usr/share/man/man1/lua*${ver}.1* ; do
-		test -f ${manpage} &&
-		ln -s $(basename "${manpage}") $(_dup "${manpage//${ver}}")
-	done
-	for header in $HEADER_FILES ; do
-		local hdr;
-		if has 'jit*' ${ver}; then
-			type -p lua${ver} &>/dev/null || die -q "lua${ver} binary is missing (or leads to broken symlink)"
-			local jit_v=$(lua${ver} -e 'print(jit.version:match("%d.%d"))')
-			hdr=luajit-${jit_v}/${header};
-		else
-			hdr=lua${ver}/${header};
-		fi
-		test -f "${EROOT}/usr/include/${hdr}" || die -q "Missing header: ${header}"
-		ln -s "${hdr}" $(_dup "${EROOT}"/usr/include/${header})
-	done
-}
-
-get_libdirs() {
-	local dir libdirs
-	for dir in $(list_libdirs); do
-		[[ -L ${EROOT}/usr/${dir} ]] && continue
-		ls "${EROOT}"/usr/${dir}/liblua*.* > /dev/null 2>&1 || continue
-
-		libdirs+=' '/usr/${dir}
-	done
-	echo ${libdirs:-/usr/lib}
-}
-
-find_targets() {
-	local dirs
-	local prefix="${EROOT}/usr/bin/lua"
-	for f in ${prefix}{5,jit-2}.* ; do
-		[[ -f "${f}" ]] && dirs="${dirs} ${f##$prefix}"
-	done
-	echo $dirs
-}
-
-resolv_target() {
-	local targets=( $(find_targets) )
-	if is_number $1; then
-		[[ $1 -le ${#targets[@]} && $1 -gt 0 ]] && echo "${targets[ $(( $1 - 1 )) ]}"
-	elif has $1 ${targets[@]}; then
-	  echo $1
-	fi
-}
-
-get_active_version() {
-	readlink -e "${EROOT}"/usr/bin/lua | sed -ne "s:.*/usr/bin/lua\([\w.-]*\):\1:p"
-}
-
-## Actual actions
-
-## set action
-
-describe_set() {
-	echo "Sets the current version of lua"
-}
-
-describe_set_parameters() {
-	echo '<target>'
-}
-
-describe_set_options() {
-	echo 'target:	Target name or number (from "list" action)'
-}
-
-
-do_set() {
-	local target=$(resolv_target $1)
-	if [[ -z "${target}" ]]; then
-	  die -q "You need to specify a version"
-	fi
-	remove_symlinks
-	set_symlinks $target
-}
-
-## List action
-
-describe_list() {
-	echo 'Lists available lua versions'
-}
-
-do_list() {
-	local targets
-	local a
-	targets=( $(find_targets) )
-	a=$(get_active_version)
-	for (( i = 0; i < ${#targets[@]}; i++ )) ; do
-		[[ $a == ${targets[i]} ]] && targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_numbered_list -m '(none found)' "${targets[@]}"
-}
-
-## Show action
-
-describe_show() {
-	echo 'Show the active lua version'
-}
-
-do_show() {
-	get_active_version
-}
-
-## update action
-
-describe_update() {
-	echo 'Automatically update the lua version'
-}
-
-describe_update_options() {
-	echo 'ifunset : Do not override existing implementation'
-}
-
-do_update() {
-	[[ -n ${1} && ! ( ${1} == ifunset || ${1} == '--if-unset' ) ]] && \
-		die -q 'Usage error'
-
-	[[ ( ${1} == ifunset || ${1} == '--if-unset' ) && -n $(get_active_version) ]] && \
-		return
-
-	remove_symlinks
-	
-	local targets=( $(find_targets) )
-	if [[ -n ${#targets[@]} ]] ; then
-		local target=${targets[${#targets[@]} - 1]}
-		set_symlinks $target || echo 'Nothing to update'
-	fi
-}
diff --git a/app-eselect/eselect-lua/metadata.xml b/app-eselect/eselect-lua/metadata.xml
deleted file mode 100644
index eed532de6..000000000
--- a/app-eselect/eselect-lua/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mva@gentoo.org</email>
-    <name>Vadim A. Misbakh-Soloviov</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild b/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
deleted file mode 100644
index 3d4f3204a..000000000
--- a/app-eselect/eselect-luajit/eselect-luajit-1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Manages LuaJIT symlinks"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=app-admin/eselect-1.2.3
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	newins "${FILESDIR}/luajit-${PV}.eselect" luajit.eselect || die "newins failed"
-}
diff --git a/app-eselect/eselect-luajit/files/luajit-1.eselect b/app-eselect/eselect-luajit/files/luajit-1.eselect
deleted file mode 100644
index 3e6f376ef..000000000
--- a/app-eselect/eselect-luajit/files/luajit-1.eselect
+++ /dev/null
@@ -1,141 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2005-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-# $Id: luajit.eselect mva $
-
-inherit config multilib
-
-DESCRIPTION="Manage the LuaJIT symlink"
-MAINTAINER="mva@mva.name"
-VERSION="1"
-
-# sort function for luajit versions, to be used in a pipe
-sort_luajit_versions() {
-	local vsort="sort --version-sort"
-	${vsort} </dev/null &>/dev/null || vsort=sort
-	sed -e 's/^\(luajit-\)\?\([[:digit:].]\+\)[-_]beta/\2 0 &/' \
-		-e 't;s/^\(luajit-\)\?\([[:digit:].]\+\)/\2 1 &/' \
-		| LC_ALL=C ${vsort} | sed 's/.* //'
-}
-
-# find a list of luajit symlink targets
-find_targets() {
-	local f
-	for f in $(find "${EROOT}"/usr/bin/ -type f -iname 'luajit-[[:digit:]]*'); do
-		basename "${f}"
-	done | sort_luajit_versions
-}
-
-get_libdirs() {
-	local dir libdirs
-	for dir in $(list_libdirs); do
-		[[ -L ${EROOT}/usr/${dir} ]] && continue
-		ls "${EROOT}"/usr/${dir}/libluajit*.* > /dev/null 2>&1 || continue
-
-		libdirs+=' '/usr/${dir}
-	done
-	echo ${libdirs:-/usr/lib}
-}
-
-
-# remove the luajit symlink
-remove_symlinks() {
-	for dir in $(get_libdirs) ; do
-		[[ -L "${dir}/libluajit-5.1.so" ]] && rm "${dir}/libluajit-5.1.so"
-		[[ -L "${dir}/libluajit-5.1.a" ]] && rm "${dir}/libluajit-5.1.a"
-		[[ -L "${dir}/pkgconfig/luajit.pc" ]] && rm "${dir}/pkgconfig/luajit.pc"
-	done
-	[[ -L "${EROOT}/usr/bin/luajit" ]] && rm "${EROOT}/usr/bin/luajit"
-	rm -f "${EROOT}"/usr/share/man/man1/luajit.1{,.gz,.bz2,.lzma} &>/dev/null
-}
-
-# set the luajit symlink
-set_symlinks() {
-	local target=$1
-
-	if is_number "${target}"; then
-		local targets=( $(find_targets) )
-		target=${targets[target-1]}
-	fi
-
-	if [[ -z ${target} ]]; then
-		die -q "Target \"$1\" doesn't appear to be valid!"
-	elif [[ -f ${EROOT}/usr/bin/${target} ]]; then
-		ln -s "${target}" "${EROOT}/usr/bin/luajit"
-		for dir in $(get_libdirs) ; do
-			[[ -e "${dir}/lib${target}.so" ]] && ln -s "lib${target}.so" "${dir}/libluajit-5.1.so"
-			[[ -e "${dir}/lib${target}.a" ]] && ln -s "lib${target}.a" "${dir}/libluajit-5.1.a"
-			[[ -e "${dir}/pkgconfig/${target}.pc" ]] && ln -s "${target}.pc" "${dir}/pkgconfig/luajit.pc"
-		done
-		for orig in "${EROOT}"/usr/share/man/man1/$target.1* ; do
-			ln -s "$(basename ${orig})" "${orig/$target/luajit}"
-		done
-	else
-		die -q "Target \"$1\" doesn't appear to be valid!"
-	fi
-}
-
-### show action ###
-
-describe_show() {
-	echo "Show the current luajit symlink"
-}
-
-do_show() {
-	write_list_start "Current luajit symlink:"
-	if [[ -L ${EROOT}/usr/bin/luajit ]]; then
-		local SV=$(readlink "${EROOT}/usr/bin/luajit")
-		write_kv_list_entry "${SV%/}"
-	else
-		write_kv_list_entry "(unset)"
-	fi
-}
-
-### list action ###
-
-describe_list() {
-	echo "List available luajit symlink targets"
-}
-
-do_list() {
-	local i targets=( $(find_targets) )
-
-	write_list_start "Available luajit symlink targets:"
-		local SV=$(readlink "${EROOT}/usr/bin/luajit")
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		[[ ${targets[i]} = \
-			$(basename "${SV}") ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-### set action ###
-
-describe_set() {
-	echo "Set a new luajit symlink target"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-
-	if [[ -L ${EROOT}/usr/bin/luajit ]]; then
-		# existing symlink
-		remove_symlinks || die -q "Couldn't remove existing symlink"
-		set_symlinks "$1" || die -q "Couldn't set a new symlink"
-	elif [[ -e ${EROOT}/usr/bin/luajit ]]; then
-		# we have something strange
-		die -q "${EROOT}/usr/bin/luajit exists but is not a symlink"
-	else
-		set_symlinks "$1" || die -q "Couldn't set a new symlink"
-	fi
-}
diff --git a/app-eselect/eselect-luajit/metadata.xml b/app-eselect/eselect-luajit/metadata.xml
deleted file mode 100644
index eed532de6..000000000
--- a/app-eselect/eselect-luajit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>mva@gentoo.org</email>
-    <name>Vadim A. Misbakh-Soloviov</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-metrics/haproxy_exporter/haproxy_exporter-9999.ebuild b/app-metrics/haproxy_exporter/haproxy_exporter-9999.ebuild
index bae945d43..177342f87 100644
--- a/app-metrics/haproxy_exporter/haproxy_exporter-9999.ebuild
+++ b/app-metrics/haproxy_exporter/haproxy_exporter-9999.ebuild
@@ -6,10 +6,10 @@ EAPI=8
 inherit go-module systemd git-r3
 
 DESCRIPTION="Prometheus exporter for HAProxy metrics"
-LICENSE="Apache-2.0"
 HOMEPAGE="https://github.com/prometheus/haproxy_exporter"
-EGIT_REPO_URI="https://github.com/prometheus/haproxy_exporter"
+LICENSE="Apache-2.0"
 SLOT="0"
+EGIT_REPO_URI="https://github.com/prometheus/haproxy_exporter"
 
 RDEPEND="
 	acct-user/prometheus
diff --git a/app-misc/010-editor-templates/010-editor-templates-20161226.ebuild b/app-misc/010-editor-templates/010-editor-templates-20161226.ebuild
index 28de90e05..feeea26d7 100644
--- a/app-misc/010-editor-templates/010-editor-templates-20161226.ebuild
+++ b/app-misc/010-editor-templates/010-editor-templates-20161226.ebuild
@@ -7,14 +7,14 @@ DESCRIPTION="010 Editor Templates"
 HOMEPAGE="https://www.sweetscape.com/010editor/templates/"
 SRC_URI="https://www.sweetscape.com/010editor/templates/files/010EditorTemplates.zip -> ${P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="EULA"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto "/usr/share/${PN}"
 	doins -r *
diff --git a/app-misc/2gis-data/2gis-data-20221227.ebuild b/app-misc/2gis-data/2gis-data-20221227.ebuild
index 81afddf99..ddab51970 100644
--- a/app-misc/2gis-data/2gis-data-20221227.ebuild
+++ b/app-misc/2gis-data/2gis-data-20221227.ebuild
@@ -6,6 +6,8 @@ EAPI=8
 DESCRIPTION="Data-files for ~app-misc/2gis-3 (wine-version)"
 HOMEPAGE="https://2gis.ru"
 
+S="${WORKDIR}"
+
 LICENSE="2Gis-ru"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -15,8 +17,6 @@ RDEPEND=">=app-misc/2gis-3.16.3.0"
 
 RESTRICT="mirror"
 
-S="${WORKDIR}"
-
 my_add_town() {
 	local town="${1}"
 	local useflag="${1,,}"
diff --git a/app-misc/2gis-plugins/2gis-plugins-0-r9999.ebuild b/app-misc/2gis-plugins/2gis-plugins-0-r9999.ebuild
index 636f53f02..a9dfaf75c 100644
--- a/app-misc/2gis-plugins/2gis-plugins-0-r9999.ebuild
+++ b/app-misc/2gis-plugins/2gis-plugins-0-r9999.ebuild
@@ -10,6 +10,9 @@ SRC_URI="
 	goto? ( https://download.2gis.ru/arhives/GoTo.zip -> 2GIS_Plugin_GoTo.zip )
 	mapnotes? ( https://download.2gis.ru/arhives/MapNotes.zip -> 2GIS_Plugin_MapNotes.zip )
 "
+
+S="${WORKDIR}"
+
 #	gps? ( http://download.2gis.ru/arhives/2GISPlugin_GPS-1.12.0.msi -> 2GIS_Plugin_GPS-1.12.0.7z )
 #	photo? ( http://download.2gis.ru/arhives/2GISPlugin_Photo-1.0.4.0.msi -> 2GIS_Plugin_Photo-1.0.4.0.7z )
 #	postcode? ( http://safegen.com/files/SafePostCode.msi -> 2GIS_Plugin_SafePostCode.7z )
@@ -24,8 +27,6 @@ IUSE="area goto mapnotes"
 BDEPEND="app-arch/unzip"
 RDEPEND="app-misc/2gis"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /opt/2gis/Plugins/
 	doins -r . || die
diff --git a/app-misc/2gis/2gis-3.16.3.0.ebuild b/app-misc/2gis/2gis-3.16.3.0.ebuild
index b24817fc5..ae2cffde9 100644
--- a/app-misc/2gis/2gis-3.16.3.0.ebuild
+++ b/app-misc/2gis/2gis-3.16.3.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Proprietary freeware multimedia map of several Russian and Ukrainia
 HOMEPAGE="https://2gis.ru"
 SRC_URI="https://download.2gis.ru/arhives/2GISShell-${PV}.orig.zip"
 
+S="${WORKDIR}"
+
 LICENSE="2Gis-ru"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -24,8 +26,6 @@ RDEPEND="
 	data? ( app-misc/2gis-data )
 "
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r 2gis/3.0/* || die
diff --git a/app-misc/amazfitbip-font-tool/amazfitbip-font-tool-1.1.ebuild b/app-misc/amazfitbip-font-tool/amazfitbip-font-tool-1.1.ebuild
index a38800e35..7f37b5605 100644
--- a/app-misc/amazfitbip-font-tool/amazfitbip-font-tool-1.1.ebuild
+++ b/app-misc/amazfitbip-font-tool/amazfitbip-font-tool-1.1.ebuild
@@ -10,10 +10,11 @@ DESCRIPTION="Amazfit Bip Font Parser (& Packer)"
 HOMEPAGE="https://web.archive.org/web/20220517220033/https://myamazfit.ru/threads/parser-shriftov-amazfit-bip.96/"
 SRC_URI="https://gist.githubusercontent.com/raw/7ffbab5b23b35207525a7a05295cf67e -> bip_font_tool-${PV}.py"
 
+S="${WORKDIR}"
+
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-# ^ ~arm64: pillow
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -22,10 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-S="${WORKDIR}"
-
 src_unpack() {
-	# mkdir -p "${S}"
 	cp "${DISTDIR}/${A}" "${S}"
 }
 
diff --git a/app-misc/amazfitbiptools-bin/amazfitbiptools-bin-1.0.3.1.ebuild b/app-misc/amazfitbiptools-bin/amazfitbiptools-bin-1.0.3.1.ebuild
index 1310c057b..e0e27db71 100644
--- a/app-misc/amazfitbiptools-bin/amazfitbiptools-bin-1.0.3.1.ebuild
+++ b/app-misc/amazfitbiptools-bin/amazfitbiptools-bin-1.0.3.1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Amazfit Bip Tools (for watchface/firmware cooking)"
 HOMEPAGE="https://bitbucket.org/valeronm/amazfitbiptools"
 SRC_URI="https://bitbucket.org/valeronm/amazfitbiptools/downloads/AmazfitBipTools-${PV}.7z"
 
+S="${WORKDIR}"
+
 LICENSE="Ms-PL"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -16,8 +18,6 @@ KEYWORDS="~amd64 ~x86"
 BDEPEND="app-arch/p7zip"
 RDEPEND="dev-lang/mono"
 
-S="${WORKDIR}"
-
 src_install() {
 	insinto /opt/${PN}
 	doins -r *
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
deleted file mode 100644
index cb9b69668..000000000
--- a/app-misc/asciinema/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST asciinema-2.3.0.gh.tar.gz 91464 BLAKE2B ff2f38715a9c69ec15ad8dfdfa282a49c32075e6be43ce2f568d188678d6fee1351f36f8dd2a272052f43087cf222e2b14d37ed26a42ba11396074523391efc5 SHA512 09951d96938faaf71a5b71f5a514ffacb32be224883691aec7fb549ad5dd4d0eb0a83c06ec23f81c36224fa028f0351decb7d82288b716a6453cbf00ad373845
diff --git a/app-misc/asciinema/asciinema-2.3.0.ebuild b/app-misc/asciinema/asciinema-2.3.0.ebuild
deleted file mode 100644
index a6d2c4593..000000000
--- a/app-misc/asciinema/asciinema-2.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/asciinema-2.2.0-setup.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -i -e "s|share/doc/asciinema|&-${PVR}|" setup.cfg || die
-}
diff --git a/app-misc/asciinema/asciinema-9999.ebuild b/app-misc/asciinema/asciinema-9999.ebuild
index a6d2c4593..0d7dd0a7a 100644
--- a/app-misc/asciinema/asciinema-9999.ebuild
+++ b/app-misc/asciinema/asciinema-9999.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..13} )
 DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..13} )
+
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
@@ -13,6 +14,7 @@ HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	EGIT_BRANCH="main"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
index 3dc7d1908..82a5992f2 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1 +1 @@
-DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
+DIST evemu-ac0531bbf81c4a58918c7b7837ba87c76edef639.tar.bz2 419908 BLAKE2B 41b868364e3ce807b1082ebcf37847ad880655f6c0f617de667adb286f08f1ecd0bf64e02c1132b83d8dcd585ac4104c53897b595464a5028de2cfe8427bd27c SHA512 4ab1e13aabe12175a84f2e6763af13d1ea99d6417e1b4373a799e10873f4509dca8b3746851c808bee572d2ae1a0c6b3ccf62c70b22b6a2bbff76ca771d07ae5
diff --git a/app-misc/evemu/evemu-2.7.0.ebuild b/app-misc/evemu/evemu-2.7.0_p20230829.ebuild
similarity index 71%
rename from app-misc/evemu/evemu-2.7.0.ebuild
rename to app-misc/evemu/evemu-2.7.0_p20230829.ebuild
index 360ffe982..f3b674733 100644
--- a/app-misc/evemu/evemu-2.7.0.ebuild
+++ b/app-misc/evemu/evemu-2.7.0_p20230829.ebuild
@@ -4,11 +4,17 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{8..13} )
 
-inherit python-single-r1
+inherit python-single-r1 autotools
 
 DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
 HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+# FIXME: remove on next versions (after 2.7.0)
+MY_SHA="ac0531bbf81c4a58918c7b7837ba87c76edef639"
+SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${MY_SHA}/${PN}-${MY_SHA}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_SHA}"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0"
@@ -21,6 +27,11 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="app-arch/xz-utils
 	${RDEPEND}"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
diff --git a/app-eselect/eselect-gradle/metadata.xml b/app-misc/evemu/metadata.xml
similarity index 52%
rename from app-eselect/eselect-gradle/metadata.xml
rename to app-misc/evemu/metadata.xml
index eddc40ef3..e63f09ab9 100644
--- a/app-eselect/eselect-gradle/metadata.xml
+++ b/app-misc/evemu/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>flo@geekplace.eu</email>
-    <description>Maintainer, CC him on bugs</description>
+    <email>mva@gentoo.org</email>
+    <name>Vadim Misbakh-Soloviov</name>
   </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">libevdev/evemu</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-portage/ebuild-bisect/ebuild-bisect-9999.ebuild b/app-portage/ebuild-bisect/ebuild-bisect-9999.ebuild
index 33a0c25ee..59a927b44 100644
--- a/app-portage/ebuild-bisect/ebuild-bisect-9999.ebuild
+++ b/app-portage/ebuild-bisect/ebuild-bisect-9999.ebuild
@@ -6,12 +6,12 @@ EAPI=8
 DESCRIPTION="Tool for bisecting live ebuilds"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}"
-
 src_install() {
 	dosbin "${FILESDIR}/ebuild-bisect"
 }
diff --git a/app-vim/nginx-syntax/nginx-syntax-1.27.0.ebuild b/app-vim/nginx-syntax/nginx-syntax-1.27.0.ebuild
index e94f0bbf2..26cbc0ea5 100644
--- a/app-vim/nginx-syntax/nginx-syntax-1.27.0.ebuild
+++ b/app-vim/nginx-syntax/nginx-syntax-1.27.0.ebuild
@@ -7,8 +7,9 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: Nginx configuration files syntax"
 HOMEPAGE="https://nginx.org/"
-LICENSE="vim"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 SRC_URI="https://nginx.org/download/${P//-syntax}.tar.gz"
 
 S="${WORKDIR}/${P//-syntax}/contrib/vim"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.1_pre20211004.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.1_pre20211004.ebuild
index 21a439e56..03cef775a 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.1_pre20211004.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.1_pre20211004.ebuild
@@ -9,7 +9,8 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
 SRC_URI="https://github.com/tmux-plugins/${PN}/archive/${MY_SHA:-v${PV}}.tar.gz -> ${P}.tar.gz"
-LICENSE="public-domain MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 S="${WORKDIR}/${PN}-${MY_SHA:-${PV}}"
+
+LICENSE="public-domain MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/dev-cpp/asio/asio-9999.ebuild b/dev-cpp/asio/asio-9999.ebuild
index e20f3f31e..50a30b8ed 100644
--- a/dev-cpp/asio/asio-9999.ebuild
+++ b/dev-cpp/asio/asio-9999.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Asynchronous Network Library"
 HOMEPAGE="https://think-async.com/Asio/"
 EGIT_REPO_URI="https://github.com/chriskohlhoff/${PN}.git"
 
+S="${WORKDIR}/${P}/${PN}"
+
 LICENSE="Boost-1.0"
 SLOT="0"
 IUSE="doc examples ssl test"
@@ -21,8 +23,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}/${PN}
-
 src_prepare() {
 	eautoreconf
 	default
diff --git a/dev-db/tora/tora-9999.ebuild b/dev-db/tora/tora-9999.ebuild
index 4e490feaa..8b855bebc 100644
--- a/dev-db/tora/tora-9999.ebuild
+++ b/dev-db/tora/tora-9999.ebuild
@@ -14,10 +14,10 @@ fi
 
 DESCRIPTION="TOra - Toolkit For Oracle"
 HOMEPAGE="https://torasql.com/"
-IUSE="debug mysql oracle oci8-instant-client postgres +experimental"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug mysql oracle oci8-instant-client postgres +experimental"
 
 RDEPEND="
 	dev-libs/ferrisloki
diff --git a/dev-java/commons-text/commons-text-1.11.0.ebuild b/dev-java/commons-text/commons-text-1.11.0.ebuild
index 6d65244c7..b90a9c93a 100644
--- a/dev-java/commons-text/commons-text-1.11.0.ebuild
+++ b/dev-java/commons-text/commons-text-1.11.0.ebuild
@@ -17,6 +17,8 @@ DESCRIPTION="Apache Commons Text is a library focused on algorithms working on s
 HOMEPAGE="https://commons.apache.org/proper/commons-text/"
 SRC_URI="https://archive.apache.org/dist/commons/text/source/${P}-src.tar.gz"
 
+S="${WORKDIR}/${P}-src"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
@@ -52,8 +54,6 @@ RDEPEND="
 
 DOCS=( CONTRIBUTING.md NOTICE.txt README.md RELEASE-NOTES.txt )
 
-S="${WORKDIR}/${P}-src"
-
 JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.text"
 JAVA_ENCODING="ISO-8859-1"
 
diff --git a/dev-java/gradle/Manifest b/dev-java/gradle/Manifest
index e7a11f6af..0c026aadb 100644
--- a/dev-java/gradle/Manifest
+++ b/dev-java/gradle/Manifest
@@ -1 +1 @@
-DIST gradle-8.6.0.tar.gz 38317031 BLAKE2B 823324ba1ba2aff2cfce3e14bb6b8c5c7511231d521f798a5bc0ebd978262ecb77d8a02090f340edabd457c28e6fac7dd667bb7d73bee2828da0ba6a438e9129 SHA512 b2cc6803c8d285cb14fbd50f4ca1add7db86266dfbc1e8b303ffe360d1e8e7991744a092112732b37ec97b13f42968b768415e0cadfb99565b9900c3aa883b05
+DIST gradle-8.10.0.tar.gz 38613139 BLAKE2B 787c6c6c4160cceae10fa9e6223fd3b7b03e8e2139a6b7b79c4a54138dbdb6a84617e79eb725cd7b0b4d8bad48ad5d51974af06687be76425dd89365eb35c531 SHA512 82688c87a174953bb8a50b450b6b902743e855cf83cc3899a2b725219b85b1b18539a7da14feca9568b4d74f0b3fbdcd51b3575f72acdde490142dc8cab34614
diff --git a/dev-java/gradle/gradle-8.6.0.ebuild b/dev-java/gradle/gradle-8.10.0.ebuild
similarity index 100%
rename from dev-java/gradle/gradle-8.6.0.ebuild
rename to dev-java/gradle/gradle-8.10.0.ebuild
index 7b9e81093..deb1a81d8 100644
--- a/dev-java/gradle/gradle-8.6.0.ebuild
+++ b/dev-java/gradle/gradle-8.10.0.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 inherit java-pkg-2 gradle
 
 DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+HOMEPAGE="https://gradle.org/"
 # SRC_URI="https://github.com/gradle/gradle-distributions/releases/download/v${PV}/${P%.0}-src.zip"
 SRC_URI="https://github.com/gradle/gradle/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://gradle.org/"
 LICENSE="Apache-2.0"
 SLOT="${PV}"
 
diff --git a/dev-java/picocli/picocli-4.6.3-r1.ebuild b/dev-java/picocli/picocli-4.6.3-r1.ebuild
index aef878a83..b384f3bf6 100644
--- a/dev-java/picocli/picocli-4.6.3-r1.ebuild
+++ b/dev-java/picocli/picocli-4.6.3-r1.ebuild
@@ -17,6 +17,9 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java command line parser with both an annotations API and a programmatic API"
 HOMEPAGE="https://picocli.info"
 SRC_URI="https://github.com/remkop/${PN}/archive/v${PV}.tar.gz -> ${P}-sources.tar.gz"
+
+S="${WORKDIR}/${P}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -35,8 +38,6 @@ RDEPEND="
 
 DOCS=( LICENSE README.md RELEASE-NOTES.md )
 
-S="${WORKDIR}/${P}"
-
 JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
similarity index 99%
rename from dev-lang/luajit/luajit-2.1.9999.ebuild
rename to dev-lang/luajit/luajit-2.1.9999999999.ebuild
index b53b82feb..e089a3b11 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -11,9 +11,8 @@ EGIT_REPO_URI="https://luajit.org/git/luajit-2.0.git"
 EGIT_BRANCH="v2.1"
 EGIT_MIN_CLONE_TYPE="single+tags"
 
-SLOT="2"
-
 LICENSE="MIT"
+SLOT="2"
 IUSE="debug valgrind lua52compat openresty +optimization"
 
 RDEPEND="
diff --git a/dev-libs/libbson/libbson-1.22.2.ebuild b/dev-libs/libbson/libbson-1.22.2.ebuild
index 08a09f261..8db185eac 100644
--- a/dev-libs/libbson/libbson-1.22.2.ebuild
+++ b/dev-libs/libbson/libbson-1.22.2.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Library routines related to building,parsing and iterating BSON doc
 HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
 SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz"
 
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~riscv ~sparc ~x86"
@@ -20,8 +22,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.14.0-no-docs.patch"
 )
 
-S="${WORKDIR}/mongo-c-driver-${PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_BSON=ON
diff --git a/dev-libs/libdrizzle/libdrizzle-7.ebuild b/dev-libs/libdrizzle/libdrizzle-7.ebuild
index 3886020cf..458230b8e 100644
--- a/dev-libs/libdrizzle/libdrizzle-7.ebuild
+++ b/dev-libs/libdrizzle/libdrizzle-7.ebuild
@@ -11,12 +11,12 @@ DESCRIPTION="Snapshot of dev-db/drizzle sources which can be built as shared lib
 HOMEPAGE="https://github.com/openresty/drizzle-nginx-module"
 SRC_URI="https://openresty.org/download/${MY_P}.tar.gz"
 
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	sed -r \
 	-e 's|python (config/pandora-plugin)|python2 \1|' \
diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-3.7.0.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-3.7.0.ebuild
index fe8b7d96c..9cb99d09d 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-3.7.0.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-3.7.0.ebuild
@@ -11,6 +11,8 @@ DESCRIPTION="C++ Driver for MongoDB"
 HOMEPAGE="https://mongocxx.org"
 SRC_URI="https://github.com/mongodb/${PN}/archive/refs/tags/r${MY_PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${PN}-r${MY_PV}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,8 +25,6 @@ RDEPEND="
 	static-mongoc? ( dev-libs/mongo-c-driver[static-libs] )
 "
 
-S="${WORKDIR}/${PN}-r${MY_PV}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_VERSION="${PV}"
diff --git a/dev-libs/msgpack/msgpack-9999.ebuild b/dev-libs/msgpack/msgpack-9999.ebuild
index c4c369d23..ad0ce6def 100644
--- a/dev-libs/msgpack/msgpack-9999.ebuild
+++ b/dev-libs/msgpack/msgpack-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake-multilib git-r3 multibuild
+inherit cmake-multilib git-r3
 
 EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 EGIT_BRANCH="c_master"
diff --git a/dev-lua/alt-getopt/alt-getopt-0.8.0.ebuild b/dev-lua/alt-getopt/alt-getopt-0.8.0.ebuild
index 1688cbccc..95cef4211 100644
--- a/dev-lua/alt-getopt/alt-getopt-0.8.0.ebuild
+++ b/dev-lua/alt-getopt/alt-getopt-0.8.0.ebuild
@@ -12,6 +12,8 @@ HOMEPAGE="https://github.com/cheusov/lua-alt-getopt"
 MY_P="lua-${P}"
 SRC_URI="https://github.com/cheusov/lua-${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/lua-${P}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
@@ -20,8 +22,6 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/lua-${P}"
-
 src_compile() { :; }
 
 each_lua_install() {
diff --git a/dev-lua/cbor/cbor-9999.ebuild b/dev-lua/cbor/cbor-9999.ebuild
index b8d58aa14..1daf4f168 100644
--- a/dev-lua/cbor/cbor-9999.ebuild
+++ b/dev-lua/cbor/cbor-9999.ebuild
@@ -35,20 +35,23 @@ src_prepare() {
 	fi
 	sed -r \
 		-e 's@^(prefix).*@\1=/usr@' \
-		-e 's@(.*LUA_DIR.*/lua/.*shell )lua( -e "print.*)@\1${ELUA}\2@' \
 		-i Makefile
+		# -e 's@(.*LUA_DIR.*/lua/.*shell )lua( -e "print.*)@\1${ELUA}\2@' \
+		# -e '/\t\$\(CC\)/s,(\$\(LDFLAGS\)),$(CFLAGS) -I$(LUA_INCDIR) \1,' \
 	lua_copy_sources
 }
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	default
+	# default
+	emake CFLAGS="${CFLAGS} $(lua_get_CFLAGS)"
 	popd
 }
 
 each_lua_install() {
 	pushd "${BUILD_DIR}"
-	default
+	emake CFLAGS="${CFLAGS} $(lua_get_CFLAGS)"
+	# default
 	popd
 }
 
diff --git a/dev-lua/lanes/lanes-9999.ebuild b/dev-lua/lanes/lanes-9999.ebuild
index 9fdc79e20..4a3ba0a4d 100644
--- a/dev-lua/lanes/lanes-9999.ebuild
+++ b/dev-lua/lanes/lanes-9999.ebuild
@@ -50,11 +50,15 @@ each_lua_install() {
 }
 
 src_prepare() {
-	sed -i -r \
-		-e '/^INSTALL..DIRECTORY docs/d' \
-		-e '/^INSTALL..DIRECTORY tests/d' \
-		-e '/^INSTALL..FILES .* README /d' \
-		CMakeLists.txt
+	# sed -i -r \
+	# 	-e '/^INSTALL..DIRECTORY docs/d' \
+	# 	-e '/^INSTALL..DIRECTORY tests/d' \
+	# 	-e '/^INSTALL..FILES .* README /d' \
+	# 	CMakeLists.txt
+	# TODO:
+	# build is broken, but may probably be fixed with
+	# set_target_properties(core PROPERTIES LINKER_LANGUAGE C)
+	# or somethinng like that
 	cmake_src_prepare
 	lua_copy_sources
 }
diff --git a/dev-lua/ldbus/ldbus-9999.ebuild b/dev-lua/ldbus/ldbus-9999.ebuild
index e5fffede3..8372ded1f 100644
--- a/dev-lua/ldbus/ldbus-9999.ebuild
+++ b/dev-lua/ldbus/ldbus-9999.ebuild
@@ -29,12 +29,20 @@ src_prepare() {
 	default
 	cp "${FILESDIR}/GNUmakefile" "${S}/"
 	sed -r \
-		-e "s@lua5.3@${ELUA}@" \
 		-e "/^PKG_CONFIG/{s@=.*@= $(tc-getPKG_CONFIG)@}" \
-		-e '/^LUA_LIBDIR/d' \
 		-e '/install:/,${s@(\$\(LUA_LIBDIR\))@$(DESTDIR)/\1@g}' \
-		-i src/Makefile
+		-i src/Makefile || die
 	lua_copy_sources
+	lua_foreach_impl each_lua_prepare
+}
+
+each_lua_prepare() {
+	pushd "${BUILD_DIR}"
+	sed -r \
+		-e "/^LUA_PKGNAME/{s@=.*@= ${ELUA}@}" \
+		-e "/^LUA_LIBDIR/{s@=.*@= $(lua_get_cmod_dir)@}" \
+		-i src/Makefile || die
+	popd
 }
 
 each_lua_compile() {
diff --git a/dev-lua/ldoc/ldoc-9999.ebuild b/dev-lua/ldoc/ldoc-9999.ebuild
index 6f26de60b..53100eb71 100644
--- a/dev-lua/ldoc/ldoc-9999.ebuild
+++ b/dev-lua/ldoc/ldoc-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua{5-{1..4},jit} )
 
-inherit lua git-r3
+inherit lua-single git-r3
 
 DESCRIPTION="A LuaDoc-compatible documentation generation system"
 HOMEPAGE="https://github.com/lunarmodules/ldoc"
@@ -17,33 +17,29 @@ IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RDEPEND="
 	${LUA_DEPS}
-	dev-lua/penlight[${LUA_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/penlight[${LUA_USEDEP}]
+	')
 "
 
-DOCS=( README.md doc/doc.md )
+DOCS=( README.md )
 
 src_compile() {
 	if use doc; then
-		for doc in {,l}doc; do
-			pushd "${doc}" &>/dev/null
-			# "${ELUA}"
-			lua ../ldoc.lua . -d ../${doc}_html || die "Failed to build in ${doc} dir"
+			pushd ldoc &>/dev/null
+			"${ELUA}" ../ldoc.lua . -d ../ldoc_html || die "Failed to build in ${doc} dir"
 			popd &>/dev/null
-		done
 	fi
 	rm ldoc/{SciTE.properties,config.ld}
 }
 
-each_lua_install() {
-	insinto "$(lua_get_lmod_dir)"
-	doins -r ldoc ldoc.lua
-}
-
 src_install() {
-	lua_foreach_impl each_lua_install
-	newbin ldoc.lua ldoc
+	# insinto "$(lua_get_lmod_dir)"
+	# doins -r ldoc ldoc.lua
+	# newbin ldoc.lua ldoc
+	emake DESTDIR="${ED}" LUA_BINDIR="${EPREFIX}/usr/bin" LUA_SHAREDIR="$(lua_get_lmod_dir)" install
 	if use doc; then
-		HTML_DOCS=( doc_html/. ldoc_html/. )
+		HTML_DOCS=( ldoc_html/. )
 	fi
 	einstalldocs
 }
diff --git a/dev-lua/lua-argon2/lua-argon2-9999.ebuild b/dev-lua/lua-argon2/lua-argon2-9999.ebuild
index ff1c08d50..f8f66a93f 100644
--- a/dev-lua/lua-argon2/lua-argon2-9999.ebuild
+++ b/dev-lua/lua-argon2/lua-argon2-9999.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	$(tc-getCC) ${CFLAGS} -fPIC -shared "src/${PN#lua-}.c" ${LDFLAGS} -largon2 -o "${PN#lua-}.so" || die
+	$(tc-getCC) ${CFLAGS} $(lua_get_CFLAGS) -fPIC -shared "src/${PN#lua-}.c" ${LDFLAGS} -largon2 -o "${PN#lua-}.so" || die
 	popd
 }
 
diff --git a/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild b/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
index b322ac0fa..027dac692 100644
--- a/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
+++ b/dev-lua/lua-cmsgpack/lua-cmsgpack-9999.ebuild
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}"
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	$(tc-getCC) -fPIC ${CFLAGS} ${LDFLAGS} -shared ${PN//-/_}.c -o ${MY_PN}.so || die
+	$(tc-getCC) -fPIC ${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS} -shared ${PN//-/_}.c -o ${MY_PN}.so || die
 	popd
 }
 
diff --git a/dev-lua/lua-discount/lua-discount-9999.ebuild b/dev-lua/lua-discount/lua-discount-9999.ebuild
index 9e10064b4..4fe6bb97f 100644
--- a/dev-lua/lua-discount/lua-discount-9999.ebuild
+++ b/dev-lua/lua-discount/lua-discount-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua{5-{1..4},jit} )
 
-inherit lua git-r3
+inherit lua git-r3 flag-o-matic
 
 DESCRIPTION="Lua binding to app-text/discount"
 HOMEPAGE="https://github.com/craigbarnes/lua-discount"
@@ -20,8 +20,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 each_lua_compile() {
+	append-cflags "$(lua_get_CFLAGS)"
 	pushd "${BUILD_DIR}"
-	emake discount.so
+	emake CFLAGS="${CFLAGS}" discount.so
 	popd
 }
 
diff --git a/dev-lua/lua-evdev/lua-evdev-9999.ebuild b/dev-lua/lua-evdev/lua-evdev-9999.ebuild
index 74b9cef49..fe3532ebc 100644
--- a/dev-lua/lua-evdev/lua-evdev-9999.ebuild
+++ b/dev-lua/lua-evdev/lua-evdev-9999.ebuild
@@ -21,8 +21,9 @@ each_lua_prepare() {
 	pushd "${BUILD_DIR}"
 	if [[ "${ELUA}" == *jit ]]; then
 		sed -r \
-			-e '/^CFLAGS/s@\$\(COMPAT_CFLAGS\) -I.@@' \
+			-e "/^CFLAGS/s@\$\(COMPAT_CFLAGS\) -I.@@" \
 			-e '/^CORE_C/s@(evdev/core.c) .*@\1@' \
+			-e '/^COMPAT_CFLAGS/d' \
 			-i Makefile
 
 		sed -r \
@@ -34,7 +35,7 @@ each_lua_prepare() {
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	default
+	emake MYCFLAGS="$(lua_get_CFLAGS)"
 	popd
 }
 
diff --git a/dev-lua/lua-geoip/lua-geoip-9999.ebuild b/dev-lua/lua-geoip/lua-geoip-9999.ebuild
index 3250e78ff..1d08197fd 100644
--- a/dev-lua/lua-geoip/lua-geoip-9999.ebuild
+++ b/dev-lua/lua-geoip/lua-geoip-9999.ebuild
@@ -40,7 +40,7 @@ src_test() {
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	default
+	emake CFLAGS="${CFLAGS} $(lua_get_CFLAGS)"
 	popd
 }
 
diff --git a/dev-lua/lua-iconv/lua-iconv-9999.ebuild b/dev-lua/lua-iconv/lua-iconv-9999.ebuild
index 5250c01a8..9d34acd99 100644
--- a/dev-lua/lua-iconv/lua-iconv-9999.ebuild
+++ b/dev-lua/lua-iconv/lua-iconv-9999.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	default
+	emake CFLAGS="${CFLAGS} $(lua_get_CFLAGS)"
 	popd
 }
 
diff --git a/dev-lua/lua-udev/lua-udev-9999.ebuild b/dev-lua/lua-udev/lua-udev-9999.ebuild
index 4f53fbc35..edbbef877 100644
--- a/dev-lua/lua-udev/lua-udev-9999.ebuild
+++ b/dev-lua/lua-udev/lua-udev-9999.ebuild
@@ -34,7 +34,8 @@ src_prepare() {
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	$(tc-getCC) "${PN}.c" ${CFLAGS} ${LDFLAGS} -fPIC -shared -ludev -o udev.so || die "Unable to compile"
+	$(tc-getCC) "${PN}.c" ${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS} -fPIC -shared -ludev -o udev.so ||
+		die "Unable to compile"
 	popd
 }
 
diff --git a/dev-lua/lua-utf8/lua-utf8-9999.ebuild b/dev-lua/lua-utf8/lua-utf8-9999.ebuild
index bb6986f17..a4d34740b 100644
--- a/dev-lua/lua-utf8/lua-utf8-9999.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-LUA_COMPAT=( lua{5-{1..4},jit} )
+LUA_COMPAT=( lua{5-{2..4},jit} )
 
 inherit lua git-r3 toolchain-funcs
 
@@ -23,6 +23,7 @@ RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${LUA_DEPS}
+	lua_targets_luajit? ( dev-lang/luajit[lua52compat] )
 	system-unicode-data? ( >=app-i18n/unicode-data-14.0.0 )
 	virtual/pkgconfig
 "
diff --git a/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild b/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild
index 365eb364b..9e9d62fc9 100644
--- a/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild
+++ b/dev-lua/lua-xxhash/lua-xxhash-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 MY_PN="${PN##lua-}"
 LUA_COMPAT=( lua{5-{1..4},jit} )
 
-inherit lua git-r3 toolchain-funcs flag-o-matic
+inherit lua git-r3 toolchain-funcs
 
 DESCRIPTION="Lua bindings for dev-libs/xxhash (XXH32 only for now)"
 HOMEPAGE="https://github.com/mah0x211/lua-xxhash"
@@ -23,8 +23,12 @@ DEPEND="${RDEPEND}"
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	append-cflags "-I./src"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared "src/${MY_PN}.c" "src/${MY_PN}_bind.c" -lxxhash -o "${MY_PN}".so || die
+	$(tc-getCC) \
+		${CFLAGS} $(lua_get_CFLAGS) -I./src \
+		${LDFLAGS} -fPIC -shared \
+		"src/${MY_PN}.c" "src/${MY_PN}_bind.c" \
+		-lxxhash \
+		-o "${MY_PN}".so || die
 	popd
 }
 
diff --git a/dev-lua/luahpdf/luahpdf-9999.ebuild b/dev-lua/luahpdf/luahpdf-9999.ebuild
index 352f8a430..67aece16b 100644
--- a/dev-lua/luahpdf/luahpdf-9999.ebuild
+++ b/dev-lua/luahpdf/luahpdf-9999.ebuild
@@ -30,12 +30,15 @@ src_prepare() {
 		-e 's#(_LINK=)cc#\1$(CC)#' \
 		-e 's#(_REPORT=).*#\1#' \
 		Makefile
+	sed -i -r \
+		-e "/include[^a-z]*hpdf.h/i#include \<hpdf_version.h\>\n" \
+		hpdf.c
 	lua_copy_sources
 }
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	default
+	emake LUAINC="$(lua_get_CFLAGS)"
 	popd
 }
 
diff --git a/dev-lua/lyaml/lyaml-9999.ebuild b/dev-lua/lyaml/lyaml-9999.ebuild
index 076f1d896..efd242dd8 100644
--- a/dev-lua/lyaml/lyaml-9999.ebuild
+++ b/dev-lua/lyaml/lyaml-9999.ebuild
@@ -48,7 +48,7 @@ each_lua_compile() {
 		LUA="${ELUA}"
 	)
 	${ELUA} build-aux/luke "${mylukeargs[@]}" || die
-	cp -nr html "${S}" || die
+	cp -r html "${S}" || die
 	popd
 }
 
diff --git a/dev-lua/pgmoon/pgmoon-2.3.2.0.ebuild b/dev-lua/pgmoon/pgmoon-2.3.2.0.ebuild
index 2cbf95110..4e7d26bdf 100644
--- a/dev-lua/pgmoon/pgmoon-2.3.2.0.ebuild
+++ b/dev-lua/pgmoon/pgmoon-2.3.2.0.ebuild
@@ -18,11 +18,11 @@ if [[ "${PV}" != 9999 ]]; then
 	EGIT_COMMIT="v${PV}"
 fi
 
-IUSE="moonscript openresty"
-
 LICENSE="MIT"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE} openresty? ( lua_targets_luajit )"
+IUSE="moonscript openresty"
+
 DEPEND="
 	${LUA_DEPS}
 "
diff --git a/dev-lua/pgmoon/pgmoon-9999.ebuild b/dev-lua/pgmoon/pgmoon-9999.ebuild
index 2cbf95110..4e7d26bdf 100644
--- a/dev-lua/pgmoon/pgmoon-9999.ebuild
+++ b/dev-lua/pgmoon/pgmoon-9999.ebuild
@@ -18,11 +18,11 @@ if [[ "${PV}" != 9999 ]]; then
 	EGIT_COMMIT="v${PV}"
 fi
 
-IUSE="moonscript openresty"
-
 LICENSE="MIT"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE} openresty? ( lua_targets_luajit )"
+IUSE="moonscript openresty"
+
 DEPEND="
 	${LUA_DEPS}
 "
diff --git a/dev-lua/profi/profi-1.3.ebuild b/dev-lua/profi/profi-1.3.ebuild
index 5875bc7de..c38cabc72 100644
--- a/dev-lua/profi/profi-1.3.ebuild
+++ b/dev-lua/profi/profi-1.3.ebuild
@@ -15,6 +15,8 @@ DESCRIPTION="a Lua Profiler"
 HOMEPAGE="https://gist.github.com/perky/2838755"
 SRC_URI="https://gist.github.com/${GIST_A}/${GIST_ID}/archive/${GIST_SHA}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${GIST_ID}-${GIST_SHA}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
@@ -23,8 +25,6 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
 RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${GIST_ID}-${GIST_SHA}"
-
 each_lua_install() {
 	insinto "$(lua_get_lmod_dir)"
 	doins ProFi.lua
diff --git a/dev-lua/resty-openssl/resty-openssl-0.8.22.ebuild b/dev-lua/resty-openssl/resty-openssl-0.8.22.ebuild
index f1e179f30..543853f55 100644
--- a/dev-lua/resty-openssl/resty-openssl-0.8.22.ebuild
+++ b/dev-lua/resty-openssl/resty-openssl-0.8.22.ebuild
@@ -18,11 +18,11 @@ if [[ "${PV}" != 9999 ]]; then
 	EGIT_COMMIT="v${PV}"
 fi
 
-IUSE="+lua_targets_luajit"
-
 LICENSE="BSD"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+IUSE="+lua_targets_luajit"
+
 RDEPEND="
 	${LUA_DEPS}
 	>=www-servers/nginx-1.24.0-r10[nginx_modules_http_lua,lua_single_target_luajit,ssl]
diff --git a/dev-lua/resty-openssl/resty-openssl-9999.ebuild b/dev-lua/resty-openssl/resty-openssl-9999.ebuild
index f1e179f30..543853f55 100644
--- a/dev-lua/resty-openssl/resty-openssl-9999.ebuild
+++ b/dev-lua/resty-openssl/resty-openssl-9999.ebuild
@@ -18,11 +18,11 @@ if [[ "${PV}" != 9999 ]]; then
 	EGIT_COMMIT="v${PV}"
 fi
 
-IUSE="+lua_targets_luajit"
-
 LICENSE="BSD"
 SLOT="0"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+IUSE="+lua_targets_luajit"
+
 RDEPEND="
 	${LUA_DEPS}
 	>=www-servers/nginx-1.24.0-r10[nginx_modules_http_lua,lua_single_target_luajit,ssl]
diff --git a/dev-lua/rings/rings-9999.ebuild b/dev-lua/rings/rings-9999.ebuild
index 880e94a23..802747de5 100644
--- a/dev-lua/rings/rings-9999.ebuild
+++ b/dev-lua/rings/rings-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LUA_COMPAT=( lua{5-{1..4},jit} )
 
-inherit lua git-r3
+inherit lua git-r3 flag-o-matic
 
 DESCRIPTION="Lua Rings Library"
 HOMEPAGE="https://github.com/keplerproject/rings"
@@ -30,6 +30,7 @@ each_lua_configure() {
 }
 
 each_lua_compile() {
+	append-cflags "$(lua_get_CFLAGS)"
 	pushd "${BUILD_DIR}"
 	myemakeargs=(
 		PREFIX=/usr
@@ -42,6 +43,7 @@ each_lua_compile() {
 }
 
 each_lua_install() {
+	append-cflags "$(lua_get_CFLAGS)"
 	pushd "${BUILD_DIR}"
 	myemakeargs=(
 		PREFIX=/usr
diff --git a/dev-lua/srlua/srlua-102.ebuild b/dev-lua/srlua/srlua-102.ebuild
index 4d6463d66..403411fb4 100644
--- a/dev-lua/srlua/srlua-102.ebuild
+++ b/dev-lua/srlua/srlua-102.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.tecgraf.puc-rio.br/~lhf/ftp/lua/ar/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="+static-libs"
+# IUSE="+static-libs"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RDEPEND="${LUA_DEPS}"
 DEPEND="${RDEPEND}"
@@ -41,10 +41,11 @@ my_cc() {
 
 each_lua_compile() {
 	pushd "${BUILD_DIR}"
-	local STATIC
-	use static-libs && STATIC="-static"
-	my_cc ${CFLAGS} ${LDFLAGS} -fPIC -o glue srglue.c
-	my_cc ${CFLAGS} ${LDFLAGS} -fPIC -o srlua srlua.c -Wl,-E ${STATIC} $(lua_get_LIBS) -ldl -lm
+	# local STATIC
+	# use static-libs && STATIC="-static"
+	my_cc ${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS} -fPIC -o glue srglue.c
+	my_cc ${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS} -fPIC -o srlua srlua.c -Wl,-E $(lua_get_LIBS) -ldl -lm
+	# my_cc ${CFLAGS} $(lua_get_CFLAGS) ${LDFLAGS} -fPIC -o srlua srlua.c -Wl,-E ${STATIC} $(lua_get_LIBS) -ldl -lm
 	popd
 }
 
diff --git a/dev-lua/tdlua/metadata.xml b/dev-lua/tdlua/metadata.xml
index d9bdfcf23..4b55e07e9 100644
--- a/dev-lua/tdlua/metadata.xml
+++ b/dev-lua/tdlua/metadata.xml
@@ -6,6 +6,11 @@
     <description>Also, you can find me on IRC (Libera.Chat) as mva, or in Telegram as @mva_name</description>
     <name>Vadim A. Misbakh-Soloviov</name>
   </maintainer>
+  <use>
+    <flag name="system-libtgvoip">Link against <pkg>media-libs/libtgvoip</pkg> instead of compiling bundled version</flag>
+    <flag name="system-tdlib">Link against <pkg>net-libs/tdlib</pkg> instead of compiling bundled version</flag>
+    <flag name="voip">Enable VoIP functionality (calls)</flag>
+  </use>
   <upstream>
     <remote-id type="github">giuseppeM99/tdlua</remote-id>
   </upstream>
diff --git a/dev-lua/tdlua/tdlua-9999.ebuild b/dev-lua/tdlua/tdlua-9999.ebuild
index db7b51c6f..bf300ecef 100644
--- a/dev-lua/tdlua/tdlua-9999.ebuild
+++ b/dev-lua/tdlua/tdlua-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LUA_COMPAT=( lua{5-{1..4},jit} )
+LUA_COMPAT=( lua{5-{2..4},jit} )
 
 inherit cmake lua git-r3
 
@@ -11,22 +11,47 @@ DESCRIPTION="A basic interface between tdlib and lua"
 HOMEPAGE="https://github.com/giuseppeM99/tdlua"
 EGIT_REPO_URI="https://github.com/giuseppeM99/tdlua"
 
+EGIT_SUBMODULES=(
+	"*"
+	-td
+)
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="examples"
+IUSE="examples static-libs +system-tdlib system-libtgvoip voip"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
 	${LUA_DEPS}
 	dev-libs/openssl:0=
 	media-libs/opus:0=
-	net-libs/tdlib:0=
+	system-libtgvoip? ( media-libs/libtgvoip:= )
+	system-tdlib? ( net-libs/tdlib:= )
+	lua_targets_luajit? ( dev-lang/luajit[lua52compat] )
 "
 DEPEND="${RDEPEND}"
 
-# TODO: unbubdle libtgvoip!
+src_unpack() {
+	if use system-libtgvoip || ! use voip; then
+		EGIT_SUBMODULES+=(-libtgvoip)
+	fi
+	git-r3_src_unpack
+}
 
 src_prepare() {
+	if use system-tdlib; then
+		sed -i -r \
+			-e '/add_subdirectory\(td\)/s@.*@find_package\(Td REQUIRED\)@' \
+			CMakeLists.txt
+	fi
+	if use system-libtgvoip; then
+		sed -i -r \
+			-e 's@libtgvoip/@tgvoip/@' \
+			LuaTDVoip.h LuaTDVoip.cpp
+		sed -i -r \
+			-e '/set\(TARGET\ "libtgvoip"\)/,/set_property\ \(TARGET\ libtgvoip\ PROPERTY\ CXX_STANDARD\ 11\)/d' \
+			CMakeLists.txt
+	fi
 	cmake_src_prepare
 	lua_copy_sources
 }
@@ -35,6 +60,8 @@ each_lua_configure() {
 	pushd "${BUILD_DIR}"
 	mycmakeargs=(
 		-DLUA_INCLUDE_DIR=$(lua_get_include_dir)
+		-DTDLUA_TD_STATIC=$(usex static-libs ON OFF)
+		-DTDLUA_CALLS=$(usex voip ON OFF)
 	)
 	cmake_src_configure
 	popd
diff --git a/dev-lua/verse/verse-9999.ebuild b/dev-lua/verse/verse-9999.ebuild
index 70ec95c91..102deac4f 100644
--- a/dev-lua/verse/verse-9999.ebuild
+++ b/dev-lua/verse/verse-9999.ebuild
@@ -10,14 +10,14 @@ inherit lua mercurial
 DESCRIPTION="XMPP client library written in Lua."
 HOMEPAGE="https://code.matthewwild.co.uk/"
 EHG_REPO_URI="https://code.matthewwild.co.uk/${PN}/"
-RESTRICT="network-sandbox"
-# ^ :(
-# fetches depends from prosody's trunk during build
 
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="network-sandbox"
+# ^ :(
+# fetches depends from prosody's trunk during build
 
 RDEPEND="
 	${LUA_DEPS}
@@ -27,21 +27,29 @@ RDEPEND="
 	dev-lua/LuaBitOp[${LUA_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-lua/squish"
-
-#src_unpack() {
-#	mercurial_src_unpack
-#	default
-#}
+# BDEPEND="dev-lua/squish"
 
 src_prepare() {
 	default
 	sed -r \
 		-e "s@^(PREFIX)=.*@\1=/usr@" \
-		-e "s@^(LUA_VERSION)=.*@\1=${ELUA##lua}@" \
 		-e '/\*\)/,/esac/{/echo/d;/exit 1/d}' \
-		-i configure
+		-i configure || die
 	lua_copy_sources
+	lua_foreach_impl each_lua_prepare
+}
+
+each_lua_prepare() {
+	pushd "${BUILD_DIR}"
+	sed -r \
+		-e "s@^(LUA_VERSION)\=.*@\1=${ELUA##lua}@" \
+		-e "s@^(LUA_INTERPRETER)\=.*@\1=${ELUA}@" \
+		-e "/^PROSODY_URL/s@0\.10@trunk@" \
+		-i ./configure || die
+	sed -r \
+		-e "1s@/lua[^/]*\$@/${ELUA}@" \
+		-i ./buildscripts/squish || die
+	popd
 }
 
 each_lua_configure() {
diff --git a/dev-node/js-beautify/js-beautify-1.14.11.ebuild b/dev-node/js-beautify/js-beautify-1.14.11.ebuild
index b5c72e70c..25dafd5cb 100644
--- a/dev-node/js-beautify/js-beautify-1.14.11.ebuild
+++ b/dev-node/js-beautify/js-beautify-1.14.11.ebuild
@@ -6,6 +6,8 @@ EAPI=8
 DESCRIPTION="Beautifier for javascript https://beautifier.io"
 HOMEPAGE="https://github.com/beautifier/js-beautify"
 
+S="${WORKDIR}/package"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
@@ -22,8 +24,6 @@ NPM_BINS="
 # Requires 'src' directory
 NPM_PKG_DIRS="src"
 
-S="${WORKDIR}/package"
-
 inherit npmv1
 
 # npmv1 doesn't understand that js-beautify's
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
new file mode 100644
index 000000000..d989c7684
--- /dev/null
+++ b/dev-python/debugpy/Manifest
@@ -0,0 +1 @@
+DIST debugpy-1.8.1.gh.tar.gz 6900806 BLAKE2B 5f9151a1a8d679c2f81d8eb1ce62b9e1f8a8cfeea7301e2f15113b95543e48ac971681c20bdc9bb9b85376be2b23cddbffe988f68b8f23cd0214905d11598905 SHA512 0eacee36904ee991a68da539b60768811606bbf57076efd07ffe2ee6a24e8a5e4cf86cd30ed948136466af71d1fb63b14f60334ffe94cf8c626b449a731ca0d8
diff --git a/dev-python/debugpy/debugpy-1.8.1.ebuild b/dev-python/debugpy/debugpy-1.8.1.ebuild
new file mode 100644
index 000000000..f9e598a68
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.8.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{11..12} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="
+	https://github.com/microsoft/debugpy/
+	https://pypi.org/project/debugpy/
+"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/pydevd[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored/pydevd || die
+	local PATCHES=(
+		"${FILESDIR}/${PN}-1.8.0-unbundle-pydevd.patch"
+	)
+
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		tests/debugpy/test_gevent.py::test_gevent
+		tests/debugpy/test_run.py::test_custom_python_args
+		tests/tests/test_timeline.py::test_occurrences
+		# TODO: random regressions
+		tests/debugpy/test_flask.py::test_flask_breakpoint_multiproc
+		tests/debugpy/test_exception.py::test_raise_exception_options
+		tests/debugpy/test_exception.py::test_vsc_exception_options_raise_without_except
+	)
+	local EPYTEST_IGNORE=(
+		tests/tests/test_vendoring.py
+	)
+
+	case ${EPYTHON} in
+		python3.12)
+			EPYTEST_DESELECT+=(
+				tests/debugpy/test_flask.py
+			)
+			;;
+	esac
+
+	epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \
+		-k "not attach_pid"
+}
diff --git a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
new file mode 100644
index 000000000..54ccdae4c
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
@@ -0,0 +1,46 @@
+diff --git a/setup.py b/setup.py
+index 0bb4f00..abfce1c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,10 @@ del sys.path[0]
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
+ import debugpy
+-import debugpy._vendored
+ 
+ del sys.path[0]
+ 
+ 
+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
+ 
+ 
+@@ -146,8 +144,6 @@ if __name__ == "__main__":
+         extras["platforms"] = platforms
+ 
+     cmds = versioneer.get_cmdclass()
+-    override_build(cmds)
+-    override_build_py(cmds)
+ 
+     setuptools.setup(
+         name="debugpy",
+diff --git a/src/debugpy/_vendored/force_pydevd.py b/src/debugpy/_vendored/force_pydevd.py
+index cfd8927..0cb1bca 100644
+--- a/src/debugpy/_vendored/force_pydevd.py
++++ b/src/debugpy/_vendored/force_pydevd.py
+@@ -8,15 +8,6 @@ import warnings
+ 
+ from . import check_modules, prefix_matcher, preimport, vendored
+ 
+-# Ensure that pydevd is our vendored copy.
+-_unvendored, _ = check_modules('pydevd',
+-                               prefix_matcher('pydev', '_pydev'))
+-if _unvendored:
+-    _unvendored = sorted(_unvendored.values())
+-    msg = 'incompatible copy of pydevd already imported'
+-    # raise ImportError(msg)
+-    warnings.warn(msg + ':\n {}'.format('\n  '.join(_unvendored)))
+-
+ # If debugpy logging is enabled, enable it for pydevd as well
+ if "DEBUGPY_LOG_DIR" in os.environ:
+     os.environ[str("PYDEVD_DEBUG")] = str("True")
diff --git a/dev-python/debugpy/metadata.xml b/dev-python/debugpy/metadata.xml
new file mode 100644
index 000000000..ad16813e4
--- /dev/null
+++ b/dev-python/debugpy/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mva@gentoo.org</email>
+    <description>Also, you can find me on IRC (Libera.Chat) as mva, or in Telegram as @mva_name</description>
+    <name>Vadim A. Misbakh-Soloviov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">debugpy</remote-id>
+    <remote-id type="github">microsoft/debugpy</remote-id>
+    <maintainer status="unknown">
+      <email>ptvshelp@microsoft.com</email>
+      <name>Microsoft Corporation</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/clocale/clocale-0.0.4.ebuild b/dev-ruby/clocale/clocale-0.0.4.ebuild
index cc4acc798..ec4f9efe9 100644
--- a/dev-ruby/clocale/clocale-0.0.4.ebuild
+++ b/dev-ruby/clocale/clocale-0.0.4.ebuild
@@ -10,11 +10,11 @@ inherit ruby-fakegem
 
 DESCRIPTION="A Ruby gem that wraps C locale functions"
 HOMEPAGE="https://github.com/avdv/clocale"
-LICENSE="MIT"
 
-RESTRICT="test"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="test"
 
 each_ruby_configure() {
 	${RUBY} -C "ext/${PN}" extconf.rb
diff --git a/dev-ruby/colorls/colorls-1.4.6.ebuild b/dev-ruby/colorls/colorls-1.4.6.ebuild
index cdabab5e0..172559953 100644
--- a/dev-ruby/colorls/colorls-1.4.6.ebuild
+++ b/dev-ruby/colorls/colorls-1.4.6.ebuild
@@ -12,14 +12,14 @@ inherit ruby-fakegem
 
 DESCRIPTION="A Ruby script that colorizes the ls output with color and icons"
 HOMEPAGE="https://github.com/athityakumar/colorls"
-LICENSE="MIT"
 
-RESTRICT="test"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # ~arm   - missing in rainbow
 # ~arm64 - missing everywhere
 # 2024: still the issue...
+RESTRICT="test"
 
 ruby_add_rdepend '
 	dev-ruby/filesize:*
diff --git a/dev-util/android-ndk/android-ndk-26d.ebuild b/dev-util/android-ndk/android-ndk-26d.ebuild
index 1ab7451da..ffd29113c 100644
--- a/dev-util/android-ndk/android-ndk-26d.ebuild
+++ b/dev-util/android-ndk/android-ndk-26d.ebuild
@@ -10,6 +10,8 @@ DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
 HOMEPAGE="https://developer.android.com/ndk/"
 SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux.zip"
 
+S="${WORKDIR}/${PN}-r${PV}"
+
 LICENSE="android"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -22,8 +24,6 @@ RDEPEND="
 "
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}/${PN}-r${PV}"
-
 ANDROID_NDK_DIR="opt/${PN}"
 
 QA_PREBUILT="*"
diff --git a/dev-util/apktool/apktool-9999.ebuild b/dev-util/apktool/apktool-9999.ebuild
index 08bfdcd9d..7fd9c2660 100644
--- a/dev-util/apktool/apktool-9999.ebuild
+++ b/dev-util/apktool/apktool-9999.ebuild
@@ -37,6 +37,6 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_newjar "brut.apktool/apktool-cli/build/libs/${PN}-cli-all.jar"
+	java-pkg_newjar "brut.apktool/apktool-cli/build/libs/${PN}-cli.jar"
 	java-pkg_dolauncher ${PN} --java_args "-Xmx512M"
 }
diff --git a/dev-util/jadx-bin/jadx-bin-1.4.5.ebuild b/dev-util/jadx-bin/jadx-bin-1.4.5.ebuild
index d92f59722..673272c1e 100644
--- a/dev-util/jadx-bin/jadx-bin-1.4.5.ebuild
+++ b/dev-util/jadx-bin/jadx-bin-1.4.5.ebuild
@@ -12,6 +12,8 @@ DESCRIPTION="Android Dex to Java Decompiler"
 HOMEPAGE="https://github.com/skylot/jadx"
 SRC_URI="https://github.com/skylot/${MY_PN}/releases/download/v${PV}/${MY_P}.zip"
 
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,8 +25,6 @@ DEPEND="
 "
 BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
-
 src_install() {
 	insinto /opt/jadx/lib/
 	doins "${S}"/lib/*
diff --git a/dev-vcs/git-annex/git-annex-9999.ebuild b/dev-vcs/git-annex/git-annex-9999.ebuild
index 46c8dfe1c..0e40a73b4 100644
--- a/dev-vcs/git-annex/git-annex-9999.ebuild
+++ b/dev-vcs/git-annex/git-annex-9999.ebuild
@@ -9,11 +9,11 @@ inherit haskell-cabal bash-completion-r1 git-r3 desktop
 DESCRIPTION="manage files with git, without checking their contents into git"
 HOMEPAGE="https://git-annex.branchable.com/"
 EGIT_REPO_URI="https://git.kitenet.net/git-annex"
-RESTRICT="test"
 
 LICENSE="AGPL-3"
 SLOT="0"
 IUSE="+assistant +benchmark +dbus debug doc +gitlfs +magicmime +pairing +torrentparser +webapp"
+RESTRICT="test"
 
 REQUIRED_USE="webapp? ( assistant )"
 
diff --git a/dev-vcs/hub/hub-9999.ebuild b/dev-vcs/hub/hub-9999.ebuild
index 5946ad44c..60ee93bcc 100644
--- a/dev-vcs/hub/hub-9999.ebuild
+++ b/dev-vcs/hub/hub-9999.ebuild
@@ -8,12 +8,12 @@ inherit bash-completion-r1 go-module git-r3
 DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
 HOMEPAGE="https://github.com/mislav/hub"
 
-LICENSE="MIT"
-SLOT="0"
-
 SRC_URI="${EGO_SUM_SRC_URI}"
 EGIT_REPO_URI="https://github.com/mislav/hub"
 
+LICENSE="MIT"
+SLOT="0"
+
 BDEPEND="sys-apps/groff"
 RDEPEND=">=dev-vcs/git-1.7.3"
 
diff --git a/games-arcade/flyinggame/flyinggame-0.ebuild b/games-arcade/flyinggame/flyinggame-0.ebuild
index 1876d1c5e..f7840dbaa 100644
--- a/games-arcade/flyinggame/flyinggame-0.ebuild
+++ b/games-arcade/flyinggame/flyinggame-0.ebuild
@@ -8,6 +8,9 @@ inherit desktop wrapper
 DESCRIPTION="A game prototype by Maurice (mari0 author)"
 HOMEPAGE="https://stabyourself.net/other/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}.love -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -16,8 +19,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_install() {
 	local dir="/usr/share/games/love/${PN}"
 	insinto "${dir}"
diff --git a/games-arcade/nottetris/nottetris-2.ebuild b/games-arcade/nottetris/nottetris-2.ebuild
index df8baa1ba..82e345482 100644
--- a/games-arcade/nottetris/nottetris-2.ebuild
+++ b/games-arcade/nottetris/nottetris-2.ebuild
@@ -8,6 +8,9 @@ inherit desktop wrapper
 DESCRIPTION="A tetris game with physics"
 HOMEPAGE="https://stabyourself.net/nottetris2/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}2/${PN}2-source.zip -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -19,8 +22,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	default
 	#it is only one .love file (but with crappy name), so we can use asterisk
diff --git a/games-arcade/orthorobot/orthorobot-0.ebuild b/games-arcade/orthorobot/orthorobot-0.ebuild
index ec08d3934..33322d699 100644
--- a/games-arcade/orthorobot/orthorobot-0.ebuild
+++ b/games-arcade/orthorobot/orthorobot-0.ebuild
@@ -8,6 +8,9 @@ inherit wrapper desktop
 DESCRIPTION="Nice perspective based puzzle game. You flatten the view to move across gaps"
 HOMEPAGE="https://stabyourself.net/orthorobot/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -16,8 +19,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	default
 	#it is only one .love file (but with crappy name), so we can use asterisk
diff --git a/games-arcade/piratebay/piratebay-0.ebuild b/games-arcade/piratebay/piratebay-0.ebuild
index d474bcb08..eaf6deaea 100644
--- a/games-arcade/piratebay/piratebay-0.ebuild
+++ b/games-arcade/piratebay/piratebay-0.ebuild
@@ -8,6 +8,9 @@ inherit desktop wrapper
 DESCRIPTION="A physics based game made for Devmania 2011 Overnight Contest"
 HOMEPAGE="https://gamejams.schattenkind.net/2011/10/pirate-bay.html"
 SRC_URI="https://sience.schattenkind.net/devmania/piratebay.love -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="ZLIB"
 SLOT="0"
 # Temporary broken. When I fix it — i'll unmask it
@@ -17,8 +20,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_install() {
 	local dir="/usr/share/games/love/${PN}"
 	insinto "${dir}"
diff --git a/games-arcade/rimshot/rimshot-0.ebuild b/games-arcade/rimshot/rimshot-0.ebuild
index 3fb267200..39a187522 100644
--- a/games-arcade/rimshot/rimshot-0.ebuild
+++ b/games-arcade/rimshot/rimshot-0.ebuild
@@ -8,6 +8,9 @@ inherit desktop wrapper
 DESCRIPTION="Nice application to work with drumbeats and play in 'Guitar Anti-Hero'"
 HOMEPAGE="https://stabyourself.net/rimshot/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -16,8 +19,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	default
 	#it is only one .love file (but with a crappy name), so we can use asterisk
diff --git a/games-arcade/shoothookers/shoothookers-0.ebuild b/games-arcade/shoothookers/shoothookers-0.ebuild
index 1876d1c5e..f7840dbaa 100644
--- a/games-arcade/shoothookers/shoothookers-0.ebuild
+++ b/games-arcade/shoothookers/shoothookers-0.ebuild
@@ -8,6 +8,9 @@ inherit desktop wrapper
 DESCRIPTION="A game prototype by Maurice (mari0 author)"
 HOMEPAGE="https://stabyourself.net/other/"
 SRC_URI="https://stabyourself.net/dl.php?file=${PN}/${PN}.love -> ${P}.zip"
+
+S="${WORKDIR}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
@@ -16,8 +19,6 @@ DEPEND=">=games-engines/love-0.8.0:*"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
-S="${WORKDIR}"
-
 src_install() {
 	local dir="/usr/share/games/love/${PN}"
 	insinto "${dir}"
diff --git a/games-arcade/supermeatboy/supermeatboy-2013.11.11.ebuild b/games-arcade/supermeatboy/supermeatboy-2013.11.11.ebuild
index 3ecd6b194..c6a09ac36 100644
--- a/games-arcade/supermeatboy/supermeatboy-2013.11.11.ebuild
+++ b/games-arcade/supermeatboy/supermeatboy-2013.11.11.ebuild
@@ -12,6 +12,9 @@ DESCRIPTION="A platformer where you play as an animated cube of meat"
 HOMEPAGE="http://www.supermeatboy.com/"
 SRC_URI="${PN}-linux-${MY_PV}-bin"
 
+S="${WORKDIR}/data"
+GAMEDIR="/usr/share/${P}"
+
 LICENSE="GOG-EULA"
 # TODO: find proper license
 SLOT="0"
@@ -25,9 +28,6 @@ RDEPEND="
 "
 BDEPEND="app-arch/zip"
 
-S="${WORKDIR}/data"
-GAMEDIR="/usr/share/${P}"
-
 pkg_nofetch() {
 	einfo "Please download ${A}"
 	einfo "from your library in Humble Indie Bundle site"
diff --git a/media-fonts/b20-sans/b20-sans-20160520.ebuild b/media-fonts/b20-sans/b20-sans-20160520.ebuild
index 2d00d9c78..156adba8a 100644
--- a/media-fonts/b20-sans/b20-sans-20160520.ebuild
+++ b/media-fonts/b20-sans/b20-sans-20160520.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-S="${WORKDIR}"
-inherit font
-
 DESCRIPTION="B20 Sans, a sans-serif font"
 HOMEPAGE="https://www.dafont.com/b20-sans.font"
 
 SRC_URI="https://img.dafont.com/dl/?f=b20_sans -> ${P}.zip"
+S="${WORKDIR}"
+
+inherit font
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/media-fonts/code2000/code2000-1.17.1.ebuild b/media-fonts/code2000/code2000-1.17.1.ebuild
index 3cc9ed038..4dd35269e 100644
--- a/media-fonts/code2000/code2000-1.17.1.ebuild
+++ b/media-fonts/code2000/code2000-1.17.1.ebuild
@@ -3,18 +3,18 @@
 
 EAPI=8
 
-S="${WORKDIR}"
-inherit font
-
-BASE_SRC_URI="https://web.archive.org/web/20110108105420/http://code2000.net/"
-
 DESCRIPTION="TrueType font covering big piece of Unicode (at time of its creation)"
 HOMEPAGE="https://web.archive.org/web/20110108105420/code2000.net"
+
+BASE_SRC_URI="https://web.archive.org/web/20110108105420/http://code2000.net/"
 SRC_URI="
 	${BASE_SRC_URI}/CODE2000.ZIP
 	${BASE_SRC_URI}/CODE2001.ZIP
 	${BASE_SRC_URI}/CODE2002.ZIP
 "
+S="${WORKDIR}"
+
+inherit font
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-fonts/consolamono/consolamono-20130127.ebuild b/media-fonts/consolamono/consolamono-20130127.ebuild
index 0023376b7..0757953d0 100644
--- a/media-fonts/consolamono/consolamono-20130127.ebuild
+++ b/media-fonts/consolamono/consolamono-20130127.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-S="${WORKDIR}"
-inherit font
-
-SHA1="61cc2afcc4eca96efe7c6ebf178d39df"
-
 DESCRIPTION="Open Font by Wojciech Kalinowski"
 HOMEPAGE="https://fontlibrary.org/en/font/consolamono"
+
+SHA1="61cc2afcc4eca96efe7c6ebf178d39df"
 SRC_URI="https://fontlibrary.org/assets/downloads/${PN}/${SHA1}/${PN}.zip -> ${P}.zip"
+S="${WORKDIR}"
+
+inherit font
 
 LICENSE="OFL-1.1"
 SLOT="0"
diff --git a/media-fonts/eurofurence/eurofurence-20160520.ebuild b/media-fonts/eurofurence/eurofurence-20160520.ebuild
index e186c477d..1df881fc8 100644
--- a/media-fonts/eurofurence/eurofurence-20160520.ebuild
+++ b/media-fonts/eurofurence/eurofurence-20160520.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-S="${WORKDIR}"
-inherit font
-
 DESCRIPTION="Eurofurence, a clean sans-serif font"
 HOMEPAGE="https://www.dafont.com/eurofurence.font"
 
 SRC_URI="https://img.dafont.com/dl/?f=eurofurence -> ${P}.zip"
+S="${WORKDIR}"
+
+inherit font
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/media-fonts/monofur/monofur-20160520.ebuild b/media-fonts/monofur/monofur-20160520.ebuild
index f83c50398..23c16f33c 100644
--- a/media-fonts/monofur/monofur-20160520.ebuild
+++ b/media-fonts/monofur/monofur-20160520.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-S="${WORKDIR}"
-inherit font
-
 DESCRIPTION="Monofur, a good fixed width font for development"
 HOMEPAGE="https://www.dafont.com/monofur.font"
 
 SRC_URI="https://img.dafont.com/dl/?f=monofur -> ${P}.zip"
+S="${WORKDIR}"
+
+inherit font
+
 LICENSE="OFL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/media-fonts/monoid/monoid-0.61.ebuild b/media-fonts/monoid/monoid-0.61.ebuild
index 6baac61e2..36b9cbaad 100644
--- a/media-fonts/monoid/monoid-0.61.ebuild
+++ b/media-fonts/monoid/monoid-0.61.ebuild
@@ -16,6 +16,9 @@ SRC_URI="
 	https://cdn.rawgit.com/larsenwork/monoid/${MONOID_SHA}/Monoid.zip
 	monoisome? ( ${GH}/raw/${MONOISOME_SHA}/Monoisome/Monoisome-Regular.ttf -> Monoisome-Regular-${MONOISOME_SHA}.ttf )
 "
+
+S="${WORKDIR}"
+
 BDEPEND="app-arch/unzip"
 
 LICENSE="MIT OFL-1.1"
@@ -25,9 +28,7 @@ IUSE="monoisome"
 RESTRICT="binchecks strip"
 
 FONT_SUFFIX="ttf"
-DOCS=( Readme.md )
-
-S="${WORKDIR}"
+HTML_DOCS=( Readme+License.html )
 
 src_unpack() {
 	default
diff --git a/media-fonts/twemoji-color-font/twemoji-color-font-14.0.2.ebuild b/media-fonts/twemoji-color-font/twemoji-color-font-14.0.2.ebuild
index 509f18981..2fab5b0d3 100644
--- a/media-fonts/twemoji-color-font/twemoji-color-font-14.0.2.ebuild
+++ b/media-fonts/twemoji-color-font/twemoji-color-font-14.0.2.ebuild
@@ -8,10 +8,13 @@ inherit font
 DESCRIPTION="A color and B&W emoji SVG-in-OT font with ZWJ, skin tone mods and country flags"
 HOMEPAGE="https://github.com/13rac1/twemoji-color-font"
 SRC_URI="https://github.com/13rac1/twemoji-color-font/releases/download/v${PV//_/-}/TwitterColorEmoji-SVGinOT-Linux-${PV//_/-}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror"
+
+S="${WORKDIR}/TwitterColorEmoji-SVGinOT-Linux-${PV//_/-}"
+
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
 
 RDEPEND="
 	media-fonts/ttf-bitstream-vera[X(+)]
@@ -22,5 +25,3 @@ RDEPEND="
 FONT_SUFFIX="ttf"
 DOCS="README.md"
 FONT_CONF=( fontconfig/56-twemoji-color.conf )
-
-S="${WORKDIR}/TwitterColorEmoji-SVGinOT-Linux-${PV//_/-}"
diff --git a/media-gfx/figma-linux-bin/figma-linux-bin-0.10.0.ebuild b/media-gfx/figma-linux-bin/figma-linux-bin-0.10.0.ebuild
index 24e5c72ae..03a171f1d 100644
--- a/media-gfx/figma-linux-bin/figma-linux-bin-0.10.0.ebuild
+++ b/media-gfx/figma-linux-bin/figma-linux-bin-0.10.0.ebuild
@@ -8,11 +8,13 @@ DESCRIPTION="Unofficial desktop application for linux"
 HOMEPAGE="https://github.com/Figma-Linux/figma-linux"
 SRC_URI="amd64? ( https://github.com/Figma-Linux/figma-linux/releases/download/v${PV}/figma-linux_${PV}_linux_amd64.deb -> ${P}-amd64.deb )"
 
+S="${WORKDIR}"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-RESTRICT="bindist mirror"
 IUSE="appindicator doc libnotify"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -37,8 +39,6 @@ RDEPEND="
 
 QA_PREBUILT="*"
 
-S=${WORKDIR}
-
 src_prepare() {
 	default
 
diff --git a/media-gfx/otfcc/otfcc-0.7.0.ebuild b/media-gfx/otfcc/otfcc-0.7.0.ebuild
index a7767bcf3..d6d3e531e 100644
--- a/media-gfx/otfcc/otfcc-0.7.0.ebuild
+++ b/media-gfx/otfcc/otfcc-0.7.0.ebuild
@@ -18,10 +18,9 @@ else
 	# ^ premake:5
 fi
 
-IUSE="debug"
-
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="debug"
 
 BDEPEND="dev-util/premake:5"
 
diff --git a/media-gfx/otfcc/otfcc-9999.ebuild b/media-gfx/otfcc/otfcc-9999.ebuild
index a7767bcf3..d6d3e531e 100644
--- a/media-gfx/otfcc/otfcc-9999.ebuild
+++ b/media-gfx/otfcc/otfcc-9999.ebuild
@@ -18,10 +18,9 @@ else
 	# ^ premake:5
 fi
 
-IUSE="debug"
-
 LICENSE="Apache-2.0"
 SLOT="0"
+IUSE="debug"
 
 BDEPEND="dev-util/premake:5"
 
diff --git a/media-gfx/sweethome3d-bin/sweethome3d-bin-7.4.ebuild b/media-gfx/sweethome3d-bin/sweethome3d-bin-7.4.ebuild
index 160724fbf..38b17b684 100644
--- a/media-gfx/sweethome3d-bin/sweethome3d-bin-7.4.ebuild
+++ b/media-gfx/sweethome3d-bin/sweethome3d-bin-7.4.ebuild
@@ -13,15 +13,16 @@ SRC_URI="
 	amd64? ( ${SF_URI}-x64.tgz )
 	x86? ( ${SF_URI}-x86.tgz )
 "
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="GPL-3"
-IUSE="gtk3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="gtk3"
 
 RDEPEND="virtual/jre"
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 # QA_PREBUILT="*java3d.*.so"
 
 src_prepare() {
diff --git a/media-libs/libyuv/libyuv-1854_p20221228.ebuild b/media-libs/libyuv/libyuv-1854_p20221228.ebuild
index 716c43216..7c4f06607 100644
--- a/media-libs/libyuv/libyuv-1854_p20221228.ebuild
+++ b/media-libs/libyuv/libyuv-1854_p20221228.ebuild
@@ -11,9 +11,11 @@ HOMEPAGE="https://chromium.googlesource.com/libyuv/libyuv/"
 # Fetch from: https://chromium.googlesource.com/libyuv/libyuv.git/+archive/${EGIT_COMMIT}.tar.gz
 SRC_URI="https://dev.gentoo.org/~mva/distfiles/${P}.tar.gz"
 
+S="${WORKDIR}"
+
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 IUSE="static-libs test tools"
 
@@ -32,7 +34,6 @@ DOCS=( AUTHORS LICENSE PATENTS README.{md,chromium} )
 
 PATCHES="${FILESDIR}/${P//_p*}-cmake-libdir.patch"
 
-S="${WORKDIR}"
 # BUILD_DIR="${S}/build"
 
 src_prepare() {
diff --git a/media-libs/openslide/openslide-3.4.1.ebuild b/media-libs/openslide/openslide-3.4.1.ebuild
index b3b64e538..d0305035e 100644
--- a/media-libs/openslide/openslide-3.4.1.ebuild
+++ b/media-libs/openslide/openslide-3.4.1.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DESCRIPTION="C library with simple interface to read virtual slides"
 HOMEPAGE="https://openslide.org/"
+
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3 meson
 	EGIT_REPO_URI="https://github.com/openslide/openslide"
@@ -13,8 +14,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 	HTML_DOCS=("doc/html/.")
 fi
-SLOT="0"
+
 LICENSE="LGPL-2.1"
+SLOT="0"
 
 DEPEND="
 	media-libs/libjpeg-turbo
diff --git a/media-libs/openslide/openslide-9999.ebuild b/media-libs/openslide/openslide-9999.ebuild
index b3b64e538..d0305035e 100644
--- a/media-libs/openslide/openslide-9999.ebuild
+++ b/media-libs/openslide/openslide-9999.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DESCRIPTION="C library with simple interface to read virtual slides"
 HOMEPAGE="https://openslide.org/"
+
 if [[ "${PV}" == *9999* ]]; then
 	inherit git-r3 meson
 	EGIT_REPO_URI="https://github.com/openslide/openslide"
@@ -13,8 +14,9 @@ else
 	KEYWORDS="~amd64 ~x86"
 	HTML_DOCS=("doc/html/.")
 fi
-SLOT="0"
+
 LICENSE="LGPL-2.1"
+SLOT="0"
 
 DEPEND="
 	media-libs/libjpeg-turbo
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
deleted file mode 100644
index 22ce2381a..000000000
--- a/media-libs/vips/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libvips-8.13.3.tar.gz 16706776 BLAKE2B 3bc6a65abc30efa23ae9425f533e069c875bd60da9ed8b405fc06c42cf8eccd8df3538326bd3a0744b53192626400448b941eeede43a2b82a6324513bc197c8d SHA512 eca5e55bc20117b4135bcf77b6cffc9e2b91438edd6a50af2a174a5f5c816b71171ea2c483a0adeead55b504441271fa3d55e17d63a0f242c8ee2a316e7943d1
diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml
index 2e9f1f82c..0efa7a98d 100644
--- a/media-libs/vips/metadata.xml
+++ b/media-libs/vips/metadata.xml
@@ -7,24 +7,26 @@
     <description>Also, you can find me on IRC (Libera.Chat) as mva, or in Telegram as @mva_name</description>
   </maintainer>
   <use>
+    <flag name="archive">Enable support for <pkg>app-arch/libarchive</pkg></flag>
     <flag name="analyze">Enable support for analyze feature</flag>
-    <flag name="cfitsio">Enable support for reading FITS images with <pkg>sci-libs/cfitsio</pkg></flag>
+    <flag name="fits">Enable support for reading FITS images with <pkg>sci-libs/cfitsio</pkg></flag>
     <flag name="cgif">Enable support for <pkg>media-libs/cgif</pkg></flag>
     <flag name="deprecated">Build deprecated components</flag>
-    <flag name="doxygen">Build C++ documentation</flag>
-    <flag name="gsf">Enable support for <pkg>gnome-extra/libgsf</pkg></flag>
+    <flag name="doc">Build C++ documentation</flag>
+    <!-- <flag name="gsf">Enable support for <pkg>gnome-extra/libgsf</pkg></flag> -->
     <flag name="heif">Enable support for <pkg>media-libs/libheif</pkg></flag>
+    <flag name="highway">Enable support for <pkg>dev-cpp/highway</pkg></flag>
     <flag name="imagequant">Enable support for <pkg>media-gfx/libimagequant</pkg></flag>
     <flag name="jpeg-xl">Enable support for JPEG XL files with <pkg>media-libs/libjxl</pkg></flag>
     <flag name="nifti">Enable support for <pkg>media-libs/nifti</pkg></flag>
     <flag name="nsgif">Enable support for <pkg>media-libs/libnsgif</pkg></flag>
-    <flag name="openjpeg">Enable support for <pkg>media-libs/openjpeg</pkg></flag>
+    <flag name="jpeg2k">Enable support for jpeg2k using <pkg>media-libs/openjpeg</pkg></flag>
     <flag name="pandoc">Rebuild GTK documentation templates from markdown sources using pandoc</flag>
-    <flag name="pangocairo">Enable support for <pkg>x11-libs/pango</pkg> and <pkg>x11-libs/cairo</pkg></flag>
-    <flag name="poppler">Enable support for <pkg>app-text/poppler</pkg></flag>
+    <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg> and <pkg>x11-libs/cairo</pkg></flag>
+    <flag name="pdf">Enable support for PDF using <pkg>app-text/poppler</pkg></flag>
     <flag name="ppm">Enable support for PPM files</flag>
     <flag name="radiance">Enable support for radiance feature</flag>
-    <flag name="rsvg">Enable support for <pkg>gnome-base/librsvg</pkg></flag>
+    <flag name="svg">Enable support for SVG using <pkg>gnome-base/librsvg</pkg></flag>
     <flag name="spng">Enable support for <pkg>media-libs/libspng</pkg></flag>
     <flag name="matio">Enable support for reading images from Matlab files through <pkg>sci-libs/matio</pkg></flag>
     <flag name="openslide">Enable support for reading images from OpenSlide files through <pkg>media-libs/openslide</pkg> (currently conflicts with jpeg-turbo)</flag>
diff --git a/media-libs/vips/vips-8.13.3.ebuild b/media-libs/vips/vips-8.13.3.ebuild
deleted file mode 100644
index 32c12f198..000000000
--- a/media-libs/vips/vips-8.13.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson-multilib vala
-
-DESCRIPTION="VIPS Image Processing Library"
-if [[ "${PV}" == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lib${PN}/lib${PN}"
-else
-	SRC_URI="https://github.com/lib${PN}/lib${PN}/archive/v${PV//_rc/-rc}.tar.gz -> lib${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-HOMEPAGE="https://www.libvips.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-VIPS_BASE_OPTS="debug +deprecated doxygen gtk-doc +introspection vala pandoc"
-VIPS_EXT_LIBS="cgif cfitsio exif fftw fontconfig gsf heif nifti imagequant jpeg jpeg-xl lcms imagemagick graphicsmagick matio openexr openjpeg openslide orc pangocairo png poppler rsvg spng tiff webp zlib"
-# pdfium quantizr
-VIPS_INT_LIBS="+nsgif +ppm +analyze +radiance"
-
-IUSE="${VIPS_BASE_OPTS} ${VIPS_EXT_LIBS} ${VIPS_INT_LIBS}"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	introspection? ( dev-libs/gobject-introspection )
-	cfitsio? ( sci-libs/cfitsio[${MULTILIB_USEDEP}] )
-	cgif? ( media-libs/cgif[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6[${MULTILIB_USEDEP}] )
-	fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )
-	gsf? ( gnome-extra/libgsf )
-	heif? ( media-libs/libheif[${MULTILIB_USEDEP}] )
-	imagequant? ( media-gfx/libimagequant )
-	nifti? ( media-libs/nifti[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
-	jpeg-xl? ( media-libs/libjxl[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms[${MULTILIB_USEDEP}] )
-	imagemagick? ( media-gfx/imagemagick )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	matio? ( >=sci-libs/matio-1.3.4 )
-	openexr? ( >=media-libs/openexr-1.2.2 )
-	openjpeg? ( media-libs/openjpeg[${MULTILIB_USEDEP}] )
-	openslide? ( media-libs/openslide )
-	orc? ( >=dev-lang/orc-0.4.11[${MULTILIB_USEDEP}] )
-	pangocairo? (
-		>=x11-libs/pango-1.8[${MULTILIB_USEDEP}]
-		x11-libs/cairo[${MULTILIB_USEDEP}]
-	)
-	png? ( >=media-libs/libpng-1.2.9:0=[${MULTILIB_USEDEP}] )
-	poppler? ( app-text/poppler )
-	spng? ( media-libs/libspng[${MULTILIB_USEDEP}] )
-	rsvg? ( gnome-base/librsvg[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
-	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	vala? ( $(vala_depend) )
-"
-BDEPEND="
-	${RDEPEND}
-	gtk-doc? (
-		dev-build/gtk-doc-am
-		dev-util/gtk-doc
-		pandoc? ( virtual/pandoc )
-	)
-	doxygen? (
-		app-text/doxygen
-	)
-"
-
-REQUIRED_USE="graphicsmagick? ( !imagemagick )"
-
-DOCS=(ChangeLog README.md)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/vips/version.h
-)
-
-src_prepare() {
-	default
-	use vala && vala_setup
-}
-
-multilib_src_configure() {
-	local magic="disabled"
-	local magickpkg
-	# TODO: port imagemagick to multilib, so it can be linked on non-native multilib ABIs too
-	if use imagemagick; then
-		magickpgk="MagickCore"
-		magick=$(meson_native_use_feature imagemagick magick)
-	elif use graphicsmagick; then
-		magickpkg="GraphicsMagick"
-		magick=$(meson_native_use_feature graphicsmagick magick)
-	fi
-
-	# TODO: maybe, port to for-loops?
-	local emesonargs=(
-		# Base options
-		$(meson_use debug)
-		$(meson_use deprecated)
-		$(meson_native_use_bool doxygen)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool introspection)
-		$(meson_use vala vapi)
-		-Dmodules=enabled
-
-		# External libs
-		# N.B.: TODO: port libs with meson_*_native in this block to multilib.
-		$(meson_feature cfitsio)
-		$(meson_feature cgif)
-		$(meson_feature exif)
-		$(meson_feature fftw)
-		$(meson_feature fontconfig)
-		$(meson_native_use_feature gsf)
-		$(meson_feature heif)
-		$(meson_feature heif heif-module)
-		$(meson_native_use_feature imagequant)
-		$(meson_feature jpeg)
-		$(meson_feature jpeg-xl)
-		$(meson_feature jpeg-xl jpeg-xl-module)
-		$(meson_feature lcms)
-		${magick}
-		${magick//=/-module=}
-		-Dmagick-package="${magickpkg}"
-		# -Dmagick-features="[load,save]"
-		$(meson_native_use_feature matio)
-		$(meson_feature nifti)
-		$(usex nifti '-Dnifti-prefix-dir=/usr' '')
-		$(meson_native_use_feature openexr) # v2 - have multilib, v3 - don't 🤷; TODO: ask maintainer why?
-		$(meson_feature openjpeg)
-		$(meson_native_use_feature openslide)
-		$(meson_native_use_feature openslide openslide-module)
-		$(meson_feature orc)
-		$(meson_feature pangocairo)
-		# $(meson_feature pdfium)
-		-Dpdfium=disabled # fucking google "gn" buildsystem. I don't wan't to fuck with that to package pdfium, sorry.
-		$(meson_feature png)
-		$(meson_native_use_feature poppler)
-		$(meson_native_use_feature poppler poppler-module)
-		# $(meson_feature quantizr)
-		-Dquantizr=disabled # I've failed to find what is that lib at all 🤷; TODO: mutual exclusive with imagequant
-		$(meson_feature rsvg)
-		$(meson_feature spng)
-		$(meson_feature tiff)
-		$(meson_feature webp)
-		$(meson_feature zlib)
-
-		# Internal libs
-		$(meson_use nsgif)
-		$(meson_use ppm)
-		$(meson_use analyze)
-		$(meson_use radiance)
-	)
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${D}" -xtype f -name '*.la' -print0
-}
diff --git a/media-libs/vips/vips-9999.ebuild b/media-libs/vips/vips-9999.ebuild
index 32c12f198..f48c983e1 100644
--- a/media-libs/vips/vips-9999.ebuild
+++ b/media-libs/vips/vips-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit meson-multilib vala
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic meson-multilib python-single-r1 toolchain-funcs vala
 
 DESCRIPTION="VIPS Image Processing Library"
 if [[ "${PV}" == 9999 ]]; then
@@ -14,63 +16,101 @@ else
 fi
 HOMEPAGE="https://www.libvips.org/"
 
-LICENSE="LGPL-2.1"
-SLOT="0"
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0/42"
 
-VIPS_BASE_OPTS="debug +deprecated doxygen gtk-doc +introspection vala pandoc"
-VIPS_EXT_LIBS="cgif cfitsio exif fftw fontconfig gsf heif nifti imagequant jpeg jpeg-xl lcms imagemagick graphicsmagick matio openexr openjpeg openslide orc pangocairo png poppler rsvg spng tiff webp zlib"
+VIPS_BASE_OPTS="debug +deprecated doc gtk-doc +introspection pandoc python test vala"
+VIPS_EXT_LIBS="archive cgif exif fftw fits fontconfig heif +highway nifti imagequant +jpeg jpeg2k jpeg-xl lcms imagemagick graphicsmagick matio openexr openslide orc pango pdf +png svg spng tiff webp"
 # pdfium quantizr
 VIPS_INT_LIBS="+nsgif +ppm +analyze +radiance"
 
 IUSE="${VIPS_BASE_OPTS} ${VIPS_EXT_LIBS} ${VIPS_INT_LIBS}"
 
 RDEPEND="
-	>=dev-libs/glib-2.6:2
-	introspection? ( dev-libs/gobject-introspection )
-	cfitsio? ( sci-libs/cfitsio[${MULTILIB_USEDEP}] )
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	virtual/libintl
+	archive? ( app-arch/libarchive:= )
 	cgif? ( media-libs/cgif[${MULTILIB_USEDEP}] )
-	exif? ( >=media-libs/libexif-0.6[${MULTILIB_USEDEP}] )
+	exif? ( media-libs/libexif[${MULTILIB_USEDEP}] )
 	fftw? ( sci-libs/fftw:3.0=[${MULTILIB_USEDEP}] )
-	gsf? ( gnome-extra/libgsf )
-	heif? ( media-libs/libheif[${MULTILIB_USEDEP}] )
+	fits? ( sci-libs/cfitsio:=[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] )
+	heif? ( media-libs/libheif:=[${MULTILIB_USEDEP}] )
+	highway? ( >=dev-cpp/highway-1.0.5[${MULTILIB_USEDEP}] )
+	!highway? (
+		orc? ( dev-lang/orc[${MULTILIB_USEDEP}] )
+	)
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:= )
+		graphicsmagick? ( media-gfx/graphicsmagick:= )
+	)
 	imagequant? ( media-gfx/libimagequant )
-	nifti? ( media-libs/nifti[${MULTILIB_USEDEP}] )
-	jpeg? ( media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] )
+	introspection? ( dev-libs/gobject-introspection )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/openjpeg:=[${MULTILIB_USEDEP}] )
 	jpeg-xl? ( media-libs/libjxl[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms[${MULTILIB_USEDEP}] )
-	imagemagick? ( media-gfx/imagemagick )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	matio? ( >=sci-libs/matio-1.3.4 )
-	openexr? ( >=media-libs/openexr-1.2.2 )
-	openjpeg? ( media-libs/openjpeg[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	matio? ( sci-libs/matio:= )
+	nifti? ( media-libs/nifti[${MULTILIB_USEDEP}] )
+	openexr? ( media-libs/openexr:= )
 	openslide? ( media-libs/openslide )
-	orc? ( >=dev-lang/orc-0.4.11[${MULTILIB_USEDEP}] )
-	pangocairo? (
+	pango? (
 		>=x11-libs/pango-1.8[${MULTILIB_USEDEP}]
 		x11-libs/cairo[${MULTILIB_USEDEP}]
 	)
-	png? ( >=media-libs/libpng-1.2.9:0=[${MULTILIB_USEDEP}] )
-	poppler? ( app-text/poppler )
+	pdf? (
+		app-text/poppler[cairo]
+		x11-libs/cairo
+	)
+	png? ( media-libs/libpng:=[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
+	)
 	spng? ( media-libs/libspng[${MULTILIB_USEDEP}] )
-	rsvg? ( gnome-base/librsvg[${MULTILIB_USEDEP}] )
-	tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+	svg? (
+		gnome-base/librsvg:2[${MULTILIB_USEDEP}]
+		sys-libs/zlib:=[${MULTILIB_USEDEP}]
+		x11-libs/cairo[${MULTILIB_USEDEP}]
+	)
+	tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] )
 	webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	vala? ( $(vala_depend) )
 "
-BDEPEND="
+	# gsf? ( gnome-extra/libgsf )
+DEPEND="
 	${RDEPEND}
+	pango? ( x11-base/xorg-proto )
+	pdf? ( x11-base/xorg-proto )
+	svg? ( x11-base/xorg-proto )
+	test? (
+		tiff? ( media-libs/tiff[jpeg] )
+	)
+"
+BDEPEND="
+	dev-util/glib-utils
+	sys-devel/gettext
 	gtk-doc? (
 		dev-build/gtk-doc-am
 		dev-util/gtk-doc
 		pandoc? ( virtual/pandoc )
 	)
-	doxygen? (
+	doc? (
 		app-text/doxygen
+		media-gfx/graphviz
 	)
+	python? ( ${PYTHON_DEPS} )
+	vala? ( $(vala_depend) )
 "
 
-REQUIRED_USE="graphicsmagick? ( !imagemagick )"
+REQUIRED_USE="
+	fontconfig? ( pango )
+	graphicsmagick? ( imagemagick )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( jpeg png webp )
+	vala? ( introspection )
+"
+RESTRICT="!test? ( test )"
 
 DOCS=(ChangeLog README.md)
 
@@ -78,74 +118,79 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/vips/version.h
 )
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
+
 	use vala && vala_setup
+
+	sed -i "s/'vips-doc'/'${PF}'/" cplusplus/meson.build || die
+
+	sed -i "/subdir('fuzz')/d" meson.build || die
 }
 
 multilib_src_configure() {
-	local magic="disabled"
-	local magickpkg
-	# TODO: port imagemagick to multilib, so it can be linked on non-native multilib ABIs too
-	if use imagemagick; then
-		magickpgk="MagickCore"
-		magick=$(meson_native_use_feature imagemagick magick)
-	elif use graphicsmagick; then
-		magickpkg="GraphicsMagick"
-		magick=$(meson_native_use_feature graphicsmagick magick)
-	fi
+	# workaround for bug in lld (bug #921728)
+	tc-ld-is-lld && filter-lto
 
-	# TODO: maybe, port to for-loops?
 	local emesonargs=(
 		# Base options
 		$(meson_use debug)
 		$(meson_use deprecated)
-		$(meson_native_use_bool doxygen)
+		$(meson_native_use_bool doc doxygen)
+		-Dexamples=false
 		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_native_use_bool introspection)
 		$(meson_use vala vapi)
 		-Dmodules=enabled
 
 		# External libs
 		# N.B.: TODO: port libs with meson_*_native in this block to multilib.
-		$(meson_feature cfitsio)
+		$(meson_feature archive)
 		$(meson_feature cgif)
 		$(meson_feature exif)
 		$(meson_feature fftw)
+		$(meson_feature fits cfitsio)
 		$(meson_feature fontconfig)
-		$(meson_native_use_feature gsf)
+		# $(meson_native_use_feature gsf)
 		$(meson_feature heif)
 		$(meson_feature heif heif-module)
+		$(meson_feature highway)
+		$(meson_native_use_feature imagemagick magick)
+		-Dmagick-package=$(usex graphicsmagick GraphicsMagick MagickCore)
+		# -Dmagick-features="[load,save]"
 		$(meson_native_use_feature imagequant)
+		$(meson_native_use_feature introspection)
 		$(meson_feature jpeg)
+		$(meson_feature jpeg2k openjpeg)
 		$(meson_feature jpeg-xl)
 		$(meson_feature jpeg-xl jpeg-xl-module)
 		$(meson_feature lcms)
-		${magick}
-		${magick//=/-module=}
-		-Dmagick-package="${magickpkg}"
-		# -Dmagick-features="[load,save]"
 		$(meson_native_use_feature matio)
 		$(meson_feature nifti)
 		$(usex nifti '-Dnifti-prefix-dir=/usr' '')
-		$(meson_native_use_feature openexr) # v2 - have multilib, v3 - don't 🤷; TODO: ask maintainer why?
-		$(meson_feature openjpeg)
+		$(meson_native_use_feature openexr) # v3 have no multilib, and v2 is no more in gentoo
 		$(meson_native_use_feature openslide)
 		$(meson_native_use_feature openslide openslide-module)
 		$(meson_feature orc)
-		$(meson_feature pangocairo)
+		$(meson_feature pango pangocairo)
 		# $(meson_feature pdfium)
-		-Dpdfium=disabled # fucking google "gn" buildsystem. I don't wan't to fuck with that to package pdfium, sorry.
+		-Dpdfium=disabled
+		# 👆fucking google "gn" buildsystem.
+		# I don't wan't to fuck with that to package pdfium, sorry.
+		# Use poppler instead.
 		$(meson_feature png)
-		$(meson_native_use_feature poppler)
-		$(meson_native_use_feature poppler poppler-module)
+		$(meson_native_use_feature pdf poppler)
+		$(meson_native_use_feature pdf poppler-module)
 		# $(meson_feature quantizr)
-		-Dquantizr=disabled # I've failed to find what is that lib at all 🤷; TODO: mutual exclusive with imagequant
-		$(meson_feature rsvg)
+		-Dquantizr=disabled # use imagequant instead
 		$(meson_feature spng)
+		$(meson_feature svg rsvg)
 		$(meson_feature tiff)
 		$(meson_feature webp)
-		$(meson_feature zlib)
+		$(meson_feature svg zlib) # zlib is currently only used by svgload.c
 
 		# Internal libs
 		$(meson_use nsgif)
@@ -158,5 +203,12 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+
 	find "${D}" -xtype f -name '*.la' -print0
+
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin/vipsprofile
+	else
+		rm -- "${ED}"/usr/{bin/vipsprofile,share/man/man1/vipsprofile.1} || die
+	fi
 }
diff --git a/media-sound/asterisk-sounds-ru-tamara/asterisk-sounds-ru-tamara-2.0.2.ebuild b/media-sound/asterisk-sounds-ru-tamara/asterisk-sounds-ru-tamara-2.0.2.ebuild
index 87b71bce8..0c5741b58 100644
--- a/media-sound/asterisk-sounds-ru-tamara/asterisk-sounds-ru-tamara-2.0.2.ebuild
+++ b/media-sound/asterisk-sounds-ru-tamara/asterisk-sounds-ru-tamara-2.0.2.ebuild
@@ -10,16 +10,15 @@ SRC_URI="
 	https://nettips.ru/files/asterisk/Russian-Tamara-2.0.2-ulaw.tar.gz
 "
 
-KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=net-misc/asterisk-1.6.2.0"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	default
 	unpack "./Russian-Tamara-2.0.2-ulaw/sounds.tar.gz"
diff --git a/net-im/jitsi-meet-electron-bin/jitsi-meet-electron-bin-2024.1.0.ebuild b/net-im/jitsi-meet-electron-bin/jitsi-meet-electron-bin-2024.1.0.ebuild
index 46f67e474..5948bdb67 100644
--- a/net-im/jitsi-meet-electron-bin/jitsi-meet-electron-bin-2024.1.0.ebuild
+++ b/net-im/jitsi-meet-electron-bin/jitsi-meet-electron-bin-2024.1.0.ebuild
@@ -16,11 +16,12 @@ SRC_URI="
 	arm64? ( ${BASE_SRC_URI}-arm64.deb -> ${P}-arm64.deb )
 "
 
+S="${WORKDIR}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-
+KEYWORDS="~amd64 ~arm64"
 IUSE="system-ffmpeg"
-
 RESTRICT="bindist mirror splitdebug test"
 
 QA_PREBUILT="*"
@@ -33,9 +34,6 @@ RDEPEND="
 	system-ffmpeg? ( media-video/ffmpeg[chromium] )
 "
 
-KEYWORDS="~amd64 ~arm64"
-S="${WORKDIR}"
-
 src_install() {
 	rm "opt/Jitsi Meet/chrome-sandbox" || die
 
diff --git a/net-im/sydent/sydent-2.5.2.ebuild b/net-im/sydent/sydent-2.5.2.ebuild
index fddd53a2e..2b114317d 100644
--- a/net-im/sydent/sydent-2.5.2.ebuild
+++ b/net-im/sydent/sydent-2.5.2.ebuild
@@ -12,10 +12,10 @@ DESCRIPTION="Reference Matrix Identity Verification and Lookup Server"
 HOMEPAGE="https://matrix.org/"
 
 SRC_URI="https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
 
 LICENSE="Apache-2.0"
 SLOT="0"
+KEYWORDS="~amd64"
 
 IUSE="gammu"
 
diff --git a/net-im/tgl/tgl-9999.ebuild b/net-im/tgl/tgl-9999.ebuild
index 3d4b8bd3a..187f8370e 100644
--- a/net-im/tgl/tgl-9999.ebuild
+++ b/net-im/tgl/tgl-9999.ebuild
@@ -5,14 +5,15 @@ EAPI=8
 
 inherit git-r3 flag-o-matic
 
+DESCRIPTION="Telegram library"
+HOMEPAGE="https://github.com/vysheng/tgl"
+
 EGIT_REPO_URI="https://github.com/vysheng/tgl.git"
 EGIT_BRANCH="master"
 
-IUSE="gcrypt +libevent"
-DESCRIPTION="Telegram library"
-HOMEPAGE="https://github.com/vysheng/tgl"
 LICENSE="LGPL-2.1+"
 SLOT="0"
+IUSE="gcrypt +libevent"
 
 DEPEND="
 	sys-libs/zlib
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index bdf2795de..0a464d1df 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -84,7 +84,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.3-cmake_lua_version.patch
 )
 
-DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+DOCS="AUTHORS.md CHANGELOG.md CONTRIBUTING.md README.md"
 
 RESTRICT="!test? ( test )"
 
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index ca70f35ce..d58d5e2a9 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,2 +1,2 @@
-DIST dovecot-2.3-pigeonhole-0.5.21.tar.gz 1955945 BLAKE2B 91c4f5b2c21ef0f74ea4661abb94bd86beda6449642ec8ef6b2f48e86b370f78eb6b63f2ffb382cff500137a6723b6b4589548c3b8e415f0caf36c2e6b8b7cf4 SHA512 5537444025a474ee1b79919a424e24530695aec639361c531257f25fac286673719d476906d99d47e348deb57baa75419bff7dd284c82d2b751334dedec96314
+DIST dovecot-2.3-pigeonhole-0.5.21.1.tar.gz 1956404 BLAKE2B ad0ea5c2c181aa9cdf12a7b58141a9812cad11e6ead4d4f38366e13589a84135db1998da179192a6e66a53240647906d96bb330982e7f2f204ba8c402f14cbbd SHA512 7387b417611599fe70d1a83d3b408321e66f5a883bf78a9d55c7496b1a17220677daebaefde2061e0d7064fe07c410ecfc64662878bb253ddcd9e128dd83fbaa
 DIST dovecot-2.3.21.tar.gz 7837242 BLAKE2B 50d0b614e163240e798d272e4435dd51b498bc96468207d2c24132a7f8ac46f5b9393df254d7651046ce10af97d5ca1041b59800b9f71e40b331645d7eaa6326 SHA512 2d463c38639c3fd3d617ee5b1a4e4d0c11362339c4d4d62a5a90164a8b10bc58919545679bbf379139bdb743fdb013033abfddc1fc6401eb8099463cdc2401ca
diff --git a/net-mail/dovecot/dovecot-2.3.21-r10.ebuild b/net-mail/dovecot/dovecot-2.3.21-r10.ebuild
index 86d86a885..140e231e8 100644
--- a/net-mail/dovecot/dovecot-2.3.21-r10.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.21-r10.ebuild
@@ -11,12 +11,14 @@ inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
 MY_P="${P/_/.}"
 #MY_S="${PN}-ce-${PV}"
 major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.21"
+sieve_version="0.5.21.1"
 if [[ ${PV} == *_rc* ]]; then
 	rc_dir="rc/"
 else
 	rc_dir=""
 fi
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="https://www.dovecot.org/"
 SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
 	sieve? (
 	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
@@ -24,11 +26,9 @@ SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
 	managesieve? (
 	https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
 	) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/"
-
-SLOT="0/${PV}"
+S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1 MIT"
+SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
@@ -83,14 +83,13 @@ RDEPEND="
 	net-mail/mailbase[pam?]
 	"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/${PN}"-autoconf-lua-version-v3.patch
 	"${FILESDIR}/${PN}"-socket-name-too-long.patch
 	"${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
 	"${FILESDIR}"/CVE-2022-30550.patch
 	"${FILESDIR}/${PN}"-openssl-3.patch
+	"${FILESDIR}/${PN}"-typo-push.patch
 )
 
 pkg_setup() {
diff --git a/net-mail/dovecot/files/dovecot-typo-push.patch b/net-mail/dovecot/files/dovecot-typo-push.patch
new file mode 100644
index 000000000..4fb551bcd
--- /dev/null
+++ b/net-mail/dovecot/files/dovecot-typo-push.patch
@@ -0,0 +1,27 @@
+From cd2ff353c6198428219fea76bdd296e5256d97b6 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Tue, 5 Mar 2024 18:15:58 -0800
+Subject: [PATCH] push-notification: fix typo 'module' to '-module'
+
+There is a typo in the Makefile.am where it has 'module` instead of '-module' which causes a build failure with slibtool.
+
+  ld: cannot find module: No such file or directory
+
+With GNU libtool the typo is silently ignored.
+---
+ src/plugins/push-notification/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/push-notification/Makefile.am b/src/plugins/push-notification/Makefile.am
+index f1527148a0..daa43a2d4d 100644
+--- a/src/plugins/push-notification/Makefile.am
++++ b/src/plugins/push-notification/Makefile.am
+@@ -75,7 +75,7 @@ lib22_push_notification_lua_plugin_la_CFLAGS = $(AM_CPPFLAGS) \
+ 	-I$(top_srcdir)/src/lib-lua \
+ 	-I$(top_srcdir)/src/plugins/mail-lua \
+ 	$(LUA_CFLAGS)
+-lib22_push_notification_lua_plugin_la_LDFLAGS = module -avoid-version
++lib22_push_notification_lua_plugin_la_LDFLAGS = -module -avoid-version
+ module_LTLIBRARIES += \
+ 	lib22_push_notification_lua_plugin.la
+ lib22_push_notification_lua_plugin_la_LIBADD = $(notify_deps) $(LUA_LIBS)
diff --git a/net-misc/android-file-transfer/android-file-transfer-3.0.ebuild b/net-misc/android-file-transfer/android-file-transfer-3.0.ebuild
index d2b359c53..96678b7df 100644
--- a/net-misc/android-file-transfer/android-file-transfer-3.0.ebuild
+++ b/net-misc/android-file-transfer/android-file-transfer-3.0.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="Reliable MTP client with minimalistic UI"
 HOMEPAGE="https://whoozle.github.io/android-file-transfer-linux/"
 SRC_URI="https://github.com/whoozle/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -25,7 +27,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_PN}-${PV}
 #PATCHES=( "${FILESDIR}/2.2-automagic.patch" )
 
 src_prepare() {
diff --git a/net-vpn/onioncat/onioncat-4.11.0.ebuild b/net-vpn/onioncat/onioncat-4.11.0.ebuild
index b625632fc..4c7ec37f8 100644
--- a/net-vpn/onioncat/onioncat-4.11.0.ebuild
+++ b/net-vpn/onioncat/onioncat-4.11.0.ebuild
@@ -16,6 +16,8 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+# S="${WORKDIR}/${PN}-${C_SHA}"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="debug +http log +queue +rtt i2p"
@@ -30,8 +32,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${PN}-${C_SHA}"
-
 src_prepare() {
 	sed -i \
 		-e '/CFLAGS=/s#-O2##g' \
diff --git a/net-vpn/onioncat/onioncat-9999.ebuild b/net-vpn/onioncat/onioncat-9999.ebuild
index b625632fc..4c7ec37f8 100644
--- a/net-vpn/onioncat/onioncat-9999.ebuild
+++ b/net-vpn/onioncat/onioncat-9999.ebuild
@@ -16,6 +16,8 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
+# S="${WORKDIR}/${PN}-${C_SHA}"
+
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="debug +http log +queue +rtt i2p"
@@ -30,8 +32,6 @@ RDEPEND="
 	)
 "
 
-S="${WORKDIR}/${PN}-${C_SHA}"
-
 src_prepare() {
 	sed -i \
 		-e '/CFLAGS=/s#-O2##g' \
diff --git a/net-vpn/toxvpn/toxvpn-9999.ebuild b/net-vpn/toxvpn/toxvpn-9999.ebuild
index aa1230bdb..bb80bfb75 100644
--- a/net-vpn/toxvpn/toxvpn-9999.ebuild
+++ b/net-vpn/toxvpn/toxvpn-9999.ebuild
@@ -9,9 +9,9 @@ DESCRIPTION="toxvpn allows one to make tunneled point to point connections over
 HOMEPAGE="https://github.com/cleverca22/toxvpn"
 EGIT_REPO_URI="https://github.com/cleverca22/toxvpn.git"
 
-IUSE="static systemd zeromq"
 LICENSE="GPL-3"
 SLOT="0"
+IUSE="static systemd zeromq"
 
 RDEPEND="
 	net-libs/tox
diff --git a/sci-biology/structure/structure-2.3.4.ebuild b/sci-biology/structure/structure-2.3.4.ebuild
index b9e88cfb3..f98982d8c 100644
--- a/sci-biology/structure/structure-2.3.4.ebuild
+++ b/sci-biology/structure/structure-2.3.4.ebuild
@@ -12,16 +12,16 @@ SRC_URI="
 	doc? (  ${BASE}_doc.pdf -> ${PN}_doc-${PV}.pdf )
 "
 
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
+S="${WORKDIR}/structure_kernel_src"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="java doc"
 RESTRICT="mirror"
 
-IUSE="java doc"
 RDEPEND="java? ( virtual/jre )"
 
-S="${WORKDIR}/structure_kernel_src"
-
 src_unpack() {
 	# Ignore PDF file in archive list
 	unpack ${A/${PN}_doc-${PV}.pdf/}
diff --git a/sys-kernel/acpi-stuff/acpi-stuff-9999.ebuild b/sys-kernel/acpi-stuff/acpi-stuff-9999.ebuild
index ebd400662..9c730828a 100644
--- a/sys-kernel/acpi-stuff/acpi-stuff-9999.ebuild
+++ b/sys-kernel/acpi-stuff/acpi-stuff-9999.ebuild
@@ -16,8 +16,8 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 
 DEPEND="
 	virtual/linux-sources
diff --git a/sys-process/systemd-cron/metadata.xml b/sys-process/systemd-cron/metadata.xml
index ff1ff93d2..488f4414b 100644
--- a/sys-process/systemd-cron/metadata.xml
+++ b/sys-process/systemd-cron/metadata.xml
@@ -2,12 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>rich0@gentoo.org</email>
+    <email>mva@gentoo.org</email>
+    <description>Also, you can find me on IRC (Libera.Chat) as mva, or in Telegram as @mva_name</description>
+    <name>Vadim A. Misbakh-Soloviov</name>
   </maintainer>
   <use>
     <flag name="cron-boot">Include support for the boot timer.</flag>
     <flag name="etc-crontab-systemd">Use dedicated /etc/crontab-systemd instead of parsing /etc/crontab</flag>
     <flag name="minutely">Support /etc/cron.minutely</flag>
+    <flag name="runparts">Use traditional run-parts instead of creating jobs for each cron.* entry</flag>
     <flag name="yearly">Support /etc/cron.yearly</flag>
     <flag name="setgid">Compile setgid C helper for crontab. Needs GCC or Clang.</flag>
   </use>
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
index a4ada63af..020e3547d 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.14.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..13} )
-inherit python-single-r1 systemd
+inherit systemd toolchain-funcs
 
 DESCRIPTION="systemd units to create timers for cron directories and crontab"
 HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
@@ -19,22 +18,28 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="cron-boot etc-crontab-systemd minutely setgid yearly"
+IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid yearly"
+# We can't run the unshare tests within sandbox/with low privs, and the
+# 'test-nounshare' target just does static analysis (shellcheck etc).
+RESTRICT="test"
 
-DEPEND="sys-process/cronbase"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	${DEPEND}
-	>=sys-apps/systemd-217
-	sys-apps/debianutils
+	!sys-process/cronie[anacron]
+	acct-user/_cron-failure
+	acct-group/_cron-failure
+	app-crypt/libmd:=
+	sys-process/cronbase
+	>=sys-apps/systemd-255[-split-usr(-)]
 	!etc-crontab-systemd? ( !sys-process/dcron )
-	${PYTHON_DEPS}
+	runparts? ( sys-apps/debianutils )
+"
+DEPEND="
+	dev-libs/openssl:=
+	sys-process/cronbase
 "
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
 	if use etc-crontab-systemd; then
 		sed -i \
 			-e 's/^crontab/crontab-systemd/' \
@@ -49,7 +54,8 @@ src_prepare() {
 		sed -i \
 			-e "s!/etc/crontab!/etc/crontab-systemd!" \
 			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
+			"${S}/src/bin/systemd-crontab-generator.cpp" \
+			"${S}/test/test-generator" || die
 	fi
 
 	default
@@ -64,20 +70,37 @@ my_use_enable() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}/usr"
-		--confdir="${EPREFIX}/etc"
-		--runparts="${EPREFIX}/bin/run-parts"
-		--mandir="${EPREFIX}/usr/share/man"
-		--unitdir="$(systemd_get_systemunitdir)"
-		--statedir="${EPREFIX}/var/spool/cron/crontabs"
-		$(my_use_enable cron-boot boot)
-		$(my_use_enable minutely)
-		$(my_use_enable yearly)
-		$(my_use_enable yearly quarterly)
-		$(my_use_enable yearly semi_annually)
-		$(my_use_enable setgid)
-		--enable-persistent=yes
-	)
-	./configure "${myeconfargs[@]}"
+	tc-export PKG_CONFIG CXX CC
+
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--unitdir="$(systemd_get_systemunitdir)" \
+		--generatordir="$(systemd_get_systemgeneratordir)" \
+		$(my_use_enable cron-boot boot) \
+		$(my_use_enable minutely) \
+		$(my_use_enable runparts) \
+		$(my_use_enable yearly) \
+		$(my_use_enable yearly quarterly) \
+		$(my_use_enable yearly semi_annually) || die
+		# --statedir="${EPREFIX}/var/spool/cron/crontabs"
+
+	use etc-crontab-systemd && export CRONTAB=crontab-systemd
+}
+
+src_compile() {
+	emake PCH=
+}
+
+src_install() {
+	emake DESTDIR="${D}" PCH= install
+	rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf
+}
+
+pkg_postinst() {
+	elog "This package now supports USE=runparts which is enabled by default."
+	elog "This enables the traditional run-parts behavior."
+	elog "If you disable this flag you will get the new behavior of having"
+	elog "multiple jobs for each cron.* entry run in parallel with"
+	elog "separate services/logs/etc."
 }
diff --git a/sys-process/systemd-cron/systemd-cron-9999.ebuild b/sys-process/systemd-cron/systemd-cron-9999.ebuild
index a4ada63af..020e3547d 100644
--- a/sys-process/systemd-cron/systemd-cron-9999.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-9999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..13} )
-inherit python-single-r1 systemd
+inherit systemd toolchain-funcs
 
 DESCRIPTION="systemd units to create timers for cron directories and crontab"
 HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
@@ -19,22 +18,28 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="cron-boot etc-crontab-systemd minutely setgid yearly"
+IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid yearly"
+# We can't run the unshare tests within sandbox/with low privs, and the
+# 'test-nounshare' target just does static analysis (shellcheck etc).
+RESTRICT="test"
 
-DEPEND="sys-process/cronbase"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	${DEPEND}
-	>=sys-apps/systemd-217
-	sys-apps/debianutils
+	!sys-process/cronie[anacron]
+	acct-user/_cron-failure
+	acct-group/_cron-failure
+	app-crypt/libmd:=
+	sys-process/cronbase
+	>=sys-apps/systemd-255[-split-usr(-)]
 	!etc-crontab-systemd? ( !sys-process/dcron )
-	${PYTHON_DEPS}
+	runparts? ( sys-apps/debianutils )
+"
+DEPEND="
+	dev-libs/openssl:=
+	sys-process/cronbase
 "
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
 	if use etc-crontab-systemd; then
 		sed -i \
 			-e 's/^crontab/crontab-systemd/' \
@@ -49,7 +54,8 @@ src_prepare() {
 		sed -i \
 			-e "s!/etc/crontab!/etc/crontab-systemd!" \
 			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
+			"${S}/src/bin/systemd-crontab-generator.cpp" \
+			"${S}/test/test-generator" || die
 	fi
 
 	default
@@ -64,20 +70,37 @@ my_use_enable() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--prefix="${EPREFIX}/usr"
-		--confdir="${EPREFIX}/etc"
-		--runparts="${EPREFIX}/bin/run-parts"
-		--mandir="${EPREFIX}/usr/share/man"
-		--unitdir="$(systemd_get_systemunitdir)"
-		--statedir="${EPREFIX}/var/spool/cron/crontabs"
-		$(my_use_enable cron-boot boot)
-		$(my_use_enable minutely)
-		$(my_use_enable yearly)
-		$(my_use_enable yearly quarterly)
-		$(my_use_enable yearly semi_annually)
-		$(my_use_enable setgid)
-		--enable-persistent=yes
-	)
-	./configure "${myeconfargs[@]}"
+	tc-export PKG_CONFIG CXX CC
+
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--unitdir="$(systemd_get_systemunitdir)" \
+		--generatordir="$(systemd_get_systemgeneratordir)" \
+		$(my_use_enable cron-boot boot) \
+		$(my_use_enable minutely) \
+		$(my_use_enable runparts) \
+		$(my_use_enable yearly) \
+		$(my_use_enable yearly quarterly) \
+		$(my_use_enable yearly semi_annually) || die
+		# --statedir="${EPREFIX}/var/spool/cron/crontabs"
+
+	use etc-crontab-systemd && export CRONTAB=crontab-systemd
+}
+
+src_compile() {
+	emake PCH=
+}
+
+src_install() {
+	emake DESTDIR="${D}" PCH= install
+	rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf
+}
+
+pkg_postinst() {
+	elog "This package now supports USE=runparts which is enabled by default."
+	elog "This enables the traditional run-parts behavior."
+	elog "If you disable this flag you will get the new behavior of having"
+	elog "multiple jobs for each cron.* entry run in parallel with"
+	elog "separate services/logs/etc."
 }
diff --git a/www-apps/gitprep/gitprep-9999.ebuild b/www-apps/gitprep/gitprep-9999.ebuild
index a1fb7df66..25c93bafa 100644
--- a/www-apps/gitprep/gitprep-9999.ebuild
+++ b/www-apps/gitprep/gitprep-9999.ebuild
@@ -8,10 +8,10 @@ inherit perl-module git-r3
 DESCRIPTION="Github clone. you can install Github system into your unix/linux machine."
 HOMEPAGE="https://github.com/yuki-kimoto/gitprep/"
 EGIT_REPO_URI="https://github.com/yuki-kimoto/gitprep"
-RESTRICT="test"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
+RESTRICT="test"
 
 RDEPEND="
 	>=acct-user/git-0-r4[gitprep]
diff --git a/www-apps/privatebin/privatebin-1.5.1.ebuild b/www-apps/privatebin/privatebin-1.5.1.ebuild
index 22c1e76dd..a9fd19a69 100644
--- a/www-apps/privatebin/privatebin-1.5.1.ebuild
+++ b/www-apps/privatebin/privatebin-1.5.1.ebuild
@@ -9,6 +9,8 @@ DESCRIPTION="A minimalist pastebin where the server has zero knowledge of pasted
 HOMEPAGE="https://privatebin.info/"
 SRC_URI="https://github.com/PrivateBin/PrivateBin/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
+S="${WORKDIR}/PrivateBin-${PV}"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64"
 
@@ -19,8 +21,6 @@ DEPEND="
 	app-admin/webapp-config
 "
 
-S=${WORKDIR}/PrivateBin-${PV}
-
 pkg_setup() {
 	webapp_pkg_setup
 }
diff --git a/www-client/chromium-gost/chromium-gost-126.0.6478.126-r1.ebuild b/www-client/chromium-gost/chromium-gost-126.0.6478.126-r1.ebuild
index c1d9d27bc..bb0991002 100644
--- a/www-client/chromium-gost/chromium-gost-126.0.6478.126-r1.ebuild
+++ b/www-client/chromium-gost/chromium-gost-126.0.6478.126-r1.ebuild
@@ -6,18 +6,20 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil
 
 inherit chromium-2 unpacker desktop wrapper pax-utils xdg
 
-RESTRICT="bindist mirror strip"
-
 DESCRIPTION="The web browser from Yandex"
-LICENSE="EULA"
-SLOT="0"
-IUSE="+ffmpeg-codecs"
 HOMEPAGE="https://github.com/deemru/Chromium-Gost"
+
 SRC_URI="
 	amd64? ( https://github.com/deemru/Chromium-Gost/releases/download/${PV}/${P}-linux-amd64.deb )
 "
 # -> ${P}.deb )
+S=${WORKDIR}
+
+LICENSE="EULA"
+SLOT="0"
 KEYWORDS="~amd64"
+IUSE="+ffmpeg-codecs"
+RESTRICT="bindist mirror strip"
 
 FFMPEG_PV="$(ver_cut 1)"
 BROWSER_HOME="opt/${PN}"
@@ -63,7 +65,6 @@ BDEPEND="
 
 QA_PREBUILT="*"
 QA_DESKTOP_FILE="usr/share/applications/yandex-browser.*\\.desktop"
-S=${WORKDIR}
 
 pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
diff --git a/www-plugins/cprocsp-plugin/cprocsp-plugin-2.0.14892.ebuild b/www-plugins/cprocsp-plugin/cprocsp-plugin-2.0.14892.ebuild
index ba4801a3b..7e021a6fa 100644
--- a/www-plugins/cprocsp-plugin/cprocsp-plugin-2.0.14892.ebuild
+++ b/www-plugins/cprocsp-plugin/cprocsp-plugin-2.0.14892.ebuild
@@ -6,6 +6,7 @@ EAPI=8
 inherit rpm
 
 DESCRIPTION="CryptoPro Browser Plugin (with additional bundled stuff)"
+HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 
 BASE_SRC_URI="https://cryptopro.ru/sites/default/files/products/cades/current_release_2_0/cades-linux"
 SRC_URI="
@@ -18,11 +19,10 @@ SRC_URI="
 # ${P}_${ARCH}.tar.gz
 # pkgdev doesn't support ${ARCH} ATM and throws an error
 
-HOMEPAGE="https://cryptopro.ru/products/csp/downloads"
 LICENSE="Crypto-Pro"
-RESTRICT="bindist mirror strip"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+RESTRICT="bindist mirror strip"
 
 RDEPEND="
 	app-crypt/cprocsp
diff --git a/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild b/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
index ada257cb1..85763659a 100644
--- a/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
+++ b/www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
@@ -6,17 +6,19 @@ EAPI=8
 inherit unpacker patches
 
 DESCRIPTION="Crypto-provider browser plugin for russian e-gov site https://gosuslugi.ru/"
+HOMEPAGE="https://gosuslugi.ru/"
 
+BASE_URI="https://ds-plugin.gosuslugi.ru/plugin/upload/assets/distrib"
 SRC_URI="
-	amd64? ( ${P}_amd64.deb )
-	x86? ( ${P}_x86.deb )
+	amd64? ( ${BASE_URI}/IFCPlugin-x86_64.deb -> ${P}_amd64.deb )
+	x86? ( ${BASE_URI}/IFCPlugin-i386.deb -> ${P}_x86.deb )
 "
+S="${WORKDIR}"
 
-HOMEPAGE="https://gosuslugi.ru/"
 LICENSE="all-rights-reserved"
-RESTRICT="fetch mirror strip"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror strip"
 
 RDEPEND="
 	dev-libs/libxml2:2
@@ -28,21 +30,12 @@ DEPEND="${RDEPEND}"
 QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib32/.* usr/lib64/.*"
 
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	local BASE_URI="https://ds-plugin.gosuslugi.ru/plugin/upload/"
-	local pkg
-	if use amd64; then
-		pkg="IFCPlugin-x86_64.deb"
-	elif use x86; then
-		pkg="IFCPlugin-i386.deb"
-	else
-		die "Unsupported architecture!"
+pkg_setup() {
+	if [[ "${MERGE_TYPE}" != "binary" ]]; then
+		ewarn "Upstream is hostile, and have no versioned distfiles"
+		ewarn "So, you should expect random checksum verification errors sometimes"
+		ewarn "In cases when it happens - place an issue on overlay's issue tracker on GitHub, please"
 	fi
-
-	eerror "Please, open ${BASE_URI}, download file named ${pkg} (downloading may start automatically)"
-	eerror "and copy/move/symlink it to ${PORTAGE_ACTUAL_DISTDIR}/${A}"
 }
 
 src_unpack() {
@@ -80,7 +73,7 @@ pkg_postinst() {
 	# otherwise it tries to create it as user, with 777 on path
 	local log="/var/log/ifc/engine_logs/engine.log"
 	touch "${log}"
-	fperms 666 "${log}" # plugin doesn't work otherwise
+	chmod 666 "${log}" # plugin doesn't work otherwise
 	# (all users who run it should be able to write in it, or plugin crashes)
 	# TODO: think about proper fix before moving to gentoo repo.
 }
diff --git a/www-plugins/kontur-diagnostic-plugin/kontur-diagnostic-plugin-001353.ebuild b/www-plugins/kontur-diagnostic-plugin/kontur-diagnostic-plugin-001353.ebuild
index 7ff5a99d4..7bd678108 100644
--- a/www-plugins/kontur-diagnostic-plugin/kontur-diagnostic-plugin-001353.ebuild
+++ b/www-plugins/kontur-diagnostic-plugin/kontur-diagnostic-plugin-001353.ebuild
@@ -7,17 +7,20 @@ inherit unpacker patches
 
 DESCRIPTION="System diagnostic browser plugin for SKB Kontur services"
 
+HOMEPAGE="https://help.kontur.ru/"
 SRC_URI="
 	amd64? ( https://api.kontur.ru/drive/v1/public/diag/files/diag.plugin_amd64.${PV}.deb -> ${P}.deb )
 "
 # x64-macos? ( https://help.kontur.ru/files/diag.plugin-3.1.0.209.000837.pkg )
 # amd64? ( https://help.kontur.ru/files/diag.plugin_amd64.${PV}.deb -> ${P}.deb )
 # https://help.kontur.ru/files/diag.plugin-3.1.0.210-1.x86_64.000865.rpm
-HOMEPAGE="https://help.kontur.ru/"
+
+S="${WORKDIR}"
+
 LICENSE="EULA"
-RESTRICT="mirror strip"
 SLOT="0"
 KEYWORDS="~amd64"
+RESTRICT="mirror strip"
 # x64-macos"
 
 RDEPEND="
@@ -33,8 +36,6 @@ DEPEND="${RDEPEND}"
 QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib64/.*"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/www-plugins/kontur-plugin/kontur-plugin-4.0.6.244.ebuild b/www-plugins/kontur-plugin/kontur-plugin-4.0.6.244.ebuild
index ed624c999..4b97c5126 100644
--- a/www-plugins/kontur-plugin/kontur-plugin-4.0.6.244.ebuild
+++ b/www-plugins/kontur-plugin/kontur-plugin-4.0.6.244.ebuild
@@ -6,16 +6,18 @@ EAPI=8
 inherit unpacker patches
 
 DESCRIPTION="Cryptographic browser plugin for SKB Kontur services"
+HOMEPAGE="https://help.kontur.ru/plugin/"
 
 SRC_URI="
 	amd64? ( https://help.kontur.ru/plugin/dist/kontur.plugin_amd64.deb -> ${P}.deb )
 "
 	# amd64? ( https://help.kontur.ru/files/kontur.plugin_amd64.${PV}.deb -> ${P}.deb )
-HOMEPAGE="https://help.kontur.ru/plugin/"
+S="${WORKDIR}"
+
 LICENSE="EULA"
-RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64"
+RESTRICT="mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -39,8 +41,6 @@ DEPEND="${RDEPEND}"
 QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib64/.*"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/www-plugins/kontur-plugin/kontur-plugin-4.2.2.488.ebuild b/www-plugins/kontur-plugin/kontur-plugin-4.2.2.488.ebuild
index ed624c999..4b97c5126 100644
--- a/www-plugins/kontur-plugin/kontur-plugin-4.2.2.488.ebuild
+++ b/www-plugins/kontur-plugin/kontur-plugin-4.2.2.488.ebuild
@@ -6,16 +6,18 @@ EAPI=8
 inherit unpacker patches
 
 DESCRIPTION="Cryptographic browser plugin for SKB Kontur services"
+HOMEPAGE="https://help.kontur.ru/plugin/"
 
 SRC_URI="
 	amd64? ( https://help.kontur.ru/plugin/dist/kontur.plugin_amd64.deb -> ${P}.deb )
 "
 	# amd64? ( https://help.kontur.ru/files/kontur.plugin_amd64.${PV}.deb -> ${P}.deb )
-HOMEPAGE="https://help.kontur.ru/plugin/"
+S="${WORKDIR}"
+
 LICENSE="EULA"
-RESTRICT="mirror"
 SLOT="0"
 KEYWORDS="~amd64"
+RESTRICT="mirror"
 
 RDEPEND="
 	app-accessibility/at-spi2-core
@@ -39,8 +41,6 @@ DEPEND="${RDEPEND}"
 QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib64/.*"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack_deb ${A}
 }
diff --git a/www-plugins/rutoken-plugin/rutoken-plugin-4.7.0.ebuild b/www-plugins/rutoken-plugin/rutoken-plugin-4.7.0.ebuild
index bad3b715f..5e5eed1e6 100644
--- a/www-plugins/rutoken-plugin/rutoken-plugin-4.7.0.ebuild
+++ b/www-plugins/rutoken-plugin/rutoken-plugin-4.7.0.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 inherit unpacker patches
 
 DESCRIPTION="Browser plugin to work with USB smartcards made under RuToken brand"
+HOMEPAGE="https://www.rutoken.ru/support/download/rutoken-plugin/"
 
 BASE_NAME="libnpRutokenPlugin_${PV}-1"
-
 SRC_URI="
 	amd64? ( ${BASE_NAME}_amd64.deb )
 	x86? ( ${BASE_NAME}_i386.deb )
@@ -16,11 +16,12 @@ SRC_URI="
 	arm64? ( ${BASE_NAME}_arm64.deb )
 "
 
-HOMEPAGE="https://www.rutoken.ru/support/download/rutoken-plugin/"
+S="${WORKDIR}"
+
 LICENSE="all-rights-reserved"
-RESTRICT="fetch mirror strip"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="fetch mirror strip"
 
 RDEPEND="
 	sys-apps/pcsc-lite
@@ -30,8 +31,6 @@ DEPEND="${RDEPEND}"
 QA_PREBUILT="*"
 QA_SONAME_NO_SYMLINK="usr/lib32/.* usr/lib64/.* usr/lib/.* opt/aktivco/.*"
 
-S="${WORKDIR}"
-
 pkg_nofetch() {
 	eerror "Please, open ${HOMEPAGE} in your browser,"
 	eerror "download '${A}' package there (or place an issue on github for me to bump the version),"
diff --git a/www-servers/apache-headers/apache-headers-2.4.59.ebuild b/www-servers/apache-headers/apache-headers-2.4.59.ebuild
index 19c0f8461..6e0aa03df 100644
--- a/www-servers/apache-headers/apache-headers-2.4.59.ebuild
+++ b/www-servers/apache-headers/apache-headers-2.4.59.ebuild
@@ -11,17 +11,17 @@ GENTOO_PATCHNAME="gentoo-apache-2.4.58"
 DESCRIPTION="Header files from the Apache Web Server"
 HOMEPAGE="https://httpd.apache.org/"
 
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
-
 SRC_URI="
 	mirror://apache/httpd/httpd-${PV}.tar.bz2
 	https://dev.gentoo.org/~${GENTOO_DEVELOPER}/dist/apache/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
 "
+S="${WORKDIR}/httpd-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x64-solaris"
 
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
-S="${WORKDIR}/httpd-${PV}"
 
 PATCHES="${GENTOO_PATCHDIR}/patches/*.patch"
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild b/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
index f13c4b8c8..f6ff7d787 100644
--- a/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.32.1-r10.ebuild
@@ -20,8 +20,6 @@ inherit systemd php-ext-source-r3 python-r1 ruby-ng toolchain-funcs flag-o-matic
 
 DESCRIPTION="Dynamic web and application server"
 HOMEPAGE="https://unit.nginx.org/"
-LICENSE="Apache-2.0"
-SLOT="0"
 
 if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/nginx/unit"
@@ -33,6 +31,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
 UNIT_MODULES="perl php python ruby"
 # go java nodejs
 # ^ not needed, as unit stuf normally installs with language package managers as vendored dependency of application
@@ -71,7 +74,6 @@ DEPEND="
 #		dev-util/wasmer
 #	)
 RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
 
 my_econf() {
 	echo ./configure "${@}"
diff --git a/www-servers/nginx-unit/nginx-unit-9999.ebuild b/www-servers/nginx-unit/nginx-unit-9999.ebuild
index f13c4b8c8..f6ff7d787 100644
--- a/www-servers/nginx-unit/nginx-unit-9999.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-9999.ebuild
@@ -20,8 +20,6 @@ inherit systemd php-ext-source-r3 python-r1 ruby-ng toolchain-funcs flag-o-matic
 
 DESCRIPTION="Dynamic web and application server"
 HOMEPAGE="https://unit.nginx.org/"
-LICENSE="Apache-2.0"
-SLOT="0"
 
 if [[ "${PV}" = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/nginx/unit"
@@ -33,6 +31,11 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
 UNIT_MODULES="perl php python ruby"
 # go java nodejs
 # ^ not needed, as unit stuf normally installs with language package managers as vendored dependency of application
@@ -71,7 +74,6 @@ DEPEND="
 #		dev-util/wasmer
 #	)
 RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
 
 my_econf() {
 	echo ./configure "${@}"