gentoo resync : 23.06.2018

19 files changed, 72 insertions, 51 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cee4ec0910e3..fb83dd0abce7 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1c0176617d4f..a54495defd3c 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -3,8 +3,8 @@ AUX eudev-include-sysmacros-header.patch 4516 BLAKE2B 2c02cece2f2dfc48cff03696a0
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
 DIST eudev-3.1.5.tar.gz 1745524 BLAKE2B d030e78f8ef751ac1d677f50200898fb2089940a7d8a828080059fb6330012e615638e47ba21dd6b35fcf89248783d20e47387b8f009f7f4cc1f3fac203e6f58 SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
-EBUILD eudev-3.1.5.ebuild 7208 BLAKE2B 845b3c538f77c1bbee8c74ae84fa58d5883bbe3e97e96e90c00dda74c8b24a2a28b676f8893269aba214c60e212104b3f28dfab4070bf3e1c9b022d46e7577ef SHA512 c3b94258f03fb86cdf2d1f0ca89a8496a23d43df1da865edeca4122dd259c0be8d0203be45ed37b00daeab91d4abf9805a82a2d1483ff94a2c197768884bbe5d
-EBUILD eudev-3.2.5.ebuild 7188 BLAKE2B d2361c8fe050393e2e5a72a6cc1a3a8b511b3fb544a8b3546bab49923806bb77e15d7fb98774a15c4eb66766e3fe77076da063695f4bd94ae7abb954b9cdcff1 SHA512 df1a850655f16c12736fd023205ca6d78522afb55f15ffb7732bb4d4e2621c4a777f8bcc263b004775670566cd758ce9f395b245d0618303afae235a43e6c4a2
-EBUILD eudev-4.9999.ebuild 6488 BLAKE2B 2ceafba483af00e76edd7d07a92ecd6036a3e99723823384928731ec6080e3e86a0dddf548a4abc1da097d247e0c54842a0ac6c9d2a639d9715c6e1568ff28cc SHA512 95f43eda615a37307c25ad6dd1997070ff5efcc936752611546542b07a242ce1a4299f775758d7f480fcbf55d25da764bcc43e2c3f9f0c10fd9083c987aba9e8
-EBUILD eudev-9999.ebuild 7198 BLAKE2B 839f4305b8dde6aba52a463d0053928f63ac5d2ab4ecc773ffac442de82d1f52c7aa6839c95b57a04b8fd021be7d49566f05e039113f5c4b2e76851147756b0d SHA512 5f4652feb5a4aa3166471513405ee08e1b5bff7de05f29dffdb88b76a5eb841f52f557d18f2104e6e8e0834d1a2bb5f5b26bf3eab6ca1cecf782c409341929e9
+EBUILD eudev-3.1.5.ebuild 7034 BLAKE2B 85f3af82179e44de1675e0de072117037025d54f900742d08476fefdc248ecc84ed6a7d93db3338d6fce147f5dfb83852faaaf29eb39a0d4e6d2785e0fa37ca5 SHA512 1650bbac075a533bd2bc50f10adc91610da7502c2d9bd65024e8027c66dcd1c31648b9fdb6eb6b928523d410393475b1048b353b4eab69e23e52bd7dfb1d246c
+EBUILD eudev-3.2.5.ebuild 7014 BLAKE2B 7b1feddcc35a0d5843fff56efa184e9676218ecd0fc7d005bf0b5598d9c91432fb0e43e2945bdd04ad6f708daabbf1d072a3e148bb994f1c8fbe39ffecce5ee6 SHA512 bec227480c34ece8c240f10431c01731dcc0d34bdfa28285f090684a82a5de26027562c440df4dbf97f470197260cd499e7c16d3ba79a999e660f7e23ed3b8d0
+EBUILD eudev-4.9999.ebuild 6314 BLAKE2B cb761cf1b967faf8d5ea170beafd0218a8be85d7f599107ee1977f77bae167d86840e7842da4bc6435a984df25470bd6fd10f263df1a326ec97f47799e38d6f5 SHA512 300f700e4ee4e117af85609d64847007b422b9a0ea7a75cb4cfb08882b4da38687d8a498cfdd36d4b1cd0f44e5eda773d24eb1085281fe302a30f978987dd0a2
+EBUILD eudev-9999.ebuild 7024 BLAKE2B 133a13098ed4b315f96c921d83032a1843d6b9e28d942bfe3aaf209c7795286590522501cd4113d5862d68860b8c63bfac71c1facc4f586779a910bed3010bd6 SHA512 5c0071d81018fe7c1fdca5e4ef4e0085752ad92eb1045f88cb01282a46c823a29884f2fae479a5445ff83836bec7c7af741abbb4bfa7eaf22cadcf2789938679
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 1a1aa6cc3111..da80e0dc8c6a 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
 	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
 
 pkg_pretend() {
 	ewarn
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 26b5186f7216..131f1a69a5db 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
 	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
 
 pkg_pretend() {
 	ewarn
diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index 8e32a0f959f0..69dbc663bc01 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -48,10 +48,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
 	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
 
 pkg_pretend() {
 	ewarn
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 4e3f3bb3c604..9cd4b44b46cc 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -47,10 +47,9 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-fs/udev-init-scripts-26
 	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
 
 pkg_pretend() {
 	ewarn
diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index 34f4d9bc6b47..e1fd50ca113f 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -1,6 +1,7 @@
 AUX ext3grep-0.10.1-gcc44.patch 7824 BLAKE2B b0c7bb82f81f088388836d3d8c92496d164043592c97a5a97570f4db38128fb24fc8ba761e9f59f900e161214285f261bc978f3fe1341d7ec45e2cc76bb2d591 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607
-AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 267 BLAKE2B 4f6b703c74b358c7d7e3db8870063d854fd9b856add323caf3cfd0bdd4bbc126dc2bec5b15aee61c8a9fceab1d2c368cd03f3a0662b4f09fbe64acd6d5cc7eb4 SHA512 4675ec597a131f91d9452f10c2d163fa8fa0d883b3138e475992596778cfd80f0499d3dff4092f6bbf09b6e7653c8d35ff18ca98217c8856d1a85596621079ac
-AUX ext3grep-0.10.2-new-e2fsprogs.diff 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
+AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 271 BLAKE2B b06c18ab18b5b1278883155dfefc3e0b4aff93e1fcfd2a500c92ada7ad10df56823564deb0acf1bfcb0c4453c2280cb27232bbf01be6567692ba2e4b0f2e395a SHA512 ea47220fc10d18bcaa6dbd9e89c94a9248f5af11d8f314a148edb1e99c9d655f753a9d8b3a33f0f3f20bc82eaa80cfd509b6d4255ff32b4977269a05af6f8e1e
+AUX ext3grep-0.10.2-new-e2fsprogs.patch 1478 BLAKE2B aa7daaae9984f524b59a7391268f301d8570bf8e48ffea686cd65e98db950351ba9fe43b9da93925c636aef78749b00acf0aa72d57b08bb2817b229497019875 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19
+AUX ext3grep-0.10.2-newer-e2fsprogs.patch 1111 BLAKE2B c4343f4d8ad9d6e4c1b52f1dc41ab42d4de97e2185279cdc018ac3de7824ed2ca09eea8a9bd79d22628ccd2fb37b0e94bfaf27bfdc1e78da11a0ed0411ad432f SHA512 321d303e8f8e12270ee40f64418888e5a23347d33b978aec4979c87ceb21f70c970736087175ce141024997332f0772444cee9baab3758d2aab08d7d84b05faa
 DIST ext3grep-0.10.2.tar.gz 236364 BLAKE2B 0352e00a20c6a1486e4ddc0b80c9dcc9afa383775bb4ca6bcc83d2761b2901a9344ccd66f96e4a3e4b02177730f4e27b444695ba0644a5c42c4f3105618288ff SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f
-EBUILD ext3grep-0.10.2.ebuild 817 BLAKE2B 6577f9a630297ef16e2ef08608d5d6c27abe05a297e5ab3bc264400c235df71418b2bbbd0374dc7891b136281fc6ed0d285e4c954545b7445852447fdac193e9 SHA512 c748ed20bc31c81789c23653615a8f62608f6910500ab1f564d16a455b905f8274e2619a188724247ec445e51c24d8388bd164e429193f4bcf891590c308e70c
+EBUILD ext3grep-0.10.2.ebuild 733 BLAKE2B 9f93845eaee2b993c8fc47c389bf63c8d0d4cc100a8ae749a6877f79461476c4d3c3dad2520f7cc2943eb17a382ce1aad17d77a580e77618f7425410a98d8292 SHA512 462bec287c7ab79daa485b4649abca01e2cf3046a05cacd304e8db691262bf37e20a322da4d4e4c212562b1706906260ff45645c5a29b972e1375edcd7823232
 MISC metadata.xml 294 BLAKE2B ff8d54938ff70c9f253ad7d0bbaa8cb9785b7e6d0a7280722ce2276dfe7874ed05801aea1f56944fa39e8b09e02ed1977e08dce8438a872f6894aa98d7ace25c SHA512 db238ab8c6f8c7c51748dc51b47d4f34553671e36792ca466b1dceaafd41293c65af7303bf060315a826bb995ea34445b5b016918556b2d3ff2fc09077a57ae5
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
index 88c27978d04d..1c8c5533ad98 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=6
 
 DESCRIPTION="Recover deleted files on an ext3 file system"
 HOMEPAGE="https://code.google.com/p/ext3grep/"
@@ -13,25 +12,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug pch"
 
-DOCS="NEWS README"
-
-RDEPEND=""
 DEPEND="sys-fs/e2fsprogs
 	virtual/os-headers
 	virtual/pkgconfig"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.10.1-gcc44.patch \
-		"${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch
+DOCS="NEWS README"
 
-	# Fix build against latest e2fsprogs, taken from
-	# https://code.google.com/p/ext3grep/issues/detail?id=34
-	epatch "${FILESDIR}"/${P}-new-e2fsprogs.diff
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.1-gcc44.patch"
+	"${FILESDIR}/${P}-include-unistd_h-for-sysconf.patch"
+	"${FILESDIR}/${P}-new-e2fsprogs.patch"
+	"${FILESDIR}/${P}-newer-e2fsprogs.patch"
+)
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
+	myeconfargs=(
+		$(use_enable debug)
 		$(use_enable pch)
+	)
+
+	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
index bf38c27e7095..42588f71d6e5 100644
--- a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/422789
 
---- src/init_consts.cc
-+++ src/init_consts.cc
+--- a/src/init_consts.cc
++++ b/src/init_consts.cc
 @@ -27,6 +27,10 @@
  #include "debug.h"
  #endif
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
index 45b54b807bd7..45b54b807bd7 100644
--- a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.patch
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
new file mode 100644
index 000000000000..8a029f9916b6
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-newer-e2fsprogs.patch
@@ -0,0 +1,22 @@
+--- a/src/ext3.h	2008-04-09 13:20:31.000000000 +0200
++++ b/src/ext3.h	2018-05-07 23:16:35.413754674 +0200
+@@ -106,7 +106,7 @@
+     __u32 const* block(void) const { return i_block; }
+     __u32 generation(void) const { return i_generation; }
+     __u32 file_acl(void) const { return i_file_acl; }
+-    __u32 dir_acl(void) const { return i_dir_acl; }
++    __u32 size_high(void) const { return i_size_high; }
+     __u32 faddr(void) const { return i_faddr; }
+     __u16 uid_high(void) const { return i_uid_high; }
+     __u16 gid_high(void) const { return i_gid_high; }
+--- a/src/print_inode_to.cc	2008-10-17 03:27:15.000000000 +0200
++++ b/src/print_inode_to.cc	2018-05-07 23:16:54.379754601 +0200
+@@ -118,7 +118,7 @@
+     os << '\n';
+   }
+   //os << "File ACL: " << inode.file_acl() << '\n';
+-  //os << "Directory ACL: " << inode.dir_acl() << '\n';
++  //os << "Directory ACL: " << inode.size_high() << '\n';
+   //os << "Fragment address: " << inode.faddr() << '\n';
+   //os << "Fragment number: " << (int)inode.osd2.linux2.l_i_frag << '\n';
+   //os << "Fragment size: " << (int)inode.osd2.linux2.l_i_fsize << '\n';
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 749a41584347..abc80cb5c9da 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -5,5 +5,5 @@ AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b
 DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee43f2c1f035d080dde1201746d994e705756ab219de8359b1f8708e83e11c0036cdc33339e54299aa433f383e698e425ff2fed SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
 EBUILD ntfs3g-2016.2.22-r2.ebuild 2461 BLAKE2B d1dce35bb7970bb4c338ec4f37ea4a653a8272eab6f550ee0efe86553d8f0f9c1f1479d647f5c0c0ad1e04b1e5583006539a5cbc776941d6541070c7aaa22835 SHA512 0e97a1235323d44ed6bb994e6160377f16641b15772a3ee84de12d671661a795db09b99d2c3f8dd82545d406a83b2f3465c898b4e7a84c7c5dadfbf56977ecb5
-EBUILD ntfs3g-2017.3.23.ebuild 2401 BLAKE2B aec942ca97cdb841d12bdb4b1583f67baa5183d9786574846448268d96d35c932b92a66f070befabfa39b3f22421dab8f618579a300b1e53f9063c777b0859c8 SHA512 ab187cf9d06b460da8a9f4a0c74c435915149064ec7aaf7733fc20669f0acf8154146b981b5b871dd4e37489abf0478003ea49e7460ed8675bc2547c8a3011ab
+EBUILD ntfs3g-2017.3.23.ebuild 2400 BLAKE2B 4f2e9973e9e274b5c5504eeb2028cb92670ff3b167c43495ec4cb970152802486f89fa2ce78159f803ccbef5b4b88122a3465c235448ad3a0f72dccbf0f264e6 SHA512 7353c23dfeeecd664abeff70a1b800e2221fc607dde463195c6da28ce9c33a4e2cc0bd98eee30a9d9864c6f2dd9325b373a17ea4bef1e44ec29d6f1eac7b8ef9
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
index 53c95176deb1..e0cd68da6b6d 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/87"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index bae2a5a6d0bc..5f2bd8e5af26 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -2,4 +2,4 @@ AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b64
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
 EBUILD zfs-auto-snapshot-1.2.4.ebuild 1379 BLAKE2B 1471a99fa769c947ce39c433c2f46362a7bae719c9cb07134cfa2e3a1d0aa76f824b02e7af7059206e31a05e0b72f432faa6ac452c01659e4f2ba88ead7e8351 SHA512 19a50df99e5b5716f62b5c2ed5e0dbdd404ed66f3615fa6620cf3e529f0851f6e18d8c440ad50a91c8d003d47d664c78af5965e92ffe93b6c0bd6baa10597db6
 EBUILD zfs-auto-snapshot-9999.ebuild 1379 BLAKE2B 1471a99fa769c947ce39c433c2f46362a7bae719c9cb07134cfa2e3a1d0aa76f824b02e7af7059206e31a05e0b72f432faa6ac452c01659e4f2ba88ead7e8351 SHA512 19a50df99e5b5716f62b5c2ed5e0dbdd404ed66f3615fa6620cf3e529f0851f6e18d8c440ad50a91c8d003d47d664c78af5965e92ffe93b6c0bd6baa10597db6
-MISC metadata.xml 1020 BLAKE2B b25380667a6ae2ad4757dd08d15cd5517104e017dba72b96d94043002041a1c7e743b3089832f6136a18d13e5b54001a12d041bb324e382cec7aa1689fc163ce SHA512 171c0ba73b401b6de8b0547d147a968d2a25378fd79f25754a65ae146a49529c52947ca2dc2b060339d5ae0ff6fc504be2e5c74830cff84d4c27ff7cfacd990b
+MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
diff --git a/sys-fs/zfs-auto-snapshot/metadata.xml b/sys-fs/zfs-auto-snapshot/metadata.xml
index c89306c4869f..7ee701b35b9f 100644
--- a/sys-fs/zfs-auto-snapshot/metadata.xml
+++ b/sys-fs/zfs-auto-snapshot/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ya@sysdump.net</email>
+		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		An alternative implementation of the zfs-auto-snapshot service for Linux
 		that is compatible with zfs-linux and zfs-fuse.
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 4d66694bad3d..0f53543af960 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -6,4 +6,4 @@ EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a14
 EBUILD zfs-kmod-0.7.9.ebuild 4054 BLAKE2B 31c851b48ef27afe5e61bfa7ad58886db39a2ab617a79b5fd47a6032e603e60592a70956a8b3054ea9e5b96dcd3de8dc3a1d8a9675b66d063012779c2e80d831 SHA512 7d3ecd5f918c45242d569f094ccee38d319d0acee8eca375374ed2128662e264f44e772487d813517ce519ac8077fbffb974ccb7d8e929bb7b35b696cd8e3eff
 EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B 8de7c6141fb29223abb3dfa371af43135b876e4791ec2ea140624f2b105efbee1eef37ec8059adfe147d0bce81ed9968a4921395ada10dac8a2a14059ca4ec48 SHA512 57af0f45a19b938e0aff46e1f7628fd4a81dcc41e32a2e6a345f5901ea9d10cd8a797873bb2c338d58c502007cf54e8ff378da2a4c7746ae5061a66caa5b58b3
 EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B e3f6c8f5420724380a1a355c64650c70e808400e59dd2f09d882f81f8afb4484d46c37b477744e9efcdd99a6b2ad75065d54794f900f0ff45000b2dac4c5d92c SHA512 4591269a50de3e4c4a0a14e86bf3489d8f2898c34a9c173cda78cc97bd524f374bd11484c71854a635791ba3eae0d357730332ba1c91d204ef2636260c8d292a
-MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b
+MISC metadata.xml 666 BLAKE2B 45ed040273833c94523c3531f36c739d0d482fbdba09cb229e6b0be80c3cfd2f124e1d90facc19c1109be3e19255f2428aeb14da106f2a39b59a0549704debbf SHA512 eea336c56df7d0b4e0f259ce88d837e2700a4733e1e70ec484ed4e3246abddb928f21f8e912822f778d626b962b092f803a0bf0ce1b812891d53d1a31f06cac9
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index 51cfee84a293..bbbcb3977c70 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -9,6 +9,10 @@
 		<email>fearedbliss@gentoo.org</email>
 		<name>Jonathan Vasquez</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag>
 	</use>
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index f4655696bbda..790aab50d823 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -9,4 +9,4 @@ EBUILD zfs-0.7.8.ebuild 6073 BLAKE2B 5ba2b9221ebf4dd4f483e531dc74d098bcfc6334052
 EBUILD zfs-0.7.9.ebuild 6072 BLAKE2B d6e0f7400ea8c2d2bdb8d4826a52e80f0f43276478cc71f2cec03183936d25ddfdaaf92f409f3b9eae620c7b0d3f778dc5260bc74f1b8f79679df6117a4b4d33 SHA512 ad13f8e8aedabd0c72ac987e4057757b136d51de17a8f82ba9e9cff1505307d61699d534bba644b984c438083026af42f1b6276da3d8216db319b77c18be2320
 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
+MISC metadata.xml 866 BLAKE2B 61980bae647a4b495c9e57a58936d2a2043b2520944c06fba145c7ab19edca705232c96469d98c4ffe1df8197581a4f287060d7c86bcb245dcb4b27c7c484dbd SHA512 041cf4aa98e4ec5b5a30980a3bcfe7e9612194850ed490b15ebdc6ce21195bfe1bd4428b576d22da276101ecd33523ae247c3644e3db826aa6e20fbe2ba6a996
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 75b863399dd4..d3167065338f 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -9,6 +9,10 @@
 		<email>fearedbliss@gentoo.org</email>
 		<name>Jonathan Vasquez</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
 	<use>
 		<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
 		<flag name="rootfs">Enable dependencies required for booting off a pool containing a rootfs</flag>