gentoo auto-resync : 26:06:2024 - 00:12:24

5 files changed, 39 insertions, 126 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 122b604fc75a..f08d0ea6a0af 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 25c7e5b49b31..a67aca1f2cfe 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,10 +1,7 @@
-DIST linux-6.7.tar.xz 141406528 BLAKE2B cecdbd19905e43e485ab73b352ced18b37f2a138c97a6956cadcda5d3d271001117dc1cf896b166ff019fc7f405f9539e2ed0d6112b0890efb04d182adf4fd0e SHA512 de06de556191614bd9daf077ae239360352a402bab407748e67f1e5108c92fd933e451707840ab22fe0f9976db3d1e1b60ca9d41cf894f015ca09b3f652b74ad
 DIST linux-6.8.tar.xz 142502100 BLAKE2B c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2 SHA512 5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
 DIST linux-6.9.tar.xz 144034416 BLAKE2B 4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e SHA512 fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
-DIST patch-6.7.6.xz 583872 BLAKE2B 123dfd4170680917ebf16c3c7f3ab31754637c962dca5e5f5d52dd702a46bb68b01ca3a5b3c2482db34841f139871126576d30703825f8ca2dda2d8bfc4ed7e2 SHA512 ab5bef028a6c61e3c6432d49e95d88aec97140d7f8b295a71ba96b08254199343f93f11da4b34ab2482015adb0d1816b6719a21f8a0f2b1dd1bd96fcd3a72d2e
 DIST patch-6.8.2.xz 247244 BLAKE2B a85078230548543c38550a5546689d0b44a54208cdad591ab34e10dec9348ce2f74e45bf85f373b14977d40556067e2e2c17ac4b6791fbb8aaba98feccd3cdac SHA512 a8e32b89f7680670c69c62f356846bb65b57614f979114627a9a2f945d7dc97c921d30197dffa993e5b18e499ba8c7196046ffdf0e721528a5378d1ee65a9ba5
 DIST patch-6.9.2.xz 16184 BLAKE2B 8a37e96c253b55b57c86f1654f2ea8bf65af96b1b38213e90032cb918bb8eea992d6ddbfa6a6774a229ab2e2288ab57bdb6cbad6e7e393c123f24850e06847c9 SHA512 a27af24f0caaa5de3811b6db5acc2d72b96df9ebb5c44bad99a949d871fb06c6ffd2be10cfc35b246d430c7be2291701f802aed47eaa8818ad12b8818a60f3ec
-EBUILD bpftool-6.7.6-r1.ebuild 3058 BLAKE2B 2fefd15fd034b172369c9b6c0f7bcc3f5c789b8272e5cc30cbada66dcf33d889faec5f47a3b8ba56f50af67d91e49ee56e31ca81e7e84106c7878944201ff72c SHA512 b8f93e8ec6e2fa3442c193498d08cb04485bf53ed4914e85074a0433d73e6f9f54b5dfb37d9bcb39b09ac51a756671b7e52f8c4157d5b124ecfbf3ea4e5a6a72
 EBUILD bpftool-6.8.2.ebuild 3101 BLAKE2B b032c5133f13d0a2f789a08fa054bd5d88cc729026974189d20b9d91f6295fdbad39056acc1223e78923b6201d91799c8cb833948135bccf25b84b4c25f00d5d SHA512 1efcf7572c1aa378394f38d2b939752aaf3215f92ffa227c493d0e3e9c8f945bcca82f759487386cd62e9c5996400395a944962f61af20fc62f8a206b57740d5
 EBUILD bpftool-6.9.2.ebuild 3131 BLAKE2B b1c16967b014d53b7f277a4bea648b0cd72d37d1e178069a1718006c5c0cf6f6ea57d3680c805a5dd83dceced77a7556bd26038d6d2a8d61002fa7c67be307bb SHA512 32c3ef4940bb76170b1aa35ebf6849b3a60c593bfda98641b24b46ea3371868a8f9dcc5bddffd5ce80b4d40992d2fc271fc2e1cbed10d8fb1e2e30de5f67fe69
 MISC metadata.xml 333 BLAKE2B 68272d411c28ff70b4e5f7d8a0dd8667ec01ee7e73f03c79cce54d47fe18306cba8dc52437b283e3018a572ec409cd3820d1dffc256658132d6209f5701eb553 SHA512 3527a7c4866b2f7a840cee65958734932c3f1bd76d1a3bad069e10abe174ed11d7e7995f094a30a3a4b6ad33b34989172c29a5bebda115e4c6da2afe0fde3720
diff --git a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild b/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
deleted file mode 100644
index fd04d9b6bbec..000000000000
--- a/dev-util/bpftool/bpftool-6.7.6-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit estack linux-info optfeature python-any-r1 bash-completion-r1 toolchain-funcs
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-pre/-git}"
-
-DESCRIPTION="Tool for inspection and simple manipulation of eBPF programs and maps"
-HOMEPAGE="https://kernel.org/"
-
-LINUX_V="${PV:0:1}.x"
-LINUX_VER=$(ver_cut 1-2)
-LINUX_PATCH=patch-${PV}.xz
-SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
-
-LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
-SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="caps +llvm"
-
-RDEPEND="
-	sys-libs/binutils-libs:=
-	sys-libs/zlib:=
-	virtual/libelf:=
-	caps? ( sys-libs/libcap:= )
-	llvm? ( sys-devel/llvm:= )
-"
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-5.8
-"
-BDEPEND="
-	${LINUX_PATCH+dev-util/patchutils}
-	${PYTHON_DEPS}
-	app-arch/tar
-	dev-python/docutils
-"
-
-CONFIG_CHECK="~DEBUG_INFO_BTF"
-
-# src_unpack and src_prepare are copied from dev-util/perf since
-# it's building from the same tarball, please keep it in sync with perf
-src_unpack() {
-	local paths=(
-		tools/bpf kernel/bpf
-		tools/{arch,build,include,lib,perf,scripts} {scripts,include,lib} "arch/*/lib"
-	)
-
-	# We expect the tar implementation to support the -j and --wildcards option
-	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
-	gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
-		"${paths[@]/#/linux-${LINUX_VER}/}" || die
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		eshopts_push -o noglob
-		ebegin "Filtering partial source patch"
-		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
-			> ${P}.patch
-		eend $? || die "filterdiff failed"
-		eshopts_pop
-	fi
-
-	local a
-	for a in ${A}; do
-		[[ ${a} == ${LINUX_SOURCES} ]] && continue
-		[[ ${a} == ${LINUX_PATCH} ]] && continue
-		unpack ${a}
-	done
-}
-
-src_prepare() {
-	default
-
-	if [[ -n ${LINUX_PATCH} ]] ; then
-		pushd "${S_K}" >/dev/null || die
-		eapply "${WORKDIR}"/${P}.patch
-		popd || die
-	fi
-
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e 's/rst2man/rst2man.py/g' Documentation/Makefile || die
-
-	# remove -Werror (bug 887981)
-	sed -i -e 's/\-Werror//g' ../../lib/bpf/Makefile || die
-}
-
-bpftool_make() {
-	local arch=$(tc-arch-kernel)
-	tc-export AR CC LD
-
-	emake V=1 VF=1 \
-		HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" \
-		EXTRA_CFLAGS="${CFLAGS}" ARCH="${arch}" BPFTOOL_VERSION="${MY_PV}" \
-		prefix="${EPREFIX}"/usr \
-		bash_compdir="$(get_bashcompdir)" \
-		feature-libcap="$(usex caps 1 0)" \
-		feature-llvm="$(usex llvm 1 0)" \
-		"$@"
-}
-
-src_compile() {
-	bpftool_make
-	bpftool_make -C Documentation
-}
-
-src_install() {
-	bpftool_make DESTDIR="${D}" install
-	bpftool_make mandir="${ED}"/usr/share/man -C Documentation install
-}
-
-pkg_postinst() {
-	optfeature "clang-bpf-co-re support" sys-devel/clang[llvm_targets_BPF]
-}
diff --git a/dev-util/hyprwayland-scanner/Manifest b/dev-util/hyprwayland-scanner/Manifest
index 5181660e15a8..a9a79ea8ecf2 100644
--- a/dev-util/hyprwayland-scanner/Manifest
+++ b/dev-util/hyprwayland-scanner/Manifest
@@ -1,7 +1,9 @@
 DIST hyprwayland-scanner-0.3.1.gh.tar.gz 8832 BLAKE2B 2a86fa7e6898a74231836e521b92f6997b18e2ad45973dd60bb3696ca2ee9c348746c4f43299882c12bfc908aae86af19f86c8f404eb2ef26e11fd2a9249e9fa SHA512 bcbaa5952655894d2093df1fd24e4df301c810180d678746f9eb4f420d92461ef7f3ea0cfde1f1d4da48f09b325e8661d4fb1540fe749964cec9b19f19822af0
+DIST hyprwayland-scanner-0.3.10.gh.tar.gz 10039 BLAKE2B 369c2445904480ec9368101056e9712c0583307c1faaea43fed80f17075521371865841c777070a6983d9a84c394c620b0b0ecd53bbd6166f7828e136c0d52eb SHA512 d63f9490d048725a7faa3995e3786190b37db16654293cce16c410c4cfd27e61042a50e6feddc7eda42d67c04bdd7bc19b51f475ddd206ffc5464e762003392b
 DIST hyprwayland-scanner-0.3.4.gh.tar.gz 9610 BLAKE2B 931807bade6186489826fe73ca558c3e4100f0db62c3a07920ad6e173dedc5c4d157b6caf1d5bc75c9b9ef419c8351f9bc06aa84425ffcd506792c8ec7de922b SHA512 1b05a41a19f7d07fdb10e5e72cb6949e1ac811ec0435f49d86376f19c3904660bc2a94b5f2dc75ca45e4243b6009df33682464c24c1bcea65ab16fa4f3a97732
 DIST hyprwayland-scanner-0.3.7.gh.tar.gz 9891 BLAKE2B 587eedabebc775b6d4591b7d0e9517238c18594f397d91d5431368b2f83646ce3b1bfdb07d424410977a8d5afab201f622c0a8de271f9322d250ae7ee621ab4f SHA512 996ef9eaf5b0096a2b01ad8d815584b2c5d6df284e33c2d5a8d07b682df5dc3eff02c3774bc92de57ad014d8414af6bf7bd18a9f212c83d8a0e1e88872f742bc
 EBUILD hyprwayland-scanner-0.3.1.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
+EBUILD hyprwayland-scanner-0.3.10.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
 EBUILD hyprwayland-scanner-0.3.4.ebuild 1106 BLAKE2B 4b658bd56b853c4a5455a8e52e55a3acccf159ff4c84bfc81ca7f28baa664c5030d2d3f83ed532319a9b07f3a50e1b6045bd3aebe3a9874afe3a4562fd517c14 SHA512 26b3e95c514c667cb37bf098ea670d223d6bf7f91828638bb364a554d8453d706addbe2f706a1edc3d8e6512c77f804300f338a1beaee591eded7518d93569ee
 EBUILD hyprwayland-scanner-0.3.7.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.10.ebuild b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.ebuild
new file mode 100644
index 000000000000..c48449c55b2b
--- /dev/null
+++ b/dev-util/hyprwayland-scanner/hyprwayland-scanner-0.3.10.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
+}