diff --git a/app-i18n/weblate-cli/weblate-cli-1.13.ebuild b/app-i18n/weblate-cli/weblate-cli-1.13.ebuild
index 94136ca..d6ca130 100644
--- a/app-i18n/weblate-cli/weblate-cli-1.13.ebuild
+++ b/app-i18n/weblate-cli/weblate-cli-1.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit distutils-r1
 
@@ -30,7 +30,6 @@ RDEPEND="
 "
 S="${WORKDIR}/wlc-${PV}"
 
-
 python_test() {
 	distutils_install_for_testing
 	py.test -v
diff --git a/games-engines/fheroes2/Manifest b/games-engines/fheroes2/Manifest
index ecae93a..8488d31 100644
--- a/games-engines/fheroes2/Manifest
+++ b/games-engines/fheroes2/Manifest
@@ -1 +1 @@
-DIST 1.0.0.tar.gz 10928987 BLAKE2B 4578bcc0c996106a74cd1652af430982d0162c16e9c50f04222e9f7ad57fe07a520ed9aa9eee017a323daf737f40f5b13f9e87ce766cea7843b339b1067958fc SHA512 b58091cbb67cc6dc1b1e7c40a38780886b2cf4af2da6aadc12a2b78265d3c7d289264f9c479c597adf3f7325de730d4a8d97976fd601f309904110b5a409f32c
+DIST fheroes2-1.0.0.tar.gz 10928987 BLAKE2B 4578bcc0c996106a74cd1652af430982d0162c16e9c50f04222e9f7ad57fe07a520ed9aa9eee017a323daf737f40f5b13f9e87ce766cea7843b339b1067958fc SHA512 b58091cbb67cc6dc1b1e7c40a38780886b2cf4af2da6aadc12a2b78265d3c7d289264f9c479c597adf3f7325de730d4a8d97976fd601f309904110b5a409f32c
diff --git a/games-engines/fheroes2/fheroes2-1.0.0.ebuild b/games-engines/fheroes2/fheroes2-1.0.0.ebuild
index b9762a6..e7d32ef 100644
--- a/games-engines/fheroes2/fheroes2-1.0.0.ebuild
+++ b/games-engines/fheroes2/fheroes2-1.0.0.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 DESCRIPTION="Recreation of the Heroes of Might and Magic II game engine"
 HOMEPAGE="https://ihhub.github.io/fheroes2/"
-SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz"
+SRC_URI="https://github.com/ihhub/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPLv2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/games-engines/fheroes2/metadata.xml b/games-engines/fheroes2/metadata.xml
index 6f49eba..5427746 100644
--- a/games-engines/fheroes2/metadata.xml
+++ b/games-engines/fheroes2/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<upstream><remote-id type="github">ihhub/fheroes2</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-libs/zrtpcpp/metadata.xml b/net-libs/zrtpcpp/metadata.xml
index 4e8381f..1adbefe 100644
--- a/net-libs/zrtpcpp/metadata.xml
+++ b/net-libs/zrtpcpp/metadata.xml
@@ -13,4 +13,7 @@
        The GNU ZRTP implementation is compliant to RFC 6189 and adds some
     more algorithms.
    </longdescription>
+   <upstream>
+      <remote-id type="github">wernerd/ZRTPCPP</remote-id>
+   </upstream>
 </pkgmetadata>
diff --git a/net-libs/zrtpcpp/zrtpcpp-4.7.0.ebuild b/net-libs/zrtpcpp/zrtpcpp-4.7.0.ebuild
index e2db21f..cd517c2 100644
--- a/net-libs/zrtpcpp/zrtpcpp-4.7.0.ebuild
+++ b/net-libs/zrtpcpp/zrtpcpp-4.7.0.ebuild
@@ -23,8 +23,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-bool-fix.patch" 
+PATCHES=( "${FILESDIR}/${P}-bool-fix.patch"
 		  "${FILESDIR}/${P}-no-git-commit.patch" )
 
 S="${WORKDIR}/${P^^}"
-
diff --git a/net-voip/twinkle/Manifest b/net-voip/twinkle/Manifest
index fb6e2d4..a28492d 100644
--- a/net-voip/twinkle/Manifest
+++ b/net-voip/twinkle/Manifest
@@ -1,2 +1 @@
-DIST twinkle-1.10.2.tar.gz 1196846 BLAKE2B 52cfa4f1d31b040db46edadccc43431d04fe71036821a1ef0c5b8803bf7ccf2fcd1d15a8340e583d049c588290a85c8ee07c6738adc599d164f7f606b2f34dc1 SHA512 a6da59a0d38d54def2bc27aa3792f43ea534793482ce0dddf2f21b6d6023f55572eda8f5747e56b7df98a8a244706485d70469603247404b45990f578ae34bfb
 DIST twinkle-1.10.3.tar.gz 1196890 BLAKE2B 80b2e91923b2a95d1b727cda5f8ea68c0aac421ea347e7b899a28b9908c3c5c2806a3b11cec9d46002d08c8bcf89221b3fcd56408ec68e191c1f78b67b13bbc4 SHA512 7b70a346e6d3f1dd08c1d019dd671da3cb3539815d8a14de7268b2bf43fc0b632834e00d3b63823b1338472a1b91f727a479e5381da8b1076327b112c8a9bea2
diff --git a/net-voip/twinkle/metadata.xml b/net-voip/twinkle/metadata.xml
index 748139e..c3b4731 100644
--- a/net-voip/twinkle/metadata.xml
+++ b/net-voip/twinkle/metadata.xml
@@ -13,11 +13,11 @@
 		Twinkle is a SIP-based VoIP client, ported to Qt5.
 	</longdescription>
 	<use>
-			<flag name="diamondcard"></flag>
+			<flag name="diamondcard">Diamondcard.us VOIP Service</flag>
 			<flag name="g729">G.729 codec</flag>
-			<flag name="ilbc"></flag>
+			<flag name="ilbc">iLBC codec</flag>
 			<flag name="zrtp">RTP compression</flag>
-	</use> 
+	</use>
 	<upstream>
 		<remote-id type="github">LubosD/twinkle</remote-id>
 	</upstream>
diff --git a/net-voip/twinkle/twinkle-1.10.2.ebuild b/net-voip/twinkle/twinkle-1.10.2.ebuild
deleted file mode 100644
index a220b6f..0000000
--- a/net-voip/twinkle/twinkle-1.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit  cmake
-
-DESCRIPTION="Softphone for VoIP communcations using SIP protocol"
-HOMEPAGE="http://twinkle.dolezel.info/"
-SRC_URI="https://github.com/LubosD/twinkle/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa diamondcard g729 speex +qt5"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/ucommon
-	media-libs/fontconfig
-	media-libs/libsndfile
-	net-libs/ccrtp
-	alsa? ( media-libs/alsa-lib )
-	g729? ( media-libs/bcg729 )
-	speex? ( media-libs/speex )"
-
-#	zrtp? ( net-libs/libzrtpcpp )
-#	ilbc? ( dev-libs/ilbc-rfc3951 )
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-
-	local mycmakeargs=(
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DIAMONDCARD=$(usex diamondcard)
-		-DWITH_G729=$(usex g729)
-		-DWITH_ILBC=$(usex ilbc)
-		-DWITH_QT5=$(usex qt5)
-		-DWITH_SPEEX=$(usex speex)
-	)
-	cmake_src_configure
-}