6 files changed, 74 insertions, 4 deletions
diff --git a/dev-util/bpftool/bpftool-7.6.0.ebuild b/dev-util/bpftool/bpftool-7.6.0.ebuild
index 96f38a883637..e26ad853e978 100644
--- a/dev-util/bpftool/bpftool-7.6.0.ebuild
+++ b/dev-util/bpftool/bpftool-7.6.0.ebuild
@@ -36,7 +36,7 @@ else
 		S="${WORKDIR}/bpftool-libbpf-v${PV}-sources"
 	fi
 
-	KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="|| ( GPL-2 BSD-2 )"
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index e1ad8e3f3b0f..2825933c9c75 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -4,3 +4,5 @@ DIST gitlab-runner-18.2.2-deps.tar.xz 118914016 BLAKE2B ef7e781547afa4de1db6000c
 DIST gitlab-runner-18.2.2.tar.bz2 1962570 BLAKE2B 84fefadae62a394e20249eb37a4dcf790cb9df323154e081034e69785dbb147408b715f5ab97f80a6450e3efffa6ec693605da1adb00e35f942194294639ff06 SHA512 326a05c588b94c5cd6c65789b8e3c05dc71dd1972d163e7fd94f1f66b82691a39deea2387bf72284ca32231fc9c99fa94d9adb2ae45bbd4a0b093656758d7108
 DIST gitlab-runner-18.3.1-deps.tar.xz 118959964 BLAKE2B c3b1243dbf26179e802fae563981d72a08a3efecf8e45cd1a3803220a9c5804b47dff746a89d948bf3c5f9c9272b762e70040aba87b2d01593b3bfd7388ae77e SHA512 77d50a96c21a02b7e0d59b0debf5b8f6ff914470ca06088c96ec738961379d8992587dd23c28ebad288c20a907434bc680fae0d6e7d5400276e6d586c7184cd9
 DIST gitlab-runner-18.3.1.tar.bz2 2018838 BLAKE2B f357afe8186d1fd56f25efd2334c873d224a75a79b552f37bfc2920541369d64f22bdb31a51c226abe24d5a4a2ee92289aaa5ebfff8d27a6137c75c5bff30d5d SHA512 e8dde34479d1c7320dae1990d37b08ce9f3757166fa104024693803085e18781f63b204923db6608277489c4f69fdc1dd38faddf43c336de084687d85f05f989
+DIST gitlab-runner-18.4.0-deps.tar.xz 118808448 BLAKE2B f46f45e4fdc3cdb85f915fa502f0d965fd3ed9d1061bc8f49909873f8674afa083b59a942ca90f2ab0c25cd748cf291b2f12856aa0e698e66cc0429bdc943fe7 SHA512 033f8755ecdc0a8a530e0f6d935c6ceccef0fbe278b68a771501430cedbd0f16977970667d423c3b04b605ea441655182a08e1a8e83bfcd7a4d2c4286c3e2bbd
+DIST gitlab-runner-18.4.0.tar.bz2 2045075 BLAKE2B c7ca6e5af039fef0be31be55fa72eaf64fc8a28cb0df4c8096efa149641bb4dd7297feb03ca45d8575b67ee0e36864c89648ccd09010078311642623aa2209f9 SHA512 267086dfed735a1bc1ce87511fbcc7e94d387e9b69ab70b8beb7228b2e91dd726a82a5d69b46cfb2f8afed61dfdd7234cf666a66dd29a4c97602e6508d14953a
diff --git a/dev-util/gitlab-runner/gitlab-runner-18.4.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-18.4.0.ebuild
new file mode 100644
index 000000000000..817b1ded9d58
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-18.4.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit eapi9-ver go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=139a0ac0
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 ~riscv"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-and-helper-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	newbin out/binaries/gitlab-runner-linux-* gitlab-runner
+	newbin out/binaries/gitlab-runner-helper/gitlab-runner-helper.linux-* gitlab-runner-helper
+	DOCS=( docs CHANGELOG.md README.md )
+	einstalldocs
+	insinto /usr/share/${PN}
+	doins config.toml.example
+
+	newconfd "${FILESDIR}/${PN}-18.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}-18.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /etc/${PN}
+	fperms 0700 /etc/${PN}
+	fowners gitlab-runner:gitlab-runner /etc/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	if ver_replacing -lt 18.0.0; then
+		ewarn "The logs are now redirected to syslog instead of being stored in /var/log/gitlab-runner"
+		ewarn
+	fi
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/goland/goland-2025.2.ebuild b/dev-util/goland/goland-2025.2.ebuild
index 648352aa3813..de8fbfcdd558 100644
--- a/dev-util/goland/goland-2025.2.ebuild
+++ b/dev-util/goland/goland-2025.2.ebuild
@@ -30,7 +30,7 @@ LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBr
 	ZLIB
 "
 SLOT="0/2025"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="wayland"
 
 RESTRICT="bindist mirror"
diff --git a/dev-util/pycharm-community/pycharm-community-2025.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2025.1.3.ebuild
index 16587e4d9a41..34ca38a2baef 100644
--- a/dev-util/pycharm-community/pycharm-community-2025.1.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2025.1.3.ebuild
@@ -38,7 +38,7 @@ else
 fi
 
 SLOT="0/2025"
-KEYWORDS="-* ~amd64 ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm64 x86"
 IUSE="+bundled-jdk"
 
 if [[ ${PN} == *-professional ]]; then
diff --git a/dev-util/pycharm-professional/pycharm-professional-2025.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2025.1.3.ebuild
index 16587e4d9a41..34ca38a2baef 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2025.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2025.1.3.ebuild
@@ -38,7 +38,7 @@ else
 fi
 
 SLOT="0/2025"
-KEYWORDS="-* ~amd64 ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm64 x86"
 IUSE="+bundled-jdk"
 
 if [[ ${PN} == *-professional ]]; then