gentoo auto-resync : 31:08:2024 - 12:01:05

4 files changed, 176 insertions, 3 deletions

diff --git a/dev-debug/systemtap/Manifest b/dev-debug/systemtap/Manifest
index da65ad869038..57ee16b828b7 100644
--- a/dev-debug/systemtap/Manifest
+++ b/dev-debug/systemtap/Manifest
@@ -4,6 +4,7 @@ DIST systemtap-5.0.tar.gz 6572411 BLAKE2B db962df2fdcbc5bc11259c03d78073924f03fe
 DIST systemtap-5.1.tar.gz 6590820 BLAKE2B 22be535b7c55d0ab90a5361a23fad93c436560c14fbbd345aca7ea2c0fcdd0f66b1ef8591800f86a14cc7ae7fe737a120695d76fe15bfdb8b349080228c37e90 SHA512 da0fe237d2124031a5786d1221dbb420d90da5497376715fd43a7a9f61a354a229c1128e67ce6becbc012aa3796dc5d337149e239e3c1def0651b179e5bf199f
 EBUILD systemtap-4.8.ebuild 3280 BLAKE2B 513575c5f89b5f66a5b9bf477126faa42932a357dd6a85fb45e974a0b5e311c9cb2880a5ee11fde203e0e54dd11c59e5e723c2726b3a94b4a609e1c4d777fa8f SHA512 027a5ef5f42c0abce481258e11e753984a0e85101e9f0c6e29fe6db689c8d86fb700ca47ac691a7851c83b4c9a1a3dbb0899c38b2c6ce8504796b295cb51784c
 EBUILD systemtap-5.0-r1.ebuild 3761 BLAKE2B abeed521d989e75a1c4d1523276f786bb70679c98fe092a08b3539c3236c9ee0d8d479eb612976743b74732aad83915589b7e8ce791c15a30839d400e9351013 SHA512 3388d4fbd408295abc409d2a7e15548999986d28f8fc7e17629485ba42c64bdaa5f6d9d55c6f39bd85acd14f56a91e680934b79bd4eceb08a96d267eef554bc9
+EBUILD systemtap-5.1-r1.ebuild 4277 BLAKE2B af0dc502585248bc8dc4355a11620c3a2b1cabcb6fcf8dcfeef357273f043a6a685ced949a4533fd8b67a10252ec6392cdb351d56d4669fd9d621d01fb739762 SHA512 6b95e477442bb7010d216c4435aee0d71c54e32ba8110fad0d45cf40c43d147ce2252a8edf047e3ece36075de5aecf22e669efb0478ea28136ab6f862704ccda
 EBUILD systemtap-5.1.ebuild 4062 BLAKE2B bb1ee40a152a74c563fb73a8e4860342affd719804e4d4bc55115472b08ad4665f5a544f89360e1841732a3970d81f1a13a37039e1c2055172a09bfea48ca4e2 SHA512 fae7b5d515544969278236a5d67754dacb41eebc01a64533c5762a5fdd7ea377f870b42e927bc4e3f0ba0aeb1adcfffef63bfa0b98e9e1646296d7800969d498
-EBUILD systemtap-9999.ebuild 4082 BLAKE2B 9c5c220aad98ad1f0cf5f4d61d5cf4803b28b0de15ef951974af692d2b05080600d7975457a4f03bff265c95732f7e8955563b5775abd44926a939b31f808eed SHA512 bf67f201dfb3a2904222c68929ac0c81d6e8af7f330ee716a27aaa90e428f845ed4d897aa486b51564d6860ef7ec0c297026be2976fa72dff67555ed5ae7c4b3
-MISC metadata.xml 411 BLAKE2B e9c7b85009b959eda20160229ba22b41336fb4d95c636f4ad579d8f65c57a2af1b92ed19d4f31fba6129b192e3cebb24b995d2dbe5475ae3f5913b74329e2090 SHA512 4ee7e4abe6065eae2774537929a5221fad5d1b02323f3cb3b860b3f4ee86d731e294c09c06c98788efbd9f32a41a2538868aabd31c8144887b9a5eff51b81033
+EBUILD systemtap-9999.ebuild 4277 BLAKE2B af0dc502585248bc8dc4355a11620c3a2b1cabcb6fcf8dcfeef357273f043a6a685ced949a4533fd8b67a10252ec6392cdb351d56d4669fd9d621d01fb739762 SHA512 6b95e477442bb7010d216c4435aee0d71c54e32ba8110fad0d45cf40c43d147ce2252a8edf047e3ece36075de5aecf22e669efb0478ea28136ab6f862704ccda
+MISC metadata.xml 601 BLAKE2B 71f332c2429743ba35c91e34a0e3790e5c1ff27931b87d24e3ee576251e4343eed913b854f674dd5d3a1ca85e223f05cd77f3990bf80839f7c3cd75bbb82662d SHA512 5a93492fd68f5e184fb6bf1c5813097278e4d764a50fab7d23b4bba8de163cf96ca4dbe68e7dd9d9305d51e6457d348b3c58bf7aecf64cc6183162e90064b18a
diff --git a/dev-debug/systemtap/metadata.xml b/dev-debug/systemtap/metadata.xml
index ef6a9e2cd046..eb938ea4fd71 100644
--- a/dev-debug/systemtap/metadata.xml
+++ b/dev-debug/systemtap/metadata.xml
@@ -6,6 +6,10 @@
 </maintainer>
   <use>
     <flag name="debuginfod">Enable debuginfod support via <pkg>dev-libs/elfutils</pkg> libdebuginfod</flag>
+    <flag name="dtrace-symlink">
+        Provide /usr/bin/dtrace symlink pointing to /usr/bin/stap-dtrace.
+        This prevents coinstallation with <pkg>dev-debug/dtrace</pkg>.
+    </flag>
     <flag name="libvirt">Support probing of libvirt domains.</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-debug/systemtap/systemtap-5.1-r1.ebuild b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
new file mode 100644
index 000000000000..f26acd209aca
--- /dev/null
+++ b/dev-debug/systemtap/systemtap-5.1-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit autotools flag-o-matic linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="Linux trace/probe tool"
+HOMEPAGE="https://sourceware.org/systemtap/"
+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 ~ia64 ~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
+	$(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	>=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="
+	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[install-tests] 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
+	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 94c53a3d0f1f..f26acd209aca 100644
--- a/dev-debug/systemtap/systemtap-9999.ebuild
+++ b/dev-debug/systemtap/systemtap-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debuginfod libvirt selinux sqlite +ssl test zeroconf"
+IUSE="debuginfod dtrace-symlink libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
 	${PYTHON_DEPS}
@@ -151,4 +151,11 @@ src_test() {
 src_install() {
 	default
 	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
 }