gentoo resync : 15.12.2017

11 files changed, 279 insertions, 11 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 023eaed10cf0..4a546637dccf 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 2c7662b418d4..c9acdb00ac0e 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,8 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.4.tar.xz 1232068 BLAKE2B a65295d023f611ac57abf25fe21b4b6b6f64d8cfdcc01f2e008eea8141423e9d364af42fa3b58f9f8a76f898a01b3918a2a3ff98bc62ab105fa85feb3c1d55cd SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
-DIST cryptsetup-2.0.0-rc1.tar.xz 10059840 BLAKE2B 4a5316adc46eb97542b726e1048212cc85fe0e348b39dad460a36415d3da58c60ec78d87217e3992cb0ebb93b514b8ef3a22081e20c37f2db5146ac5e1e5b0c0 SHA512 397c45b11dd275c2e7da6442a80a92da0de8888a1b9547ae16ee69681c5b63d95253fe0e80ea20a09d14d06d0e138ad349486999f94ce065140f49dcd1dd8427
+DIST cryptsetup-2.0.0.tar.xz 10079936 BLAKE2B 6e5f1bb20571cf7a66f988e50b2cc88d152a2cd414a9b760ad845cafac3d0aa5b5a1fbd871117b91a78b7cbf1d8a849608221f8a35d1faf26f901518c2d00c6e SHA512 195e9c0b6429d21ec0cc7c5faddfde85cb71eee09d348fa50df6779693a2dc05fce04bada4c835150964e08b2e8af30e4194155e0f6366b24c7812f48477a249
 EBUILD cryptsetup-1.7.4.ebuild 4025 BLAKE2B ba5aec9f19bc046e4269baa7d4b73f0e1e0da13253a5ee700fb62cdfaf05de0cb71b86229379d7ce3176e9075e1d063d0f9f488df97da6a8c77e098ef4754f4f SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928
 EBUILD cryptsetup-1.7.5.ebuild 4045 BLAKE2B 14036d9f2c6a1eb5b245ff66edd50629b517b632b11bd3303fd47e4ba7b830fec10c6eecf18b7109801e8f5e84ae0104303a9c4adbdcb5de22ce623b527ba82d SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd
-EBUILD cryptsetup-2.0.0_rc1.ebuild 4335 BLAKE2B 6620bb028b7d3494d6df569f0b24e4af04d0b25ffd8be822790b207301f14837bc4d6823ddd05919eca9eb4826d7b50333f4fb36ddc7aa2d316ec13ec7243a66 SHA512 af301877acf95dde95c82e2a2de9c980c369c3a9a1ec6bb6f86637a1c64348db5b14ab8d2eee86c0935fb48527e53c6c208c0a135e83c761bf3e0cf51d12d5f0
+EBUILD cryptsetup-2.0.0.ebuild 4315 BLAKE2B c28cac94fa3838471dba585f1ce5e2f48d4bfa9a7570c028632f0305da52719a60a3673b0217e31d8788ef728f3031a036892e3373265d5e71f438a573942c8a SHA512 d2da581f685e429e71fb26a0624866100f1ad49be8b2b8b9ad39063b43036b1916f9de24a59c7e9a5fe29bd75aa401ce02dbcd43e908af9b74b4e051a27536ed
 MISC metadata.xml 974 BLAKE2B 7dc6d2696e918f5a5c195194f70ec053bac4bfc84510234ae63a4bebb8363b72e9b1fcc331312c938839a633c95dae1e88dc24bf8ca0602cefc8bb8ab1c822c0 SHA512 a5c9ab70c75af24d3ffdd076f1eb61c6eec3b388a417f611f8988bf3f2da5daaffaab461b50c995e572d2d800c726ca960e78c3c17dd2a40788fcf48e4158f41
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0.ebuild
index d5cb3915a115..ecdf5fbd105f 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/$
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+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
@@ -25,6 +25,7 @@ REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	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[static-libs(+)]
@@ -45,7 +46,6 @@ RDEPEND="static-libs? ( ${LIB_DEPEND} )
 	${LIB_DEPEND//\[static-libs\(+\)\]}
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
-	dev-libs/json-c
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 27e7fa3d6bb4..e314b42f2aab 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,14 +1,17 @@
 AUX dd_rescue-1.99-disable-hmac-tests.patch 1098 BLAKE2B 6a475990165d46aa49209eda0f6a7fc60840e2c323aed93089d8a3aa7f64434a0689c49937805b6943d930e206dd78d7e9899f5ea99ff12736ca09a06fcffc6d SHA512 66de8719daf55ca02bc98b6bdbdb02c27cb4632ef981205b5c250511e058bd8d14408c4595b10dd2c3c0c6d0cf66a28a3b3b358d62420739537e221601be1c0f
 AUX dd_rescue-1.99-musl-r1.patch 4012 BLAKE2B a8dc45bf5aa9b596309165a07649d045af4978f05179b50370c9744aa3dbf345068ab071a4955002caad5c5b6cce72689c17e7ad1bc7dce879c37a1386c20973 SHA512 3c49ea2e82d4196213ca9c0db659d5f9e38b299dc6214ba411b81bc7ef333ea8c0981cc1f86b124c06a84179ebb105133620d6a8334f6ff1d0046ffb432d79c0
+AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 AUX dd_rescue-1.99-musl.patch 2224 BLAKE2B 593ccb007bd65c2fcc729ffd9ffc66f3bef94fdf7854cb66440dbbe5dc67903544e4bbb0cd6e776577305bf6d26ce86308a9516d1f22a0cdc7014e3437f523d3 SHA512 51dd97748c96a711682450fd8c3018498fc6a3cc2663b52be6b1205c7cbdcb033d182543c81b5c09130f3ad26a4cd50ac1a16b2845996fe70118556b2804dd5b
 AUX dd_rescue-1.99-test_fix.patch 497 BLAKE2B 7d9c5b0d10adfad4f0a2279c437d5e3a011dd35aae157b0cff5b5233d2aced4059dc49da1d493bdd97eb443656360d951a32ed0ee61ce7301c48cbf04f4527e0 SHA512 2544e1336763d2951eceafed6de7c2155403bf005eb0eb26e813451b5efdefbdc74eacf97e75229da3720414d0df0f0e9c4dddb254f5068e310765057dcc4349
 DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28
 DIST dd_rescue-1.99.5.tar.bz2 170712 BLAKE2B f19a91de3acf96759c51361a30262a0c77aad45121fdcaa20e0a38e1b47a3f7a9530d22abed78dd78924cb77e053e19eabc9a6c93ba4a0601f5916468f6ba139 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88
 DIST dd_rescue-1.99.6.tar.bz2 171621 BLAKE2B cee1bfb3014e87fdc083ed956427c91a1329f39215d300171e4dc6a553a81e04dd95c006354e318cf692845becc052db77c1daac54942b019e307bc2ba594b1e SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e
 DIST dd_rescue-1.99.7.tar.bz2 172414 BLAKE2B 0f9bd9abd3936eeb4ec22f2c3cf59a3dbf2cb1c2e7fe854b7e0b0c5e3b521541595115952b0d840d739bfb2080a0f2920e867551b3598db62df1f41cb15f3121 SHA512 56e1aca8f068110376ba8b3b7ef7ec203a1632cf943d0b47e415699af67ac29984094a22fb685a4237f6a6962d4aa972714f2ac19e283d209ed3e5c193c9d72d
+DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.46.ebuild 1935 BLAKE2B 96cb26dbaf1af6e3653593bb3416b27165a078e2211519dd94ac7bdc889cba2c66ac9f04dee253828b56c00a8aaf9de51091aabe706b0bfe6e27de9d44854066 SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7
 EBUILD dd-rescue-1.99.5.ebuild 2039 BLAKE2B 56c620e373fa3bd728741518d4d6823a506d3a2304735cf48646247e7f781aad5c79364b41dbdcac287214aaeebb410e27ce706a22c1078a733c08b966ee4351 SHA512 411b9c56ae10eed02006538bb6f479e671128fca9d77829dbaeb7a5c4395dcf0e8619fdb564be2c3dfdd705ff8e5eab8fe18f653377ecf62da3e0125c74834fb
 EBUILD dd-rescue-1.99.6-r1.ebuild 2157 BLAKE2B 7616006018576f961576315b4875712915bf3530fd4942572244416ee7e49c71f9641b6ad098592ec746fb2376e008ad341592b1b4b324c97213671bff4e730b SHA512 58df8d72ced7136925407f44aa6d182baeb52e8bb45ec4be3df66e9ae5b675e20523c92ef3fb149f21d09812f7d4fb7f27ee8accf1ddf46861d65870f80af047
 EBUILD dd-rescue-1.99.6.ebuild 2012 BLAKE2B 08dfe6918cb605941ca02af08f0343e08ac966ece46089f6facdb4fe77726dc368c071ad1fa7c0fca9e02d58522cae2e31f6eaf39427fe346ffbba54041731df SHA512 cf7ae56d76409c667cdb25e836a0f55461b59427fdb6a78499147a8ffd718bafe68df7eff3047d088a8429396419afdcfb6f436a6d98750c4f6f2444229f6711
 EBUILD dd-rescue-1.99.7.ebuild 2346 BLAKE2B 0d953290411f55c7c0f06d19a33b434bb7f8690f31edd20e14fb4055e74e48c07cbdd3b2545048e3bd415773664fc8db49ee82f3f31fb1617b623410755e71d6 SHA512 aef7a441ef2930252051c7c4ab843cc2c4ac0be8c20c121047fccb9ff6b8bbee9ca91bf9f1c794ee197c7832a22a8cea4e50cf1bfebef184e541f35d59fe8f27
+EBUILD dd-rescue-1.99.8.ebuild 2346 BLAKE2B bc1c9babb6afafcc20b4657dbe8e1519eee1116e5e5a64922e2a8f92c1f9a2d2cab6c9b6eaf45d1f04165cbbf4ccc96afc8680846fbdc7faeaecce6b7e935ff5 SHA512 d29c4b0f21cff639f2827a8252c545fceeb68c9cea19d71aa65a10b0ac798147de4e2985be0ebafb924f8ea1ea24ed9b1da87705b1f359298b2bceeb0eed7933
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
new file mode 100644
index 000000000000..135b53fec881
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic multilib autotools
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Similar to dd but can copy from source with errors"
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/"
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
+
+RDEPEND="lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:-ldl:$(LDFLAGS) -ldl:' \
+		-e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
+		Makefile || die
+
+	if ! use cpu_flags_x86_sse4_2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
+			configure.in || die
+	fi
+
+	if ! use cpu_flags_x86_avx2; then
+		sed -i \
+			-e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
+			configure.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	# OpenSSL is only used by a random helper tool we don't install.
+	ac_cv_header_attr_xattr_h=$(usex xattr) \
+	ac_cv_header_openssl_evp_h=no \
+	ac_cv_lib_crypto_EVP_aes_192_ctr=no \
+	ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \
+	ac_cv_header_lzo_lzo1x_h=$(usex lzo) \
+	econf
+}
+
+_emake() {
+	local arch
+	case ${ARCH} in
+	x86)   arch=i386;;
+	amd64) arch=x86_64;;
+	arm)   arch=arm;;
+	arm64) arch=aarch64;;
+	esac
+
+	local os=$(usex kernel_linux Linux IDK)
+
+	# The Makefile is a mess.  Override a few vars rather than patch it.
+	emake \
+		MACH="${arch}" \
+		OS="${os}" \
+		HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \
+		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
+		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS_OPT='$(CFLAGS)' \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+		CC="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	# easier to install by hand than trying to make sense of the Makefile.
+	dobin dd_rescue
+	dodir /usr/$(get_libdir)/${PN}
+	cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die
+	dodoc README.dd_rescue
+	doman dd_rescue.1
+	use lzo && doman ddr_lzo.1
+}
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
new file mode 100644
index 000000000000..c98ddeca13a0
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
@@ -0,0 +1,161 @@
+From e96b79c9e4cd6c40ba6e5fe495904f07a95fb909 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL
+
+Rewrite of Justin Keogh's patch [Link 1] to fix build problems
+on ARM.
+
+Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
+Fixes: https://bugs.gentoo.org/616364
+---
+ configure.in  | 2 +-
+ ddr_ctrl.h    | 3 +++
+ ffs.h         | 3 +++
+ fiemap.h      | 4 ++++
+ fmt_no.h      | 2 ++
+ fstrim.h      | 3 +++
+ libddr_hash.c | 4 ++++
+ libddr_lzo.c  | 3 +++
+ libddr_null.c | 3 +++
+ sha512.h      | 4 ++++
+ 10 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index eb2e813..355ea84 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,7 @@ AC_C_INLINE
+ AC_HEADER_STDC
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+diff --git a/ddr_ctrl.h b/ddr_ctrl.h
+index ac71e4f..58cffd5 100644
+--- a/ddr_ctrl.h
++++ b/ddr_ctrl.h
+@@ -7,6 +7,9 @@
+  *  License: GNU GPLv2 or v3
+  */
+ 
++#define _GNU_SOURCE
++#include <fcntl.h>
++
+ #ifndef _DDR_CTRL_H
+ #define _DDR_CTRL_H
+ 
+diff --git a/ffs.h b/ffs.h
+index 2215080..c1f3444 100644
+--- a/ffs.h
++++ b/ffs.h
+@@ -28,6 +28,9 @@
+ #include <endian.h>
+ #endif
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ 
+ #ifdef HAVE_FFS
+ # define myffs(x) ffs(x)
+diff --git a/fiemap.h b/fiemap.h
+index df1ba95..31cde3b 100644
+--- a/fiemap.h
++++ b/fiemap.h
+@@ -29,5 +29,9 @@
+ 
+ #endif	/* HAVE_LINUX_FS_H */
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #endif	/* _FIEMAPH */
+ 
+diff --git a/fmt_no.h b/fmt_no.h
+index cb0a81b..52ec236 100644
+--- a/fmt_no.h
++++ b/fmt_no.h
+@@ -1,4 +1,6 @@
+ /** Decl for int to str conversion with highlighting */
++#define _GNU_SOURCE
++#include <fcntl.h>
+ 
+ #ifndef _FMT_NO_H
+ #define _FMT_NO_H
+diff --git a/fstrim.h b/fstrim.h
+index 7447061..b9cdcbb 100644
+--- a/fstrim.h
++++ b/fstrim.h
+@@ -1,3 +1,6 @@
++#define _GNU_SOURCE
++#include <fcntl.h>
++
+ #ifndef _FSTRIM_H
+ #define _FSTRIM_H
+ 
+diff --git a/libddr_hash.c b/libddr_hash.c
+index 7c8cdf8..cdbbd4d 100644
+--- a/libddr_hash.c
++++ b/libddr_hash.c
+@@ -33,6 +33,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #include <netinet/in.h>	/* For ntohl/htonl */
+ #include <endian.h>
+ 
+diff --git a/libddr_lzo.c b/libddr_lzo.c
+index 8d3983e..8c83c04 100644
+--- a/libddr_lzo.c
++++ b/libddr_lzo.c
+@@ -26,6 +26,9 @@
+ #include <errno.h>
+ #include <netinet/in.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ #include <signal.h>
+ #include <lzo/lzo1x.h>
+ #include <lzo/lzo1y.h>
+diff --git a/libddr_null.c b/libddr_null.c
+index 3f0f194..c379961 100644
+--- a/libddr_null.c
++++ b/libddr_null.c
+@@ -10,6 +10,9 @@
+ #include "ddr_ctrl.h"
+ #include <string.h>
+ #include <stdlib.h>
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ 
+ /* fwd decl */
+ extern ddr_plugin_t ddr_plug;
+diff --git a/sha512.h b/sha512.h
+index 4d08043..f54d371 100644
+--- a/sha512.h
++++ b/sha512.h
+@@ -3,6 +3,10 @@
+ 
+ #include "hash.h"
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ void sha512_init(hash_t *ctx);
+ void sha384_init(hash_t *ctx);
+ void sha512_128(const uint8_t* msg, hash_t* ctx);
+-- 
+2.15.0
+
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 009ce57e4535..86ecfe5cbc93 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -3,5 +3,5 @@ DIST udiskie-0.6.4.tar.gz 51201 BLAKE2B 72212137e4a234bda6c56f3481727bee16934bbc
 DIST udiskie-1.1.1.tar.gz 62207 BLAKE2B 47dea106580fbd037970b274205b896fa95e1f41cd8593bc9a14c8d19f40c3c44281e7334d4b0aaab0aa5e37146b8fa702afc4b82a2ed0e00549d2f9eb475533 SHA512 0524aeafb4777039a35be8854a0cf3bdbefd43eccb758da9aa2fa71fc4041816ff009dbbff20b4906c9bac281995c9923fcf542107a83c76ecb8c45d6b20b1ba
 EBUILD udiskie-0.6.2.ebuild 1230 BLAKE2B feed1d91f489787b52c988c039a0f1cc2e9485ee2d213bb276b4234918baff70caac96583d1bdf03b8261b50bd371b35e250ad08d3c3370d5d54db443f4d616c SHA512 5bfeb4d461f3672c52c0753f4a1e16655c41643671d0e6894b86435f8dbb1e0fc70a0ae5ded6b0f4b6aea0f4e6b8265f56b93f7502bf9b6f881120bfe7ddf560
 EBUILD udiskie-0.6.4.ebuild 1232 BLAKE2B ef0ff2f1e4b20490960e67b8faffde647c59a86b9002ba2f06f3ca1779650a8254667b63cc647d1944234317e91dc01e42985ff0ff270d5ee8d8fdf5a62fc70a SHA512 f894bfd20993e7e27f24c1c00abe62a3eac0b5d0f5054c9d9e1b97651df75ad1e8e092bc139f46837c3d7f07fae40bfc8922609b5b9230470f5a5bb32c2c608c
-EBUILD udiskie-1.1.1.ebuild 1083 BLAKE2B 2386b21d63f4c8888b64807db67bce45b6252e4cddafbb42cdd0f0b0bf00ea6fbe6aa105eb6659e311d6f9b208b34e2676bb47fadb13e7b03f7a452a91e870b4 SHA512 8e46253bc32c8c47155a1505ec1a5eef3566b2fcc947280633fd33c8057ad6b2c954a7f7a50fd7ca148c665965cbaee1120d2add7cbae337578da53f89db6a63
+EBUILD udiskie-1.1.1.ebuild 1082 BLAKE2B 78b4704f58286d3f0762516166e7222e1807f740df9711c7114427d7d40468958c08712c2723e8152f84162387f4503a9a26dcc8da98398db86e0cdc9df59554 SHA512 1a245c08616a8f34a13e1d218dcc0817f1d83325d7aaea1dbce72a3da97f9270bf0d808f59f6fe6e28bf9405f2177aaf067c8272e4c3b7fae040bcdeb5acef0b
 MISC metadata.xml 270 BLAKE2B 5189aebfdd1b9a7cad5cef37c93c06aeae088156a4938b69b66aeb622ffd9d98235c9a2bf4441d69eba42fe19c46236c83527cd45b660c23c31e0883809c4b01 SHA512 88b1a34217420c25625124b4730a6a9c13ab0022b64c8905a5235b87ac8e2dc0aa44af1204bc96b022ad408b40658276c44897176348f4c43244fbeba3d3d306
diff --git a/sys-fs/udiskie/udiskie-1.1.1.ebuild b/sys-fs/udiskie/udiskie-1.1.1.ebuild
index 2e069af73c33..425c9694ee5a 100644
--- a/sys-fs/udiskie/udiskie-1.1.1.ebuild
+++ b/sys-fs/udiskie/udiskie-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 0e1dfc1c6bfc..76e3473ec093 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -10,6 +10,6 @@ DIST udisks-2.7.5.tar.gz 1299487 BLAKE2B bb8be1686c2b26b42b51810ef198017a154c33f
 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 3413 BLAKE2B ec95609eda8711524c620011aa5abb511685fd96304fd80467d7447891de1a901e09bbf28a193dbb71a4f5b8428b8930eb734b9436c4afa20b201d9742b249da SHA512 8b6cf0d13a536645f7bd09dce87cfe8cbc7bdc101fbb652f52352d506974c0adde2193c6bb7ecf2f0765e501bd8265161383f3adafdba4856ca9b2660f124b89
-EBUILD udisks-2.7.5.ebuild 3415 BLAKE2B 34e38225ae40b2bead084717900012762bc047266a173eaa63f39956bc574514fef7b1bfb4b1044bd1e374efc404b5f1dc5e968e4edee230a528f1d1802a1423 SHA512 f600d62ad352a751bc8034bb5ad304d9cbd8800ece45ede63930ec832e65c404c737d3902a82174454554bb82004f01b2d635ec29117ed1d57483b28df1a5eec
+EBUILD udisks-2.7.4.ebuild 3418 BLAKE2B a6e9d6eb4ea995c905c831314b63c8ac391e57c8fc5718d7a14e387ff019e2bf85a8fcf10345bb80898b9499eef171648fe1947bb2c5bf9c2602141aed775feb SHA512 269e5c1c8a254477db26120b65c0c7e9aa29509714d95ff3f7e70704f384868b6a284ec1f991ba386c42c6a233fdfdae1e9d08d78c191d632d847628e3127433
+EBUILD udisks-2.7.5.ebuild 3420 BLAKE2B 71c4db8cb1d437d217413dfa3d7b06a1e56ee91325fbe90eb29ec70288cbfff7ae7c5d18720932234621467db6edc8d46deb75c37e6af4d5961d04514dbf93f8 SHA512 18f4b8b687d7176a4be364c10f93e3f870415c03533e28e9f2505516f78c0fb20ba68eede99152baeb36ce0e267c11f5802b72eae3e65133aba35dcb0f7e3e75
 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 e615e1d70386..22b63aa1c5a4 100644
--- a/sys-fs/udisks/udisks-2.7.4.ebuild
+++ b/sys-fs/udisks/udisks-2.7.4.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-2.14[crypt,lvm?]
+	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
 	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
diff --git a/sys-fs/udisks/udisks-2.7.5.ebuild b/sys-fs/udisks/udisks-2.7.5.ebuild
index da67c255bedb..14f5c533ed98 100644
--- a/sys-fs/udisks/udisks-2.7.5.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-2.14[crypt,lvm?]
+	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
 	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )