gentoo resync : 17.02.2020

3 files changed, 5 insertions, 66 deletions

diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index cf0faa58c916..f94b223d6d89 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,7 +1,6 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
-DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
-EBUILD pax-utils-1.2.3-r3.ebuild 1811 BLAKE2B 10dbb7ce74ad2f410864d51da6a0aa2b9d8c0d26e2f58667693b5761f66e62513e73cdcff3eab59fbb3cac052c4365d74fad35aa00f5c896865d011f543d6513 SHA512 f61a084a9ddb5f5a971641f59fa0786e27ec3af227b2b64a74ad88c47ae82b188cf3690700bf35de8211ba2f0930a66aa9c56923bc22a124fa9ac1d9fab16ecc
-EBUILD pax-utils-1.2.3.ebuild 1456 BLAKE2B 102ef557c9ba2b21776da305f3773797906bc4b5a52417008b4675d1f03b30006f3df003766bc6a3d06358df2077d5392dc538ac408bd4a64b10df928d6442e7 SHA512 7819e495c975534ebafd3b7a260bfd9d5d26b022a6ce1d4c9097b0e2be9aae660ff47eb90058f069c8b51cdd6db0098a7e58bc3acb36a786c2163eaf9aa45ded
+DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
 EBUILD pax-utils-1.2.4-r1.ebuild 1764 BLAKE2B e67d2008503858e90a8f77ac15b6c685eb30f19b715fcc7de55ac81053b6f04de046ef76cf91ce27eb326f3b80933d0fc8f1e3476ccaea1eee085f33a53ca7b5 SHA512 7e6a9cdf23494fbc179438f5fcb91012798f30c3284946b1f087e709ae6901ba39311ddf7d413cbd7838fb734e966cea0b2e19949432468b6aef44786a9e6bfe
+EBUILD pax-utils-1.2.5.ebuild 1774 BLAKE2B 86444335343df2e8f6e9bd55261b58db5d615ea349b99b5a285a13af05f47995330cbf20d6cd039b1c9c3709bef202e6fc0ab65f3a1a54d3f21d12ecdaab74bf SHA512 f171c70c956b63b4a05a1b1aea30f416adb2c9d6693fd24a2ddb03067db28cf91669341a60836f6916008ca29876dfce9ffddd017ef32ef75535484b90b4532a
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
deleted file mode 100644
index 99f4ff6bff9c..000000000000
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs unpacker
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? ( dev-python/pyelftools )
-	seccomp? ( sys-libs/libseccomp )"
-DEPEND="${RDEPEND}
-	caps? ( virtual/pkgconfig )
-	seccomp? ( virtual/pkgconfig )
-	app-arch/xz-utils"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux || \
-	   has_version '<sys-libs/glibc-2.10'
-	then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-}
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
index 2bd5a6a4fbff..1918cdf76e44 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eutils python-single-r1 toolchain-funcs unpacker
 
@@ -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 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
@@ -31,10 +31,6 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.7.patch
-)
-
 _emake() {
 	emake \
 		USE_CAP=$(usex caps) \