6 files changed, 130 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 862eb6b894e9..09858acced4e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 9c7ec1522c4b..dd5dd158da75 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -7,8 +7,10 @@ AUX bpftrace-0.17.0-llvm-16.patch 852 BLAKE2B f429d6b0f80e96ed51813ac257fe6b3b71
 AUX bpftrace-0.17.0-use-std-optional.patch 1832 BLAKE2B fbe955e32135192b9e058f5b6fbea1b43608ac4eb7f8e30d157e8679350040b3919ac96a5d74b86ffddb5ce2e39d52bc1feece2a77b101b4b8eef6093e85ea49 SHA512 0325101a220996090e60b1681f97ac6587babf559b6cd814c8ebbcfe144ed9af9f9e3eace179e0a3f399e862392c8bbf6a344fa80006137717a8bdc0d3a2dfa5
 DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
 DIST bpftrace-0.17.0.gh.tar.gz 1033934 BLAKE2B 960582096fcf1652a65c4f8e18dcc5e17792c3b5c048dff59465fc1fc43d39e033c06ebc5c9bc88310b429a81fac5a8cfcdc261e7f0dcdcba4823b518f74fa3e SHA512 b1c8fc81b23f38bc45b4e73edd29c4cd0775e703b368612f00902fbda39dc3758038cd7afa351c1711cec467efd2a199a6b8b933b03aebd591d230d533e190d3
+DIST bpftrace-0.17.1.gh.tar.gz 1035345 BLAKE2B 5dca6f3fc49458b4b2ed3068e3f99f1156067c430af36b53949e469a870101d2da6aba6c4d18bfaf173cc45eab18e3c316966a5e222a4b4cea98363a9afd90ce SHA512 57f00a0b209d745efe5ce39d0e8efb90a21b5c499b41385814378d828ef507dc2c6d9497f9d23dbb610fcff21f077cba9f7481e7a6a6465825065743289ef4ad
 EBUILD bpftrace-0.16.0-r1.ebuild 1740 BLAKE2B b798c92e0e80396c069d83b1f9d55d019382a4f3615c4a064d9b0c196c010c4399d488c41ef403702a5e3ccdff14d1cd4466a8b0d6cdb25902b48498197120b7 SHA512 0b252876bcd309520eb3daa4216cf21e1d8b1eb2ea0e33f5abe3b5d48cf32e8c5e5739f46c395f4678c64e39841e87093b829269563eadd51bdb10acf0b51d3c
 EBUILD bpftrace-0.16.0-r2.ebuild 1791 BLAKE2B bd0db18452f6d36ea37658b477219fc10edb329b17aa0fb6f26bce4578c9ddba88915e0a026fd190fcb5eba8bf005d930d6fcda590da623725a8254e8f224f30 SHA512 569974b254bd1ffc50018bc66edac49bb0f2c07a8990caded28fdf24f5728b16df08cc20157f07e248eb960291ecf9c8f5782bc4e1701ce2e8631f0abcbd8164
 EBUILD bpftrace-0.17.0-r3.ebuild 1938 BLAKE2B b4849d7b719f8f95a77bbfe58ec2a17cf1d2e8e8460f14a2dd24a3a075a90760300aa4e898319ce101d4953ed3c7e08711839b125d11f59d1090c97a48c8410e SHA512 72e87b86b90dced3a5904bd56415390763dfe7e47f1bd4a933d193a48c6e8e9ae144e6172fd1546ce9c28f9e1388c7c6e297e468f339fe00322bb34aa936c2c1
 EBUILD bpftrace-0.17.0-r4.ebuild 1934 BLAKE2B 97786852a27191f1d21618033a15c0a0da7a043cb6abc71f15240f7de4720a77139f4ace5d5f049f987ba60b7fb59eb8719b2b837b7d1cce7e98c72793f8eda0 SHA512 89e195cd57c499738f5e27137f3f0c640c1230a739fe6d4ccd264587eecd4a9ef3ba88aab67644c30cfe3e3456ea8114d8fa1eae9628fe8498bd51c8c3516fa5
+EBUILD bpftrace-0.17.1.ebuild 1934 BLAKE2B 97786852a27191f1d21618033a15c0a0da7a043cb6abc71f15240f7de4720a77139f4ace5d5f049f987ba60b7fb59eb8719b2b837b7d1cce7e98c72793f8eda0 SHA512 89e195cd57c499738f5e27137f3f0c640c1230a739fe6d4ccd264587eecd4a9ef3ba88aab67644c30cfe3e3456ea8114d8fa1eae9628fe8498bd51c8c3516fa5
 MISC metadata.xml 499 BLAKE2B ce7c46f4c5e49f2f779ff6584053f7fc78dffaeee432ac46a8881b3d49dc569e309af95aaf9d6e77a36ebc87be0cd2f86a5db7b733463e4252d3a242d914f293 SHA512 dfb827afd47feb8204ef40c940ebcc7d1b3217cdf0f24425e4ab32195309d727225e942d777871565e47a2c02244d053f46ed25165e9728c94e0683ff61bf4ce
diff --git a/dev-util/bpftrace/bpftrace-0.17.1.ebuild b/dev-util/bpftrace/bpftrace-0.17.1.ebuild
new file mode 100644
index 000000000000..21b7e21bf0fd
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.17.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+inherit llvm linux-info cmake
+
+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}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# remove keywords until build works:
+# https://github.com/iovisor/bpftrace/issues/2349
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.1:=
+	>=dev-util/bcc-0.25.0:=
+	>=sys-devel/llvm-10[llvm_targets_BPF(+)]
+	>=sys-devel/clang-10
+	<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="
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="
+	/usr/lib.*/libbpftraceresources.so
+	/usr/lib.*/libcxxdemangler_llvm.so
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.17.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.17.0-llvm-16.patch"
+	"${FILESDIR}/bpftrace-0.17.0-use-std-optional.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 mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+		-DUSE_SYSTEM_BPF_BCC:BOOL=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/huc/Manifest b/dev-util/huc/Manifest
index 977d16a80768..39cfb2cded54 100644
--- a/dev-util/huc/Manifest
+++ b/dev-util/huc/Manifest
@@ -1,3 +1,4 @@
 DIST huc-0.1.tar.bz2 8367 BLAKE2B d29c4414849d9f0ad23ec8ecc235833a301631755dc1d0a27fc96fdf28f2899595de92f30c0895fa70136f1ddb5ce8ab3e8cda309686708b4493640c0a31bc79 SHA512 711266edfdec572aad877230653248b02cc0b989f1cf2766bf6cc4e196dcd02ba4bf148849d360457fc396de18f0bd0b6f7a26ba3c13a159cf26ece7c356c225
-EBUILD huc-0.1-r1.ebuild 496 BLAKE2B 68511432968477034b0dff3848aa66d68836dbfc10bc64f557a516d8af47f5411196a7b5de2948692009b7a9344ec11e1a63fe681a15cc5746989815e8ac855b SHA512 892753bfac5422d9e6e8381d3699d666e588d73134fec247a3a34d0a28444c8abbe21673dc949fdd5b7cb319f30c8820afb728a401610879febfdfb451b896c4
+EBUILD huc-0.1-r1.ebuild 499 BLAKE2B fa69a01ae157340731d1a456746ea4fcc00c062b0b974440394755c33edb48d0e0d403e77103ca89df5661175ec5950ec03b3c0515dfbb977bf960fc03b1bebf SHA512 b142a4520caa6d3b160594ef8c8fc5b15a6db234ef0bd4192468cd4fe4ccfb4e0579be4fa6e3c2cdc5a69c7abbd607b799341e2266fb34f5650fa448fa35fa4a
+EBUILD huc-0.1-r2.ebuild 503 BLAKE2B 59e257d0149a1e31149aba32a85bd819b1c29cdaa1bf23cfeaea030aa9b7a260a9b1a6af4096beac826b6ba8ebd263b06480f5e5ff0573938efc0153820f4b39 SHA512 ab784b3cf102610fca9cb5fdc5d2825fd402d54b1f778f6f49b71e9cbaf4de4ea8036a1ed9642ebcd58cdeee911b740f8ab00947789541450f89b4c11b53ed31
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/huc/huc-0.1-r1.ebuild b/dev-util/huc/huc-0.1-r1.ebuild
index c74f4c65b7ed..69788f08447b 100644
--- a/dev-util/huc/huc-0.1-r1.ebuild
+++ b/dev-util/huc/huc-0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,11 +6,11 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="HTML umlaut conversion tool"
-SRC_URI="http://www.int21.de/huc/${P}.tar.bz2"
-HOMEPAGE="http://www.int21.de/huc"
+SRC_URI="https://www.int21.de/huc/${P}.tar.bz2"
+HOMEPAGE="https://www.int21.de/huc"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 KEYWORDS="amd64 ppc sparc x86 ~x86-linux ~ppc-macos"
 
 src_compile() {
diff --git a/dev-util/huc/huc-0.1-r2.ebuild b/dev-util/huc/huc-0.1-r2.ebuild
new file mode 100644
index 000000000000..50a2ea0f13bd
--- /dev/null
+++ b/dev-util/huc/huc-0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="HTML umlaut conversion tool"
+SRC_URI="https://www.int21.de/huc/${P}.tar.bz2"
+HOMEPAGE="https://www.int21.de/huc"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+
+src_compile() {
+	$(tc-getCXX) \
+		${LDFLAGS} ${CXXFLAGS} \
+		-o ${PN} ${PN}.cpp || die "compile failed"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+}