gentoo resync : 24.03.2019

4 files changed, 2 insertions, 84 deletions

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 29b7dd68e75e..4f1628f1d234 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -11,16 +11,12 @@ AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec5
 DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
-DIST squashfs3.2-r2.tar.gz 314764 BLAKE2B 55d2f38572263c4b1ec704ed7a07794400e904e260e316e399511851d35ab0f7e1834eba605e8739d1b8f6b5a56512570d36196d21743d05842e958b3d80e368 SHA512 983f1fa966c15fb4929eaaf2d88401aac72f6d04e8c5523bd46397bc28928ff13b638e0e96bc09650627449c37f6a654ffa727445f1e9ca13cdc9de4fc43012f
-DIST squashfs3.4.tar.gz 352660 BLAKE2B f48b1f0399d3fde75b8f625fa4130d04772ed9e6d8dc179e7105a7770a5bd211a7aa5c7d5d621efedc54707b37a622351efa65291c03cd84d049ec4a1094773a SHA512 5e126ea468271f54c62d473a04a355169514f2668b4dc0de4138a8ef2a6e633d373454e7b85c1c684b875d9dfc8afb17c05548dd5062d05f847ffef8e624d9fe
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-3.2_p2-r1.ebuild 1021 BLAKE2B 7e3485fdb797f12e782736b21ee4b675ab9436eaf65a60391004d2eb69a3e24d26a3dfa35c6a0b902b203e01d2d5ce036c34c9d95677b20392578f7431c9c187 SHA512 d4b88eabdf7792ffb35369821b8ed5c1083228794bcbdabd34026662307e0dcf35f743d2a26693404ac150ab8e1500bb6ec02353ee061aa167d526dfadfc1ff4
-EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e964737db11c64e18e135b5ee5aa0335d8981d72bd2f39740769a847391e1efca36a7f012f07a2ce20deef71daef58bfd0b21 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129
 EBUILD squashfs-tools-3.4-r1.ebuild 1005 BLAKE2B cb55eca250959a6e9fd91eab43f989711047bf524f90ee19f8decc364237ef735bd0dadb233dad17c8b0ffd97464a8a6156b5fae019779ed0c42630b09d8e1b8 SHA512 7db000e02f9d9a9a32fd33fb90299852be6a075c9c1954c9a34bca2ead534014177f9de959341ceab5d7948bc80898af3517043bd245294a7fda799b65092875
-EBUILD squashfs-tools-3.4.ebuild 937 BLAKE2B 77ce02b82aae8aae9a5e64b7c4e28e416d70bf92f1ce2d4b017eb3a3a9bd257e7355176c149668a85f757ddb66f017543b55f366782b2ad7c1bd8f01a0921689 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
 EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
-EBUILD squashfs-tools-4.3_p7.ebuild 2094 BLAKE2B 284c6aff0004705ea2fb2bfd09f621a4eb842c717a27e3115cdb805060591dd4984e04d762b97b429438f1ab775e94d385c80b35fcb09fe15ce978e70a2e6917 SHA512 1609df86a2048663b4dc65d3bed09fe939c2f4f2b6bd6583f7ded002016d3c67f3410ac964f950333f67437a266b1c13ba9e2643c1bd7040edca00b7b572e7dc
+EBUILD squashfs-tools-4.3_p7.ebuild 2093 BLAKE2B b692a9a1fb451510186b693621d07a069721efee7440268a8bff0d21e8b83ba46b4e500f7f3a9ec62820c1dd80268efb66dde19f4f47f174f4c0a1cbdf3c7e18 SHA512 bb30e815378cc01e6f399c1cb5e8971fabcb9ea5cf48f9bfc2cdda180e18f0c9a9a8548391ca6d43e1064f9dfa420843b4a54dd7b481fda197ae52632a73f64e
 EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
deleted file mode 100644
index 33c9be8386ec..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.0" # squashfs filesystem version
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_prepare() {
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die
-
-	echo "struct dir_info; `grep '^int dir_scan2' mksquashfs.c`;" >> global.h
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT}
-	newbin unsquashfs unsquashfs-${SLOT}
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README-3.2
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
deleted file mode 100644
index ef2cd80bfd22..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-MY_PV=${PV/_p/-r}
-DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3.1" # squashfs filesystem version
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools
-
-src_prepare() {
-	sed -i \
-		-e 's:-O2:$(CFLAGS):' \
-		-e '/-lz/s:$: $(LDFLAGS):' \
-		Makefile || die
-
-	sed -i -e 's:get_nprocs():sysconf(_SC_NPROCESSORS_ONLN):' *.c
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	newbin mksquashfs mksquashfs-${SLOT}
-	newbin unsquashfs unsquashfs-${SLOT}
-	cd ..
-	dodoc README ACKNOWLEDGEMENTS CHANGES PERFORMANCE.README README
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 8565685e580a..fb27b8b6e9da 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="