diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 956ec92a1..d7eeadaed 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,2 +1,4 @@
 DIST goland-2024.3.4-aarch64.tar.gz 1108954980 BLAKE2B 7a94ab02d133f9177616a3e13549426f2e8c64da9bedf12d1e6d7a26a6034d6d090bd0d6037c7d3317cb0b2b82bab92b4e9b18d66ac6e5b21b42799c155d935b SHA512 8d940ef20145babb715d9ba9bb69e15c1833b6e3f5b4f17e631b00da13afd876d48bdb02ab86c382ebf385c1f26fe8f3d653bfd174f60de10fb0ee5d0df37a3d
 DIST goland-2024.3.4.tar.gz 1109282670 BLAKE2B 34cc73f9629dd6faf26215d20ad24a90fa7a313970f188b16a0dcef6e3b45ed0a14dfbe94a2d283ce67f91c0f0f7ebdcb968779555429927c69d11d3431eba9a SHA512 cfbcf36507b16a11426207c60387151f86d9785ca1f884eb934bf2be2c97d478109d48fb71beef1479c0bfc2c71927642ad88bf7ab28b97d85ac1b4fefcf55d3
+DIST goland-2024.3.5-aarch64.tar.gz 1108972234 BLAKE2B 6f9cf2b9d5b61b4608dde0006b282ca929484d2a74a918806efdde032bf8239b23ef00bf46f5c3b33a7cfd77625e5588f474f5524cfed20b9ca14fdf81db252f SHA512 e6acbd595531ee66ed132d4f70df3fa2c3181e126c7570a083df89d87f203789263576f96c496593d311866475c4f845d50e08dd137556bcc26ece810568fa27
+DIST goland-2024.3.5.tar.gz 1109319258 BLAKE2B 03c0f91313f492b2db3cbc139eef866193d17a56f4f20a45a64c7cf9a27f36cd9ebf87c95689cb406dabbe7f147a6802fa27a4eab2b33acb5c732e470b21836b SHA512 40a81c037d29210294920bf6400778104bc20dde37966c6f9305e0003ca546cb582aa4aa1fb74001e6c340d0c25b692dd84f6d3c881381b06fc20ea57842636d
diff --git a/dev-util/goland/goland-2024.3.5.ebuild b/dev-util/goland/goland-2024.3.5.ebuild
new file mode 100644
index 000000000..0fe091326
--- /dev/null
+++ b/dev-util/goland/goland-2024.3.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="https://www.jetbrains.com/go/"
+SRC_URI="
+	amd64? ( https://download.jetbrains.com/go/${P}.tar.gz )
+	arm64? ( https://download.jetbrains.com/go/${P}-aarch64.tar.gz )
+"
+S="${WORKDIR}/GoLand-${PV}"
+LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBrains-individual )
+	Apache-2.0
+	BSD
+	CC0-1.0
+	CDDL
+	CDDL-1.1
+	EPL-1.0
+	GPL-2
+	GPL-2-with-classpath-exception
+	ISC
+	LGPL-2.1
+	LGPL-3
+	MIT
+	MPL-1.1
+	OFL-1.1
+	ZLIB
+"
+SLOT="0/2024"
+KEYWORDS="~amd64 ~arm64"
+IUSE="wayland"
+
+RESTRICT="bindist mirror"
+QA_PREBUILT="opt/${P}/*"
+
+BDEPEND="
+	dev-util/debugedit
+	dev-util/patchelf
+"
+RDEPEND="
+	>=virtual/jre-17:*
+	dev-lang/go
+	dev-libs/wayland
+	sys-libs/pam
+	sys-process/audit
+"
+
+src_prepare() {
+	default
+
+	local remove_me=(
+		lib/async-profiler/aarch64
+		plugins/go-plugin/lib/dlv/linuxarm/dlv
+	)
+
+	rm -rv "${remove_me[@]}" || die
+
+	# removing debug symbols and relocating debug files as per #876295
+	# we're escaping all the files that contain $() in their name
+	# as they should not be executed
+	find . -type f ! -name '*$(*)*' -exec sh -c '
+		if file "{}" | grep -qE "ELF (32|64)-bit"; then
+			objcopy --remove-section .note.gnu.build-id "{}"
+			debugedit -b "${EPREFIX}/opt/${PN}" -d "/usr/lib/debug" -i "{}"
+		fi
+	' \;
+
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/libjcef.so" || die
+	patchelf --set-rpath '$ORIGIN' "jbr/lib/jcef_helper" || die
+
+	# As per https://blog.jetbrains.com/platform/2024/07/wayland-support-preview-in-2024-2/ for full wayland support
+	if use wayland; then
+		echo "-Dawt.toolkit.name=WLToolkit" >> bin/webstorm64.vmoptions || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,goland.sh,inspect.sh,ltedit.sh,remote-dev-server.sh,restarter,fsnotifier}
+	fperms 755 "${dir}"/jbr/bin/{java,javac,javadoc,jcmd,jdb,jfr,jhsdb,jinfo,jmap,jps,jrunscript,jstack,jstat,keytool,rmiregistry,serialver}
+	fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+	fperms 755 "${dir}"/plugins/go-plugin/lib/dlv/linux/dlv
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "Goland ${PV}" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	insinto /usr/lib/sysctl.d
+	newins - 30-"${PN}"-inotify-watches.conf <<<"fs.inotify.max_user_watches = 524288"
+}