sys-fs/aufs3: Version Bump, drop old

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

9 files changed, 30 insertions, 840 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 8abc80736ec2..7c5efb31d0b2 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,24 @@
 # 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.14 2012/05/22 06:56:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.15 2012/05/23 06:31:29 jlec Exp $
+
+*aufs3-3_p20120523 (23 May 2012)
+
+  23 May 2012; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20110815.ebuild,
+  -aufs3-3_p20111031.ebuild, -aufs3-3_p20111114.ebuild,
+  -aufs3-3_p20111205-r1.ebuild, -aufs3-3_p20120319.ebuild,
+  -aufs3-3_p20120329.ebuild, -aufs3-3_p20120402.ebuild,
+  +aufs3-3_p20120523.ebuild:
+  Version Bump, drop old
+
+*aufs3-3_p20120526 (23 May 2012)
+
+  23 May 2012; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20110815.ebuild,
+  -aufs3-3_p20111031.ebuild, -aufs3-3_p20111114.ebuild,
+  -aufs3-3_p20111205-r1.ebuild, -aufs3-3_p20120319.ebuild,
+  -aufs3-3_p20120329.ebuild, -aufs3-3_p20120402.ebuild,
+  +aufs3-3_p20120526.ebuild:
+  Version Bump, drop old
 
   22 May 2012; Justin Lecher <jlec@gentoo.org> aufs3-3_p20120430.ebuild:
   dodoc doesn't follow symlinks, so install the file directly
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 116572e756ac..7827aa07f6e1 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -15,31 +15,19 @@ AUX aufs3-standalone-3.patch 7671 RMD160 4487131557b3e34cf06bba6642b4aab3e397e61
 AUX aufs3-standalone-x-rcN.patch 7675 RMD160 548c928270fc1c0d1b0f4e0846431ccd5188bfcb SHA1 a703f5518fe7a5089018f9bfac1df04d101ce7d9 SHA256 444987216ef9bb757210c1bb33abf3c99fb2716a7fbf96aec026d3effeb7ecef
 AUX parallel.patch 725 RMD160 45b54727f87723174884d19adb708f3983afb44f SHA1 15022c8d1570be2281845b7a9abe664f80258728 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
-DIST aufs3-3_p20110815.tar.xz 391672 RMD160 f99b997401f1d983cb46ceb355445b94e6103c56 SHA1 f1d91e872cc75ee8bb76f6f4a08ddbe3c3a9c6b8 SHA256 e7d71097ba949c9a42b726f0e13ada8bed41f3630a4749f46a0eb7823851e337
-DIST aufs3-3_p20111031.tar.xz 432796 RMD160 1321f3233578ac563d998fac5430b78e0c74eab3 SHA1 18c5244bb3ca28babd09a6350df42bc53a3a8bd0 SHA256 c9d9332fe9fab6c8cdadfa890591ef872cdf68ea1091cbaf60e79cdfb2113355
-DIST aufs3-3_p20111114.tar.xz 472760 RMD160 60c030fc9f7c5e5297a0c68efb6501039de281bf SHA1 6c1c4535156e9c8115417f336d5745a46618133a SHA256 3e68f7ffe4feee593f786b3f335e0ec83ff576d40a262535fa2b2f79d872bc0a
-DIST aufs3-3_p20111205.tar.xz 478084 RMD160 33a545ec241a855b5e1d675334da6cc77417b58d SHA1 bf4e4d728cfe8a551f334eef57c6d850c93b072d SHA256 c522eaf622d7efb9489cde47c6fe2ac49ffe24d86871191ab76bfb7684a4824b
 DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444
-DIST aufs3-3_p20120319.tar.xz 699072 RMD160 ffed47615fbbbe4b0746d1e5957737832b2f2e03 SHA1 a33d019c73a1b5a919b02bbb563700ebc4072ea9 SHA256 4eb25133344c329926813586adf6736dfe57ce2c64a940115dc71a1a2cc03da8
-DIST aufs3-3_p20120329.tar.xz 981864 RMD160 deea937b4f209282135fcb0dc139f7e89f250109 SHA1 b20ae435c2b70d933191f6336e7649fb709be2fd SHA256 e3de219bc7018c3e245131e85aa62f60230f654788c2eb72753c3c7e3d9a7004
-DIST aufs3-3_p20120402.tar.xz 1042724 RMD160 dfe8ae1b4676daa8b1341bd872b20d89db01735c SHA1 36289be6e75dd9787479144cedee395999bd6ef7 SHA256 8ff21ed0f5e472ffb1c5954188fd45ec5758c16856e7cac21b61496af2d455c8
 DIST aufs3-3_p20120430.tar.xz 1085556 RMD160 3d6d8f8a11f1bf3a958036c079b55b268710f24b SHA1 375ea311f5540c57eed0636f1c0f13accafaf1df SHA256 1b6ce1cf87377033e3741111db4f40cafdcb969b22f80b406c9407535e71788c
-EBUILD aufs3-3_p20110815.ebuild 3924 RMD160 3b62654d7c66a13a9b3c2a8ed7b0ab57d9d6699d SHA1 d1293e727a590619a42706cf6d63975681f14116 SHA256 1b83d7bc7f5a2779ddb0de7bcd19c9daae64278af9106cb41949be4c5bab51c0
-EBUILD aufs3-3_p20111031.ebuild 4064 RMD160 ae385f7895de0b58d892e5a84669c8993a999417 SHA1 b871613ac5c22a410979edaef2d19c10ceed2941 SHA256 56405349d2dc3dad6eb4028d6048ff3e5b6b96c45fe7b7b5a68c2c474369b43f
-EBUILD aufs3-3_p20111114.ebuild 4023 RMD160 ce04630f37c94af8b8bcd0311e497f9d1725b722 SHA1 6a197abdb447826b471262ba0b66fd3a8ece3a4d SHA256 d74a55ddb45e996ef1c853487e925d5d1e350a8b1b9cc51c04ec36bd6b0fabae
-EBUILD aufs3-3_p20111205-r1.ebuild 4613 RMD160 0cbca3ae3b89b66f57e97597ffb050e72d814db9 SHA1 396cd1841bd8b833ef078391469f5bb4836bac3c SHA256 350e90ce6438697d39c462c660694bff82891553885be3db8446fa5c88b57c20
+DIST aufs3-3_p20120523.tar.xz 1108480 RMD160 3b0db00430b934301b68fcf945856debe6ccbc0c SHA1 de3b0d2a1fc49e9196075e760ae76be64516e247 SHA256 694d0a89653959d6175ee52cfd29e5bb7a8c026d00200310b198fff57ad188f0
 EBUILD aufs3-3_p20120109.ebuild 4610 RMD160 7ed8ef799abf3c03bf72b168fe260a7cd0968645 SHA1 c1861a26ae1aae3231fe77f21dc095be4a69a571 SHA256 46b13f9dbf9eb299fa1a6ed435aa72db6f0932a059a2570a349a9d4372ddfa89
-EBUILD aufs3-3_p20120319.ebuild 4486 RMD160 86910cd1b5d7af00f676224cb9309454c7b27165 SHA1 62c2f309d735862bd4c53f6acb086edb75e9da32 SHA256 5b6b41eff4a94ce64866e85c35981992abf768948304e7907efab80961f9b495
-EBUILD aufs3-3_p20120329.ebuild 4486 RMD160 49d3edb3d2f9036859ca4e1d0a944377570b445f SHA1 218d777e311ec20253a14beaa3a16a3c6bc79922 SHA256 803b3700ab3b596488cb57b845411f8b07070f4b02ee600ba76bd38224b30480
-EBUILD aufs3-3_p20120402.ebuild 4524 RMD160 0f3b4a9e3cc9a4b85e689ab273c16a87a9c08cc7 SHA1 d262aaffef644ec046abc3a1ff1f71a8b57902c4 SHA256 9503195e3b11928ff3d19871f6d619dc0e21ec534507d2d41d0dc0287d618f76
 EBUILD aufs3-3_p20120430.ebuild 4517 RMD160 660cfb2604396bc276222673960994d2e1d80d6b SHA1 9dbac2d584ccf44364e8d4348d9b1fc1e27f710b SHA256 19d3975ecff600a5b938fee0fdb977e065f88a7411463391d86ab7748a1576b1
-MISC ChangeLog 3658 RMD160 02c0da36e1f0940cfd84b0760bd36fef1b2d98cc SHA1 cde466e109b252e6d1ab2cb31cda8e25b2bf6c65 SHA256 79e8f9e6a019eb5b8bde7a7245ad5d12d09032c4efbbd1be7bbb2194f6f13e72
+EBUILD aufs3-3_p20120523.ebuild 4513 RMD160 95e47b51757d8eaca75b3065483a189fd77bae38 SHA1 3e7411159a639242c63f6bf93cdf4198bb2ac39a SHA256 0327bad42b3c8ed356069590c04c76fe763336ecd1a24e5d4157f8891bc6b3a1
+MISC ChangeLog 4326 RMD160 5efa706f6fc9f2ef0cf90711625686ccbb3dbb82 SHA1 65ca15511cbdbb3d67ada530027e2946cbce7ecd SHA256 5095b1df18b01a80461b1c2b40f1b4f762c776dae2298f89e7b90a5f12782d9a
 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+7OKAACgkQgAnW8HDreRb+pQCaA5hwz9g9jBLpaMb3Np6tcZac
-wTsAoL06HuKZ9hbw/u6NJtoZQdsTcuZn
-=DpQn
+iEYEAREKAAYFAk+8hEYACgkQgAnW8HDreRa/2ACfb9BPtsWVpDXIH5dXg408JSyY
+OPAAn1/GvB+4+pgtMZxXHWMKbwvY4fJE
+=1ALp
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20110815.ebuild b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
deleted file mode 100644
index e8ffbc6c3ac6..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20110815.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20110815.ebuild,v 1.1 2011/08/28 09:48:57 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-
-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 0 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_MINOR}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_MINOR}.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-${KV_MINOR}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_MINOR}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${KV_MINOR}.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-${KV_MINOR}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${KV_MINOR}.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 branch=origin/${PN}-${KV_MINOR}
-	local branch=origin/${PN}.0
-	git checkout -q $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
-	git checkout -q origin/${PN}.0
-	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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111031.ebuild b/sys-fs/aufs3/aufs3-3_p20111031.ebuild
deleted file mode 100644
index 22e166ff6328..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111031.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111031.ebuild,v 1.1 2011/10/31 14:01:21 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-#PATCH_VER=x-rcN
-
-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 1 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	[[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR}
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.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_VER}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.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_VER}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.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 branch=origin/${PN}.${PATCH_VER}
-
-	git checkout -q -b local-gentoo $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
-	PATCH_VER=0
-	git checkout -b local-gentoo origin/${PN}.${PATCH_VER}
-	epatch "${FILESDIR}"/aufs-util-31.patch
-	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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111114.ebuild b/sys-fs/aufs3/aufs3-3_p20111114.ebuild
deleted file mode 100644
index b4fad62af637..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111114.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111114.ebuild,v 1.1 2011/11/14 10:50:01 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-#PATCH_VER=x-rcN
-
-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 1 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	[[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR}
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.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_VER}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.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_VER}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.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 branch=origin/${PN}.${PATCH_VER}
-
-	git checkout -q -b local-gentoo $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
-	PATCH_VER=0
-	git checkout -b local-gentoo origin/${PN}.${PATCH_VER}
-	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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
deleted file mode 100644
index e39efccbacf5..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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_p20111205-r1.ebuild,v 1.1 2012/01/08 13:31:17 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="1"
-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 2 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
-			[[ ${KV_MINOR} -gt ${PATCH_MAX_VER} ]] && \
-				epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120329.ebuild b/sys-fs/aufs3/aufs3-3_p20120329.ebuild
deleted file mode 100644
index acb6421f240a..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120329.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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_p20120329.ebuild,v 1.1 2012/03/29 07:48:46 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="3"
-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 3 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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120402.ebuild b/sys-fs/aufs3/aufs3-3_p20120402.ebuild
deleted file mode 100644
index b29eeb5bb162..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120402.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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_p20120402.ebuild,v 1.2 2012/04/28 06:59:11 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="3"
-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 3 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
-
-	epatch "${FILESDIR}"/parallel.patch
-
-	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 README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120319.ebuild b/sys-fs/aufs3/aufs3-3_p20120523.ebuild
index 0e847fbf5061..bb5fd55d786c 100644
--- a/sys-fs/aufs3/aufs3-3_p20120319.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120523.ebuild
@@ -1,14 +1,14 @@
 # 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_p20120319.ebuild,v 1.1 2012/03/19 21:25:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120523.ebuild,v 1.1 2012/05/23 06:31:29 jlec Exp $
 
 EAPI=4
 
 inherit linux-mod multilib toolchain-funcs
 
 AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="2"
-UTIL_MAX_VER="0"
+PATCH_MAX_VER=4
+UTIL_MAX_VER=0
 
 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
 HOMEPAGE="http://aufs.sourceforge.net/"
@@ -40,7 +40,7 @@ pkg_setup() {
 
 	get_version
 	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 3 99 && die "kernel too new"
+	kernel_is gt 3 4 99 && die "kernel too new"
 
 	linux-mod_pkg_setup
 
@@ -135,7 +135,7 @@ src_install() {
 
 	use doc && doins -r Documentation
 
-	dodoc README
+	dodoc Documentation/filesystems/aufs/README
 
 	cd "${WORKDIR}"/${PN/3}-util
 	emake DESTDIR="${D}" KDIR=${KV_DIR} install