diff --git a/dev-util/mobsf/metadata.xml b/dev-util/mobsf/metadata.xml
new file mode 100644
index 000000000..a60681b78
--- /dev/null
+++ b/dev-util/mobsf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="genymotion">Add <pkg>app-emulation/genymotion-bin</pkg> support</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/mobsf/mobsf-3.0.1.ebuild b/dev-util/mobsf/mobsf-3.0.1.ebuild
index 15f827ef3..3a787cfb3 100644
--- a/dev-util/mobsf/mobsf-3.0.1.ebuild
+++ b/dev-util/mobsf/mobsf-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1
 
@@ -21,37 +21,44 @@ SLOT="0"
 #Dynamic Analysis or genymotion
 IUSE="genymotion pdf"
 
-RDEPEND="
-	dev-python/django[${PYTHON_USEDEP}]
-	pdf? ( dev-python/pdfkit[${PYTHON_USEDEP}] )
-	dev-util/androguard[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	dev-python/biplist[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/macholib[${PYTHON_USEDEP}]
-	dev-python/google-play-scraper[${PYTHON_USEDEP}]
-	dev-python/whitenoise[${PYTHON_USEDEP}]
-	dev-python/waitress[${PYTHON_USEDEP}]
-	dev-python/frida-python[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/shelljob[${PYTHON_USEDEP}]
-	dev-python/asn1crypto[${PYTHON_USEDEP}]
-	dev-python/oscrypto[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/apkid[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/http-tools[${PYTHON_USEDEP}]
-	dev-python/yara-python[${PYTHON_USEDEP}]
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/django[${PYTHON_MULTI_USEDEP}]
+		dev-util/androguard[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/rsa[${PYTHON_MULTI_USEDEP}]
+		dev-python/biplist[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		dev-python/colorlog[${PYTHON_MULTI_USEDEP}]
+		dev-python/macholib[${PYTHON_MULTI_USEDEP}]
+		dev-python/google-play-scraper[${PYTHON_MULTI_USEDEP}]
+		dev-python/whitenoise[${PYTHON_MULTI_USEDEP}]
+		dev-python/waitress[${PYTHON_MULTI_USEDEP}]
+		dev-python/frida-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+		dev-python/shelljob[${PYTHON_MULTI_USEDEP}]
+		dev-python/asn1crypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/oscrypto[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/apkid[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyparsing[${PYTHON_MULTI_USEDEP}]
+		dev-python/http-tools[${PYTHON_MULTI_USEDEP}]
+		dev-python/yara-python[${PYTHON_MULTI_USEDEP}]
+	')
+	pdf? ( $(python_gen_cond_dep 'dev-python/pdfkit[${PYTHON_MULTI_USEDEP}]') )
 	www-servers/gunicorn
 	genymotion? ( app-emulation/genymotion-bin )"
+
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 pkg_postinst() {
 	einfo "https://github.com/MobSF/Mobile-Security-Framework-MobSF/wiki/1.-Documentation"
 	einfo " gunicorn -b 0.0.0.0:8000 MobSF.wsgi:application --workers=1"