gentoo resync : 15.11.2017

9 files changed, 292 insertions, 23 deletions

diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 77819ab7f35a..29df6d931d55 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -11,6 +11,7 @@ DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 SHA256 96dcb9d94d1d2358a61e9d
 DIST aufs4-standalone-0_pre20170313.tar.xz 1883012 SHA256 195b0a821fe9fe7f22416848699bb464434d6c7562d981a3fa64f8670234b516 SHA512 7d711e0ebdc38aa79d3b7cdb04c91f3029c233bacdadca87a8622d48826c261c678d6a2cda6b627a0db0f248b35448e0d9da30e2c8e2e42e3b1e3ae6327033ba WHIRLPOOL 41410d251ede7e85faee6aaac4139aa00862f7dfdf4eeef6baef72f0324d594cf48c416d3d3dc7ff98ad0563d3b7b0b3c20f75784947660947b20a74331d89c7
 DIST aufs4-standalone-0_pre20170612.tar.xz 2017248 SHA256 fe725b22ace944b26cc33a79fe8cb977824937473ee4b67b95d62854da1dd589 SHA512 2d0fd1dce7b1a421533e667420fc69a44c378753dccddc3768eebdb906a023e41378b38961004a58b1c4f2e3844c86f8cb4be238e634318a380881eab513acfa WHIRLPOOL c74bea33b077e3dda7abe165daf0e5c54e1949f6b3d3928b47e50d13e9dee1a9b2a49605b85d9afb52dd36c69a61c1f07969e4a05da0aa705051d719b8a86776
 DIST aufs4-standalone-0_pre20171002.tar.xz 2265048 SHA256 89ed39c84ad9d30a479b9bc5039dcdd37c0a88d61055a9935e364e23a12a2d59 SHA512 ee9d0e48fba6671fe4c5d3f533956c3eb0c6caa45fc4074be94f4427d84a5446cd4dc9f3ebf27fb56e697b24172ddd14a61c246f0414ebce8e372c204dfbb150 WHIRLPOOL 178ece388bd30c2d3aeef226f5fc03910513df7902f208ca14dfd4a841c453db38fc48ade8c18e0801142cdb4d592d2f4d13f68369a74eed32bb8ee4a3465e3c
+DIST aufs4-standalone-0_pre20171106.tar.xz 2351120 SHA256 c795079fd6cf6835af4cf5879a238d1be788c459cb233a17a9f962aba0699df6 SHA512 9a8c6f59b737133e423613365bb46fd197f05a93d459b6206a70807ffaa6763b7095b2f4780deb6e7882a2b464aaa185cf1760febbf3a674e8d0cf71c7ba72ee WHIRLPOOL d3497bc316b33bf6805635808976f5130c042474af701fed244ca00211117ae4994ec3ba3d449ab7b466207adf6ff88b8e3704e88e7cdc3d2b43f5479602c5ee
 EBUILD aufs4-0_pre20160219.ebuild 5069 SHA256 d8f28085ae0693564e62d1f8f790d72365800a0d520c9e36b60e85c5b37ba1b2 SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7 WHIRLPOOL 7bf3cd55469fd27b582ea57132a23bc67ca9b27070c1e52e223127817c5d5715d74e9913e8aa049bc0d3074cfed0c46a6fbdb25ac7e660be25913aacacdb9c3f
 EBUILD aufs4-0_pre20160223.ebuild 5069 SHA256 d8f28085ae0693564e62d1f8f790d72365800a0d520c9e36b60e85c5b37ba1b2 SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7 WHIRLPOOL 7bf3cd55469fd27b582ea57132a23bc67ca9b27070c1e52e223127817c5d5715d74e9913e8aa049bc0d3074cfed0c46a6fbdb25ac7e660be25913aacacdb9c3f
 EBUILD aufs4-0_pre20160627.ebuild 5069 SHA256 ae1674210d594091803cd98fcab4a5a451655b53ded37cc0cfc8f0824869726a SHA512 ee12cf58211697584c8314b46acc150c8e0e1ecf4a003883c0e9666df128d2298f46506e6248e1671e3a8ea677336331e4e98502a3d8636821023e29fe446ba4 WHIRLPOOL 23e413311af73f8e9eb9af5536910923a2e53bb164b2be67b4984e3a6fb836c0843a2535a3f5a7bb7770d1d33bc60737defed73b06a61d2de9a4e8c8aa9a15d4
@@ -22,6 +23,7 @@ EBUILD aufs4-0_pre20170220.ebuild 5070 SHA256 b215cd1740df75261ba15d56d297005f7c
 EBUILD aufs4-0_pre20170313.ebuild 5070 SHA256 5a8e50bcc13bbd19ff8e2f28b71c1b1bb985aa0b6affe5488ee595c9ea9a0609 SHA512 7af320fd64d5da1edfd1a5c2eb4b433a2b03c9ee85cc6d40e71af086856589cc66d92336223a4d36c2ec08cabf1bf5c8f225b9935f3da86429718752efaca939 WHIRLPOOL aef3c0c428a5f4215ae33991209fa5dd357c77f0bc7b820348bf5da06a6471f7f6edd26070f61963e7be1e829b12b80950c5b97711d7b5a19bed950ced7c5216
 EBUILD aufs4-0_pre20170612.ebuild 5071 SHA256 07f102c3aaabaae0e07d372072f98d0b9b16789aaa8b3b3d5f3b5812116de0a2 SHA512 967961b3757a59705eddb781d470893deb54080fa70f52609d0228830fafb94737dd40b5e3269601b92f50e65795738809c1bde433949f9f504a575639e0d3b3 WHIRLPOOL 934add0c44f2993f2dec324b12edfbef25a62ce2df18c590478df684e2bfbb219e9e956eeab8b9c49519f7a7ec28a1365d3c43b457cc5dfc4afb4a48078df766
 EBUILD aufs4-0_pre20171002.ebuild 5071 SHA256 ed7e87358df79e9f7a4188ccdb06893749c69977bc9590c828191528268885b5 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca WHIRLPOOL 48837d62faf6b2d185e760584defb55c48e38f983117a3c8b42eb299c527602a6b78988ed92e72754cd1ad862bc64497840967aea7030da65b5aed54b3055c59
+EBUILD aufs4-0_pre20171106.ebuild 5071 SHA256 ed7e87358df79e9f7a4188ccdb06893749c69977bc9590c828191528268885b5 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca WHIRLPOOL 48837d62faf6b2d185e760584defb55c48e38f983117a3c8b42eb299c527602a6b78988ed92e72754cd1ad862bc64497840967aea7030da65b5aed54b3055c59
 MISC ChangeLog 7679 SHA256 a26f1f94bebd38395c6162e8e45f03aa9e41dfe9147ff1ea8c5c00161f90401a SHA512 06a64b896f1ae97b05a96f29f05e82887b2968e646561a09291fbd1e83dce2bceca3b0ff9caddf1ae109d356d518dfd1ebdf7cf6cbb054a9722492f819066ce9 WHIRLPOOL 07dd85072931199d69207bb2b2fcfc6bb06f3d00511f7090bcdeb95ec5ca78406c81e0b1ea4c7f159ad505dde8149199c260bce3eab2e3ea65e3c209f6e46e96
 MISC ChangeLog-2015 1365 SHA256 e771df45ce7333a94ae23d05016f2644530233f1385683dd1cc1905cf67ec602 SHA512 84886306c5ffa5fac414d73e19ef31fa68e393e4fd449be0cca9b13af2fed37d3517b3ce486ea2b7b95d9de91ead61f66309d380b4626d552178520f8df7a0de WHIRLPOOL ec795a56aa3551a77c2c0ebc8ea526ed6c5ad1556a8246d38de993a806cae4a5c9512170992a500372474ea66bee7c92921c28808e1264d4aa8ab09145cbbbf5
 MISC metadata.xml 809 SHA256 36364d972f838e36cbf1cb5b5857077cac43ba9a05ae57be7aa9050af93b1e25 SHA512 043c012f55866721363c82fd80007c4ed8420fd8eec95459aac9fb913d855a0be5f135035ba5e3fcab668641ca61897d71ea8e48c1d45f171d418c812620d576 WHIRLPOOL 4ce31dd2931da5af1ae06aa0cce080196e9500ee7cf1760c93e0fa8445a84a6ea10a76b40ac0027b75e73f9507f5a7966636f1bf619e04d04fd31956bdd484ee
diff --git a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild b/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
new file mode 100644
index 000000000000..2f61f36acc1d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 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=14
+# 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/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index a83ec296b21e..6833b1ff8b5d 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -2,8 +2,10 @@ AUX f2fs-tools-1.6.1-sysmacros.patch 1555 SHA256 f3a2364f7263092a6d7e0875738a4cb
 AUX f2fs-tools-1.8.0-sysmacros.patch 324 SHA256 0708ae4d53f3e295d297cc29b509847179f2012490a9356b262bbe352af72f33 SHA512 15e2e79c34efe001c08d059ad4f6a01e7f066b6e8e2466e8d3c6423f8c59a90582cb345ce62cbc340bd0aac2eff6f21113d2cc8b88135e828f36ce5b08b4b6d2 WHIRLPOOL 60eb824bfee4a1bb32a11c5f09512a4fd0da85b19da74655780356717ee61a768b13cfac63dd8057e2a71af77dce19f4dc781cf6aad0f769ab615f858c3bb8c7
 DIST f2fs-tools-1.6.1.tar.xz 282152 SHA256 1c2f9ab663d26c939924ad6bbcfbacf676bec1f6dbae8f9ef5362ade4b03d885 SHA512 108327042079d9e864899a20f2dd94019be1b957fd7ffa295af097c5b93a5065ea9c36de9bae83f84a6412ac496340849fc44de041e24461a2919073eed15cf2 WHIRLPOOL b5659154da6e48138b4f49481a68b25c95ba2461971609b4cb0399d173a7c0e5b0203baccd8da2adc7a8c2d7b078620649aea9ee57739498452a8b946fb43836
 DIST f2fs-tools-1.8.0.tar.xz 301108 SHA256 0d9b00d9e873da4508bb297c7a5ef46050af350deb21b32898c16ed5164bb6a4 SHA512 aff27e1113cc3034194e496883570143bd6a3cc7cc077e868255052298a401cc36c423579b4e695fe3e480d770ae05f9d14d9bb4bbc0311bdd5e23e37950a27f WHIRLPOOL 4a7ae8533e4a02bd9d1ee09461c7bd30e8ef8d47bcc4e7adfe631eb14c2231fb0db9a253eeca7d0437296ad65abd446ab2249bc48ccc07b89f923d078d17e4dc
+DIST f2fs-tools-1.9.0.tar.xz 337676 SHA256 04a655ce471f3ee1f62a72e4d9213f563b2ab0c60e7469765be5b9a965c6950a SHA512 aa76d4bf595b3d17607846f2531327f2c26c8724b4fdb2572074e028965c2300fcd880d57246f5c15d8dd4b9ae62fc93552edecdd504d7313fca5839590f16e5 WHIRLPOOL 8568fc6790ea6e4cf5e83ab13093c995de29408501a8ceb035408c51c6693a9d300082e413d63536120a760120ec03d352eb90e8bb6b44077af2fa6e7e31d86d
 EBUILD f2fs-tools-1.6.1.ebuild 737 SHA256 159d1de76701b2595902fe6454be263a62759d9c0f716d65a67dd131d1652b4f SHA512 a303cc13d4fee5657d93008d9d189dfcfed920bc80e6f4e383d751e29f83745659ee23d8917abddc733a1f2ed66d991c8b9a10aa93ac2134e7e164899a789d22 WHIRLPOOL 83403bcb6761d0a99a7ab6f67751d4ca5eeb4824d2632fb114b50c02aeb248b7eeac1353259032d4be2646c31c6cb627fd1ef7d246820644ffccd7f48e5569a3
 EBUILD f2fs-tools-1.8.0.ebuild 782 SHA256 7f3e599c0cbd29c1faa08054acc6c2dddbe21ff31be085bddac3763285f5a815 SHA512 96814eda2864cad7b00f213e2482f962f08df61d8c7f9af4bbe4a6946735c7680df83ff3729b42d4441caf39b8f32d1490f53a7a4c26c7d36ae5a18dfad55976 WHIRLPOOL 55c2f166fd284e6eb3e0e81966910f4e4563b6a84218f5e6a20d10db5b24d9e202053c349a51a490913d449d7d1386eca32107f254996853a3ca8e049a969f3d
+EBUILD f2fs-tools-1.9.0.ebuild 725 SHA256 37c7dab535a16787765cd61243ba78b4d291f861768484bbdb0c8400165c4eaa SHA512 3786197a4de850e6f385acda8af06a65a7ece57f27cf298fa222ed32b6f52cca4a75948c8e3242d39fb34458bb859939a50017f2efe7a9b87fe0bdc32901550f WHIRLPOOL fdeb6ceda54b1c1122fe54cf85175ddbcda7cdffd23d44239d8f9663e28549142777bdae806a5b7d50517c61694867ca1096c48b4c818a004650cad92fc4df01
 MISC ChangeLog 6266 SHA256 bf037f748f30266d2e742cd2d1634ec41fdecee34868fc5b4e5d8bc62d486236 SHA512 17e24d18affc402c8f72855420e9fca2c2f81552080326cfff37300e6f6ec9fea9afc1016f1e8f421b17664e9d74c1a53899be25da4f10cc33e30fc86c9e69c8 WHIRLPOOL 570631a6333514bd1c56b74827e643536b6e3211fa22ef945dd2eedc5d9bbccb3bc9debddafe0d82a37b7e047dbbf72601f473a0d57819087464da297ac687f4
 MISC ChangeLog-2015 2185 SHA256 92643ab7dc9878e3a0f4dbcc61085f9bfbc629f34f1c7a7f10b62d344dc6a49f SHA512 5a2dc01cbb3ca1ae1e81b0978954975b220d015b4fca39b30f15f9afb02bbab6d825153a4ef191cd9a36b9fbf0b0624c413e5e57308bef5fc6f3bf9329e5b4c1 WHIRLPOOL 38dab2fd45ca4208f9c7f945103a715e2601613597e8242d3d015905b3f19088da4a12d7d72c7769cd79581cdb0b437ebcb3fc24c1d75dbb457d6d2284ef662b
 MISC metadata.xml 332 SHA256 4e1cb81c66b944bba224c9aac140df609f7b7639c2b19ba62476ce37f559caf6 SHA512 bc1094f4316330324f30e1fc02c2ec4c4ac3a4201b3d6203dc24845bcbcd194a2c762b39399aef2f42d9df0064ca75c84495e49832b8fd02038bfba7a177ac7b WHIRLPOOL 23696f69ba884991eb2bdccb5021fefc384fe506827a83bbc8626ab6b5055b0a3a505e163cdd1c3246abc9e7b3e2ab2def71a8f5b81d4192b09c7e89eed603a4
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.9.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.9.0.ebuild
new file mode 100644
index 000000000000..ed0af30bce68
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.9.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	sys-apps/util-linux
+	selinux? ( sys-libs/libselinux )"
+DEPEND="$RDEPEND"
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 206875ada134..093f63b9e335 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -13,7 +13,7 @@ DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e
 EBUILD squashfs-tools-3.2_p2.ebuild 953 SHA256 378ed13f72b193ae57f6e7dfa73e0497dd2dd576e2f02d6bb1d4065a32d75487 SHA512 989198cdeb688add1cd826743ab55b7ff33f0de87bf8338e4d6d14882dc79452ebf54fc393a41365e10efa22da1e0e0643f2ea50f4c4fabc8ab969517845f129 WHIRLPOOL e08b0d35c663be1e1bce2e583422549e53c13a731b25c2b41e0293d60a4e69434abd96f6189331da27947853aedb58006d959f76323ae47a5dccd1aa2fb05576
 EBUILD squashfs-tools-3.4.ebuild 937 SHA256 cc5393a6ac2d6563388f851b5d8960f4406df92193f3c22a1ed869a19e417937 SHA512 ea53dbc7607757087c89d6ce7e1396b0ffaa462534bfaadc13e4400172d242c5089c85d722f4b52e26c35cfeb328c9d2495f9d826e2fdcd24135934de55f924b WHIRLPOOL d18c907a2bf4bb378635dc1b8f8d028fc4e90bb9068c3a9ecc018ae9bf71cddb19fae343092c668594d3b8e5fc1383983d15c926e2717976f4849723762f11fd
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 SHA256 79a5da851793eba5b94a5b9bc5dc87f2b430e25659ff3cbabf3115079c23be7d SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec WHIRLPOOL 40caa4996831fd8c3711e16b8adc7a548dd5b7ab4c1c4d71042034949bed640aad1976be9f5ee0943d9768a65385c04183c68318237463861885814dd0956e96
-EBUILD squashfs-tools-9999.ebuild 1649 SHA256 39a6b5ef9618b67ffccf0ec3ce56b0c497ada8269fd70b891da03abf6d1fefaf SHA512 0535d76acba1893795b029dd8f0315fa5d1a96ff5048bffa9cac18a221b3204abcc2173e5ab26e8fad427824bee1aebfedef2d40f1cd8cf3a26c0b9a30972628 WHIRLPOOL 246c8c30868c05566649c9eb818891f6a067161e87ecbc462f4833f5498e81f1cc50800f03f7cc82d67ec89c206d32b7cf0cc29cb7cc3a51a52a4066214ddd55
+EBUILD squashfs-tools-9999.ebuild 1694 SHA256 fcb4ad716933e8a67cf2d16889b0b5797f1a505ced3c2afc54ce8fc28b0d55cf SHA512 b364a908e175482bb48ce6106d706b766aee3d3953e2fffa03b0a83b5ca3098d92e79e2034f31e120b856b99f9d3e1bd98cb50114a50f8cb2cb3502e080e6c10 WHIRLPOOL 2c53ea0741c4aab801c74afe14039c716b5740ce99753f3ba6733cb01f2b49567c3997c063fedce69cc356b6963e60e534c22335f7a3ecbf80bc1999d2016c39
 MISC ChangeLog 4948 SHA256 048b1ddb2aef544d992020d83546b567bd89ccdbc92b902e6b993a80e60d115f SHA512 6baf9d18b382033117f4a7ca46dfd9196af0c3b6b60d7b3b4073d6aecadacddd2816631fbab7f3ee308abf768fc2e6d5e82ffa4f9517e8c69344c106aff36bee WHIRLPOOL b8ec6c9c0a646c4c5ce8b30080d38168f50c0a7da1fb0c7567efb2eb8e869be6547574d3f24da2d87d5f805bcaaad2ebb75940fe3099f4c19b4f5040692f9be6
 MISC ChangeLog-2015 18760 SHA256 a731f71798d4dcbb59b9001f81a73064961bc450ba3f4e6de3fb790112eaf571 SHA512 58d3ee1c7ed0327c87d8bec39fcb309095adc8c500aa919c74cb461d13e9e745e632fc07207109dbab677ab4ac1862cbe1ec08af74f98cafc92d2a26e9d931be WHIRLPOOL 8188d57e0e1c6b6dcfd5be583571e38ea9db21ded8bb60355e60a2ed8eb34debc72cfaa79fa122e787085ded69a64567269e9ded619d63fdc36852f6b61ff110
-MISC metadata.xml 559 SHA256 5813dae0eff3bfed9a7a40ac785726804d493f175479c1cc10ee3ea566b6eb2d SHA512 2318c516e5e76a6c802563d1e1bf60273dbfd6a6cf0944a41e5287f0c85f1b73761ba050599dfb3b2c86a53da01fc752bb4c74397c404c4ff68eb73dfedf2572 WHIRLPOOL 763a763428e1ca87f7fc653cc7984a88bac9ffb256464e7fe2258f901ab4283819998c560197aa1e558e17a3b3c4bdb480a2b9df696efadd81c4cd00a47cfade
+MISC metadata.xml 619 SHA256 c3a99ca9c19501c93537f0336e30f690d602c25f0e61b0fd265f25d6459ed472 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9 WHIRLPOOL d0eb98de765f228a9843e6ea58ca315e96010e351b550a7768cdea64a4c56d9c014987bc13535a0cf129d5552a82a31d80f96a27c28b2b91ddd0ce05240acafa
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 9edcb3d56b8b..4a5bc2d698e3 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>livecd@gentoo.org</email>
-    <name>Gentoo LiveCD Project</name>
-  </maintainer>
-  <use>
-    <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-    <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">squashfs</remote-id>
-  </upstream>
+<maintainer type="project">
+<email>livecd@gentoo.org</email>
+<name>Gentoo LiveCD Project</name>
+</maintainer>
+<use>
+<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
+<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
+<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
+</use>
+<upstream>
+<remote-id type="sourceforge">squashfs</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index b2c2c5a39252..c06d73d05088 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,23 +16,28 @@ EGIT_REPO_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug lz4 lzma lzo static xattr +xz"
+IUSE="debug lz4 lzma lzo static xattr +xz zstd"
 
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]
+LIB_DEPEND="
+	sys-libs/zlib[static-libs(+)]
 	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
 	lz4? ( app-arch/lz4[static-libs(+)] )
 	lzma? ( app-arch/xz-utils[static-libs(+)] )
 	lzo? ( dev-libs/lzo[static-libs(+)] )
 	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
+	xz? ( app-arch/xz-utils[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
 	"${FILESDIR}"/${PN}-4.3-aligned-data.patch
-	"${FILESDIR}"/${PN}-4.3-xattrs.patch
 )
 
 use10() { usex $1 1 0 ; }
@@ -42,11 +47,12 @@ src_configure() {
 
 	# set up make command line variables in EMAKE_SQUASHFS_CONF
 	EMAKE_SQUASHFS_CONF=(
+		LZ4_SUPPORT=$(use10 lz4)
 		LZMA_XZ_SUPPORT=$(use10 lzma)
 		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
 		XATTR_SUPPORT=$(use10 xattr)
 		XZ_SUPPORT=$(use10 xz)
+		ZSTD_SUPPORT=$(use10 zstd)
 	)
 
 	tc-export CC
diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest
index 69c6a6706eff..0c7c15f8ed98 100644
--- a/sys-fs/tmsu/Manifest
+++ b/sys-fs/tmsu/Manifest
@@ -1,3 +1,5 @@
 DIST tmsu-0.6.1.tar.gz 92874 SHA256 00483d9ca12cb868e9587207556a8293bd43ee5a2993a6fe9f0c93edef918a7f SHA512 53bc9d880f9138e9d88b25a151f72a5a3110418002c2a1a6101d2794c0b6fd854ebd52e589f3b1ffa18f1b5c2f2298550246fc6cb1bfebbfd0131692c2fa5512 WHIRLPOOL 3f5de7d6935464b2bef84408146e2458048e51fbfd63a88055ba560c738c4d24fade4484be44729187d06a5a2af407d4fd7c7fbb1b24731f8a78b743825f05a7
+DIST tmsu-0.7.0.tar.gz 98108 SHA256 758cc9776244d3e2e164d9779d0c1ec3a02a624ab52e1f13023f0084f5521a84 SHA512 c3f719f4962291a9701d2438381aeb65ea470b896ab6acf5a0871b1984bbb2758380a73ddc94c2b37ea2a45477fb66eb1a2afcae3f1e7ca3e469913f7562bd66 WHIRLPOOL 2ef383ee32bd2a3bdcb80ba0b11d6fa91d72020cb7328995b9f50c4fbcfa7f523323d2efcb261557ade50293757fa828934321cf5e5b9b452b788d80fe0920ec
 EBUILD tmsu-0.6.1.ebuild 802 SHA256 eb679b97acde66a1989fd78920f205da175ad3c282c47af4eeec7c7982f170e7 SHA512 04ce11db2184fb4bba4f4e37358e77f5a352010bb05c81270edd22a6e880a5bbb8a022a28b8c167e846146f88706fdc98fca836c9c663ff5170bb0b5de748cd8 WHIRLPOOL 9509c3df9b9d69d015d949cbb1510cb2274b709ec5f4f9d77b68013e5e2f5e69aaf0e23a19f1fcf4e1f1070925ab688787628327f88120e003cc2e82ba258e97
+EBUILD tmsu-0.7.0.ebuild 802 SHA256 eb679b97acde66a1989fd78920f205da175ad3c282c47af4eeec7c7982f170e7 SHA512 04ce11db2184fb4bba4f4e37358e77f5a352010bb05c81270edd22a6e880a5bbb8a022a28b8c167e846146f88706fdc98fca836c9c663ff5170bb0b5de748cd8 WHIRLPOOL 9509c3df9b9d69d015d949cbb1510cb2274b709ec5f4f9d77b68013e5e2f5e69aaf0e23a19f1fcf4e1f1070925ab688787628327f88120e003cc2e82ba258e97
 MISC metadata.xml 694 SHA256 c2cc2025353c0646d6552bc65ba4dfbc0acacf28822262b8c9d5f22748a0d13a SHA512 78e596dce79201090c19568ea1a36badb92b26420114a319f062c02465f4410e26e8811203fb723bb740ad5c20e0563a83ec5b646c407b5201ca622902bcf856 WHIRLPOOL c5296c12b20d2efce7faaa509322b9569935fbd2800b017ef9064ae1320fbe90ccf9319b6f3622ea58bbd7c44f2ba4f0c21a20df7a4983eeb706ec42cead33c0
diff --git a/sys-fs/tmsu/tmsu-0.7.0.ebuild b/sys-fs/tmsu/tmsu-0.7.0.ebuild
new file mode 100644
index 000000000000..d37b33711282
--- /dev/null
+++ b/sys-fs/tmsu/tmsu-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_PN="github.com/oniony/TMSU/"
+DESCRIPTION="Files tagger and virtual tag-based filesystem"
+HOMEPAGE="https://github.com/oniony/TMSU/wiki"
+SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test zsh-completion"
+
+RDEPEND="
+	zsh-completion? ( app-shells/zsh )
+"
+DEPEND="
+	dev-go/go-sqlite3
+	dev-lang/go
+	dev-libs/go-fuse
+"
+
+src_unpack() {
+	default
+	mv TMSU-${PV} ${P} || die "Failed to move sorce directory."
+}
+
+src_install() {
+	dobin misc/bin/*
+	doman misc/man/tmsu.*
+	newbin TMSU tmsu
+
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/zsh/_tmsu
+	fi
+}