Adding metadata

18 files changed, 87 insertions, 232 deletions

diff --git a/dev-go/delve/delve-1.26.3.ebuild b/dev-go/delve/delve-1.26.3.ebuild
index 15f38b18b2a2..14551d050f66 100644
--- a/dev-go/delve/delve-1.26.3.ebuild
+++ b/dev-go/delve/delve-1.26.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/go-delve/delve/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT BSD BSD-2 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND=">=dev-lang/go-1.26.1"
 
diff --git a/dev-go/delve/metadata.xml b/dev-go/delve/metadata.xml
index 469eae727f6a..4a50bd6b65fc 100644
--- a/dev-go/delve/metadata.xml
+++ b/dev-go/delve/metadata.xml
@@ -9,5 +9,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="person">
+    <email>arthurzam@gentoo.org</email>
+    <name>Arthur Zamarin</name>
+  </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest
index 17af0e6d6386..7748fc26f613 100644
--- a/dev-go/go-md2man/Manifest
+++ b/dev-go/go-md2man/Manifest
@@ -1,4 +1,2 @@
-DIST go-md2man-2.0.6-deps.tar.xz 76368 BLAKE2B 010d274d5e5c20e14848e92b210b03447d11c6fe8fd728b0f148a6f2cbc9f0a7cca22217f1920e00b0f7c363bbe2c5f572fb95ce02e67e3e55175c56cbd372d9 SHA512 7abc4eb75b4a168f2269936049eaca68ecb9ed39b29e6885cddf3683daf9b439b1573848192dff98ce67b99da0d1f09ddc27261e97c8cdfeb71e09e0030876b6
-DIST go-md2man-2.0.6.tar.gz 11064 BLAKE2B fec5c061c5d1b85e3ad86563a301afd01d47f2d83ef5b97bf964f77ebbbbb19c58108ecd8caa9df1663396a13c8b178578a9b02c3c30341cea0bb9abe1d196ea SHA512 c6273040edf7e4c97851c0bfb5366ed0298e92ff1f7f4740104979f1cac17d6303b998ff75396a4264b164872886854e7dadfee3f139d76f684c1b6ca5512828
 DIST go-md2man-2.0.7-deps.tar.xz 76368 BLAKE2B 010d274d5e5c20e14848e92b210b03447d11c6fe8fd728b0f148a6f2cbc9f0a7cca22217f1920e00b0f7c363bbe2c5f572fb95ce02e67e3e55175c56cbd372d9 SHA512 7abc4eb75b4a168f2269936049eaca68ecb9ed39b29e6885cddf3683daf9b439b1573848192dff98ce67b99da0d1f09ddc27261e97c8cdfeb71e09e0030876b6
 DIST go-md2man-2.0.7.tar.gz 11337 BLAKE2B 4b82e6cff896317e555b0eb50da69e9c29b9532d115e3c9b2c5a9c98681ba2726db81bab6dc8fac95a2dc4ca32f9e99161c0a8943001863ef68191acf8fd6c09 SHA512 cc6878af3cfdb0c06ee46b39aa407ec5e48814dc8f68eeae885607407833ac263995fe61c0870217e7c2b2102904f1cf732fa210d89ba38e2443ab1436212905
diff --git a/dev-go/go-md2man/go-md2man-2.0.6.ebuild b/dev-go/go-md2man/go-md2man-2.0.6.ebuild
deleted file mode 100644
index bfe8fa049974..000000000000
--- a/dev-go/go-md2man/go-md2man-2.0.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo go-module
-
-DESCRIPTION="A utility to convert markdown to man pages"
-HOMEPAGE="https://github.com/cpuguy83/go-md2man"
-SRC_URI="https://github.com/cpuguy83/go-md2man/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~arthurzam/distfiles/dev-go/${PN}/${P}-deps.tar.xz"
-
-LICENSE="BSD-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
-
-src_compile() {
-	emake build
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin bin/go-md2man
-
-	edo "${S}"/bin/go-md2man -in go-md2man.1.md -out go-md2man.1
-	doman go-md2man.1
-}
diff --git a/dev-go/go-md2man/go-md2man-2.0.7.ebuild b/dev-go/go-md2man/go-md2man-2.0.7.ebuild
index bfe8fa049974..c3b79643a00e 100644
--- a/dev-go/go-md2man/go-md2man-2.0.7.ebuild
+++ b/dev-go/go-md2man/go-md2man-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit edo go-module
+inherit go-module sysroot
 
 DESCRIPTION="A utility to convert markdown to man pages"
 HOMEPAGE="https://github.com/cpuguy83/go-md2man"
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv ~x86"
 
 src_compile() {
 	emake build
+	sysroot_try_run_prefixed ./bin/go-md2man -in go-md2man.1.md -out go-md2man.1
 }
 
 src_test() {
@@ -24,7 +25,5 @@ src_test() {
 
 src_install() {
 	dobin bin/go-md2man
-
-	edo "${S}"/bin/go-md2man -in go-md2man.1.md -out go-md2man.1
-	doman go-md2man.1
+	[[ -s go-md2man.1 ]] && doman go-md2man.1
 }
diff --git a/dev-go/golangci-lint/Manifest b/dev-go/golangci-lint/Manifest
index 7f6b2405b0a2..b161591d4118 100644
--- a/dev-go/golangci-lint/Manifest
+++ b/dev-go/golangci-lint/Manifest
@@ -6,11 +6,3 @@ DIST golangci-lint-2.12.1-vendor.tar.xz 5661744 BLAKE2B cba88436487d9d1fa0ae9cf5
 DIST golangci-lint-2.12.1.tar.gz 5462109 BLAKE2B 28e4ee7071f8f25984710395b0923be4c48c17ed43cd783400c01adff7ad7e0c7aebe5ac92a50d31b7ced04588d6633b0239030c023af8ac8ef0ded43f4a1737 SHA512 a0800fefde4ff4eefbe718707ea12ad1d1fd745cce2eb326666afd107615efca7d4c5817320eb8e2fa07ba675c38f738dd16dfe5beeb02a887bc5ebea4a3a122
 DIST golangci-lint-2.12.2-vendor.tar.xz 5665388 BLAKE2B 15908f8da9ccf2b1ddb720b5ffc5850fde966c7a33728615283b1076856163b1f8d58173cf7397766f148975021c2d244a2ea7dd14c466972746f630f6ea6b3b SHA512 59ddec7d49b15d0b5158c2df8e3f8a19db1479aee0e344d01acc2d06685bf50125baca3793560727d25a99eef38e261671476959cb3d2b9db90cb47b11f3cbba
 DIST golangci-lint-2.12.2.tar.gz 5463246 BLAKE2B 2728946fc39d626cf5bb3c800755fbdd1cded81f64cea7b85d94900147ed9031db63b6b6193c70b8c1340110b7745697b70fd970f1e99ac267eeae83ca17c4ed SHA512 ad44c66a0620e35e86ae2ea4cf414b940fa11824bb99487978df771f10efcf963d54043242780f2b570213a0689d641371db8d4f63f633143efd3540bdf3a913
-DIST golangci-lint-2.5.0-deps.tar.xz 32920816 BLAKE2B 05cef8ad47009e81d3fc1884d86f2c868bfc2c432d0a40a89fd34d8c5a2cb150de449135566a320dd9d966acb25156ac2b18d36f292517e12e16bc8606c85a06 SHA512 0521c469e21833f88bd56d2a5cbc7c11e8870214600c3f0abb0315092f05b335dd833c81401042163f50d299ad8b24e2d0ee4d73706ed8694ea772dd896cd501
-DIST golangci-lint-2.5.0.tar.gz 5258480 BLAKE2B 9ee2cd3b5b342fae85864107c60f60d0e1174c9ce857082c13a159d8d506429413b66ec32fa39b4517988539f0aa5e3230c9efa2631e7a2203203457d6b8c778 SHA512 3260a1606beb396af244d35e34c2fa606c94023f873f12d2d97b3c0a79082b92a059cf721114845747efbb4f309c145f0967846fc2bcdbe235079b6ec1d3f92a
-DIST golangci-lint-2.6.1-deps.tar.xz 33027976 BLAKE2B bd03a908e1c522e87661ed0e30c9e8e26aae8b2ac948154cff7a509b6afa10f6f14f6c09f3bcd414c3fdcae3b27f9c1abd761bec7c7afbb7c0319f14a0e8ac00 SHA512 339a287f33efd7ec77e51144d00c2223256b5e3424f521b5329db85aacf57e72c33efd2b70679e8ba44b94d3772c5ffa61f0f50c81369d09390483e5bd2c5fb9
-DIST golangci-lint-2.6.1.tar.gz 5329109 BLAKE2B 3f8b625556bba25717b9d736e284f186f34defa80ec7edc2b2fbe2c4488b84a8e68a890ea0e56be1af87c1ecabd693c85e31efec551a1eed19faa9631f9c8f54 SHA512 9d68a40ea41c287774ede970272d7cbd8cf101bad85240e6517e9fc1b581054a6a1c45e25cb0b727b6a077136452427ecfdd9b4ec77c2c3bf32e6e1246751068
-DIST golangci-lint-2.6.2-vendor.tar.xz 5330920 BLAKE2B 0b8a5fec5d920741d55f2f7306222d3748b3a0eb993d35b41275aaa3454fae6d55421a2b7d1c411d47353eb897b21f678ae37e83fdfa82c5568c862b2c730a1e SHA512 2e8a0594bf67b8a3e47cb7c11ab10073e9bb5afe7fd9a0e852c51510c57a180daa7c1ebedd44e8be27cda8c2ce47339771f49ed6be4bf3092d074e7bb2f904ff
-DIST golangci-lint-2.6.2.tar.gz 5329919 BLAKE2B 8865bf507bd30d83a39ff4e46899287ce80127712af89df78e2b62a1af637821b792b2c14dd933627fa3c1c97e556f9be23f425241e0ee0bbf854d904bd30491 SHA512 30514f96c8a0cdd2c72985382b993307250d647720dd5b672a6af15a5b50872ed8e161452aa76f7cf03a6e9ff2a6e3ccd74c68f6efcda86bd3019c024c03fd43
-DIST golangci-lint-2.7.2-vendor.tar.xz 5348368 BLAKE2B 3ebafb6a56b8e0862b03fd6bdf8015896014efec11c358e0f54c8275978a9362449888115ddc1e85de4ae1e3da7d6d1a029d6a915a6cfaa7baa88c459c783d91 SHA512 f539444d4a5a6faedf03a34c74f390ad558066b19427c2750547cae86554cbea4925f079b2c1fcff6a03d7758711debf0c2e5c68e4b900407f0cd394d5d3993e
-DIST golangci-lint-2.7.2.tar.gz 5356800 BLAKE2B 1a92938430361a5d532f79c013925a893b3866caf3a3bbbe6be4cd59e2ae86d48333bb517a933987d18dcb66d664a807fa886dbbc8d738bf6394fe05a476572d SHA512 9450c9032f124677a94d60ff9a243f5cbcab2f5d3aeba7746f5ef7cf01274f02f3b8c9d3d534c7e333d236ac514a282719ffe5ea259b6718988a0fc23d5ee7aa
diff --git a/dev-go/golangci-lint/golangci-lint-2.12.2.ebuild b/dev-go/golangci-lint/golangci-lint-2.12.2.ebuild
index 59e31e0bce27..4f60ea76dfb6 100644
--- a/dev-go/golangci-lint/golangci-lint-2.12.2.ebuild
+++ b/dev-go/golangci-lint/golangci-lint-2.12.2.ebuild
@@ -19,7 +19,14 @@ KEYWORDS="~amd64"
 BDEPEND=">=dev-lang/go-1.26.1"
 
 src_compile() {
-	emake build
+	local myldflags=(
+		-w
+		-X main.version="${PV}"
+		-X main.commit="gentoo-${PV}"
+		-X main.date="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+	)
+	local -x CGO_ENABLED=0
+	ego build -trimpath -ldflags "${myldflags[*]}" -o golangci-lint ./cmd/golangci-lint
 
 	einfo "generating shell completion files"
 	sysroot_try_run_prefixed ./golangci-lint completion bash > ${PN}.bash || die
diff --git a/dev-go/golangci-lint/golangci-lint-2.5.0.ebuild b/dev-go/golangci-lint/golangci-lint-2.5.0.ebuild
deleted file mode 100644
index d7fd07699bf3..000000000000
--- a/dev-go/golangci-lint/golangci-lint-2.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module shell-completion toolchain-funcs
-
-DESCRIPTION="Fast linters runner for Go"
-HOMEPAGE="https://golangci-lint.run/ https://github.com/golangci/golangci-lint"
-SRC_URI="https://github.com/golangci/golangci-lint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-deps.tar.xz"
-
-LICENSE="GPL-3"
-# Dependent licenses
-LICENSE+="  Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	emake build
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		./golangci-lint completion bash > ${PN}.bash || die
-		./golangci-lint completion zsh > ${PN}.zsh || die
-		./golangci-lint completion fish > ${PN}.fish || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin golangci-lint
-	local DOCS=( README.md CHANGELOG.md )
-	einstalldocs
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/dev-go/golangci-lint/golangci-lint-2.6.1.ebuild b/dev-go/golangci-lint/golangci-lint-2.6.1.ebuild
deleted file mode 100644
index d7fd07699bf3..000000000000
--- a/dev-go/golangci-lint/golangci-lint-2.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module shell-completion toolchain-funcs
-
-DESCRIPTION="Fast linters runner for Go"
-HOMEPAGE="https://golangci-lint.run/ https://github.com/golangci/golangci-lint"
-SRC_URI="https://github.com/golangci/golangci-lint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-deps.tar.xz"
-
-LICENSE="GPL-3"
-# Dependent licenses
-LICENSE+="  Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	emake build
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		./golangci-lint completion bash > ${PN}.bash || die
-		./golangci-lint completion zsh > ${PN}.zsh || die
-		./golangci-lint completion fish > ${PN}.fish || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin golangci-lint
-	local DOCS=( README.md CHANGELOG.md )
-	einstalldocs
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/dev-go/golangci-lint/golangci-lint-2.6.2.ebuild b/dev-go/golangci-lint/golangci-lint-2.6.2.ebuild
deleted file mode 100644
index 85b3d960b3c1..000000000000
--- a/dev-go/golangci-lint/golangci-lint-2.6.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module shell-completion toolchain-funcs
-
-DESCRIPTION="Fast linters runner for Go"
-HOMEPAGE="https://golangci-lint.run/ https://github.com/golangci/golangci-lint"
-SRC_URI="https://github.com/golangci/golangci-lint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-vendor.tar.xz"
-
-LICENSE="GPL-3"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	emake build
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		./golangci-lint completion bash > ${PN}.bash || die
-		./golangci-lint completion zsh > ${PN}.zsh || die
-		./golangci-lint completion fish > ${PN}.fish || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin golangci-lint
-	local DOCS=( README.md CHANGELOG.md )
-	einstalldocs
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/dev-go/golangci-lint/golangci-lint-2.7.2.ebuild b/dev-go/golangci-lint/golangci-lint-2.7.2.ebuild
deleted file mode 100644
index 85b3d960b3c1..000000000000
--- a/dev-go/golangci-lint/golangci-lint-2.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module shell-completion toolchain-funcs
-
-DESCRIPTION="Fast linters runner for Go"
-HOMEPAGE="https://golangci-lint.run/ https://github.com/golangci/golangci-lint"
-SRC_URI="https://github.com/golangci/golangci-lint/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-vendor.tar.xz"
-
-LICENSE="GPL-3"
-# Dependent licenses
-LICENSE+=" Apache-2.0 BSD BSD-2 GPL-3 ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	emake build
-
-	if ! tc-is-cross-compiler; then
-		einfo "generating shell completion files"
-		./golangci-lint completion bash > ${PN}.bash || die
-		./golangci-lint completion zsh > ${PN}.zsh || die
-		./golangci-lint completion fish > ${PN}.fish || die
-	fi
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin golangci-lint
-	local DOCS=( README.md CHANGELOG.md )
-	einstalldocs
-
-	if ! tc-is-cross-compiler; then
-		newbashcomp ${PN}.bash ${PN}
-		newzshcomp ${PN}.zsh _${PN}
-		dofishcomp ${PN}.fish
-	else
-		ewarn "Shell completion files not installed! Install them manually with '${PN} completion --help'"
-	fi
-}
diff --git a/dev-go/golangci-lint/metadata.xml b/dev-go/golangci-lint/metadata.xml
index 17492b5107c4..478583f5b166 100644
--- a/dev-go/golangci-lint/metadata.xml
+++ b/dev-go/golangci-lint/metadata.xml
@@ -5,5 +5,9 @@
     <email>williamh@gentoo.org</email>
     <name>William Hubbs</name>
   </maintainer>
+  <maintainer type="person">
+    <email>arthurzam@gentoo.org</email>
+    <name>Arthur Zamarin</name>
+  </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/dev-go/gopls/Manifest b/dev-go/gopls/Manifest
index 5552187cfa55..b1ddcdc2414c 100644
--- a/dev-go/gopls/Manifest
+++ b/dev-go/gopls/Manifest
@@ -10,3 +10,5 @@ DIST gopls-0.21.0-deps.tar.xz 2551528 BLAKE2B 45564ae68a2758256ac56a03fa2f10e039
 DIST gopls-0.21.0.tar.gz 8335128 BLAKE2B 66565fd5c4fdbb51bf572e0c28d1003eb15fb11c5af41b2a0690fd929e5840dfcb88f10a420b82d53e6566320101742cead7351237df45a42d1bbdd2a1ae953c SHA512 b47906657a813bc747bdced040878de8bf53d5abe48a869d783ff914002aaf591910f027647e5eee50c78c1521fda6ed65079b278f65c8ea1ef0a1c7b30e0888
 DIST gopls-0.21.1-deps.tar.xz 2552972 BLAKE2B 9963c2b6e246eb29c87ddb0bc82ace63dd27a9e603f3ce3c6ae3d8ea8f75db2fd908751000776a6bd3c6bc31c59a0ae26c5d428438b90c40460a7a7c346ac796 SHA512 124da4d542903709a7a3f7a9736a8bf377cfb319aa69bc42810ee4fe48933e3eab2be6ce308ab421a9c6ed6bfd195bd0a2607e8d00b7cb5af836b00e08bcca18
 DIST gopls-0.21.1.tar.gz 8332475 BLAKE2B 879d519fdc40bb49fbf9dcd1074cff27d4757a8ae80339dafac28b85245f7904cf687d3dd0f0d9340100f9a02933142a45b9be2be5e086e65cddd1c7b2a8cd9e SHA512 c2a3af645dda3b836eaf9f0d23b067225a57cc0591938e26e8f8af12c2237755094cb538b139e4a0cecaa373b5ce6a45c593624c521c3a897ba750e1780ff930
+DIST gopls-0.22.0.tar.gz 8500067 BLAKE2B e8ec5ebafef65180871c18ad31e930752d6e26661fd181059cbcf1f9e27250a39f9a5a0d602cc3d22f22979cf132a6444ba28a27d70fa5aa53d22b617dffa6d2 SHA512 81319e754de272c883566b991a5f17e620f1e992091fa1993f765f84c175c3e58fafdb4e483050b63fb3bc5492ea6402075b6e4dfd2fe7ae0f89959caf8438d0
+DIST tools-gopls-v0.22.0-deps.tar.xz 22855316 BLAKE2B 28954b25e2226c66e693a17f18e2a9d3913602c88736e80e562f5d5dcb641c4d3a06550733092e474c70b339a5c92c63929786427159e451538efbf36bf4b8a1 SHA512 d1b7a714484f1a6d0b9bf0cf67576cf0460f9bcb34790eedbb65682a933f2619c26579e06c1f109e3feb710d398c8306984477fcf5109fd4e12ac045d127813f
diff --git a/dev-go/gopls/gopls-0.21.1.ebuild b/dev-go/gopls/gopls-0.21.1.ebuild
index 55fc64e48691..d04c46f4ad1c 100644
--- a/dev-go/gopls/gopls-0.21.1.ebuild
+++ b/dev-go/gopls/gopls-0.21.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/tools-gopls-v${PV}/${PN}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND=">=dev-lang/go-1.25"
 # TODO: fix test failure with deps tarball
diff --git a/dev-go/gopls/gopls-0.22.0.ebuild b/dev-go/gopls/gopls-0.22.0.ebuild
new file mode 100644
index 000000000000..4d38dc70aa7c
--- /dev/null
+++ b/dev-go/gopls/gopls-0.22.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit go-module
+
+DESCRIPTION="\"Go please\" is the official Go language server"
+HOMEPAGE="https://github.com/golang/tools/blob/master/gopls/README.md"
+SRC_URI="https://github.com/golang/tools/archive/refs/tags/gopls/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/gentoo-golang-dist/tools/releases/download/gopls%2Fv${PV}/tools-${PN}-v${PV}-deps.tar.xz"
+S=${WORKDIR}/tools-gopls-v${PV}/${PN}
+
+LICENSE="BSD"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-lang/go-1.26.0"
+
+src_compile() {
+	ego build -ldflags "-w -X main.version=${PV}"
+}
+
+src_test() {
+	rm -v internal/test/marker/testdata/diagnostics/{osarch_suffix,excludedfile}.txt || die
+	ego test -work "./..." || die
+}
+
+src_install() {
+	dobin gopls
+	dodoc -r doc README.md
+}
diff --git a/dev-go/gopls/metadata.xml b/dev-go/gopls/metadata.xml
index 3482499fbc25..e9adc81acb9c 100644
--- a/dev-go/gopls/metadata.xml
+++ b/dev-go/gopls/metadata.xml
@@ -12,5 +12,9 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="person">
+    <email>arthurzam@gentoo.org</email>
+    <name>Arthur Zamarin</name>
+  </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/dev-go/protobuf-go/Manifest b/dev-go/protobuf-go/Manifest
index 3d11e2f353a7..5b07c7bcc051 100644
--- a/dev-go/protobuf-go/Manifest
+++ b/dev-go/protobuf-go/Manifest
@@ -1,2 +1,4 @@
 DIST protobuf-go-1.30.0-deps.tar.xz 565680 BLAKE2B 711bdcd31c7986dd63a47db946d84081087c9a815b41c7239e8da312ca20faa7fbb8e4b03c59819c7403ff99e2eb691c436a3c03c7065c5ff99f513c90fc5d34 SHA512 73fffe68233c25b19edd0f22c0b1fb3e769a72a74ce00dcf5c1614ae2ec1f450e41283709791bbf0b31d08c462dc51ac08c07fece957aaec7850de66833c3648
 DIST protobuf-go-1.30.0.tar.gz 1298988 BLAKE2B 8ab6a105e691eacc60b6dc8ab872298469fcd38aad2fe7f5373761b2fa8e6208499db1b7eaccc40e5159dfcc2d1e4c9b5b5cbd81cb85787f88bcf93f355aa263 SHA512 379860dda3ccff3d6687520d92320a7543562cea104634a17abe5733c2d028116d2740434b33e39e7b263b9468806da7fe15af40c8e23c490c67fd9f9db8b770
+DIST protobuf-go-1.36.11-vendor.tar.xz 64060 BLAKE2B 0eaa32de5203d8f482e4cc16dc102133ca89a222c9a9cd93c733020d3e19ff9a725be8413b7fbf31055e17001819df1c8f960ed8ac26280cb55ee1bf77529037 SHA512 671607633cd3126b47a9e5a1af0dd59eaf914e191e6aac4cd3d51718ee68d990fb170efd182d7ae9c0193ffbadfb6ad78f6b8c078af327df0d79321774d184c6
+DIST protobuf-go-1.36.11.tar.gz 1821632 BLAKE2B 7fbb68eb881cf5004165df2594fdc3c312fa6108d65ba3cb1ed45d26ff861763428aafcea6d11c968af3497f73a081c51c7d524a8c0de3d5dcd6a39537be062d SHA512 6451cfe7321781cbd2523c2e98696cb3d28b808a3736f6adc1a9b08a6f3ff19ae65eb20ce44368568f493f6ca2fcc534b3410a7df5ce2995e1af66e55cd30e72
diff --git a/dev-go/protobuf-go/protobuf-go-1.36.11.ebuild b/dev-go/protobuf-go/protobuf-go-1.36.11.ebuild
new file mode 100644
index 000000000000..803ec680885a
--- /dev/null
+++ b/dev-go/protobuf-go/protobuf-go-1.36.11.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2023-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit go-module
+
+DESCRIPTION="Go support for Google's protocol buffers"
+HOMEPAGE="http://protobuf.dev"
+SRC_URI="https://github.com/protocolbuffers/protobuf-go/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-vendor.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	ego build ./cmd/protoc-gen-go
+}
+
+src_install() {
+	dobin protoc-gen-go
+}