gentoo resync : 22.05.2021

4 files changed, 40 insertions, 37 deletions

diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 9d144407a179..353187705100 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,7 +1,7 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
 DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-EBUILD acl-2.2.53-r1.ebuild 1389 BLAKE2B 3f315dce6b0f21880ed3d9bd5c050773ee4bdfa1041980946310e274c49d7300fb8d6b8fe95f9d497bf8097c6370ac2c7913a938e122b1c9936b0fbea4d46f7e SHA512 c1bc01a8c97730bdc6c69d0c3987c52ce0070a94d4e6efdf6be427d07bbe987ba402ea6e83bb96dc1474dbb1d5202a355026d5914d03ff33026b253b8ecaf30a
-EBUILD acl-2.3.0.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
-EBUILD acl-2.3.1.ebuild 1397 BLAKE2B b9487ad365a7995fcd3e760bf20fca375dafb60433d631f185f02e94e5bfb1b48b7718ccd61c88d012761b6440adc2fff6441dab1122cd0656956a2de65e4002 SHA512 0aed518a74b5a3056245850ccba6bed2dde5fb86859c4f8fd6279616e0a026d50b77f38da49407fe3dca25b2881b285beddd9cd0bf4146f9209d4e528d006317
+EBUILD acl-2.2.53-r1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
+EBUILD acl-2.3.0.ebuild 1354 BLAKE2B 6463639b3008515864594574eefde4ab927ba559087d8f989beb1dca1f928ff73a583e46b7f0415a8e6d7a21a4930b444db811ed8cbcd39b89f79364a3a6cba5 SHA512 de765bf94d376c2ba4ece69c9750b717304676639a145362ee598e0b218cad21f1dfb151aa82df6f338d0944a26900788950220dcaf60a5c33e4225241578a8e
+EBUILD acl-2.3.1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
index 1c5fd4005593..5ab955ac8363 100644
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.53-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }
 
diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild
index b802802db8a9..7ffef6cfc235 100644
--- a/sys-apps/acl/acl-2.3.0.ebuild
+++ b/sys-apps/acl/acl-2.3.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }
 
diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild
index b802802db8a9..5ab955ac8363 100644
--- a/sys-apps/acl/acl-2.3.1.ebuild
+++ b/sys-apps/acl/acl-2.3.1.ebuild
@@ -3,15 +3,15 @@
 
 EAPI=7
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
-DESCRIPTION="access control list utilities, libraries and headers"
+DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
@@ -20,37 +20,38 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
 
-pkg_setup() {
-	# filter out -flto flags as they break getfacl/setfacl binaries
-	# (bug #667372)
-	filter-flags -flto*
-}
-
 src_prepare() {
 	default
-	elibtoolize #580792
+
+	# bug #580792
+	elibtoolize
 }
 
 multilib_src_configure() {
+	# Filter out -flto flags as they break getfacl/setfacl binaries
+	# bug #667372
+	filter-flags -flto*
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
 		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable nls)
 	)
+
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_test() {
 	# Tests call native binaries with an LD_PRELOAD wrapper
-	# https://bugs.gentoo.org/772356
+	# bug #772356
 	multilib_is_native_abi && default
 }
 
 multilib_src_install() {
 	default
 
-	# move shared libs to /
+	# Move shared libs to /
 	gen_usr_ldscript -a acl
 }