diff --git a/dev-java/gradle-base-annotations/Manifest b/dev-java/gradle-base-annotations/Manifest
deleted file mode 100644
index a856d17482..0000000000
--- a/dev-java/gradle-base-annotations/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gradle-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8
diff --git a/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild b/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild
deleted file mode 100644
index 023008142c..0000000000
--- a/dev-java/gradle-base-annotations/gradle-base-annotations-6.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="gradle-${PV}"
-DESCRIPTION="Build automation tool for JVM Languages, C(++), etc."
-HOMEPAGE="https://gradle.org"
-SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6.8"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/jsr305"
-
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}"
-
-S="${WORKDIR}/gradle-${PV}"
-JAVA_SRC_DIR="subprojects/base-annotations/src/main/java"
-JAVA_GENTOO_CLASSPATH="jsr305"
-RESTRICT="test"
diff --git a/dev-java/gradle-base-annotations/metadata.xml b/dev-java/gradle-base-annotations/metadata.xml
deleted file mode 100644
index 261f740c8c..0000000000
--- a/dev-java/gradle-base-annotations/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- kaiboma06@gmail.com
- Kaibo Ma
-
-
diff --git a/dev-java/gradle-build-operations/Manifest b/dev-java/gradle-build-operations/Manifest
deleted file mode 100644
index a856d17482..0000000000
--- a/dev-java/gradle-build-operations/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gradle-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8
diff --git a/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild b/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild
deleted file mode 100644
index 9a4e46c6f3..0000000000
--- a/dev-java/gradle-build-operations/gradle-build-operations-6.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="gradle-${PV}"
-
-DESCRIPTION="Build automation tool for JVM Languages, C(++), etc."
-HOMEPAGE="https://gradle.org"
-SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6.8"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/slf4j-api
-dev-java/gradle-base-annotations:${SLOT}"
-
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}"
-
-MY_PN="${PN/gradle-/}"
-S="${WORKDIR}/gradle-${PV}"
-JAVA_SRC_DIR="subprojects/${MY_PN}/src/main/java"
-JAVA_GENTOO_CLASSPATH="slf4j-api gradle-base-annotations-${SLOT}"
-RESTRICT="test"
diff --git a/dev-java/gradle-build-operations/metadata.xml b/dev-java/gradle-build-operations/metadata.xml
deleted file mode 100644
index 261f740c8c..0000000000
--- a/dev-java/gradle-build-operations/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- kaiboma06@gmail.com
- Kaibo Ma
-
-
diff --git a/dev-python/factory-boy/Manifest b/dev-python/factory-boy/Manifest
new file mode 100644
index 0000000000..45667ee32d
--- /dev/null
+++ b/dev-python/factory-boy/Manifest
@@ -0,0 +1 @@
+DIST factory_boy-3.2.1.tar.gz 153483 BLAKE2B e527a04b5371289beb6ae765ccf116b1171d3293cd7bf0ef240ecf17b7806d0ed6db4a97d9c3c4cc22d93c1eaa96888046bdfa7aa1b2d9910257165266ce9828 SHA512 21ad111c648f3ff444cc2310479464334eb4c5b16ed04a592fb9152397f9bf6c044d235789b901f65ebf49d07a0621834ec280630279be0696ccec15ac9f15df
diff --git a/dev-python/factory-boy/factory-boy-3.2.1-r1.ebuild b/dev-python/factory-boy/factory-boy-3.2.1-r1.ebuild
new file mode 100644
index 0000000000..85de6e6817
--- /dev/null
+++ b/dev-python/factory-boy/factory-boy-3.2.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 pypi
+
+DESCRIPTION="A versatile test fixtures replacement based on thoughtbot's factory_bot for Ruby"
+HOMEPAGE="
+ https://pypi.org/project/factory-boy/
+ https://github.com/FactoryBoy/factory_boy
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/Faker[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/django[sqlite,${PYTHON_USEDEP}]
+ dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+ )
+"
+
+EPYTEST_IGNORE=(
+ # depends on treecleaned dev-python/mongoengine
+ tests/test_mongoengine.py
+)
+
+EPYTEST_DESELECT=(
+ # broken
+ examples/flask_alchemy
+)
+
+distutils_enable_tests pytest
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-rtd-theme \
+ dev-python/sphinxcontrib-spelling
diff --git a/dev-python/factory_boy/metadata.xml b/dev-python/factory-boy/metadata.xml
similarity index 100%
rename from dev-python/factory_boy/metadata.xml
rename to dev-python/factory-boy/metadata.xml
diff --git a/dev-python/factory_boy/Manifest b/dev-python/factory_boy/Manifest
deleted file mode 100644
index bcb8169807..0000000000
--- a/dev-python/factory_boy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST factory_boy-3.2.1.gh.tar.gz 141947 BLAKE2B f7668e945c653276fdf8c28aca728e4dd0aa24e980868a22e116cdb6395170f37f60d9b021c915586681b93d84a50f254b6d4a0b8f75e15991fac91aa4b17e0c SHA512 45f88970fa2adf15160d489335d7843ebf78178ae619e6b1ad2cc2e3af8e6c14763cf1afe21bc4e66d1d7196458d8045862db4d5878d5cfc1f2aa658ccba1812
diff --git a/dev-python/factory_boy/factory_boy-3.2.1.ebuild b/dev-python/factory_boy/factory_boy-3.2.1.ebuild
deleted file mode 100644
index 7059794285..0000000000
--- a/dev-python/factory_boy/factory_boy-3.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A fixtures replacement tool"
-HOMEPAGE="https://github.com/FactoryBoy/factory_boy"
-SRC_URI="https://github.com/FactoryBoy/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/Faker-0.7.0[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- $(python_gen_impl_dep sqlite)
- dev-python/django[${PYTHON_USEDEP}]
- dev-python/pillow[jpeg,${PYTHON_USEDEP}]
- dev-python/sqlalchemy[${PYTHON_USEDEP}]
- )
- doc? (
- dev-python/factory_boy[${PYTHON_USEDEP}]
- )
-"
-
-python_prepare_all() {
- # Fix symbolic link QA
- rm ChangeLog || die "remove failed"
- cp docs/changelog.rst ChangeLog || die "copy failed"
-
- # depends on masked dev-python/mongoengine
- rm tests/test_mongoengine.py || die
-
- distutils-r1_python_prepare_all
-}
-
-distutils_enable_tests --install unittest
-
-distutils_enable_sphinx docs dev-python/sphinx-rtd-theme dev-python/sphinxcontrib-spelling
diff --git a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild b/dev-python/pytest-randomly/pytest-randomly-3.12.0-r1.ebuild
similarity index 74%
rename from dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
rename to dev-python/pytest-randomly/pytest-randomly-3.12.0-r1.ebuild
index 38242bcf0d..b67d4e9e7b 100644
--- a/dev-python/pytest-randomly/pytest-randomly-3.12.0.ebuild
+++ b/dev-python/pytest-randomly/pytest-randomly-3.12.0-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-
inherit distutils-r1
DESCRIPTION="Pytest plugin to randomly order tests and control random.seed"
@@ -19,17 +18,15 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
-RDEPEND="
- dev-python/pytest[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/importlib_metadata-3.6.0[${PYTHON_USEDEP}]' python3_{8,9})
-"
-# tests pytest-xdist integration
-BDEPEND="test? (
- dev-python/factory_boy[${PYTHON_USEDEP}]
- dev-python/Faker[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
-)"
+RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/Faker[${PYTHON_USEDEP}]
+ dev-python/factory-boy[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+" # tests pytest-xdist integration
EPYTEST_DESELECT=(
tests/test_pytest_randomly.py::test_entrypoint_injection
diff --git a/dev-vcs/got/Manifest b/dev-vcs/got/Manifest
index c69b2b35ed..8ac8f3b50c 100644
--- a/dev-vcs/got/Manifest
+++ b/dev-vcs/got/Manifest
@@ -1,2 +1,2 @@
-DIST got-portable-0.84.1.tar.gz 1009452 BLAKE2B 86154a2baa3543572be73eacbfc645c24f7c95bd5de14bc83da7aa0d8ef513bee8df83090c635dc2a73044149ccf9a0b769da42cd170f931bdd7d91c388ff15d SHA512 56431d8c096ab66219f9821d3ab7e9e222f893d5728dd2a551da9c54ca8d792f6aacef915cddd926cd0e3c7464bd147eaa3f33e1c48b14e97901507082ebfac5
DIST got-portable-0.85.tar.gz 1033808 BLAKE2B e8912344933397fcd6c79df7a199f1208e51bd36b9df3311cc8d2f381db02114fa6bf01764b24b57b38dd0dfa2b8898a623de92a57f7751b0620507cce6861d8 SHA512 66ae168d961c1a8c19f9b18e3b71628adc988b68de19fb51f19b87855bd54612bd9c4f1753dc1e6f5cd85fa6bb42d4a165ab347608d95c8963707a4aea1c54d4
+DIST got-portable-0.86.tar.gz 1034905 BLAKE2B f04eaa87fb3dfd0c2bf8e9d4557c5f7d5b75c601744fb6be2622e8d3ba67702ed5c9f45117f57c60fedb86dfb6c2ebb63596dc53182fa6410639e0a3a038c11b SHA512 adc40c9197b18cdb78bdd962e962ebe2b120552377ad3d9a92acae77182939c06e7cd386bc0b7f4b0970752a9ea9736eb4af98096be7062fa12630dd9f452b4b
diff --git a/dev-vcs/got/got-0.84.1.ebuild b/dev-vcs/got/got-0.86.ebuild
similarity index 100%
rename from dev-vcs/got/got-0.84.1.ebuild
rename to dev-vcs/got/got-0.86.ebuild
diff --git a/profiles/updates/1Q-2023 b/profiles/updates/1Q-2023
index 01d87543ba..7764488ac3 100644
--- a/profiles/updates/1Q-2023
+++ b/profiles/updates/1Q-2023
@@ -2,3 +2,4 @@ move dev-python/dropbox-sdk-python dev-python/dropbox
move dev-python/sre_yield dev-python/sre-yield
move dev-python/http_ece dev-python/http-ece
move dev-util/psautohint dev-python/psautohint
+move dev-python/factory_boy dev-python/factory-boy
diff --git a/profiles/updates/2Q-2022 b/profiles/updates/2Q-2022
index d87ae538c9..d954554124 100644
--- a/profiles/updates/2Q-2022
+++ b/profiles/updates/2Q-2022
@@ -2,7 +2,6 @@ move app-misc/ssmtool app-misc/vocabsieve
move sci-mathematics/libpotassco sci-libs/libpotassco
move media-video/mpv_thumbnail_script mpv-plugin/mpv_thumbnail_script
move media-video/mpv-mpris mpv-plugin/mpv-mpris
-move net-misc/bee-node net-misc/bee
move kde-misc/skanpage media-gfx/skanpage
move sys-cluster/KVTree dev-libs/KVTree
move sys-cluster/shuffile dev-libs/shuffile
diff --git a/sys-fs/ufiformat/ufiformat-0.9.9.ebuild b/sys-fs/ufiformat/ufiformat-0.9.9.ebuild
index e0bf3984aa..8e97e31037 100644
--- a/sys-fs/ufiformat/ufiformat-0.9.9.ebuild
+++ b/sys-fs/ufiformat/ufiformat-0.9.9.ebuild
@@ -15,3 +15,7 @@ IUSE=""
RDEPEND="sys-fs/e2fsprogs"
DEPEND=${RDEPEND}
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+ makedev
+)