diff --git a/dev-python/androidtv/Manifest b/dev-python/androidtv/Manifest
index c445238e5..33d939114 100644
--- a/dev-python/androidtv/Manifest
+++ b/dev-python/androidtv/Manifest
@@ -1,11 +1,9 @@
-DIST androidtv-0.0.12.tar.gz 11104 BLAKE2B 4372c27fa54c3f267ad2a847d1b30ac0d0fa530cbdac0b750ab7d4f32cd27ef2d4ed3ff99decedb323131c57a927f38363cdd6f84d2c2324d71ce1fa6655d5b9 SHA512 b931a06f1f0d58a95a8aa812b292b5bac9a97ce0f2424fc76ae71d9f571937ab1130acc65e797bfcaeb87a45a53ffeb3084c6c20224cc189b02c16eb27822404
-DIST androidtv-0.0.14.tar.gz 11104 BLAKE2B b0838e95edd3b691fa8c0030cf7509de635fc23fb55e93358325e4fb3190c6c1ff8b3afc50bed48ad404f72338b199da741a3c76d0498d242e29c9c4fab8f082 SHA512 029ae0a8e14e4ff92cffcc7b1cb40275f096b96c27294ab5cb690400265d625053f5803d548c09c4e0fc1a482e2c7b10d449c3c0a7b91f63e666f3c22b9d7e37
 DIST androidtv-0.0.15.tar.gz 12017 BLAKE2B dce46bd104054999c1073930a1d90133a313f45d36d8ace1c1bcc18631e3742ebd72d2ee3dfdf4eefa7195a4a1f034f0d1263c98a6830a5e1caf80a5c6a73b27 SHA512 2febf7fcfa564ca07007e0a8732c395873c08471d80bc26d3a7095343c4d011191d1bf78019722eaefac8ee489439dadaa5ea7fdaef72b054019b3e562168c0c
 DIST androidtv-0.0.16.tar.gz 13004 BLAKE2B ef54ea82b1e8c56b6bd1253de4fac81d878b9aeb9630c2ff91ae25068f45da0b02ba541e5ad316fad88c82ada5810c0f93cf58f11cf1bf45b39d686731b37f5a SHA512 513860850213f637654439e8c33c12683a825b8b605ba90ac3e53d51b499165e8a03ba321034cf73e92ed976ba1f2f83bf77783fa6f42de36eb0014efa548d0a
 DIST androidtv-0.0.17.tar.gz 13150 BLAKE2B 0aa50bd261d428ae7ea0534e2bf9e8f2bee67fa21e7fedc766617d316fb124228793cbe412cbfc8e4cc731600f9f7282400d378521f4c15e0919d87d4e70ce47 SHA512 5e72616fa50f26dfad162edc4075d387576d0602dabf36104dca0e95fc3da56db54177549553007fd036a00cd9d50294f62eee8c8e6653ebde9e9040e133e566
-EBUILD androidtv-0.0.12.ebuild 755 BLAKE2B 850cdf5bce66a161cf8e24354192f14d113dd9073ccc76cbbae2dc45e0619e18490986937fb9d8c2729c47542300f0b23fa51fc89f79605d3e69ecb1206b07cc SHA512 95db5dca441646e1484b47459a5b07c6f9f0020bc97b0b1ae02231b76f57cc356cf254aa6fd1f5f98e78d7abfa991c19483a5f7f960c44d4908c56d076d3de89
-EBUILD androidtv-0.0.14.ebuild 807 BLAKE2B 81109ea94c113761a9fc44ff7de448f04e855d743b6e51e67694946f86b4d201d26a15ac0ac9c41fe9cd53dc6377e4291343863c4f84bd839c0f7564acf64616 SHA512 599c003a8cccf21de9cbf71b35ab658d593d3a2c076fdedc0cd71b56e71c64fcec244a78b17eea06d4d18ef2ab3e308c5323e99b4d426b85dfd35024a41c3899
+DIST androidtv-0.0.18.tar.gz 13365 BLAKE2B 196897cf7784908db0d8d2f63846daaf80bcc2a2522c440e9739762e7ad387efc74a4a494b8a28092aa9a64539e45cabbde4b95f97f016af91b329ef28c7b684 SHA512 182c15b1dca03dfbce7dc548e3eb9c00f04973275e64235ad5a0c521700286282fcbb75b99013bf8134f442175dcb1a7fae7f241e6325bcfc5cda784ae4154be
 EBUILD androidtv-0.0.15.ebuild 807 BLAKE2B 81109ea94c113761a9fc44ff7de448f04e855d743b6e51e67694946f86b4d201d26a15ac0ac9c41fe9cd53dc6377e4291343863c4f84bd839c0f7564acf64616 SHA512 599c003a8cccf21de9cbf71b35ab658d593d3a2c076fdedc0cd71b56e71c64fcec244a78b17eea06d4d18ef2ab3e308c5323e99b4d426b85dfd35024a41c3899
 EBUILD androidtv-0.0.16.ebuild 899 BLAKE2B af706cea47562244c94eb71ef1cab9239ed8378f76e9f553d4cb6f949ef9ec06d183a408a17f4c017ca144c9a7d230b212dd352d3d73b27726d7f4f21f1399f2 SHA512 a9f5aad9365dec0aba28ddb8a0a3948df45ae48b27ff97d076653928649479f79afa6b90391d0c5706aba4e9578b9644fb1f85ea4733e30d6af7d2c456248844
 EBUILD androidtv-0.0.17.ebuild 899 BLAKE2B af706cea47562244c94eb71ef1cab9239ed8378f76e9f553d4cb6f949ef9ec06d183a408a17f4c017ca144c9a7d230b212dd352d3d73b27726d7f4f21f1399f2 SHA512 a9f5aad9365dec0aba28ddb8a0a3948df45ae48b27ff97d076653928649479f79afa6b90391d0c5706aba4e9578b9644fb1f85ea4733e30d6af7d2c456248844
+EBUILD androidtv-0.0.18.ebuild 899 BLAKE2B af706cea47562244c94eb71ef1cab9239ed8378f76e9f553d4cb6f949ef9ec06d183a408a17f4c017ca144c9a7d230b212dd352d3d73b27726d7f4f21f1399f2 SHA512 a9f5aad9365dec0aba28ddb8a0a3948df45ae48b27ff97d076653928649479f79afa6b90391d0c5706aba4e9578b9644fb1f85ea4733e30d6af7d2c456248844
 MISC metadata.xml 474 BLAKE2B b771a17e02ae763561a8e1aa4ef700881b5a6bac845b10b23f1cad983377cdc45601e5e997314fc1ea4fac4af88df5ef1d6fa07908d142833599e781ccadf00b SHA512 99c3df1197ebb6faadf804a6ca31dd84f5a7588ec604fa52d9cfea4e263ead84655f6336dc4deda61b2af19d969bdcaa159cf3baad5230746c5461bf56b3e70f
diff --git a/dev-python/androidtv/androidtv-0.0.14.ebuild b/dev-python/androidtv/androidtv-0.0.14.ebuild
deleted file mode 100644
index 0645d8e75..000000000
--- a/dev-python/androidtv/androidtv-0.0.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
-# Distributed under the terms of the GNU General Public License v3.0
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Communicate with an Android TV or Fire TV device via ADB over a network."
-HOMEPAGE="https://github.com/JeffLIrion/python-androidtv/ https://pypi.org/project/androidtv/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-#RDEPEND="~dev-python/pure-python-adb-0.1.6[${PYTHON_USEDEP}]"
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
diff --git a/dev-python/androidtv/androidtv-0.0.12.ebuild b/dev-python/androidtv/androidtv-0.0.18.ebuild
similarity index 82%
rename from dev-python/androidtv/androidtv-0.0.12.ebuild
rename to dev-python/androidtv/androidtv-0.0.18.ebuild
index a3ca59a74..1090ef800 100644
--- a/dev-python/androidtv/androidtv-0.0.12.ebuild
+++ b/dev-python/androidtv/androidtv-0.0.18.ebuild
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
-RDEPEND=""
+RDEPEND="dev-python/rsa[${PYTHON_USEDEP}]
+		 dev-python/pure-python-adb-homeassistant[${PYTHON_USEDEP}]
+		 dev-python/adb-homeassistant[${PYTHON_USEDEP}]"
 DEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (