gentoo resync : 28.04.2021

3 files changed, 12 insertions, 13 deletions

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index a5f61ae5247f..3330767d1b16 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
-DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
 DIST pax-utils-1.2.9.tar.xz 705188 BLAKE2B 9eb9309f0317683dd06e491e6647ba20986f2cb248432fad0ed0eb277711e8d38c5b5148bc0b44e6dbc3d5d3d0093bccd4d10c057090801c49246a63f3bc0899 SHA512 47271cd75818728342e2a074fa05da24fce51ef0eeedb28237138525d7c86c207ca2b5d206fd02cb34529590340b726a14c54b205c65204539a51fb78ac55d41
-EBUILD pax-utils-1.2.6.ebuild 1890 BLAKE2B 5178e5c8495e24305743efd40f8a1a656efa0673b46854fe32c2c6cd2fadb6d7e51b0ae9a67a3e1ff5ab45d5f60f681699d52426c1b7b767ebf14cb709a6a8e8 SHA512 f3534814ed8b649c568e00de1c1c1aa01759c715fe5228bc6f00f990e973840e48108dac2ce6a3df25783d8441d7d651e91072a2c1a2c543bca7a6692ee3bab9
-EBUILD pax-utils-1.2.9.ebuild 1895 BLAKE2B 0993bbe0514d2242501c53637ce8bb4c5dbe326e1e02c4ba95b394b9b82344dd0728ea8efb32ff816ade88a7b3844231871f12bae743de048fdfdeef096de77c SHA512 d8c6b880cfaf6a6a2ebd41cc3cffcf9f87d7b271f78ce039ab610fbb48ca010b720851e2ae65ed8fe731b1bc135281d9d67c2a60b4d6b0be49c30b1644c8cbdf
+DIST pax-utils-1.3.1.tar.xz 718384 BLAKE2B eef34077dfaceba1bf6f3d56b5e9990090e6d6c5d8c14f7f4bd8506040f0abdcf1a7bd52c643092faa74d991f22ed48c96924572a50c556aaf879dd411569457 SHA512 1a3a463f3864a420b4dcdd8e5736fbee785ed7cb19545966819493cc98d3cea670eb44592c7f100188b2d45b58908bc1f8e2e010f8842c51b70495b260a03102
+EBUILD pax-utils-1.2.9.ebuild 1887 BLAKE2B ba4f47fff5eb0e56bcb845a04a7cfa61c655503878d66c6684b32a3fd15a19a2e30757c560a1ddecc1e49ace6540b420b2adc6d542c60e2285d63cfba0179d4b SHA512 dad5e4f7c102a6f4a490c5cdcb80759d0e71784081d8e363183d37970ddaa5bdf87a0bae66d010f88ce092cf74a328e719a5b0bacfa579654e8f7c06f99ed48c
+EBUILD pax-utils-1.3.1.ebuild 1880 BLAKE2B 35d4f74bf83d2bf0292a0d45e7b8e78b337b866237352973b85deb8690c53b4ce795da8d3ccbab7b971184ef219b51436c961010fd3029e6278e824b39425a7a SHA512 85ecc69ee4d80491ca654c89dc7918f22c92d72df89a03e5fc1f04435d121e0d25557ad8c2ff36a4d5e3c0af34bd5db6d745fd65527fb09d81875d4bdf77258a
 MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.9.ebuild b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
index af56cab4443d..277c9f68fa7e 100644
--- a/app-misc/pax-utils/pax-utils-1.2.9.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
index a3e63fcd1d5c..474efb8559ac 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.3.1.ebuild
@@ -1,20 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit eutils python-single-r1 toolchain-funcs
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="ELF utils that can check files for security relevant properties"
 HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
 SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
+	https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug kernel_linux python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
@@ -24,16 +25,14 @@ RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
 			dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
 		')
 	)
-	seccomp? ( sys-libs/libseccomp )
 "
-# >=linux-headers-4.11 to pick linux headers with statx, bug #737094
+# >=linux-headers-5.8 to pick linux headers with faccessat2, bug #768624
 DEPEND="
 	${RDEPEND}
-	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-4.11 ) )
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.8 ) )
 "
 BDEPEND="
 	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"