sys-fs/aufs3: Dropped old; block AUFS_FS kernel option

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

12 files changed, 19 insertions, 893 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 74389c49da6d..4d7edb1021f4 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.32 2012/11/21 11:19:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.33 2012/11/26 20:36:26 jlec Exp $
+
+  26 Nov 2012; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20120109.ebuild,
+  aufs3-3_p20120430.ebuild, -aufs3-3_p20120523.ebuild,
+  -aufs3-3_p20120531.ebuild, -aufs3-3_p20120619.ebuild,
+  -aufs3-3_p20120730.ebuild, -aufs3-3_p20120813.ebuild,
+  aufs3-3_p20120813-r1.ebuild, aufs3-3_p20121015.ebuild,
+  aufs3-3_p20121015-r1.ebuild, aufs3-3_p20121112.ebuild:
+  Dropped old; block AUFS_FS kernel option
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> aufs3-3_p20120430.ebuild:
   Stable for x86, wrt bug #422879
diff --git a/sys-fs/aufs3/aufs3-3_p20120109.ebuild b/sys-fs/aufs3/aufs3-3_p20120109.ebuild
deleted file mode 100644
index c211eb579138..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120109.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120109.ebuild,v 1.4 2012/05/24 02:55:43 vapier Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs eutils
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="2"
-UTIL_MAX_VER="0"
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 2 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			[[ ${KV_MINOR} -gt ${PATCH_MAX_VER} ]] && \
-				epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120430.ebuild b/sys-fs/aufs3/aufs3-3_p20120430.ebuild
index cd79692ff1d7..6f50117df0a3 100644
--- a/sys-fs/aufs3/aufs3-3_p20120430.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120430.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120430.ebuild,v 1.5 2012/11/21 11:19:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120430.ebuild,v 1.6 2012/11/26 20:36:26 jlec Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ S="${WORKDIR}"/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS"
 	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
 	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
diff --git a/sys-fs/aufs3/aufs3-3_p20120523.ebuild b/sys-fs/aufs3/aufs3-3_p20120523.ebuild
deleted file mode 100644
index f2be34fbddc6..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120523.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120523.ebuild,v 1.2 2012/05/24 02:55:43 vapier Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs eutils
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER=4
-UTIL_MAX_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 4 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc Documentation/filesystems/aufs/README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120531.ebuild b/sys-fs/aufs3/aufs3-3_p20120531.ebuild
deleted file mode 100644
index 6f5994f778ab..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120531.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120531.ebuild,v 1.1 2012/05/31 16:13:46 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs eutils
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=4
-# highest supported version
-KERN_MAX_VER=5
-# highest util branch version
-UTIL_MAX_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc Documentation/filesystems/aufs/README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120619.ebuild b/sys-fs/aufs3/aufs3-3_p20120619.ebuild
deleted file mode 100644
index 83d05f0b7336..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120619.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120619.ebuild,v 1.1 2012/06/19 18:56:35 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs eutils
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=4
-# highest supported version
-KERN_MAX_VER=5
-# highest util branch version
-UTIL_MAX_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc Documentation/filesystems/aufs/README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120730.ebuild b/sys-fs/aufs3/aufs3-3_p20120730.ebuild
deleted file mode 100644
index 3b46c9b0e0ca..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120730.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120730.ebuild,v 1.1 2012/07/30 08:25:28 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs eutils
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=5
-# highest supported version
-KERN_MAX_VER=6
-# highest util branch version
-UTIL_MAX_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc Documentation/filesystems/aufs/README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
index c4d3867252e3..d95f7cd4c0a3 100644
--- a/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.4 2012/10/18 20:31:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813-r1.ebuild,v 1.5 2012/11/26 20:36:26 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ S="${WORKDIR}"/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS"
 	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
 	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
diff --git a/sys-fs/aufs3/aufs3-3_p20120813.ebuild b/sys-fs/aufs3/aufs3-3_p20120813.ebuild
deleted file mode 100644
index fbde606fb750..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120813.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120813.ebuild,v 1.2 2012/10/07 11:49:11 jlec Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-# highest branch version
-PATCH_MAX_VER=5
-# highest supported version
-KERN_MAX_VER=6
-# highest util branch version
-UTIL_MAX_VER=0
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
-	!sys-fs/aufs
-	!sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
-	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
-	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
-	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
-	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
-	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
-	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
-	get_version
-	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
-	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
-
-	linux-mod_pkg_setup
-
-	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
-		PATCH_BRANCH="x-rcN"
-	else
-		PATCH_BRANCH="${KV_MINOR}"
-	fi
-
-	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
-		UTIL_BRANCH="x-rcN"
-	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
-		UTIL_BRANCH="${UTIL_MAX_VER}"
-	else
-		UTIL_BRANCH="${KV_MINOR}"
-	fi
-
-	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
-		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
-		if use kernel-patch; then
-			cd ${KV_DIR}
-			ewarn "Patching your kernel..."
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
-			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
-			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
-			ewarn "You need to compile your kernel with the applied patch"
-			ewarn "to be able to load and use the aufs kernel module"
-		else
-			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
-			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
-			eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
-			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
-			die "missing kernel patch, please apply it first"
-		fi
-	fi
-	export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
-	for option in $*; do
-		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
-		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
-	done
-}
-
-src_prepare() {
-	local module_branch=origin/${PN}.${PATCH_BRANCH}
-	local util_branch=origin/${PN}.${UTIL_BRANCH}
-
-	einfo "Using for module creation branch ${module_branch}"
-	git checkout -q -b local-gentoo ${module_branch} || die
-
-	# All config options to off
-	sed "s:= y:=:g" -i config.mk || die
-
-	set_config RDU BRANCH_MAX_127 SBILIST
-
-	use debug && set_config DEBUG
-	use fuse && set_config BR_FUSE POLL
-	use hfs && set_config BR_HFSPLUS
-	use inotify && set_config HNOTIFY HFSNOTIFY
-	use nfs && set_config EXPORT
-	use nfs && use amd64 && set_config INO_T_64
-	use ramfs && set_config BR_RAMFS
-
-	use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
-	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
-	sed -i "s:__user::g" include/linux/aufs_type.h || die
-
-	cd "${WORKDIR}"/${PN/3}-util
-
-	einfo "Using for utils building branch ${util_branch}"
-	git checkout -b local-gentoo ${util_branch} || die
-	sed -i "/LDFLAGS += -static -s/d" Makefile || die
-	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
-	local ARCH=x86
-
-	emake CC=$(tc-getCC) LDFLAGS="$(raw-ldflags)" CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR}
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
-	linux-mod_src_install
-
-	insinto /usr/share/doc/${PF}
-
-	use doc && doins -r Documentation
-
-	dodoc Documentation/filesystems/aufs/README
-
-	cd "${WORKDIR}"/${PN/3}-util
-	emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install
-
-	newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild
index b193559eb097..d8afbcf622ee 100644
--- a/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild,v 1.2 2012/11/14 07:32:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild,v 1.3 2012/11/26 20:36:26 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ S="${WORKDIR}"/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS"
 	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
 	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
diff --git a/sys-fs/aufs3/aufs3-3_p20121015.ebuild b/sys-fs/aufs3/aufs3-3_p20121015.ebuild
index 53727c48bc43..e4ce611b3a18 100644
--- a/sys-fs/aufs3/aufs3-3_p20121015.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20121015.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015.ebuild,v 1.3 2012/10/18 20:31:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015.ebuild,v 1.4 2012/11/26 20:36:26 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ S="${WORKDIR}"/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS"
 	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
 	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
diff --git a/sys-fs/aufs3/aufs3-3_p20121112.ebuild b/sys-fs/aufs3/aufs3-3_p20121112.ebuild
index 681e204c3d80..ad6e21ac555d 100644
--- a/sys-fs/aufs3/aufs3-3_p20121112.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20121112.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121112.ebuild,v 1.2 2012/11/14 07:32:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121112.ebuild,v 1.3 2012/11/26 20:36:26 jlec Exp $
 
 EAPI=4
 
@@ -33,7 +33,7 @@ S="${WORKDIR}"/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
-	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS"
 	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
 	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"