gentoo resync : 21.07.2018

20 files changed, 52 insertions, 180 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 04fa80f007a4..3b3a9b6435f2 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index 4da176d385ce..623fd4047f9c 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -1,10 +1,9 @@
-AUX cachefilesd-0.10.4-makefile.patch 628 BLAKE2B 80c758f814b38416342ecd4057e8f9c70b16f8d45951c273dcd570dbaf8f6ac4a600466e06ee81bc40cf82a9b12acf5ec8f84d0441ab567aae8fb617c2b58308 SHA512 b6092b5c98c63b8479af22c6bf1812da9124a54c8e51e9e7531bf7984d3816090cc0a0126d6d506f8d42bc19863b2ba486b373d5c5577d47369cf3a1b2c78e72
 AUX cachefilesd-0.10.9-makefile.patch 609 BLAKE2B 0b6f518b71866b4220164ec27a8ba3d7b2042be9994689b003359854af507b18e24050ba56d64eab2672b03d7307b618528f62d7ad12aef2f5119902d2f96737 SHA512 cda279d9403dcae3cc1ba15bda7093536bc4bdf20c1dd9cc8e26f8bec504c4524e829e1ee8a936acecab71ff1d855520274383f916d9d15076dc9e876d88dee7
 AUX cachefilesd-3.init 1677 BLAKE2B 20406636f93b3e002ab15bb33879101813a7bcc23dfe0b5dbc35e24ec3f192023e4cfbacefff6985b39bcc205575ba3b9b6ed44be96679b7486df550641a11e4 SHA512 ca227db027c1673f9e1339f6a3952c93a2cbdf454adb690e43c8eb49860cf998b5e12f0191ec58c78055212f7a65269b77a413e7ee89c3293ac9a3af5a0ec8f8
 AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219307a96c4a12cc25517d26bd3b377deee41eae00b0a12ef55a6a9b9820836ae57bbfdb4c2b381a2efa6bb71 SHA512 37ddd3a452cc1d639b3ea3e98fc528c4552dd7f768a05fd1e4ad1821bbd6a0092f1cc5cfa4e7e41664952e4fd06001724fe64f6a16115fff15c542732d2ffec3
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
 DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10.ebuild 1478 BLAKE2B e94563ae245a849ade78e8e89e3df399a5190cdf4cc4412b2437c99f8b1ef3c19b6afdbdcd1653e865f3062d59312813abea5ac7ead3dc7c81096f1d7a48fc31 SHA512 21c5044a4af28a5c8fa6aa36c2b579c60e8f964bd5f13aaece7315e05ddc5751fb3ee8dabe467f6dcfa7ba82f53457f58c6783ebd2c20fc5a99e1f1d845a8ef8
+EBUILD cachefilesd-0.10.10-r1.ebuild 1557 BLAKE2B 89592efd30dabb92a26373e762795d09c9868c02c0b255f93ebf925eb9af29071db97ba92bfe423ff5b90c5a21ccbd04786760432ee67006f6edd2e01450ed43 SHA512 685b795812663df5aa5b8e72a4e6742d2dec4d259924264b29aa84acc28126dd3c53be5ed8786df709dd7be8affbca10be9001512a20494e43d68d2a444b5940
 EBUILD cachefilesd-0.10.9.ebuild 1474 BLAKE2B f6f6a711efb2f8a6e4da64eeef209aabc7c3fbbefe99381bff20761d9295d2717e65c983d83a588348a62f9df3c0242c1d2858d3b61a5d4714c51b668938a0a2 SHA512 ca2637b562004f977847dc0697753b2114a5ed53dca94906209f90e763bb2126e36fabe59f6ef8ddb2579387eed090d76a6f1c8726d0b4a7882af0db0ca587f3
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 629ffd58c2cf..9d8411670fe4 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
@@ -44,6 +44,7 @@ src_install() {
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 	newinitd "${FILESDIR}"/${PN}-3.init ${PN}
 
+	sed -i 's@ExecStart=/usr@ExecStart=@' ${PN}.service || die "failed to fix path"
 	systemd_dounit ${PN}.service
 	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
 }
diff --git a/sys-fs/cachefilesd/files/cachefilesd-0.10.4-makefile.patch b/sys-fs/cachefilesd/files/cachefilesd-0.10.4-makefile.patch
deleted file mode 100644
index 5cbb24001c95..000000000000
--- a/sys-fs/cachefilesd/files/cachefilesd-0.10.4-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- Makefile |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d5d352e..9a98bf5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,3 @@
--CFLAGS		:= -g -O2 -Wall
- INSTALL		:= install
- DESTDIR		:=
- ETCDIR		:= /etc
-@@ -38,7 +37,10 @@ endif
- ###############################################################################
- all: cachefilesd
- 
--cachefilesd: cachefilesd.c Makefile
-+cachefilesd.o: cachefilesd.c
-+	$(CC) $(CFLAGS) -c $<
-+
-+cachefilesd: cachefilesd.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
- ###############################################################################
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 1c77d93b6f9c..8ac00c92beea 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -2,9 +2,7 @@ AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499a
 AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.0.2.tar.xz 10122404 BLAKE2B ac2391cdef387c403a8477467fb8fa36850d38ad3759639326f10ecd2b475bbd3df63162aafa1886e389a5a6b4ff1f94c2906e31538501d3be36267fbee12f6a SHA512 1c37b81b1dcb1223293b30ddc7096e074d01e2dd978b543fbda7ae11ecc29c1c461d12e4b22288bb382a188e9e679bf1ad3e281e77428374b7c605c8902c1b17
 DIST cryptsetup-2.0.3.tar.xz 10125548 BLAKE2B 871df4c248151394f5abc907209b6df636049e5a1ff72161af091d36963ef68adee14e5e1867d779c9419e489aa9bea7562608b239a8fe361b769f0cc14daaf0 SHA512 f5ac54aa9614b234f2d1e84758a98914d283b669f4ab5cbe0ed7cdf25ce77f2d1abdf1e5b5010d803971f0e29120954110ee4fcc538137b04fbdc13b7804385e
-EBUILD cryptsetup-1.7.5.ebuild 4036 BLAKE2B bb375ecb644f402b0f27e0df5f32a4be5df56bce651752d81ee986ecde94e7d0d4690baa75ce26097687341336feaf7b596d2dcc9697114a984c525f6372a7e8 SHA512 13f8d76ea1ed070bc6803bc4ce93c442dec574acf0a973983b60f5f9fafedb463341201f1869a2beba7a0003c69426dd69862c07c95b91b5ad77e260574261a7
-EBUILD cryptsetup-2.0.2.ebuild 4034 BLAKE2B 77ef011fd8005a29e27fb480137b9f36e2a160122a6917b532d2645f04360f7c042f9444819b6d1e6b59c7bfb4b981a7f7585e9cbd2ca22a6a44a957e6a0d25a SHA512 59315e58bafd417c781b38378ccd6ad8342ba89d6347ef0b40e399411c408eea370f295a6ce3fca2ea82bb06e4cb99aa278b883d62afeb928cd576a3488c2521
-EBUILD cryptsetup-2.0.3.ebuild 4089 BLAKE2B cdb483d1ffd2132604753292bfb5dbe03f6a3a30a0f8ba87dfd68d9a3391fe0b7eacac584ad166b337e8c841059170d83fe655ecc1a02395258356514d46c9f4 SHA512 4576d6a4fffd5877c3650904fb445ecb72635d9c61bdfc13b3689e3565af80bb1ee094589ce8d62551815829446cad99d05fcd57d6003c369eb77151fec9b747
+EBUILD cryptsetup-1.7.5-r1.ebuild 4041 BLAKE2B 3f8868734f9ed2d1a635762348632b00520b243738c9f907866225e981bd7534d38f746c2eda2292cfaa395f77e431cd4b479ba97294d187c9d7de3b3f6047c5 SHA512 d41b3eb764e68fe72d1e4d2ee725a66030f03cfe7ea7d9046cc0dfaf673062229e9ade2a356b81112e8955cc8536916caae949716aebf3b0d4bfb8ce8f2190c7
+EBUILD cryptsetup-2.0.3-r1.ebuild 4094 BLAKE2B e145fd62d995b06b5326e7d2989d84e0fd265fa7357e561a61edc283c0b02cce3bfcf77b162e36b9477349d4920c788899840261628173b7fc6536c8094de24c SHA512 278cd2e0d788d3aacec7bd64592509c912ccc915bc8e432cbbfd50528143e6dae7736adc6049fc0f0de997fee68c1b96fd63ac9986cfe538d9a82943e04a6784
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
index 93b4e3a96176..aae1559690ed 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools distutils-r1 linux-info libtool eutils versionator
 
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom"
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	static? ( !gcrypt )" #496612
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.2.ebuild
deleted file mode 100644
index 8a3cab745499..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.0.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit autotools python-single-r1 linux-info libtool ltprune versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	use python && python_setup
-
-	# We disable autotool python integration so we can use eclasses
-	# for proper integration with multiple python versions.
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable python)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.3.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild
index 9a20d88f801e..90930f1120c1 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit autotools python-single-r1 linux-info libtool ltprune versionator
 
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~mips ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs udev urandom"
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	static? ( !gcrypt )" #496612
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index ccb08ff02ea7..a150378f8396 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,3 +1,3 @@
 DIST fuse-zip-0.4.2.tar.gz 672323 BLAKE2B f21a630c3aee48547efa354069410e5c1691fa358fe925d55b3839d0c514b9f886b6a39629132956104406c77485f6c1976d81801f7f86781c3225dd7f4d3e38 SHA512 73e38ee96b6bd24ee74b13e57994dddcd97abb99997c1d2bae4801f37a2cf1665cef0cbe4c6cca26d8423c4a9cb5fec2583ad033e242b4807ae87719f2e5f2a7
 EBUILD fuse-zip-0.4.2.ebuild 881 BLAKE2B 663b579c733087e8af1e34d5940c6045e33bbcc330a95fb49071cb8edfaa9f1d8e52a741156a11f5871a9a86a4439952acd2de3a137c80b18783b6c392f49260 SHA512 d521fc413a82072f38cd9193a5bc0f24cd86f0b882c7b6a0d70ed1be130130efce4f99e0c9b361b5d48cb87fdec6087a0f80b39fba9a62715073fa400956a212
-MISC metadata.xml 388 BLAKE2B 8490c8b4d9f3689861bb2d124509596c539a722029ab85516761bbac207712764796831c1c8d3b0cd6018016a472c185c88526a6ffddf7cb19b979a235035d6a SHA512 08f5a44d72e9f11caf0913bd613202e3e3605cdd989ad56fbfeb106f2c8c18e74395b315921c81e30a70149eed7f20747b2416ad1c2ba356a1cec831e0be5b11
+MISC metadata.xml 383 BLAKE2B 9fbc9f2c9ddbe2560cee3301a08f6705818607c3f43deea8a964208843eb4954ec3169362ffea084689e90313a9e18518c315a422de8719a6bbeda103358257f SHA512 e7962c4db2054e682b47d78745cbea5bd0a1d2da9c2d17dc4e48b7f88f83ac18515f23f5ae09a3b07b6bb0ad81cb28881ba9bca977f35536503b8737a3134fce
diff --git a/sys-fs/fuse-zip/metadata.xml b/sys-fs/fuse-zip/metadata.xml
index 77ee45c5d763..bf2b3309dfc3 100644
--- a/sys-fs/fuse-zip/metadata.xml
+++ b/sys-fs/fuse-zip/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">fuse-zip</remote-id>
diff --git a/sys-fs/lessfs/Manifest b/sys-fs/lessfs/Manifest
index 9c6711e4c736..462807da1cd0 100644
--- a/sys-fs/lessfs/Manifest
+++ b/sys-fs/lessfs/Manifest
@@ -2,4 +2,4 @@ DIST lessfs-1.5.13.tar.gz 506221 BLAKE2B 30d960b97120c7e819af2357358050720d01c22
 DIST lessfs-1.7.0.tar.gz 514667 BLAKE2B 249e240dbeb95ed9412495d00fe7fdc708a931c65d724f2f16019213f62a9c6333ad6be849337399243a99e3d31d692cdec9a8e0347957087a6f7a36daf11586 SHA512 a868b28159fbcd2e7672607d46e3007c7b959bd8c8880b6c98cdab6c61fd104ac222e156f543c2b3e9f9d9fe2f1879c2988ee80605946f03b646481e7c6f15d1
 EBUILD lessfs-1.5.13.ebuild 1218 BLAKE2B 518b144a352a20fb2501f69f21e591514876c37628fc6aac3615e205a190e5bdbaa00c5d2f758bba9c5ded2be75547ff1536d330f455f2a3ae3b0b02347f36f3 SHA512 ef9ff6d16f0397fded5f6eeb21039e760485f73f61579f7a1345228ae6a94ebdad1c4a98a92d008585ceb16cab54999bfd8b40eb06476c9049542dfc4e1e7d52
 EBUILD lessfs-1.7.0.ebuild 1281 BLAKE2B 6080ac5f1c1a57321306a292728bd297b4687754274c7d10adf25298405937d3cf7bcbdf2ccb4d595e4141d0b7483de5b9982e814d716d4cfc0dd417ca5c55b7 SHA512 e930c0ebb872b82702a495dd62fb3782dc64b10afce925f34311d80e00ebecfde203da2f171102ad39035849da1043ac69c0480c2c43461b7803c18e340c1100
-MISC metadata.xml 1505 BLAKE2B e83c322f012bc37f76869ac27746fedd1b7854f9402160954ebdede04f408547c7d15efc0c044263c908cb4e8d87da5e037cefca4059c45a7520e90012670f0f SHA512 d9a93c34bbfc60ab5e3287367613ae66529e8a25abe7c89983fd547e862262c268a14e4de96a45949b451b9d00e1dc8b733d65e9b1ad93ff2b67b4f82a87f77e
+MISC metadata.xml 1422 BLAKE2B faa04d5dc2bb7b18102a3bd2a4386590050599cbfd1124b632d78cae75692f0395f9675b9226c2c7a45de81359737b43f488ddffc67ec04aec829f256cd0fd92 SHA512 d841f92f53749f39637801b2f4f5129083f07df540cc13c5c2e2bdd1c7e16aefa66e120ca9b0b78e38d85a9186a7c208dfb44a3600f1ba7d76e70d6e7bfb95d9
diff --git a/sys-fs/lessfs/metadata.xml b/sys-fs/lessfs/metadata.xml
index ce642aedde3e..b5086c36b11b 100644
--- a/sys-fs/lessfs/metadata.xml
+++ b/sys-fs/lessfs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="filelog">Enable the ability to log to a file instead of syslog</flag>
 		<flag name="memtrace">Enable leefs to create a report regarding the memory allocation. This feature should be used for debugging purposes to avoid performance degradation</flag>
diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest
index 136601513592..e186dd163d7a 100644
--- a/sys-fs/mac-fdisk/Manifest
+++ b/sys-fs/mac-fdisk/Manifest
@@ -2,11 +2,12 @@ AUX big_pt.patch 1404 BLAKE2B 71fc2242a8b9a4c37b50a234acab2b013bc6ebb6308b552682
 AUX largerthan2gb.patch 272 BLAKE2B 7bbd9b0fd817430d956d96d89c12b996d8ceec8f06654227e39f9b52d9f78b433a0520d9b5794ffaab9a0ab0452a92f94e1418e683749832bf9d43b29ce9322a SHA512 b5988eb6aa64324421398461396b0fdd0b55d7643094c042bea7264ec0f9913e8a793f3f550c15928419e697a14f2932f483c4b98a54618af99b35aa7ceae757
 AUX mac-fdisk-0.1-headers.patch 2050 BLAKE2B d375f6e4eb9ec940957771047413de4e8b3a99340630804926a24fc0104acde175c6332d06eab6f709d96974c81a3e834408fe8e42be4a1d917e136caca87a00 SHA512 7d16300c02b293de87101e3ef83a8b7778d15123c261d562f0129704b74d0c3d7ca18730c52d37b599ff57c0b70dacd41aeefe99cf235aea4abd4b569e3d601e
 AUX mac-fdisk-0.1-r6-ppc64.patch 13664 BLAKE2B f0dcdb916fb9f6d07f8696613fbac8953e407dfb4bdc5f218d0a67c4b6dfc67fc0049add4a59806ed0ce513412c4b9d8b2a06ba1c4a305f533fa04c5a715d96b SHA512 8ad99f6f205d7f4ced33c1da93a76b4329c24c85e85ea5f0fda579002d1e7282c5764cdec37c7a7c99e4f198d34259a382ed37cead60b8307a7779806142d49b
+AUX mac-fdisk-0.1_p16-ppc-inline.patch 863 BLAKE2B 3af665308ee82c2854047a5a80749122e02a3ab75370ff03e1f0322f54977ac9722f81a1a53cf918e0400bf9bc9bd03e9f31732574a22533e9f956eecbe54420 SHA512 40e213b1f0234195eb14450fe9fb326de2401552747af15eb743c0fbedd5f94aebe41245ad6f892a0aa34b6041cad2728530b7c6290731375b4dfe06c0e0102c
 AUX mac-fdisk-0.1_p16-ppc64.patch 12912 BLAKE2B 39b808d7e69e1ce705e6b8e231a1f0db559863fb2f80cd15bf9a3971c87e4a6c0a06e85dc3726489a4f82493aa7e85da1597c101ea1eed174bd58d3615167d9d SHA512 e521009d628934fe3925085c941d2bb3fba9c3322ccaaa6dd650ecbc6b990056f9bf186adb3a645dc8593efdb44611b69a7b6bf4e87d262870bbb515581e0ef3
 AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021184be73ecdc41568fcaf73e1daec8183d43f355b4bba876a0399f3dfd2c05173d7c9fee6d8d95068f141633 SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c
 DIST mac-fdisk_0.1-13.diff.gz 19615 BLAKE2B 75f81f5adcac44803e581b0959a13e27cb588fb7220c19e2ea07f8784af4eae2b1f39c3e268a0bbed8765fc3d430805b2ef13f87cb7810d1e0a758b1d9c751a3 SHA512 adc34f20e73ae91c39acb073f70f0041a4a0726985fc5e5de34ae433996b3f719ca4193cce51efc6599ba1773ad63fee045a8d72b6bd8a036c188d762626fe57
 DIST mac-fdisk_0.1-16.diff.gz 19896 BLAKE2B 9383a22fb02f44d23802dd57acdf3e956c68aad17927030395f03c0422237fb6420430277b3bd512b8267ce0e36dee7b19355820fb5005db646bc21748221ced SHA512 deb44217afae097594e14dea6cd128f6cb1e8ed6e62e646d2aa311508ea27d164c94187e8eb1f1d018ee6044346f6785770981a655b6ad536dbbce550df13359
 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120
 EBUILD mac-fdisk-0.1-r7.ebuild 1348 BLAKE2B a0b4d9462e7c45a0cf57c1cd8652a5f3ca42a1d9e50f3c601bcb93e99caa666c34a6567bc34b68b4d0c3395934b34394eb70dff13f7d66efac8d40fd8b7ec83e SHA512 4ef48d9a3ef95d08ac60313c40fd7cfbbb41d42940065cebf1961d7705e4510a25ac5eca7732f948692d6bd861ffd019dd436aa55a7dcdf353c0d5dbc2164988
-EBUILD mac-fdisk-0.1_p16.ebuild 1239 BLAKE2B 084b93ee70e4b374b5af24c57f78cdaf03d8247ef57a60bd2235fe0770e5533e5e76f4fc69a13f8dad5f3fbd67399d26690795bc3c1733eca1752cf529a19b3b SHA512 f26c8731ea781eee50c6d08425a812f91128aaf1e5ec1527f793b6ce11acee91420e0ddcd47e2c1785fe06d0e3cfe2c7b7469e00fd9436b99baa66fffe22def1
+EBUILD mac-fdisk-0.1_p16.ebuild 1293 BLAKE2B 61dec1a06762c62770735430b474d39007c9832ffa566e43e9f7771ebb7be67d28b53b87954884345acb0f541fa917db8ea652eaf623cc316dc3cd986bf97419 SHA512 e0b81a76399e70dce7ba67490fe5767d7e98f1417fcbad9593710a7dbd77850fdeee9efdcf67c0b01322003a882eb1af10cc38cf343e87e6e0765243d4115330
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc-inline.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc-inline.patch
new file mode 100644
index 000000000000..032c68d96378
--- /dev/null
+++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p16-ppc-inline.patch
@@ -0,0 +1,21 @@
+on gcc-7.3.0 build failed as:
+    # CFLAGS="-mcpu=powerpc -Os -pipe" emerge -v1 sys-fs/mac-fdisk
+    cc   fdisk.o fdisklabel.o   -o fdisk
+    fdisk.o: In function `check_consistency':
+    fdisk.c:(.text+0x64): undefined reference to `__swap32'
+    fdisk.c:(.text+0x70): undefined reference to `__swap32'
+
+Avoid exporting inline symbols and workaround build failure.
+--- a/fdisk.c
++++ b/fdisk.c
+@@ -247,8 +247,8 @@ char read_char(char *mesg);
+ jmp_buf listingbuf;
+ 
+-inline unsigned short __swap16(unsigned short x) {
++static inline unsigned short __swap16(unsigned short x) {
+ 	return (((__u16)(x) & 0xFF) << 8) | (((__u16)(x) & 0xFF00) >> 8);
+ }
+-inline __u32 __swap32(__u32 x) {
++static inline __u32 __swap32(__u32 x) {
+ 	return (((__u32)(x) & 0xFF) << 24) | (((__u32)(x) & 0xFF00) << 8) | (((__u32)(x) & 0xFF0000) >> 8) | (((__u32)(x) & 0xFF000000) >> 24);
+ }
diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
index 19b9fff8a39e..32ae45a56014 100644
--- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
+++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,6 +34,8 @@ src_prepare() {
 	### Note that >=2TB disks may not work due to limitations of the Mac
 	### Partition Table structure, this needs to be investigated
 	epatch "${FILESDIR}"/big_pt.patch
+
+	epatch "${FILESDIR}"/${PN}-0.1_p16-ppc-inline.patch
 }
 
 src_compile() {
diff --git a/sys-fs/treesize/Manifest b/sys-fs/treesize/Manifest
index 1ca8ebac5dac..1beb9b16b624 100644
--- a/sys-fs/treesize/Manifest
+++ b/sys-fs/treesize/Manifest
@@ -1,4 +1,4 @@
 AUX 0.54.1-amd64.patch 286 BLAKE2B 66d5bfe8a87636f3655e3dbb39a348e420ce273ff21c2adbf383de72493724ec63877827c7a85f5fdddede6780ec095596e40881754dc161db518138e4d51027 SHA512 baff1d78c6cb49bca3e0e15cd77e6c7f33fc0f1c0afbb4f2707a90ec641340785acfdac37b499e6ce88c423950c60a711786565ddbb207a015188190b5f0627f
 DIST treesize-0.54.1-src.tbz2 296047 BLAKE2B a00cdadc225976bc2cecb8e0e26509650c1a2707eaaa14b6edbbb5ee88871eaa5e56f164aa7285efa369aad77ec6414e9d025de31d1aef16c5910d9142fb07dc SHA512 461e3f6aa01127afd11b98395d65911f441012fcdaa3741ef35789d51fdb491731cfc62b5616150d74bbcbb8c2742561a387aef8ec4f9a493e9ce6683fb5fcae
 EBUILD treesize-0.54.1.ebuild 619 BLAKE2B 6b39f2983a8da5b40bbbcee71b989021a393ebbd96721ddfb03d8806dd7c419f33daf4ef9717cc372e9b59003cf172b4c95a9a813a6bf366cd14cc8a0fa8001d SHA512 7ea14f520ffd8c410e2c48f5d48e81598e69b0267c8f8b53f1fde03bd572ea50924918aa7920187c8d52f8ffe8f43b73a8911ea256c9d9d88f263e020004350b
-MISC metadata.xml 328 BLAKE2B 0070994f36515a29415b887dac5e5fd85bda6fa285dba3828b68215afb844fd73e6ac939f8608a59e6f8d2ee41dcffcb7db9cdf95178319c4717c5db9ff5829f SHA512 72c0fce83a8b490532584b8e393fb0a0d42416ffe4cd6221348c31cb652d2f4d3fa7d6df328ec3ed38a5f877a0e678e40fceb862b01ac22044ae62e89d80e3b1
+MISC metadata.xml 245 BLAKE2B 379d9f118f924bb9c4fca6ccf376e9be6d26f243e0517922acc4a2959912dced4b592df9440699016c20a8a1280577cb7c71b0f744b66e46266c64955b66eec0 SHA512 ce493a808a1b4807488b017b1813c1ae857367457fec5fa2f27ba9bdb780f6aa431fe30e33a3dcb7574168ef9245305ea223a273c9e9f0557b7aa12bd02b5ef7
diff --git a/sys-fs/treesize/metadata.xml b/sys-fs/treesize/metadata.xml
index cb54d014c97b..696c2fdd2975 100644
--- a/sys-fs/treesize/metadata.xml
+++ b/sys-fs/treesize/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">treesize</remote-id>
 	</upstream>
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index c2b49fdb2a6c..e86271d0e271 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -9,6 +9,6 @@ DIST xfsprogs-4.16.1.tar.xz 1199632 BLAKE2B 26448ce8ec691d117c0b41aebcb692994ad5
 DIST xfsprogs-4.17.0.tar.xz 1205508 BLAKE2B 46168792c1e4c335b7ed9e7489afc20d7df4b4e554eb86043b2c19303879491cc4746b18d23fdff3e2f92ca3887ac27957ae57e85ba784476d8891ea6909d67e SHA512 996de920c76de596b6175e4ae4ba9de208c16fbcf9362bbb44d25ee1c12b249d0178fc5cc93dc5a434ab20e6d515d64a3f51b8e89905b5b033b28a3638f4d400
 EBUILD xfsprogs-4.14.0.ebuild 2655 BLAKE2B 8aa62f0b2a4aecaebf4842edf8c636f0dddee92b2635ff8355f26e6cd95ff5b328e613e325463cb3dc22d1a7dad376b0ff3ef8840da0bfa9e9dbf775ee8a7d9d SHA512 a9bd435a3d8ec8f6ca2c3b1408cff7eb5c8f5bfeba876d4fad81c7ec6bf1f2cb35c2380badea5fc556ac386f933c8764521cfa35fa5c8ce5e2cd2f3bec57bd22
 EBUILD xfsprogs-4.15.1.ebuild 2774 BLAKE2B f043cc030b481eec290acca613349ade3157a44f54225fb023d14f0e1e87fd65513250c2fcfafa14dbaa11a7d03243020ea63a7353a3c960374bd4b0a558b062 SHA512 b4f44545aa76cd46f2011dac25c021a4925edf6a03e5abbdaed98eae5d254eeb0b3c0d01e114300ea1b0a40c6005f88c3f50205b154bdd4f41fe75f82baa91fb
-EBUILD xfsprogs-4.16.1.ebuild 2798 BLAKE2B 2995b45fbeade53dfbf6d60b0f1d161e1ae7966ae3f1fb7649b29e4a27dc484e113ed1e8c03c21bcdcc928d3868b955d13249c085d5b9fc224a7e9f8b8b5c66d SHA512 9c6ff808c18124ac94a21e0fddc3288cbb136bbb24d3de943e1df8acafc99dd44e706bcc40155f81f6def94b8514a41d2a2db4e6741566476339454013d62398
-EBUILD xfsprogs-4.17.0.ebuild 2798 BLAKE2B 2995b45fbeade53dfbf6d60b0f1d161e1ae7966ae3f1fb7649b29e4a27dc484e113ed1e8c03c21bcdcc928d3868b955d13249c085d5b9fc224a7e9f8b8b5c66d SHA512 9c6ff808c18124ac94a21e0fddc3288cbb136bbb24d3de943e1df8acafc99dd44e706bcc40155f81f6def94b8514a41d2a2db4e6741566476339454013d62398
+EBUILD xfsprogs-4.16.1-r1.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
+EBUILD xfsprogs-4.17.0-r1.ebuild 2887 BLAKE2B e17dfa5a76155525edf9a5bfae7ddf2d869a8c16a846bc5e2db122c327b3214a9ce59b91429eed89f5cc179fe7549c796933640ac85c8072dc97e40037068f39 SHA512 8599b45f034314a0e9f48e97551bf4d8efbbc50aa2b72a86975ee5788362c507d904b45a69eeacc9b31eabbe80177f0d7ed7d3600de6c9024519dd7ea5da48c6
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
index 275a8f8ef898..273db91aea0b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.16.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.16.1-r1.ebuild
@@ -12,10 +12,11 @@ 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="libedit nls readline static static-libs"
+IUSE="icu libedit nls readline static static-libs"
 REQUIRED_USE="static? ( 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="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -68,8 +69,10 @@ src_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))
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index 275a8f8ef898..273db91aea0b 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -12,10 +12,11 @@ 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="libedit nls readline static static-libs"
+IUSE="icu libedit nls readline static static-libs"
 REQUIRED_USE="static? ( 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="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
@@ -68,8 +69,10 @@ src_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))