sys-fs/aufs3: Bump to latest aufs3; drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

25 files changed, 21 insertions, 3807 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 611e0eead842..736c29443c77 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,23 @@
 # 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.104 2014/08/21 11:52:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.105 2014/09/13 13:35:03 jlec Exp $
+
+*aufs3-3_p20140908 (13 Sep 2014)
+
+  13 Sep 2014; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20131007.ebuild,
+  -aufs3-3_p20131014.ebuild, -aufs3-3_p20131104-r1.ebuild,
+  -aufs3-3_p20131111-r1.ebuild, -aufs3-3_p20131223.ebuild,
+  -aufs3-3_p20140114.ebuild, -aufs3-3_p20140119.ebuild,
+  -aufs3-3_p20140127.ebuild, -aufs3-3_p20140127-r1.ebuild,
+  -aufs3-3_p20140224.ebuild, -aufs3-3_p20140303.ebuild,
+  -aufs3-3_p20140310.ebuild, -aufs3-3_p20140420.ebuild,
+  -aufs3-3_p20140511.ebuild, -aufs3-3_p20140526.ebuild,
+  -aufs3-3_p20140602.ebuild, -aufs3-3_p20140609.ebuild,
+  -aufs3-3_p20140616.ebuild, -aufs3-3_p20140623.ebuild,
+  -aufs3-3_p20140630.ebuild, -aufs3-3_p20140707.ebuild,
+  -aufs3-3_p20140714.ebuild, -aufs3-3_p20140721.ebuild,
+  -aufs3-3_p20140728.ebuild, +aufs3-3_p20140908.ebuild:
+  Bump to latest aufs3; drop old
 
 *aufs3-3_p20140818 (21 Aug 2014)
 
diff --git a/sys-fs/aufs3/aufs3-3_p20131007.ebuild b/sys-fs/aufs3/aufs3-3_p20131007.ebuild
deleted file mode 100644
index 9ad2347678c2..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20131007.ebuild
+++ /dev/null
@@ -1,157 +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_p20131007.ebuild,v 1.5 2013/10/22 13:10:14 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
-
-	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}
-	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
-
-	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-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20131014.ebuild b/sys-fs/aufs3/aufs3-3_p20131014.ebuild
deleted file mode 100644
index 60be5744fbd1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20131014.ebuild
+++ /dev/null
@@ -1,157 +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_p20131014.ebuild,v 1.3 2013/10/22 13:10:14 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
-
-	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}
-	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
-
-	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-combined.patch
-
-	dodoc Documentation/filesystems/aufs/README
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20131104-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20131104-r1.ebuild
deleted file mode 100644
index 32440079420d..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20131104-r1.ebuild
+++ /dev/null
@@ -1,158 +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_p20131104-r1.ebuild,v 1.1 2013/11/19 14:03:10 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
-
-	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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20131111-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20131111-r1.ebuild
deleted file mode 100644
index 96e0a2f95dd9..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20131111-r1.ebuild
+++ /dev/null
@@ -1,160 +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_p20131111-r1.ebuild,v 1.1 2013/11/19 14:03:10 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=12
-# highest supported version
-KERN_MAX_VER=13
-# lowest supported version
-KERN_MIN_VER=9
-
-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 ${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"
-	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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20131223.ebuild b/sys-fs/aufs3/aufs3-3_p20131223.ebuild
deleted file mode 100644
index 29895039e28a..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20131223.ebuild
+++ /dev/null
@@ -1,159 +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_p20131223.ebuild,v 1.1 2013/12/26 14:57:59 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=12
-# highest supported version
-KERN_MAX_VER=13
-# 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})"
-
-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"
-	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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140114.ebuild b/sys-fs/aufs3/aufs3-3_p20140114.ebuild
deleted file mode 100644
index 0f6be0fc45ba..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140114.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# 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_p20140114.ebuild,v 1.1 2014/01/13 07:16:57 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=12
-# highest supported version
-KERN_MAX_VER=13
-# 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})"
-
-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"
-	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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140119.ebuild b/sys-fs/aufs3/aufs3-3_p20140119.ebuild
deleted file mode 100644
index dff318554abc..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140119.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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_p20140119.ebuild,v 1.1 2014/01/20 07:28:36 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=12
-# highest supported version
-KERN_MAX_VER=13
-# 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})"
-
-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_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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild
deleted file mode 100644
index a36ce3df7004..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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_p20140127-r1.ebuild,v 1.1 2014/02/04 17:31:30 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=13
-# highest supported version
-KERN_MAX_VER=14
-# 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})"
-
-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}" == "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}
-	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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140127.ebuild b/sys-fs/aufs3/aufs3-3_p20140127.ebuild
deleted file mode 100644
index 882992826280..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140127.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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_p20140127.ebuild,v 1.1 2014/01/28 11:20:02 jlec Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=13
-# highest supported version
-KERN_MAX_VER=14
-# 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})"
-
-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_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}
-	git checkout -q -b local-gentoo ${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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140224.ebuild b/sys-fs/aufs3/aufs3-3_p20140224.ebuild
deleted file mode 100644
index 54b866162e7d..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140224.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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_p20140224.ebuild,v 1.1 2014/02/24 09:15:53 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=13
-# highest supported version
-KERN_MAX_VER=14
-# 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})"
-
-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}" == "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}
-	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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140303.ebuild b/sys-fs/aufs3/aufs3-3_p20140303.ebuild
deleted file mode 100644
index a1e7c54efbe1..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140303.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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_p20140303.ebuild,v 1.2 2014/03/06 15:25:50 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=13
-# highest supported version
-KERN_MAX_VER=14
-# 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})"
-
-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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140310.ebuild b/sys-fs/aufs3/aufs3-3_p20140310.ebuild
deleted file mode 100644
index 4180f6df0a7b..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140310.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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_p20140310.ebuild,v 1.1 2014/03/10 07:30:46 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=13
-# highest supported version
-KERN_MAX_VER=14
-# 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})"
-
-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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140420.ebuild b/sys-fs/aufs3/aufs3-3_p20140420.ebuild
deleted file mode 100644
index b3b3eb3124fe..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140420.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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_p20140420.ebuild,v 1.1 2014/04/24 12:00: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=14
-# highest supported version
-KERN_MAX_VER=15
-# 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})"
-
-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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140511.ebuild b/sys-fs/aufs3/aufs3-3_p20140511.ebuild
deleted file mode 100644
index 902acc979f4b..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140511.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# 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_p20140511.ebuild,v 1.1 2014/05/13 11:18:56 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=14
-# highest supported version
-KERN_MAX_VER=15
-# 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})"
-
-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
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140526.ebuild b/sys-fs/aufs3/aufs3-3_p20140526.ebuild
deleted file mode 100644
index 95cccd7d1724..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140526.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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_p20140526.ebuild,v 1.2 2014/06/02 09:23:19 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=14
-# highest supported version
-KERN_MAX_VER=15
-# 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})"
-
-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-ibitmap}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140602.ebuild b/sys-fs/aufs3/aufs3-3_p20140602.ebuild
deleted file mode 100644
index d35b54e19075..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140602.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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_p20140602.ebuild,v 1.1 2014/06/02 09:23:19 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=14
-# highest supported version
-KERN_MAX_VER=15
-# 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})"
-
-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-ibitmap}.patch
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_pkg_postinst
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20140609.ebuild b/sys-fs/aufs3/aufs3-3_p20140609.ebuild
deleted file mode 100644
index 69a262a90521..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140609.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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_p20140609.ebuild,v 1.2 2014/06/14 09:12:06 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=14
-# highest supported version
-KERN_MAX_VER=15
-# 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})"
-
-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/aufs3-3_p20140616.ebuild b/sys-fs/aufs3/aufs3-3_p20140616.ebuild
deleted file mode 100644
index 12fd6254bf35..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140616.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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_p20140616.ebuild,v 1.1 2014/06/15 17:31:59 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})"
-
-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/aufs3-3_p20140630.ebuild b/sys-fs/aufs3/aufs3-3_p20140630.ebuild
deleted file mode 100644
index d1d9510058ea..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140630.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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/aufs3-3_p20140707.ebuild b/sys-fs/aufs3/aufs3-3_p20140707.ebuild
deleted file mode 100644
index 3be97026ece6..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140707.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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_p20140707.ebuild,v 1.1 2014/07/06 19:21:58 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/aufs3-3_p20140714.ebuild b/sys-fs/aufs3/aufs3-3_p20140714.ebuild
deleted file mode 100644
index 81221678cb38..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140714.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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_p20140714.ebuild,v 1.1 2014/07/14 08:56:03 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/aufs3-3_p20140721.ebuild b/sys-fs/aufs3/aufs3-3_p20140721.ebuild
deleted file mode 100644
index 3fb8cb923539..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140721.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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_p20140721.ebuild,v 1.1 2014/07/21 09:15:32 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/aufs3-3_p20140728.ebuild b/sys-fs/aufs3/aufs3-3_p20140728.ebuild
deleted file mode 100644
index baa87144250e..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20140728.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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_p20140728.ebuild,v 1.1 2014/07/30 07:37:10 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/aufs3-3_p20140623.ebuild b/sys-fs/aufs3/aufs3-3_p20140908.ebuild
index 80e1456ae953..66719115adfb 100644
--- a/sys-fs/aufs3/aufs3-3_p20140623.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20140908.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.2 2014/06/30 07:04:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140908.ebuild,v 1.1 2014/09/13 13:35:03 jlec Exp $
 
 EAPI=5
 
@@ -8,9 +8,9 @@ inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchai
 
 AUFS_VERSION="${PV%%_p*}"
 # highest branch version
-PATCH_MAX_VER=15
+PATCH_MAX_VER=16
 # highest supported version
-KERN_MAX_VER=16
+KERN_MAX_VER=17
 # lowest supported version
 KERN_MIN_VER=10