12 files changed, 66 insertions, 448 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 4f61d87fe017..59816aa14efd 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index d959f725c4c7..72287e3dd1be 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,6 +1,8 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.1.0.tar.gz 929047 BLAKE2B 82193eb4b465db365062785abfda8df1c2c42252adf4518f85abd785954b3305f2eed42ebf6e1c3c032f9c23e34744f4c9f05d25e259f8c0011f83283c51b963 SHA512 649645d702298ee7f3e5b8d2c39b2781fc1aae55cd03a4b774a2e66feef51e67f0a4367350db4defd62eaa2fc6710cb48a58d65991a63942d34e43783d29f94d
 DIST reiser4progs-1.2.0.tar.gz 962611 BLAKE2B 0ee17f51ea7ae21d82b682c5594c8022be41af602390ccdb6ebf88d9e4c1ce12ef3ea190bc4f0b109cbc3657d1c404bbbaa30cbd7c0febf619f99d528de97ea3 SHA512 c517c3ea2121689ef94241a63daf7a0d85322b8cfa2343b08d0aef7640642499f261c806c83a2d46cfcdf28feba3518ff48a76b898b89c811f53493a918db843
+DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
 EBUILD reiser4progs-1.1.0.ebuild 1239 BLAKE2B 2895506c8255d205f26ca5292c29771ad24967ebb9c413a5aef16d04caae004aa1b72e73d8291b1e6af755f373a3ce5362851b3abaefdf7707314b152b163adc SHA512 169576343c45a5e33a60a8913ce8324128f62e46d207021fc4e87d908714fbce7513dc92cc1df7af53401ec7df7b07312ce4723f15e44f36d25792cc0afc619f
 EBUILD reiser4progs-1.2.0.ebuild 1260 BLAKE2B 75ab433ef73307b8135640c4e1598115ec7a76aa67af5408a86ee900afba1235fce3c30c03a24bf110c2695d82377f512beb8ec685d815a84ed93d272fb3b217 SHA512 25079af303cdfd305cb2e1a4f372e47884aaea9ae36502c119e2b44b92d0265b18f054a4fc07a9a4549b94cbb0cbb252b8a7f17f6e717f844c844ddb71d70bd1
+EBUILD reiser4progs-1.2.1.ebuild 1290 BLAKE2B a0c1dbaee410e6dbde3d2c4c6ffdf843d74f49acb564a177d96182305746e3d6bb7a1394693976c676e16a4d177eb12d271aba2d1dbda23d7ad30ffeb576c4e6 SHA512 76ddafe221ca0dbe9147779bea5faae42bb782d20cf89fd23111d43665cb36408fb30018fa2a323a015d1c4ee36a065ab0dc60a294bfaf521f2b194ea30b1295
 MISC metadata.xml 440 BLAKE2B ccaa949c04b37b13f2b7d11a4ab6586de239bc61be58e772f160e797e6da6c102b66be660e57e7888ca5960911b0dd2455978709de0d6e75b615a37bd870e8de SHA512 f12899412ca119abba07a6012e55f243ea069e1132c7dd9786aeb399f7d543ff82cba92f0957443ec08f230e68bc257729b789519ef52337ebc5679ee63b3ddc
diff --git a/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
new file mode 100644
index 000000000000..1e0a57a8fb8d
--- /dev/null
+++ b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib eutils toolchain-funcs
+
+DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
+HOMEPAGE="https://sourceforge.net/projects/reiser4/"
+SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+IUSE="debug readline static static-libs"
+
+LIB_DEPEND=">=sys-libs/libaal-1.0.6:=[static-libs(+)]
+	readline? ( sys-libs/readline:0=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch )
+
+src_prepare() {
+	printf '#!/bin/sh\ntrue\n' > run-ldconfig
+	# Delete hardcoded link/compile flags.
+	sed -i -r \
+		-e '/CFLAGS=/s: -static":":' \
+		-e '/CFLAGS/s: (-O[123s]|-g)\>::g' \
+		configure || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static full-static)
+		$(use_enable static-libs static)
+		$(use_enable debug)
+		$(use_with readline)
+		--disable-Werror
+		--enable-libminimal
+		--sbindir=/sbin
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a reiser4{,-minimal} repair
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 59a579477d04..8031d14442f0 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,8 +1,5 @@
-AUX 232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch 13821 BLAKE2B 594d1a477d40a063c3f29bd552776a29232f6656bda52c902e124f039283a3e61045d1c5fa3bb0eee4385bdc7993c9bd6b7609957a577defbd5e777ca9ea105b SHA512 1056b7d661b65a26ec77e01d61dd06a1e244ddb0a70ed9cbefbfa3ade2368da18247d96a7d0fd0ccdd087eb9157e79be9a5751c3fe30535a12532479eedbbe44
 AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc
 AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912
-AUX systemd-232-pkgconfig.patch 1472 BLAKE2B e9597f11a4ebe9561060bad360ef0c79af97b0e3ddb38bdbee29cfe2409b06da46319b2a61f58923caddc1a7703ec98fe0d94a703788386c1302fb5bc15e8217 SHA512 eba2c6f84fcc7215e0ca1ac11e672e3f03b2494e1d4b2aa623b4eeb15986a0bc828d6d867baa9123789467ae81a44f636630a090ac3336998434bae286475ae7
-AUX udev-229-sysmacros.patch 2172 BLAKE2B 6c714bc55447a3c4ef10797f8a3dc3b56c06cce2ad9bc809a284aed0c75a3ad57b4d92cb549daa75290ae6c0688fe1ecef7a7a5397160e2cdb60926350891b0d SHA512 003f32b3cc0c070bd524ea708b26ea50b570cf10ebdb6588012d060395db41b409da71b438c6d1718aae6b50ce92e1a21aaab32b23284c72ab8c147480bc369a
 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
 DIST systemd-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
 DIST systemd-233.tar.gz 4660737 SHA256 8b3e99da3d4164b66581830a7f2436c0c8fe697b5fbdc3927bdb960646be0083 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e WHIRLPOOL ce19f6a546b8f899cfa952e49d47f063fd29186be4a53391bc30ea2c487eb2c140a74ad843a1dc499bb61bba3e9ca055613852291e38b85af5d79c59409dc176
@@ -12,7 +9,7 @@ DIST udev-216-patches-2.tar.xz 1264 SHA256 18b7b8f852f11c2ac2a58458462ce686ebec4
 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68
 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d
 EBUILD udev-233.ebuild 12992 BLAKE2B 782d651360a8ea3e694f6dddecaf9faf7890bad6c19b10072356372f6e03094bbc741382268ad7472b6a5178b12dbfbb4aa2564e89946b9adf1373d1d4fd531d SHA512 43a241d81d922547ae4477c57aaf4f9007fb1d47dbe542185673f14d6cc4e5efec467b7f4e2d79ed4bcde498bb8fef57d0fa43e8be9791aebb0bae321b18495d
-EBUILD udev-234-r1.ebuild 9955 BLAKE2B 19c384c78fc8a0493640ec2f05caac11d3b4c30abd21c88069bbf72399bcbe4a6b28af097bafe4270f4ddcf4c2e9c785031356ee2c1e30f642178efccde69341 SHA512 f8717265cb3ab78525381eec12c40d9194610df22f6eecdbd08e7f275bd760a1fd7e17ba0d4c2860df5ecc3f5363ae065d88b7cd4b0f381b29e7a9749da800cc
-EBUILD udev-235.ebuild 9953 BLAKE2B 42485974cb8b33bb4abdbe919d82df15449919e458e51c74d1b54ab8d4a2b41621c29f95c9b569fcca17e4a9fa5c79d7632e2b4e203aaf3d2758b9b2432c1409 SHA512 dc6614e41e872907f151ce6a5b4d11e68f4d247982f24845a330042c2130d5c14381bf5ff70c03b71f77e0a54eb1a6b6eff3a38c8628d0397b960bda832f6073
-EBUILD udev-9999.ebuild 9953 BLAKE2B 42485974cb8b33bb4abdbe919d82df15449919e458e51c74d1b54ab8d4a2b41621c29f95c9b569fcca17e4a9fa5c79d7632e2b4e203aaf3d2758b9b2432c1409 SHA512 dc6614e41e872907f151ce6a5b4d11e68f4d247982f24845a330042c2130d5c14381bf5ff70c03b71f77e0a54eb1a6b6eff3a38c8628d0397b960bda832f6073
+EBUILD udev-234-r1.ebuild 9961 BLAKE2B c6646d6d80561810e0417a27357d1fdc8585916a3cc705b764a28901d522e09adf7e660f5a9315f92862838ff17fdb345fa6365e37ab6dd409ddc216532ce6ba SHA512 a28aad03494d615f7ed0fb3e36beb81e8b4dac56b05357ce44096b318b87e6c90158803959d4954006434bbfde1f5d4a3b7cecd2e138714b0ef92aa061d32382
+EBUILD udev-235.ebuild 9959 BLAKE2B 07a34ef395aef47b8dbdce9171c9f8a74bb4c8814e195d6e811c710b62d41c44bad9468598026ce1496b7677b06a5e89ee1a225f206833c9104db1532ecec35b SHA512 5afd385dd43243183dd422dd907d549244278e6343b631fe7e8ceaf975c242d511856371bb240f9487883cd62eb05bac3cefc1b0bffea9202542864b96f48d15
+EBUILD udev-9999.ebuild 9959 BLAKE2B 07a34ef395aef47b8dbdce9171c9f8a74bb4c8814e195d6e811c710b62d41c44bad9468598026ce1496b7677b06a5e89ee1a225f206833c9104db1532ecec35b SHA512 5afd385dd43243183dd422dd907d549244278e6343b631fe7e8ceaf975c242d511856371bb240f9487883cd62eb05bac3cefc1b0bffea9202542864b96f48d15
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch b/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
deleted file mode 100644
index 440ec75bd3bb..000000000000
--- a/sys-fs/udev/files/232-0002-build-sys-add-check-for-gperf-lookup-function-signat.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From 016fb3b83b861cfe58694996076a9764dcb46475 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppymaster@gmail.com>
-Date: Tue, 10 Jan 2017 02:39:05 -0500
-Subject: [PATCH 2/2] build-sys: add check for gperf lookup function signature
- (#5055)
-
-gperf-3.1 generates lookup functions that take a size_t length
-parameter instead of unsigned int. Test for this at configure time.
-
-Fixes: https://github.com/systemd/systemd/issues/5039
----
- configure.ac                     | 22 ++++++++++++++++++++++
- src/basic/af-list.c              |  2 +-
- src/basic/arphrd-list.c          |  2 +-
- src/basic/cap-list.c             |  2 +-
- src/basic/errno-list.c           |  2 +-
- src/core/load-fragment.h         |  2 +-
- src/journal/journald-server.h    |  2 +-
- src/login/logind.h               |  2 +-
- src/network/networkd-conf.h      |  2 +-
- src/network/networkd-netdev.h    |  2 +-
- src/network/networkd-network.h   |  2 +-
- src/nspawn/nspawn-settings.h     |  2 +-
- src/resolve/dns-type.c           |  2 +-
- src/resolve/resolved-conf.h      |  2 +-
- src/test/test-af-list.c          |  2 +-
- src/test/test-arphrd-list.c      |  2 +-
- src/timesync/timesyncd-conf.h    |  2 +-
- src/udev/net/link-config.h       |  2 +-
- src/udev/udev-builtin-keyboard.c |  2 +-
- 19 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1928e65bd..5c639e32d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,6 +258,28 @@ AC_CHECK_SIZEOF(rlim_t,,[
-        #include <sys/resource.h>
- ])
- 
-+GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)"
-+
-+AC_COMPILE_IFELSE(
-+        [AC_LANG_PROGRAM([
-+                #include <string.h>
-+                const char * in_word_set(const char *, size_t);
-+                $GPERF_TEST]
-+        )],
-+        [GPERF_LEN_TYPE=size_t],
-+        [AC_COMPILE_IFELSE(
-+                [AC_LANG_PROGRAM([
-+                        #include <string.h>
-+                        const char * in_word_set(const char *, unsigned);
-+                        $GPERF_TEST]
-+                )],
-+                [GPERF_LEN_TYPE=unsigned],
-+                [AC_MSG_ERROR([** unable to determine gperf len type])]
-+        )]
-+)
-+
-+AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type])
-+
- # ------------------------------------------------------------------------------
- # we use python to build the man page index
- have_python=no
-diff --git a/src/basic/af-list.c b/src/basic/af-list.c
-index 3fac9c508..4b291d177 100644
---- a/src/basic/af-list.c
-+++ b/src/basic/af-list.c
-@@ -23,7 +23,7 @@
- #include "af-list.h"
- #include "macro.h"
- 
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "af-from-name.h"
- #include "af-to-name.h"
-diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-list.c
-index 6792d1ee3..2d598dc66 100644
---- a/src/basic/arphrd-list.c
-+++ b/src/basic/arphrd-list.c
-@@ -23,7 +23,7 @@
- #include "arphrd-list.h"
- #include "macro.h"
- 
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "arphrd-from-name.h"
- #include "arphrd-to-name.h"
-diff --git a/src/basic/cap-list.c b/src/basic/cap-list.c
-index 3e773a06f..d68cc78d0 100644
---- a/src/basic/cap-list.c
-+++ b/src/basic/cap-list.c
-@@ -26,7 +26,7 @@
- #include "parse-util.h"
- #include "util.h"
- 
--static const struct capability_name* lookup_capability(register const char *str, register unsigned int len);
-+static const struct capability_name* lookup_capability(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "cap-from-name.h"
- #include "cap-to-name.h"
-diff --git a/src/basic/errno-list.c b/src/basic/errno-list.c
-index 31b66bad5..c6a01eec8 100644
---- a/src/basic/errno-list.c
-+++ b/src/basic/errno-list.c
-@@ -23,7 +23,7 @@
- #include "macro.h"
- 
- static const struct errno_name* lookup_errno(register const char *str,
--                                             register unsigned int len);
-+                                             register GPERF_LEN_TYPE len);
- 
- #include "errno-from-name.h"
- #include "errno-to-name.h"
-diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
-index c05f205c3..ede6b1f73 100644
---- a/src/core/load-fragment.h
-+++ b/src/core/load-fragment.h
-@@ -118,7 +118,7 @@ int config_parse_user_group(const char *unit, const char *filename, unsigned lin
- int config_parse_user_group_strv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
- /* gperf prototypes */
--const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* load_fragment_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- extern const char load_fragment_gperf_nulstr[];
- 
- typedef enum Disabled {
-diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
-index 99d91496b..d1520c45d 100644
---- a/src/journal/journald-server.h
-+++ b/src/journal/journald-server.h
-@@ -179,7 +179,7 @@ void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigne
- void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,0) _sentinel_;
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* journald_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_storage(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
-diff --git a/src/login/logind.h b/src/login/logind.h
-index 086fa1eeb..7556ee2e4 100644
---- a/src/login/logind.h
-+++ b/src/login/logind.h
-@@ -182,7 +182,7 @@ int manager_unit_is_active(Manager *manager, const char *unit);
- int manager_job_is_active(Manager *manager, const char *path);
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* logind_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int manager_set_lid_switch_ignore(Manager *m, usec_t until);
- 
-diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
-index c7bfb42a7..00ddb7672 100644
---- a/src/network/networkd-conf.h
-+++ b/src/network/networkd-conf.h
-@@ -23,7 +23,7 @@
- 
- int manager_parse_config_file(Manager *m);
- 
--const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* networkd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_duid_type(
-                 const char *unit,
-diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
-index 70ff947b9..37c743121 100644
---- a/src/network/networkd-netdev.h
-+++ b/src/network/networkd-netdev.h
-@@ -175,7 +175,7 @@ NetDevKind netdev_kind_from_string(const char *d) _pure_;
- int config_parse_netdev_kind(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
- /* gperf */
--const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- /* Macros which append INTERFACE= to the message */
- 
-diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h
-index 42fc82d39..09c3b3a3a 100644
---- a/src/network/networkd-network.h
-+++ b/src/network/networkd-network.h
-@@ -236,7 +236,7 @@ int config_parse_dhcp_route_table(const char *unit, const char *filename, unsign
- /* Legacy IPv4LL support */
- int config_parse_ipv4ll(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- 
--const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* network_network_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- extern const sd_bus_vtable network_vtable[];
- 
-diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h
-index 231e6d726..4ae34f8e2 100644
---- a/src/nspawn/nspawn-settings.h
-+++ b/src/nspawn/nspawn-settings.h
-@@ -103,7 +103,7 @@ bool settings_private_network(Settings *s);
- 
- DEFINE_TRIVIAL_CLEANUP_FUNC(Settings*, settings_free);
- 
--const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* nspawn_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_capability(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_id128(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/resolve/dns-type.c b/src/resolve/dns-type.c
-index aaf5ed62c..d89ae28dc 100644
---- a/src/resolve/dns-type.c
-+++ b/src/resolve/dns-type.c
-@@ -29,7 +29,7 @@ typedef const struct {
- } dns_type;
- 
- static const struct dns_type_name *
--lookup_dns_type (register const char *str, register unsigned int len);
-+lookup_dns_type (register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "dns_type-from-name.h"
- #include "dns_type-to-name.h"
-diff --git a/src/resolve/resolved-conf.h b/src/resolve/resolved-conf.h
-index fc425a36b..8184d6cad 100644
---- a/src/resolve/resolved-conf.h
-+++ b/src/resolve/resolved-conf.h
-@@ -41,7 +41,7 @@ int manager_parse_search_domains_and_warn(Manager *m, const char *string);
- int manager_add_dns_server_by_string(Manager *m, DnsServerType type, const char *word);
- int manager_parse_dns_server_string_and_warn(Manager *m, DnsServerType type, const char *string);
- 
--const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* resolved_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_dns_servers(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_search_domains(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/test/test-af-list.c b/src/test/test-af-list.c
-index aeaa0929b..e2479133d 100644
---- a/src/test/test-af-list.c
-+++ b/src/test/test-af-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
- 
--static const struct af_name* lookup_af(register const char *str, register unsigned int len);
-+static const struct af_name* lookup_af(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "af-from-name.h"
- #include "af-list.h"
-diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-list.c
-index f3989ad20..8f4f342fa 100644
---- a/src/test/test-arphrd-list.c
-+++ b/src/test/test-arphrd-list.c
-@@ -24,7 +24,7 @@
- #include "string-util.h"
- #include "util.h"
- 
--static const struct arphrd_name* lookup_arphrd(register const char *str, register unsigned int len);
-+static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
- 
- #include "arphrd-from-name.h"
- #include "arphrd-list.h"
-diff --git a/src/timesync/timesyncd-conf.h b/src/timesync/timesyncd-conf.h
-index cba0724b1..0280697e9 100644
---- a/src/timesync/timesyncd-conf.h
-+++ b/src/timesync/timesyncd-conf.h
-@@ -22,7 +22,7 @@
- #include "conf-parser.h"
- #include "timesyncd-manager.h"
- 
--const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* timesyncd_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int manager_parse_server_string(Manager *m, ServerType type, const char *string);
- 
-diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
-index 91cc0357c..b0d8ceb76 100644
---- a/src/udev/net/link-config.h
-+++ b/src/udev/net/link-config.h
-@@ -93,7 +93,7 @@ const char *mac_policy_to_string(MACPolicy p) _const_;
- MACPolicy mac_policy_from_string(const char *p) _pure_;
- 
- /* gperf lookup function */
--const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, unsigned length);
-+const struct ConfigPerfItem* link_config_gperf_lookup(const char *key, GPERF_LEN_TYPE length);
- 
- int config_parse_mac_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
- int config_parse_name_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
-diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
-index aa10beafb..09024116f 100644
---- a/src/udev/udev-builtin-keyboard.c
-+++ b/src/udev/udev-builtin-keyboard.c
-@@ -29,7 +29,7 @@
- #include "string-util.h"
- #include "udev.h"
- 
--static const struct key *keyboard_lookup_key(const char *str, unsigned len);
-+static const struct key *keyboard_lookup_key(const char *str, GPERF_LEN_TYPE len);
- #include "keyboard-keys-from-name.h"
- 
- static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {
--- 
-2.11.0
-
diff --git a/sys-fs/udev/files/systemd-232-pkgconfig.patch b/sys-fs/udev/files/systemd-232-pkgconfig.patch
deleted file mode 100644
index 50f7921b565d..000000000000
--- a/sys-fs/udev/files/systemd-232-pkgconfig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a36dad95c447a5cf65f9e3b66c86e906e7f05890 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 5 Nov 2016 09:17:34 -0400
-Subject: [PATCH] Adjust pkgconfig files to point at rootlibdir
-
-The .so symlinks got moved to rootlibdir in 082210c7.
----
- Makefile.am                     | 1 +
- src/libsystemd/libsystemd.pc.in | 2 +-
- src/libudev/libudev.pc.in       | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index f2d8bf5..73144b1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6054,6 +6054,7 @@ EXTRA_DIST += \
- 
- # ------------------------------------------------------------------------------
- substitutions = \
-+       '|rootlibdir=$(rootlibdir)|' \
-        '|rootlibexecdir=$(rootlibexecdir)|' \
-        '|rootbindir=$(rootbindir)|' \
-        '|bindir=$(bindir)|' \
-diff --git a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
-index e8f7950..7e6d499 100644
---- a/src/libsystemd/libsystemd.pc.in
-+++ b/src/libsystemd/libsystemd.pc.in
-@@ -7,7 +7,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@rootlibdir@
- includedir=@includedir@
- 
- Name: systemd
-diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
-index a0f3f52..770c922 100644
---- a/src/libudev/libudev.pc.in
-+++ b/src/libudev/libudev.pc.in
-@@ -7,7 +7,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@rootlibdir@
- includedir=@includedir@
- 
- Name: libudev
diff --git a/sys-fs/udev/files/udev-229-sysmacros.patch b/sys-fs/udev/files/udev-229-sysmacros.patch
deleted file mode 100644
index d72eb5907da7..000000000000
--- a/sys-fs/udev/files/udev-229-sysmacros.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-https://bugs.gentoo.org/580200
-https://github.com/systemd/systemd/commit/27d13af71c3af6b2f9b60556d2c046dbb6e36e23
-
-From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 14 Mar 2016 17:44:49 -0400
-Subject: [PATCH] include sys/sysmacros.h in more places
-
-Since glibc is moving away from implicitly including sys/sysmacros.h
-all the time via sys/types.h, include the header directly in more
-places.  This seems to cover most makedev/major/minor usage.
----
- src/basic/macro.h       | 1 +
- src/basic/util.h        | 1 +
- src/libudev/libudev.h   | 1 +
- src/systemd/sd-device.h | 1 +
- src/udev/udev.h         | 1 +
- 5 files changed, 5 insertions(+)
-
-diff --git a/src/basic/macro.h b/src/basic/macro.h
-index c34441d..b36a956 100644
---- a/src/basic/macro.h
-+++ b/src/basic/macro.h
-@@ -23,6 +23,7 @@
- #include <inttypes.h>
- #include <stdbool.h>
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
-diff --git a/src/basic/util.h b/src/basic/util.h
-index e095254..286db05 100644
---- a/src/basic/util.h
-+++ b/src/basic/util.h
-@@ -36,6 +36,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/statfs.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <time.h>
- #include <unistd.h>
-diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
-index eb58740..3f6d0ed 100644
---- a/src/libudev/libudev.h
-+++ b/src/libudev/libudev.h
-@@ -21,6 +21,7 @@
- #define _LIBUDEV_H_
- 
- #include <stdarg.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #ifdef __cplusplus
-diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
-index 5bfca6e..c1d0756 100644
---- a/src/systemd/sd-device.h
-+++ b/src/systemd/sd-device.h
-@@ -22,6 +22,7 @@
- ***/
- 
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #include "_sd-common.h"
-diff --git a/src/udev/udev.h b/src/udev/udev.h
-index 5659051..8433e8d 100644
---- a/src/udev/udev.h
-+++ b/src/udev/udev.h
-@@ -19,6 +19,7 @@
-  */
- 
- #include <sys/param.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- #include "libudev.h"
--- 
-2.7.4
-
diff --git a/sys-fs/udev/udev-234-r1.ebuild b/sys-fs/udev/udev-234-r1.ebuild
index 1d98a8ca3990..03b5b7ee2290 100644
--- a/sys-fs/udev/udev-234-r1.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-235.ebuild b/sys-fs/udev/udev-235.ebuild
index 1853b357d182..c14199307749 100644
--- a/sys-fs/udev/udev-235.ebuild
+++ b/sys-fs/udev/udev-235.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 1853b357d182..c14199307749 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 94bd2532c667..a9b1c6278fd5 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,11 +5,11 @@ AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45
 DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
 DIST udisks-2.1.8.tar.bz2 931110 SHA256 da416914812a77e5f4d82b81deb8c25799fd3228d27d52f7bf89a501b1857dda SHA512 4f8adc0ebd5e8f34801722cacef09fe176a0e301889b98ecddad1bfbc61b008b2035518cdaf270258a80e087b0a5cb685ddba1373ba332a8d7967656a08156cb WHIRLPOOL 396465f32c9798495e4cd1ce541b619e5ed9d2693561da9a2630eeb27933deac8fa3959ee0c4f16d63bad297f4cadf8df9a4e5dd07b7dc06951cb84d12c64e64
 DIST udisks-2.6.5.tar.gz 1251008 SHA256 817e2de4efab458a98b24b15066933692e6ee3777430211b4e7aeddd0b9045f2 SHA512 57ac878c981af1b91a2e93af154c81471853969a1c951ce11c83f39e4450354da58d447c7644f477e39b602e673d76ecafe34fc7ba1346abf1f71707bcc324a7 WHIRLPOOL 43f66f3410d68ef8b6db8050d30ada83307fe5236e011752f67d1f45c5c81c1f4714fe6fde8377544a3054192482731d58206bf8af94e50a9e713df7a78912b3
-DIST udisks-2.7.3.tar.gz 1282215 SHA256 96e09e94083228a7af1025c4040b56c7eeca9687e60fecf7f88be88291dcb1f1 SHA512 27761e52527ecfd080711e39efb6669b2e85fe388e9f34b2f99294b2fefdd0da489b74ff3b3c2d53a239ff1bd818d73a1fd8d88eb7a7ef660d51f338ac2c82fe WHIRLPOOL be2d96b75e1dee8c905104fe0b88fb08f997524da7795f870412f392676baffc361303ca7a60f3734091c84c35fdad00c7c052c348539147f3b4b87d2e4de62c
-DIST udisks-2.7.4.tar.gz 1286465 SHA256 2ca70f67cdfb4bd5b630972f72fd29eb35eb1b644e161132488446776a1d70fc SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849 WHIRLPOOL dd99c4287e8b0a3276573da092d8826d32c13ca6b99a6945ed731ca6443b0f74e21f4876ef84c89c7a665d9e1f96fb67c2455b46def60b905fd0cebf95821f93
+DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
+DIST udisks-2.7.5.tar.gz 1299487 BLAKE2B bb8be1686c2b26b42b51810ef198017a154c33f0b41b38bbb627607a79fd73ef48ed4c62fe80ed6b3c7a09266aa2d9c2d365f5e3b9aba4694dea42e75126b8d2 SHA512 fd49fd719d3d11ceb6349e856996f8f6f9ee58a2cc35e6622ce662096fa2e746d01958c81e464c4be6071578f4f3e39c5af81669b83582be47b191703c93e71c
 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.3.ebuild 3406 BLAKE2B 83bcd2572280092397befab7460a0f246ea1429e2df4712810ce71bd9faa6e807baa4254ab8105098d8f76d98395ed4da12ebdb458d64407ed6b7492049da506 SHA512 4d24e779a21d5749131375ef493188594a938796fadf1f5dfba51a6d445d78ec052aecc8cded8ebc016b4643881bf2744662d6c6672cacfe4b27db393a2c3db3
 EBUILD udisks-2.7.4.ebuild 3414 BLAKE2B cd4c18c0fcee054bdffcbe4fa3cef2e82b3014466af1ab01ff3c46757f1d1f935aaa0bcafdc6f5f4d585da243a796a50bb4cb699693fc562bd9798b8a8063378 SHA512 c9839af94657a2536901383633f13a76e2c104d1259ee6fd4ab0ff92af8fad08c2b1a559326af1c9c608f430a098cb63053a8061151b8830f17bc39089245be9
+EBUILD udisks-2.7.5.ebuild 3415 BLAKE2B 34e38225ae40b2bead084717900012762bc047266a173eaa63f39956bc574514fef7b1bfb4b1044bd1e374efc404b5f1dc5e968e4edee230a528f1d1802a1423 SHA512 f600d62ad352a751bc8034bb5ad304d9cbd8800ece45ede63930ec832e65c404c737d3902a82174454554bb82004f01b2d635ec29117ed1d57483b28df1a5eec
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.7.3.ebuild b/sys-fs/udisks/udisks-2.7.5.ebuild
index 0ddf5e552c13..da67c255bedb 100644
--- a/sys-fs/udisks/udisks-2.7.3.ebuild
+++ b/sys-fs/udisks/udisks-2.7.5.ebuild
@@ -19,7 +19,7 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/libatasmart-0.19
 	>=sys-auth/polkit-0.110
-	sys-libs/libblockdev[crypt,lvm?]
+	>=sys-libs/libblockdev-2.14[crypt,lvm?]
 	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
@@ -108,7 +108,7 @@ src_install() {
 	prune_libtool_files
 	keepdir /var/lib/udisks2 #383091
 
-	rm -rf "${ED}"/usr/share/bash-completion
+	rm -rf "${ED%/}"/usr/share/bash-completion
 	dobashcomp data/completions/udisksctl
 }