sys-fs/aufs3: Bump to latest aufs3

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 183 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 931b63d5d610..d3bc59fc8c44 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.81 2014/01/13 07:16:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.82 2014/01/20 07:28:36 jlec Exp $
+
+*aufs3-3_p20140119 (20 Jan 2014)
+
+  20 Jan 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140119.ebuild:
+  Bump to latest aufs3
 
 *aufs3-3_p20140114 (13 Jan 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index d292041e1b3f..1f2bb184120a 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -9,28 +9,30 @@ DIST aufs3-standalone-3_p20131104.tar.xz 2073160 SHA256 2a55ece940e4f949482879b7
 DIST aufs3-standalone-3_p20131111.tar.xz 1610788 SHA256 5ea5b080fa8b68f4921fc9fc9247e456c3740321445e5d455ac1eb00454a6d7f SHA512 bf3b35a30164a4f5856db7a66c898e7e3491a5dab05252207fc402b9ef9a946be4cd6fe71370c52c1bc5168653c7323f3ce039f062d9da7f01a84a1ef33c7475 WHIRLPOOL 364b732719d24139eb450275ef9819b58dd8e3fa8bbbc0cd4e4ca5cee5d9beb622931233022f70621887c245dde2d4b879067c68ba8910fdfd8c4fc2f43c1037
 DIST aufs3-standalone-3_p20131223.tar.xz 1612628 SHA256 62872509098ccf57056a1045cd75c83cd25b7f517da8222cb4abf174e6f923af SHA512 28f0490f4c87de07e77208003f511c7e8f7af8a59e4660f6229ed459fa5c2db9c56bcb15d9ae8291106b0b565ec6a8296ddb804799f02c0876d314eae229d28e WHIRLPOOL 66e70e6c8f3212b771062ef48be20db28769adcc846ccdee49c12787e77ae31955586509bb88cf98dc16c1e257e3aebe04e462e039c3a768f3911bd08d72701f
 DIST aufs3-standalone-3_p20140114.tar.xz 1995600 SHA256 0010f7ccfcc8c79cd8a708ee56d8619daecf4a692a2226c62f2c6b6855288ab3 SHA512 ff3ea064a2ffdc80f13e3c561ad87f3d396b5636c14dcf42bb584b8f9680e43bd3158829958052954d7de7abf178ee628575c4fb949f0b67d89a6426386720a9 WHIRLPOOL 09bbb6921d2f22bd314d5737809bfb78cc87a13cc76888faa4b6da44f59c16f9202acd1eab1d461a08bdb5d036271dfb1de80fea7ed0b64b655d9513ffdf5209
+DIST aufs3-standalone-3_p20140119.tar.xz 1655840 SHA256 c7c25614455edf72c3eb516cfc3311becedcc24cd0ddbfe442e86938f4943589 SHA512 169ec3129a4e24cbe9293852906d172835942910f5bcbefd35a66669d23a2d0dc5bb59ee432f77ca76ced0b29c84ff814577fa86a1ccc0b27a2d96b2b81963b6 WHIRLPOOL 74ee3fddfd1bb2bd47fae61229bb53d90bd2f602feff0936eec652423aa2cc3b10febd8df10bef073d6f3d45d599516548f43d7b794d26427fbd2a9e26c2e482
 EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
 EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
 EBUILD aufs3-3_p20131104-r1.ebuild 4812 SHA256 5264e3ddaed1ed9547215e3e7f6b459c2f261980ae60900ca5d0f57a49e1a5a8 SHA512 0f826d4d200a4cb5074a5274b5d20f5e56edfbb19cefa812cbb68436af25ae2744c559a3adadf06910e6e983ec079b66ed072ad8124b28a958b92d8466ad1619 WHIRLPOOL 8e8d3ab45dc8c0532c140f9becbdd4dcd00d5c8ef0fa07af9c7c5d8f2624cb529ed9b2d39b98791af223dd35e98e22aef83ffbdb90a10b2fdd4c46df6448c3e5
 EBUILD aufs3-3_p20131111-r1.ebuild 4900 SHA256 65ec0f45707a05b26a7312224a795cf2db4c13817eb57a79d0241d2b1e075963 SHA512 d5b3ca6385b5f700c159595168b27632f7ea6c0852f815ab1148b7a4cca0d7a8fe30527a343bbfe3a155444c16b69c9a8ade486e843795ca7061c776e86a6915 WHIRLPOOL 496ee7abc8f34c5fd4ba979e85d8e998be9ca870f5a46b09ab9453f1646254ba4222b5e4e86a8ef1620255707429c73e89076a74efa5f833746837ec07b08413
 EBUILD aufs3-3_p20131223.ebuild 4846 SHA256 4f03951751c036891be9c405d7c09b4ac75ca74e450a41be81fcd155a4269a61 SHA512 4d8a36623eeada50b2c55b3e516a9e9ee6d7ec522eeb7d10e3acd2547f3d0d0da2e1cf9d1e106651d0c02e0689bfbf2fefb68c4c84a257cabfd87f35c056aed7 WHIRLPOOL 9f80628bdb174c989374428011d69bea0ea6007c50a846d2eeaba4cbfeb26006990f28013a6f35a9abd325be4f18b50fa59ef6fed510bce053e30ee852eef1db
 EBUILD aufs3-3_p20140114.ebuild 4846 SHA256 e2d4e80f6414f96c7a9d08c7293a04d06ce0b039e31574817339e1438239caf2 SHA512 54a60ac7f7e1320dffc2af1beed3f5bde72d14c58cf478569ed72b3f95a89a428fb0cb07e261df17dd9ef8f427c2184f2d10f5cccad2e6de20c9d62984158c4f WHIRLPOOL b00c4effb4e2729849949ec0828e1dbea326b9aff19ad0eef8d4c0ac807b36f31bdbcb74dd1939c3220137a8d398efb83b5d703b009cfb4e08f8e765f85e7a0f
-MISC ChangeLog 21783 SHA256 d40affe66f9cd9f0288f4c0bf82d045532a7b87d377d69dfb450553797220ac6 SHA512 edca1dbe5ccf04c406912973a674302bcc5861c68af35bea79a38d35b5c8a92b81bf8a1c0caca9843b6ffd60964092d43ec13f2c591f10c548f5851afff53457 WHIRLPOOL 8e092d51423bce00b2329e4e92532c94fef16b5fd2d6c55e02d50b1b35f2fa72e9fcb49cb1cf675efcc305b4c5910eba4da36051823297becdf373d22f85aa4c
+EBUILD aufs3-3_p20140119.ebuild 4948 SHA256 e199eda18aaa6d800b7ed565ee7b81626cb775085961da717db516e13af26931 SHA512 e7d0ffcc905c6582de3195b802710e14117b20dcc88f176a9a5e4675cb2f4c381e4cc3b616e4232753b2a3222a339c9fbb7f5a9e26d6730e15ecf8169d1659b9 WHIRLPOOL 18b4584e8565242c1dc2ca92c018c21580d11faae110666aa38a48c646989abd5f19cb18a29a20dc4efde9a90b85381291afa79776002d6902ba9e8d8ddef67b
+MISC ChangeLog 21915 SHA256 a034f2c3894536aa6e55d1a050602b06c2e2697c2eeb2f45555c9ed074647414 SHA512 bdd0e5aa7920edb9934a763aebb5551b9b2a6d15f0277aefb866122ec44efee39a9c47bff15795d79b03e96e54acb900795370faf02c89c2a90fb218fa080826 WHIRLPOOL 35219e45ea097f913ab98a26fc6112e306fe7fdf9774951d5ee9ddd6b1dde71c37f914dfd80d033cfa9e7f35bc90eaab64982a388c42884cc8c2bd4d961b360c
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS05LqAAoJELnU8jG9FVirCQ8P+gMUwdL15tkn8pZThtcOrq8/
-w5jrzQIQ52RNknO9MENmaCRaHXqYFhUjKZUrHg8J61uivPz74Ygf2ApQUgVVH9EY
-phPKkTJsHbMRAwuAAyriL9QpWG+9fZvo6eeIOLE+EkPGPTgQoecj65qok65m0R9Y
-I4vqSkFG4UeoYgyivsaFZu8Aqnh/npCwEpAPBLVchCgivBKqbD3RObTiCNaAduDT
-4F5zgPAIgTA8S24o11xqou1MFOT5DNJEGrmF6BWbzeFlzcu51E8BX+7ZNPlSga2T
-NKUy33Uh+u4B3sZvEiLVSLBvWlmJmQbmhcQz91s28wBg26Bp3JKJTJ1CtIgs+f5/
-YvCBs79mnnOwnAnt9bP46YMT295/Prnfv/whv66NTPjnJZHwm1qj9dEnNfMpabMA
-aEE9ojFhdC7QPtWVY7JyWtnnHA1t+N41/8ICywfqF/z5uwFBtr848bC0OcaaBWtM
-a5rhlfQnpS39kQ2g9OEQQj2ZnXE4pLqdzPJqx+WrFg+/kaWyD+Hllw9zybfBKt1a
-IcauH/t8bq6fKnLRzrVVDmKtsJeHq4TfNb/Zfo7YS4snBrIO7m/Yz+P30IWpk/UY
-v2C9AxUkqpCK8lIzk9JLw7r4takiwKbdcXZGBENUseU6q445BHhz/Q7DZvsJGZaw
-HVurw0lUQOmt/jvdl0F/
-=UMnH
+iQIcBAEBCgAGBQJS3NAjAAoJELnU8jG9FVirr5YP/irjMBh0+2uq1KCHt5o3VBrV
+W8kmKiFjJp52+O2nTH/+2gWJHEUf9KTTj30B1ILqFL24ors524aUju69pqQM8ZMG
+n7E/8LKKRal4JAX08K3OOqHEBx5qGVGf1ZJX3/yT+lsiX/xh6re5mgmt0WOafXyh
+Lc8ZnqRwz+cI/uuTCKzWMczGlT0W4RCN+4M9pcC03BA1yUY9y0ByldIOGxI0wIhP
+kkH3uTQQX2dAUW8ohXVIaRBe6TFXED0CVA77R+X3yoi/43tu+X8w1gxptvlbTcMU
+B1DSskI5sfBMZih6E2UKbnYBqraPEtnoiG1+thnXYRhpswe7miLnJpTp6yM+dzHw
++6UHMV3khlwqFY3+RbCEAq6ATzQtiswVNOW+POO3quBZPQ4NLAUF4nNBPF9H93te
+GhTSETaLiJtpvffSdZCNPgzVjDEu3ALp6NfxN8rxSoVXQzlZCflrxQztbqEQx5FR
+YubJ6ylc4+i2QKz2716CiJVdmg4zDgf6s6p1gV4ha4SXeu8E2NJMPMS/cIOUZp97
+IjiQtkDykLUmfJ73b8WHUvR5F/CNqNeylhhRYgsXxd7B6LESzVfrTkjtHKJsLxJj
+fRLy7wor6yG7I7ils5vguqRheI9ZznRoLrbuHR2N+LG5klGdJTV+ufdgrhVrClhH
+9RYtZbF5IxoR8i9l8fkJ
+=DB6g
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140119.ebuild b/sys-fs/aufs3/aufs3-3_p20140119.ebuild
new file mode 100644
index 000000000000..dff318554abc
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140119.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140119.ebuild,v 1.1 2014/01/20 07:28:36 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=12
+# highest supported version
+KERN_MAX_VER=13
+# lowest supported version
+KERN_MIN_VER=10
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-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"
+
+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 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${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}" == "10" ]] || [[ "${KV_MINOR}" == "12" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${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
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+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
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}