From ad806778f682f6cd766327c653c460dc4534bf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 13 Nov 2024 21:08:01 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20dev-python/{subunit=20=E2=86=92=20pyth?= =?UTF-8?q?on-subunit}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-libs/check/check-0.15.2-r1.ebuild | 2 +- dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild | 2 +- .../python-neutronclient/python-neutronclient-11.3.1.ebuild | 2 +- dev-python/{subunit => python-subunit}/Manifest | 0 .../files/subunit-1.4.0-werror.patch | 0 dev-python/{subunit => python-subunit}/metadata.xml | 0 .../python-subunit-1.4.4.ebuild} | 0 dev-python/stestr/stestr-4.1.0.ebuild | 2 +- dev-python/tempest/tempest-41.0.0.ebuild | 2 +- net-analyzer/arping/arping-2.22.ebuild | 4 ++-- net-analyzer/arping/arping-2.23.ebuild | 2 +- net-analyzer/arping/arping-2.25.ebuild | 2 +- net-analyzer/arping/arping-9999.ebuild | 4 ++-- net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild | 4 ++-- net-fs/samba/samba-4.19.7.ebuild | 2 +- net-fs/samba/samba-4.19.8.ebuild | 2 +- net-fs/samba/samba-4.19.9.ebuild | 2 +- net-fs/samba/samba-4.20.5.ebuild | 2 +- net-fs/samba/samba-4.21.0.ebuild | 2 +- net-fs/samba/samba-4.21.1.ebuild | 2 +- profiles/arch/hppa/package.use.stable.mask | 2 +- profiles/updates/4Q-2024 | 1 + 22 files changed, 21 insertions(+), 20 deletions(-) rename dev-python/{subunit => python-subunit}/Manifest (100%) rename dev-python/{subunit => python-subunit}/files/subunit-1.4.0-werror.patch (100%) rename dev-python/{subunit => python-subunit}/metadata.xml (100%) rename dev-python/{subunit/subunit-1.4.4.ebuild => python-subunit/python-subunit-1.4.4.ebuild} (100%) diff --git a/dev-libs/check/check-0.15.2-r1.ebuild b/dev-libs/check/check-0.15.2-r1.ebuild index 728babb128612..4003f08cbde1e 100644 --- a/dev-libs/check/check-0.15.2-r1.ebuild +++ b/dev-libs/check/check-0.15.2-r1.ebuild @@ -19,7 +19,7 @@ RESTRICT="ppc? ( test ) ppc64? ( test ) !test? ( test )" -RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )" +RDEPEND="subunit? ( dev-python/python-subunit[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} sys-apps/texinfo" BDEPEND="doc? ( app-text/doxygen )" diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild index b992e082002ca..a8e42128711b6 100644 --- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild +++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild @@ -34,7 +34,7 @@ BDEPEND=" dev-python/python-glanceclient[${PYTHON_USEDEP}] >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}] >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP}] + dev-python/python-subunit[${PYTHON_USEDEP}] >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] ) diff --git a/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild index 5f3b9670d1e23..e1e5e8fc5f2bb 100644 --- a/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild +++ b/dev-python/python-neutronclient/python-neutronclient-11.3.1.ebuild @@ -44,7 +44,7 @@ BDEPEND=" dev-python/fixtures[${PYTHON_USEDEP}] dev-python/oslotest[${PYTHON_USEDEP}] dev-python/python-openstackclient[${PYTHON_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP}] + dev-python/python-subunit[${PYTHON_USEDEP}] dev-python/requests-mock[${PYTHON_USEDEP}] dev-python/testtools[${PYTHON_USEDEP}] dev-python/testscenarios[${PYTHON_USEDEP}] diff --git a/dev-python/subunit/Manifest b/dev-python/python-subunit/Manifest similarity index 100% rename from dev-python/subunit/Manifest rename to dev-python/python-subunit/Manifest diff --git a/dev-python/subunit/files/subunit-1.4.0-werror.patch b/dev-python/python-subunit/files/subunit-1.4.0-werror.patch similarity index 100% rename from dev-python/subunit/files/subunit-1.4.0-werror.patch rename to dev-python/python-subunit/files/subunit-1.4.0-werror.patch diff --git a/dev-python/subunit/metadata.xml b/dev-python/python-subunit/metadata.xml similarity index 100% rename from dev-python/subunit/metadata.xml rename to dev-python/python-subunit/metadata.xml diff --git a/dev-python/subunit/subunit-1.4.4.ebuild b/dev-python/python-subunit/python-subunit-1.4.4.ebuild similarity index 100% rename from dev-python/subunit/subunit-1.4.4.ebuild rename to dev-python/python-subunit/python-subunit-1.4.4.ebuild diff --git a/dev-python/stestr/stestr-4.1.0.ebuild b/dev-python/stestr/stestr-4.1.0.ebuild index 4ca9ae4addfd4..ebba7254164ef 100644 --- a/dev-python/stestr/stestr-4.1.0.ebuild +++ b/dev-python/stestr/stestr-4.1.0.ebuild @@ -26,7 +26,7 @@ RDEPEND=" >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}] - >=dev-python/subunit-1.4.0[${PYTHON_USEDEP}] + >=dev-python/python-subunit-1.4.0[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] >=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}] >=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}] diff --git a/dev-python/tempest/tempest-41.0.0.ebuild b/dev-python/tempest/tempest-41.0.0.ebuild index 890bbe82daecc..ad51505078e91 100644 --- a/dev-python/tempest/tempest-41.0.0.ebuild +++ b/dev-python/tempest/tempest-41.0.0.ebuild @@ -34,7 +34,7 @@ RDEPEND=" >=dev-python/oslo-utils-4.7.0[${PYTHON_USEDEP}] >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}] - >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] + >=dev-python/python-subunit-1.0.0[${PYTHON_USEDEP}] >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] >=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}] diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild index d641a0ed9374b..d959be9a14ba5 100644 --- a/net-analyzer/arping/arping-2.22.ebuild +++ b/net-analyzer/arping/arping-2.22.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 @@ -25,7 +25,7 @@ DEPEND=" ${RDEPEND} test? ( dev-libs/check - dev-python/subunit + dev-python/python-subunit ) " diff --git a/net-analyzer/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild index 57f0726429574..a403799cf52b4 100644 --- a/net-analyzer/arping/arping-2.23.ebuild +++ b/net-analyzer/arping/arping-2.23.ebuild @@ -30,7 +30,7 @@ RDEPEND="net-libs/libpcap DEPEND="${RDEPEND} test? ( dev-libs/check - dev-python/subunit + dev-python/python-subunit )" FILECAPS=( cap_net_raw usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-2.25.ebuild b/net-analyzer/arping/arping-2.25.ebuild index c6330bb6cdefb..495a5460fe68f 100644 --- a/net-analyzer/arping/arping-2.25.ebuild +++ b/net-analyzer/arping/arping-2.25.ebuild @@ -30,7 +30,7 @@ RDEPEND="net-libs/libpcap DEPEND="${RDEPEND} test? ( dev-libs/check - dev-python/subunit + dev-python/python-subunit )" FILECAPS=( cap_net_raw usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild index 566ba796671af..495a5460fe68f 100644 --- a/net-analyzer/arping/arping-9999.ebuild +++ b/net-analyzer/arping/arping-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 @@ -30,7 +30,7 @@ RDEPEND="net-libs/libpcap DEPEND="${RDEPEND} test? ( dev-libs/check - dev-python/subunit + dev-python/python-subunit )" FILECAPS=( cap_net_raw usr/sbin/arping ) diff --git a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild index a716eb211cf9b..f77d99e033542 100644 --- a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild +++ b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ RDEPEND="acct-user/ossec DEPEND="${RDEPEND} test? ( dev-libs/check - dev-python/subunit + dev-python/python-subunit )" S="${WORKDIR}/${P}/src" diff --git a/net-fs/samba/samba-4.19.7.ebuild b/net-fs/samba/samba-4.19.7.ebuild index c80c621228f45..16c88105a55d7 100644 --- a/net-fs/samba/samba-4.19.7.ebuild +++ b/net-fs/samba/samba-4.19.7.ebuild @@ -125,7 +125,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/net-fs/samba/samba-4.19.8.ebuild b/net-fs/samba/samba-4.19.8.ebuild index 5035cef134342..fc5f032b69512 100644 --- a/net-fs/samba/samba-4.19.8.ebuild +++ b/net-fs/samba/samba-4.19.8.ebuild @@ -125,7 +125,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/net-fs/samba/samba-4.19.9.ebuild b/net-fs/samba/samba-4.19.9.ebuild index 8348e938a80fe..88f3edac2776a 100644 --- a/net-fs/samba/samba-4.19.9.ebuild +++ b/net-fs/samba/samba-4.19.9.ebuild @@ -125,7 +125,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/net-fs/samba/samba-4.20.5.ebuild b/net-fs/samba/samba-4.20.5.ebuild index 5bd9e9da5ca0a..bc8c62560a284 100644 --- a/net-fs/samba/samba-4.20.5.ebuild +++ b/net-fs/samba/samba-4.20.5.ebuild @@ -125,7 +125,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/net-fs/samba/samba-4.21.0.ebuild b/net-fs/samba/samba-4.21.0.ebuild index e1985456f25d8..51353dc4f979c 100644 --- a/net-fs/samba/samba-4.21.0.ebuild +++ b/net-fs/samba/samba-4.21.0.ebuild @@ -123,7 +123,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/net-fs/samba/samba-4.21.1.ebuild b/net-fs/samba/samba-4.21.1.ebuild index b5be6bbfc3dfb..af8e4d91ef4c8 100644 --- a/net-fs/samba/samba-4.21.1.ebuild +++ b/net-fs/samba/samba-4.21.1.ebuild @@ -124,7 +124,7 @@ DEPEND="${COMMON_DEPEND} spotlight? ( dev-libs/glib ) test? ( >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}] - $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) + $(python_gen_cond_dep "dev-python/python-subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) !system-mitkrb5? ( >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask index 3123dca6d640e..c36b38f644f81 100644 --- a/profiles/arch/hppa/package.use.stable.mask +++ b/profiles/arch/hppa/package.use.stable.mask @@ -168,7 +168,7 @@ app-misc/mc spell net-nds/openldap smbkrb5passwd # Matt Turner (2020-12-23) -# dev-python/subunit is not stable on hppa +# dev-python/python-subunit is not stable on hppa dev-libs/check subunit # Matt Turner (2020-12-23) diff --git a/profiles/updates/4Q-2024 b/profiles/updates/4Q-2024 index 07fff632ada5e..6b3119735a742 100644 --- a/profiles/updates/4Q-2024 +++ b/profiles/updates/4Q-2024 @@ -6,3 +6,4 @@ move dev-python/jinja dev-python/jinja2 move dev-python/gmpy dev-python/gmpy2 move dev-python/tlsh dev-python/python-tlsh move dev-python/tappy dev-python/tap-py +move dev-python/subunit dev-python/python-subunit