9 files changed, 156 insertions, 76 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4520e65a1692..96ac9f833cc3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 7b1eb226cc91..4c3504b745f0 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,5 +1,7 @@
 AUX 5.19.12-no-stack-protector.patch 517 BLAKE2B 5d47108db32a2c33a0151997c26da2d1f9944b4796e6b0e4c90a8dc8edfc0a0cfc78be248dd484e1b55038f64e226633e9b7d792bed980b875d9d628e04ee376 SHA512 155cf0d515b9c644fcfe233c0f2a05b2b6ffecfc634f0320b32e3dcbfcf7807896bc2d09a70f139af62d9c743c1fcdafade890dcedd73bb240f38b55b1ee6a2a
 DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7e99f4ed2d074aaa01ac4487813ab297d337a6855cdbcbb33346b631c4256ee3b06191adfb1be3615a56bdd6d SHA512 a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd
 DIST patch-6.2.1.xz 5688 BLAKE2B 383ad7820e2b581b35c7b33e272782c1ea9588e050b2e306b7a31e82984c49f6da55dd10908c6c2d5cf0b524a7cfacc08b3ce0279e4ccd96286463ae28cb5e90 SHA512 e5777e2cb124ba5899c330135b25aaa4d612fed4af2230214c2311fe6ca03825e9c3f9be7ed84ac3712db6a4aad4fed43e88cbbf3d7b33d8d98000cba78f9085
+DIST patch-6.2.11.xz 683356 BLAKE2B e77dabcfb28aa22afcfd57c80508d345497ae95c176e49112136e67f914013d9480c55395992a0a8ee4c02f61354af78de2db13ea92d0f0b8bd220b2404c8cda SHA512 86fb459cd07b023014ec82f030189c732bb3717715b644f3b6012537465a26b9bda164b8f4a57e121a914ae7cae8209473505300ecd8c14d035266e7cf22dac6
 EBUILD bpftool-6.2.1.ebuild 3002 BLAKE2B 8f0afdbdb41176ff1ed27224b310c88b67c44214d9ad82ba4bca353ba02f04e666b2c19f16e66d68e4cd7540412d7f6ee0eef3ce71048dcadd75f4594909c681 SHA512 604498cf1ba5b83edb808480577395f1d85b59644f06bd3d2d21a843f3062ca3d85f1390e09bc917c8ec2324c56cca4a45b79ee3b6c57311a85d4ce979c5751c
+EBUILD bpftool-6.2.11.ebuild 3003 BLAKE2B 4a4e2c20ada14d20cbdba794ca3e48b9da6096436eb624f958c0186d3953e05390cff04662fb93d6d2c287ca7dca201fb47101156faf3dc1d7fb3fdfc6bc8e2a SHA512 ebd77d297593d5366d2cf62721aad65426feabd454d8f28cdd25c50f68f2632b447eb9ce7df15fc2210f6ce1e999057ce1b2373b18a679719be7f8645b564519
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.2.11.ebuild b/dev-util/bpftool/bpftool-6.2.11.ebuild
new file mode 100644
index 000000000000..5e04ebcc3cf1
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.2.11.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~riscv ~x86"
+IUSE="caps"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	sys-libs/zlib:=
+	virtual/libelf:=
+	caps? ( sys-libs/libcap:= )
+"
+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
+
+	pushd "${S_K}" >/dev/null || die
+	# bug #890638
+	eapply "${FILESDIR}"/5.19.12-no-stack-protector.patch
+	popd || die
+
+	# dev-python/docutils installs rst2man.py, not rst2man
+	sed -i -e 's/rst2man/rst2man.py/g' Documentation/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)" \
+		"$@"
+}
+
+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/dmake/Manifest b/dev-util/dmake/Manifest
deleted file mode 100644
index 68cfcb271222..000000000000
--- a/dev-util/dmake/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST dmake-4.12.2.tar.bz2 461738 BLAKE2B 2a80f5a566f9981d61472717f1df8dcb9634975356c2ca0d4d7053ea32e74f57e5daccd11c41b81bddc7994e57e2b001fc9610800f6d949146a23b1b065b9b16 SHA512 f09453205bd425882d933a7b2cf879d69d795765bb7586e1e35ca5c9e39444cb70cfe56ed9b350f12fae8d484670b4ae418bb5d2da7c0c2ff229d9165caff45b
-DIST dmake-4.13.1.tar.gz 677296 BLAKE2B e56966569a00f5d13396ff59536194831757bd8e19a3cb66dbf28c0f7189a2791938173b94ce56c96bc5e2cbec34f48b0cba4b8ed7034b73095a0a6c4a9b477f SHA512 fc1b6cddcba174d34e709dd39f98f363ab0dff85f55c672cb231ab18c6dd045c7a3ae7483fa256effef4f5b876e71e860d0354426a30f55c30d4b04127cb3954
-EBUILD dmake-4.12.2.ebuild 678 BLAKE2B 7f3ba1357d2471e5c2e1899ac504ce5a1b1ca50d3ac9fd3e1ae986b54113d5a02cba72ea97857a49b0b2bbc159c8b9b38cfd37059686bdbcedfe5a62ee91f1e3 SHA512 3d1db0871fc5b4cb39b8c26c03a3a8140bab5aa010fe00a4aec35fbd506fa46dc3c4215a1ecd70cabfed683175951577892e8e8db14f7fc7b713cb1a9dff1390
-EBUILD dmake-4.13.1.ebuild 553 BLAKE2B 477a7ff441a66d32e89e3bc136bbea5d18b7fc22aa4d87800d8b33c0e81e0cab1ab80bdea3d08d20429850c1a7a1099277efb042d90b9d0b6fcf588a564d58aa SHA512 4a54a4ced039776485c0d0c84f9174cd2b40025fe398d0c85729d9642cd974f97024883ccbd29b0c3fab880f9fff21dd0ea2f8fd35fa40b5a5d9b10abb089861
-MISC metadata.xml 345 BLAKE2B 10a7cae86f300e8f060b80f18cb33e87cc5eadfbd34f94e6db8597c4e112fa8d9b0200fe17c8754bf0c3e3bbf9116beab5fb84ff20fbf76ea50524645055fb78 SHA512 a05e8e10ec95cfa3abd41fadfd806af6b71619982f7c1efbd833ef8bf307fa79b01de4cd17a77e8d8a025193db6ec2612c35f7c17cfca410f9a020b44a50c2a3
diff --git a/dev-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
deleted file mode 100644
index c31db3ef0f51..000000000000
--- a/dev-util/dmake/dmake-4.12.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Improved make"
-HOMEPAGE="https://github.com/mohawk2/dmake"
-SRC_URI="http://${PN}.apache-extras.org.codespot.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-# test failure, reported upstream at
-# https://code.google.com/a/apache-extras.org/p/dmake/issues/detail?id=1
-RESTRICT="test"
-
-BDEPEND="
-	app-arch/unzip
-	sys-apps/groff"
-
-src_prepare() {
-	default
-
-	# make tests executable, bug #404989
-	chmod +x tests/targets-{1..12} || die
-}
-
-src_install() {
-	default
-	newman man/dmake.tf dmake.1
-}
diff --git a/dev-util/dmake/dmake-4.13.1.ebuild b/dev-util/dmake/dmake-4.13.1.ebuild
deleted file mode 100644
index 2b106f632d52..000000000000
--- a/dev-util/dmake/dmake-4.13.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Improved make"
-HOMEPAGE="https://jimjag.github.io/dmake/"
-SRC_URI="https://github.com/jimjag/${PN}/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="
-	app-arch/unzip
-	sys-apps/groff"
-
-src_prepare() {
-	default
-
-	# make tests executable, bug #404989
-	chmod +x tests/targets-{1..12} || die
-}
-
-src_install() {
-	default
-	newman man/dmake.tf dmake.1
-}
diff --git a/dev-util/dmake/metadata.xml b/dev-util/dmake/metadata.xml
deleted file mode 100644
index f61de6a5613f..000000000000
--- a/dev-util/dmake/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chithanh@gentoo.org</email>
-		<name>Chí-Thanh Christopher Nguyễn</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mohawk2/dmake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index d4737c315879..d795742d52b8 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,3 +1,5 @@
 DIST opencl-headers-2023.02.06.tar.gz 66125 BLAKE2B 75018fab7e530c955b4a61dc40626751894cf9c471234f0d1d5346d1eb38d00b13df5f87cbd2af59bfa17d014bb20f9ed13727fb660bc79b3728c075b7b1c613 SHA512 41730e80b267de45db9d7a3bcf9e0f29bfc86b25475a86d50180a7258e1240fc8c8f2ad3e222b03b3ef50c10ef63fb5b1647c056fec615e87965aa3196e8ac60
+DIST opencl-headers-2023.04.17.tar.gz 73963 BLAKE2B 93b792559bb9dca0a2b62a113dd91f81297f86aabd1ca613f3770f02ff70b77276f02d13e0b8eb203495f520005fdd66da37e00fb49a2322f65b86671bb13271 SHA512 55945cdbd79b8a70b074dd09dd9cb6a560c454ce98c16341c75ac197cc85e57314f0e8fafd25aa51d4c4b4f7f8cf401a144d52aebfc8893bbbd1f28ec2850625
 EBUILD opencl-headers-2023.02.06.ebuild 616 BLAKE2B 357a31bfbeca35b3a4900345fa617ef7f8d38b254eb0f20a9e36e51ac773df6eec09f5950a89d6762b0b444096c43bd025c7aebf8c37cd94b0671c54e8737d6b SHA512 ffa2378293a4ba70da1a9edc30fe1da4f7b9543d3c385c7d8b8a5985592dbdbfbedddc98a406e34a98cc02111266835331bc60ccf37065ac6636ea4375c898df
+EBUILD opencl-headers-2023.04.17.ebuild 619 BLAKE2B 8d1100dc4008fcb33498b35fa19bc60e758c6833f4b3a2579bcf2dd5edb12b25e0a483258aed97836cd00ccc17bbd2f8306d7d1595831fbda51c7274709819ef SHA512 61b91b1e0bcf8bf74cfe683f21272f1514dab8fe6247959b809d8566b7b62dfc34e7122b050dec60c79d7ce006b79499d7c641b902fd5befcaa70ffdb38855c3
 MISC metadata.xml 1055 BLAKE2B ac96e1bf07e353236170d3678541555b7d901984266dfd1356456db90effe430e6a042afc0b9b5a7f51d0e9cfbcef0fbf66fb46de82fdc8cc1cfa29c6cfd61d0 SHA512 6233610591851e415ab0354ca900dfdfa14fa2442e56094d547420ce710942be86c701820c3a63e2c6f070b74c0801f92bbe9ed6c7f2a5cae406f74b81acd86a
diff --git a/dev-util/opencl-headers/opencl-headers-2023.04.17.ebuild b/dev-util/opencl-headers/opencl-headers-2023.04.17.ebuild
new file mode 100644
index 000000000000..e31ba9edaf8a
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2023.04.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
+}