diff --git a/app-misc/gomatrix/Manifest b/app-misc/gomatrix/Manifest
index 0b27813..7930a02 100644
--- a/app-misc/gomatrix/Manifest
+++ b/app-misc/gomatrix/Manifest
@@ -1,18 +1,2 @@
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
-DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
-DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
-DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.zip 73484 BLAKE2B f672190275344f13b69502306133f6d009fe380f079ff20aa18366ba790ba6bdac3bfec7e7c27d8da21a463a5adf3a0a5d7bee2a08cbd12d9f7c8fff2450fe55 SHA512 a66fd5693b4a57cbb994d48bbde37ad226f57bb73a0bad7da5e5763af5826795bc282d2fb23e60565286223050d4f2c2a5cab9bf7ef646cb571f4d844dfc2749
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST gomatrix-0.0.1_p20200420-r2-deps.tar.xz 12516804 BLAKE2B 9a4a9c695a1185e3b84c300383ca313994ba206a1e1a12856f9616070508d2fb49d09fa2487aec23aa4ca6716fce1a00bc3c415b19e9d84369c5329df6270da8 SHA512 8f8f28770758fe5364f343951f2b09808c8e996b32238f3b634891520c6d9cbb534cc5ae3582ef664d677912b511a155c2d49797520adb29d9ef7b1895ef2dcc
 DIST gomatrix-0.0.1_p20200420.tar.gz 7000 BLAKE2B ba58f3c4840dd4ac6e8d8fc2d89d4308e87efcfb9efa6583f90284d04319ad29a73a27abfc6d62d29393918d4d64732087f033412836f47aff6f9fdf085d83f5 SHA512 5bf7fa9484802172ea2df1e7679350faf83697cb47b78d2f4f1b8b49fbfae6d1c05d780bc8c0b3356587914e6db1e723722039bd15e5888e5a893d46d1b97810
diff --git a/app-misc/gomatrix/gomatrix-0.0.1_p20200420-r1.ebuild b/app-misc/gomatrix/gomatrix-0.0.1_p20200420-r2.ebuild
similarity index 62%
rename from app-misc/gomatrix/gomatrix-0.0.1_p20200420-r1.ebuild
rename to app-misc/gomatrix/gomatrix-0.0.1_p20200420-r2.ebuild
index 6c7ddad..fff0829 100644
--- a/app-misc/gomatrix/gomatrix-0.0.1_p20200420-r1.ebuild
+++ b/app-misc/gomatrix/gomatrix-0.0.1_p20200420-r2.ebuild
@@ -1,31 +1,10 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 inherit go-module
 
-EGO_SUM=(
-	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/gdamore/encoding v1.0.0"
-	"github.com/gdamore/encoding v1.0.0/go.mod"
-	"github.com/gdamore/tcell v1.3.0"
-	"github.com/gdamore/tcell v1.3.0/go.mod"
-	"github.com/jessevdk/go-flags v1.4.0"
-	"github.com/jessevdk/go-flags v1.4.0/go.mod"
-	"github.com/lucasb-eyer/go-colorful v1.0.2"
-	"github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
-	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-)
-go-module_set_globals
-
 DESCRIPTION="Connect to The Matrix and display it's data streams in your terminal"
 HOMEPAGE="https://github.com/GeertJohan/gomatrix"
 
@@ -35,13 +14,13 @@ COMMIT_ID="b3aff13d5fde12c75cdc506215b9db9f4c7ee7dc"
 if [[ ${PV} == *_p* ]]; then
 	SRC_URI="
 		https://${EGO_PN}/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}
+		https://files.holgersson.xyz/gentoo/distfiles/${P}-r2-deps.tar.xz
 	"
 	S="${WORKDIR}/${PN}-${COMMIT_ID}"
 else
 	SRC_URI="
 		https://${EGO_PN}/archive/v${PV}.tar.gz
-		${EGO_SUM_SRC_URI}
+		https://files.holgersson.xyz/gentoo/distfiles/${P}-r2-deps.tar.xz
 	"
 fi