8 files changed, 184 insertions, 76 deletions
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index ecc17649d6c1..dbd7cfaa98be 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,2 +1,4 @@
 DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65
+DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257
 DIST patch-6.3.xz 8617176 BLAKE2B cab9b9b3e3a97c425e186e2390b7753e77740a8a7286ba8f8fd88527c1d2e6ee22b0d27510c5ea065e73161ac1f9a178251585ffa8d2648595c92e831cf1fee3 SHA512 4a7228e9d89633d3cb14af2dd7419eb625b765b70b95e4149ff1aff6367fb2490d5bd16d6399da33a0b85c32a8dafa2c2cb2e3695aec335f4d3a2813ca52c9f4
+DIST patch-6.5.7.xz 561404 BLAKE2B 98f6fe0a43562cc60ada3596443e56966742de6ec2ef243331d22a4f345ad5741a5fe136e03ae0a5016fec4234bb89e6a6262076d3e5a449c53bb78ee7fb1175 SHA512 4c77a595fa76e8b0a07aff0aa681af7ae3d91231964662158b6a484ba477679d85dae8e12152ea95893d0794c6cef4f1394f908b7da6d6bf34b59d8b33d8c392
diff --git a/dev-util/bpftool/bpftool-6.5.7.ebuild b/dev-util/bpftool/bpftool-6.5.7.ebuild
new file mode 100644
index 000000000000..49ed3957bd88
--- /dev/null
+++ b/dev-util/bpftool/bpftool-6.5.7.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_{8,9,10,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 3078588ad945..d91332d2ffe3 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,3 +1,2 @@
-DIST clippy-8.5.2.tar.gz 10076639 BLAKE2B 2e2aca4e42757f66c9ca4725826c6cc1d611930490eed2a175ca5b56910f2c09a9d842b2a9370a64a9fdac6a6314bd4573be609d14dbf956049d9fbf49310404 SHA512 1afa6ca1a41096aa47dc2fc39ab87290b3cbf634a1632e7910a5b69d2816998fbccbca616f261a410aa146a21dd26d12b7e6812da4ec08545b1500f8b546b972
-DIST clippy-8.5.tar.gz 10068379 BLAKE2B ed7aa538997bdbfde0370f36a8980ad3ae882a2325cdc7c3b2bdba9d6a43cd9ca04ff96b94b7827e06593a15c104cdadbd2632e136eb2d68e7ed87095a9294a4 SHA512 13e2ea8642fc00b565e9a36d2d59abe5d0e11caf646199cd928184fda2de004bda9892ae8a2f91870d5ac218bb127725663b693e4d764e5b21c942bb20b8d66f
+DIST frr-9.0.1.tar.gz 10334150 BLAKE2B c5f0d092421cdaea400e669973da3d53d9875871488be3b5e8c2c9afa78bf357a775671756eacb94372c5067a8a1284cb4feb4927988e0f1a42d19239a871f3b SHA512 fa1884529a98c8e5ad2dab7f6f67246844ea34ba4d68e3a907a01d43e0eec9317104107f5f18e4b61c11d2cbb4d20eac1e8aef6e4a2b2e54efcad245ee3fb6b9
 DIST frr-9.0.tar.gz 10332694 BLAKE2B 82221df6da189d5e687af4618af71933eb512413126dfb312bfcc663e5fc6f85e29c33da84117f40598452e6033cb24e9cba8d28f00d63fee2bf45a43babef17 SHA512 d3af6c24abbc8745f9646a22c023bd1d0e155776ffd09c9dd0b81b93c383723c9e7dd987319551db85dab5fd45d47cbcbf47a1ae1b6861cd7930bc27f18d2e25
diff --git a/dev-util/clippy/clippy-8.5.2.ebuild b/dev-util/clippy/clippy-8.5.2.ebuild
deleted file mode 100644
index b61d0a3f1936..000000000000
--- a/dev-util/clippy/clippy-8.5.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{8,9,10,11} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# standalone clippy does not have any tests
-# restrict to prevent bug 811753
-RESTRICT="test"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# bug #884291
-	unset YACC
-	export LEX=flex
-
-	econf --enable-clippy-only
-}
-
-src_install() {
-	# 830087
-	find "lib" -type f -name "clippy" -print0 |
-		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
-		xargs -I '{}' dobin '{}' ||
-		die "Failed to install 'lib/clippy'"
-}
diff --git a/dev-util/clippy/clippy-8.5.ebuild b/dev-util/clippy/clippy-9.0.1.ebuild
index 4a070b4bfce4..0f7fdc6f62fd 100644
--- a/dev-util/clippy/clippy-8.5.ebuild
+++ b/dev-util/clippy/clippy-9.0.1.ebuild
@@ -9,12 +9,12 @@ inherit autotools python-single-r1
 
 DESCRIPTION="Standalone clippy tool built from FRR sources"
 HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz"
 S="${WORKDIR}/frr-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # standalone clippy does not have any tests
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
index 778505f08068..7fc8e4f82c11 100644
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.14062.11-vc.patch
@@ -1,59 +1,73 @@
+From 9be3363c1f9f97627566d88a56e6e612a74691b3 Mon Sep 17 00:00:00 2001
+From: Igor Gorban <igor.gorban@intel.com>
+Date: Mon, 9 Oct 2023 13:13:57 +0000
+Subject: [PATCH]  Fix regression in release-build
+
+Thanks @frantisekz for point and triage problem
+---
+ .../lib/GenXCodeGen/GenXSimdCFConformance.cpp     | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
+index ade15972379d..c5572e758833 100644
 --- a/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
 +++ b/IGC/VectorCompiler/lib/GenXCodeGen/GenXSimdCFConformance.cpp
-@@ -1867,11 +1867,13 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1867,11 +1867,12 @@ void GenXSimdCFConformance::ensureConformance() {
          IID != GenXIntrinsic::genx_simdcf_unmask &&
          IID != GenXIntrinsic::genx_simdcf_remask) {
        EMValsStack.insert(*i);
-+      #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
        LLVM_DEBUG(if (auto *Inst = dyn_cast<Instruction>(i->getValue())) {
          auto FuncName = Inst->getFunction()->getName();
-         dbgs() << "Entry EMVals " << FuncName << " - ";
-         i->getValue()->dump();
+-        dbgs() << "Entry EMVals " << FuncName << " - ";
+-        i->getValue()->dump();
++        dbgs() << "Entry EMVals " << FuncName << " - " << *Inst << "\n";
        });
-+      #endif
++#endif
      }
    }
    for (auto i = EMVals.begin(), e = EMVals.end(); i != e; ++i) {
-@@ -1919,6 +1921,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1919,6 +1920,7 @@ void GenXSimdCFConformance::ensureConformance() {
      // been identified in the early pass, unless passes in between have
      // transformed the code in an unexpected way that has made the simd CF
      // non-conformant. Give an error here if this has happened.
-+    #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
      if (!GotosToLower.empty()) {
        dbgs() << "Not empty GotosToLower:";
        for (auto *Dump : GotosToLower)
-@@ -1929,6 +1932,7 @@ void GenXSimdCFConformance::ensureConformance() {
+@@ -1929,6 +1931,7 @@ void GenXSimdCFConformance::ensureConformance() {
        for (auto *Dump : JoinsToLower)
          Dump->dump();
      }
-+    #endif
++#endif
      IGC_ASSERT_EXIT_MESSAGE(
          GotosToLower.empty(),
          "unexpected non-conformant SIMD CF in late SIMD CF conformance pass");
-@@ -2460,8 +2464,10 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
+@@ -2460,9 +2463,9 @@ static bool checkAllUsesAreSelectOrWrRegion(Value *V) {
      auto User2 = cast<Instruction>(ui2->getUser());
      unsigned OpNum = ui2->getOperandNo();
      ++ui2;
-+    #ifdef DEBUG_VERBOSE_ON
-     LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
-                User2->dump());
-+    #endif
- 
+-    LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user ";
+-               User2->dump());
+-
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
++    LLVM_DEBUG(dbgs() << "checkAllUsesAreSelectOrWrRegion: for user " << *User2 << "\n");
++#endif
      if (isa<SelectInst>(User2))
        continue;
-@@ -3006,12 +3012,14 @@ bool GenXSimdCFConformance::getConnectedVals(
+ 
+@@ -3006,12 +3009,14 @@ bool GenXSimdCFConformance::getConnectedVals(
      }
    } else {
      if (!UsersToLower.empty()) {
-+      #ifdef DEBUG_VERBOSE_ON
++#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP)
        LLVM_DEBUG(dbgs() << "getConnectedVals: find bad users:\n";
                   for (auto &BadUser
                        : UsersToLower) {
                     dbgs() << "    ";
                     BadUser.dump();
                   });
-+      #endif
++#endif
        return false;
      }
    }
---
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
index 70aaf083a043..2e674bc43c4c 100644
--- a/dev-util/stripe-mock/Manifest
+++ b/dev-util/stripe-mock/Manifest
@@ -1,2 +1,3 @@
 DIST stripe-mock-0.173.0.tar.gz 1297798 BLAKE2B dffa959b7e221217f19c636f4c75cf4fa4ed453066085d2cf81d915d1da3938e3d7310bd0cba08e2f8da217f957b35f24019c33b5da12852bcd972d044d77500 SHA512 9c516bbeb9845a9ab3b870232020eed71387f7a4e3270af85d74acab103c71fd49791b6e22b44a5e6b1490fa01c2d5a9358f866b54e9faaf0af50dd7b67d54dd
 DIST stripe-mock-0.175.0.tar.gz 1345538 BLAKE2B d669af5ca5b38eeca5ce30bc4ce8b446bd49524ad89f7ee04c8bfd465202d4fc58f848abfe0410e463f58871da7e2c6f26b6db9155c3253ad0ae29f151e480ee SHA512 9ce0e90ea94a0bbcece43913da40b717d668650e05c264cb42cb08f6ef7d5086f5337388556d33d23262fc474945b1f622bab0fa8912303a8b66657fe4b9b828
+DIST stripe-mock-0.176.0.tar.gz 1388731 BLAKE2B 1e9265b0a1906a11f3c78c63d5426d00a9c1d06dfe3145c07d6f2da51eb2b660a93bcc33d7f8bfda402d590ac908a805a034e6111c3013ff0406aba4a304b80d SHA512 f53cb4f15d7fac9af0e89b50b8c08f4a4a1b10c81b723dbca67cec1d7eb276434b287a5863b2028fe3c29259ec588ef25e39a9a55fe913ba8e748c5c034e3e40
diff --git a/dev-util/stripe-mock/stripe-mock-0.176.0.ebuild b/dev-util/stripe-mock/stripe-mock-0.176.0.ebuild
new file mode 100644
index 000000000000..ca0f4e60efa7
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.176.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock/"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT ISC BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake build
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin stripe-mock
+	einstalldocs
+}