From 9d0673651c57438d51e18c6b8ca894d0491b2df3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 24 Aug 2022 20:48:34 +0100
Subject: gentoo auto-resync : 24:08:2022 - 20:48:33

---
 dev-util/Manifest.gz                        | Bin 68493 -> 68490 bytes
 dev-util/bpftrace/Manifest                  |   2 +-
 dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild |  93 ++++++++++++++++++++++++++++
 dev-util/bpftrace/bpftrace-0.15.0.ebuild    |  92 ---------------------------
 dev-util/crash/Manifest                     |   3 +-
 dev-util/crash/crash-8.0.1.ebuild           |  16 ++++-
 dev-util/librnp/Manifest                    |   2 +-
 dev-util/librnp/librnp-0.16.0.ebuild        |   2 +-
 8 files changed, 111 insertions(+), 99 deletions(-)
 create mode 100644 dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
 delete mode 100644 dev-util/bpftrace/bpftrace-0.15.0.ebuild

(limited to 'dev-util')

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index df85c82e82d7..bc62decfee68 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index e0b6f4a13189..4cde796a0850 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -3,5 +3,5 @@ AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b3
 AUX bpftrace-0.15.0-install-libs.patch 8206 BLAKE2B 9d8b193f422b0ee64301b7ea12791afdd5111cde487b904ec35750e6189fdd6faca9af36b8956058c820c2398bcabc7dcee6d26b93c55ff1e591b3259a682a27 SHA512 9721d8f3812855d7a9155d8e5ecac305dedb5c8326ccf8ea679048f920ca58a774576840c1b0bc2864a26c66c89bf0c81ed1a1ab30fb571a6cfaebc5b499c2b7
 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
-EBUILD bpftrace-0.15.0.ebuild 1851 BLAKE2B 29ec8eeb90ec974e7ad54ad64fb5cc652fea32534dab661b34567a2a9a3e2ca6f642fc2916d59dd8ab3df501ac6927a2a68358ceea2d4dbcd29902ed9d60e29e SHA512 42cbc3baa5a14d421941bae00b300ded638b76809b60cfe8751610b5e8523327c30b209a2e94dbbd1f7a81e610b52b141b6940a3d9be2792d0ab4094bd2a7352
+EBUILD bpftrace-0.15.0-r1.ebuild 1875 BLAKE2B 095b7fdbc206dd65f778addbc236da43d8465e7b07ab958de48c537842d9d93e9afd1c7359b48955126eb38c21bf0a61e2606c8bd1629f9561f5ef367344009e SHA512 6ff4b6726208920ead3bd07f83471ffeb6b0b7f952dc445d094a4729a7822193ee1bb8b2313aac8e3b310599954fe5e220c5688a0a7eb27b887bc3a0de5c9202
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
new file mode 100644
index 000000000000..1b080a8637d2
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.15.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LLVM_MAX_SLOT=15
+
+inherit llvm linux-info cmake toolchain-funcs
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="
+	https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
+"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-0.8:=
+	<dev-libs/libbpf-1.0:=
+	>=dev-util/bcc-0.13.0:=
+	dev-util/systemtap
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-apps/sed
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.15.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_SHARED_LIBS:=OFF
+		-DBUILD_TESTING:BOOL=OFF
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/bpftrace-0.15.0.ebuild b/dev-util/bpftrace/bpftrace-0.15.0.ebuild
deleted file mode 100644
index cb4b8281e70b..000000000000
--- a/dev-util/bpftrace/bpftrace-0.15.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LLVM_MAX_SLOT=15
-
-inherit llvm linux-info cmake toolchain-funcs
-
-DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
-MY_PV="${PV//_/}"
-SRC_URI="
-	https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~chutzpah/dist/bpftrace/bpftrace-0.14.1-llvm14.patch.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="fuzzing test"
-# lots of fixing needed
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/libbpf-0.8:=
-	>=dev-util/bcc-0.13.0:=
-	dev-util/systemtap
-	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
-	sys-libs/binutils-libs:=
-	virtual/libelf:=
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/cereal:=
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="
-	sys-apps/sed
-	app-arch/xz-utils
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig
-"
-
-QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
-
-PATCHES=(
-	"${FILESDIR}/bpftrace-0.15.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
-	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="
-		~BPF
-		~BPF_EVENTS
-		~BPF_JIT
-		~BPF_SYSCALL
-		~FTRACE_SYSCALLS
-		~HAVE_EBPF_JIT
-	"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-}
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DSTATIC_LINKING:BOOL=OFF
-		# bug 809362, 754648
-		-DBUILD_SHARED_LIBS:=OFF
-		-DBUILD_TESTING:BOOL=OFF
-		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-		-DENABLE_MAN:BOOL=OFF
-		-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# bug 809362
-	dostrip -x /usr/bin/bpftrace
-	doman man/man8/*.?
-}
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index acbbbcc63b27..e06bec994c97 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1,11 +1,12 @@
 DIST crash-7.3.1.tar.gz 1329499 BLAKE2B 9c9fd88d7f8874557b99a173b4bd615bb5d41d35b051ee6e82c10a8928b150861dbfdecb3ba94e1367c62c6bb8583c85d39ce7015945d4983d3ce1e1d86dac78 SHA512 018fc33daa144906a29120660951755856169be3df123bcf2bec9c1c4586a18f528c14634f794e658d3dab308419b7a6a7f56b9b0ac5aad68b5ff18ae442f63b
 DIST crash-8.0.0-patches-1.tar.xz 38880 BLAKE2B b1b22a55f07e7c23c90d13769cdf0db92d3015d5aa5af20bef85394013635bb393c4bbc36fb0af2a925b59b98289e33b3c092ca39c9c90c7213ba5e4b9af8b74 SHA512 17f638c4a5d2cff472a75f58d82d3b7325e6cf9444641c85ec6a3be5b4980aae90ec19dae66ae4b5022f938faae6876b4b50c0b791087fbd20629745b9909ac6
 DIST crash-8.0.0.tar.gz 1281026 BLAKE2B bb86bc64d04ce136295bf57097674e96d29e5c934b2fc55f2bd5fa331f2d0086929e1fc7ce60b75b4df1ded128e71048e555bffc3321f6f860d00a8fae8bc09e SHA512 c52afab6c8187dc0c44a13b2a5b33bd7df33d9ee12bcecc6b7e94e8bc98d9470c134cb0fbe941b750f36a66028aad718bfd6f1a00524ad38ce43d1f278048a3b
+DIST crash-8.0.1-extra-0.tar.xz 19152 BLAKE2B 60e40fa646f19fe1c5c120812f25c9b1ca3ace975decdeda3c4914ee730a15faf374c6400419ec5d2923c6c79a13d4c63b03fbc4410b2bef5b166015560e63e6 SHA512 1797f6200b7ef9c9bd1e3c1efe499f5d9c5fe70213f0adac55a763f3b8675e4eccf04a62223e321c5d23a426e214860205222e78ce6f36c0dab2f7bafc141824
 DIST crash-8.0.1.tar.gz 1293336 BLAKE2B 97c2e6e9f8407d6f310afb120c9609f845fb4395543634dfca5bf1278aecacb2fb30ead890f72ac476674ffd9df189e26e4261f09c577e0fcaaaacfe120fe6f1 SHA512 ef9fe84dd5efa1b0570f71a8dd7af398a2ff35e9dc9fbcbeafd0f5ff503c7c4da93a33ffddfbac672fe12788dd3712808d6726ba9161ce282a7c76c3e2dc0793
 DIST gdb-10.2.tar.gz 40267550 BLAKE2B cee3ab45a52ed378fc718e49c4d153393200fd1b85306888e4085919ab27277bb85d66f9297e6d0aaa1fb47d65fc31d4b97a2fc476e2ccedd4dba0fbec778ab4 SHA512 aa89caf47c1c84366020377d47e7c51ddbc48e5b7686f244e38797c8eb88411cf57fcdc37eb669961efb41ceeac4181747f429625fd1acce7712cb9a1fea9c41
 DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
 EBUILD crash-7.3.1.ebuild 1049 BLAKE2B 87fac2ac007629723f10c252808eb104bb3b90695cb9c847c35b169103fcc8b652619eb789a58c5232142fb56350404c0b3d2f3ff9f893ef148cdd4ba6c745f7 SHA512 6d705509862b013b9882194520691958abf108a45ff4828f98c1392b54ff1a33f51e45dd69e3aa2fb71a156d1ec9fa371186a760c1773df5e4521f403b3161da
 EBUILD crash-8.0.0-r1.ebuild 1179 BLAKE2B 50d3e7be37ea782f0c02e64d6ab2274f3b1348eeeb93d72e9e8c8c2e44383038fd5b196a3478cbc5400cdea72a05b35f5da1596492949ec7e5b7ec0a03173cda SHA512 689bda50c66921eb02b0abf0788e4befe92e3b98fe527d5881ee4f8a479df9d4c67055be714d8df7b12fcb2e842f1376b33aacaf6574efc6da0c96a665c5a10b
-EBUILD crash-8.0.1.ebuild 1355 BLAKE2B 4d099dafae243c04dd319160a0fbaa29372d676ce1386979954a6cf9da7a14ee6435a26ee815ec2e04f7a1f22338c14754d5affb38514dbea22bce14d2e4d77e SHA512 01113ef44d2fa22165612c169a94fbb08a04e997b7b80811eef89f3efb27e7831d869d2dbe596112cd912c80f4370f2663665f29a926bbf4870be43d1bfd69e4
+EBUILD crash-8.0.1.ebuild 1675 BLAKE2B cafb83bb7a1fffa4bcac72bac03f6f521bc87c4753ee1b1a971d95b0cc1b8c119337968ce766afed42fccc2ffcf87df8802b72f6584890ced95488c524befc08 SHA512 805a982d7872efe4343f1571170712a69a9f5e409fbc15ca398d5eec862fdf809141276795442a3d655eee77012190c842dcb21faa864f503c8138f7bd820388
 EBUILD crash-9999.ebuild 1051 BLAKE2B dc00010d83da71a08cc149a223e512689db4904a68e7dcfe0316becbb1ba4cee349f013805559a1d2326d7be77005f0dc8b953d497e5f0b8f90669992cedf07b SHA512 865d0b6d2ce1ccb6924326772607ca5f60635a31e53730a69a8f5394902a1738b29bda934e22dbdf0ab02dc17c64e91d9f24ab780e73f3fd24dff98673c1ac0f
 MISC metadata.xml 641 BLAKE2B 48301b1c1db0805eb7514f7c41f40f31535652ef57e09c227b939470259c891333bb96a288b1eee725f9b93c3640efd28df94eccf2f8996e3e85412c7b015181 SHA512 2aefb1422f38b6532a11bfb508c1c13c1ca85931ebbe47d93f2f193df5f7a4e622283425b68d898ce7921c301d8d5937c2c5c848917e5a0e3f2f13de03ab310d
diff --git a/dev-util/crash/crash-8.0.1.ebuild b/dev-util/crash/crash-8.0.1.ebuild
index 7cb2b455d1a8..eea9dfb346d1 100644
--- a/dev-util/crash/crash-8.0.1.ebuild
+++ b/dev-util/crash/crash-8.0.1.ebuild
@@ -6,6 +6,8 @@ EAPI=8
 inherit toolchain-funcs
 
 GDB_VERSION=10.2
+UPSTREAM_VER=
+EXTRA_VER=0
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
@@ -14,12 +16,15 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	[[ -n ${UPSTREAM_VER} ]] && \
-		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CAT}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz"
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-${UPSTREAM_VER}.tar.xz"
+
+	[[ -n ${EXTRA_VER} ]] && \
+		EXTRA_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-extra-${EXTRA_VER}.tar.xz"
 
 	SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-		${UPSTREAM_PATCHSET_URI}
+		${UPSTREAM_PATCHSET_URI} ${EXTRA_PATCHSET_URI}
 		mirror://gnu/gdb/gdb-${GDB_VERSION}.tar.gz"
-	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+	KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~riscv ~s390 ~x86"
 fi
 
 DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
@@ -40,6 +45,11 @@ src_prepare() {
 		eapply "${WORKDIR}"/patches-upstream
 	fi
 
+	if [[ -n ${EXTRA_VER} ]]; then
+		einfo "Try to apply Crash's Extra patch set"
+		eapply "${WORKDIR}"/patches-extra
+	fi
+
 	sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
 	ln -s "${DISTDIR}"/gdb-10.2.tar.gz . || die
 }
diff --git a/dev-util/librnp/Manifest b/dev-util/librnp/Manifest
index 3b5578dfbd19..d19fa4767506 100644
--- a/dev-util/librnp/Manifest
+++ b/dev-util/librnp/Manifest
@@ -1,3 +1,3 @@
 DIST librnp-0.16.0.tar.gz 2755417 BLAKE2B bdd06b1bd20ae816b54be19fa844767e9978eb387487db85db2dcd699da1d1b426455565a6c0508bf3782e07317d3bf6ae3613ebe6f8721f80849cb985e7850f SHA512 3d1ba077f85b08ca308d0ebc6499b3a2f32db38f0fd3abbfa7c38277d4552d2bcb7b2e7d07b7fa3222130af347b73d853136974ec289d6de3e97c1e18e407b36
-EBUILD librnp-0.16.0.ebuild 1014 BLAKE2B ceb247ae2cc63bcc96b9ddf9add1ceff3fe5d34e4790f375bb5c570414a06c57803214b3e446c6161d4182e76a983e08072c01c7f9a55e29bbdff4e11c9ed36b SHA512 9aeefa39a3245fc7f556b8e26772d567d650a64a3a978b607407c6e1de2be65ecbf88c02d0265841cd7be8817f49decefd302a3cacff3049c92c62c5f257892c
+EBUILD librnp-0.16.0.ebuild 1021 BLAKE2B 9e608b9c201584ec17ccef7d08f16901d35464628778e7b4bb021ebfcfe9791a4ab838259e4c9a1709fd01849546a36134a70918dcbe4fa21c0daaffcf629bb4 SHA512 ff997a44da8262838135052fbc8b67f90a7d3262ddec9a8728377289dda33ca2b88e881dd67a1b260ca0faf1ca38cd36128b06f8db6ebd430b26e03f7c9cb400
 MISC metadata.xml 339 BLAKE2B 435d74e705e406e63a6349676c46f3a9ce2fb6b3952bd36d31372cadf163ab1f61ba7bfb4de16e4586695783cf9bd3cbd29b67bfe236c6e1fb52e1e2edab14cc SHA512 5431a0d99435dd7001c179159cb728e2b0af71c0c3df23856e1cbc794af2b0808b046de6ead30a8679cace52f67667f5ab634f9ffb04efedf4f24a247eb4f211
diff --git a/dev-util/librnp/librnp-0.16.0.ebuild b/dev-util/librnp/librnp-0.16.0.ebuild
index 227a3aa3bf2f..db950da4873c 100644
--- a/dev-util/librnp/librnp-0.16.0.ebuild
+++ b/dev-util/librnp/librnp-0.16.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rnpgp/rnp/archive/refs/tags/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0 BSD BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="man test"
 
 RDEPEND="app-arch/bzip2
-- 
cgit v1.2.3