gentoo resync : 21.10.2017

2 files changed, 186 insertions, 0 deletions

diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 099bbae357a2..77819ab7f35a 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -10,6 +10,7 @@ DIST aufs4-standalone-0_pre20170130.tar.xz 1761280 SHA256 ea854a64dabfb6b2d6c6be
 DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 SHA256 96dcb9d94d1d2358a61e9d5cdfb9c9e6e4886018f5d24a76ab8deb7e03b7f04f SHA512 c68cf12573a0f3d9ec9419c63759d2b6f120eaafbbc005553c31d9c07b77d61612b903dc7ebdb2a8de8a52ded62e20b08cd32206b3cd3df196f0c1da82d472f7 WHIRLPOOL a2a3f10d003999a9498978a7b0d013cf918070cad975bfe54429d158d980943864fd810178a0639925d54c33974d13fa782950c77756469c646ebc57ddd6f917
 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
 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
@@ -20,6 +21,7 @@ EBUILD aufs4-0_pre20170130.ebuild 5070 SHA256 b215cd1740df75261ba15d56d297005f7c
 EBUILD aufs4-0_pre20170220.ebuild 5070 SHA256 b215cd1740df75261ba15d56d297005f7c6f83e480c8389359e518cea9dd291c SHA512 756b514a6d2d86692e872a2e513f95ae9b0387b44d1ffdd506eb9c698eef74b601de45d24dd02e75610aa8e6fbef91bd44c10b34c006a3cdad17b74b8d17a5b5 WHIRLPOOL b775cef39ec8119bbb5b82f77227b8f35d91c9b29743f8e41ed66d3a1277027362dd6ba289ed3b863609ac49965e2b12e1a9bae12643c1dc7daa4c473fa8cfe9
 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
 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_pre20171002.ebuild b/sys-fs/aufs4/aufs4-0_pre20171002.ebuild
new file mode 100644
index 000000000000..2f61f36acc1d
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20171002.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
+}