6 files changed, 61 insertions, 33 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 80ac1c7b0b85..401189ab1fec 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/hyprwayland-scanner/Manifest b/dev-util/hyprwayland-scanner/Manifest
new file mode 100644
index 000000000000..b8079ff56969
--- /dev/null
+++ b/dev-util/hyprwayland-scanner/Manifest
@@ -0,0 +1,3 @@
+DIST hyprwayland-scanner-0.3.1.gh.tar.gz 8832 BLAKE2B 2a86fa7e6898a74231836e521b92f6997b18e2ad45973dd60bb3696ca2ee9c348746c4f43299882c12bfc908aae86af19f86c8f404eb2ef26e11fd2a9249e9fa SHA512 bcbaa5952655894d2093df1fd24e4df301c810180d678746f9eb4f420d92461ef7f3ea0cfde1f1d4da48f09b325e8661d4fb1540fe749964cec9b19f19822af0
+EBUILD hyprwayland-scanner-0.3.1.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
+MISC metadata.xml 796 BLAKE2B ad11d5a2bc557d4eeec7f6bbd098ad28d1cb2b132aad7237029fca054cc9ac29225611b025685f6f1c3b7b8c5cd139076fc65522090243116dd9471276845a40 SHA512 51b663c96e8db90cc9cbafcea489102e7f8ca1fee59118a8b3beb29090f6620b4d539d809be3ccfb083e34a508b19c9aa70580fec774fafa691c393eb7b2a938
diff --git a/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild
new file mode 100644
index 000000000000..c48449c55b2b
--- /dev/null
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="A Hyprland implementation of wayland-scanner, in and for C++"
+HOMEPAGE="https://github.com/hyprwm/hyprwayland-scanner/"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/hyprwm/hyprwayland-scanner.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/hyprwm/hyprwayland-scanner/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND=">=dev-libs/pugixml-1.14"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
+		eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile Hyprland!"
+	elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
+		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
+		die "Clang version is too old to compile Hyprland!"
+	fi
+}
diff --git a/dev-util/hyprwayland-scanner/metadata.xml b/dev-util/hyprwayland-scanner/metadata.xml
new file mode 100644
index 000000000000..f3312ee6fcc4
--- /dev/null
+++ b/dev-util/hyprwayland-scanner/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>julien@jroy.ca</email>
+    <name>Julien Roy</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>jethro.rosette@outlook.com</email>
+    <name>Jethro Rosettenstein</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <changelog>https://github.com/hyprwm/hyprwayland-scanner/releases</changelog>
+    <bugs-to>https://github.com/hyprwm/hyprwayland-scanner/issues</bugs-to>
+    <remote-id type="github">hyprwm/hyprwayland-scanner</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index 65c1e227bf5a..74814e5e7e34 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,9 +1,5 @@
 DIST shellcheck-v0.10.0.linux.aarch64.tar.xz 4291764 BLAKE2B 6402fe9230c44dbf4620d019bd505246f06d7b96233d57b154f1b6a453f116e8c633768f8bce8f2031672a8df7dcac4de9ea5ebf6274444e450718b1cd300b4b SHA512 77abeaa8bee293264ebfd94a2021bd490695ed5518f2da7c0f9ec4b402cd1e5da6642a0e9f953961510cef7351cc9afae7c7a528a597d1befd1867b8c69e15b1
 DIST shellcheck-v0.10.0.linux.armv6hf.tar.xz 1328236 BLAKE2B 89788bf2de2c7c1fc1b78a64c1e28c08fea5fd29928c198cb80989191f63bcda6c9e0ebda5a5ffb471f7331292740486bc2f1cc894d30e8b704e6d2fb4a925f1 SHA512 466acfbd956d6a90f7e66c852b62fc0b9c236c1315ee58b0658780549f1b73c9a13cf203574de5969cf665f99046c4cff234813ffa45732eb7b0ea083350b4d1
 DIST shellcheck-v0.10.0.linux.x86_64.tar.xz 2404716 BLAKE2B 9cf6eeccb13770808a6efdedd27b85c925f0ab899a82ac8fdf8c16e9133d3f91b5b80900a3c1e11ee7b0b035aab1c08d439b682a479c5b47a218e55bc08562c5 SHA512 31006830087c2b9ffe9fa36c1ab4a8b11c85078cac8203265d0cfd630c70a4a506e66dd9d7ccde964360ad95045894149de457db34f10cad76708c7a4aa544ca
-DIST shellcheck-v0.9.0.linux.aarch64.tar.xz 3110236 BLAKE2B b127d5070077c6233624a2a330609d83e7054e114b6159d053a97ca18ff6f4908cd41183a386a9f6a7c076314a53612d980f1d29c764f81c3be03c9a85951c3c SHA512 3c11bc1901d470ba7f95334fcd4d8ea9c39c73ebb15655cd0cc478826279b02413409fa3f7b011c7ecdba98530953be54906b4a99b898b064c236f146f3ec749
-DIST shellcheck-v0.9.0.linux.armv6hf.tar.xz 1330204 BLAKE2B 0b6525e63f56c2a5d2374621085a0c49fedf941b1fe31c838502ac0e6baff564fcf333ef08b058d5d6e97aeb29981f8712bc4f89604c27546cad2e96cb2d4aea SHA512 ac495f5bcf358b5de9f2cbb275b30050e586218458c97c01444076947d22e9cb7acc817e361599290e22bf25996deb8006240e0350ef864372a29db3032c1388
-DIST shellcheck-v0.9.0.linux.x86_64.tar.xz 2351560 BLAKE2B d3264cd69eaed2cb6d9b68d45da81eed293c044e15032c6c36a8efac99fa48d8cc3f8fe697c545d40f28351506fa061e06fb8c7ffce12bda1c8a3b023e236bfb SHA512 157fd8b2c18a257f3876e23015580ea63d27b12c4f13f87d625a180e8ca042e7501271d15edeb36e7b5780da73815b45386a33e063ab1c891d838f35c778a8ac
 EBUILD shellcheck-bin-0.10.0.ebuild 638 BLAKE2B 4d09d9d87a33e7385ae96525f46d4bfca72e9ffe6e26eeee5c315a86abddc61c42ed2896fec7a5bcf9a291c078403a92e79d65773d3988a4c6af9edef24ca38a SHA512 170c657d98c7b39e8cf41fb2253b5f01207c5c31d88e2e090d22c09df406bacbd9a878259bdf78923e9414ab54119a5955b9a79b88bcabea51071f4e744d6592
-EBUILD shellcheck-bin-0.9.0.ebuild 638 BLAKE2B 4d09d9d87a33e7385ae96525f46d4bfca72e9ffe6e26eeee5c315a86abddc61c42ed2896fec7a5bcf9a291c078403a92e79d65773d3988a4c6af9edef24ca38a SHA512 170c657d98c7b39e8cf41fb2253b5f01207c5c31d88e2e090d22c09df406bacbd9a878259bdf78923e9414ab54119a5955b9a79b88bcabea51071f4e744d6592
 MISC metadata.xml 330 BLAKE2B c1b093b00f009ee4656b64149aeccd3879a4ac92f3530012c4da6b8af5378b42734004876c00e5c5f8e41ff9ec5da77873599361e999c0cc01c93bde829073d1 SHA512 922faa2a5867657fdf07965442169c1135aba8da58c3e1c49ba5bd39c15a91e69dd3fa7aa831b1d2d74a26c164c6ee7131a6617d9dbba1f2719dbc8a8b24f8ce
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.9.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.9.0.ebuild
deleted file mode 100644
index c6c33e14f8a3..000000000000
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.9.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SC_P=${PN%-bin}-v${PV}
-SC_URI="https://github.com/koalaman/shellcheck/releases/download/v${PV}/${SC_P}.linux"
-
-DESCRIPTION="Shell script analysis tool (binary package)"
-HOMEPAGE="https://www.shellcheck.net/"
-SRC_URI="
-	amd64? ( ${SC_URI}.x86_64.tar.xz  )
-	arm64? ( ${SC_URI}.aarch64.tar.xz )
-	arm? ( ${SC_URI}.armv6hf.tar.xz )
-"
-S=${WORKDIR}/${SC_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm arm64"
-
-RDEPEND="!dev-util/shellcheck"
-
-QA_PREBUILT="usr/bin/shellcheck"
-
-src_install() {
-	dobin shellcheck
-	einstalldocs
-}