gentoo resync : 07.10.2018

16 files changed, 198 insertions, 26 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2015c629e33a..4c5bbe6fb152 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index dd95c2c90fda..f0a3b555bf09 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,2 +1,4 @@
-EBUILD bees-9999.ebuild 2001 BLAKE2B 7fa1c9d043a4334579dfad3560d1593717e548c0d31695cf8ccf8ffe45f2347584c7da43b47cad873745f3c843207433c6b892a0469c5618f107c68f78fd5fe2 SHA512 d49266e007895c049e1c9f7e28ec2f649b386a6441eccba02ee411f14ad395925eecdaa8a747962ccc526f9e1d3aba9fd68f4452a1d276d4e5b7d48c80102cd8
-MISC metadata.xml 600 BLAKE2B f772b28d500fc9e77397073dd0f09e2522dbe9c4c5a17236018f050e10057b02a471ac284f480b58592d315352776b08b57316856b914441e9842b7e2f0ff6c9 SHA512 c69131207ee3485d539024c9b2a34be233d4066320346744038a0ae5c1177790288a0ea4cd9319323c3f23230213b706e7841dc1b5000ffdcc620f52bf9b7b07
+DIST bees-0.6.tar.gz 124049 BLAKE2B 7a2d77366758325cebbc51767781a3eff4fa52180b53ebf5eb982433bfc1c80acd4f3befa5968c888be443815e6231625e9ecc2763c35e33e5ed55c13bd702bc SHA512 bb288da8d2e0fad100dc40e3f9060055220e0ec948bc571a1cb06a7d78d0d0e6db30164e7dbde040c264c496cb59d50bb0694dd9432a8229e04f2cdc33bab31d
+EBUILD bees-0.6.ebuild 2099 BLAKE2B ca8f34586b0005dff546cc251be3696a3415c120847026e1d719f7e463ea82f5069730402d609c3447f3902eae494b4ec3d85fad783160fba01fdf893af45db2 SHA512 5a0a8a7b5a11f2bd5e2695e595c5688793ac314f1e5bd96b4a69783e696ac40172a8cd6447474bbbd8c6cc6836863e5e8ed5c3f5a0dab09ee41b6c48cc51bd0a
+EBUILD bees-9999.ebuild 2099 BLAKE2B 88a9e370419db85e8f459626489a4dd06fbc55abd59ad367229d0aa4eb360bbbca0d4f46e4feada0d01d434a360bdac4015c3bfc063af3eb1940c3ada6a34665 SHA512 65745b2e09d1b7231a9ea29d78479f68f2d3a628353032ccaaf43245376e526721fae5f0a22a3586462634271a9798feb4608bc2349a48d2c5e7df7052bf5970
+MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.ebuild b/sys-fs/bees/bees-0.6.ebuild
new file mode 100644
index 000000000000..dfda78fae30b
--- /dev/null
+++ b/sys-fs/bees/bees-0.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="tools"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.1
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 4 3; then
+			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
+			ewarn "properly operate, so it won't work. It's recommended to run at least"
+			ewarn "kernel version 4.11 for best performance and reliability."
+			ewarn
+		elif kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		fi
+		elog "Bees recommends to run the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+	fi
+}
+
+src_configure() {
+	cat >localconf <<-EOF || die
+		LIBEXEC_PREFIX=/usr/libexec
+		PREFIX=/usr
+		LIBDIR=$(get_libdir)
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if use tools; then
+		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
+	fi
+
+	# quickfix, will be removed when fixed upstream
+	sed -i "s/UNKNOWN/v${PV}/" src/Makefile || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 72fef108e72d..22a1b0a48880 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -60,6 +60,11 @@ src_configure() {
 		LIBDIR=$(get_libdir)
 		DEFAULT_MAKE_TARGET=all
 	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		cat >>localconf <<-EOF || die
+			BEES_VERSION=v${PV}
+		EOF
+	fi
 	if use tools; then
 		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
 	fi
diff --git a/sys-fs/bees/metadata.xml b/sys-fs/bees/metadata.xml
index ba18bd51ea03..1231725fe211 100644
--- a/sys-fs/bees/metadata.xml
+++ b/sys-fs/bees/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 <use>
-	<flag name="tools">Build extra tools useful for debugging (fiemap, feiwalk, beestop)</flag>
+	<flag name="tools">Build extra tools useful for debugging (fiemap, fiewalk)</flag>
 </use>
 <upstream>
 	<bugs-to>https://github.com/Zygo/bees/issues</bugs-to>
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index a00b189d7e5b..cab325f5d379 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -2,5 +2,5 @@ AUX dosfstools-4.0-udevlibs.patch 1132 BLAKE2B f6d5d052a56a8d997e12cf293bfa7e482
 DIST dosfstools-4.0.tar.xz 157564 BLAKE2B 13dd374eb6824b2c5d5ae849dd802a4bb1b85729f4654e3d23ee8c3698a72a45a73e1a7d7cb95ae7cba13ea9737e80e253eb4603b342e49743a8402d7f7ceeba SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
 EBUILD dosfstools-4.0-r1.ebuild 1117 BLAKE2B a973db2963f44141e73cd3fe8e680ae4ec10564bf3eb2397254d5070a7ad395a4905484d1d61bdc91c89464c02bcb494efa9195cb76608966966101e013a8816 SHA512 f00d35306a1a95d7b3b23fb8e23f5587e16cb8f4e02244f53fc4ddda3b07a704727a7d463bda724015f1e08273102f2aa1f165e4b9bf5be468bc7f9363fda597
-EBUILD dosfstools-4.1.ebuild 1001 BLAKE2B ddc181a69a0168f18c8f35040aab32f00707660e1e17f1b418d630250a3a917bef43c66e594183e9727f1f676d23edb3c76d7f4c6ddbd484596d465dddbffed5 SHA512 26afe1536b2d6902b09a569820c501cbca6570802c61c6c2137fccffdcf1a4dc8899eb849175f10e569487c5db2ce29a791beaea2ef2ae14d9782f11d6677f82
+EBUILD dosfstools-4.1.ebuild 992 BLAKE2B 51e05ea5b1dadbcb7a8f751e44e858f1b3c99723f806e76aca14969f2ed2a156c21d76f38621f16da95eea5c0b98f6c7ebeb97a0648145ac13284ffaa911a595 SHA512 1539f755bea79409f8adb3e275da612fc0040bf57f6aae058431d713a98054f4da37fc2fef83d60fc76be7179ec580077482395cb356599c069995b14f9fc165
 MISC metadata.xml 424 BLAKE2B 01d65645ef9a1e617bf40a2d401a5fd3f1444c68f41a3c64e746e445b100ebd7c8af05b48c250f4bd9c679842906dd2e9b679edc298b1001f7dfe5b183f5f77a SHA512 d82795b70fc583b8154a2c3b14b6565cff36924b91fb3888cd2b6c36d8036614be6d67a0ea0fc96f2fa4bfa5516675b8aa74571e578ad8d42c06cb9f503c565d
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index 00dc71c5ffad..c78c0fbac6ff 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
 
 CDEPEND="udev? ( virtual/libudev )"
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index a150378f8396..e78f12238fd7 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,3 +1,4 @@
-DIST fuse-zip-0.4.2.tar.gz 672323 BLAKE2B f21a630c3aee48547efa354069410e5c1691fa358fe925d55b3839d0c514b9f886b6a39629132956104406c77485f6c1976d81801f7f86781c3225dd7f4d3e38 SHA512 73e38ee96b6bd24ee74b13e57994dddcd97abb99997c1d2bae4801f37a2cf1665cef0cbe4c6cca26d8423c4a9cb5fec2583ad033e242b4807ae87719f2e5f2a7
-EBUILD fuse-zip-0.4.2.ebuild 881 BLAKE2B 663b579c733087e8af1e34d5940c6045e33bbcc330a95fb49071cb8edfaa9f1d8e52a741156a11f5871a9a86a4439952acd2de3a137c80b18783b6c392f49260 SHA512 d521fc413a82072f38cd9193a5bc0f24cd86f0b882c7b6a0d70ed1be130130efce4f99e0c9b361b5d48cb87fdec6087a0f80b39fba9a62715073fa400956a212
+AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6
+DIST fuse-zip-0.4.5.tar.gz 687727 BLAKE2B 5a03eee7e44eb0599129c3266cf8779545426e8992b8d4a473ca87e3b65c51bdde5720e9cea3e5a121b2983dd320f7ff4f352359702e5e2e8e83598153d575c5 SHA512 5a3338d8b820ec5b218db849d139b74d2f4413b94ec75ba8d1a69b8d0e3fdbca0195b1af2f33322fdf9c35f56d3e2e5c4142a7ff3fd3a84bfe7649bbe29b6e98
+EBUILD fuse-zip-0.4.5.ebuild 696 BLAKE2B e52b9478f293898c3ff965fc10f942695b75715b8e5d13f0025b9372f118e0f0eb70eb84de0bbb256e4d006a392e81c38e2767ff0d0b7ca5a1c76ae0b4ca82c0 SHA512 86a8e8f055b969fc1cdcfe10d1655455f24b982cacddac2d8ac2f51b13640183b67ea461df7ef7416be5d9a924fd28778deb869a23f03646b646ebada590868d
 MISC metadata.xml 383 BLAKE2B 9fbc9f2c9ddbe2560cee3301a08f6705818607c3f43deea8a964208843eb4954ec3169362ffea084689e90313a9e18518c315a422de8719a6bbeda103358257f SHA512 e7962c4db2054e682b47d78745cbea5bd0a1d2da9c2d17dc4e48b7f88f83ac18515f23f5ae09a3b07b6bb0ad81cb28881ba9bca977f35536503b8737a3134fce
diff --git a/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch b/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch
new file mode 100644
index 000000000000..d72e5eb99e6c
--- /dev/null
+++ b/sys-fs/fuse-zip/files/fuse-zip-0.4.5-makefile.patch
@@ -0,0 +1,29 @@
+--- A/Makefile.orig	2018-02-04 03:55:50.000000000 +0100
++++ B/Makefile	2018-10-02 12:14:42.209976366 +0200
+@@ -1,5 +1,5 @@
+ DEST=fuse-zip
+-prefix=/usr/local
++prefix=/usr
+ exec_prefix=$(prefix)
+ bindir=$(exec_prefix)/bin
+ datarootdir=$(prefix)/share
+@@ -62,18 +62,12 @@
+ install: all doc
+ 	mkdir -p "$(DESTDIR)$(bindir)/"
+ 	$(INSTALL_PROGRAM) "$(DEST)" "$(DESTDIR)$(bindir)/"
+-	mkdir -p "$(DESTDIR)$(docdir)/"
+-	$(INSTALL_DATA) $(DOCFILES) "$(DESTDIR)$(docdir)/"
+-	mkdir -p "$(DESTDIR)$(man1dir)/"
+-	$(INSTALL_DATA) $(MAN) "$(DESTDIR)$(man1dir)/"
+ 
+ install-strip:
+-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
++	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM)' install
+ 
+ uninstall:
+ 	rm "$(DESTDIR)$(bindir)/$(DEST)"
+-	rm -r "$(DESTDIR)$(docdir)"
+-	rm "$(DESTDIR)$(man1dir)/$(MAN)"
+ 
+ dist:
+ 	./makeArchives.sh
diff --git a/sys-fs/fuse-zip/fuse-zip-0.4.2.ebuild b/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild
index 4436c8c05131..a6bf2433100a 100644
--- a/sys-fs/fuse-zip/fuse-zip-0.4.2.ebuild
+++ b/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ DESCRIPTION="FUSE file system to navigate, extract, create and modify ZIP archiv
 HOMEPAGE="https://bitbucket.org/agalanin/fuse-zip"
 SRC_URI="https://bitbucket.org/agalanin/${PN}/downloads/${P}.tar.gz"
 
-LICENSE="LGPL-3"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -20,15 +20,15 @@ RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
-src_prepare() {
-	# Fix strip than installing fuse-zip
-	sed -i -e 's/install -m 755 -s/install -m 755/' Makefile || die "sed failed"
-	#enable parallel build
-	sed -i -e "s:make :\$\(MAKE\) :" Makefile || die "sed failed"
-	# Fix prefix
-	sed -i -e "s:^prefix=.*:prefix=/usr:" Makefile || die "sed failed"
-}
+DOCS=( changelog README.md )
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
 }
+
+src_install() {
+	default
+	doman fuse-zip.1
+}
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 9f4362b25529..0751a0bb7e42 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -3,6 +3,6 @@ DIST lsscsi-0.28.tgz 150259 BLAKE2B e8376f306c61ebcbef055ba603bf42ece4dab13bd775
 DIST lsscsi-0.29.tgz 353116 BLAKE2B 6374410cadf7fb091f6dcc99bf9435b0af56bc603bbecdeadb76407efc5b2f6106a0fc65f9705d6dfe4cdbbd66494b8a966caffb08bb350d2e6128ee881546d9 SHA512 2c595cfc738815c9231ac078e47215ac46c1283bc8ad784a898eaef6d64f41311a9a08c96ea0dc9379bd79fe6c6ff4d2af176cea5aecaca74a0fa255746d84ad
 DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb103108dc93748d2b245f2dc7edd93da7d3bf3b176187a2d8cace78ce1f7ce8f42da1454c05d8fd308e02db3b3 SHA512 ea1ba2bd2892b7e7feff0bf08ea09ffcdc38d21e4dba2cdce598d8ffde926a5908f2d02116d692bf4747b76c76c1c35974569583cb2da75eb49553959368dc76
 EBUILD lsscsi-0.28.ebuild 424 BLAKE2B aa2f6df0b61816d547c8670bb06cd65f8f16402c3ff1c3164b905eef22565097f43383127dcf7820576527d8598bdef51687add0faf88d526666c0abd78845dd SHA512 4efed74f282adc66f35b6c2308ffea8a4d96a815a15406622eb52cf2077e3fcb9480f98b2882bc3e57127d7543ea4d36da122348dd5952f5231a9a072e1adf4f
-EBUILD lsscsi-0.29.ebuild 345 BLAKE2B c6102c0262aba02d78cfa6274bcbba16bd6babf3939cc6b21b48dd14d0540ba4b42b7ffc998522c981442ab48781416bea75c8be43fef71a25ec5854b92ff783 SHA512 4d605fd75b3011f99dc0be2f07ff27c511272110bfebab22b1401c526ab5b0b590bf429fa557f5a69b3431920af42098f596feba1a27a040489ec92aef5f6e43
+EBUILD lsscsi-0.29.ebuild 340 BLAKE2B 7ec2757d4b6f46bc4b80dc1de287ef6235e1c876d8c738d22fd70c9f875af3dc0fc8242875e213096b5fa1632c548734b0350259de6335c7ba5aba25903d9f47 SHA512 1dd0ebe8a4d85a1dcf1f8d85095723077f34b5bf5285cb4e24094dcd175c4be261f1338d8479dab62f7b3d2c779770ea75fd9630d92e14c44980d4b0fa568b9d
 EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.29.ebuild b/sys-fs/lsscsi/lsscsi-0.29.ebuild
index 6664fe62da8f..f327ebdf96e8 100644
--- a/sys-fs/lsscsi/lsscsi-0.29.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 50dfd9b25f91..1feca55eba1b 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,5 +2,7 @@ AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf
 AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
 AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
 DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
+DIST mtools-4.0.19.tar.bz2 445566 BLAKE2B 2f35eaccb65ba39cb365ecaf1de95cff038370503bcb9dad4dc1bb654d00d1559c7183f8a30538f0fb6ce12332521083eefaa34f4eda9bdc9698cd54a0689fa9 SHA512 8928baa197bb3ad0f5e5b6852bfb1b4220bc50d19527e703025cec98bf9988faba496d91df71b14d936a095cc89ce92ce533abe9adf5fff2602f139cb3c6085a
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
+EBUILD mtools-4.0.19.ebuild 1460 BLAKE2B d4dbeeb9a245221fd74e478a026bd35a618bbcf1a4d33ab9f1ad9dee0264fc77dbc1bbdcd3b9ea78128cfa54fa83c0611f2a3d266853dceb93b987bb7b2dd8bf SHA512 0601d64c3b944d8ee6727a934038addd6a4a24e3710ab4d7c0499541a7944506f35650c74188dc932b848e4c05e124b96f31afab702a1d0726bba94775f37941
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.19.ebuild b/sys-fs/mtools/mtools-4.0.19.ebuild
new file mode 100644
index 000000000000..241e6ded35ab
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.19.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit flag-o-matic
+
+DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
+HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+IUSE="X elibc_glibc"
+
+RDEPEND="
+	!elibc_glibc? ( virtual/libiconv )
+	X? (
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+# texinfo is required because we patch mtools.texi
+# drop it when mtools-4.0.18-locking.patch is no longer applied
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.18-locking.patch # https://crbug.com/508713
+	"${FILESDIR}"/${PN}-4.0.18-attr.patch # https://crbug.com/644387
+	"${FILESDIR}"/${PN}-4.0.18-memset.patch
+)
+
+src_prepare() {
+	default
+
+	# Don't throw errors on existing directories
+	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
+}
+
+src_configure() {
+	# 447688
+	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
+	econf \
+		--sysconfdir="${EPREFIX%/}"/etc/mtools \
+		$(use_with X x)
+}
+
+src_install() {
+	local -a DOCS=( README* Release.notes )
+	default
+
+	insinto /etc/mtools
+	doins mtools.conf
+
+	# default is fine
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED%/}"/etc/mtools/mtools.conf || die
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 9c037cdc6828..f35db4947a82 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -15,5 +15,5 @@ EBUILD squashfs-tools-3.2_p2.ebuild 953 BLAKE2B a4d1a831009bf68138e760847c6e9647
 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_p6.ebuild 2102 BLAKE2B aff4d868da046f29a32d4a8c3b741bb4a6a443d1c8778e1ea3f0d2f35cd29f47d9f86060d51c8be1b0a34ef386338e958eeb9cd55328c7022559cb50539f755e SHA512 5bbe36316133880a5f4ef71f5edf6b0aa90a61e87f71f227de655a5c261996c6a9760e8672d3a39168a8b9e8f8f95b0fbd127ff30de43c7aad29ebb403fbc586
-EBUILD squashfs-tools-9999.ebuild 1627 BLAKE2B 0110dda14ddddc8ae01127b016df014d10a1fe278a12580469c352b0b7da70ff9a1aee7fbf4906ba6cf1908b7d0a8d0a4566e14a1ea6f540d8f8cb69e3c5d46d SHA512 5b285f492107a3de0302a5ea6c00382c667f0e69429bcd52ec906272c3e6ad1e15db0018b7ef5f3a5317383a0f5209cad59388a9f9eb42a30452e5204a9a7af3
+EBUILD squashfs-tools-9999.ebuild 1662 BLAKE2B 07e5705480853692733b18b433b5d08fa302cc24143c7ae4703efba82c8a563979e57528487e5326d2fb6d61bd864e6f8eccc978f62228124139d53103ccee38 SHA512 f5c9e3c4c4082bd6fbcb53c5ea7caccee5ebb3f86c393e883aa2d2fde1e1673b56e88b0e84781b298dcba9a58ff477d3cd50306cab968d2d456dd8102878d973
 MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 11c0570d7f45..5668f68d5054 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,12 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Tool for creating compressed filesystem type squashfs"
-HOMEPAGE="http://squashfs.sourceforge.net"
-EGIT_REPO_URI="https://github.com/plougher/squashfs-tools"
+HOMEPAGE="
+	http://squashfs.sourceforge.net
+	https://github.com/plougher/squashfs-tools
+"
+EGIT_REPO_URI="https://github.com/plougher/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"