diff options
23 files changed, 33 insertions, 32 deletions
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild index 884a5fc7c489..767945e9dad9 100644 --- a/app-misc/jail/jail-2.0-r4.ebuild +++ b/app-misc/jail/jail-2.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86" RDEPEND=" + dev-debug/strace dev-lang/perl - dev-util/strace " PATCHES=( diff --git a/dev-util/strace/Manifest b/dev-debug/strace/Manifest index db4d692ee15a..db4d692ee15a 100644 --- a/dev-util/strace/Manifest +++ b/dev-debug/strace/Manifest diff --git a/dev-util/strace/files/strace-5.11-static.patch b/dev-debug/strace/files/strace-5.11-static.patch index 146ace0dd2e7..146ace0dd2e7 100644 --- a/dev-util/strace/files/strace-5.11-static.patch +++ b/dev-debug/strace/files/strace-5.11-static.patch diff --git a/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch b/dev-debug/strace/files/strace-6.4-linux-headers-6.5.patch index 2814dee76258..2814dee76258 100644 --- a/dev-util/strace/files/strace-6.4-linux-headers-6.5.patch +++ b/dev-debug/strace/files/strace-6.4-linux-headers-6.5.patch diff --git a/dev-util/strace/files/strace-6.5-static.patch b/dev-debug/strace/files/strace-6.5-static.patch index 67e4b05ca856..67e4b05ca856 100644 --- a/dev-util/strace/files/strace-6.5-static.patch +++ b/dev-debug/strace/files/strace-6.5-static.patch diff --git a/dev-util/strace/metadata.xml b/dev-debug/strace/metadata.xml index 2a0ac3bbabf4..2a0ac3bbabf4 100644 --- a/dev-util/strace/metadata.xml +++ b/dev-debug/strace/metadata.xml diff --git a/dev-util/strace/strace-6.2.ebuild b/dev-debug/strace/strace-6.2.ebuild index 386b07093734..5335711e7f1a 100644 --- a/dev-util/strace/strace-6.2.ebuild +++ b/dev-debug/strace/strace-6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-util/strace/strace-6.3.ebuild b/dev-debug/strace/strace-6.3.ebuild index 24320451eac7..463bac04d6cb 100644 --- a/dev-util/strace/strace-6.3.ebuild +++ b/dev-debug/strace/strace-6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-util/strace/strace-6.4-r1.ebuild b/dev-debug/strace/strace-6.4-r1.ebuild index 9ea02aa9e41c..f71d7670bcd2 100644 --- a/dev-util/strace/strace-6.4-r1.ebuild +++ b/dev-debug/strace/strace-6.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-util/strace/strace-6.6.ebuild b/dev-debug/strace/strace-6.6.ebuild index aae04e4c6bee..482af8b00c17 100644 --- a/dev-util/strace/strace-6.6.ebuild +++ b/dev-debug/strace/strace-6.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-util/strace/strace-9999.ebuild b/dev-debug/strace/strace-9999.ebuild index d1881f35b452..9c5835571a43 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-debug/strace/strace-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/dev-lisp/sbcl/sbcl-2.3.11.ebuild b/dev-lisp/sbcl/sbcl-2.3.11.ebuild index 9fd3fb0bb4e5..dc33af6ce03b 100644 --- a/dev-lisp/sbcl/sbcl-2.3.11.ebuild +++ b/dev-lisp/sbcl/sbcl-2.3.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ CDEPEND=">=dev-lisp/asdf-3.3:= \ prefix? ( dev-util/patchelf )" # bug #843851 BDEPEND="${CDEPEND} - dev-util/strace + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} diff --git a/dev-lisp/sbcl/sbcl-2.3.5.ebuild b/dev-lisp/sbcl/sbcl-2.3.5.ebuild index 8ecba254dd18..94ba59bb43cd 100644 --- a/dev-lisp/sbcl/sbcl-2.3.5.ebuild +++ b/dev-lisp/sbcl/sbcl-2.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ CDEPEND=">=dev-lisp/asdf-3.3:= \ prefix? ( dev-util/patchelf )" # bug #843851 BDEPEND="${CDEPEND} - dev-util/strace + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} diff --git a/dev-lisp/sbcl/sbcl-2.4.0.ebuild b/dev-lisp/sbcl/sbcl-2.4.0.ebuild index ec1f642b8efd..83e244df65f4 100644 --- a/dev-lisp/sbcl/sbcl-2.4.0.ebuild +++ b/dev-lisp/sbcl/sbcl-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -48,7 +48,7 @@ CDEPEND=">=dev-lisp/asdf-3.3:= \ prefix? ( dev-util/patchelf )" # bug #843851 BDEPEND="${CDEPEND} - dev-util/strace + dev-debug/strace doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) system-bootstrap? ( || ( dev-lisp/clisp dev-lisp/sbcl ) )" RDEPEND="${CDEPEND} diff --git a/profiles/arch/hppa/package.mask b/profiles/arch/hppa/package.mask index f60c79116aa6..38231b9f09d7 100644 --- a/profiles/arch/hppa/package.mask +++ b/profiles/arch/hppa/package.mask @@ -1,4 +1,4 @@ -# Copyright 2019-2023 Gentoo Authors +# Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Sam James <sam@gentoo.org> (2023-03-28) @@ -8,7 +8,7 @@ dev-python/py-cpuinfo # Sam James <sam@gentoo.org> (2023-03-10) # Fails to build on HPPA w/ sys-kernel/linux-headers-6.2: # https://github.com/strace/strace/issues/241 -=dev-util/strace-6.2 +=dev-debug/strace-6.2 # Quote from <eike@s...l.de>: # "Compilation fails with: #error You need to define CycleTimer for diff --git a/profiles/updates/1Q-2024 b/profiles/updates/1Q-2024 index 08dd8d64c719..1696ed726ea6 100644 --- a/profiles/updates/1Q-2024 +++ b/profiles/updates/1Q-2024 @@ -64,3 +64,4 @@ move dev-util/d-spy dev-debug/d-spy move dev-util/duma dev-debug/duma move dev-util/leaktracer dev-debug/leaktracer move dev-util/ltrace dev-debug/ltrace +move dev-util/strace dev-debug/strace diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild index 3dc5686f020d..01a7a97fc192 100644 --- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_10 ) inherit flag-o-matic python-any-r1 toolchain-funcs @@ -38,9 +38,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) " diff --git a/sys-apps/coreutils/coreutils-9.1-r2.ebuild b/sys-apps/coreutils/coreutils-9.1-r2.ebuild index 5fb7309f58a2..61d1ba7df222 100644 --- a/sys-apps/coreutils/coreutils-9.1-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ EAPI=7 # The upstream coreutils maintainers also maintain the package in Fedora and may # backport fixes which we want to pick up. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -52,9 +52,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sys-apps/coreutils/coreutils-9.3-r2.ebuild b/sys-apps/coreutils/coreutils-9.3-r2.ebuild index 42a48c3d0a52..be73ff76f43b 100644 --- a/sys-apps/coreutils/coreutils-9.3-r2.ebuild +++ b/sys-apps/coreutils/coreutils-9.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sys-apps/coreutils/coreutils-9.3-r3.ebuild b/sys-apps/coreutils/coreutils-9.3-r3.ebuild index bb5183a62b15..4f124cf83228 100644 --- a/sys-apps/coreutils/coreutils-9.3-r3.ebuild +++ b/sys-apps/coreutils/coreutils-9.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ EAPI=8 # # Also recommend subscribing to the coreutils and bug-coreutils MLs. -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sys-apps/coreutils/coreutils-9.4.ebuild b/sys-apps/coreutils/coreutils-9.4.ebuild index f28b7d85381c..40a2c20ada63 100644 --- a/sys-apps/coreutils/coreutils-9.4.ebuild +++ b/sys-apps/coreutils/coreutils-9.4.ebuild @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index 3ad9fc001a09..14e289049915 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -63,9 +63,9 @@ BDEPEND=" app-arch/xz-utils dev-lang/perl test? ( + dev-debug/strace dev-lang/perl dev-perl/Expect - dev-util/strace ${PYTHON_DEPS} ) verify-sig? ( sec-keys/openpgp-keys-coreutils ) diff --git a/sys-fs/libeatmydata/libeatmydata-131.ebuild b/sys-fs/libeatmydata/libeatmydata-131.ebuild index 869abe911d8e..d186e6938bf4 100644 --- a/sys-fs/libeatmydata/libeatmydata-131.ebuild +++ b/sys-fs/libeatmydata/libeatmydata-131.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ KEYWORDS="amd64 arm arm64 ~hppa ~loong ~x86" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND="test? ( dev-util/strace )" +BDEPEND="test? ( dev-debug/strace )" PATCHES=( "${FILESDIR}"/${PN}-131-gnu_source.patch |