sys-fs/aufs3: Bump to latest aufs3

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

3 files changed, 160 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index facdf565eead..f551e2175549 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.68 2013/09/28 09:20:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.69 2013/10/08 11:50:02 jlec Exp $
+
+*aufs3-3_p20131007 (08 Oct 2013)
+
+  08 Oct 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20131007.ebuild:
+  Bump to latest aufs3
 
 *aufs3-3_p20130928 (28 Sep 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 2ce7fafc8b23..ddb44324d90e 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -11,6 +11,7 @@ DIST aufs3-standalone-3_p20130812.tar.xz 1517136 SHA256 985e7e5578567d6b8c64f2c8
 DIST aufs3-standalone-3_p20130821.tar.xz 1656216 SHA256 5826558e703f8636765d17f69cb7e69d755c4dd48d8c8aa290f33f836e9d46f9 SHA512 24fb360106f2e6be8d1a4dd40f4b6e15a75c22cacfda346270f51e2163f9f830ad5181945628ca85dcb57471d909572e3e9512c115cbcccc93a9aa054be741f6 WHIRLPOOL c6675f5ed55e75a40a07fddb61e8ca3d05a47b3be4a2c08d698fcf400c0148fae0581b0e67d6c99d06ad035618860c3400860ca20ec961d7657b1b7f431152f8
 DIST aufs3-standalone-3_p20130915.tar.xz 1900020 SHA256 8f6ea717e7ced211c909a329c73c639afdec8cd67094e649d6e72c4833a8a5aa SHA512 798fa5ae0b368052de638a5900ac9343fffde58d455b4e4f8dd75e8e82d571acff1fe5e854acb9c31f49001431484e6ba993003edbf1462ec33c39fbbac93f97 WHIRLPOOL fb7588c3fe06cf48f878ef5017782b8392ccc7628b667b5e662a552132f7aa43f32819a2ecae2d0b90c1bec43d19b193faa69081bf61084be789bb7e24d2c317
 DIST aufs3-standalone-3_p20130928.tar.xz 1971792 SHA256 3b7aa4a0ee7e733ed25b6b28f6d45440224706e432986e6c3d6770a01f95731b SHA512 d560bc191d733714889cd7a7d8a001fd9e022fb29752e43e64368f2b4622f69799d2b5aca1dce372a42d9d67b2c38ebcf9143dc7e809f20f34b14f0751401262 WHIRLPOOL d4bac5548e8562a3b93a25278690309095d6c5b32fab396b55dc07ca0855dfdd76c5eef521619563d68f6c8c0bcbbb54bd07d33ad0fc932fe146afcf9739825b
+DIST aufs3-standalone-3_p20131007.tar.xz 1953352 SHA256 3916a1c34a604a688e92a3c1d58d83e712fbb89748c4f4d0cdce591a22ab1cfc SHA512 e304e1be74553c4160a7db5695e680b50becee061fd7809318468d3aebfa442a75468bc36add14058bcf765b8fa77b88631c17cb7c4997f3ad8a7ca556cc450d WHIRLPOOL b2d04bdd7b03e400589fe906616c9c894eddf21ba10c1029982a26c5e5b10169b9002aeaca3a3fe1a301edb1b8d392e6f3d4a79815f45a3b2b0802e4a31298fa
 EBUILD aufs3-3_p20130506.ebuild 4138 SHA256 527e3e85b96cb8a2928300298ca5d95a39ac8dea43bc56a43aafa823635ebbee SHA512 54eda09ac029e38801388fdb046337e1aacb4bc7d8cd5a2566abb1e2e5e5e484330aab9d2ceaa1824923a9a31ebf553be5d4a3a9582bedcafacc0de079fc327d WHIRLPOOL 0dc37640db64606b1921dcd9c8151d77660cc9e481e03bab3b2a113ad149a0fa135423ba9dbf1bdf600aa3bc817b08bf1ddf008dab6de0443f01708b6eaf81e8
 EBUILD aufs3-3_p20130519.ebuild 4138 SHA256 e1831fd4163a0b6de71d6bbc02145525ee46706b62fb0372595eb78d0a166136 SHA512 da4243d308842332d92b830aa8329f249c33c68f868af2f9f60ba14e35c8636ebf8e3d3630762f198ce9141c842f2d120697fb10ff3e024a7effe78919ecdb7d WHIRLPOOL d019c7c51bffe51f2b0542098da795277c6cf90af9c690af0e9ae27f6484fcbc76601c08e5a81e5792b23d3eb21d3457c4bcf09cdc15d1a63bc3ed450690f7a7
 EBUILD aufs3-3_p20130708.ebuild 4142 SHA256 b1f17d53de2e4b6c394c3e636110fde01d2210c4e05b70523c81042752578deb SHA512 8ca0f3cde8557f9a40a4e04f7cac9e6968a4d2d8fd73a74cf0d36d82000df8c21211ad81b4242cf1c4a2f91ee3b3d5d3b9c3e38a2218a0466451802b17d90970 WHIRLPOOL 5406b9e2032019cc8f01c2c95acc886e28b46f1b499f499cdfb29c241483ac094069bed654e9da02440fe29a681ea6f5efda389a678556782156aef44430cfd2
@@ -20,22 +21,23 @@ EBUILD aufs3-3_p20130812.ebuild 4142 SHA256 a13696d88aac3950a3f77b2a38bda6e527ab
 EBUILD aufs3-3_p20130821.ebuild 4142 SHA256 139301c062c0f119193e97175d56772fbac4b12bf90f686fc1340326d52f4f0b SHA512 1baebe9a034e52a23eec889174c5fd9b763a2d4505aa5dd7bca43d4b5e8c18f047c7e37727c2cc093a7e1c6c09c60437937bdcad010a9a2e578988f4556d150a WHIRLPOOL 24d6233d74a51daf57bc6eaa61aefb100a9c1392c1aa74c4f93695892b47de1114aa2b57c3ccaf65a37b1dcb51ac10193df33309e3133d418a9a327aea1845a2
 EBUILD aufs3-3_p20130915.ebuild 4142 SHA256 7f23d06cd81d9ef70e821cbbbafa17d51a08c1f981d59ecd298ab1c8e70b1278 SHA512 b1967fcc879d244491a281cc34905e9461bf1cc1ac285de8b812438ad5650899a4ce5a5026fb4788aeea2cd4829001d1201a548149191348357176b6bd830f2a WHIRLPOOL da4fa6ccbd3067fd6cc13490eb65c128a367c3f3330c03e4659901d88d172fc713cab480afbb371a8f83002dceb0e64e1369652593c140546ddce7c46fb780cc
 EBUILD aufs3-3_p20130928.ebuild 4142 SHA256 5a25e7cfdf378bf18cf2847a6423b2a2df029806ebb4f14bde2af9658cbdc9e4 SHA512 fd4d5ff963c0cd916da6f17c9faf2b6e31db8893c63ad540a0fb36ab3e11f667066b6f76ffbf7a73ffe62e302966585b465294c5beba00c91cf2e888edce35a3 WHIRLPOOL 0d06c393ef96b54b9b86b43c3b00152c61ac49c4f3762cb99bc3b6639b455dc2b95f80e51e92febfa3a223d732eebf4333acb48715165d2682d522ee41e1220a
-MISC ChangeLog 19202 SHA256 39be562b5a00cb07574b97c8eb448db240ae8f6ce2ca77e56444fe809db21051 SHA512 741b48858f609553f2dd82975d0c715aedf7fcc3636b0e3e42a1b883ee027968c537ac50449bcb90d7d82df3ceda1af8671e858b30e51a57a40c3735b0e5d810 WHIRLPOOL 1ffe83f9daa8226e3413034ff451d331971b72aba02bfe415e418423642c2da3df7d836cb2f6b486c0654a4a9f83f663372d28b6940715162da377a4d03b82c3
+EBUILD aufs3-3_p20131007.ebuild 4142 SHA256 07bbed6fc0227d80348b9773c7e8d4a7339dc069822d7b843d5d2c0330681b24 SHA512 7e1369389d38631c1ba4c0bf1024a31aba1283a16cfca79bc9b75c52eaadfa9479338b574583a6097b924b9097300b6ad5634a4f2357c35072e0dbd12810df53 WHIRLPOOL 26dafac0b57063907ad25af73a1a1320f77f21c18d16195b41c521f7d0fde41f467c706ea49c72080ca8c2b8e0138621c5e1928e81a89a502eff51440d28a841
+MISC ChangeLog 19334 SHA256 523ecb95c6a767a29c0223a2b684513ca7480c704d046422ea4e11d2c490823f SHA512 b78908d5bf2d47c7a8726fdfcba42b17fae88937e0a50f79f5ce17ae08e72dcc93d58ead4161b2d8cba8ed1ce509344d9a02188a7e479df48114443783582f7d WHIRLPOOL 8013d4466b3689c4c4817322d48e414960c16fe49faaeefced8baf82ef491802d77d31d789fe02e310b86ca5f6a79760d59017440c461899a00039d82752c887
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSRp9oAAoJELnU8jG9FVirsNcP/RCF4YsLBxUP3Y5KTAlQDVRM
-ou1GhzP78ZRSmOPi3yfSjHC7IBFOK5xdoBdlJdnOaTXw+rp5xGu7jBmdeORsRIPj
-j677uEGn0OF7N8/snypcJeUY3wHrIPXcHA37X3wajiRpsRClwaPtycmaymHBx9y6
-29PTVYVBqtwM81rcAop/Y+AyNTtWbdkA+6WPcpZ5JxeudrdZKcin4V1p8k47FhZI
-6hFt7v0dN/jT5jzmWy3LQZd0mfCDz/cvqZ0A2wiebRAObJS2rwN0Temw5tTggS6F
-+y17AvmaM75IUeyyC4D1sHSXoRCEEuUqeMzzCdTVB6YwAH/3BkdPu8KidGw/Ks5m
-7y/qjOmChaaYFZOtslxFQ/B7E2mM8dUg8W0i7TwsuzKh55yqn/WxeRzz3bpnSgE5
-chjOYqTsG72/v8ROLlLSBzdYha9r4i/n1VaEoJPYvY7G7t7vtKVIBBzY1rlaMyba
-ItQO0OxR745my6hpoxroH/T2lrgTY04tvBJ+uF/UGQTgSij8qvaTa2yocyxePssZ
-kBhLcMDrZEP8qA9VDdO3KBGkgBb9zQ3ZkzvYSHmdWppzKSKHr3UejnDWAq40NYUm
-Pdzy59/iVV8SDert38eale0ONL+hL+KNLhtD1MML7TER6LjuCCWDgvpluiQ5NuJl
-F0eCIu48dfWDdTOAh1CU
-=RzYk
+iQIcBAEBCgAGBQJSU/FrAAoJELnU8jG9FVirh2cP+wfjJFbzjRCWf7TBEfaqs0E2
+qoODUAT53dEVMkdX0FEI35oya4u1XbIMBz1cPiWcvd024UKhOmZmtqSqFRfPZxC6
+I8j7c71hI0s88S/kbXoU65BXArHP+lhoASBY3xIAnZjMGqGKFxBHg+1s4IYS3DuS
+wlqSsYy/NbVVypV3JvO96pu76l+Ez6hM4C76vMn6viQ1uL+OEJNz2ffdOpBpyKoC
+OizZOSaJQvLtw5EMZnBbS43OrdS/N2wxB1NslodJ6xg/v0XNVd99oY6+TpT2kKl5
+vcUdx7YD8tM6D9CwvjToqn50h/R6cXNHXCHFqTO7iT+N+QzYbbpmhk6y3rp1o8NK
+vZsYI9DCw+voLJ/jyR2W5HOUY0PhzUj05g8OC9nCXBDw31AnHFylzqkNFR3u8ONA
+HOmDv65ZalGk1oRzI8zqPnjWjQdIVeS0qOUlgop2nW9JmgHsZBwxHkFEfDbu0qIs
+n1WfuxWNz4uzYFr1Dk1RWTyFHbo5H5tHa3ItBI4issIc64gWjUh1bDVIRaM0Y7b4
+HGAS1l2DFP6Lw8njiQJIqfywnA5UIfxKe8B3SJqrIEqgqXAZZTfDiBKmi75bwbJ9
+Xh0nGzmzNs74+5kRW3hLpIjbqEGRmYX8HJWLV8oSXO6KFgvC6Ftc3SzOf0yt78BN
+Uj7wQKZ9r/pAMBbYJoWJ
+=aEKg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20131007.ebuild b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
new file mode 100644
index 000000000000..395970995e61
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131007.ebuild,v 1.1 2013/10/08 11:50:02 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=11
+# highest supported version
+KERN_MAX_VER=12
+
+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() {
+	kernel_is lt 3 9 && CONFIG_CHECK+=" ~EXPERIMENTAL"
+	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 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	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"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	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 > ${PN}-standalone-base-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-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-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-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 ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-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-3.patch
+
+	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-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}