gentoo resync : 15.01.2020

3 files changed, 3 insertions, 60 deletions

diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index cba5d4c38f88..288b2120e4c5 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,5 +1,3 @@
-DIST acl-2.2.52.src.tar.gz 386604 BLAKE2B e8b7b555cec93f84579aac846ce64235e356d73770844e88898564d1742fcf3d7c314511f0321aefbad33bdd85800406102178e8ab6414bc9c883891442d3188 SHA512 59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-EBUILD acl-2.2.52-r1.ebuild 1383 BLAKE2B bd6b33ba28ef7874e7b072e119f7711b779776d5891f871fd52af0f6539f5d950c98367f721b861c4b03b9713c14de9794eb981c42187e5275d2fce6404d6446 SHA512 4d975c99a096befae707e5da57777ef0e5aa0c41962c8c6231936a75b90f7ec14ccfca3d79a80ea1c5eb640df2132db219b983863b3ec53bb75e0e6f51f1c39d
-EBUILD acl-2.2.53.ebuild 1231 BLAKE2B 480c89f323d9550d37dbea50847e0f61dbb8a595dc56bc7df9704f8103709cac620329ccba088ccaeba5eca58388fe8876c7cb9c564b599dfe1649f7d5b6b969 SHA512 d4243f0b74068edacf5dc8f65c2d4e3de856ac0534d3caab35754b4fdce390bdfe9766e51a5c10de8c922c01765f37948d106c6fd57c2985e7906cdd74ec0b06
+EBUILD acl-2.2.53.ebuild 1230 BLAKE2B 8b90ea7d615544bed6d90de1ceb922da1f458a5cf963f8931618bbb626bef7c6093b9dc144ea7af9ea0b73a1b01a3baf9920b179249542a90b6ef710a987ca67 SHA512 e649859f150337f3631e0af4377218352e796a5b561b468971a7ab7fbf309d9e9186b6bd44253adfa6d6c53ef33ffc8e13d8362ed5e3d867a92ace9803cdf2c8
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
deleted file mode 100644
index 11c8d630a18c..000000000000
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="access control list utilities, libraries and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas po
-	elibtoolize #580792
-
-	# same as https://savannah.nongnu.org/bugs/index.php?39736
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-multilib_src_install() {
-	emake DIST_ROOT="${D}" install install-dev install-lib
-
-	# move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-}
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 6b676984e267..0ba2b30408d6 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 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 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="