diff --git a/app-misc/ufetch/ufetch-0.1.ebuild b/app-misc/ufetch/ufetch-0.1.ebuild
index 93a83ef0a7..712b151bec 100644
--- a/app-misc/ufetch/ufetch-0.1.ebuild
+++ b/app-misc/ufetch/ufetch-0.1.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 src_install() {
 	exeinto /usr/bin &&
diff --git a/app-misc/ufetch/ufetch-0.2.ebuild b/app-misc/ufetch/ufetch-0.2.ebuild
index 93a83ef0a7..712b151bec 100644
--- a/app-misc/ufetch/ufetch-0.2.ebuild
+++ b/app-misc/ufetch/ufetch-0.2.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 src_install() {
 	exeinto /usr/bin &&
diff --git a/app-misc/ufetch/ufetch-9999.ebuild b/app-misc/ufetch/ufetch-9999.ebuild
index fa1d76a952..712b151bec 100644
--- a/app-misc/ufetch/ufetch-9999.ebuild
+++ b/app-misc/ufetch/ufetch-9999.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_REPO_URI="https://gitlab.com/jschx/${PN}"
 case "${PV}" in
 	"9999")
 		inherit git-r3
+		EGIT_REPO_URI="https://gitlab.com/jschx/ufetch.git"
 		;;
 	*)
 		P0="${PN}-v${PV}"
-		SRC_URI="${EGIT_REPO_URI}/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://gitlab.com/jschx/ufetch/-/archive/v${PV}/${P0}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P0}"
+		KEYWORDS="~amd64 ~x86"
 esac
 
 DESCRIPTION="Tiny system info for Unix-like operating systems"
-HOMEPAGE="${EGIT_REPO_URI}"
+HOMEPAGE="https://gitlab.com/jschx/ufetch"
 LICENSE="ISC"
 
+RESTRICT="mirror test"
+
 SLOT="0"
-KEYWORDS=""
 
 src_install() {
 	exeinto /usr/bin &&