gentoo resync : 29.12.2022

4 files changed, 268 insertions, 3 deletions

diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 64028445abf8..13ddd8930648 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -2,7 +2,11 @@ AUX systemtap-3.1-ia64.patch 885 BLAKE2B e26c60e4549f95f0db3e128cd535f923f03dc45
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
 DIST systemtap-4.5.tar.gz 5549909 BLAKE2B 3c180a49c81070cb374ae23f95f1e90cc3cf2550170363793f46584b201c2284b2ee639f395d73ed6c5b44160825b3cf128bd360b81bc243e71c98e71d779f48 SHA512 8136779a9f5cb0fbaae565eab1ab6fa307f1024dfc2c6c3845acfadff0eecc684ba89aa5d442c7b90c2c73edaab41ca07bae2bad8361f80fe8e9928b40466cd3
+DIST systemtap-4.6.tar.gz 5588126 BLAKE2B 7a0b1ed201f3661d5737bbf2c8b10b8bcf708df0c9aeeb941d501f5001e13b254ff779e20ed6af72b457a9e8236f064b9d5ee6d79438f96abb09d913f5732db3 SHA512 835b45597e9de0ea17857b47d542c87d155cb5c772f8595f41845a25ff06b862cb9c4b635292c3a6c66cb5255a07eee3af7cb7861110a4a05f545a4b35f11402
+DIST systemtap-4.7.tar.gz 5611495 BLAKE2B 839a824c3ef249add3edb2c9329c7bcb297d36d268d463c2913d945688845b7a6af8d811b2a533c4da8ce496cabccbdfabd080be847c754c2614f9c9efb22c61 SHA512 7d7c213dc4f7c5430f81763668da21403fbc351d1701b1096eb1ad233e3f0325e35f01dfd0a33e75f277b26fdde88c46d42dd32e32e4d4f27a45d53e2dd0f831
 EBUILD systemtap-4.4.ebuild 2885 BLAKE2B 3ab515c217ac8b58b70a2c46e44e2f3fbc55f5f3294e3b019a30048de33c9b908729dd50a13b4866923fe52ae06f33f0653f2db918f46fe214c0b613a8c569e7 SHA512 fdf5b5824f6c3ecd0cf1d926e8674bdd72288aef315803da1ac23188c93571aa525bdccf5ba09a23faed7c099990247452243ffb1b44c3b278e569dd19bac974
-EBUILD systemtap-4.5-r1.ebuild 2849 BLAKE2B fafb9f95e3270127739de311674244504d82a75952e160482fe26fcc05cd7d9e5cfec0ec52df965c76accfa48d594159c35b2301dc98cba0965544cb24a866c1 SHA512 7c68266ff9a12d39b284f68fd71d2f62a591339a663ecf4395f67b7480b893d5d4358f658f5bb76016df2f631b460113781e647b7dfd8d5eca81f15adb2b4efa
+EBUILD systemtap-4.5-r1.ebuild 3257 BLAKE2B 820e5ab1f3e123c2e265c89f77dd02964603641ac9b47c1de1187f130b8d4b68b039c6f44ad4e6d8792ab705570aa0982fe8d8676001abf672d4d36812505497 SHA512 5522e91b54d98aec2a304b7b26c450e48ddf50a315db51d35c09246a1f9ef4fe60b2db9d8ecec4d605e571a843b403163239f59b16f13edee0858eb75a6e72c6
 EBUILD systemtap-4.5.ebuild 2821 BLAKE2B 45cd56187b5b8da6a7e815f0953c2d826ce668f1018910501c267ab7a145c7cabe4a615643a05b4180dbbe59e679c8fb913d3235a0f1d7bd03a57f7b7ffbb00d SHA512 b19089f6c2efc45620045abe7be37963136beb5c453645be1f7f1b52ed007c733291907334843de71cbb11e4089b5935703cd0f17ff6ecf9672a40ba13649cae
+EBUILD systemtap-4.6.ebuild 3264 BLAKE2B 36768eae7877b68327662f9b125689c51ab74a44915709a58136af03031d88aad996c377dd8d8d66f14007a7b013cdb4d88339fb049ecf2a9712f276d260958e SHA512 c3ab1a88139b673e5c13e72d44b4e4dd60c296319a249e9f789bfa9b99c4e26e7d6cd0fb1eaff066c54bc45f9b03842ed4e1a7b0464b79ccb108d6ca8aaac0fc
+EBUILD systemtap-4.7.ebuild 3264 BLAKE2B 36768eae7877b68327662f9b125689c51ab74a44915709a58136af03031d88aad996c377dd8d8d66f14007a7b013cdb4d88339fb049ecf2a9712f276d260958e SHA512 c3ab1a88139b673e5c13e72d44b4e4dd60c296319a249e9f789bfa9b99c4e26e7d6cd0fb1eaff066c54bc45f9b03842ed4e1a7b0464b79ccb108d6ca8aaac0fc
 MISC metadata.xml 303 BLAKE2B 5db95d500a08d656d0221a474d297c8357712f19334f45db347e36f14a10365d65777e0d24c68f75d4855b3ee1778dca1ecf4a05b19d2dd3975acf25a12b4523 SHA512 27261bc875c881495a9b0e1fffc811dff40b763a9e6453ca47143cb8d7d867682becd7266f8d559ad8c32bb5d7de9698341055d483f3e6a68b107895aa174b77
diff --git a/dev-util/systemtap/systemtap-4.5-r1.ebuild b/dev-util/systemtap/systemtap-4.5-r1.ebuild
index b11a0b1830c0..cb7728fb5a3e 100644
--- a/dev-util/systemtap/systemtap-4.5-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
 
 CDEPEND="
@@ -96,6 +96,15 @@ src_configure() {
 		--disable-grapher
 		--disable-refdocs
 		--disable-server
+		# 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
diff --git a/dev-util/systemtap/systemtap-4.6.ebuild b/dev-util/systemtap/systemtap-4.6.ebuild
new file mode 100644
index 000000000000..a4f2a7d2663b
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.6.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit autotools linux-info python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	>=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+
+	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-arch/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
+"
+BDEPEND="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'."
+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|-Werror||g' \
+		configure.ac \
+		Makefile.am \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/Makefile.am \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		# 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 zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+}
diff --git a/dev-util/systemtap/systemtap-4.7.ebuild b/dev-util/systemtap/systemtap-4.7.ebuild
new file mode 100644
index 000000000000..a4f2a7d2663b
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.7.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit autotools linux-info python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl test zeroconf"
+
+CDEPEND="
+	${PYTHON_DEPS}
+
+	>=dev-libs/elfutils-0.142
+	dev-libs/json-c:=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+
+	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-arch/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
+"
+BDEPEND="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'."
+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|-Werror||g' \
+		configure.ac \
+		Makefile.am \
+		stapbpf/Makefile.am \
+		stapdyn/Makefile.am \
+		staprun/Makefile.am \
+		testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+		testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+		testsuite/systemtap.base/stmt_rel_user.exp \
+		testsuite/systemtap.base/sdt_va_args.exp \
+		testsuite/systemtap.base/sdt_misc.exp \
+		testsuite/systemtap.base/sdt.exp \
+		scripts/kprobes_test/gen_code.py \
+		|| die "Failed to clean up sources"
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-docs
+		--disable-grapher
+		--disable-refdocs
+		--disable-server
+		# 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 zeroconf avahi)
+		$(use_with ssl nss)
+		$(use_with selinux)
+	)
+	PYTHON3="${PYTHON}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+}