12 files changed, 38 insertions, 1277 deletions
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 11adc9bbfcf8..cbedf2f266f4 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2013/10/08 13:24:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.71 2013/10/13 15:18:51 jlec Exp $
+
+  13 Oct 2013; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20130506.ebuild,
+  -aufs3-3_p20130519.ebuild, -aufs3-3_p20130708.ebuild,
+  -aufs3-3_p20130722.ebuild, -aufs3-3_p20130811.ebuild,
+  -aufs3-3_p20130812.ebuild, -aufs3-3_p20130821.ebuild,
+  -aufs3-3_p20130915.ebuild, -aufs3-3_p20130928.ebuild,
+  aufs3-3_p20131007.ebuild:
+  Drop old versions and add notification to aufs-sources
 
   08 Oct 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20130506.ebuild,
   aufs3-3_p20130519.ebuild, aufs3-3_p20130708.ebuild, aufs3-3_p20130722.ebuild,
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 56ef22f36bf5..e8d4a8ca6cd3 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -2,42 +2,24 @@
 Hash: SHA512
 
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
-DIST aufs3-standalone-3_p20130506.tar.xz 1188700 SHA256 f8ab3c8978ded7f919155378a5476baf7580312de9c46da2553bffc0e4b81182 SHA512 d9246fc77c60a256fae0998d46f101d449150cdbc988feac5ac338f06b6ad6a13a4965c2cbc5a79f6ea26f512060954adfc34c1e81949de4e39dad68fbd5d680 WHIRLPOOL 97d5943818e987aca3888475c04ed6d94c9e5d5c4148daf5ed32b5845802635ee0fbc82d17aa006dc34c2eb136804c408d2934805d4780673768801a9e378ea2
-DIST aufs3-standalone-3_p20130519.tar.xz 1276192 SHA256 282e49afab0061e055a69729cb06d2f68da2e614e5adb22b862a5bd870b1a897 SHA512 0465e04a903c8087fa4af44c3b8a02eca8695e10f96b1c9b30d12feed0a9538fb893119bd7bdb64c72ae633276e0663f955e53d55506857a49eee16a5eb85940 WHIRLPOOL 0e48ba72a019d0e3c6e6b546be0b3ed5ad6e58fb02191076653303b405a0f4819ca5474474b290d933dc7de4f4533a99bfaf471701c2d0fe5e538f8b9166550f
-DIST aufs3-standalone-3_p20130708.tar.xz 1213564 SHA256 e1b111f13a0ba5b1f4c58cd7e8c7d043a810322216621f5212492083d19fc5bf SHA512 cf13e83704d89609308715f116a60fe6c22d3017bcd8f5d1ecefeb49320224147697f2f395824b8317542102cf874e875504be16f6e7807dfabcfb58ada4fdaa WHIRLPOOL 69a6d6ed97b86a9dc221a5dd3a7021013570a330732f89eb14beda61eaa03fe860b01cfc55b8750e2b0fe2ef3f423f3f4169d77e4e4001f0c45733a2e442fb14
-DIST aufs3-standalone-3_p20130722.tar.xz 1375380 SHA256 cf2914e20c36f63f117e5d52d33b69582b5e528f90f3b35be8eec29ecae1516e SHA512 d02e7a12bb3869da0948fcf4dab025472c297317fc41246c23db84cd2dfd0ae94c8c9692efc2a2e8d80e576c6d27b594056668fe1b17b81de47764f7529bb73d WHIRLPOOL 70ef77d4576c01a768312972b0a303205f77e3712a5a9c327a985f43d812f2e7719c2563b923d246d335b6e5bbbd836facb2bd2f89171001d4b2f84594b82ed4
-DIST aufs3-standalone-3_p20130811.tar.xz 1438432 SHA256 0dad6694ba73c88d37f3cf2266dbcce6e16fb74c75c21bb37465287bad5b58eb SHA512 8325a2747ff0f20cd00f29249f3e151f42281ba18aa18e9c5cd815618b20bca12faa93063d94bb7de75bf273fdf07ca802dab8f5ecefda7b36cf0d84bcad97ef WHIRLPOOL 26530b40a3953b44facde02cf3c02e3aeec0dd04af853ce5211552a0ade448e81e17a68778ea45bc7efb7556dc01d0e2465d8dea9396977f6a6d7da7168c2ad4
-DIST aufs3-standalone-3_p20130812.tar.xz 1517136 SHA256 985e7e5578567d6b8c64f2c820605bd702ff49a3fca28e465da696c60ab076fe SHA512 c4a6375babd0771526b2f51608182323b6eff2455852d1140de25fc1fc958b08c7f324313c727daa7844e43f836b0a4104b8938c33ebf50d9fb6db00f7fc3196 WHIRLPOOL e63851376c8827abbd8676a4231f3ce82bfa92321e3ddd9ad68e6d674d79a1d034cd34155e44de75b30d579ff2bc38b857ee0e2d4d63f8779a28a187449bb2a0
-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 4132 SHA256 533ca6d7c90f049fed961f11a7ec8bb8d9787cb384d76c45162d513f14089307 SHA512 cac9d3af73b5276995924697e32b8bdc45e21bd01f189188a369ca165e4a4b9d018791ccc8da68bd30239ece9ba8af6b54559869631fe648f1c7f889a7e2d96c WHIRLPOOL 08faa15906bc615be76eabb6f1c22e4d63010023c753e6a43e3b42da65bd25df7af749c223af7370416cf08727939612debd0d4af88900bbf9de97ceb0e6c565
-EBUILD aufs3-3_p20130519.ebuild 4132 SHA256 bdff9cfbf244096220d50c03f6d59d6cc666d544c00861bcf9a38aa45fa30f8c SHA512 88fc8fa514259d7da64fe7d7c2dae3c36ed7fac417074ca013b7dd6510ba7445d93470703b85a6ea6c4a6c6790177311566e9edd6811dd28a6f65e0091b0746b WHIRLPOOL f38057385829e55af24726119e000e88747529c0bd88dc16763ab91ddea70dfc1d62d8dc05278305e8b7641f1ac464c5e7d7a1a6a2d5a09f030970884e92b204
-EBUILD aufs3-3_p20130708.ebuild 4136 SHA256 5631ef69c625eaf08ae06452916ad09a318113ff6651233aa2363869b5f63038 SHA512 ed21225b50f3aabde57d15f916017ea7e5659e4051c5d3a007fd002c880ad787d2eb6b8d1c75fd27d59150102279f38eed3f3b684a30ea71e9a728536bb85d2c WHIRLPOOL 935f2a2f704df81ff4101ff63db5ba3ab823de55c10617a862c5a91991c1b7191bb4b1cdc099edffd6d35aea6e0cd00b891724358361156c37dc2514e5a99e3b
-EBUILD aufs3-3_p20130722.ebuild 4136 SHA256 95893dd9b148822ab93adffebdde1b5ee99f8b73b9b452d9716148a294db84c6 SHA512 21de828f1bdf50a802742f88ec5c25228c5c358ee43ec82831f504a0fd4c9aa7b51f287fda348a2c1a14d826e9eae4786d8d6a169106dc172d39b8f2dc978aa2 WHIRLPOOL 053d63508b39c14dfac47793d3e6428ad6eb1035387fc50c0fc2d0b8984fd3fd1588d2bf54c557a2e2a3ac4ae9236338f0bb323180f57a1a4aa80d16e66278e5
-EBUILD aufs3-3_p20130811.ebuild 4136 SHA256 1f30df2f3f64b9f1575d77cae2898e0ba2e2eb6245b6b35248fa3a82ad9ae778 SHA512 bd1eab21ae1e9adcce760966c71a1e57e26c5c44aa864d660da8efcc2e632f4179d6958083728f08b818cb61e36b9ca33ecdd27eb373b150a0edc3c2e21d59bf WHIRLPOOL 880100b2996e4ac6a6e935baac6ebd39380e03708155022ac5967c2794550f6513ff7d2a24a02924ef39faf0ed5ffa55bffe9adc097c48fdd8cd186d2c12f11e
-EBUILD aufs3-3_p20130812.ebuild 4136 SHA256 51a7d1c50a0939e394cdff6ae70b1f0a8a20108917eb9504083ee3b2f1b541bb SHA512 4dee6c226221e94bed661c989cc74de0ce8a309dadc47aef17e5c316d3779f0528a6d6659cb58faa9ab12beed279d56b091236223907ffaf6b65b51264e8393a WHIRLPOOL 563b7ca55cb083fbe6b3b1b17c6f69e2d2dc146212b5b9c01edd28a03f7b6874378212535e8bed89ebe1d833bb243c1e68c98cc40f441792ce7f56f6da64f30d
-EBUILD aufs3-3_p20130821.ebuild 4136 SHA256 b9ff0586e8b8b815efbed208806ad54af978922e64ee10c627455c996ee2b681 SHA512 f81e9a9d6cd53f7c3de7b6aa83931b95de317b63689c636af35dce12f10bc8b689d70c72b09871819a0d79663e29286862af1e3fd3a47840e614bc252dba9dce WHIRLPOOL b5196c1194de297edf8a651b285353e27d70ddf49ff1dc7943cf42b273eb1dda316d955159828c92b63cffffb9ad92f4d683981f703d683e5f3134d6cdb4e50b
-EBUILD aufs3-3_p20130915.ebuild 4136 SHA256 371aac4f020dbb5d0cf77d57b10994c014fc6857df1f50ca1508eccdc1e4023a SHA512 b4d3697d1942ebe89758bd40324f43693685312991b9579b29c111eef98a5fda4474b368744bd606f3a737a7a845a20f51c475b023bb605178130971aa0f7706 WHIRLPOOL 7c73939e0ec14afd9f89d6502f625744f57156b9d780996ef67524cd798933ac88cf7d22ed45d44beae6c4c74ee46c72d59306de3cdc37aa2482f380f6278f2f
-EBUILD aufs3-3_p20130928.ebuild 4136 SHA256 f9321cc922c74edace2b923c8aefb936221f62dbd952493bb95eda43ca09b631 SHA512 f69e0a07855f3117faffdfe816f87b9396c64b0c6b8f279ba46e5589fa144c249b3d2344318484cf1c845bb88611e5a412e24733c88f80dd219495227695ac81 WHIRLPOOL 9fac67fb1ce86adf5d0f5d88dc621be2878aaa88ed2fe57dbdf67eda8949136ee4c1d1443b358e666f8d2322fcc6a4c63b97fe36591451a585687ccb00783e3c
-EBUILD aufs3-3_p20131007.ebuild 4136 SHA256 535fb4c79697daa8d5baa923543a9b92eca84736a220a2eb892edf2029e22ebc SHA512 858a2bfcd11fe8853bbbe3a6ef69cebb1556ca4b95b09757f2d5621536b01c72fa521fd0352adb79af2b937127df6f718346322dfdb1585ce774806ddd35ab51 WHIRLPOOL 5168ced7af3b796d55e91215b778a7d9f89e0cdd7517a13228822c6b8a752066f364489a76e4aa74ce4a6cfdb2b6f44577ae7942144ef9bb585e2a10d4ede86c
-MISC ChangeLog 19762 SHA256 4cec71273f99b7b608af86556e6b0cbdee065bb46092f14d3dab79162ee7e889 SHA512 3f9c0c834ce411be142576334113fb11d31999b6fe1afc45d4dbed38558fda32b2745a0e44c4029398439b08924438bb4c020565e1c1de0b8cd3c8f66d93f495 WHIRLPOOL 80acf6e94e9364aec2a4fea73c881961608c1761284000c049fa6f50e0fc834b717c65198c266e8bdb56278e0eccaab7e8df2d5b7a6d7ad2e3dfc3ec2cc474cf
+EBUILD aufs3-3_p20131007.ebuild 4605 SHA256 449a3d15a817f9d09255ac0b5ac1acea0ec287d84ea1e1fdfa65f1e2e79ed6b1 SHA512 de5dd43e78ec3391fa5631a6c41a065d5a990a403bf9692e28f37b3356d9d26107ab7c324d51c4c14a0d530e4afe873a65d776a6cd151f6ce07dcb983bcb9896 WHIRLPOOL ad36a78734d42103ef9e65d5306449b9d3eaf1b257a129106e2355055236a50fad31b36c9b5ddaf02b246a1f983fa5612794386e520035235c4c8c1cabc49936
+MISC ChangeLog 20146 SHA256 533d556825f6ff7259163f91211ee17b5e6197b183ecb06fff56bb5eec59f26f SHA512 1988e7ebe479d364e557bc104184247e9ad57c9a3e30472c138ca2597d3729316e230ee20614c2edbb662f16319d4c40bff85ed3a05c9f348194c9453ac53713 WHIRLPOOL ceafd394cf04722ed113e629cb5478228e60be9bf8b02d0d33a75e6524e5ea996b9bb0d4e34a49c85ff90e9a8c132344f67fee9499d74d96570323f6bd7991eb
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSVAd/AAoJELnU8jG9FVirbD0P/1RLjcuCV3RcFvH6C1l9w41P
-Mpjp5ycmyKkd9IDummRJa6RVTKU2KrXBOpBRs7XkrBjKcF19hIxnHf7Ic4LzcFB/
-ZD+XciADANHGv/IWeDoGq82TQp87CN/0vsybfcRIGL83LTVIvOAN5J7OSNzgJgec
-B9HZlMZJPMQkQoGE5dLS814KwPUMQvLCq1nB+v9aL/Vy1ju74rXXSb/W+Pp3c2hS
-eUqAlCtxn0UwAjj7Jd1evt0KWQxCA3j0oUuvr68Eexhg+tX726yMr6Cx91EQMQ22
-Zk+AXev5oycq8HSNirTccp62Amq9GW3046O3gcNoxjGCYRnB0PoVoi7a/XXs80VN
-uXLmmwHAMKpCe7GR1E0s2EI1iX1fNZRpS7VJMyBAWfOKYiBLSwgvPeTwzvEFsrDm
-fndFJsIbRsBEHolmKAjv+m3CKVh738T1ZF86b2hiseynuGp/Q+yGoJ1qiPA7erty
-RaE+ikkVUBVV7nYwLNVSfo3/7P61CZ06pfaojeqz7QtRbySnH4pijkkvqti4z6NT
-LOay9S13Y0gUUnaeoutrUFLuuoMzqZuhWkwas2zizlA+zwuP1GW2CP/tSO5CpG0g
-CrVp/yi124Z2EIvQqkZ/+cfgvyoetKK8hPdfUwO7GoUujbZpOJp/Zj5MU1RZoJlI
-ETZ+t//lDCfmTZq9TuzW
-=kqUp
+iQIcBAEBCgAGBQJSWrncAAoJELnU8jG9FVirQ/YP/j1DsmYX1qOLuznApPlhJpYG
+rC18/XQtrFpJMcnSn4cgCuXJYoVSo8J3FqP+UJMIGkyH9Hr1lkQE7XXD2jHqUuKO
+GEAAUgYR7wk1bWene9jvPp4NUf79JGhZ1slsLq1+ZpGuE/AkgVSGf0qFSoc4NGFw
+Wqd6ZMp9O2AOhrnls6tl48WQkCISIyWNLFgU40axk7q3WHIiTTjYMvMUYApApKUU
+tEcjayC1OVbpUf8eSZfDFbioFgvZwgPh6muyO9BXxj4x7AAgo7pqAT4C+uGtJwyk
+FgyVvnPy8jRqcE4ndvrl/U9I4UYL0TKClECMhWQJGGdj+uk/3kcvAg1ZhA1dntPH
+So877xSlHwG50v5v3v7iUEu3xq9gRCc3jlCuGNCgjYl5hSxDXJtNxHsr/1fudqKM
+7cOi2nejwoMYkIkpNkYmH4c00aXTHKxO1zinIPdheo9BcAukTckQK/CYItuWNG3f
+do1vOzYOZ5XdCMmhzYRmWpvm6uBIw98fzsphPm6/5BPjdoX383Dq0Izn8AMILy+K
+stDe4QXT0siElt7fV5Y02hs6Z2s/+BKMq0UkrioxVe0tJ9pKS5BUIT3Ag5WXom3w
+T4FQA2Jin1mIv9wUEm5uyEzPswJ37IeN1cib5WOJLcV40gQN4qzowJGyyMSEertn
+Ls9b9mgSRe+d+h8p5thg
+=EKYB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130506.ebuild b/sys-fs/aufs3/aufs3-3_p20130506.ebuild
deleted file mode 100644
index bb98088da244..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130506.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130506.ebuild,v 1.3 2013/10/08 13:24:12 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=9
-# highest supported version
-KERN_MAX_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() {
-	kernel_is 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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130519.ebuild b/sys-fs/aufs3/aufs3-3_p20130519.ebuild
deleted file mode 100644
index 3c23178c26c6..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130519.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130519.ebuild,v 1.4 2013/10/08 13:24:12 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=9
-# highest supported version
-KERN_MAX_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() {
-	kernel_is 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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130708.ebuild b/sys-fs/aufs3/aufs3-3_p20130708.ebuild
deleted file mode 100644
index 2d44be0fdc7d..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130708.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130708.ebuild,v 1.2 2013/10/08 13:24:12 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=10
-# highest supported version
-KERN_MAX_VER=11
-
-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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130722.ebuild b/sys-fs/aufs3/aufs3-3_p20130722.ebuild
deleted file mode 100644
index 70c2034190a3..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130722.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130722.ebuild,v 1.2 2013/10/08 13:24:12 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=10
-# highest supported version
-KERN_MAX_VER=11
-
-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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130811.ebuild b/sys-fs/aufs3/aufs3-3_p20130811.ebuild
deleted file mode 100644
index dc8258a4841b..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130811.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130811.ebuild,v 1.2 2013/10/08 13:24:12 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=10
-# highest supported version
-KERN_MAX_VER=11
-
-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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130812.ebuild b/sys-fs/aufs3/aufs3-3_p20130812.ebuild
deleted file mode 100644
index 7513edbb601a..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130812.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130812.ebuild,v 1.2 2013/10/08 13:24:12 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=10
-# highest supported version
-KERN_MAX_VER=11
-
-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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130821.ebuild b/sys-fs/aufs3/aufs3-3_p20130821.ebuild
deleted file mode 100644
index 0bfe13c5c4e3..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130821.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130821.ebuild,v 1.2 2013/10/08 13:24:12 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=10
-# highest supported version
-KERN_MAX_VER=11
-
-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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130915.ebuild b/sys-fs/aufs3/aufs3-3_p20130915.ebuild
deleted file mode 100644
index c2edb7776b2c..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130915.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130915.ebuild,v 1.2 2013/10/08 13:24:12 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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20130928.ebuild b/sys-fs/aufs3/aufs3-3_p20130928.ebuild
deleted file mode 100644
index 0c59fca606bf..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20130928.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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_p20130928.ebuild,v 1.2 2013/10/08 13:24:12 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 "${T}"/${PN}-standalone/${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20131007.ebuild b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
index e0b14dfa9022..5e5bbbe46b1d 100644
--- a/sys-fs/aufs3/aufs3-3_p20131007.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2013/10/08 13:24:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131007.ebuild,v 1.3 2013/10/13 15:18:51 jlec Exp $
 
 EAPI=5
 
@@ -57,6 +57,19 @@ pkg_setup() {
 		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