gentoo resync : 19.01.2018

15 files changed, 21 insertions, 383 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0508080e40a3..d6ba26195c18 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 6ac80f0c40f6..9e1502008b8e 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,5 +1,5 @@
 DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86
 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
-EBUILD cryfs-0.9.7.ebuild 2076 BLAKE2B 5cc6450ae0ccda996fd4b2b6092c7daf10de07c669b3cf42daf6d34a39cec0d9ab1a6b536afbc60c20f724f2081e9597ff3c9848d5e756fffe3b4836e1cda403 SHA512 006ab059fa8fe787e9ab68939b96e5e8c5ad78d88a8ec6db2728102b89222a3880b460d75c53a08385e0b5cfd959745bd44775ad3a19d42e65c4d9f9101950e9
+EBUILD cryfs-0.9.7.ebuild 2162 BLAKE2B c11cd941b8c5fc3d4d3c05b4d52fefb1b070f3208fba21543ed807248114140c59b4f9cce0d99409fc0ff9a5d1900b37a02d668e9c5c4c82b0f994dd93bc9edc SHA512 ee7311ca786a821328549894f60981b28e1e894ea8b0156a494185b818b1321237becbd4627343157751512dc0c24200de2481201ad66f78730e6359c58ab63e
 EBUILD cryfs-9999.ebuild 1971 BLAKE2B 83abba1c2167ad53a16487fa1e637b3de05d681fcdd70bde98f9647e5f1bc974df8d4e7e333704ae9a081e4fef1919d164de76d4c1f52d9160394c881e6be02a SHA512 6a8d717593da53d4db604c4bb49c1f742d57c9d2058edbec416fbf26f30c470cc89cc17a1c7b7d44fc98a6f21d14e6a3692465fea7da4f6040978eda902e69c8
 MISC metadata.xml 516 BLAKE2B 7ff79d057c37e85960937024f889ca49839b9fa0c611084ee762f37fec64e31e74d31faabebfc0ae5b9e9d7a39798f65213fc2a178bf386868e3b3949d7b50cc SHA512 d452400e202e5f1ce607cdd554e7e40ee626b43dcc344b3d9f87bbdd2bc4b6bf072615e09b26adcf5a0a751837db62f2f02c4c5421510d929be6e935bcf03dd4
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
index a8e370eff006..0c24d0a7e632 100644
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz
 	https://dev.gentoo.org/~johu/distfiles/${P}-spdlog.patch.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}"
 fi
 
@@ -38,6 +38,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=( "${WORKDIR}/${P}-spdlog.patch" )
 
+# tests work, but let install fail
+# revisit with 0.9.8 version bump.
+RESTRICT="test"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index f3c930f1746a..6278a6d76675 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -4,5 +4,5 @@ DIST encfs-1.8.1.tar.gz 316534 BLAKE2B 318b4ec8e17a7187c299e1287ad1927db2da64c96
 DIST encfs-1.9.2.tar.gz 11043181 BLAKE2B 5e1ada5b85166312010dade2537b83d44b67dcfa0cdbdc1cf4076e4a92ed593aed6129457c241492ea8afe7049ab12889dbe292c4d427710ff16c11a67085819 SHA512 7664a2f48dddde77cae005aba70962704b002f60afb2da35c4661f7e4e22ce5c003d3b674ce125fcc72e9f0588164c1f7dbf22f2b9061d0736b8c164c1ec70a5
 EBUILD encfs-1.7.5.ebuild 944 BLAKE2B 15eddfdf2608b1a7bc9790759024ff989ac7af61f7cb3dbf83cb030c51a0db54ee403dd451f285ed08203e4aa05e15ab339f1d108cbbc39e1eab56acc5dfc27e SHA512 7cc33ba27c23b1220cdd59a494fe92c219041c3dcff2189301ac8ba1d635ea117e41c6d5658fa3ad00d883df0961ac9ba56e44c7b09149670f95d3b7d6cc4848
 EBUILD encfs-1.8.1.ebuild 1186 BLAKE2B e1e6f0bc4fba1fe1d9f2eb7b4896a5011ee519bb9af631881dbf747f632b2fec0d8cdb128d441c0be56efcc7806afd8299dea81c392822608ed09a29cc5b45dc SHA512 d9133dbcf045e0a9fdef6c7fe8f7e8aa67b82d776f0f05388c93a891a54c3f9f48ab4d2ec232e358c54e2d713248a45a66ef950825e4e2677157f7fde154a1a9
-EBUILD encfs-1.9.2.ebuild 752 BLAKE2B a640b65703dc4f8cd84f644002f939cbaf65e26c15ff0a1e6422c6e7d5de8a2b0b088e83540debb4a8378d397b53176f4c66bf89d63f59b5d87fece54a7a9802 SHA512 3ae238ce2440306d45242e41cb05b84ede290d5ca783823d98f585e9411206e18cb5c7f3c7e34323ad6ec336594f4e3713cd0211a484a38f45b3b62bf6422c9a
+EBUILD encfs-1.9.2.ebuild 908 BLAKE2B 72e6c9ade188977f93348d45e830e18f015f189d9577789c75ca356ec21816cb35cba247df64c58a385909518d7fa665e720e4a883c5ef50ed586c98b0046dfa SHA512 b23c7ed3054f808feca0425b30532136cbeb46690bf8175ba9e4a31bf8af43e1661d4e738fe5ebb5ea0bf15dbf4a7a982fe2ff0e4156be82e5cd807e09e3ea30
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index e1ed5b33785b..01426e04c93a 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="libressl nls"
 
 RDEPEND="
@@ -25,6 +25,11 @@ DEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+# Build dir is hardcoded in test suite, but we restrict them
+# because they can lead to false negatives, bug #630486
+RESTRICT="test"
+BUILD_DIR="${S}/build"
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_NLS="$(usex nls)"
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 389346fb26d4..f2d65f4af4e1 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,5 +1,3 @@
-DIST fatsort-1.3.365.tar.gz 57209 BLAKE2B 0e79373c8e8a286f7445294f0dea210943e015d3c834e9f363a114d000ca8afd12f43c7de3aacf4d07f674db0188edf257489667a5f1bec16cf2d28c6e20c59a SHA512 e3611841501e6dded8fd6270188ffb00191a20e93d84b0729cd2e215d37317f48e08bd67da41b88604858ef6f661e4b921b80645f454b78f91bfd2d0d4254d29
 DIST fatsort-1.4.2.439.tar.xz 41852 BLAKE2B 30ffc8575ca50a71c09c5f90e658a150ece34a9bed664696d8969ccbe4c3cb1b0130d830990e259889fab331ccf0c35e3f0aa3401628fdff3e04acbb7d0b53dd SHA512 c51b5316b34e1a74e2a8d1c625716fd022d32e40a92ef56b88fbc940b5e6dd6c978b733f180477e8b5b3235b46cd16eb74798c5aadd45de9ead1f1bafdf52fee
-EBUILD fatsort-1.3.ebuild 779 BLAKE2B 4e4d220e3f8b76971e6572d31890fa770455521781f8f59850212f9db807bf4d8d807b5f580687d402fe087a41d659b000d2157edbf57765faa4f2d94b716c39 SHA512 dfd525dc3af5a865f3ddc2fa483a536037f8bccf32df2d8dfc393d9a6f77bc0e87b568be2d293edd8b1f796588981edf2f4db0526732e6643884f5db6a5a5f4e
 EBUILD fatsort-1.4.2.ebuild 794 BLAKE2B c84ad6c26cf1ef2c014c02083cb133d6870189ff5b613c679663b9f41f0fc5d7c610b2f7c8453b442b078c06cee609acacb2b0f847f24dd8713ed2ecbe0b2722 SHA512 b5ccb6f60d1ed3aaebfc3eebefa6fc5169a7cded74dc4e4af76f907a2f4ba9080782d25802a282e2b77902c999be148edf2e210588e781e04706c86b21783c0d
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.3.ebuild b/sys-fs/fatsort/fatsort-1.3.ebuild
deleted file mode 100644
index d2e195201b1f..000000000000
--- a/sys-fs/fatsort/fatsort-1.3.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 eutils toolchain-funcs
-
-SVN_REV=365
-MY_P=${P}.${SVN_REV}
-
-DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
-HOMEPAGE="http://fatsort.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="test? ( dev-util/bbe sys-fs/dosfstools )"
-
-RESTRICT="test? ( userpriv )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \
-		$(find ./ -name Makefile) || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}"
-}
-
-src_test() {
-	make tests
-}
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 18391e6a1004..bc9c62ceb552 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,20 +2,13 @@ AUX multipath-tools-0.5.0-makefile.patch 6790 BLAKE2B 519417d6cf3aa8fefc181b95d6
 AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 BLAKE2B 7d640f27a8b736abfa33aa50d9e73c6cb27c48189df45f88c9915e683d114f9cab6d447b1decff7dae0bb4d2051d9803d7b02679b007a84ae1e65ce4eb60a00f SHA512 60b5717b0e3fd9a3d422b756359ce6bb5018346c104bd45543135257b1c4efb3c586d188e35176bbcfa2c81ed9d4824e3c96cc395e52605934e9cc4935f17fec
 AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 BLAKE2B e30f06a67f8e5f00156f35abf4c60dec71f5b3f8487b8a6822a0a5eae32f6b034fd2be98da34aad085db933a0cef592d0056075819a9e8985a8aab7b3743cfd4 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156
 AUX multipath-tools-0.6.4-sysmacros.patch 1554 BLAKE2B d293a6a72fbf0480c711af66b8bbb78da3584270c766cbcdd096bbd46b2f34170a68c459c5cc9b4d472359a80aeb108498209ac926623eb09277af18a5ff1170 SHA512 1f6c862e0fc73859b670d2917b2e0d63731714edb07098929dbd46e7cc61f9d354f30558034993c8e719de103d4b37c16a34483236a040db28a983416772634e
-AUX multipath-tools-0.7.3-fix-build-without-systemd.patch 1024 BLAKE2B c8e66e3330e0d24d7a672ba43b68ef1204569aa3b9ee23d222ff04c1b76ae903be374e62f5fe882257dc7ca7a68ee2b1dd8dfc7e874b1d622e4dcc4417fbe4c9 SHA512 870fbc9ee1fff533a8f2080f941e0d299852d8d64da98e900d6d0ef23dddaeb8e05a9accbffb2cf19f4c1e76766fbf778b145f3086a0a0c809012125a14cd391
 AUX multipath-tools-0.7.4-respect-flags.patch 599 BLAKE2B dc4469f96eaff9327125ba40cda675cc608724c9eb0e31ec12134ade4a4e07e3f390454c9a31093e6656ab8790230d99f1ad383960c80515acae668f323f1d5b SHA512 739b09000ac32f386e74f45b6dde268444c250d03dceddafe27fe1c919c43de92f01ad79dbcd9fb495e485d7557b726bd9596f58b4367fa29b8762d35c570428
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11
 DIST multipath-tools-0.5.0.tar.bz2 184024 BLAKE2B 1e1b0fdd52bf0aaea3ed281e0cd89d04aed58c03b9b42ac094173bebdf3b81e368d0c7efb23a8748d4598c99d1502fdf5f8b2c9b64a2be4ce7d6b30fa607984a SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.1.tar.gz 329008 BLAKE2B 3cb503db3b208ed472a44c549aa61e82e0609dd06a7c7751b9c6e7076db00e87771274f1e95f2b5945e9931604590679a18ea950da0ed8c4c3e2bb0cc77ffb00 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82
-DIST multipath-tools-0.7.2.tar.gz 335187 BLAKE2B 4d14bc7c4c87cdf494412af0674efba709689b442f9a8484b1fc6f9707dd48bc8ef0835843dfea048a51e53a976d5ff33020113b60d6329ad8ced2d2246bb84b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046
-DIST multipath-tools-0.7.3.tar.gz 344030 BLAKE2B f2153a86afc79ff11bd1fad8a20c8bb0c473a8b4790b47266d9f519ec0c5f569bbc9dfbcc8d99e0191cf8fab3e54234943f06785ef03f149afe87c78184632e6 SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace
 DIST multipath-tools-0.7.4.tar.gz 350361 BLAKE2B a55a5912f040913b2db8a6fe28727dd52fd4be9ceb8544f1b45384e12112775caa6159da3ce774dd529377796a2b9033490ee655f3caac864919708bdc5070ec SHA512 0a00b79920251b685265ab731e5418538f32d6392b101082c71a6c7345ef7d008bcdcf466ee1317e8bf658d0fb01fc9a2e4ec6658fc565129c1bb5949ac91254
 EBUILD multipath-tools-0.5.0-r1.ebuild 1728 BLAKE2B dd525f001463684fe5cb6ccbb112a658bcf02fcf94d672c44b3a9330bd275809486bbd3bd10e35a19185837b1bff349cfe037054e8e4d9fab5f87e7677e1a98c SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86
 EBUILD multipath-tools-0.6.4-r1.ebuild 2534 BLAKE2B 2ff046ece2d09bfc1831baa309ea8a22b81cf414277225f3aa4b2e4ba8dc951abf844e5c509232ff2ecacf357340690452ea6a4c01f06eb9c76aa13290337dd7 SHA512 9c1df2d0a038cf8baf51a84265dc22e2b80d598fee9b6e7b737c623dfc776ecd7bc309ae52cb5a492a7bb8b13aaebf00de2df9881532304f567ee1a50a61079f
-EBUILD multipath-tools-0.7.1.ebuild 2191 BLAKE2B 6a4e07013d19792f330749221d48eb517b7094d2a4fcd3c12f20512f031aa7ed7724ebf4e57e46447331203753689d28fe3410457006f6ad36e16759f1dae6b7 SHA512 c072c5e86c3fbf1688a27ee27b6c344a04581300329b863c1e461a2eddd534c4790342a2a0ef416094de40e03a02146443b67d47b144d4950eed93ff383791ae
-EBUILD multipath-tools-0.7.2.ebuild 2191 BLAKE2B 6a4e07013d19792f330749221d48eb517b7094d2a4fcd3c12f20512f031aa7ed7724ebf4e57e46447331203753689d28fe3410457006f6ad36e16759f1dae6b7 SHA512 c072c5e86c3fbf1688a27ee27b6c344a04581300329b863c1e461a2eddd534c4790342a2a0ef416094de40e03a02146443b67d47b144d4950eed93ff383791ae
-EBUILD multipath-tools-0.7.3.ebuild 2262 BLAKE2B e761090475b8665ea450d7a42b458f420e7940e5edfde0666d107ae8b64381a61a465a1ebb648c7de8b02aeb75784d9a33685ad892bf0ee8378e3b5d32581c52 SHA512 cf34545cacf9131e0d626664b0d3b9cd29f1e0991dd11232c25e0b5e1c1a75e86745cdea98f64e585742d3c46246b96c3448eddfd5de17170b421cd8b074c044
 EBUILD multipath-tools-0.7.4.ebuild 2253 BLAKE2B 0cf74d33ac951fbf2f906d35d9ab707320141d33977207a12f264a779011ea9c3b20bee7a02d4a43af42b6f87d228ffd2166f02fa99fd88cc2f563d33fff096d SHA512 72e5403c0c3869074b50d5d00d956b2582fcc297c1bc02cd61f3a2bc9ca57d228cd993499537d0b28d48ec712a43075bfb5e2033058ba71c3ed312572b08f0ab
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
deleted file mode 100644
index d92e5c05c7d4..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f0a874f9bd86504840a7bdbf0a0c07bcd0ea8c29 Mon Sep 17 00:00:00 2001
-From: Michael Lass <bevan@bi-co.net>
-Date: Wed, 20 Sep 2017 21:54:32 +0200
-Subject: [PATCH] multipathd: fix build without systemd
-
-do_sd_notify contains a call to sd_notify which is unknown if USE_SYSTEMD is
-undefined. In this case, do_sd_notify is never called anyway, so embed the
-entire function into an #ifdef USE_SYSTEMD.
-
-This fixes a regression introduced in 88ddca5.
-
-Signed-off-by: Michael Lass <bevan@bi-co.net>
----
- multipathd/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/multipathd/main.c b/multipathd/main.c
-index 8049da22..bbe14771 100644
---- a/multipathd/main.c
-+++ b/multipathd/main.c
-@@ -169,6 +169,7 @@ sd_notify_status(void)
- 	return NULL;
- }
- 
-+#ifdef USE_SYSTEMD
- static void do_sd_notify(enum daemon_status old_state)
- {
- 	/*
-@@ -181,6 +182,7 @@ static void do_sd_notify(enum daemon_status old_state)
- 		return;
- 	sd_notify(0, sd_notify_status());
- }
-+#endif
- 
- static void config_cleanup(void *arg)
- {
--- 
-2.14.1
-
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
deleted file mode 100644
index 6b87ca18b13c..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
deleted file mode 100644
index 6b87ca18b13c..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
deleted file mode 100644
index 99506a248340..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.3-fix-build-without-systemd.patch )
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 71a4a3ef4ac0..0f0993c8a6ef 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -10,6 +10,6 @@ DIST udisks-2.7.5.tar.bz2 1270965 BLAKE2B 42044f00b09764bb15c665e5a301c39fb9d14e
 EBUILD udisks-1.0.5-r1.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
 EBUILD udisks-2.1.8.ebuild 2997 BLAKE2B 3339216fdb9ab778f5601ab798be81ffe76ecf9c50d4e493cd86c80a2a6e150fb174d5ba0127e6b8cde3f81e9bf114ad6529bc1d45876dc02555d36e5f61b90e SHA512 b035b304e9585c5cfced81a4700eede5de731f850e06eb76bd391ba7ab333c3acba8775c493ca83bde42679877e9ad8ce436fc202486c04db2a34cfca7485c25
 EBUILD udisks-2.6.5.ebuild 3348 BLAKE2B f227e1c664937ff73880f50d4847f61a7f42d681d7320d580863578abf4d2d6b41b5c38513cfdfb76311b6baf107b7b32ecbe9826213828c3936454d27d57736 SHA512 ed5146d860532c61b6cda0f4dcffd8ad3ce4907b671369f4032b58070a3252f65959f5fe33bc44914b3f872d0f40d5bc1f7b9fe2e1345fb7ef04019fb3554cbc
-EBUILD udisks-2.7.4.ebuild 3430 BLAKE2B 0f784f23e0ad7b3de2dab0414451ff0f460292cfcbdadef67604f91eea3986e2634d50e117d4eaa6b4f8460e8b2dba33edd057ae6268b8586bdda73227139711 SHA512 fa647dd17529f7efd69d41b27e3969de8b30b092756fe9820f0daec162c6692cce543580500c78281eb2c6a21178d9797cbb3719d142c1137bd71f3934c8a55a
-EBUILD udisks-2.7.5.ebuild 3489 BLAKE2B 164b69cbc29b4b234f1c9c841a81abb4ef425369f1d73297595d6a1c402569354a9796a4e56f75bf5881fc4d240e2e667bb4659fdcca6d1c52a02380fda02ccc SHA512 cf5d3c84a0b780c5e05e52edb8f979f4a700ba8cf5677b8e1fe73b0cbfacde12a3977ef1f8d07f0af5290c3ae0671cf63e18582c338de025d047936c64fe00b1
+EBUILD udisks-2.7.4.ebuild 3434 BLAKE2B bf1a9ede6b6faef5c1ed6ee2fa935b2abf46479035dba551f1f57f0cfc43627615820e3335c7ba62ea3bd6dc2c467b1192762f95f919c49c4ba19079228e3247 SHA512 109d5a2052b632ebcce964770703f4e5f25d6b1d0a5981d87c66742a932d6202ae11ece57e22e9ecb15b8c04c394886b16820022a47c6b7c8af8e8b31c0d0242
+EBUILD udisks-2.7.5.ebuild 3503 BLAKE2B 5aa11ad64789c01674579d8de9486f8b56a71fe84a33ca30f6279e478d42e68cae0a929b2720f863e9479348e255b6444e9a6884fec2eb46a183d9a1b70e447b SHA512 cf390eef1066db7dfb5aaeaadbe6d8ca57afd172b901eef5f25bb7aedf52c6758f83731642cc1fe8ec412582cc4ea47f095686c35ae10eedbe718e992f2d1f4f
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.7.4.ebuild b/sys-fs/udisks/udisks-2.7.4.ebuild
index cc3d89ee9b52..833fa85161b7 100644
--- a/sys-fs/udisks/udisks-2.7.4.ebuild
+++ b/sys-fs/udisks/udisks-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~arm64 ia64 x86"
+KEYWORDS="amd64 arm ~arm64 ia64 x86"
 IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/udisks/udisks-2.7.5.ebuild b/sys-fs/udisks/udisks-2.7.5.ebuild
index a0e661df34f9..cf2e42b967fa 100644
--- a/sys-fs/udisks/udisks-2.7.5.ebuild
+++ b/sys-fs/udisks/udisks-2.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl cryptsetup debug elogind +gptfdisk +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"