diff --git a/dev-python/hass-nabucasa/Manifest b/dev-python/hass-nabucasa/Manifest
index e254ac8ea..ab7b10d71 100644
--- a/dev-python/hass-nabucasa/Manifest
+++ b/dev-python/hass-nabucasa/Manifest
@@ -1,11 +1,7 @@
 DIST hass-nabucasa-0.10.tar.gz 15549 BLAKE2B 5a9bfc11a05ddf2a6a79a6406e7eb9206f7e3262cae20f0d3149eea71e7222969c75efe6358c76b158dbd94b9954e7afd59a984d1d68374b5476726ae83cea6a SHA512 6fdc3b1a80e3e4fd2557d2006d129aa4d880d8ccef55aac3d38b2400fe7110a61813b58985c8cb4cddf0c31ec2c8ae9399148bc4eee139f46a1ebfdc545af3ca
 DIST hass-nabucasa-0.11.tar.gz 15554 BLAKE2B f99f94feac5e25aaff3840efb97003096805e6154a76cee50d196231a80ca6e07ac24087a3667e5c783260d2703cd85dcc00fedfa676646c306fe98fa52317de SHA512 cb6450fa29c6c35c5022f936a223ef73e3f0303fce11b8171a9868c2c2b852d93ccc83112660a542f65405cab10fb41507cd1465cccd5e34fe64eea8c9ac6807
 DIST hass-nabucasa-0.12.tar.gz 15592 BLAKE2B 03af0bf2218cb74b43489b1274e7b1fc63dc827936afd1904c5d3d5ebffaddb1dfc3eb8d7a9cdcf4164b3c5b37a1fb4ae7591be89c5951f379a34f853fddb761 SHA512 1240dc5f63b0624fd2137375ca8d5af27300a601163a782a4698a68e14378c23c244c136fe0b9b5e23f038602bd7027ede4b03a09220139d4936ba1231eae392
-DIST hass-nabucasa-0.7.tar.gz 15360 BLAKE2B b4c304ae73171d1a0ec66ef558cf91ee4aad082f0161ab62d8240c81d1f812bcab9b47eae023119a6d4e3006841709b1fed5f803048486eb0a966439eb067159 SHA512 67b21a31bec5ce715f8a56179cea45cd5791d6457a22ad6badf66b83ed5371082d453fa8710b5c11fe99aa17e2ddae782a731ed4ab9d37e985685d42d7352fd5
-DIST hass-nabucasa-0.8.tar.gz 15399 BLAKE2B 722ad3ca682fca4f0c91a4ae8ee44faa10bd97488d2c8651ead3b8022166c75e1aaea3e36ccd6f93823260b3a2a157217adbfce67373ac51c93dbc25bc0fde5a SHA512 2b9cde1c09a7f29a687a63dccd464d0cefbe9733387be41a52f700ce2c059e1f9c5764ce8d0e82fa3c88c8c9a8454ce10c5a50fac2fa5c3dc5829082e8a9fa3f
-EBUILD hass-nabucasa-0.10.ebuild 719 BLAKE2B 317b373a6d6dfc0e5ee033300ed61eee2f7cded85587d4495f0536ce232462251b0583b5305c98d363cd975633bb6e9cc6fbee40e8fdd18ba839f735003e30ae SHA512 b289b347b73cebf03ca6a2a2c2aab14a97cd74c2144c5d1541d21dc7c104a3ebf9732c05be83951a275d6562c2fab32238528336789c572d29fd0ad1b498cfef
-EBUILD hass-nabucasa-0.11.ebuild 719 BLAKE2B 317b373a6d6dfc0e5ee033300ed61eee2f7cded85587d4495f0536ce232462251b0583b5305c98d363cd975633bb6e9cc6fbee40e8fdd18ba839f735003e30ae SHA512 b289b347b73cebf03ca6a2a2c2aab14a97cd74c2144c5d1541d21dc7c104a3ebf9732c05be83951a275d6562c2fab32238528336789c572d29fd0ad1b498cfef
-EBUILD hass-nabucasa-0.12.ebuild 719 BLAKE2B 317b373a6d6dfc0e5ee033300ed61eee2f7cded85587d4495f0536ce232462251b0583b5305c98d363cd975633bb6e9cc6fbee40e8fdd18ba839f735003e30ae SHA512 b289b347b73cebf03ca6a2a2c2aab14a97cd74c2144c5d1541d21dc7c104a3ebf9732c05be83951a275d6562c2fab32238528336789c572d29fd0ad1b498cfef
-EBUILD hass-nabucasa-0.7.ebuild 719 BLAKE2B 317b373a6d6dfc0e5ee033300ed61eee2f7cded85587d4495f0536ce232462251b0583b5305c98d363cd975633bb6e9cc6fbee40e8fdd18ba839f735003e30ae SHA512 b289b347b73cebf03ca6a2a2c2aab14a97cd74c2144c5d1541d21dc7c104a3ebf9732c05be83951a275d6562c2fab32238528336789c572d29fd0ad1b498cfef
-EBUILD hass-nabucasa-0.8.ebuild 719 BLAKE2B 317b373a6d6dfc0e5ee033300ed61eee2f7cded85587d4495f0536ce232462251b0583b5305c98d363cd975633bb6e9cc6fbee40e8fdd18ba839f735003e30ae SHA512 b289b347b73cebf03ca6a2a2c2aab14a97cd74c2144c5d1541d21dc7c104a3ebf9732c05be83951a275d6562c2fab32238528336789c572d29fd0ad1b498cfef
+EBUILD hass-nabucasa-0.10.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
+EBUILD hass-nabucasa-0.11.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
+EBUILD hass-nabucasa-0.12.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
 MISC metadata.xml 471 BLAKE2B 6372982274560c38a8e99fcd6f67722d4366511329e6e6578246f6a5b8744e152fa165526cc780846380c3e9b9332475618c67adad49b41bd09b3df884db898a SHA512 91f30e1aabd695abae432bc0421d4adbaf8be3f5b0a3520bc6e49d5dbf9ab95243e5ffa936eec69aa5afaacbfeaa38b330a373e11d801026993728c147d6caa1
diff --git a/dev-python/hass-nabucasa/hass-nabucasa-0.10.ebuild b/dev-python/hass-nabucasa/hass-nabucasa-0.10.ebuild
index abe56e6a6..8ccf40bb5 100644
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.10.ebuild
+++ b/dev-python/hass-nabucasa/hass-nabucasa-0.10.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Home Assistant cloud integration by Nabu Casa, inc."
 HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/hass-nabucasa/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="GPL v3"
+LICENSE="GPL-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/hass-nabucasa/hass-nabucasa-0.11.ebuild b/dev-python/hass-nabucasa/hass-nabucasa-0.11.ebuild
index abe56e6a6..8ccf40bb5 100644
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.11.ebuild
+++ b/dev-python/hass-nabucasa/hass-nabucasa-0.11.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Home Assistant cloud integration by Nabu Casa, inc."
 HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/hass-nabucasa/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="GPL v3"
+LICENSE="GPL-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/hass-nabucasa/hass-nabucasa-0.12.ebuild b/dev-python/hass-nabucasa/hass-nabucasa-0.12.ebuild
index abe56e6a6..8ccf40bb5 100644
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.12.ebuild
+++ b/dev-python/hass-nabucasa/hass-nabucasa-0.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Home Assistant cloud integration by Nabu Casa, inc."
 HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/hass-nabucasa/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="GPL v3"
+LICENSE="GPL-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
diff --git a/dev-python/hass-nabucasa/hass-nabucasa-0.7.ebuild b/dev-python/hass-nabucasa/hass-nabucasa-0.7.ebuild
deleted file mode 100644
index abe56e6a6..000000000
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.7.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="Home Assistant cloud integration by Nabu Casa, inc."
-HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/hass-nabucasa/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL v3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-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/hass-nabucasa/hass-nabucasa-0.8.ebuild b/dev-python/hass-nabucasa/hass-nabucasa-0.8.ebuild
deleted file mode 100644
index abe56e6a6..000000000
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.8.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="Home Assistant cloud integration by Nabu Casa, inc."
-HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/hass-nabucasa/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL v3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-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
-}