commit:     5cde29d04e2da37ded900130f0f3dea13fcc350f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  3 15:23:15 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug  3 15:23:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cde29d0

sys-libs/glibc: require pax-utils 1.3.1 for 2.33 instead

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 sys-libs/glibc/glibc-2.33-r1.ebuild | 5 +++--
 sys-libs/glibc/glibc-2.33-r5.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.33-r1.ebuild 
b/sys-libs/glibc/glibc-2.33-r1.ebuild
index fe0ef6cbb24..bf657301512 100644
--- a/sys-libs/glibc/glibc-2.33-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r1.ebuild
@@ -94,7 +94,7 @@ fi
 
 BDEPEND="
        ${PYTHON_DEPS}
-       >=app-misc/pax-utils-0.1.10
+       >=app-misc/pax-utils-1.3.1
        sys-devel/bison
        doc? ( sys-apps/texinfo )
        !compile-locales? (
@@ -112,7 +112,6 @@ COMMON_DEPEND="
        suid? ( caps? ( sys-libs/libcap ) )
        selinux? ( sys-libs/libselinux )
        systemtap? ( dev-util/systemtap )
-       !<net-misc/openssh-8.1_p1-r2
 "
 DEPEND="${COMMON_DEPEND}
        compile-locales? (
@@ -127,6 +126,8 @@ RDEPEND="${COMMON_DEPEND}
        sys-apps/grep
        virtual/awk
        sys-apps/gentoo-functions
+       !<app-misc/pax-utils-1.3.1
+       !<net-misc/openssh-8.1_p1-r2
 "
 
 RESTRICT="!test? ( test )"

diff --git a/sys-libs/glibc/glibc-2.33-r5.ebuild 
b/sys-libs/glibc/glibc-2.33-r5.ebuild
index c8c57855f2e..65857001c42 100644
--- a/sys-libs/glibc/glibc-2.33-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.33-r5.ebuild
@@ -97,7 +97,7 @@ fi
 
 BDEPEND="
        ${PYTHON_DEPS}
-       >=app-misc/pax-utils-1.3.3
+       >=app-misc/pax-utils-1.3.1
        sys-devel/bison
        doc? ( sys-apps/texinfo )
        !compile-locales? (
@@ -129,7 +129,7 @@ RDEPEND="${COMMON_DEPEND}
        sys-apps/grep
        virtual/awk
        sys-apps/gentoo-functions
-       !<app-misc/pax-utils-1.3.3
+       !<app-misc/pax-utils-1.3.1
        !<net-misc/openssh-8.1_p1-r2
 "
 

Reply via email to