gentoo resync : 12.05.2022

3 files changed, 2 insertions, 63 deletions

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index bf139c3d1d13..97af031ef1b9 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,5 +1,3 @@
 DIST squashfs-tools-4.5.1.tar.gz 270112 BLAKE2B cbd35daf582d284b021911bb754ed548763f2773e1bc02516ca18bab7034e352780c11eb7dfed1f047b70974dcfb716bb1a1d3729e5b25662203cfbf93553b73 SHA512 b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
-DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135
-EBUILD squashfs-tools-4.5.1.ebuild 1270 BLAKE2B ce5e6b149260a4bd9a75cc03b247c003315694b1be767e39d390bc1b747f67b143c968f5ec4709f765e72c2f27a98b91c350964a91ddb6d73555e9181e851966 SHA512 ff3e7a7949e0566c64a8aa57e6e7850488e8a4dc387c8193ba9f6fe66a117a08765f3dfc0348f27f8919c65fb60f5e1ad75464e587ea9a22aa53cf2a27680c88
-EBUILD squashfs-tools-4.5_p20210914.ebuild 1501 BLAKE2B e909ffbb86ef8a7dc103f6436a101e31c70d2a1fedca07c697bff192ecba3e42afe9b51272ad9dad9722b78392da1d06a9834240f9747a830abb23dd0962a6ea SHA512 e301da8e5ec3201f27a5847dd876aca3d594390de2b849827260c50435c12b4b34f57f5a7b5c5e1f03815d7184ed689f279db5940a9ad65a99baa6b53e9dd328
+EBUILD squashfs-tools-4.5.1.ebuild 1263 BLAKE2B 5eff6295550f8f004c894083bca9862d4e0d83234422a7fed136fa5a2d2add410fa73659da966f7f41500b87cdd43dda7901e799ef0f16347d33411e6a870c44 SHA512 ae4b46dede58eb800d376b68bcac80e702767e8e15a02325a515b190924d3c22628fee1883642e6b0e4dfbbc1feb63c376404b3ada43e1818af1db83392cda67
 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild
index 27d1c3f642c7..c8e5c9198e74 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="debug lz4 lzma lzo xattr zstd"
 
 RDEPEND="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
deleted file mode 100644
index fdbb67149677..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic toolchain-funcs
-
-MY_COMMIT="19fcc9365dcdb2c22d232d42d11012940df64b7c"
-MY_P=${P/_p/-git.}
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="https://github.com/plougher/squashfs-tools/"
-SRC_URI="https://github.com/plougher/squashfs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${PN}-${MY_COMMIT}
-
-#SRC_URI="
-#	https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz
-#		-> ${MY_P}.tar.gz"
-#S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="debug lz4 lzma lzo xattr zstd"
-
-RDEPEND="
-	sys-libs/zlib
-	lz4? ( app-arch/lz4 )
-	lzma? ( app-arch/xz-utils )
-	lzo? ( dev-libs/lzo )
-	xattr? ( sys-apps/attr )
-	zstd? ( app-arch/zstd )
-"
-DEPEND=${RDEPEND}
-
-use10() { usex "${1}" 1 0; }
-
-src_configure() {
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 lzma)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
-}
-
-src_install() {
-	dobin squashfs-tools/{mksquashfs,unsquashfs}
-	dodoc ACKNOWLEDGEMENTS CHANGES README*
-	dodoc -r RELEASE-READMEs
-}