From: Justin Lecher <jlec@gentoo.org>
Date: Mon, 4 May 2015 13:51:58 +0000 (+0000)
Subject: Bump to latest aufs
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a3b77e0293235163261b01ac99ce861c2b665560;p=gentoo.git

Bump to latest aufs

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

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index b7e7f0adf31e..b20e36b9026d 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.130 2015/04/22 06:25:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.131 2015/05/04 13:50:02 jlec Exp $
+
+*aufs3-3_p20150504 (04 May 2015)
+
+  04 May 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150504.ebuild:
+  Bump to latest aufs
 
 *aufs3-3_p20150420 (22 Apr 2015)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index a708758eb814..eceb9a72ac53 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -6,26 +6,28 @@ AUX pax-3.11.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 DIST aufs3-standalone-3_p20150406.tar.xz 2863952 SHA256 e2de4fcdb086ab33bc182b084bf534891cc31a7d3ffc805d40dc087c37ab464b SHA512 c843999798f99fef5c16232935606ca438774104dc04c58982bb2b3f9ae371d9f2173b5454d366481de22fd3e658ee9e67f6981504c5c8157af20a8f15f269d1 WHIRLPOOL 0d2efaa6918c6f90339cae02a9ef3908921e8d1903364aaff9af034262f439886a02a639f9eaae27a28093fc6bf451bbc9fe7072a766a36e51f75c779378095d
 DIST aufs3-standalone-3_p20150420.tar.xz 2864092 SHA256 0f592b3c84b149d0842c518b83656be61a627f5bb9c953b824fd1631e24a2224 SHA512 ad383f37c5201a6a6e53e91f18d63648b3768b8327f07c36a207eb90b63b13779709a0f18696896c833866a30e1010c70ad8aa1259ae08dca5465a68f91d48e5 WHIRLPOOL 029f0cb665e0aa5f8d8bc2a93177e73d8ee7d80d68326f4f38018cec5678ff70378e70473f48bde1ba4f8096331eae4e40949b7c732f22789d09c690cd5cfce7
+DIST aufs3-standalone-3_p20150504.tar.xz 2886004 SHA256 f88435f8fa5d0316a5d87cc8c99012a5504e4f52deee518ae6d4b48152a38071 SHA512 acb863eb197a089e7720237f4b1f1a28be150eee751cb6930e16d96053c1dee84333479ac5f2e5eee2107fe73f9563fe4864c01d07a9de452cff1b7fd283844c WHIRLPOOL d6dcea3e86d0eb5636fe6026c9d8e887e8c15283f364aaf41fe1b7eb4ebfe51caae8dcad26162353e90a28e27587a777fa6d7d6e710c1d1006f2b597bd39c06e
 EBUILD aufs3-3_p20150406.ebuild 5310 SHA256 5577be022e8319c4bbcd7fe5e97317c96c4c6af55ce2b49399592a945d4f9aac SHA512 b1fa9f91ed61c1e299dc798544078377ea043d4cb5ca821acd06f172cad227f2ee42e5bd773ed682713c1f7cc30bf8e814d1920384413f51afecd2a5d6a37fc0 WHIRLPOOL db231654ef119992785e5e35fc91ea6760e7cf5aa5efe14001214fb916224bbdd6da823d907d0ee6b83f9dfce8082ae37fe62da2c92816f7c9ed264b2f8efa23
 EBUILD aufs3-3_p20150420.ebuild 5310 SHA256 3239b19a3faba15d48689f9b981aaf308a0d9084685d6a577b43d5cf5bdbb359 SHA512 e956ba3468042c0118b0e6be27deb06b99cc0a51a17fb4b78ca0cea6d2fb4ab546a62c026874717c7570dedb8f63768d9111c579b260b1186329c07aeacf11fd WHIRLPOOL f668d9139a38ba4878f10ad9005fa8faa34a72abb1d14c394a940dab7708015f0e6b16b390be88ae34c9cfd751c9d0021abbaed4f35bf81d6d5db0f2169a0ae2
-MISC ChangeLog 29504 SHA256 c352babe480195e8b8321595ebd64d55b73f0f50fc8b90683c2a369faea4f4e0 SHA512 2fafe319bd57ec8e93c8ceee2824fb0fe078f52df969eef51b751d9cdc338e7b54197c607a864e5b439f558b7b67a51b5c93dde674d7c65e4d80ee3154f76392 WHIRLPOOL a817d471475626d8e0bcb25f0f9a678d8b3ab316a05929c92a5cabbd0b6fc2d823e0891a772631bbed2e62724aeba12643ad4d654601cee3b85ff6a66edffe66
+EBUILD aufs3-3_p20150504.ebuild 5310 SHA256 6cb0fa1578b6fc5f73832d1354c8f74febbf95c8289a813f986aaf8a1c7d33ad SHA512 9e627f9ca209e2dff5037eab2310b4cce4608c82a790319854faaa5ac6a447cfdf04e3b14e3a56cdee7be6682667020cf59ebe63149abc4b0f565f36755a8f8f WHIRLPOOL 05d6fa22671a95f21e47c41cf8ce823fbbb4d5e6da88c9f10c0c0c96002c4dd60bf819258e09eaa7ac9776d3912e23329d4eccc3adbd44700f846ad9ba6484ef
+MISC ChangeLog 29635 SHA256 e521e40ed0ec7a1f58c3917ea820b85f9f04d62c5fd55a5c70ef6999481231e5 SHA512 4278c2d6a35e2964010996cbb6577ab5e9ef093355d1315aada53d6c4a0fd293f8dc4830ed7f01175f57491395b151b3b3ff833264aab87cbfc5c4300fd61f98 WHIRLPOOL 0ec1ce09de2bc3df57fad703b08c515c8e7d6934f24ef08cef928874cad2b97322a57e21dadcef97f7dbe9edf12aa5acd3fef19d1e5d27fdb81dc0f835f83c28
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVNz7BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVR3kAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirBQcQAJzno847+ypi5vQFWcWNbAs5
-EfkMgZIGITSQvJVnHhBus0Icv9FGMsHO9ZEfq8Svba25X31mkljgf1lVb5+swGH1
-JG2r3N9CjZGbWN2ZittsJQD08maK8ybXxxiKGoHdZZDUIu7ZwjLQga4tDyN8U/Wp
-rM1KaYWRJWpKpnO6gDrGOSorKOjfQzQjll8B5/aMWhfdwC7A7m4XkUIoHfruQTQJ
-O/FBgeTqucCMqnaqsdXkGONMP1RfULAptMvqNUHdzqSa8PE703FfORMQdkytvcSy
-iET4bdhkHzT3WqZrDXztNCLQxQBwRD7W7A6IT3ig9nc3RULxZM6XBuriuWElXYci
-SRznCZBMi2o9F2XQo/4heyplFzeQfBAHv4YRkaImhZPfRN21OwBMdHMxUrh4wivM
-gXgmwjgs3FVQCtYNZlt+PQxxMpoy6N4kIQBfZ/86yFp1zjshs7eTq0lArnIPaM3Z
-dfvn+uTG4nzgLUDPcI/OtaH86LU1iSBt7JW2cKwm0cu3cvXTehXaRNZ5VuYFgguz
-+bfc+eQu+2as0my+3NFmYMQFlyI7xkMo1pIweimOpY1x0PPhwLh9PGA67qwwubY7
-q2SeepRYAdQuWIv0XOBBID+Jhpuuo56XOlCPqqaJlky5NflWYyIKHHrGoeiQ3onb
-bAAbjfcdliU/1rST46Bx
-=Lnpx
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirB34P/3U0SH2NTfdUhZ2tkLXR19eP
+Nj7Tz8QiywT0+4+ADiWvloGHiGUPJPxBYzyIyaTPy6AfzGH+qrz9TvAJsfCICr3x
+nALHhKjD6xpTu+79BT7BjFBxzLf4xE8AJiQtkKN9iE7oUsls0g9HbCXCEW2XwtpC
+MPAM7wEJOWoJOMhi6gZMiuYFHzAFSHNlqalKxnzeencnRCinSo/M0EfLCgvI6uJJ
+2572EJ8y55SdA7C6cqnfS2yGWKKOOEQqGlghNCPiADO1YuGHvWQ+dGx/RVeM5pcZ
+41h4ic3Rv5mKfJlhosxZArOQzRyi0Yj03g4Qh9j4Nxu34xjYO+CSqbL3onfwGh88
+X2tkush0oRfif6Eho7ojh9YOVI/D6JCUiyOXZiCSFT10/+STdmAAcpGevgQXNxRr
+SDZqXUMYde0FP+kVWW3YgU0V/K9RHlKAyKUL/Ni0QphaxWVCk8+EotxdOhthQK8C
+W9GzOswmJweI4gXAGLUFSjNMtLqeHKC3exgJ+v9hJrHCXMV2O4kkNXaIzukBm5Cc
+7Fck0qklZShrg7YaFMwrH5N5vwjTZhGUlscq+qBssnHMRSM9ZaYaV+L3FvDd6lRl
+RpSysfglaM+iK3xO9Cidr79Y2+Bxo5y6RtwBmLUF0cIf3U5ycuU0ayXQqZpAI1Mn
+fLo4L+qFWggTLO8hMV9+
+=TBud
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150504.ebuild b/sys-fs/aufs3/aufs3-3_p20150504.ebuild
new file mode 100644
index 000000000000..3f955caf8743
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150504.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20150504.ebuild,v 1.1 2015/05/04 13:50:02 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=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+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
+	!sys-fs/aufs4"
+
+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}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".12+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	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/aufs4/ChangeLog b/sys-fs/aufs4/ChangeLog
index 92422eead3b5..ac2733ac59c5 100644
--- a/sys-fs/aufs4/ChangeLog
+++ b/sys-fs/aufs4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs4
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs4/ChangeLog,v 1.1 2015/04/20 07:24:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs4/ChangeLog,v 1.2 2015/05/04 13:51:57 jlec Exp $
+
+*aufs4-0_pre20150504 (04 May 2015)
+
+  04 May 2015; Justin Lecher <jlec@gentoo.org> +aufs4-0_pre20150504.ebuild:
+  Bump to latest aufs
 
 *aufs4-0_pre20150420 (20 Apr 2015)
 
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index a4b42337b0ce..0a4907ecb853 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -4,25 +4,27 @@ Hash: SHA512
 AUX README.gentoo 911 SHA256 9b9eb681f692f052105bf3d3d15e689685a5fcfba1d90a88b3351158d4cebd97 SHA512 f22f1e1fae62c7a03230194c05701dc03502b84a52cfc8aacb5fbfab2c1f8bed9d4f3f97d0095578d497b09f818a3a45a04ef8527983e0cbfa9db10baeb1b691 WHIRLPOOL 73c88b3df5e691659e2e2044bda00119e742178868fa74ca7990c3d0204eaca495bc625353c22804c7420db807774941cdddd2e901c2cbceb36aa220ee3d4d95
 AUX pax-4.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec3f5234e7e1ef446 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 WHIRLPOOL e329ea70448d30510b5dc64ba9eca54c969c6781dc75ed326714ad0de90d10f43844e62e840cf1bfaed0ebb166b9f8a3cdef295ff06f5b38b4e5d75857e3fb46
 DIST aufs4-standalone-0_pre20150420.tar.xz 424400 SHA256 7d96ee8bb16a4b72d60bfbab2955f5e68aec5a01d61a0a4870bb90f69099ad0f SHA512 71e460c582591861a1042fe628b186f081581f61fef61ccdc1ddb98ae7ee289ae58922c9df1549109f4351c8de3858fb3b2eb040f7e1da488f05f5b954468311 WHIRLPOOL f6b324404a62b465cd8a2d677000c4b4c7f951fa502f7ed6e5634d4a39dc90bb87e245a7f7036379a02d8e7f8a9fc64801c33e86ceb747b63912b8509d68a925
+DIST aufs4-standalone-0_pre20150504.tar.xz 466636 SHA256 b14bba141ead117ff9193a8a896a2bcefc418e11e642eb8547d4785833d70261 SHA512 c1299eb6ca179e60e60be2f7792001e2277f9507fd416994abd41c43e066be46ea508eaface45740153e4c34ccfcdcb3aa6a6118c840786fb1abf5aa56d6cc63 WHIRLPOOL 37bf469947c8ef5e0724e37fa40ec9535ff4065f81e64d45d924c16bb1d059d526ae853d0a73cd67de2aeacd3c41444a3a51545e9a12d08c0b8b27b526fa4dff
 EBUILD aufs4-0_pre20150420.ebuild 5020 SHA256 180081d27d54d72526787fdb6257ead687c825735514582382655bc9ebb2766b SHA512 466bc2fd3c5627757625256d5413b68472f3c7ff16a914fd3b4843353d8a02bf2246988a0b0e6a215a0e60897303eb7d45547c6e4355bc9873dddfef0369fa29 WHIRLPOOL b507506ee4227d5feeb5554954422e4661958076062d3753a6a666075eaef90814687a687a5f93beb9bfdfdf1d7e1d24e52e05815f288d5cd644a0ec569ba303
-MISC ChangeLog 380 SHA256 dca6bb23130a8e725f0fa40d6dd4ff2ca4e53ef3d7fa941fca0442931466a85b SHA512 b611cef430976e66f73cd6d4c1511472b63dc1e71b351fa47c0bd21dee40b487556ef84c5d938dfec96dbe4d9fc330c7f1038f129fc87f3dc1ca950a4e8d3f21 WHIRLPOOL c254bea71747c7720e85928c1419c22366ad3587e9712dce96264ede81f04b53da3e9935cc2c18c1aaa31d7ac0c1125d8c826c69f5941fad8e47e2a340bb80da
+EBUILD aufs4-0_pre20150504.ebuild 5020 SHA256 50e1637eac52a46b1959e4bab5ea01937484f5d520ba1c4ade25dcf444dbabd7 SHA512 e196460b00c6db2a8ed86e21485b97e39ca258bd05ae8652e4b5e92cdec3cf5d5901d82f018bcbf5b555879f5e445951b74f5079aa54ccf1ec854f501beb782a WHIRLPOOL b98c7e59453dc432d9ca0c02f7608b1e5e1f9e6aea9aca7aa73685c6db88f373fedf97d64c17bbee5a3ec0332696a2b3aeb4155d3479658ddbd8cc4dfbb5c52a
+MISC ChangeLog 515 SHA256 2203515320e75aaaf6e9cd998d7658d384e552b1f3ee82a56f9ee7f15941433c SHA512 88a7342291f5636508cb083af2194bcfddb66d61ec3c58b1280f86e54e3e5ee4e3eede53878c976fd70aab92cfc5796bd24fedd9d3fb909126553abe449aaf99 WHIRLPOOL 44e0dbdac5dc0387ff2c7931a221c2bc92a07e53b3852ec5316f9b5aaff3baec50020fbe24e20b89637d1bd743a25ee61375ec81a286cd76f460ee81caac09b4
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVNKmjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVR3lzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbLEP/R0S60dybs8KXCzN4/6cbwPB
-cMvjy6Bh+I3XeqhJ1qAyPU/510jF3brFZGPtXCUChuO8V9VUmyZ6oYPg8eQQC+Ai
-aKlbyMrQTmdeTa3IUh48sEGg7A2DIOTj9/ncxPh3EHbMq1lhooqPHEpUeFVmEzrn
-JkB3xxGWPFbsyTJ84VokcWkQADpvmd6lXdsLNzN5BNYxvFCHa3cqloi8jGSVV3iW
-E15lqlTHFb81T84/J1D4oZcqkywknFoF7gzrAldbRq/1/OrXiOFQQjddHYcq+V0X
-0/auyVGxmeFytodCroY6Kx67KNBmK31z7tM2BQoWu025igJt8j/O+1pO3NoQ4rUb
-r50KVI7cPnCZjDNkaBq24v+7lykTqwyKFpU1+N0dLfpvZMDltBXPrbyI5C2XZpqj
-6UySzR2aC2U3+0aRkeDX7oB/bkS45iDj0xlwTqApcVhcqvaE7bwdHnlxYggAveSj
-uMwvXo3f+UnHsVK1W8yCrdMMWniXY8pSBkUqc8x8IqXKadKCkOWnBq9n/8bhf/SF
-rHsfeUudg2TDrZxiRxVTmKfqaxqs3dHp2Cte1jKln64rZa6B2XHB4JP3pWAhZlcU
-nhAcgbfnAImwq+gCgdu3ELhJsHhF0wvKtb5uYB/qy5mZtkSvFV9z3eZM31wlIbd4
-D5ePdyZbmMEE8cDser56
-=FUcb
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir4L0P/04EuvFrs1utLU1BzRVwKs0F
+/LklDFVKtN1M4Z+N/8DOFSpf2iwfwd/oljDvFuwN8ra8/7l39xmM40aKm7z9mz9y
+/z1FTn/dS6ad2jRSj/kJ2H9FSZE7EUifZmQw8uQhVuoJ3fElruRgiVOYUWSAA/9t
+fCfoTaYGZlgBbaT1Xj9XNDKVuohrtUBvQ5RiKVjLDlCim1XSxu9UWhhciNpka7u7
+iQNndfHZIPOR4rvXIcg/CutdyZznSAv/XvyNnj9AaYE1DpvEaOtf/AbADuvN/bjm
+u6JAN7ph+a62gEu43CBzhG9R24wMBVkqy1I/pjy/sSTI9RpNcKZOdsQd44/A6gvw
+0rLn8KLywx0lL6JcCZfvv2nFz4sk8mz2bgseE2RfITLfLnTWwV3Ax7OjKhXLwhtC
+bgRBN1OxIVX5wow63fKPpLy/RU3eYlkHva+dguHJOnysXylXZMarAp45oHjYGwan
+d7Gb1rdzQtG0DxH+ALUoWq0OGTph7iGElhYWzLHlSKJzih7yLxF/XCnSFO7t7axL
+At83gyqcBCelsa4H1velj2b6SwaprYWP4syo0WFwxZ7i1reQvPWgEi0QChqBagK2
+Vp5Od70OjGSfqLTlVi8b3Rymtl2HbZw7NIANsGQFIjGAHQt5vB/1DlBzMTyJj0he
+F9LL3jiIjfLL9X1vMUcC
+=G5os
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs4/aufs4-0_pre20150504.ebuild b/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
new file mode 100644
index 000000000000..d06cf8d759fc
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20150504.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs4/aufs4-0_pre20150504.ebuild,v 1.1 2015/05/04 13:51:57 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=0
+# highest supported version
+KERN_MAX_VER=1
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs4-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
+	!sys-fs/aufs3"
+
+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 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${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 aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 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
+		epatch "${FILESDIR}"/pax-4.patch
+	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/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}