gentoo resync : 02.04.2018

17 files changed, 196 insertions, 79 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 41c54b600413..11d5012a32e8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index c6ae4ffe1bb3..9981295669e3 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -13,6 +13,7 @@ DIST aufs4-standalone-0_pre20170612.tar.xz 2017248 BLAKE2B 40fa98545d6ddd3685f9c
 DIST aufs4-standalone-0_pre20171002.tar.xz 2265048 BLAKE2B ae68812c547411bebd7e169e3bfa840536386a3cfdd876473f167372ec716c7df620329438c9024b185bb302d2053df5ded7026342a166d68187dc756a6e9560 SHA512 ee9d0e48fba6671fe4c5d3f533956c3eb0c6caa45fc4074be94f4427d84a5446cd4dc9f3ebf27fb56e697b24172ddd14a61c246f0414ebce8e372c204dfbb150
 DIST aufs4-standalone-0_pre20171106.tar.xz 2351120 BLAKE2B e29209475da3c39188eb9ec88bf91cd50d7d882fdd234e32e28741b500aa85427e98a23528a297f35562f81dc4f8e4932783917644b2eda0b4f2744ac15b700e SHA512 9a8c6f59b737133e423613365bb46fd197f05a93d459b6206a70807ffaa6763b7095b2f4780deb6e7882a2b464aaa185cf1760febbf3a674e8d0cf71c7ba72ee
 DIST aufs4-standalone-0_pre20180219.tar.xz 2496676 BLAKE2B 61015534f74f9f2398b79643d9528c59f0069fefae3bf9382eea1f31db69fe22195ce8a929e2c25285b41fdc070d7f255effb6d408d3997d61dd83beda544452 SHA512 b667be0c2c2b9bcef66f81839364fa56871c2577b9b2389f0464b669a1404fd68928522bb5b3eb4c114b21b6e86201fb50eeaf167d194de187f305ebc0b75cb7
+DIST aufs4-standalone-0_pre20180312.tar.xz 2521856 BLAKE2B e226a6ba530fe9423d1671cee59501445cbc70419801420f6c5eb8c5fd3af3cce9301d9d32042ea8c4c704a847b4f46bd006c397871f7c9ee5dcb4e92c3ce7e9 SHA512 60e1dfb703706f21928645c51d1a4138187e7ea44d86ca5f2ee8a991a910974bc514340237a7c51397d658ca56e2cf32cfcf374eb8e060073266042e5ee42cee
 EBUILD aufs4-0_pre20160219.ebuild 5069 BLAKE2B c57f8b6f2917b74c1c4715b1314087b5a7c3a9fc06c6124358e36e9a3677489aad587e616db120f2026302315940370597812642ac2dcfd3d95fc65480552b5d SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7
 EBUILD aufs4-0_pre20160223.ebuild 5069 BLAKE2B c57f8b6f2917b74c1c4715b1314087b5a7c3a9fc06c6124358e36e9a3677489aad587e616db120f2026302315940370597812642ac2dcfd3d95fc65480552b5d SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7
 EBUILD aufs4-0_pre20160627.ebuild 5069 BLAKE2B 03f78d0d097baee870a08f47162aaa24ebdfd48dc20e2556405433d77b3d60bd1c79d23fa99998e12438f806549580d8d0ae7ca1ee161b8e655915c999176361 SHA512 ee12cf58211697584c8314b46acc150c8e0e1ecf4a003883c0e9666df128d2298f46506e6248e1671e3a8ea677336331e4e98502a3d8636821023e29fe446ba4
@@ -26,4 +27,5 @@ EBUILD aufs4-0_pre20170612.ebuild 5071 BLAKE2B 085a65234f9876aa1f384c6dd0268abf7
 EBUILD aufs4-0_pre20171002.ebuild 5071 BLAKE2B 4880e26029183fa18ab0bc5df9af980810ce036340d0d834fcfd168ab8021f57ba8a9c1f8232511df875c42a860aeba02d5eb7913ee0db7014d2c3dbd63bfee2 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca
 EBUILD aufs4-0_pre20171106.ebuild 5071 BLAKE2B 4880e26029183fa18ab0bc5df9af980810ce036340d0d834fcfd168ab8021f57ba8a9c1f8232511df875c42a860aeba02d5eb7913ee0db7014d2c3dbd63bfee2 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca
 EBUILD aufs4-0_pre20180219.ebuild 5071 BLAKE2B 0c349c6ca4b487c2878d522df58f36d3208006e9d435cca68305209c910dbf093ad0b7670e9041d1af90ae1bacfd399b6233d57cba721bc9777eddf1d668828f SHA512 6d76fb718d2d5f9a2e3df5ecc1b2c37f174085e1dbc5f7483850e313bfe9d49115439161c2b1b294abab8eb8a0464317c992da6885bc291f3fbc0ef03f2a92bb
+EBUILD aufs4-0_pre20180312.ebuild 5071 BLAKE2B 00121f1ea8244f49692666be28059379f9bdf595c7631c510a5016e2c51ae8de90f89593073991825d46fb9aadc2b1a7492f21fc60ab8c4a03f77126974355c7 SHA512 4f67e80ce62e3267bfe2dedcdace83a58e1cdf415707bbd69476d6dc4ed4ae473e4b499040a431b01dc7bed4de1ab2efd3230588d50bc4d25d6f1523a0045e12
 MISC metadata.xml 809 BLAKE2B fd2f52def4a155a56b0ef2d20f1abac271cc9e55eb4d1164cc7f0686180ab1397c897220e71c7075bb148632f45d30a00fbe7c2513424b44b122a31e5d432c2f SHA512 043c012f55866721363c82fd80007c4ed8420fd8eec95459aac9fb913d855a0be5f135035ba5e3fcab668641ca61897d71ea8e48c1d45f171d418c812620d576
diff --git a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild b/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
new file mode 100644
index 000000000000..1917bdd71b81
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=13
+# highest supported version
+KERN_MAX_VER=16
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" \
+		&& ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is
+	# possible w/out a kernel unpacked on the system
+	[[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && \
+		die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".13+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null || die
+	unpack ${A}
+
+	cd ${PN}-standalone || die
+
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+
+	combinediff \
+		${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+	combinediff \
+		"${T}"/combined-1.patch ${PN}-mmap.patch \
+		> ${PN}-standalone-base-mmap-combined.patch
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch \
+				--no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
+				< "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
+				> /dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || \
+			die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
+
+	sed \
+		-e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
+		-i Makefile || die
+
+	eapply_user
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	use doc && dodoc -r Documentation
+
+	use kernel-patch || \
+		doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc \
+		Documentation/filesystems/aufs/README \
+		"${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index a67d2b45bfea..98b3bc58e6ac 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,9 +1,3 @@
-DIST exfat-utils-1.2.4.tar.gz 167004 BLAKE2B 9491ed5dc74826a233d788976a6f585651dcb7813d132c6a985435e24ab751f39edb3e5dbf87fea39ac0b8ea8eee8d727ff526a05a82ea84a27a7cc5eceb3ee5 SHA512 88c012b535a761493b7c417fad6d1cdafdfb71a5a7e29279e73c7220111edc51bf2e9857f9f3b786b7324227db5ea7b919b599c5b44b6e121fae004a7bdc15e5
-DIST exfat-utils-1.2.6.tar.gz 167375 BLAKE2B a91a34fbaf178ac6ec68191c21ad5e46943608a39aa1db6ad64df1e3d0d0465f65206977c3c2eee49fb2b7d8b57a145a46f916f057075fe6311e77cd8a5046ec SHA512 dc7aaa708cbfef887d6a03d7877488ea6699c053d9cc825243480ae912fe3d76b5e4297559b352defd5b234f159806a16aa407ac1b26206e86d6d9dd4c8bcc36
-DIST exfat-utils-1.2.7.tar.gz 158468 BLAKE2B 39700af0a8186a922bacb34b5b42af2fb09430a6b4c802642e4df78174c90188f9480488a5f30e67621eb29485eb0b16035cba49b956693a4859dcdc105626a5 SHA512 316bf4c770b880f5c2e33792a41849094bad26c279253da3abb6a6fcb3e9287d45bdd7cb1205f9cf4b68e277bc0a557391ff82d96365f9c209ef9500e4017d80
 DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
-EBUILD exfat-utils-1.2.4.ebuild 649 BLAKE2B 01654bce3a254241cd89b3ece1450c0a819459ca329786ee0b7d51a2f11161eef7db15c51b8a1fd96538a211224c6690b2b6a62238f9d640879eed25bf7e5ddd SHA512 c8a6ae79392bcf7b9edd419dbe83f1e85260018ae87656d6bad9365156812198c85f7c6af52b1012ddfccc9a5ad1b47f95e2a489c627eccf20840f459bddceda
-EBUILD exfat-utils-1.2.6.ebuild 651 BLAKE2B 4cfaf841a0a7873bd0c7c8ce731971459b69ada2adab32eec3f00af1a3729f798e694ff49668e2bae58ab5a3f8c926e485549cbee73385f6c8194fb4ee72e21e SHA512 96c22dd901dd0672d1d28034e1061aa1764e8513ad6495bf8f0e9703d7f2c2c10496b922ee2323cff63eda936f5e81e929b9d75a90584bfbddd7ee8dd27328dc
-EBUILD exfat-utils-1.2.7.ebuild 651 BLAKE2B 4cfaf841a0a7873bd0c7c8ce731971459b69ada2adab32eec3f00af1a3729f798e694ff49668e2bae58ab5a3f8c926e485549cbee73385f6c8194fb4ee72e21e SHA512 96c22dd901dd0672d1d28034e1061aa1764e8513ad6495bf8f0e9703d7f2c2c10496b922ee2323cff63eda936f5e81e929b9d75a90584bfbddd7ee8dd27328dc
 EBUILD exfat-utils-1.2.8.ebuild 649 BLAKE2B d1e85531d5c76bf8cac89ecd0bed9ad656880f5821f9819d9777317408ac4defda124e6a3e3755450e420d914d5ede6edc0b0312a1cfb75249c4c4ef8a46e569 SHA512 61442860cc5a317a9818d52dbdb9c12cd8b8157b176a4860a9bc5bdac478c26da1deacec77d92a2fc858cbe0715c53e2974a95a3f47cdd08b9aaf584452d3fa5
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild
deleted file mode 100644
index 4c5878165df0..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-1.2.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
-	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
-}
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.6.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.6.ebuild
deleted file mode 100644
index c16c9ef677b9..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-1.2.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
-	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
-}
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.7.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.7.ebuild
deleted file mode 100644
index c16c9ef677b9..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-1.2.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
-	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
-}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 96f278683fce..ef46e6b275ea 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,5 +1,5 @@
 DIST inotify-tools-3.14.tar.gz 358772 BLAKE2B 99a0b82942d227e3c237edd6ca07bea68a7bbc07fd97bc5d44cb3c07e5e3bfee9513255fe675667872b027f93edd1137c30b61da7c0ef3986994aa812ca74d15 SHA512 6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 EBUILD inotify-tools-3.14.ebuild 793 BLAKE2B aa7e944757801932fdacee27abd3026f6eef864048183dc6b6727a33de40c14b1bdf39464f77f41cde7bc0189d08b589f535f0616f6be6ef7eaa67ddafdec62e SHA512 316279c93f1277e74547a4e728847353e11068bcc0fd2fc26b988d9b9c2c0029ac1c7d5e14a0c64eb526312c7e70c1364c2763835402863838987533a39b7044
-EBUILD inotify-tools-3.20.1.ebuild 822 BLAKE2B 335c2dcb495a674a78e1ba6b6085efb597209febc59786c54148972d3e6f7b64946ae5e7bc5255a88e887bc8f2f4b24f6be0f48228bcc8d316bb4f8a1699608a SHA512 347233060efc80213ef7ccb16716505ef267ae4dffd3ee75dee43c32ea854d4da5b01a534ed6a1980713b49f65866a765e251ac6de87c1124a6a07cd48db7cc7
+EBUILD inotify-tools-3.20.1.ebuild 829 BLAKE2B 913274935f081ad2393c078720058991e42c6db77bbb4e16754b47c8ef454cbfaaa518180e84a1fd289f9d19ff2dc7ec82dbbaa3aa37b3ca72d1a6e62ff47544 SHA512 fe357e872331a2906c5cc2b4afb3758affd4428e918a72733372bba6c2a1c4a66f6002aeec1e8ab971f497b7cdbff9e2623165c27ca8e47c605c68b8360be271
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
index 9f5d0f02a1c8..e2c706306876 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 1dbe721c6daf..e4338d16e35b 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -13,5 +13,5 @@ EBUILD udisks-2.1.8.ebuild 2920 BLAKE2B 66910a00b8b01456188ca325218b048c2634ee53
 EBUILD udisks-2.6.5.ebuild 3271 BLAKE2B 3541f6e93c01380fd9617cffc9c829cad537fb085eccf222ad012aefc2c577bd83c197137b782aed6c358e9d089e476e325e964af1a3815df5de17c6c2db4ec0 SHA512 236af3f68f0767b409dd8a8033c80c74ed66f321761f77bbb199c3158de65dedbd52eedaa44dd2378734cdddb265b5337db63ffc2c8f7c23d9563ca947da383e
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
 EBUILD udisks-2.7.5-r1.ebuild 3381 BLAKE2B 93a8fbcf187c13d3a4be00d109e4accd7c24f7ed90c16fcb5a82c94af624e8dfe51823b17d53fe7917c75a95d97587c7357403a726349484d158ff182489c92c SHA512 d4e4d51e50ba07a55bb2ad05ce44c9d91c25903c614407c5141cc67e3638dd78ac37753f0b300becf23696a0981b16ec5e4cf639d3a52c7fc00282315fb2abe9
-EBUILD udisks-2.7.6.ebuild 3179 BLAKE2B ced7a060914686fc55724fff4d45a9cf51c4159ca18b42fb467d6a751cf2616736079703a1b168172715c98a8cc685487ae313bb752bff69dd82148ac3fefd02 SHA512 ae095cd091ccb187c7d5c7613c7fd7d54fb27e698d0f051b7012749ca0c7a2b69de4261f4f1878878e5eb3bee4d19cef42f9e57f01aa7c02628ca3e656782557
+EBUILD udisks-2.7.6.ebuild 3179 BLAKE2B 36d1dd022087907f0d20f6392114ef5d2abab8da12316eb0a8c7b46956340f192c20dda5218f3ce62ef73462edc6e99691fc1cb8ef541b13c41c2867037e84af SHA512 fc25fa2b3f2fd4b85832d020bfca48fa339b8bec7c4b7b88916e791464da830311eff5b5cd052eeca0163208d823de8c0176fc004d3c0b51ba6c914389d38daa
 MISC metadata.xml 803 BLAKE2B d703b430613a9e0527eb00c5b8b78ebcd04a76d28c5029980e818624aa2acbb486d9076ccb7636ce1df285d98ad64ffe45aa06989ff6d9df4a313b7d8b365c3f SHA512 c371035f733d2537c445d2fdd25e8754a6e92dc66e30e8610ec1112569799bce3101f98c5965df69c0fed25cc376a69e3f93d84c0c540e09b839cca44ad9585e
diff --git a/sys-fs/udisks/udisks-2.7.6.ebuild b/sys-fs/udisks/udisks-2.7.6.ebuild
index ed821f50f3ed..30c3252db0b0 100644
--- a/sys-fs/udisks/udisks-2.7.6.ebuild
+++ b/sys-fs/udisks/udisks-2.7.6.ebuild
@@ -16,7 +16,7 @@ IUSE="acl debug elogind +introspection lvm nls selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.50:2
 	>=dev-libs/libatasmart-0.19
 	>=sys-auth/polkit-0.110
 	>=sys-libs/libblockdev-2.14[cryptsetup,lvm?]
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 200aae635786..2b74d16398cf 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -4,5 +4,5 @@ AUX xfsdump-3.1.6-linguas.patch 975 BLAKE2B c4a862aa55e3a473e4253433154e0e9a7032
 DIST xfsdump-3.1.6.tar.gz 848698 BLAKE2B c87738640f2d5f424d8e8e9df50a75b2424c1f2741a47cd94f1e63d18b460946f1cb0ff362d2a00345db8fcc8e3518faa720e6495b138aaa51fe4e8d2d1bd24a SHA512 6d8eff10c65e0a0893525590953ccb7ec0095ba528725ffe3f18260e6cb8f66dd3945c60477500e84421a9ed57fae9e8f0f25c3c0900be3671f30ca6951ed5e7
 DIST xfsdump-3.1.8.tar.xz 603304 BLAKE2B 8f923ca267f648e88e4e964bcafcfd3bfde0fdb4e6753a9c21bbb8a1ae0f63e868cdad3da4eed5e95ffda861278eaaad49758701384681f3b0a19b93e07a232d SHA512 84720c83627647c75b42c59d180bb31cbb6e064568bef18b73641cf821fa7d39e6f7e0df4a6c7ffd36fba63296ab88cb83f0effdb1f6aa98f4b593ca0e658e0b
 EBUILD xfsdump-3.1.6.ebuild 1440 BLAKE2B 21fd8b07fd5d0cf97f3ae7bcd44e1527dd8929adf68bbede0baa24bf62fcb7900804beefc3104d21e8844c3600b5d631841fa687cd283929dcd541663b069ff9 SHA512 6f9f3123abad6cc0cf066515020d662bc05097aa511bb9e1666855170dea275422ce096925c7ecc4196ae86472888f4245ed9af8c69b6e4bffd5fa1d3171c669
-EBUILD xfsdump-3.1.8.ebuild 1499 BLAKE2B 31ce8da51946d6789aa500e4d9732013bc956853be3e9a2616d00ecdb8e8ed631911392c5a75a171b69fa2a5572c69861517af17af98f0dbbcb34754be43f7ca SHA512 a782e168ed7bdc48e93b6303a815407e38091d7cf1db714c4670d6bf1ecd91d61e2e4b6d61ead01b3f1df829fb261b5f2200cf71cdc45ab8a020f3d697e2136e
+EBUILD xfsdump-3.1.8.ebuild 1498 BLAKE2B 7c45f9c4ecd8c215e8c54ba2fdeec68c012a5959ee86003c837c893ff6322b653c417be67c235fadd0ca655a396d1c636a2b121f28a59eb90d86a08d6ba5fa52 SHA512 d54828f2ccc768ac153bb753324b83f5a42a2931ea801f60f50bc9d994baa8ff82ec0eff36031abfabbec2f62071c7bffaf694332309a852b2aecf22b34d9b65
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
index 8a2e034a5043..dee1b9b97ba1 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 -sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 16a4a569f79d..308201e56085 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,7 +6,7 @@ DIST zfs-0.7.7.tar.gz 6516501 BLAKE2B f9366952bd4d8a8a81f1e4ec9c3306c4076fed7d0e
 EBUILD zfs-kmod-0.6.5.11.ebuild 4075 BLAKE2B a1b642691217beee71f20c29932e2de6b65e2e0745ddf940f63ee1f434c6a5a72ced4f877f4e9201ec0f2ea5e59657f591da9819212838f3e07388fb55c6e372 SHA512 07ef13d00c98c90e0a7759a4fa68fe40ba43f9db3ab180b8203358d812c817f90819bcf45f4451e1b94e319a0e0ec5ea035b34d4bb3eb813053a9eb7dc128040
 EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4401 BLAKE2B a4648117230b7351ad427a7d93d704162eab8561b048730e28224594f2653e2a975da34e66a59de007c61187beb504cc8e263942602f141c7afee75cb670a43f SHA512 589e0c952efe6bc9d2fe0b1a85c0309eefa64a3c632f5030112b613d3c2d2c177a8fd7b501b0296ed74e040e3a574296c5acf86701925154377bf479b8d3aaad
 EBUILD zfs-kmod-0.7.6.ebuild 4054 BLAKE2B d9696df2d2a3612b42d426afb40f588f47a53e7d821ea14cd71c3a0edcdb2663195bdfd8e2a5d18b05d230e78194bef2a459be912f8e5327bf589a35cd548e89 SHA512 ac7ea69f470ab7b8749abd815069f600aa045f45f634166f65edc76849e05a6ceff014d50df860991de7a7bae3386fd42fa3765f3e0e94939550260386df2b9c
-EBUILD zfs-kmod-0.7.7.ebuild 4054 BLAKE2B 31c851b48ef27afe5e61bfa7ad58886db39a2ab617a79b5fd47a6032e603e60592a70956a8b3054ea9e5b96dcd3de8dc3a1d8a9675b66d063012779c2e80d831 SHA512 7d3ecd5f918c45242d569f094ccee38d319d0acee8eca375374ed2128662e264f44e772487d813517ce519ac8077fbffb974ccb7d8e929bb7b35b696cd8e3eff
+EBUILD zfs-kmod-0.7.7.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6
 EBUILD zfs-kmod-0.7.9999.ebuild 4133 BLAKE2B e4863fb198b74a1ba2417caca7d1d817d23423b8d8c1da2d65d422bb9c25e59ed6aff0fc15f7037529e491dee71f06b05252cc7305a9ae4b7383969692977f80 SHA512 2ae7acae2a3f4f8836dcbbe2e30773f966204e568bf4754fd0d7225052508ab9b0f90c8eab0974b1436472642cacf652da6e1db2216771f58c962a0f9a6a06a7
 EBUILD zfs-kmod-9999.ebuild 4092 BLAKE2B 9aff1a1edb78f8c445ae022c153cf8c8afd524c97e47542f74b11f6248642a638f81c03a6403376b6d92c51512abd9238806c81eec33acc52dc682706fd5191e SHA512 f8d8674dd7ff3692735f242c3634671a617ae0e2de6530dc380ea58292f9a6c9d5829f4b0548e677471224b2fe9796ba11ee069d2bf66bb5f9611a3acbcd4b2e
 MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.7.ebuild
index d71cf40662e3..c8153afff87b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.7.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then
 else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 1fb63415ff25..5702256916db 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -9,7 +9,7 @@ DIST zfs-0.7.7.tar.gz 6516501 BLAKE2B f9366952bd4d8a8a81f1e4ec9c3306c4076fed7d0e
 EBUILD zfs-0.6.5.11-r2.ebuild 6070 BLAKE2B a6ed1c6c13421c77a2d491f889824cdcedf92ee5944cfebf2fd3b077eaf5e922b7a1349a5bf083d494a517f5d98edc14a1dd515bd4a87e899944831f03eb63af SHA512 8f5bca7f06a0c32b6f7c9387f2ae776b39c1c56012c7ff036eb63c368d2bed4a2223c2e213a753f04ad809c02eb1f7eb693ae946e18d3df573c5d1dadb8a2585
 EBUILD zfs-0.6.5.4-r4.ebuild 7128 BLAKE2B 096bc923b0d89b657248bf6eb8b4aab36fd2b33fc902a82c066fbd66a6338d2a982de5ead7e83d8e4da439f12aac524934f190b876315ea7e6ab9abeb2c931f6 SHA512 99fb3507dd8447ca132ea7cd38e854792e743812000692324283eb4bc15e77e7e3510f0f452f3ebab0ab69a6c9e7bc2cf65ec079b65fdc5c73208d2f0b7ff9ff
 EBUILD zfs-0.7.6-r1.ebuild 6074 BLAKE2B 4c31e7519ca9032f1c3285fac8e458b56f3566fa9a6fa6ef82480d820c801a69e8b01cd3aa66646721bab4a1f888484e9a34ff5a647a3617822e35b24c7f7bdf SHA512 5a84bb0453ed965e51f1ddf9e411f69749bf642fc08773980240ef0222f933d2359f827e3c15594fbd080c42131cc47b8f413018d6a83469e46baf1c0166466b
-EBUILD zfs-0.7.7.ebuild 6074 BLAKE2B 4c31e7519ca9032f1c3285fac8e458b56f3566fa9a6fa6ef82480d820c801a69e8b01cd3aa66646721bab4a1f888484e9a34ff5a647a3617822e35b24c7f7bdf SHA512 5a84bb0453ed965e51f1ddf9e411f69749bf642fc08773980240ef0222f933d2359f827e3c15594fbd080c42131cc47b8f413018d6a83469e46baf1c0166466b
+EBUILD zfs-0.7.7.ebuild 6073 BLAKE2B 5ba2b9221ebf4dd4f483e531dc74d098bcfc633405204bd577a38d24ae92f9e9ee5d47e779097f31f424e1e0da8eff9ebc62c303d0a115810a557e856df5ba78 SHA512 9740c0a4dd42b6f82d7f6a09ffb399127e1b2d04bf211267908d1b918e0914a0443a9115b788d9300703ca8da68561a1d8c09d4f3ffd61a7c9fdd83775a5d24d
 EBUILD zfs-0.7.9999.ebuild 5975 BLAKE2B 109e38dde8903a09eb8c3458fc36686c048c1309a46e7c63c21922fba71371078a97f8978798be72c34056bbe5ec39cb0d4503fcbaedc5c14fa61db651924d12 SHA512 f4c0afcd5606a381bff06783b8523f5dffe4610fd6108b3f020580ab89c58a522d633967471c14e8f6ced4b27cfbc7382f78eca0c18302a8ea8dee929ff9245f
 EBUILD zfs-9999.ebuild 6216 BLAKE2B 08da2b7ebfcaca96b298b47f2d544785d7852ea08e601d8e2de58b2a7c9bed30a90c6ba416b451aaf6ee2f577c0e7f4a0468ed3daa15330bf5560430d46bf461 SHA512 ce8ad3c9532a5ee4d9d358acb371bb33a6d4595acf77a23b88f39eeb46a85cc02c88e64c037655a5b0da77511f3a1563a8a91665bc26b021150accd3e6948991
 MISC metadata.xml 754 BLAKE2B 7fc8a5badf77174cc9d31bb1e83da53d910a18884897287bc3666066edcfc03ec6331c09cb7ff02767e14b17df03eddba74549feea61dd044c21a4133f4aa763 SHA512 647ffa3857be38b2aed7462d26bbb1d3ea50fc53068b6d973514fdbadf7164421dd2025165a592855b86a03754d968d36e503dcfafc99e3ed75ee7db3f62df3a
diff --git a/sys-fs/zfs/zfs-0.7.7.ebuild b/sys-fs/zfs/zfs-0.7.7.ebuild
index b625fe321e0f..333f9edb6160 100644
--- a/sys-fs/zfs/zfs-0.7.7.ebuild
+++ b/sys-fs/zfs/zfs-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev