gentoo auto-resync : 29:06:2024 - 08:00:25

7 files changed, 82 insertions, 28 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index bcfe7cc944f6..4a2c9f746b75 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/bpftrace/Manifest b/dev-debug/bpftrace/Manifest
index ab1aca6d08cc..80e9cedfc5b3 100644
--- a/dev-debug/bpftrace/Manifest
+++ b/dev-debug/bpftrace/Manifest
@@ -2,10 +2,11 @@ AUX bpftrace-0.11.4-old-kernels.patch 563 BLAKE2B 3b2afb997119188e7095b24ec459f4
 AUX bpftrace-0.15.0-dont-compress-man.patch 1885 BLAKE2B 89a327cef68fa838d5c04b37e7bf72e6b03b54c244889706ba3c5156e2355d00cf395d14a6e8a7fe622e002acf9bab06dbc1427f6b637f0c59db86af08f05d51 SHA512 b591a73b0bbdd0105e6b87fb264ca4345e200ab58754d09a87dec79e60044eab165f2b34fe5ddc904cd877a460d5f41eef8b4d59eac255ea4f4e0fae37cf3511
 AUX bpftrace-0.20.0-install-libs.patch 13542 BLAKE2B 20919556ae2653228282ae099f9043e85f2c22bc16472021ef20f794eadf61a5fc765058294ec19e95cf73711c5f38353d28b1cc3c36ed4dee9324da4d15bc91 SHA512 12806b7b02cb9fb24df41e3cbfd19ae18ede5bbf55c9c29fc7897bdbcec6dd4ae771f9dc4e18335f4fa44bed014dbb59f5b090e1ac20ca78ba90e85b8ec7f864
 AUX bpftrace-0.20.1-fuzzer.patch 1699 BLAKE2B c41270a45536732920fc39c186ec21889ef398a54e7a1a25323e0c455ab799b3369297b2a65e5b84e36c5fbde64d0c43ebcc98f50770c2b759cc944341a29be7 SHA512 71c41cc5b52174ed5700064a1b9ecff8956f5689761da870d544cc89ce3af2d6d836ab089e24c0a05cf9c909ca785c044f26f5e8bb6a5b365ed4d100af3cc843
+AUX bpftrace-0.21.0-dont-compress-man.patch 1887 BLAKE2B 7437e270ccfb06e13ce8daa0238dcb58869f1816295c662cf6dbe45c05088b7d395c4341f4d99704be40d94bb682322d4a07d1f222facdc88ed06e951848bee8 SHA512 fb67dc37941b6e4921d0bedf8e2989abefbe8c7f2108fc8c2bc3571a840b45e2212c1b24740f5a9296e28beebd16b6a7aaa67328c34386f2822b2470fe2f09ee
 DIST bpftrace-0.20.1.gh.tar.gz 1233431 BLAKE2B fe9221a94d58b43e0311f8c841df8421c3fe226a3fe61f2ec5cce5de309acdb69a68834e92a2e622a1750975869cbdaa95a90f9afb83989aa61b56b551fa96e3 SHA512 fdcc2b0d091d4ab428207877626b0fb37f3e0778730e6a6db26be869a086264e1f24186857c47597813aacde98621a66301bcf6c8004f77bdf9ebf180f198ba0
-DIST bpftrace-0.20.3.gh.tar.gz 1233923 BLAKE2B c8a280441237d068029bd561a0fa70fd54676625c5bdd7d82a0a219d361cd71a460435ff05c865647d3e5c27d769ec296a47e5e7a3546fc8571af6a16d898300 SHA512 218a1bfac7e1a2b7eef5b0ed3e7403eed4bc932f2aa03c5f4c8924246c09088f5074ab3d54031e582cb4f8e7d0c7df1bb30007c2421c44d2c2506364f0ba5a0e
 DIST bpftrace-0.20.4.gh.tar.gz 1233327 BLAKE2B ef98dbae80285c42b6322c10666345600e594e7043184e7191c77a3158e8c188b7448a580c00b656c1c352601fc1898178d17a7f88f4f1f174187440074832b2 SHA512 a8d5b5bd7d35f9bb308cd7d0ae4eaee899312d3e6540164d3b29eac61159983ea01350311f53b7b6c5023844bde9a2cd3a2d50459116261a536c0e6e52963462
+DIST bpftrace-0.21.1.gh.tar.gz 1293781 BLAKE2B 154acfd076bd10d1ea7f81b77f8fe6b94812be7fc82bf798f508fa94a5558b068e1ec4bde7cecf51d1076593032d7674a5c0cde6432be7bb6dc4781656104915 SHA512 db6f5faf65fc2ac55ffbd1799b70941b8a6e4036c7fc2f56fe134f932dcf8a14fdd11a5a8b1d4b20261932d2d1ac18636cc1d7d4b87b31e366a9e53514a84ad3
 EBUILD bpftrace-0.20.1-r2.ebuild 1930 BLAKE2B d92cc08b503ccacab7525257c867f7f94e1ded719b5cb75d3cebca7ce91f2ef4e39e8c2333a35307630eccea0e0bb1c8adf9be041b46a77a108fa092f7f89aec SHA512 d21d001c3ab2b8ee6e5bc3bc54be9df7f90b487e766d7329d1990e17f84f10e0fafad4fabbc3948f66ec335b82be2667be30b2c207aa50d17cc20dd780013edd
-EBUILD bpftrace-0.20.3.ebuild 1931 BLAKE2B c8dd77de8c446c67949deede85d06d1e317f93193daf4f326aa8552f53b9640b393069f019acdb9ec3580748cb56ee96b45e91d5b00fef0a5ef1a30b1ff87fa5 SHA512 bcc3121f2a118dc249d6c9a56b858f277ba50bfa386cccbb9dd323e5ab21b8d8e65948362675034002f313a9b1b43e8a6b912c7b1882cf003eef63068d979bdc
 EBUILD bpftrace-0.20.4.ebuild 1867 BLAKE2B 2b1f8d14a249cb8c7651d548ea4921aa1384f7a0858fbce4f840f0d26c48dcffe488cd574efba7e73b5a80b88715a1a27e69293e8868883bb52c2afe4ffdc0a6 SHA512 e7750823cb0f4d7312126681ff68d83f725279fb8a5ecbb85bb5743d465e24497fea8747a6fb04a97f156466e83b1fc813c131a6a265c30eb11ef6e4411785f4
-MISC metadata.xml 385 BLAKE2B 625639d1899cc754d8622934822d467802c908ec386311103b8683c2bec45f1ac28b42704203ee97caacd08c6a96fcc84edde3dcc7b6f3f10f918cf67a656754 SHA512 7e15d98bff6109e41edd085924d9ac6a8bece5ff534e840576ca8c9d338f80e80a77b0ce7f822a8c10a41cb7d58a02a09ae54917136c450a98338124b7b24f9e
+EBUILD bpftrace-0.21.1.ebuild 1824 BLAKE2B ac40c774133b6b2912455a9d98b789f3cdf899e226e39c9fef289ce575aed1ca4260e1ef90d7b636eba2a99aa1fee9e49ab8a75036ed2639a2dfdaf3f99321e4 SHA512 c9bcc2f7dbd2d3a1244aa78c8c7a375854e652c7e2447fa8f1830b82028b94771fd335d8dd3b196f000fd907401a1562b8ce2c4afc437a68d48258c2989400e0
+MISC metadata.xml 885 BLAKE2B ddc2fa06dbbf2de6ebea4820a2755a7816786d13ae5faed0a30d74d1bd4f8670d94b8b184aa05cc5960c756a72a16d03817bd3db0e3544eafcd2d9932c7d605a SHA512 6bcec6b73627b3b9a44d75d96c1309c8e4e4d5f470c53ed911a901446bb500f20d91ccc135142e2d7b4471325761ec8face64a2bb6a16b1adefe98b23842bdea
diff --git a/dev-debug/bpftrace/bpftrace-0.20.3.ebuild b/dev-debug/bpftrace/bpftrace-0.21.1.ebuild
index 53f8faa529a0..bf07da70b442 100644
--- a/dev-debug/bpftrace/bpftrace-0.20.3.ebuild
+++ b/dev-debug/bpftrace/bpftrace-0.21.1.ebuild
@@ -3,23 +3,21 @@
 
 EAPI=8
 
-LLVM_MAX_SLOT=17
+LLVM_MAX_SLOT=18
 
 inherit llvm linux-info cmake
 
 DESCRIPTION="High-level tracing language for eBPF"
-HOMEPAGE="https://github.com/iovisor/bpftrace"
+HOMEPAGE="https://github.com/bpftrace/bpftrace"
 MY_PV="${PV//_/}"
-SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI="https://github.com/bpftrace/${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"
+IUSE="lldb test"
 
 # lots of fixing needed
 RESTRICT="test"
@@ -27,8 +25,9 @@ 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
+	lldb? ( >=dev-debug/lldb-15 )
+	>=sys-devel/llvm-15[llvm_targets_BPF(+)]
+	>=sys-devel/clang-15
 	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
 	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
 	sys-process/procps
@@ -51,16 +50,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-QA_DT_NEEDED="
-	usr/lib.*/libbpftraceresources.so
-	usr/lib.*/libcxxdemangler_llvm.so
-"
-
 PATCHES=(
-	"${FILESDIR}/bpftrace-0.20.0-install-libs.patch"
-	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.21.0-dont-compress-man.patch"
 	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
-	"${FILESDIR}/bpftrace-0.20.1-fuzzer.patch"
 )
 
 pkg_pretend() {
@@ -82,10 +74,15 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		# prevent automagic lldb use
+		$(cmake_use_find_package lldb LLDB)
+		# DO NOT build the internal libs as shared
+		-DBUILD_SHARED_LIBS=OFF
+		# DO dynamically link the bpftrace executable
 		-DSTATIC_LINKING:BOOL=OFF
 		# bug 809362, 754648
 		-DBUILD_TESTING:BOOL=$(usex test)
-		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DBUILD_FUZZ:BOOL=OFF
 		-DENABLE_MAN:BOOL=OFF
 	)
 
@@ -94,7 +91,5 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	# bug 809362
-	dostrip -x /usr/bin/bpftrace
 	doman man/man8/*.?
 }
diff --git a/dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch b/dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch
new file mode 100644
index 000000000000..93bcfcf73e31
--- /dev/null
+++ b/dev-debug/bpftrace/files/bpftrace-0.21.0-dont-compress-man.patch
@@ -0,0 +1,47 @@
+diff --git a/man/adoc/CMakeLists.txt b/man/adoc/CMakeLists.txt
+index 1a81dee0..c93ccbd2 100644
+--- a/man/adoc/CMakeLists.txt
++++ b/man/adoc/CMakeLists.txt
+@@ -1,7 +1,5 @@
+-find_program(GZIP gzip REQUIRED)
+ find_program(ASCIIDOCTOR asciidoctor)
+ file(GLOB FILES *.adoc)
+-set(GZFILES "")
+ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+   foreach(FIL ${FILES})
+     get_filename_component(NAME ${FIL} NAME_WE)
+@@ -12,14 +10,9 @@ if(NOT "${ASCIIDOCTOR}" STREQUAL "ASCIIDOCTOR-NOTFOUND")
+       COMMAND ${ASCIIDOCTOR} ${FIL} -b manpage -o - > ${MANPAGE_FILE}
+       DEPENDS ${FIL})
+ 
+-    add_custom_command(OUTPUT ${GZ_MANPAGE_FILE}
+-      COMMAND ${GZIP} -nc ${MANPAGE_FILE} > ${GZ_MANPAGE_FILE}
+-      DEPENDS ${MANPAGE_FILE})
+-
+-    list(APPEND GZFILES ${GZ_MANPAGE_FILE})
+   endforeach()
+-  add_custom_target(adoc_man DEPENDS ${GZFILES})
+-  install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++  add_custom_target(adoc_man DEPENDS ${FILES})
++  install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
+ else()
+   message(WARNING "asciidoctor not found, building without bpftrace manpage")
+   add_custom_target(adoc_man)
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index 2a316cd9..2207cf80 100644
+--- a/man/man8/CMakeLists.txt
++++ b/man/man8/CMakeLists.txt
+@@ -1,12 +1,3 @@
+-find_program(GZIP gzip REQUIRED)
+ file(GLOB FILES *.8)
+-set(GZFILES "")
+-foreach(FIL ${FILES})
+-  get_filename_component(NAME ${FIL} NAME)
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    COMMAND ${GZIP} -nc ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    DEPENDS ${FIL})
+-  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
+-endforeach()
+ add_custom_target(man_man DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
++install(FILES ${FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man8)
diff --git a/dev-debug/bpftrace/metadata.xml b/dev-debug/bpftrace/metadata.xml
index 3e240d7784b1..faa36d662473 100644
--- a/dev-debug/bpftrace/metadata.xml
+++ b/dev-debug/bpftrace/metadata.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>holger@applied-asynchrony.com</email>
+    <name>Holger Hoffstätte</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="person">
     <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
   </maintainer>
   <use>
     <flag name="fuzzing">Build bpftrace for fuzzing</flag>
+    <flag name="lldb">Parse debug info using<pkg>dev-debug/lldb</pkg></flag>
   </use>
   <upstream>
-    <remote-id type="github">iovisor/bpftrace</remote-id>
+    <remote-id type="github">bpftrace/bpftrace</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-debug/ltrace/Manifest b/dev-debug/ltrace/Manifest
index 76544f73735a..08c1f57c59af 100644
--- a/dev-debug/ltrace/Manifest
+++ b/dev-debug/ltrace/Manifest
@@ -10,4 +10,4 @@ AUX ltrace-0.7.91-test-glibc-2.33.patch 351 BLAKE2B 8daacf679828735a37ec062ce775
 AUX ltrace-0.7.91-tuple-tests.patch 431 BLAKE2B 452e19ff22cd4453e73f1652777ffd998c3af1bb510815c5867a38b53cc25924a02aa055bb335491b0292c430749db6febca79222d1669a3f416ff1dcde4c715 SHA512 6ec368bc19f870322e21d05a409b29aa1064c8c901c98d4281a35513149bc6104282bb4b655506fdd22dd305edb10d438416e2f42bf65cd59748c17ce5a386d9
 DIST ltrace-0.7.91_pre20221216.tar.bz2 288077 BLAKE2B cadc2ac551a96dfa95aee0d0eb251d8f41a8631350ba3be3f67d0cb10774a3db6abbd42481d24febdfcb0d565107e66b4de0056a85a7954bb050adb8e8fa5b4a SHA512 993c247797551b4fbb202c04f9af08063c8641946825b17d1f32c4647c606ece803a6b049c4afa3046c798add161ab58f01d90106f3b6029a223af03bca27a99
 EBUILD ltrace-0.7.91_pre20221216-r1.ebuild 1732 BLAKE2B 23c02f090da9a64747dd5c932295329f59b422f3495515407853d24f9046be35212683ce4b7f751e04e4990ea9ba512fed48f4b5fb6df44b6325f4ff6903d83b SHA512 f8d2f2af42a13178ce16a0807656ef4d473c9de3c5363ad3deedd0de1e40b4d21691754286e199c24bd6ca8c96b9ca8feddec2a4de566ab8c3c5b86d47b70008
-MISC metadata.xml 537 BLAKE2B 24953f8433b61bae5b1405f07bd321b6a2c284a3c20076c2f4263ed68cd7185fa51866aea595a616a15b6195b4841c8a5df61a075f00457b550b529ba2a39664 SHA512 5003800cc9a96fe56b72060bd439922dae92d8066ceee0cd90bbcc082c3db46de50cf53cbc05e9b840799d80362a5176a2c659b03846fd8283acec292898bb7b
+MISC metadata.xml 459 BLAKE2B c7c2e4216c5453527c7b8760ebe4ad81bfbaa7a7407b2fa1feb18ef2d6f2a7ea99b1baf969a6ce2f39c6aba3c57d2b3f88b1a631750aa938baf931bfbf280720 SHA512 61e4b1d2f4be5fdf9e0d38c80a8f14670a6bdb614383a02a40f39d7cf9337980d39748be8bbc8431a2ef7cfcd2ca4032cca61b7050bde369c97995c1a105226d
diff --git a/dev-debug/ltrace/metadata.xml b/dev-debug/ltrace/metadata.xml
index e7ef67f97d07..e5a4079eb30b 100644
--- a/dev-debug/ltrace/metadata.xml
+++ b/dev-debug/ltrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="gitlab">cespedes/ltrace</remote-id>
 	</upstream>