gentoo resync : 09.07.2022

2 files changed, 119 insertions, 0 deletions

diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 54778f24a947..023560cc39be 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -2,6 +2,8 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST patch-5.17.7.xz 668120 BLAKE2B ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb SHA512 b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
 DIST patch-5.18.4.xz 424880 BLAKE2B 6ab25a0b36539608f8d0cfb42a6d41afa4d1810dfa4bdd85fe478465044e481a734ed31baf2de3c41741d07ac41bc943ea2f8a1da76c5d285f971f53edca1756 SHA512 4fe7bc40e9dabde0bbf050818f47ee3ddcfe1fcfcbb2246f05bd67df8abb0f27e46413979e9cf4b2c8ed89a590e4a663b0a75148a9c64fc17770949b98644949
+DIST patch-5.18.6.xz 486212 BLAKE2B 59243f71884a147197605388fd3ae3f84e2886e0492f960deab66c65e299b5935ace0d0f43b1c1c43f1690f4d978d6d405bbec5add4291c3356b90e80a4a4b15 SHA512 c33e90ef5af07df0bc861ae384a022ff7469c7ffaaaea372f8e292ac75b6817b4d23fcbd3d78583433a395b37e1ebb1cde40890a1e6a9ccf7e452ff8297b8c38
 EBUILD bpftool-5.17.7.ebuild 2830 BLAKE2B db113b1e8e9b42204215e0d0a6b1ff21b7ca929401f4e63b33e1fc0da8baa837be38349171ff19c2f7460b63062b72423e0524df6180c118ff10e1b110d90bac SHA512 139015d99cf70a7bcf9558f316a214e4c8cb0b9c162c6936df785702b94f02ee5abfccb64e5f6beebef4badebe6182045917cb3fb45a4edf0ccee108c00f7385
 EBUILD bpftool-5.18.4.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
+EBUILD bpftool-5.18.6.ebuild 2838 BLAKE2B db68f909f5b00257ff8c7516f170eb751abede56e45b908982048be66d488b04839ca9fd5ee1edf961730fa749b01628c1fd6b0ceb3b6410db51dd9151d935f3 SHA512 bf28c750ec794ee6e980cf464e5b23705198bcb35403d183625ea650760a5f9b61da2f0d528f0061f6912d82fe37bb8a7cd2afe73501e5cffa525d33ff66506c
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.18.6.ebuild b/dev-util/bpftool/bpftool-5.18.6.ebuild
new file mode 100644
index 000000000000..6833c60b6e2a
--- /dev/null
+++ b/dev-util/bpftool/bpftool-5.18.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit estack linux-info optfeature python-any-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 ~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}
+	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 option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --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
+}
+
+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 \
+		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]
+}