sys-fs/aufs3: Bump to latest aufs3 release

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

6 files changed, 224 insertions, 20 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 9d002302a613..dbb11b59930b 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # 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.97 2014/06/23 07:01:57 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.98 2014/06/30 07:04:00 jlec Exp $
+
+*aufs3-3_p20140630 (30 Jun 2014)
+
+  30 Jun 2014; Justin Lecher <jlec@gentoo.org> aufs3-3_p20140623.ebuild,
+  +aufs3-3_p20140630.ebuild, files/README.gentoo, +files/README.gentoo-r1:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20140623 (23 Jun 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index fb0a4e5ed839..c3d606814b6b 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX README.gentoo 931 SHA256 9929267e66dfbc73d4a14e2fd3bba26c423bf39682d64937cd69a53f770a8c5b SHA512 d98d4eb49abb2ffde245709e7ebc245b05f0b5cdffe2e0c308698d979d47d601970ce6eb5fe70db951f8971ef827ed30f0d083197bb5fdbf9dfa75d4bbf256bf WHIRLPOOL fe05d8ee5cd37b337f6ecaab24756900a64168c30487f94209f2c0ee6ef50aa1d0cdb67b6384b54570c5625558fcd772441b23b9b5cb64840a1378d3e1d4a75b
+AUX README.gentoo 915 SHA256 c4344c4eb6a1a38ddf86bf271c61b7514700cd986be16bfd3555a99fa2bdff88 SHA512 26a1c7389c1a5ccf0bad3fe496461048deea2dc0d627e2ad65c51404b6f3b74439e6a13c6531e501d442c281f5582524229faeaa5df22d43cb4dc7eecdb61399 WHIRLPOOL 58eab5b45c464518794d47f800b8de0ec7975094fd983be6988abe1806b3b19de831ce59dd7da4a2d3323cd93a6705827bc2c66ea852327ea443709987ba9803
+AUX README.gentoo-r1 911 SHA256 9b9eb681f692f052105bf3d3d15e689685a5fcfba1d90a88b3351158d4cebd97 SHA512 f22f1e1fae62c7a03230194c05701dc03502b84a52cfc8aacb5fbfab2c1f8bed9d4f3f97d0095578d497b09f818a3a45a04ef8527983e0cbfa9db10baeb1b691 WHIRLPOOL 73c88b3df5e691659e2e2044bda00119e742178868fa74ca7990c3d0204eaca495bc625353c22804c7420db807774941cdddd2e901c2cbceb36aa220ee3d4d95
 AUX pax-3.11.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec3f5234e7e1ef446 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 WHIRLPOOL e329ea70448d30510b5dc64ba9eca54c969c6781dc75ed326714ad0de90d10f43844e62e840cf1bfaed0ebb166b9f8a3cdef295ff06f5b38b4e5d75857e3fb46
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 DIST aufs3-standalone-3_p20131007.tar.xz 1953352 SHA256 3916a1c34a604a688e92a3c1d58d83e712fbb89748c4f4d0cdce591a22ab1cfc SHA512 e304e1be74553c4160a7db5695e680b50becee061fd7809318468d3aebfa442a75468bc36add14058bcf765b8fa77b88631c17cb7c4997f3ad8a7ca556cc450d WHIRLPOOL b2d04bdd7b03e400589fe906616c9c894eddf21ba10c1029982a26c5e5b10169b9002aeaca3a3fe1a301edb1b8d392e6f3d4a79815f45a3b2b0802e4a31298fa
@@ -22,6 +23,7 @@ DIST aufs3-standalone-3_p20140602.tar.xz 1835304 SHA256 3ff598a2bda18bc66010bf9b
 DIST aufs3-standalone-3_p20140609.tar.xz 1837512 SHA256 b54796e6fd79bcf2a51444cc93177cc379b6fae4c957eb315981091ac999dbc3 SHA512 772acb13208bd9d70504bfae3fc3263fd67ff1707340e60bc8c22d621c13a2167de9462e9adf0ab77b18ddaf98e69e16793e5de572d42f96fad0d658881fe796 WHIRLPOOL f807f40e092e4fab18ebd54b39d548128d898da67a541df2c106561d7ed8b647e12259a1bebaad5781755898b385304dc76e3973fedd975adec6436f2e58a3b8
 DIST aufs3-standalone-3_p20140616.tar.xz 1883700 SHA256 25ac09681bcbec4a4e6931d84ca75734f9a4ab45930a29ce274858867b77579e SHA512 c6acabe0ef27fa1f008aa7580606c99270cac0dd2bc0400300926cbe732d926059e9738f5b57b25925846fee178721baac7963ac891e58ff397b2dccd31c1ed0 WHIRLPOOL f4804e07d3c8ce6243c6ee4cd196420b80d85d47b77e1ff4c630c1fe1d9838a92f4db23c7b91ed9fbf91018e91882394133aa81e692c8df71af7bac53155c664
 DIST aufs3-standalone-3_p20140623.tar.xz 1916776 SHA256 2b1a6140d21cb52ab8bbb6b6ad62a42fe1dfea4ac47f0aaa0ff5aa4f2ab20b88 SHA512 415eefd7837f962ceef6d1c041632408c89b1eab5ddcf2487a72df6ab145bcfa8feba6334a466eacdaddebef481201b3d7f8d75c113e950dc4df76b62f865644 WHIRLPOOL e13139057a333d4096f28f53fa89468af29fb41ea0046f0d3653defc7ac6482ca9df015c967376183c244ab2eb5f0e1d9c43813f9c75eda91d88f13d7be0b77b
+DIST aufs3-standalone-3_p20140630.tar.xz 2007452 SHA256 ee8f28f448eab08e7c13226e553e5f4be8618b0eace12b9410751f603a405818 SHA512 b40c4478672b0b59f43a5dd04e5d936000c4b9f7b84393e14bb3125f2d356b6a7f34fde6d796b684e80f15f9a3a12de82bd7ebd5a85fb03fe9be7fe721365f19 WHIRLPOOL 1fc706f9c0c99a096af7064160d92396079df11155d91da8052525151513e0b9e172acc1579868cf32f313ec329842d2b5013fe1d7f8946d9c0861c6cc7d98fe
 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
@@ -40,25 +42,26 @@ EBUILD aufs3-3_p20140526.ebuild 5265 SHA256 c2fab1893ed9895cb5d65864575d71ce52e4
 EBUILD aufs3-3_p20140602.ebuild 5265 SHA256 527c38f361619ac7491ee43260642cea9cda2f00c6ea0dd0a9f37b398867d86e SHA512 a7f289973bed5f4f2b8e90ca1273834d1b6ee3b071ae81e77fa83a95c3612a6e914d8277354d0bbece3db68b331e16457a7d65cd4018879fc8d40de6c1b65c1e WHIRLPOOL 1b77cea9b408adde6c212eb90708b9980eaa1b461670d8f85d0a02d12615632fefacba839728cbc7cfc50a666af466687569408ab97ed5233b6bb92e50718bf2
 EBUILD aufs3-3_p20140609.ebuild 5261 SHA256 2d10448d6155427362ffd7601fa028f338335eeee76317dd8d65e7d76c6ac414 SHA512 7d94275b1e3d9c1e7ebf135e336a89f5e74a600db6c356ebc30927ca42656ef4093a069ee42a969b4bbb4f3901852050176bd74cdd5123c4946fef5842803543 WHIRLPOOL e2ed103e328b34eeca49bf4dbb9e08f5412182b4e743c68c5b2ae999a134c28999dd95e2bb364785dcbb6a7be4474ecc75c7c2ffb780043f5267bbe015379038
 EBUILD aufs3-3_p20140616.ebuild 5261 SHA256 6dde099d37091445d61db98ecafdf2afaac1c89092e911b0c8da458c27d8a16d SHA512 abde0946b1b02ec3b0e4779e4a8e7403ea4e61c4f73e33fb326c93fcba2080c7bdcaad28980b162f81c6ab1347df6fc7b147fcce8c224accd1ee5151b15dc253 WHIRLPOOL 0e1b96eb8f664585a8c53c90d65e25363557f93a3fa5facdf7d7e0c27893bc6c48079fbaae8e320f5dd7ead80b7064710cffab43a726874521abd78367f94726
-EBUILD aufs3-3_p20140623.ebuild 5261 SHA256 363c4a35f33ae0c3e91a63fa80b5844fc49107e85077a89b60ff7978411485d6 SHA512 0c5965cf037aca0c139d2c8d4d4f41128f9de8acb58e8ea7a7ce2f9c7af46f665f8af817ef5ab4837b04aca9e29c6c9851de9577f74d57d5c444d68735c97f3a WHIRLPOOL 4bf20de2ea160fe6b557d84285f84ce45604b6ae93f0adb004ee9311e880d270654ca86777cf72e84062d2ebaaa0b456336d3e20032345e04265d9ad80534a38
-MISC ChangeLog 24069 SHA256 38c35f29f7fa66e220a6081d7c37d1c914c5938e53c32af8dca88e005f4c33e1 SHA512 6b2b272bf7b988750c52929e143aad6c31bc9e7c94faae78fa67287c2e79e073fd37d209aecfcfa9d30147177a400c41611b000ece1019794a7904f6962b6ded WHIRLPOOL a58668b19a0cc1fed371846cea4cb57d86bcaccdb3cf77b61d4345deb250aac461eec7ec08c53964bdd16417c5d28dfb364bd07a04129086d8d50d4da1244599
+EBUILD aufs3-3_p20140623.ebuild 5289 SHA256 990edaaaa1b226908a37b39e0f9099e95d6147168b239b7c06d9c31e87796d19 SHA512 aa31653b49858e1a6e0bc7a0e5fea4f9cfd196e87dc251a62b62b071bdf2833da5a0b1171506767a279889e06c1b9f9c9a9f6e41442df10f29599c7f35318faa WHIRLPOOL a7921ecfd5faedb6924afede4dadd2c1a4a4564391bf5e77a2267be2742e15538a45fdf62794b7a66b497b980982beb04049e03fffd8315acc295acae1f8b899
+EBUILD aufs3-3_p20140630.ebuild 5289 SHA256 1b84dfc92872167d1a368c97d78ae89d97573b04acb94f7bffd2e62361c7436d SHA512 5947564d0cd37cc85813c246c40637baf190ab5fc1256ebc0b9adf503a465237d39ed734c4f0242d81f49b0e5f1f684f82c52605e632b580d8d31cb8dba3f15e WHIRLPOOL cefd0d6c1503e73daf6bc0cb50d260ffe31a725e0bdf3643bf9f595faad9338c5fd464efcb94c77e9022416d2914fceaa2a53eeb35c9f23474480addfbc1b820
+MISC ChangeLog 24283 SHA256 729c7d2775c42b0b69ba65d38ec290e9b2015914ef8546ea01e438b2a17fbce5 SHA512 743eaaa089686061cbc419922b6fcbbba7127618b32ba1dfbef02d612651f8e45783be111613169a670e3ad3934a8d17f717a022109253ac676a5b660cf83f93 WHIRLPOOL 669f6ea4256d3516594aaef31439cda6724d9bfced6191be71aedc2e015fc2ef00328a7d61c36da4adf34a771a2b85fa75c9c55442e004e7df5f226e06adfce8
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTp9DnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTsQvfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOyMQAIPWDO45yGvF4ReySR3zfa3k
-YeVuWk00GNPbBHDiUBzMAirDpyuh3YuESy29e85BilnxxGtVQXVMFcUFVZbQOlrU
-/cI7DqLeAb5FHT7zJlBc75wOt8DWP7OpTj/mn+2rNS1Lm5txCmtEbpLT8wRpTHXS
-ywSmnzi3XXSbBM/I5cMDcfdkbqj0bT3L6jmj6aUQEQIu3k5hCJRkdvC3GXUWLLJY
-XPSIx66jRHENfAtCE9pbRbq782f4L5VLHPUKhbIgxiZucwyftgdPu0d0AKFV2JT/
-yXYZroBL26OGiue8mvzYAHtcMIcalJ04i8NSHjkaOHYZyJzb0jWT2iBX1kJGdcs/
-f8WHTBxvvCA7jI8sKTCt6SCrmpcsbuHNyOpRnaw6UVVwGi+8eM0KMAMoE+lQjFd8
-Mx+VIvl0I5hIe68f0cPmGx18pccLJpicYgSLHKAk9y2Tt8jwPkBD21NmcV036soC
-oHuQndRBs/vmMkUXogMvN3EP3+hfaxX13jCfO0zi3zs/iJFu+vXab4nbOeiqs45f
-vCCbXC7UWkOS1CZ0Qa0QlLqDlT1mtU6zNynTsxD6TVHeX/oH4tzSZ6dKOzknSxbz
-vx5WJTX8fpslokSKkyj1VcsInItuyvJ2c5wl0W5Pz2tGF2G9X1Zo7hXVmEQ9ga3z
-KENfUi4+DNA3FEqhVEEQ
-=iRTV
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN5IQAKAuLoEOCMQaDWZ6M9eXob6i
+mdrsx/61RxdX3rTIl/n864ju8WdDUgraJHIXHLVC54wWSFMTXGn4k8RIXGDasp69
+7H+dtAfNx8JyAJprOuk6tc+GQ1wswOO5eX621fTZUkcyss20soIAdK2fsiryuXC9
+B0xll67dzwABZgydZm/o1Glw5AlS7/CWV/97EjfK4AOxgLrfqn+iF77gk+Uyi+Xo
+BuleiWw4mbXJ/VpCt/90+UUUWBj3cYIYIYaMmRlY7HxBhM0OYEPR0gdEACW/kisH
+zRgxE3SUOuoboiuXBSq++qEu3HgFEVbguSkdmjHLByOXVce3ks9zO/ZmIayNJrIP
+nbufVgzGr6Qwc8fEVJPyc1Z+KfrH1QlVJqlf6Y6l6113+vr9PcoQ4Los1tgk+GZf
+usUp8b21Xu7aIpmHhnEdEWD+i0xXsz3GCsY7zPeeRMwk19IDktCVQxtLlbOmr0+E
+EvyoA30kgELrRLFFHBqx0UbBiJwzj1mVrLCTO5h2pbM84ykm5ruIVLlZt7Ws+ZLN
++BIUdzPgSs8iiXxdi6807i+krRfXkX92F1GSxLekocTMHI+qhFggn+Hs0LINIiHP
+EzFhsaqpKscaFKZ/eg7qt266QHB99KnRQJRdc65Jvr9Pgto2qakMveDRXoTxKNuj
+cFRnFO3rryN6stbVSxzW
+=0nOb
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140623.ebuild b/sys-fs/aufs3/aufs3-3_p20140623.ebuild
index 2d69afbdc0f0..80e1456ae953 100644
--- a/sys-fs/aufs3/aufs3-3_p20140623.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20140623.ebuild
@@ -1,6 +1,6 @@
 # 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_p20140623.ebuild,v 1.1 2014/06/23 07:01:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140623.ebuild,v 1.2 2014/06/30 07:04:00 jlec Exp $
 
 EAPI=5
 
@@ -35,6 +35,8 @@ S="${WORKDIR}"/${PN}-standalone
 
 MODULE_NAMES="aufs(misc:${S})"
 
+README_GENTOO_SUFFIX="-r1"
+
 pkg_setup() {
 	CONFIG_CHECK+=" !AUFS_FS"
 	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
diff --git a/sys-fs/aufs3/aufs3-3_p20140630.ebuild b/sys-fs/aufs3/aufs3-3_p20140630.ebuild
new file mode 100644
index 000000000000..d1d9510058ea
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140630.ebuild
@@ -0,0 +1,173 @@
+# 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_p20140630.ebuild,v 1.1 2014/06/30 07:04:00 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=15
+# highest supported version
+KERN_MAX_VER=16
+# 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})"
+
+README_GENTOO_SUFFIX="-r1"
+
+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_PATCH}" -ge "28" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	elif [[ "${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}
+	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
+
+	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 "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/files/README.gentoo b/sys-fs/aufs3/files/README.gentoo
index f0b590af86f0..c203912926fe 100644
--- a/sys-fs/aufs3/files/README.gentoo
+++ b/sys-fs/aufs3/files/README.gentoo
@@ -12,7 +12,7 @@ in the documentation directory.
 	  order to stop assigning 0 for an inode-number. Not directly related to
 	  aufs, but recommended generally.
 
-	- tmpfs-ibitmap.patch/tmpfs-idr.patch
+	- tmpfs-ibitmap.patch
 	  Keeps the tmpfs inode number as the lowest value. Effective to reduce
 	  the size of aufs XINO files for tmpfs branch. Also it prevents the
 	  duplication of inode number, which is important for backup
diff --git a/sys-fs/aufs3/files/README.gentoo-r1 b/sys-fs/aufs3/files/README.gentoo-r1
new file mode 100644
index 000000000000..64dfe94b4bda
--- /dev/null
+++ b/sys-fs/aufs3/files/README.gentoo-r1
@@ -0,0 +1,20 @@
+There several other patches in aufs3. They are all
+optional. When you meet some problems, they will help you. You can find them
+in the documentation directory.
+
+	- aufs3-loopback.patch
+	  Supports a nested loopback mount in a branch-fs. This patch is
+	  unnecessary until aufs produces a message such like "you may want to try
+	  another patch for loopback file".
+
+	- vfs-ino.patch
+	  Modifies a system global kernel internal function get_next_ino() in
+	  order to stop assigning 0 for an inode-number. Not directly related to
+	  aufs, but recommended generally.
+
+	- tmpfs-idr.patch
+	  Keeps the tmpfs inode number as the lowest value. Effective to reduce
+	  the size of aufs XINO files for tmpfs branch. Also it prevents the
+	  duplication of inode number, which is important for backup
+	  tools, aubrsync or other utilities. When you find aufs XINO files for
+	  tmpfs branch growing too much, try this patch.