diff --git a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.6.0.ebuild b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.6.0.ebuild
index 1ea60c7873..f355a0ba66 100644
--- a/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.6.0.ebuild
+++ b/dev-python/sphinxcontrib-katex/sphinxcontrib-katex-0.6.0.ebuild
@@ -14,12 +14,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# avoid circular dependency with sphinx
-PDEPEND=">=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
 
 DOCS=( "CONTRIBUTING.rst" "README.rst" )
 
+distutils_enable_sphinx docs
+
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50-r1.ebuild
similarity index 99%
rename from sci-geosciences/geographiclib/geographiclib-1.50.ebuild
rename to sci-geosciences/geographiclib/geographiclib-1.50-r1.ebuild
index 023dc9884d..e05ee127bf 100644
--- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
+++ b/sci-geosciences/geographiclib/geographiclib-1.50-r1.ebuild
@@ -138,7 +138,7 @@ src_configure() {
 	use precision_quad		&& precision="4"
 	use precision_single		&& precision="1"
 
-	export GEODATAPATH="/usr/share/${P}"
+	export GEODATAPATH="/usr/share/${PN}"
 
 	local mycmakeargs=(
 		-DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF)
diff --git a/www-apps/twint/Manifest b/www-apps/twint/Manifest
new file mode 100644
index 0000000000..67f852ae9f
--- /dev/null
+++ b/www-apps/twint/Manifest
@@ -0,0 +1 @@
+DIST twint-2.1.18.tar.gz 33213 BLAKE2B 74d8634ad178b40af726347ee144766bc5ae2480842ad617739a12ed469bf7692247bdc4dc5d979a081b88a223ce2649924cf89a6c0ff77acd10142f2290865c SHA512 0060d5f496bd19e74e72243ce83202204eacd28b57db7440ae83d112c96ea962512adf12e590e0843cf5231b1922cfcc943725aaeb2ab31127522be26e7fc9a7
diff --git a/www-apps/twint/metadata.xml b/www-apps/twint/metadata.xml
new file mode 100644
index 0000000000..c62db26406
--- /dev/null
+++ b/www-apps/twint/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <longdescription>
+    No authentication. No API. No limits.
+
+Twint is an advanced Twitter scraping tool written in Python that allows for scraping Tweets from Twitter profiles without using Twitter's API.
+
+Twint utilizes Twitter's search operators to let you scrape Tweets from specific users, scrape Tweets relating to certain topics, hashtags &amp; trends, or sort out sensitive information from Tweets like e-mail and phone numbers. I find this very useful, and you can get really creative with it too.
+
+Twint also makes special queries to Twitter allowing you to also scrape a Twitter user's followers, Tweets a user has liked, and who they follow without any authentication, API, Selenium, or browser emulation.
+tl;dr Benefits
+
+Some of the benefits of using Twint vs Twitter API:
+
+    Can fetch almost all Tweets (Twitter API limits to last 3200 Tweets only);
+    Fast initial setup;
+    Can be used anonymously and without Twitter sign up;
+    No rate limitations.
+
+Limits imposed by Twitter
+
+Twitter limits scrolls while browsing the user timeline. This means that with .Profile or with .Favorites you will be able to get ~3200 tweets.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">twintproject/twint</remote-id>
+    <remote-id type="pypi">twint</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-apps/twint/twint-2.1.18.ebuild b/www-apps/twint/twint-2.1.18.ebuild
new file mode 100644
index 0000000000..0a311419e4
--- /dev/null
+++ b/www-apps/twint/twint-2.1.18.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Twitter scraping & OSINT tool written in Python that doesn't use Twitter's API"
+HOMEPAGE="
+	https://github.com/twintproject/twint
+	https://pypi.org/project/twint
+"
+SRC_URI="https://github.com/twintproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+#tests require network
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/cchardet[${PYTHON_USEDEP}]
+	dev-python/elasticsearch-py[${PYTHON_USEDEP}]
+	dev-python/fake-useragent[${PYTHON_USEDEP}]
+	dev-python/geopy[${PYTHON_USEDEP}]
+	dev-python/googletransx[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/schedule[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" test.py -v || die
+}