gentoo auto-resync : 27:12:2023 - 01:38:47

7 files changed, 123 insertions, 10 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 60add70e0b8e..9f6aa939e9ab 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index a220bb192abe..6433d71fb362 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,4 +1,7 @@
 DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
+DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
 DIST patch-6.5.7.xz 561404 BLAKE2B 98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175 SHA512 4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
+DIST patch-6.6.8.xz 587540 BLAKE2B 4794b1b4415b8369b856a4b04d23931903a84d7f660e5cbf5677c359dba3c64cdb55606325ad2be1ce7878cd0daa95d2318dbf5ef12006ad37c9a69cd74b2dae SHA512 1bdf6186ef52831d508dacf740ce6c18eccca71a6426e294d5d47ebfff26a716c58db1963c439760ef104a594db5fa888d3374bc113af229794cca9362692dfe
 EBUILD bpftool-6.5.7.ebuild 2903 BLAKE2B 87f95b114db4f37815ef0f9d35a3b32e9a1f89fa7f0210ec2520a1b9b5bea948197159ffff8871f755bd127fb1041c3e7b0942f0148f406a937d1706c4acb677 SHA512 67b56ea325d71a5f27c2004ad2743e35cd14ceddfb72ecc631e172422953f5af04b428ad804f41666d1bd3a2f33c20b32b217fc339af51aaec4c03187dde4e17
+EBUILD bpftool-6.6.8.ebuild 2904 BLAKE2B f5b3e6d184fd825c036dcb8e2dbde9c2d278530d3b6662285a1eaa1a5e0406118f2d2ecd1e327464b6f729308bde5260e5c90ee733ccdc3e06f31e23d5f53e95 SHA512 d5c5da1796fd52b9f7c414574f6d04f49203f05ace439a8409e699429b357afaf52008b7ff639b5ee5ba7088a0e64ef1def27cf175f2e917f799772095d095af
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-6.6.8.ebuild b/dev-util/bpftool/bpftool-6.6.8.ebuild
new file mode 100644
index 000000000000..8d18340895fc
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.6.8.ebuild
@@ -0,0 +1,118 @@
+# 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 ~loong ~ppc ~ppc64 ~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
+
+	# 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/clippy/Manifest b/dev-util/clippy/Manifest
index 9859cb8a945b..af09b7caab3e 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -2,4 +2,4 @@ DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d98758714
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
 EBUILD clippy-9.0.1.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
 EBUILD clippy-9.0.ebuild 1163 BLAKE2B e845a4132c8525aeedbb8cb06b7af4ed44ca980ca9c455351cc615d18b9fc54dff7c15dc38a1a6c3fca88c93936b375a5142a4d6df65decc59e89eb0971fd987 SHA512 cc957f3a773435d2b709bae7b6cf3cb0b4a81d356162d9c8c677c81b290db687350eb3d994abc4d3d5f80b22fff66db2cb1799e0ac6789bad69e7be1daf372bd
-MISC metadata.xml 698 BLAKE2B 6d9e26fe97aec43d747a6f32f2798ac54dd90bc2455754681b9af469482cca56b0af5ef9aef37d7a499cbb645ff925c2f2310f505e6abc97f1480ba74490d99a SHA512 c22ce95c9ef7a367c3a9f0fcc937850a8caf73b59b4dfc52f22bdd8163729bb6624f518856da1d3198e29e2a0eeabbfc2e818c8f9b15b1005d133d39bbd0d4f1
+MISC metadata.xml 590 BLAKE2B 03cc6d8c7b3ebcc2be5e4522d4ee42a01c8f631d71f00c693fc3ea59390bbd77bd2da32058f97b967e1e5f15df860eb2117d617b84fd75959bab368727d18848 SHA512 c2e8dc96da08d30cdfa8285c9bf4bd0f516bd759fb9944cafced9af67442b77fce0051ade7253f017c4380f2a61c82446f2c35d52c7af561a98bbd2f469d3906
diff --git a/dev-util/clippy/metadata.xml b/dev-util/clippy/metadata.xml
index 4432e2729d7d..b19c1cfaa54d 100644
--- a/dev-util/clippy/metadata.xml
+++ b/dev-util/clippy/metadata.xml
@@ -5,10 +5,6 @@
 		<name>Alarig Le Lay</name>
 		<email>alarig@swordarmor.fr</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolić</name>
-	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
diff --git a/dev-util/ply/Manifest b/dev-util/ply/Manifest
index 282783237583..2c204acaba9f 100644
--- a/dev-util/ply/Manifest
+++ b/dev-util/ply/Manifest
@@ -1,4 +1,4 @@
 DIST ply-2.3.0-arm-build-fix.patch 1433 BLAKE2B 305bb06ce1e5516dc3868cd276edc94d89cb7c20866094c6947092048af2c090a29bae52dc82956cbf7f36e42e15d873c553948dade17f4b1f9d490bb8191ed9 SHA512 e7572e5e777e13b483e9123fc5c62d63f3f1a2c753d7dedce8de8d78a4c5baa9c10b45b0e31ba16a92b0e2af11e206662cfe815643f0a8145f8d79e388d536b9
 DIST ply-2.3.0.tar.gz 79753 BLAKE2B 7c2f71a6078ff65ce92b3959c3dac31d44fcf3b99fc0b2d0390152fcdfcb5f1620090b26a47f6579aaa7b7644700f2865e2693707e8746cdd78c77ce66e9ead1 SHA512 ee8acd31bef7b2ac318ef64f7775aae2b288bae15a7b7b5b28c2ce5728e8ece7833ce192bd10488dd54228685d3dc9053679a033960ed75fd91a10bb0fa6d912
 EBUILD ply-2.3.0.ebuild 1162 BLAKE2B 8b04bba2ece7224558d9f64615e488cfa22afdcbe3bd827bce1427de079afe9a4d30306768ebc1c8bd36fd148379d9e10d42b7ab40245426ee88086066a08826 SHA512 3895076f4408568e067e1cbc4f3b24c9911c34c8069f89235bacb7a0b4f785c621a02db7272af6320402f51a2b19c0139b34fbd0865362b0606a410ba43e2dbf
-MISC metadata.xml 417 BLAKE2B 28ebd45dbaf6cca1bb15bbf344ed122b15f1925ce45a0d74b408c512a9116f767508e7aba47798f6becc5bbaa647fa74dec5153c1c82783fbba336b6eeafab62 SHA512 cd1f87108a632e8741bc85eeb949f75cc7a7375aa472b0bfa1fdc421e25056178ce565b1eb64047e5c26dae0642e9038f586fbe356b162e8a957d71d7b37117b
+MISC metadata.xml 303 BLAKE2B c5e15a91a2b9f1af303fbb016c08e777c643de84190c2558db22c57545b8fb16e4b7ea40748591db040fd3919a8d62e7ae55739725ada15b5b7b49674d512d62 SHA512 de63bee2c693af627b367fa9d9bff27329004d3071d590137d262e7f096d20f86d16753f6b8833d12684340dfc0c0722ce551bb4eae9abe6de552f05c571396c
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index 47729cdf52af..ab8f3d84c38e 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,10 +4,6 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer type="person">
-    <email>jsmolic@gentoo.org</email>
-    <name>Jakov Smolić</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">iovisor/ply</remote-id>
   </upstream>