diff --git a/dev-R/modelr/Manifest b/dev-R/modelr/Manifest
new file mode 100644
index 0000000000..558e1c1225
--- /dev/null
+++ b/dev-R/modelr/Manifest
@@ -0,0 +1 @@
+DIST modelr_0.1.8.tar.gz 121333 BLAKE2B 83ac7bb2c4bc1c4f0aa3560f32920a24fe91a17fe1e8daee1f887fbaba84e43903c017edf480453d1ca2ce2a7a499672870b260ddeba7d9c3c192794bde0302c SHA512 712e7e63a2f5beec3845b3e16f444a69eacd00759d51bec1428ce84907bfe42545fe0d6e592c82bc2c2dd6bce4d58ae5865225a4697fc8e35f420f3b5ed51b2b
diff --git a/dev-R/modelr/metadata.xml b/dev-R/modelr/metadata.xml
new file mode 100644
index 0000000000..60f6786499
--- /dev/null
+++ b/dev-R/modelr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>me@r0bert.dev</email>
+		<name>Robert Greener</name>
+	</maintainer>
+	<longdescription lang="en">Functions for modelling that help you seamlessly integrate modelling into a pipeline of data manipulation and visualisation.</longdescription>
+	<upstream>
+		<maintainer>
+			<name>Hadley Wickham</name>
+			<email>hadley@rstudio.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/tidyverse/modelr/issues</bugs-to>
+		<remote-id type="github">tidyverse/modelr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-R/modelr/modelr-0.1.8.ebuild b/dev-R/modelr/modelr-0.1.8.ebuild
new file mode 100644
index 0000000000..d1e1441f70
--- /dev/null
+++ b/dev-R/modelr/modelr-0.1.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit R-packages edo
+
+DESCRIPTION='Modelling Functions that Work with the Pipe'
+KEYWORDS="~amd64"
+LICENSE='GPL-3'
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+DEPEND="
+	dev-R/broom
+	dev-R/magrittr
+	>=dev-R/purrr-0.2.2
+	>=dev-R/rlang-0.2.0
+	dev-R/tibble
+	>=dev-R/tidyr-0.8.0
+	dev-R/tidyselect
+	dev-R/vctrs
+	test? (
+		dev-R/testthat
+	)
+"
+
+SUGGESTED_PACKAGES="
+	dev-R/covr
+	dev-R/ggplot2
+	dev-R/testthat
+"
+
+src_test() {
+	cd "${WORKDIR}/${P}/tests" || die
+	NOT_CRAN=true R_LIBS="${T}/R" edo Rscript --vanilla testthat.R
+}
diff --git a/dev-python/beziers/beziers-0.4.0.ebuild b/dev-python/beziers/beziers-0.4.0.ebuild
index 1913de28ec..029255587c 100644
--- a/dev-python/beziers/beziers-0.4.0.ebuild
+++ b/dev-python/beziers/beziers-0.4.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyclipper[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
+	dev-python/shapely[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/dev-python/databases/databases-0.5.3.ebuild b/dev-python/databases/databases-0.5.3.ebuild
index 27e5cb603e..29ce25bafe 100644
--- a/dev-python/databases/databases-0.5.3.ebuild
+++ b/dev-python/databases/databases-0.5.3.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 BDEPEND="test? (
 	dev-python/aiopg[${PYTHON_USEDEP}]
 	dev-python/aiosqlite[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
+	dev-python/async-timeout[${PYTHON_USEDEP}]
 	dev-python/asyncpg[${PYTHON_USEDEP}]
 	dev-python/psycopg[${PYTHON_USEDEP}]
 	dev-python/pymysql[${PYTHON_USEDEP}]
diff --git a/dev-python/grpclib/grpclib-0.4.2.ebuild b/dev-python/grpclib/grpclib-0.4.2.ebuild
index 8e70746bbd..7c1a95824f 100644
--- a/dev-python/grpclib/grpclib-0.4.2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
 		dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 		dev-python/Faker[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
index 89e9547ff0..626db12681 100644
--- a/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
+++ b/dev-python/grpclib/grpclib-0.4.3_rc2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/async_timeout[${PYTHON_USEDEP}]
+		dev-python/async-timeout[${PYTHON_USEDEP}]
 		dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
 		dev-python/Faker[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
index fb1e228a0b..9349690da4 100644
--- a/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
+++ b/dev-python/keyrings-alt/keyrings-alt-4.1.0.ebuild
@@ -27,9 +27,10 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/rst-linker \
-	dev-python/jaraco-packaging
+# dev-python/jaraco-packaging removed
+# distutils_enable_sphinx docs \
+# 	dev-python/rst-linker \
+# 	dev-python/jaraco-packaging
 
 pkg_setup() {
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
index e45bcaedcc..a7ad5881e8 100644
--- a/dev-python/persist-queue/persist-queue-0.8.0.ebuild
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 RESTRICT="test"
 
 DEPEND="
-	dev-python/dbutils[${PYTHON_USEDEP}]
+	dev-python/DBUtils[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	dev-python/pymysql[${PYTHON_USEDEP}]
 "