gentoo auto-resync : 22:11:2024 - 03:03:01

8 files changed, 181 insertions, 12 deletions

diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 1b94a7016b92..fc68b3aca684 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/systemtap/Manifest b/dev-debug/systemtap/Manifest
index 339d8f7ce432..b42ef8555004 100644
--- a/dev-debug/systemtap/Manifest
+++ b/dev-debug/systemtap/Manifest
@@ -2,9 +2,11 @@ AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45
 DIST systemtap-4.8.tar.gz 5628003 BLAKE2B 9f5050eba29d390c907b117187f94ef088f16bb739b4971bc32ffe88b1024a4157cd4e9793a8fc1e149a5a182a28330e3b4fd9d51213bb3637d616fbb9867f6d SHA512 fdcbc48ba17b2155c1419d99147a4cfbee2e69db945bfd0e6881b71ab11165bd23ea7ce9456856ae36807fb18f9934880a6b7c44456b63833ea260038744d9f2
 DIST systemtap-5.0.tar.gz 6572411 BLAKE2B db962df2fdcbc5bc11259c03d78073924f03fee4434dca8686a62fcb0818dab1ca91558160dd9d67d43b709f63ffe4f0af30ab1fe6965e19155bdd4c04501a04 SHA512 dc511a05e66abcbbd8c926973962751196180f3c571d0cd2a3b158ae367c5339ad32967a680ecd03224ab5f7ed2c55be7064867e4fb1b1cd7ea1cb21b2436e4c
 DIST systemtap-5.1.tar.gz 6590820 BLAKE2B 22be535b7c55d0ab90a5361a23fad93c436560c14fbbd345aca7ea2c0fcdd0f66b1ef8591800f86a14cc7ae7fe737a120695d76fe15bfdb8b349080228c37e90 SHA512 da0fe237d2124031a5786d1221dbb420d90da5497376715fd43a7a9f61a354a229c1128e67ce6becbc012aa3796dc5d337149e239e3c1def0651b179e5bf199f
-EBUILD systemtap-4.8.ebuild 3274 BLAKE2B ed2b063d3e66f45c3b0554a00eeeaa03fdd13c2357c1ec4d4b1a63e8ba2da9e300da6c2a8000bf4ae3409136fd6541a3d0c8a5de39223350e3e714ae18037836 SHA512 91704a543a0819ca4c58994e3b1c80bba28b320b4e56d766a0d749ebd901693d4a01f2003217f5c3ba29f3f890641357ada87c7ee53372b6e6c99a28c6f349b9
-EBUILD systemtap-5.0-r1.ebuild 3755 BLAKE2B ac6d88f04ee964efd407c2e0a12d1eb68cfc11c4e9f6a11dc4782d96e6f2e19b2415bc21f2dc99b036f2926a468a311ef0a53c7de42ad0c6c63c426006ee06f7 SHA512 3552e1f67d7814f8a30786290094e8ab1e732fa93b7e655e6ca098521b9e3c7cef0a4352f5ffb099b69b1706ef1681408c2db025a189977dc0a2244b96f6d9a0
-EBUILD systemtap-5.1-r1.ebuild 4307 BLAKE2B abd4e378a12fde59719bfaf7c82ce816d5ad39f1999596690cf6f83b9d56c2c3a7e161592405f8597522858e3289bcc7796682399a94d7653d97b1e1026deb72 SHA512 b768b7e9a3a0f5e2f9a53cc67d49f0dadf4609abbd211d9e175d769584b71d55b146c1580337873fae07403314af99010069bc1f20f50e8e3543a8e790b8b7c1
-EBUILD systemtap-5.1.ebuild 4055 BLAKE2B e5b32f86516d40be340d75f7a2b70de85bf21080583c632efccd86d84e834c2f022d11bd49241f2c0b1df4c39e61c46b12e6279b0e1e3657cc99c2fb38a70053 SHA512 7c6265ac8275d81db9aed59d9982861c8c3725cf26b0ea31171b253df5e2a2daf5faac88ee8d8bf973bdbeedfb41fbc14280d028581a2208461542e2bd2dc608
-EBUILD systemtap-9999.ebuild 4308 BLAKE2B 266b0307ef618231cc30c6ecf29d94d83f0eae6e7b6cb4ea1c0ef94abda267c59fc5dffe9c8915ca062fb62814601277553bee047aac281735b3c282e330a53c SHA512 18b51ebe6cd52d98e5265458a47567d1f7767c8303e2e917d04e271e61e316df90f66083b64fc3f03c38e91e6d125d0e4b29d9ed917b7a3956fce72ad77d6389
+DIST systemtap-5.2.tar.gz 6594250 BLAKE2B 39fc0731a42f3a9d8f4c9329083de1e85ef969cfdefc9eeacc4f9e546e8fe73f7d45f53c79b0c1a1d63bd88c439abfff4d21060c8baefe2282b96562634d6aa3 SHA512 30137e232e44abe98747ae61a71a162eff5abc89e9a922f86ade834eac2cac1923ae06d4ed17710718adba082ad06d2fb544822003a54e13b97eea9e183bdf9d
+EBUILD systemtap-4.8.ebuild 3277 BLAKE2B 5a7ccfa8b4506e31391ac3968d192f66fbb1929829611de174f9bf55c27df9f48f3818516e9760fe4bf638f823ccc3b145d46ded1645a4cf0f6481791a390c8a SHA512 9cd19a0af7d7b43fdcfbacb65166459a7673b09409baa588efe19169a129a1679db86fff1e2f6771327f663a0500dac15edaaa22fc1534d485a02ebdca00edea
+EBUILD systemtap-5.0-r1.ebuild 3758 BLAKE2B 62f4341bb6431c7c8dfd86f246bc11c9af860bba7ce3f20e98c6d16caa6e25ef158e7186b5b6faa48183732525d6678ae4ba2b3f4ec184cc5b155426acb73e69 SHA512 25622e0958efcccabe16f5235434f9bc369ddb1409cdf62f7666d29e899d5f6fbf64bd6bd230e835b8c02b5dad2ebb55674053126927dfa368f21b79e240e856
+EBUILD systemtap-5.1-r1.ebuild 4307 BLAKE2B 173894fa3ca1f58bae744686287412172bd1726f17a58da92cbdbc750929efb172bf61f941d1ed7bf5da0722057af33263045a3ff31354733cea05f3146800a8 SHA512 289a64178041d8f3d0f3f460a780bf07b0109e44a5662a9bd9d87b8222e0aa73cf0f62e60d9d437749e26a36472b5acc575379510c957de511755983853e584e
+EBUILD systemtap-5.1.ebuild 4055 BLAKE2B bd5023bdff70b666fcef20cdc35db75029b9058d8f676ae2023db3e79500ecfc5c58b67d4ccd705b293616ef1932ed77b5e069aa7cdf7dd9afb0bc7e499d2d9e SHA512 04956864b2219133a35d3b3f911f2f3a75a4ead02673f2b96836f8a59ac2b3182f7cdfce721967c08749d1def27aa611828557716d273513e04203459e639844
+EBUILD systemtap-5.2.ebuild 4363 BLAKE2B 846eeb7671d6a14406e2da89e7b0858b370b64da6c5c6adb54b859135c00faac60821e5e2e967264aa4bfed576500dd83ba7229552ccd23d3f16bda720a9089b SHA512 8ab69241796eb93002eae5ed882efac25256da4c78c68fa5f53d010f8aa0b79817f3fd4b2f3d5f76ff60d93528092d7cf43adee60b533f1822d684e49e37ff76
+EBUILD systemtap-9999.ebuild 4363 BLAKE2B 846eeb7671d6a14406e2da89e7b0858b370b64da6c5c6adb54b859135c00faac60821e5e2e967264aa4bfed576500dd83ba7229552ccd23d3f16bda720a9089b SHA512 8ab69241796eb93002eae5ed882efac25256da4c78c68fa5f53d010f8aa0b79817f3fd4b2f3d5f76ff60d93528092d7cf43adee60b533f1822d684e49e37ff76
 MISC metadata.xml 601 BLAKE2B 71f332c2429743ba35c91e34a0e3790e5c1ff27931b87d24e3ee576251e4343eed913b854f674dd5d3a1ca85e223f05cd77f3990bf80839f7c3cd75bbb82662d SHA512 5a93492fd68f5e184fb6bf1c5813097278e4d764a50fab7d23b4bba8de163cf96ca4dbe68e7dd9d9305d51e6457d348b3c58bf7aecf64cc6183162e90064b18a
diff --git a/dev-debug/systemtap/systemtap-4.8.ebuild b/dev-debug/systemtap/systemtap-4.8.ebuild
index 424f64136cb4..f1da9abd10fb 100644
--- a/dev-debug/systemtap/systemtap-4.8.ebuild
+++ b/dev-debug/systemtap/systemtap-4.8.ebuild
@@ -38,7 +38,6 @@ DEPEND="
 	${CDEPEND}
 	app-alternatives/cpio
 	app-text/xmlto
-	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
 
 	libvirt? ( dev-libs/libxml2 )
@@ -49,7 +48,10 @@ RDEPEND="
 	acct-group/stapsys
 	acct-group/stapusr
 "
-BDEPEND="test? ( dev-util/dejagnu )"
+BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	test? ( dev-util/dejagnu )
+"
 
 CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
 ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
diff --git a/dev-debug/systemtap/systemtap-5.0-r1.ebuild b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
index a82fc3af3eb6..c7d6dcfb96ee 100644
--- a/dev-debug/systemtap/systemtap-5.0-r1.ebuild
+++ b/dev-debug/systemtap/systemtap-5.0-r1.ebuild
@@ -38,7 +38,6 @@ DEPEND="
 	${CDEPEND}
 	app-alternatives/cpio
 	app-text/xmlto
-	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
 
 	libvirt? ( dev-libs/libxml2 )
@@ -49,7 +48,10 @@ RDEPEND="
 	acct-group/stapsys
 	acct-group/stapusr
 "
-BDEPEND="test? ( dev-util/dejagnu )"
+BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	test? ( dev-util/dejagnu )
+"
 
 CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
 ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
diff --git a/dev-debug/systemtap/systemtap-5.1-r1.ebuild b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
index de32caa4bc1f..959daf66209e 100644
--- a/dev-debug/systemtap/systemtap-5.1-r1.ebuild
+++ b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 	${CDEPEND}
 	app-alternatives/cpio
 	app-text/xmlto
-	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
 
 	libvirt? ( dev-libs/libxml2 )
@@ -56,6 +55,7 @@ RDEPEND="
 "
 # which: https://sourceware.org/PR32106
 BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	test? (
 		dev-util/dejagnu
 		|| (
diff --git a/dev-debug/systemtap/systemtap-5.1.ebuild b/dev-debug/systemtap/systemtap-5.1.ebuild
index e8c3b20243c9..5830c0e68aca 100644
--- a/dev-debug/systemtap/systemtap-5.1.ebuild
+++ b/dev-debug/systemtap/systemtap-5.1.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 	${CDEPEND}
 	app-alternatives/cpio
 	app-text/xmlto
-	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
 
 	libvirt? ( dev-libs/libxml2 )
@@ -56,6 +55,7 @@ RDEPEND="
 "
 # which: https://sourceware.org/PR32106
 BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	test? (
 		dev-util/dejagnu
 		|| (
diff --git a/dev-debug/systemtap/systemtap-5.2.ebuild b/dev-debug/systemtap/systemtap-5.2.ebuild
new file mode 100644
index 000000000000..109764c069e8
--- /dev/null
+++ b/dev-debug/systemtap/systemtap-5.2.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+
+inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/ https://sourceware.org/systemtap/wiki"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://sourceware.org/git/systemtap.git"
+	inherit git-r3
+else
+	SRC_URI="https://sourceware.org/ftp/${PN}/releases/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	dev-libs/boost:=
+	>=dev-libs/elfutils-0.142[debuginfod?]
+	dev-libs/json-c:=
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+
+	libvirt? ( >=app-emulation/libvirt-1.0.2 )
+	selinux? ( sys-libs/libselinux )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		dev-libs/nspr
+		dev-libs/nss
+	)
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="
+	${CDEPEND}
+	app-alternatives/cpio
+	app-text/xmlto
+	>=sys-devel/gettext-0.18.2
+
+	libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${CDEPEND}
+	acct-group/stapdev
+	acct-group/stapsys
+	acct-group/stapusr
+"
+# which: https://sourceware.org/PR32106
+BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	test? (
+		dev-util/dejagnu
+		|| (
+			net-analyzer/netcat
+			net-analyzer/openbsd-netcat
+		)
+		sys-apps/which
+	)
+"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1-ia64.patch"
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang .
+
+	sed -i \
+		-e 's#$(INSTALL_DATA) $(srcdir)/stap-exporter.options "$(DESTDIR)$(sysconfdir)/sysconfig/stap-exporter"##g' \
+		stap-exporter/Makefile.am || die "Failed to modify stap-exporter Makefile.am"
+	sed -i \
+		-e '\#^EnvironmentFile=-/etc/sysconfig/stap-exporter#d' \
+		-e 's#$PORT $KEEPALIVE $SCRIPTS $OPTIONS#--port 9900 --keepalive 300#g' \
+		stap-exporter/stap-exporter.service || die "Failed to adapt stap-exporter.service"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		--disable-Werror
+		# Our toolchain sets this for us already and adding in
+		# -D_FORTIFY_SOURCE=2 breaks builds w/ no optimisation.
+		# This option (at least as of 4.5) doesn't pass -fno* etc,
+		# it just doesn't _add_ options, which is good. If it changes
+		# to actually pass -fno-stack-protector and friends, we'll
+		# need to change course. Forcing =2 also has problems for
+		# setting it to 3.
+		# bug #794667.
+		--disable-ssp
+		--enable-pie
+		--with-python3
+		--without-java
+		--without-openssl
+		--without-python2-probes
+		--without-rpm
+		$(use_enable libvirt virt)
+		$(use_enable sqlite)
+		$(use_with debuginfod)
+		$(use_with zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+
+	# Use bash because of bashisms with brace expansion in Makefile.am
+	# https://sourceware.org/PR32105
+	CONFIG_SHELL="${BROOT}"/bin/bash PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# TODO: Install tests like dev-debug/dtrace[test-install] and
+	# e.g. Fedora does.
+	(
+		strip-flags
+		filter-flags '-fcf-protection=*'
+		filter-flags '-fdiagnostics-color=*' '-fdiagnostics-urls=*'
+		filter-flags '-g*'
+		filter-lto
+		tc-ld-force-bfd
+		emake -Onone -k check CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+	)
+}
+
+src_install() {
+	default
+	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
+	python_optimize
+
+	# Avoid file collision with dev-debug/dtrace
+	mv "${ED}"/usr/bin/dtrace "${ED}"/usr/bin/stap-dtrace || die
+
+	if use dtrace-symlink ; then
+		dosym stap-dtrace /usr/bin/dtrace
+	fi
+}
diff --git a/dev-debug/systemtap/systemtap-9999.ebuild b/dev-debug/systemtap/systemtap-9999.ebuild
index 4777e9d326b8..109764c069e8 100644
--- a/dev-debug/systemtap/systemtap-9999.ebuild
+++ b/dev-debug/systemtap/systemtap-9999.ebuild
@@ -43,7 +43,6 @@ DEPEND="
 	${CDEPEND}
 	app-alternatives/cpio
 	app-text/xmlto
-	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	>=sys-devel/gettext-0.18.2
 
 	libvirt? ( dev-libs/libxml2 )
@@ -56,6 +55,7 @@ RDEPEND="
 "
 # which: https://sourceware.org/PR32106
 BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 	test? (
 		dev-util/dejagnu
 		|| (
@@ -150,6 +150,7 @@ src_test() {
 
 src_install() {
 	default
+	rm -rf "${D}/$(python_get_sitedir)"/*.egg-info || die
 	python_optimize
 
 	# Avoid file collision with dev-debug/dtrace