diff --git a/dev-python/forecast-solar/Manifest b/dev-python/forecast-solar/Manifest
index 5781cfc4f..b8a7b755f 100644
--- a/dev-python/forecast-solar/Manifest
+++ b/dev-python/forecast-solar/Manifest
@@ -1,7 +1,7 @@
 DIST forecast-solar-1.3.1.tar.gz 6104 BLAKE2B d26dd5dfdf7899e53b2ce1a7db7cf77575fb3ea15febfb15d27fd301740f4b7f0394f64ddc4572a9ce6336fbce095502958535ba1d8b3fbcfdc568e9cbf92b64 SHA512 1e413e560aa9abb0eb9fbd06666d5b1dc386b0ab36788b7e45355f5c61b720836c4d0260ffcc137f346f370af2fd0844619568155903a2bdc8f04e5268b95e2e
 DIST forecast-solar-2.0.0.tar.gz 7632 BLAKE2B 90c888e5f9db0f0cab29f50e46dfbf2e0f4b271fe276ff2d9470bbfbb8dcf39de1bf46a1315a092848aa9aad0b03e309ede9a0f7a00546079b0137c3a4a15916 SHA512 b16efb2a5a25a5f244800ca8732350621e5f15b13ef2dc4f1760cdf3931e0cf6deba287d731f1a72e7117d84884f0df9719fe4f5c6eecac98a840e56aeaed341
 DIST forecast-solar-2.1.0.tar.gz 7991 BLAKE2B 04aaf7b9ed3352fba35e631a57aef01cb64ec1abcd7d293390f116d3428dffb317491728c226c1adbb5409392fa3e735688fc62884d8370e6d28d021e3438293 SHA512 ccde071f879b64490d3237213c8b1a21b34e2d3cf8abcf50f93ef2b6e895a7864cd17a165fad6d575a2443dd0ecb08b591783dee94612be107a06e5fed47d4c9
-EBUILD forecast-solar-1.3.1.ebuild 896 BLAKE2B 4ec0a0a92edc3480b92fc99f63f23d0714bb29ca0b1c9ca943039a18db41c75263dd3687079775c88c44a142c67b04c4ef97831b45e4fdba40ce558ad9f689bc SHA512 a72b6a036e4387a8b5c11ff30e4a6aa0d20c1cda2113c90c3d7cd879d51f9258e7dee51fee4a649555ceeb7d80e59e5a5d348e96f380468f59bcb708685c38eb
-EBUILD forecast-solar-2.0.0.ebuild 896 BLAKE2B 4ec0a0a92edc3480b92fc99f63f23d0714bb29ca0b1c9ca943039a18db41c75263dd3687079775c88c44a142c67b04c4ef97831b45e4fdba40ce558ad9f689bc SHA512 a72b6a036e4387a8b5c11ff30e4a6aa0d20c1cda2113c90c3d7cd879d51f9258e7dee51fee4a649555ceeb7d80e59e5a5d348e96f380468f59bcb708685c38eb
-EBUILD forecast-solar-2.1.0.ebuild 896 BLAKE2B 4ec0a0a92edc3480b92fc99f63f23d0714bb29ca0b1c9ca943039a18db41c75263dd3687079775c88c44a142c67b04c4ef97831b45e4fdba40ce558ad9f689bc SHA512 a72b6a036e4387a8b5c11ff30e4a6aa0d20c1cda2113c90c3d7cd879d51f9258e7dee51fee4a649555ceeb7d80e59e5a5d348e96f380468f59bcb708685c38eb
+EBUILD forecast-solar-1.3.1-r1.ebuild 1029 BLAKE2B 6673056affdad5878900e9b9ca5eeeae74d82ddfc681f064e78f46274bcaac6872159976c06d09225e9b804c035da33d265624d00f42452a7905951c8a0f8767 SHA512 e0ef3cc2d3db8f6c16599c21716c56ad2265fd71f2e8717ce73764c634a783b0662e6029f7dfd8b3c0a12706b4a098e7311e0745151a45b095a55ab4e6ed6f21
+EBUILD forecast-solar-2.0.0-r1.ebuild 1029 BLAKE2B 6673056affdad5878900e9b9ca5eeeae74d82ddfc681f064e78f46274bcaac6872159976c06d09225e9b804c035da33d265624d00f42452a7905951c8a0f8767 SHA512 e0ef3cc2d3db8f6c16599c21716c56ad2265fd71f2e8717ce73764c634a783b0662e6029f7dfd8b3c0a12706b4a098e7311e0745151a45b095a55ab4e6ed6f21
+EBUILD forecast-solar-2.1.0-r1.ebuild 1027 BLAKE2B 8d9a36a90fe9f0ff272190b1e2fe0fbe04cbba4c83c70c7d8f74487a25806128bcf8f9104165693ac0f3eff8817cfae3546e5273e77f710d565a1f5ce67b613c SHA512 a45810fed5d2d5bfb2376313960f2f3f1300126935671a28e533374df16a959c297e36ae5f8bac4ab35fe51624b67ec98d05eb31364829b23250c2a0b5f6e428
 MISC metadata.xml 466 BLAKE2B 0ac64504d21cf440ee1ecc22d1fe0e062ffcda0a4fcdc47c2890da4e1741bd26565f9ade4ca7002c26b201e2fdfab39bfde27dd4bb4203145e0a73f72ef1a4ec SHA512 3016a9e60ff12aa97b120d052fb4a82282215fd0b658d0f2b134034c770fc319f12c224bf231ebf6e0781f281fb7c15f4b7593d414eb1e137298a1a7d316c92b
diff --git a/dev-python/forecast-solar/forecast-solar-1.3.1.ebuild b/dev-python/forecast-solar/forecast-solar-1.3.1-r1.ebuild
similarity index 86%
rename from dev-python/forecast-solar/forecast-solar-1.3.1.ebuild
rename to dev-python/forecast-solar/forecast-solar-1.3.1-r1.ebuild
index 05015c86f..5b295338d 100644
--- a/dev-python/forecast-solar/forecast-solar-1.3.1.ebuild
+++ b/dev-python/forecast-solar/forecast-solar-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -33,3 +33,9 @@ python_test() {
 	nosetests --verbose || die
 	py.test -v -v || die
 }
+
+# fill empty package version
+src_prepare() {
+	sed 's/os.environ.get("PACKAGE_VERSION")/"'${PV}'"/g' -i setup.py || die
+	eapply_user
+}
diff --git a/dev-python/forecast-solar/forecast-solar-2.0.0.ebuild b/dev-python/forecast-solar/forecast-solar-2.0.0-r1.ebuild
similarity index 86%
rename from dev-python/forecast-solar/forecast-solar-2.0.0.ebuild
rename to dev-python/forecast-solar/forecast-solar-2.0.0-r1.ebuild
index 05015c86f..5b295338d 100644
--- a/dev-python/forecast-solar/forecast-solar-2.0.0.ebuild
+++ b/dev-python/forecast-solar/forecast-solar-2.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -33,3 +33,9 @@ python_test() {
 	nosetests --verbose || die
 	py.test -v -v || die
 }
+
+# fill empty package version
+src_prepare() {
+	sed 's/os.environ.get("PACKAGE_VERSION")/"'${PV}'"/g' -i setup.py || die
+	eapply_user
+}
diff --git a/dev-python/forecast-solar/forecast-solar-2.1.0.ebuild b/dev-python/forecast-solar/forecast-solar-2.1.0-r1.ebuild
similarity index 80%
rename from dev-python/forecast-solar/forecast-solar-2.1.0.ebuild
rename to dev-python/forecast-solar/forecast-solar-2.1.0-r1.ebuild
index 05015c86f..937719aca 100644
--- a/dev-python/forecast-solar/forecast-solar-2.1.0.ebuild
+++ b/dev-python/forecast-solar/forecast-solar-2.1.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DOCS="README.md"
@@ -33,3 +33,9 @@ python_test() {
 	nosetests --verbose || die
 	py.test -v -v || die
 }
+
+# fill empty package version
+src_prepare() {
+	sed 's/os.environ.get("PACKAGE_VERSION")/"'${PV}'"/g' -i setup.py || die
+	eapply_user
+}