gentoo resync : 18.11.2018

26 files changed, 389 insertions, 26 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 516275b58f6f..86e1ee772a87 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index f8987cc7888d..7634d98c5bc9 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,4 +1,6 @@
 DIST android-file-transfer-linux-3.5.tar.gz 779997 BLAKE2B af8f1025ae09f2e5a99116a1feb2449d2dcdf64887cd46e712c88f7911aea891ea5ff1705220b68ef9f6ab349a8c1d1955a843a47dcb53383a64a28f8830c7a8 SHA512 2a87a0a2c17b1f51cdce445291ccb99ee15ab24531e2cf41b1648702c66916d55ec8cdc1bd344bdbda5e4a1132daf0cc623862028f2d781812c24f8cf89a1367
+DIST android-file-transfer-linux-3.6.tar.gz 779459 BLAKE2B f71e7f3313a60cf12179908ed539e6b728e64c0b4e3b6b39dafd9926b27b96b54d31abac9da704111b2ab42867b1c58aac51ff547553cd5ad96dd8c00a5f670a SHA512 bcbc2f8bd39d093677b1c2dcb3d981293a8e79487884fcbe3450864dad9beff381fe966a2a42faf0af75a96753e4f139c95de7ed9175d7cb350055a35f7be4bc
 EBUILD android-file-transfer-linux-3.5.ebuild 1249 BLAKE2B 291048a184b70cffb2dd671b162404b3a11cf1e64d1b0ea4fb8ee7ac43295fd79d33113f3ec100ed1518c2898553e608c5051ac0874a317656fb163d98f97469 SHA512 8fe4e868db2e65d2415b67ef861f1d22c1fdbffcd68dc76ec7718ce8a447c4690351801dedad647e416240138d04f360672b984c460bb8017f651ce4b348f6cb
-EBUILD android-file-transfer-linux-9999.ebuild 1249 BLAKE2B 291048a184b70cffb2dd671b162404b3a11cf1e64d1b0ea4fb8ee7ac43295fd79d33113f3ec100ed1518c2898553e608c5051ac0874a317656fb163d98f97469 SHA512 8fe4e868db2e65d2415b67ef861f1d22c1fdbffcd68dc76ec7718ce8a447c4690351801dedad647e416240138d04f360672b984c460bb8017f651ce4b348f6cb
+EBUILD android-file-transfer-linux-3.6.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
+EBUILD android-file-transfer-linux-9999.ebuild 1218 BLAKE2B e1207bee155fc6b426865073d6bb7dc025e7b98f2089040e71154c423cc6358fc8f059f1a89829666c533ea3124337d41413a509ad084212f2085c0c9152e6cc SHA512 27ae2789f024e12375018920e80672dee47a402a65f8804b36da34b23ee53092fc64f4dac460509a75facb833a7f9b7185b5d0a9f280a7cac8791fb1b0adc94e
 MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.6.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.6.ebuild
new file mode 100644
index 000000000000..de7813d30653
--- /dev/null
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+DESCRIPTION="Android File Transfer for Linux"
+HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
+
+if [[ "${PV}" = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
+else
+	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+IUSE="fuse qt5"
+
+RDEPEND="
+	sys-apps/file
+	sys-libs/readline:0=
+	fuse? ( sys-fs/fuse:0 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_FUSE="$(usex fuse)"
+		-DBUILD_QT_UI="$(usex qt5)"
+		-DBUILD_SHARED_LIB="ON"
+		# Upstream recommends to keep this off as libusb is broken
+		-DUSB_BACKEND_LIBUSB="OFF"
+		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() { gnome2_icon_savelist ; }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
index 753c4b81006b..de7813d30653 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.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
@@ -41,12 +41,8 @@ src_configure() {
 		-DBUILD_SHARED_LIB="ON"
 		# Upstream recommends to keep this off as libusb is broken
 		-DUSB_BACKEND_LIBUSB="OFF"
+		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DDESIRED_QT_VERSION=5
-		)
-	fi
 	cmake-utils_src_configure
 }
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 70140f9cceee..d45692d4603d 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,4 +1,5 @@
 AUX btrfs-progs-4.15.1-e2fsprogs-1.44.0.patch 1168 BLAKE2B d2ebad85f6f15dfe97fbdce1f32170a14655ec3280ee5720fc6abece9b29c1a60eb3ad7207f396f9a4edd792a9f09928dc396e6906f1d2ce561d5d27ed8266b4 SHA512 de99775ec92dd87ed2bcb29885a18a69f781490bd71a26c0b5536f8b180d8a03ebb4fd52eb8b3939c2f28dcae01bcbddc93c0b7b347f15e5295939f5e5dfe9e4
+AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
 AUX btrfs-progs-man-no-gz.patch 2206 BLAKE2B f195b10aa96230e056b4d5b94019a799cbe9717a1fdb2141a293c3916a929181ea12a1d32da6db7113b888da066463ebd55ae64712d54458cba0c7b654d6487b SHA512 94f0cf810f4f800f40a478595cfd062b0a523cb7538030152ee21d5a0adeceaafa310aab95c119c98309ee606a2ee6d6c4ff7014fe8026d43288ceb04c2773cd
 DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b
 DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
@@ -8,7 +9,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331
 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88
 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e
 DIST btrfs-progs-v4.17.1.tar.xz 2045192 BLAKE2B cfc696f32ae8f02865206ff0b1f749a5af072b147537e2c6389a4fb7e93e437754b6af23f122722837612a08d86485bcf110e069facb6c5b76f193dc89a6d433 SHA512 90f291e362b640a22b41036351619e7b8a793a3b57d0537e7865edf4b830d6dc57b3051c0aed9e1ff38b602441a20fea7f974ccff789a3b4a622a0ea57756538
-DIST btrfs-progs-v4.19-rc1.tar.xz 2000332 BLAKE2B a0721d6d4541a31b8f483e7faea342b8f7e74d6b2a6e0e5da6f8c1f2dea9b713ce5e9517382af76079c523d880b9673e669eb6513ed03d947daa95798a109470 SHA512 2f849a72b321be7e37e309dfa758b1d7b0da29a803bb0060100e3169415318a554eb089725e275154ad2bf1105216f874106d20541311302b9f72d9d41b4c2a0
+DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 EBUILD btrfs-progs-3.16.2.ebuild 1257 BLAKE2B b243da6fc07eb44afbb5c4db272ba98c88a27f27afaf7740e2105c143fbc5ac7f6894c66feb931229a1da4eb5b7613418240ee1a051ebedf79d53d4b0e260fc5 SHA512 2321b579af3ee75282836090bc1c0fa71e2f80fa039a479ea71755674f09cacc18e269430e1617e4b1dadd2a9a80b6155cfd0cf2231b6f3ef6fd58f03934caf2
@@ -19,7 +20,7 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa
 EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc
 EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c
 EBUILD btrfs-progs-4.17.1.ebuild 2912 BLAKE2B cd9161dd0c7fa433d03020dc951e1bd0a6974fc02bbbf48353f6fea4d2724ced5c5187e6ab050d46dae41027338a9a55a8f97d65eb9899c282c0dcaf488bb426 SHA512 4b27b69c325883fd5728a6efd4fd9110dfa6e013dfd6ad56a447049097108247e62adcceae768980afd15f3a433eed5c041f70331d55495fd52875281019bbd5
-EBUILD btrfs-progs-4.19_rc1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
+EBUILD btrfs-progs-4.19.ebuild 2903 BLAKE2B 1dbbe5f5a97d874327d34c5ef9a20e681db40ab6ead357ee3ac312c06300041282524ba5c2499fa226a58f39b46eea8f670ee33b7a527e00f89e85ecb5452e2e SHA512 6b6d2bcb4126d535a636afffeb1bd031c49bd59985c69a3b06d56a98455774d8b4d1cd6db27be2b72867a8f7ba15dcf5382d4ed34db81c6043b1169758cccd06
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19_rc1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 04d538396094..c0e82c0a114e 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19_rc1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -72,6 +72,10 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-be-bswap.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
new file mode 100644
index 000000000000..b91b32040855
--- /dev/null
+++ b/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch
@@ -0,0 +1,24 @@
+Fix build failure on big-endian platforms.
+
+Reported-by: ernsteiswuerfel
+Bug: https://bugs.gentoo.org/670741
+--- a/kernel-lib/bitops.h
++++ b/kernel-lib/bitops.h
+@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y)
+ #if BITS_PER_LONG == 64
+-	return (unsigned long) bswap64((u64) y);
++	return (unsigned long) bswap_64((u64) y);
+ #elif BITS_PER_LONG == 32
+-	return (unsigned long) bswap32((u32) y);
++	return (unsigned long) bswap_32((u32) y);
+ #else
+@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1,
+ 
+-unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
++static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
+ 		unsigned long offset)
+@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size,
+ 
+-unsigned long find_next_bit_le(const void *addr, unsigned long size,
++static inline unsigned long find_next_bit_le(const void *addr, unsigned long size,
+ 		unsigned long offset)
diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest
index a9c8fe924393..91f54f19a96b 100644
--- a/sys-fs/dmraid/Manifest
+++ b/sys-fs/dmraid/Manifest
@@ -4,4 +4,5 @@ AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded8
 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 EBUILD dmraid-1.0.0_rc16-r3.ebuild 3267 BLAKE2B 00b1ce94096b42699c028a54e0462e91870bcd7e790ec68fa8d18f21d949f4e2aee9ff88bbce5e191eb7c29e98ef644caef2bd78fe1d27643255506bff36304e SHA512 eca54618444b7e4afa2e69dcb134adcaaaa9a370d43623cc008b6b03e11683839aed8ad2335f60c70b69094e91bdc4eca9f346962d11102ac607c97e06906172
+EBUILD dmraid-1.0.0_rc16-r4.ebuild 3199 BLAKE2B df8cc50e363a354ebbcfa4adbb98b3fac4d4ee23a102950819a4337576a69bc7d8501f73f9fa62f908c8d37220135546b15f1b8329d7179cd6270972ba27e94b SHA512 db1ac9ee6140aae30d3124895d4b8cffb414663449c53f5559a6d76f17d19433057419516c8978fc9b8afea0462f9071695d7042e766c427b08d86bf0432b9f4
 MISC metadata.xml 769 BLAKE2B 58eaf54f32d2bdfa2bdcdb149d97a5e23cfaa91edcf261041953b46ca79291dc8f687da56d9fc2c821697fe69cdc54f78515581566c2ab4a5afc125273e4c3a4 SHA512 e716dad80405dae942af5ded092214854432f43a5c622e8ce41f36af3f514c9425de401da278e2b0a2abc96103e4894896ff539f5665e5c48ec2640e57d11e26
diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild
new file mode 100644
index 000000000000..153fa71d352a
--- /dev/null
+++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools linux-info flag-o-matic eutils
+
+MY_PV=${PV/_/.}-3
+
+DESCRIPTION="Device-mapper RAID tool and library"
+HOMEPAGE="https://people.redhat.com/~heinzm/sw/dmraid/"
+SRC_URI="https://people.redhat.com/~heinzm/sw/dmraid/src/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="intel_led led mini static"
+
+RDEPEND=">=sys-fs/lvm2-2.02.45"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static? ( sys-fs/lvm2[static-libs] )
+"
+
+S="${WORKDIR}/${PN}/${MY_PV}/${PN}"
+
+pkg_setup() {
+	if kernel_is lt 2 6 ; then
+		ewarn "You are using a kernel < 2.6"
+		ewarn "DMraid uses recently introduced Device-Mapper features."
+		ewarn "These might be unavailable in the kernel you are running now."
+	fi
+}
+
+src_prepare() {
+	epatch	"${FILESDIR}"/${P}-undo-p-rename.patch \
+		"${FILESDIR}"/${P}-return-all-sets.patch \
+		"${FILESDIR}"/${P}-static-build-fixes.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch
+	# pkg_check_modules is not in aclocal.m4 by default, and eautoreconf doesnt add it
+	einfo "Appending pkg.m4 from system to aclocal.m4"
+	cat "${ROOT}"/usr/share/aclocal/pkg.m4 >>"${S}"/aclocal.m4 || die "Could not append pkg.m4"
+	epatch_user
+	eautoreconf
+
+	einfo "Creating prepatched source archive for use with Genkernel"
+	# archive the patched source for use with genkernel
+	cd "${WORKDIR}" || die
+	mkdir -p "tmp/${PN}" || die
+	cp -a "${PN}/${MY_PV}/${PN}" "tmp/${PN}" || die
+	mv "tmp/${PN}/${PN}" "tmp/${PN}/${MY_PV}" || die
+	cd tmp || die
+	tar -jcf ${PN}-${MY_PV}-prepatched.tar.bz2 ${PN} || die
+	mv ${PN}-${MY_PV}-prepatched.tar.bz2 .. || die
+}
+
+src_configure() {
+	# disable klibc and dietlibc, bug #653392
+	econf --with-usrlibdir='${prefix}'/$(get_libdir) \
+		--disable-klibc \
+		--disable-dietlibc \
+		$(use_enable static static_link) \
+		$(use_enable mini) \
+		$(use_enable led) \
+		$(use_enable intel_led)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGELOG README TODO KNOWN_BUGS doc/*
+	insinto /usr/share/${PN}
+	doins "${WORKDIR}"/${PN}-${MY_PV}-prepatched.tar.bz2
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "For booting Gentoo from Device-Mapper RAID you can use a Genkernel initramfs."
+		elog
+		elog "Genkernel will generate the kernel and the initramfs with a statically "
+		elog "linked dmraid binary (its own version which may not be the same as this version):"
+		elog "\t emerge -av sys-kernel/genkernel"
+		elog "\t genkernel --dmraid all"
+	fi
+	# skip this message if this revision has already been emerged
+	if [[ " ${REPLACING_VERSIONS} " != *\ ${PVR}\ * ]]; then
+		elog
+		elog "A pre-patched distfile of this version of DMRAID has been installed at"
+		elog "/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2 , to support using it within a"
+		elog "Genkernel initramfs."
+		elog
+	fi
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you would rather use this version of DMRAID with Genkernel, update the following"
+		elog "in /etc/genkernel.conf:"
+		elog "\t DMRAID_VER=\"${MY_PV}\""
+		elog "\t DMRAID_SRCTAR=\"/usr/share/${PN}/${PN}-${MY_PV}-prepatched.tar.bz2\""
+		elog
+	fi
+}
diff --git a/sys-fs/jmtpfs/Manifest b/sys-fs/jmtpfs/Manifest
index cc310dd6d817..becaf7b440d5 100644
--- a/sys-fs/jmtpfs/Manifest
+++ b/sys-fs/jmtpfs/Manifest
@@ -1,3 +1,4 @@
 DIST jmtpfs-0.5.tar.gz 142914 BLAKE2B c6970df3f332b918792034d1da195601098c369a55b9ad4534961227fbc286da6a552ba5fad520474fb8b245f2df5c0b3f07f400d4d12fa5478286250f6e2881 SHA512 1997d202199af59ae2138701855864e4dab624fff4feac08ea98e3e4ed6c39e4181d8f9fec35db0e83570f48de204f3d00e1b0d2244ec677f77a99b1dc9c38b3
+EBUILD jmtpfs-0.5-r1.ebuild 538 BLAKE2B d115071327280a2acda4c26d25344c9d163302c1dfaef80ef25881f7ae06070a2ed3b594d43d2d6290cd946c8d7ea550333ffd565b979c6d27446af523cd64cb SHA512 f7ec7977de44ff1eef22f8b5ce9ab414a75edc9401fd903dd442890376cd65fa83949074fff4d790acb6847ff273257ebfbe95315897f536428f417f18ee4961
 EBUILD jmtpfs-0.5.ebuild 523 BLAKE2B 49212758b08073c0e4f81900284c136cb17b9d6749a20bfab9ca28c7e0d0808e9aa39061030b35defe3092b4a8b8e16269e13aba323c14b6bcb614fba865ee2b SHA512 2789599a26fc8f0d349face029f5876fdd33e2a9e2236dbb4e6b4cc21ff3a3b48e63576f2abb66b58122cdc5216815f54c348272b88e8737e9ef2b62c5c15384
 MISC metadata.xml 298 BLAKE2B 26a4e6270ad510210e0f36c42bb2fa2b44ce328e86307222a4ce16db8d3f924b9f5f3577b092c6d5b62f892b94a411edc0d9909101231099636356e3a030abff SHA512 0164dff12990e4ab1cf98d21baf3d3f02354aec3827244112f1f6a7f02769d3d7210ffb0c190ddd5b193921df44237bb0e1a9a2cfc860fe5b3fd3be5ab6ab922
diff --git a/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild b/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
new file mode 100644
index 000000000000..8ac5c3177bfb
--- /dev/null
+++ b/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A FUSE and libmtp based filesystem for accessing MTP devices"
+HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=media-libs/libmtp-1.1.0
+	>=sys-fs/fuse-2.6:0
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index e9d06ac76ed9..21d6ca075cfd 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -11,7 +11,7 @@ DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd5178328859
 DIST mdadm_3.3.4-1.1.debian.tar.xz 86312 BLAKE2B 367a9ed4b16b73a63b613e8029934ee8fbb056e33ca621e92964408ac9a3b3d107af03b657dbfe572f63150e5438879f6dd29a7e7cca1599b213ba135249e78d SHA512 ea9b34a9952e1ff836cb931c7eef0ae0c44e3f4d46162c7a7eca24936d6f7168e99d67749b3100bc68ebadc8f256e4833d42da48c531cf71e6e8f3100911828f
 DIST mdadm_3.4-4.debian.tar.xz 81200 BLAKE2B 393bac2310139788935ced77b736d60d11f58e86349990034367af5460483e97239eef5a6622405b68a7aa6f65059bc5692518172e422c3596ab879527619952 SHA512 86a9edb8f29931fdfa40037d535ca80f0bf59539fe1ef16f2639e666a5ac1bd90ec617ec1635080ae62a02f7986a6e10c97dce5389555ab7d417885f216c0f93
 DIST mdadm_4.1~rc1-4.debian.tar.xz 104716 BLAKE2B d3f5def44de4e83ba302c25438b0f4b2cba0ea1d65964482d6ad1fe1c9e7847e04ef5068859fbefba7125b0931a6473746eef18f1152d02ca604a6fe01e39c99 SHA512 25f60d6bb789ecc8db64dd1fdc750f0cf875f52e28fe82b10bf870e39f751b7e819d45e85c13252ce1b4b728e957216fb28ccd41d04dc8d7386cbd8cdd113fac
-EBUILD mdadm-3.4.ebuild 2295 BLAKE2B d7b2d67672dcdb65085aabbce1a001cece049f3dff01f6fc089a68df2954663b19684af21d373bdd52f483b12e537f658979c27cf724000372a62a2a881c174d SHA512 e782ba420537d40ee0c25e0d7dbea42ea429374c6e8025ce10ed766d111744fe70fbced96f935ff450c914f2e79bcdf268fd7b0101458e423f4cf19ac735888a
-EBUILD mdadm-4.0.ebuild 2300 BLAKE2B c5c98ebefd06b717c6f4d37507c1a15c9348812d0402327d1e7d2661a209cc0c90537353261a441c896f98ee4516b54d1faca335601aba0604aeeac18e2109ba SHA512 66b5316daee8bcb7ff2a1e8e366533e45113683e2cf64b45c8ff431c8d030d6095c1a2430fcc5049401890a5dc72affb49a9735f55dddaab618bd58f04cfdeea
-EBUILD mdadm-4.1.ebuild 2278 BLAKE2B 032d8cb63ea5fe7423d6f3e627ef68c995822b288c4132ba0966163eee9f216e2d6a4e1e6d4e300c73daa72426292ce889f980604a75cdaa806168566657a0ed SHA512 23cbfa888a1ac5ecf6b03cfc250f0bc5be709f5fab2b8f9695280a0f5dafc1afe5c7a6c9fd69626847fbb6ac60c353f4efd48b8043514855fa3bf4f61780215b
+EBUILD mdadm-3.4.ebuild 2312 BLAKE2B 41ef408ace17b030f2df95ccadccf30e27d9e8f352407882dee3d2b9716f0c9102fa59d61d1242cb7b6f6cb729400f3734df4826f4747180949e32da6b0d9bad SHA512 a9db6b4547e842873cda2a6ab5adf9d3c9cc3a32fcb6f119479f3ad3b204a61ec7f70008fd90facfbb4b0acfc34d39c39b123aef6feceebee62fc4a37671e507
+EBUILD mdadm-4.0.ebuild 2317 BLAKE2B f0b6868f68dac70629cd334394edf4bfa354fc8c9d954b0abd1c79cc01db4d56d901c5fed0e4cd03a9b99f066c502b11ca5bd24f282fb39ee35e3cf0f78b695c SHA512 44784eab4666f253615afc8fa362e7d445639bb2d8e9922526fa01dd76143886b5a6dd69baac7a1534df22fa1dcb0d95c4c1ab9589c22641c80ff1faaaffbd9a
+EBUILD mdadm-4.1.ebuild 2291 BLAKE2B 2672eba9227ba577838f17e3c63eec81be869c88166df1324ff94328b4f1cf41addfa35e8baf72bafa4587782f992b3094893c5f32f635a2d1e9c4a413c689df SHA512 7ee57f202f9b9210014640d8fd8b7b295ffca8dcfadb2e030de330d01567108336aa455f282fa8b512c5ec980db7d4a52fa1935e6b60b18c169aa66bd2bd9184
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index ddf71b2cb3e5..14b87d2989a2 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
 
 DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="http://neil.brown.name/blog/mdadm"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
 DEB_PR=1.1
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
 		mirror://debian/pool/main/m/mdadm/${PN}_3.3.4-${DEB_PR}.debian.tar.xz"
diff --git a/sys-fs/mdadm/mdadm-4.0.ebuild b/sys-fs/mdadm/mdadm-4.0.ebuild
index 9238d494d065..4532b9e2202a 100644
--- a/sys-fs/mdadm/mdadm-4.0.ebuild
+++ b/sys-fs/mdadm/mdadm-4.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
 
 DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="http://neil.brown.name/blog/mdadm"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
 DEB_PR=4
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
 		mirror://debian/pool/main/m/mdadm/${PN}_3.4-${DEB_PR}.debian.tar.xz"
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 0ff2ea6b71ad..e3943f1d3d3d 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic multilib systemd toolchain-funcs udev
 
 DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
-HOMEPAGE="http://neil.brown.name/blog/mdadm"
+HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
 DEB_PF="4.1~rc1-4"
 SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 1feca55eba1b..1d047220df16 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -3,6 +3,8 @@ AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6
 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
+DIST mtools-4.0.20.tar.bz2 449835 BLAKE2B 51ee105e57c2cf56acf46d1ea9e0c1a5b89f85916cbd160421ebb992cdfdc7722d257b81cc794cc6d2dbc18728edb6e24c51d460adcb95291021e189a5c0c3e6 SHA512 2b99d2cd86deaa38a47b377ba47c2b88ccb99159085b59db9c2b4f1f9adcfd011f92934419e7b33a634a1ffddf336c8f11229071847ef082fe56b9b91b5f3a36
 EBUILD mtools-4.0.18-r2.ebuild 1442 BLAKE2B 7aaa093e1f1bbc4df2201b1c66044141914cbf49479cbac748026604ead012f986dc5228340448d60aa169023f6f5b7a2d5d826e19bf5e2618059ab8bacdc4af SHA512 32a807769bebeffad14f2a366e5536cb9b055f24cfa3a15508267eb88e4015f33713e8fa338078834942fcfc0d44ac22e15bb3265f45ab96420466ed4c1b77d5
 EBUILD mtools-4.0.19.ebuild 1460 BLAKE2B d4dbeeb9a245221fd74e478a026bd35a618bbcf1a4d33ab9f1ad9dee0264fc77dbc1bbdcd3b9ea78128cfa54fa83c0611f2a3d266853dceb93b987bb7b2dd8bf SHA512 0601d64c3b944d8ee6727a934038addd6a4a24e3710ab4d7c0499541a7944506f35650c74188dc932b848e4c05e124b96f31afab702a1d0726bba94775f37941
+EBUILD mtools-4.0.20.ebuild 1232 BLAKE2B 8e09a9a483a6eaa3028839de1b6f7cb86ffa5aacbe5936828b9551f56dc2d62a9b6868e08bc111768ca1087a405b6acb1278da522303f809998453ef5ce1ee1d SHA512 2510d093f7bcfc8b8545cd1220c840e7d30d976bebc631cec4ac9986085ad7e35e143ef9a469e302206f0bfa15c262db0a00a9650a622f18bd168c823d58cd36
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mtools/mtools-4.0.20.ebuild b/sys-fs/mtools/mtools-4.0.20.ebuild
new file mode 100644
index 000000000000..3dd3d67269f5
--- /dev/null
+++ b/sys-fs/mtools/mtools-4.0.20.ebuild
@@ -0,0 +1,58 @@
+# 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}"
+
+PATCHES=(
+	"${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"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX%/}"/etc/mtools
+		$(use_with X x)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index bee9c86c06f1..6ce9dd588d37 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -12,5 +12,5 @@ DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99ea
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
 EBUILD mtpfs-1.0.ebuild 986 BLAKE2B 4fc769add8ee8c1c12cc8cec6c69ae9c00fc543fdbf63095296ded1a4a0127fe204f711522ca58c2c95a480f71cba184a27571b0006df085f485cc18fa575f1a SHA512 9069b27f5d76131502438c1bbc9d329efa5c295a4a36403e14119c887eeb5d0e5523cbfa15ed3d63b4f2af8651d15aa7cd5e435c42d765f3c80b62f2109f6c4d
 EBUILD mtpfs-1.1-r3.ebuild 1269 BLAKE2B c3da55f5770aa13f8cfec7f5e00c61c4a057fdc6de780ff066e4972579d7fe3368e64f8231c8c677444cdb863a1560c04fa7e7ebd685788969c04433eefafd48 SHA512 c12f11172555e927eb4335bebfe05105c6346db378a8e838fc4186947f9bf8dec66e07126401219cfdefc68d9683a108f0ca450cd4d0bb31c35d20099c159f79
-EBUILD mtpfs-1.1-r4.ebuild 1243 BLAKE2B 47d6c41124ff9544c0025a19ad8e7dd35b62a6882814deebb79e657407ec290ac6924bc72152563bc0005b46e9284a7bf60a4e885b2685f1176d0909b53fc6d7 SHA512 0bb4a5cc6bafefe0aad263adde1a168713dc52e332b9784d31cd10f61c26c63b852c6c9eb7932ef112cee0a43181fcf20b01d8cab2699f77bbcb9dbdb58db4c6
+EBUILD mtpfs-1.1-r4.ebuild 1242 BLAKE2B ba8f15fb0b62c6ab0b4a5063d7263782ae00b3bce04baac5c091fa642eb774fd0e78203737b381fd5523b0d7bdbcd8cba0e41c5904bcb8a35d041cbd237dba90 SHA512 94c5de07d7d90de0ebac9ebb5f2f0a72b442fe8d47215c27a9bb4b815c6236e2f2f1103717e17e2021b725645cdbaca869f1847ed63f0118c8fd960be590a804
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
index 4c46f953d4b9..deab850ea328 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 443a5464ac38..0b080fd1f60b 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
 DIST ncdu-1.12.tar.gz 140596 BLAKE2B 5594d2d1e0b96eb7a1aa4a8461592e0298f0cd95a6ecb1cf18e09dc62fa1af9b7c8ac7f7ce4f7e5ec76ae1fe4702d9e47fc6d5e8410ac9bac86f444b02053792 SHA512 20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
 DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
 EBUILD ncdu-1.12.ebuild 432 BLAKE2B 188c880232163301bb308b4080f32b7b249c2f13c144dda7786d30bd4deca2cf332d3c72863f5cd2b11cee5a724bca4524db0db62aa371b70b8396707f09122f SHA512 3450a2c99c636046913074afc646e79292de567533c8c31fdb59f58d3dff179c4b3581d16dd45147113c25de63d6666071bd597356ea5593a351c3a7a711c476
-EBUILD ncdu-1.13.ebuild 430 BLAKE2B dac0ab95cf5251ea72dcc1c5afaca83e5bd38f9f139c927363e92bc6c6755711c1fafb8de8e0dfb5437cf683fe98d4f66028c98c50fc75d064b6a339e331bfc5 SHA512 e54c312b90ee02d7e0db790a8b0326718dca03cc1668d8589dfbce0b13dccbab28e051d6fccb0d348863b36d3a571b453a058a4129761738db16ffc314972d99
+EBUILD ncdu-1.13.ebuild 429 BLAKE2B b437604c81314a3aba39cc8e502e4c680aa09b153a8ad52006a0bec74deb03fbe73aaaa9efe2cdd4b2a84eb73e3b47dd8b851dc56483f36ace9290328d8023e3 SHA512 5e0208e5c53aa232f2a611e7784a6b18165156c71a7e2011186b4fa4f7d40a3b127452d531be8412ac8b193b464c8bd0adade8ca1f8bcd066417257e21ac5a38
 MISC metadata.xml 580 BLAKE2B 02c4868a6afb6f72a6e8ce6b2f6310dc05f895f08783d1163601c79f0ffc913f7e8f92cdf4eb53156ab4afba573eb17d0bb5763b0bf6409632b10d948e9e2a1f SHA512 71aa0fba8e2f364b9f4a7da7d50ab86e5534518d84f8a26f08a5738655eb5f335de1da5b373dae93b21610881023b6197ca06cedb3c12f4b7f1a02850bf1729f
diff --git a/sys-fs/ncdu/ncdu-1.13.ebuild b/sys-fs/ncdu/ncdu-1.13.ebuild
index 2783275b895e..bddef439e959 100644
--- a/sys-fs/ncdu/ncdu-1.13.ebuild
+++ b/sys-fs/ncdu/ncdu-1.13.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/shake/Manifest b/sys-fs/shake/Manifest
index a49db870964c..782e0a1b5860 100644
--- a/sys-fs/shake/Manifest
+++ b/sys-fs/shake/Manifest
@@ -3,5 +3,5 @@ AUX shake-0.999-uclibc.patch 1180 BLAKE2B 158d92a4320e3db600f85b7fdcaef1b2c6a726
 DIST shake-0.999.tar.bz2 37225 BLAKE2B a3330f66c43d47ae117918c507e8097225f074dd221d88d277624064ac51ba2bc23c9e261bed5cd34f473f63511131f532c7f26f7d57b38a722b1d944cabe5fd SHA512 7dbd61cb35f771ffae6ec90bcdbf0cc467166661a78379191c7cf888d5f32ad27ea56da739f8f39344a209003747de2be1b57f2335ddc5641f55605c15c84b78
 DIST shake-1.0.tar.gz 42885 BLAKE2B 999a4846a47a124c9f66f674e54ee1c89039b9598b7a3d0c5b5690abe5b90bcec5248e8f516f10681543bdba666ef4129172e4d05759b997016ca1071e33e4b0 SHA512 f73601ebf37ac934b2cfb5bcedd530e38bd6873615e80eae01c690bf935ed3924abb1d06fb31c46397b5804d47a36584ac5e11b4c7142b46e570ddbf3abe1775
 EBUILD shake-0.999.ebuild 539 BLAKE2B bfc86efeb61179fb79c96d184c2ef93be02b9760627b93aadc87a356bdde3baa3768a631072572af542191d3f07c5a6a9580f694e7bd81f6fb018d0b90979335 SHA512 911a1ad7694b2579e8012799db50e4f33dba8471b615f7a3f5669b01faeb58a774b52e5ec40f74bc237e3ee4c00fac1aac284939cc09ff732b6f8854b1bfcee2
-EBUILD shake-1.0.ebuild 501 BLAKE2B 148e4c2e63464a12f8a559088c369f4de38bc61189a5d1ed1b3511c5cd1c1fd6f9ab7883262ec9177817ef8d9dc19896dd56b084332206dd39a12e5f26218fe9 SHA512 5bc7bd243afee000310ca519cbe13784c9591534a9fe413002616074085d62cfd139d8888e385a16a6a5fa9d150af6e9712b172043e0a87a036f917d97dba760
+EBUILD shake-1.0.ebuild 498 BLAKE2B 2280b17b8d5694a072da97089757a61175a5db8a649b7522ae3c18e09ebb612a276b1e4e13e037bd90c45a9da89ceedc7dd11b2fe8f0c2d6ee766185a3d554a7 SHA512 50672a07c46e8e93a20e310c18f0a2ec07492811d5d2153d0f75c59a12f5c54c8d74c73cde7862f40e6ad89da96d0107d91976aadb32390b174afb1f057c3c78
 MISC metadata.xml 452 BLAKE2B 1a0a9c4e8df41600c72136c4df4182658d1aa1852ebca1c5d0ea3dc8d3ea81a533c8bfa4931955a565d084dbe3a70a8173f0a2995ad95f9ed47c2786f1de1186 SHA512 95fab203ab540b445036639bcc24ae4f7d18cd51a4f1a693c14a69ba5c1b561c77ab1e0585f2baf389a3f660c19a8a06f6b0cd5d748a52fc72fd842df99b2a3e
diff --git a/sys-fs/shake/shake-1.0.ebuild b/sys-fs/shake/shake-1.0.ebuild
index 63deb4279d04..86e302269c32 100644
--- a/sys-fs/shake/shake-1.0.ebuild
+++ b/sys-fs/shake/shake-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/unbrice/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="sys-apps/attr"
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 5f1837fd7c47..b3e81c428a02 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -6,7 +6,9 @@ AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13f
 DIST xfsprogs-4.14.0.tar.xz 1137048 BLAKE2B b58373ca7f58e5d887cf18ed2aab169aed4ba233a50f1f1ff41eaf0dcd039ae290f1e49b385da19ceff3a34e770f90943502eefd7c1469c5cba74f45185fd07e SHA512 69832a1b9636dc5a77ad277122bb24bc09c71ad743c3ab5bf830d398557e63fa1477dd08c6115a53a94f01fc27e58d70268416013cc25e026baed7a74af8d506
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 DIST xfsprogs-4.18.0.tar.xz 1214480 BLAKE2B 78db41319e53be1f03b66f85ecc7c50e0c6658fa3fd8ddd8539bac04e656614a5cb54dc930a324d9df6afe4024c2be10259b903e1ca0ccd0ffb340e7410692c2 SHA512 0629400f8824620138928a7d72908b7a852408814238a55e11d6eb3b2da42cd56273960430d3ea729a9bce95f605d225607940d4728b68c468c39eb5a9a590be
+DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
-EBUILD xfsprogs-4.17.0-r1.ebuild 2303 BLAKE2B 40e0d6ecfc777d419123e39b6b3b4504c34224bcbeb82dfb05c285ea0fa57b7ff62930d95a4e759ad6bdd96b523a89723e1705c1705967f2f4323b3ae91ad38c SHA512 02e4aa3c3fc3ba08dddfe1eea9ac2e2c82cdd61b156ea3d9c49c6d9398f7563b2da6fc4eb3151d30d0a96547eb22e9041cec5c30cc1c201d66f7e4164c36a781
+EBUILD xfsprogs-4.17.0-r1.ebuild 2302 BLAKE2B e63276181002c8484a7c5deedb6ec9da508cb20e1bf54e1f38301ef7c8125e74ee668be57b79af8f715713bea65bae97c49e074063236ca29dd4a2a0dec4a4ca SHA512 698cd6d21e9bf0c05c7d6c7d372e7ccc3f4f924f90f97baa668dc458c3576ac49efe78ed6e1298a3ccca8b6b53b35979e93f646b11608c2d138e213597452e21
 EBUILD xfsprogs-4.18.0.ebuild 2314 BLAKE2B b2a8dd0f0a36b5461bdc34b5ec061e261f24040c29b49989977927e05bd66a3716cf275f5ae7d2d3ce54e64f78b919f3fc9e939539482294ce7d17067c03824d SHA512 01ccc49541ff057324b706fb2a8474492422e5b32ada74844494ca53a010920eeafde7e321e2a94c9c2b9c25823bae86db5b50597c87407202147f94ef92e4ad
+EBUILD xfsprogs-4.19.0.ebuild 2433 BLAKE2B d9ed6c1ecb450423971ec6e144098860ac835c81dede1dc6d1933941460ecb7e3167a979c26e33a468d5a786352d7d57af27af98e746f40cbe6e172144fa8d3d SHA512 0f18de87e5db27e269a247c60939f67c7583f3349acae954eede1a5ad54d7f96d6077f45dd4091c8bffa286e822a25f023d11401342c27ce745d0911ef87369d
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index e0c568168d34..8e1861b25c61 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
new file mode 100644
index 000000000000..6e3d050f54b1
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs multilib systemd
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="icu libedit nls readline static-libs"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
+	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+)
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Clear out -static from all flags since we want to link against dynamic xfs libs.
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+	find -name Makefile -exec \
+		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
+}
+
+src_configure() {
+	export DEBUG=-DNDEBUG
+	export OPTIMIZER=${CFLAGS}
+	unset PLATFORM # if set in user env, this breaks configure
+
+	local myconf=(
+		--disable-lto #655638
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable readline)
+		$(usex readline --disable-editline $(use_enable libedit editline))
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+
+	MAKEOPTS+=" V=1"
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	# parallel install fails on this target for >=xfsprogs-3.2.0
+	emake -j1 DIST_ROOT="${ED}" install-dev
+
+	# handle is for xfsdump, the rest for xfsprogs
+	gen_usr_ldscript -a handle xcmd xfs xlog frog
+	# removing unnecessary .la files if not needed
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}