gentoo resync : 05.02.2020

6 files changed, 29 insertions, 17 deletions

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index b25b39c4ba17..1cfd7c821ff5 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -6,14 +6,15 @@ AUX squashfs-tools-4.3-mem-overflow.patch 981 BLAKE2B 135d7a985ae0e795e2d2464059
 AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88cca5973a56efc1ad2896034d5fe071461da2d947a1d9009fa354e49f668ee56b4cb900af1842be8dad34a51bdb4c8e9 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
+AUX squashfs-tools-4.4-fno-common.patch 456 BLAKE2B 6864eea963512705290c84e2c8ec57db59d0b96119469dae57a55c70f999446ca14ac7fbf7260540afd1656e1b50ba7ad174548b3972fba74ed530cfee1e5a7d SHA512 16da63201d5d1584401f3199a0f89d11d5e8d968a4e707215febf5910ec03425a7478d32a0a6e5e6cf7039f92300657d1797a525b38a817601ed0a8e698fb96d
 DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
 DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
 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 squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
-EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
+EBUILD squashfs-tools-4.3-r2.ebuild 2130 BLAKE2B 7395e3137ace870d801a19a1111dabc91cde63046d678962eebf025cf254e17dec7b3706e7e2641ab1c0a368ba0cc3e53d97ba935aa321bf51eaaba15191c212 SHA512 1cfcd651d41090c56ea56ea278e3e02cb35f16063171def3a9ea06ce188783830c6b5a3fa69e0852582b149bf384018140db582e6d2fc167cb04bba229d1fd4d
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
-EBUILD squashfs-tools-4.3_p7.ebuild 2081 BLAKE2B 4a8dd3b2d9aeab4dd62e837ccad73c3978a38cc6eab1bed7b325cae5df5b86eb07a72c7fb41d15c6f3c8d359e7f737e42378bf1f8cd27449fbdee0feabe3e757 SHA512 7502683661d1ce9dceae275695f727153fa3215735e8d65089f3953244ec9e4a37e0be4df02300001d8ea49e1819e4d9a14529b6a6f654ee6332b6bbc2ce63f8
-EBUILD squashfs-tools-4.4.ebuild 1682 BLAKE2B f26a90aa1069483c51fd4a198b5604cbc1010e16476a207dfea47a3987522f26d29f3d9f4be3d435069b4dd3dca6b4474c3a63eb036ae5c9c7e99a479dcdff9c SHA512 c42d7d613652f82d044504f9ab513ee9187fb84ffc7fa15e9f57d38aaaa910e6eecae082e7dd8213aa385fa9c87e3ed8dde79711f91cebd11a2e1e0db816ac0a
-EBUILD squashfs-tools-9999.ebuild 1598 BLAKE2B 99811ee72ca38123b68e575076e88abd43353143a399039347608d5c28ac32c0bc1b095811af3571ef63dd157a28ff7c330b851f6874f052ae79da524982bed7 SHA512 4c6339bcd651802945f61d20c881836936fb99e0eb3c4b21ca7766805db1c5bb031e221a171c2f02e2d761b6659669ca97d43e82b0c3c74e2cfc1beea6440858
+EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B 3759b4f836a47783c2123d5f5dadbeef39fac9e2477065392e56cbed03345688c263e86473b6f512cf3135760e57878cfefb92e84a9a7580d1d62d5c2fb1c2b8 SHA512 bb022bd76d01afe17edf16220a2f58e4ee0a03dd96d8a54dee90f33b999070f92fe886e8e26a4b85b9cfa967b3c955f2a463838de5fdbd58b3d1df845d72ed31
+EBUILD squashfs-tools-4.4.ebuild 1723 BLAKE2B 21b10ff20d4777a911af10118e780de33a84ba76cce0407a2f537dc65ed18c4d642a4514b423afc4bb66f5a395bfcfa2a27eb7ab4b85c9bfcea00016495da33b SHA512 c48b71312b2484f80b5bd5d7dbbcc614383b8c00ed80eeed183fb360c5ce34d2358d739556a163987e0a17493c7f80d52947dc973df0266589ac53bb8b6d6d3c
+EBUILD squashfs-tools-9999.ebuild 1561 BLAKE2B 11c5821cf9591e4ad7ac26cc636c9858e9ba6d229381f6bc642310d2e876051a4d8e9996a7f537473bd5ffd8f5da280496cc50ec578cee523f1163483df6e518 SHA512 801cbb143d6cea3270f1a9bc7e6767643a8be079a7ccf5eb8d619cf5b57f4cb059e723cccb8b5b022b8f4b4c0a74e37a0410243a7dcb609033c947e3d61c984c
 MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
new file mode 100644
index 000000000000..dfbf42abb34b
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.4-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -143,7 +143,7 @@ struct append_file {
+ #endif
+ 
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+-struct cache *bwriter_buffer, *fwriter_buffer;
++extern struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+ 	*to_frag, *locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
index 8273f5535b06..bad3a819cc82 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${PV}.tar.gz
 
 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="sys-libs/zlib[static-libs(+)]
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 48fb0075411c..3c7a5099850b 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="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index 4bbb6fa92af7..fcc3ce5bf79e 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.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=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
 
 LIB_DEPEND="
@@ -30,7 +30,9 @@ DEPEND="
 	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 "
-S=${WORKDIR}/${P}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4-fno-common.patch
+)
 
 use10() { usex $1 1 0 ; }
 
@@ -55,12 +57,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
 }
 
 src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
+	dobin ${PN}/{mksquashfs,unsquashfs}
 	dodoc ACKNOWLEDGEMENTS CHANGES README*
 	dodoc -r RELEASE-READMEs
 }
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 56e2a3332c0b..c5bf886e7767 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.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=7
@@ -34,12 +34,12 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
+	"${FILESDIR}"/${PN}-4.4-fno-common.patch
 )
 
 use10() { usex $1 1 0 ; }
 
 src_configure() {
-	cd "${WORKDIR}"/${P}/${PN} || die
 
 	# set up make command line variables in EMAKE_SQUASHFS_CONF
 	EMAKE_SQUASHFS_CONF=(
@@ -57,11 +57,10 @@ src_configure() {
 }
 
 src_compile() {
-	cd "${WORKDIR}"/${P}/${PN} || die
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
 }
 
 src_install() {
-	dobin "${WORKDIR}"/${P}/${PN}/{mksquashfs,unsquashfs}
+	dobin ${PN}/{mksquashfs,unsquashfs}
 	dodoc CHANGES README RELEASE-READMEs/*
 }