sys-fs/aufs3: Version Bump

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 177 insertions, 21 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index ad9aa0da424b..104ee1981368 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.21 2012/07/30 08:25:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.22 2012/08/13 07:50:47 jlec Exp $
+
+*aufs3-3_p20120813 (13 Aug 2012)
+
+  13 Aug 2012; Justin Lecher <jlec@gentoo.org> files/aufs3-base-x-rcN.patch,
+  files/aufs3-standalone-x-rcN.patch, +aufs3-3_p20120813.ebuild:
+  Version Bump
 
 *aufs3-3_p20120730 (30 Jul 2012)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 56917ecf9a61..b19e935d93d0 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -8,7 +8,7 @@ AUX aufs3-base-2.patch 2734 SHA256 2635ca013f170d4381826ec5b3aba3c15bfabd567df43
 AUX aufs3-base-3.patch 2734 SHA256 60f619c05540a42115044ba5bc752c1a5a8be905c55fbad3fd839114578c69c5 SHA512 03e6ac1d39a2379961342e5d69db1bac9bf21f53ab28c84b81c4424f94fd771893c64478f8fd36acff5182eb364b93367b30fa033ae78a831f538550d6ffd1b8 WHIRLPOOL 126f1798e9ba6a7f75634e3e195c4fcd3f5f4331b0b5f22364caeefd1591171604bac25860d865f36324ebfd9f6bf39e45d69977caaa496acdf92b34324ea96a
 AUX aufs3-base-4.patch 2744 SHA256 874493462520e2323b973cb330e527bd629907bf9cc9ed0f1cea575628b0011e SHA512 d7a0a216f959121dfed9b421f7ed5dd775e5cafb646edc6e25ec14665e7956fbc91fef848839854a2c922dfda5e8112d49a7201dcd94a04c8a4562d39aba4d8c WHIRLPOOL b42bd47f14837b7d10582a2c82eac5dc1c4ecb62b3bf092d33a815cf4fabb121e74c6333149c6efcf5e2757a70051f2efdf1f06bbbda1e4aaf43a931c1c6b0b4
 AUX aufs3-base-5.patch 3879 SHA256 e214c467b7540ac5555dd14baa48baf1c6e222a907894a96fb9809d8d438487b SHA512 d0609940762471469fe1165b66e75ac8298e9cd927bbed9f9a4fc40dfd6c9e9e2670a863c34e07bc7a94a40f0567cd1201d8f8bf395b212d053eb94c3d5a8392 WHIRLPOOL c7b1edb6fa9cd4222068ff8e51948e205ccb35bfc88dde9455754ee31ae79bf5987e659be5307ded9e5d7259940af9d23519b2140b5a1a760dff218890f55208
-AUX aufs3-base-x-rcN.patch 2906 SHA256 476ed2223d8036b2915b15b3d412e89bb4a66af8d05dd7553d4e6ad7def6e805 SHA512 7f0f8afc4d51926083bc47dd80f6fb34cdf50b751a0e32b002bb4d0d2167cc91bdf47f7e7a42f6ed67d7c5db6ded99152f2c477c36de251bfc3e4474647025ff WHIRLPOOL 76ac8ad12a7999e003328765d47190e7aa8f249665e8003451c29ed7ba4a5c9f54aca28ac537a5c86e78998d60bc21091e4d9f005664899d7a1d3e8f892a051f
+AUX aufs3-base-x-rcN.patch 2906 SHA256 db6c30af3eb8139a1ef49bf1536bf8ba45d868be854c9ff29829494ab98da4cf SHA512 00d75996606fa896a923c8104f1aa311a1142447a48f9ce50bf6cb273ef9b4980f4c17a18ce7d9dea813cc4d785890e7f2a45db6b8e670bf33380d42c1146621 WHIRLPOOL db36839d5b720593124d1f360b003631d22968f19dff2922966e3edfe182bf7ce7f620da86d0244eba6f4059e18decd9aad45aba8c93c75c9116d1af0cc6cab5
 AUX aufs3-fix-export-__devcgroup_inode_permission.patch 231 SHA256 e2e18629401ecc1d8a89cc21f911c11c5e451161570cf36bff942a54ac523053 SHA512 a2b5e91b2721a762fcd5bf13124543398283f4859b075f635d7d6ddf0ca00f1af82bf247d306f988af86d83a0f3eb41261b190aee2f6fc5074c94ce91aa3152e WHIRLPOOL fc37ceca72f43df688c3ce12e18b69d843cb56a18b57fdcc7c7af82a2f24702ad37561919884608f90e75ddf3abd03644ccc45c17cc1babe7a3c0e94587bb213
 AUX aufs3-standalone-0.patch 7666 SHA256 53a2613f6da1d418d55e20e5b3f020c3382be0789260a312b7ce97334939f203 SHA512 50c9d1f7e392538c05c13023534621aa51e611d7e27c9bdebaf1df1de4c6208cb2e1decb2c8c9d0c4b866254ca24b2ba13e573f632f90e4112be3c093913d23c WHIRLPOOL 108f0911b1bb656c1419bdaae18b9f77f685ee54d279dd2e4221ac50d6761764d98cea65ccf75c52a94296bdb467c1557fe6bc4f8337ea2ec2fc5aa303595a23
 AUX aufs3-standalone-1.patch 7510 SHA256 63b08742aef9f34132fb7cc0caf107a9c7162665d24401573f12f8f96ad1407f SHA512 08b01555895fb5a487058c770a91976751b11d980183153ad459e49f75b167971c450a32d0c0f96a0c7f1292de9cbb4e997ef50ce2ee520d78411ec93ba5b406 WHIRLPOOL c3042e9c3a0ddae4ec1a5e6bd70befc89e1a10c2312e9e7cffe50b33ac3870763942e68c3cc7e11d4c3fbb7a14fb1bffb1894e07e416b2b78fa680480c670f24
@@ -16,7 +16,7 @@ AUX aufs3-standalone-2.patch 7722 SHA256 eb7f414f2a9f07e09c2c0eae9972b21a51ada57
 AUX aufs3-standalone-3.patch 7671 SHA256 e450fa66ebf041d10db5a594c87f83e47a39e29f6054310d6e56b44e31ad0971 SHA512 14431367818853979e5cf77cf226438fb3fcd353028b6df8c39eefd6d9e4a4bbd6aba67cc59b72cbedc6ed1fd8bdbcc60022e92d8f35fc0e544c6487d21cda02 WHIRLPOOL 18c52b08d5b498b667c8e1ea1503795bd8601a9bd06397a2917d6d7738101bd6b0eec48e5bdfb16ab4c7a17ac7854110b53eda7b54bb8265e53fd415576afd43
 AUX aufs3-standalone-4.patch 7671 SHA256 c9b3a8f32d429eb4ae9749c112e2fede084e64a148660ab146a820b846dcd7cc SHA512 b6a4a705cfbe24192cb70ce41486876c17f4b61f8f124150e3c7be530216cad11f6a677276e6cd5769fd3c150bfc9dd5792f8673776d803ce10a8b85b1b5f58d WHIRLPOOL 024362252c0e48174e107a41562315041b176797cd93934525ad9b8da516e859986e6c1acb68081d533b8b682aaafcfb73a37972631b3afffbc34b983d6437c5
 AUX aufs3-standalone-5.patch 8448 SHA256 a7472965292ea881cca3a42319e130778559e7211a758026727e20db3e7f77b4 SHA512 41992935a858f0f211f88f344aecda06b28aba7e389b1e9820689766b13de93a2ab72b0e6683fd473979c349e099db58e113bbb269dedf6c8241852d2d48d2b1 WHIRLPOOL 80844451d158d47f661d1813452c7c1da37b2b0f949e096be09d35e03dde17836786cd4713426658780bd7c10bca5713ce8a7cc7c601a96978d03ab5011c76a4
-AUX aufs3-standalone-x-rcN.patch 8107 SHA256 f64bd668e811ca01742cc2b5da6f6d00471473913aae6d857038cd207d5956c2 SHA512 fd8cc7f860413d322b452d3d85c2864ad357d3f425faccfdb2edc8a4eae24c37690aa114d4dda07b3b86064939c1df4ff49ce95c192bae82435967325b19b1a4 WHIRLPOOL 08a3bb75422bd9740fbad6ab76ecaad4e553ce79ee272d640b2cd17f40232099b81b01b738110367fb79d95c69a947414f0a2b2dea83f4cd3e58892ca119e25a
+AUX aufs3-standalone-x-rcN.patch 8107 SHA256 29123e466605cd1773cad1dfe54b9bf693fc58a7bb0b563f20e78104bc883467 SHA512 5e5ba78a4adc15e24a0b0c4155e3ba1ebc1f39fddd11337aae69633d0db60f2e056addbd3a31b5cbebc5368d9fb8c097cd0bf5b20c433a90eee57cdd75dda149 WHIRLPOOL 9febad977a65e5b32cc50acbedd519dcaa740a8966e7110c4a59398b78eab1a9aca4d24ec2b72f310969e5cdcaf1cd113dd4cd250c2f071601f0da17e61ae67a
 AUX parallel.patch 725 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6 SHA512 c15a3a6319c4545bf5249036aecc0504a1f2ca5ffde5f7a11967089a3b3374c44544fbe801c30684d3edfd9a38c9552a02a8e0d34fed7f38f8bf3cfa8834a686 WHIRLPOOL 11b31499f1df710750328f5ad0c06a92623316e485cd173d47151e1c65545b25c8cc582cab1f98226804ceb9be24ba32d0336dc65325eaa0e81f7ee0c587cdb7
 AUX pax.patch 4821 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad SHA512 96c9f131da09fb138d60ff8d4c2a0ccb2518f8477b3dd04f81db4b53be006dfa21a487b9ba524ea479a4621b8678ed073467932b6c9ca10c8abb0af5ec9e9330 WHIRLPOOL 99bc6cae56608b8fbc0ff81b1822a76dfa9307b6c18a7ba2708dc5e6771cfad136906821b1cabf584012afe1683f5b74ff6da3d85a08c83226a070b4d192b333
 DIST aufs3-3_p20120109.tar.xz 572140 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444
@@ -25,19 +25,21 @@ DIST aufs3-3_p20120523.tar.xz 1108480 SHA256 694d0a89653959d6175ee52cfd29e5bb7a8
 DIST aufs3-3_p20120531.tar.xz 1135072 SHA256 b7c0aa54867451df191ecc9fa497ba99618cde3a9135cc2f465490ca34d43728
 DIST aufs3-3_p20120619.tar.xz 1307784 SHA256 8bbcc70da9e3e362c4e9e96f52f8bd9594371c1583d6a22bb04e32f2492effb7 SHA512 85b66bb0ac9645e70d99fb0f4e5592ed57753bf3a7ac2e7fc6f49d92ed9d3232e42bb244d85b68e6e63b163cb43d26c52e1227633b83dc3115e45bab0c95f8b1 WHIRLPOOL 003e01829bde40b6caa87a4f02ed63d090715c14189bafe8a371458948ababc4ec1a05926518a719258c5bc23aa63000e9408d845fb5685da76990bf2df0467c
 DIST aufs3-3_p20120730.tar.xz 1469500 SHA256 6006405bdf8248adcb69a2a5fd5979053f6ab86c23c169a5f87fd3eec21dd84b SHA512 b4efd244ccac25316f68c121b0f7c292f6fe760f5ab60ddbc3c32191467221331e0a5c5f9fbe7c80f1ebe698815e79270608901a42f1c15eda0ddc19404b62c8 WHIRLPOOL 45fcf21c7ce96fefb60099f464056e0a8363cc52393d0b3c29eef6ec6d58c9ef64f40208eeb5da4cbb17822de30c6db63f57c381a89d936acf907a0c23e6b867
+DIST aufs3-3_p20120813.tar.xz 1594656 SHA256 549b496e42b96d05e428a8deb5f1fc6c3dcaa1630c9b9d36d683eebf3546ac4c SHA512 deb6cfa132a2c99a12d36db0d199b3cd2be598392273f543ad80387be8f9669c0bd82dd11fe2e1739a039eac6fce7e3098d50f15450bc6a5ce5b4afa3dd5d95a WHIRLPOOL 0d59b023ccb5baa7c51fc662bf6597aac4160873ff3396a5f1be61d47c5593a5b982321fce1a1afdd92c312425a7d8a0c56961da81c42b18f80c286232030e63
 EBUILD aufs3-3_p20120109.ebuild 4617 SHA256 c82fab58ad78eb4c98e7d89ffdcb6fe77885bf1e3368e7dabe4550a962d5a370 SHA512 1148533616920c81617fde1a112405d52d4e1872adc493135768db6ac5d0dd92905e0d78b467ce13b09349c3217a87b80eac0b8d6e462f241d53e9b8f674639d WHIRLPOOL fe150b3dac2f39ca0818a4f1720956b8bfba146c50eb337119039e4bac42ea18d69aae72001a1452f257683d2a39ada8aef7d9b5d3cc3f8a84c734b338cd638d
 EBUILD aufs3-3_p20120430.ebuild 4522 SHA256 d35ac31316bf6738cf4b69784f555042a225dd1c53c9532839edffaa1c7563b1 SHA512 628ba1ca883f38c5ff5e9102c348271104fe6151ddf381814c45af0027800e4f20d209495bd7d13405a38ccb3e30965e73c86b0985f24907a04cd746b7de4102 WHIRLPOOL 58d17b0021ceea43551f9de81268fa41be0edaf5a881f81b65f5d7a67b17749ba11eb56dedc3db7ee91767dc0b483a328c07da1c14df711557b51e4f25b6d508
 EBUILD aufs3-3_p20120523.ebuild 4522 SHA256 f3aa201a2d0074106dbcf63bc09653205a2128635c970e7c7013504fdc013cc1 SHA512 99f7d4150777d197bd7afd5f86770dd6b65357e7dea0eafda031cd1a296557d88fdb742d2575174b00b4b440c8469048652bc4fcf5a630c8a0cf0a00ff3af7c9 WHIRLPOOL af0b1e37155d6ee758013186dc7ed15e339d40ebef322d04299f5c83698ceddd6a82afde3c30bd0f29c8fa58af1c6b8ece14a4faa52ec9f4772f5beb02629103
 EBUILD aufs3-3_p20120531.ebuild 4632 SHA256 f9ef7f6e4bf5660f7e875a38bbcc07db4ea304d5b80001db10882841749b2952 SHA512 e9dc26e647400ddceb3d6bc4df81699cfe56af8fcd992356db0af26fdaaffde2641db7bdcee2ebe5d6f6e39b50d73a9879fe177618704b6e52829c178d90554a WHIRLPOOL 904da73302decc4398844a01f2804cea22039b52a89190ad23faa532089d9333278eeb5c9c9d45860f8bc757af2184f78626462ef09f955e5b54d1b23879b646
 EBUILD aufs3-3_p20120619.ebuild 4632 SHA256 1458e837811fbaa6aad77be59353df89e3b49a5b91cd4af4df57882f5a604010 SHA512 2259a1a7282cc584509388a0c0a8709562938513c37d1f858128aa3dd2078e7ca6737dfbbcdb31e8504e96cbfd573362aeb637e8dce1fc0144506e1878213559 WHIRLPOOL 513891aa0ed31fddc9525a301fded6aa36d76b0ec82201edba4bfad05caecb6a12e73e7b72f333e1968e16d369d45180d2d6232f9156c2d8804dbd5cb284eba7
 EBUILD aufs3-3_p20120730.ebuild 4632 SHA256 3866934b24a6228d36c1a94caddc9e80d948a116af3f350436342501c1666855 SHA512 8af0e924679c2feb285b45471f27e9a121456e0a53d6193acf8dc2273b4de251cd1f527020a84799bdbb84989a27591e04444710e73435fb4b40ff4d3151835e WHIRLPOOL b2c251210a553241e14f0015f34e8ba9045860d8073acd4baeb0c8396a3d9c46016f2eaaa90ef8c6e431a6e2508bf40e51adaaf458aba8d62e59fd18b677d44d
-MISC ChangeLog 5334 SHA256 ca3c318032ea1502e87e1cc5c383a8fa8dcced09f8cddd007189367b2ef90882 SHA512 cbdd9505c46b411cceec0f4f2fe3044124230716cf57fd023cec6bdc5c08c4fba12597e5bf466464e748f760f29c7837788b56424ea6d7f950162f5825032cad WHIRLPOOL 16bacb5c0569a509f104a9d81324965a5e715d4c168bc49f69894b9d99db725e43a2b43a3f0812f9216af47c99d156e9f4ef9efee7dd4f2d9177547e71364786
+EBUILD aufs3-3_p20120813.ebuild 4632 SHA256 579695d1cb25ed09daaf8ac64d7bb2494ca3d69458b26326bfc2e1160e8027a1 SHA512 440849f3df869014f298e4a833cd1dddaaf315d8690b90e4d9d53fd6297a6f423a4f1723ab288082bf30efdfb6c354f04bd3f8ea15ceabd6892d3c9db5ad7e41 WHIRLPOOL 952a11055e4b0e5f8a80646a826ea72b3afa5c456bfaacc7582317e9f6c5ba5439a50ed0a53832821bef4a4650a3ef45cb061ad60782380e88be835e12147818
+MISC ChangeLog 5526 SHA256 b1ed71b2748ab177c340504a7e612f1aca88e9c9d59aaf78cd8deb7a3997ebcf SHA512 51090c90e44a8f8c134ce7594022978cfe61ed515bbd7a4e17b1bc8894d2c156f2d5a40953885da5f74e507d321e0c0c7fb469de7d1eeb20d9a6d1aa70aa98ec WHIRLPOOL a50bfae2576991f2c32bab4a3ff24bee7755d344dcedb6b08f46b4032173ae3e30c86b1295b6f3e307512a7934a229c558cd669ac164e418919633e0c19856c4
 MISC metadata.xml 758 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536 SHA512 6dcf4ddf5616e78d0b43e54d08dbde64ddaa0ef995af863de3623c34bcab139c9e36329722a1f965821f6a2513a62906ad3a436f07368e25893704ea46dbf566 WHIRLPOOL 32198ee0cfa5cbd5fc12109e5136f84d0b240dabd7515a9fb0ef3617458372b063c51a60930309853526f297646e5a2afc3264f4a2e0e02383d970e5816c305f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAWRP0ACgkQgAnW8HDreRYQFQCgxWJASkPj4wSgK8LKbZMy1uk2
-cNMAnjZyNBuw0WFAzsmnczBBImj2nyNJ
-=KXfB
+iEYEAREIAAYFAlAosdwACgkQgAnW8HDreRajCgCdHps4Du3fedyGe64V9ECjd9U4
+xf8AoLlsp7l2nGgkzoRjVlmVu8BDhqtO
+=vKXd
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120813.ebuild b/sys-fs/aufs3/aufs3-3_p20120813.ebuild
new file mode 100644
index 000000000000..db3397f60f4f
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20120813.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813.ebuild,v 1.1 2012/08/13 07:50:47 jlec Exp $
+
+EAPI=4
+
+inherit linux-mod multilib toolchain-funcs eutils
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=5
+# highest supported version
+KERN_MAX_VER=6
+# highest util branch version
+UTIL_MAX_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
+
+DEPEND="dev-vcs/git"
+RDEPEND="
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
+	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
+	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
+	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
+
+	# 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
+
+	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
+		UTIL_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
+		UTIL_BRANCH="${UTIL_MAX_VER}"
+	else
+		UTIL_BRANCH="${KV_MINOR}"
+	fi
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
+		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.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} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
+			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.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 ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
+			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	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}
+	local util_branch=origin/${PN}.${UTIL_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 && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax.patch
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed -i "s:__user::g" include/linux/aufs_type.h || die
+
+	cd "${WORKDIR}"/${PN/3}-util
+
+	einfo "Using for utils building branch ${util_branch}"
+	git checkout -b local-gentoo ${util_branch} || die
+	sed -i "/LDFLAGS += -static -s/d" Makefile || die
+	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+
+	cd "${WORKDIR}"/${PN/3}-util
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	dodoc Documentation/filesystems/aufs/README
+
+	cd "${WORKDIR}"/${PN/3}-util
+	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+
+	newdoc README README-utils
+}
diff --git a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
index 205f0d0776cf..7fa26200896d 100644
--- a/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
+++ b/sys-fs/aufs3/files/aufs3-base-x-rcN.patch
@@ -1,7 +1,7 @@
 aufs3.x-rcN base patch
 
 diff --git a/fs/inode.c b/fs/inode.c
-index 775cbab..1c14ec7 100644
+index ac8d904..7b2c8fa 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode,
@@ -14,10 +14,10 @@ index 775cbab..1c14ec7 100644
  	if (inode->i_op->update_time)
  		return inode->i_op->update_time(inode, time, flags);
 diff --git a/fs/splice.c b/fs/splice.c
-index 7bf08fa..e3c40b5 100644
+index 41514dd..663b402 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1090,8 +1090,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+@@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
  /*
   * Attempt to initiate a splice from pipe to file.
   */
@@ -28,7 +28,7 @@ index 7bf08fa..e3c40b5 100644
  {
  	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
  				loff_t *, size_t, unsigned int);
-@@ -1118,9 +1118,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  /*
   * Attempt to initiate a splice from a file to a pipe.
   */
@@ -42,10 +42,10 @@ index 7bf08fa..e3c40b5 100644
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 8fabb03..3a21a51 100644
+index aa11047..9116d2e 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -2606,6 +2606,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
+@@ -2741,6 +2741,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *);
  extern int inode_newsize_ok(const struct inode *, loff_t offset);
  extern void setattr_copy(struct inode *inode, const struct iattr *attr);
  
diff --git a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
index 2dcec123f806..47edb847d0ab 100644
--- a/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
+++ b/sys-fs/aufs3/files/aufs3-standalone-x-rcN.patch
@@ -1,7 +1,7 @@
 aufs3.x-rcN standalone patch
 
 diff --git a/fs/file_table.c b/fs/file_table.c
-index b3fc4d6..1bcb78d 100644
+index 701985e..a9fe741 100644
 --- a/fs/file_table.c
 +++ b/fs/file_table.c
 @@ -37,6 +37,7 @@ struct files_stat_struct files_stat = {
@@ -22,7 +22,7 @@ index b3fc4d6..1bcb78d 100644
  
  /*
 diff --git a/fs/inode.c b/fs/inode.c
-index 1c14ec7..92b8a01 100644
+index 7b2c8fa..0c4318d 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
 @@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
@@ -42,7 +42,7 @@ index 1c14ec7..92b8a01 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index c53d338..08b2f0a 100644
+index 4d31f73..fe1eca1 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj);
@@ -53,7 +53,7 @@ index c53d338..08b2f0a 100644
  
  static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry)
  {
-@@ -1344,6 +1345,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1401,6 +1402,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -123,7 +123,7 @@ index f104d56..54f36db 100644
  static int fsnotify_mark_destroy(void *ignored)
  {
 diff --git a/fs/open.c b/fs/open.c
-index 1e914b3..8959129 100644
+index bc132e1..00c1fac 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -135,10 +135,10 @@ index 1e914b3..8959129 100644
  static long do_sys_truncate(const char __user *pathname, loff_t length)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index e3c40b5..3afc547 100644
+index 663b402..51e1deb 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1114,6 +1114,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+@@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
  
  	return splice_write(pipe, out, ppos, len, flags);
  }
@@ -146,7 +146,7 @@ index e3c40b5..3afc547 100644
  
  /*
   * Attempt to initiate a splice from a file to a pipe.
-@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+@@ -1143,6 +1144,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
  
  	return splice_read(in, ppos, pipe, len, flags);
  }