diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest
index 08f9b68e91..f863f69fe7 100644
--- a/dev-python/graphene/Manifest
+++ b/dev-python/graphene/Manifest
@@ -1 +1 @@
-DIST graphene-2.1.8.tar.gz 102179 BLAKE2B 45c61f0f5965828f4b623a1a78678afdd9ef180c0ac83ff6d13ac4385479a787166e7401d75b4314cd125c623ebab7f43337fe2b00db471c1c8751177ca8b264 SHA512 238108c2047b9942de22f21b90581bbda42fb85ee3588ed5d4a26bd54784a6a71407c7a4e8308726ab22b6a62317e94253a60d1771272969e00e0097f3614d51
+DIST graphene-3.0.0_beta3.tar.gz 108606 BLAKE2B 20b1af8400b1fe3721eafb1ce6884702653c58931933d0e3d6058180c115b48bf00a59cc7b6feb61648e9a85195033d0b0ff8c7e4e44822c77b1904cfc3c3b45 SHA512 65b920e5d10d080678df5c9a57d173baab421a3d2c676d943fb3e25fe596cc3623ddb6987322dbdc47d3b299e8f4363e4136bdcd2df0af3c1cf4117e7bb18375
diff --git a/dev-python/graphene/graphene-2.1.8.ebuild b/dev-python/graphene/graphene-3.0.0_beta3.ebuild
similarity index 63%
rename from dev-python/graphene/graphene-2.1.8.ebuild
rename to dev-python/graphene/graphene-3.0.0_beta3.ebuild
index 52cadcadf3..d13504753a 100644
--- a/dev-python/graphene/graphene-2.1.8.ebuild
+++ b/dev-python/graphene/graphene-3.0.0_beta3.ebuild
@@ -7,39 +7,38 @@ PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
+MYPV="${PV/_beta/b}"
+MYP="${PN}-${MYPV}"
+
 DESCRIPTION="GraphQL Framework for Python"
 HOMEPAGE="https://github.com/graphql-python/graphene"
-SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# We need newer graphql-core
-RESTRICT="test"
-
 RDEPEND="
 	dev-python/aniso8601[${PYTHON_USEDEP}]
 	dev-python/graphql-core[${PYTHON_USEDEP}]
 	dev-python/graphql-relay[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]"
+	dev-python/unidecode[${PYTHON_USEDEP}]
+"
 
 DEPEND="test? (
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	dev-python/promises[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/promises[${PYTHON_USEDEP}]
+	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/iso8601[${PYTHON_USEDEP}] )"
+	dev-python/snapshottest[${PYTHON_USEDEP}]
+)"
 
-python_prepare_all() {
-	# Package installs 'examples' package which is forbidden and likely a bug in the build system.
-	rm -r examples || die
-
-	distutils-r1_python_prepare_all
-}
+S="${WORKDIR}/${MYP}"
 
 distutils_enable_tests pytest
 # ModuleNotFoundError: No module named 'sphinx_graphene_theme'
-# There is a github, but no releases at the moment
+# There is a archived github, but no releases at the moment
 #distutils_enable_sphinx docs
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
new file mode 100644
index 0000000000..725f60e9be
--- /dev/null
+++ b/dev-python/graphql-core/Manifest
@@ -0,0 +1 @@
+DIST graphql-core-3.1.1.tar.gz 481087 BLAKE2B e7bf05f4da9aa1c37acf802b830c05427a3f10fd36a716f194bb21ba3812ae5322534c67b692135a901f23dd48d46fe404a46b2b90cc7ee3862241a6381fd405 SHA512 62bef44d7d73eff1f1dc05e169fd765d4ea4d9716bbde26bc20ee826eb4fa78bb41deed1a196c37a24d4c5aa7e7965de86bee441c4a53f0b18f0cb2364d4cdec
diff --git a/dev-python/graphql-core/graphql-core-3.1.1.ebuild b/dev-python/graphql-core/graphql-core-3.1.1.ebuild
new file mode 100644
index 0000000000..b76518b39e
--- /dev/null
+++ b/dev-python/graphql-core/graphql-core-3.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="GraphQL for Python"
+HOMEPAGE="https://github.com/graphql-python/graphql-core"
+SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+	dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/graphql-core/metadata.xml b/dev-python/graphql-core/metadata.xml
new file mode 100644
index 0000000000..a0a60d7147
--- /dev/null
+++ b/dev-python/graphql-core/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild b/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild
index 03c65f4b88..cee3add124 100644
--- a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild
+++ b/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,9 +15,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# most likely we need a newer version of graphql-core
-RESTRICT="test"
+BDEPEND="test? (
+	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+)"
 
-RDEPEND="dev-python/graphql-core[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/graphql-core[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.13.4.ebuild b/dev-python/starlette/starlette-0.13.4.ebuild
index 84b0d96a0f..d337b9756c 100644
--- a/dev-python/starlette/starlette-0.13.4.ebuild
+++ b/dev-python/starlette/starlette-0.13.4.ebuild
@@ -22,13 +22,13 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="doc"
-
-# ModuleNotFoundError: No module named 'graphql.pyutils.compat'
-# We need newer graphql-core
+# ModuleNotFoundError: No module named 'graphql.execution.executors'
+# Now graphql is at the newest version and this still doesn't work :(
+# though there are less errors now
 RESTRICT="test"
 
 DEPEND="test? (
+	dev-python/aiosqlite[${PYTHON_USEDEP}]
 	dev-python/aiofiles[${PYTHON_USEDEP}]
 	dev-python/black[${PYTHON_USEDEP}]
 	dev-python/databases[${PYTHON_USEDEP}]
@@ -40,7 +40,8 @@ DEPEND="test? (
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/sse-starlette[${PYTHON_USEDEP}]
 	dev-python/ujson[${PYTHON_USEDEP}]
-	dev-python/graphene[${PYTHON_USEDEP}] )"
+	dev-python/graphene[${PYTHON_USEDEP}]
+)"
 
 python_prepare_all() {
 	# do not install LICENSE to /usr/
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index ab18c1dfa6..0acf5973f6 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1 +1 @@
-DIST flatpak-1.8.0.tar.xz 1401336 BLAKE2B d606e56abf3e2db98b4a38e3dd5bf64bcf4a9aa818fcd32fa27c9fad94d7df222853910efea8fa66549c581d00f890b619f2379553777339a1132a03c1415681 SHA512 2955eadddcea2baecb36b45a638a33735a934641dd99793d22d7193d58ffd02910ae1239d9450f9b4c5bf648e6aa0f29efcc17a2bc7bd26936a9ea7b53af3f72
+DIST flatpak-1.8.1.tar.xz 1423484 BLAKE2B 74ae70668f02c99f97d2239d12f12b0a6cd403c9920b2edd3dae5119bdae3095d743fb416a3a9ebdd71a3e9b8232755b1a4813934e541d874cba0b811d6f7041 SHA512 37c1b1a4c64cae06f94d6e2c9715c8db996fc66574abbc0d2f41d695e36e5ff8812121c1a704f4fb20b552ff9af8125314e4436b15a85f86dba2053c5ed477d8
diff --git a/sys-apps/flatpak/flatpak-1.8.0.ebuild b/sys-apps/flatpak/flatpak-1.8.1.ebuild
similarity index 100%
rename from sys-apps/flatpak/flatpak-1.8.0.ebuild
rename to sys-apps/flatpak/flatpak-1.8.1.ebuild