Bump to latest aufs

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

3 files changed, 196 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index c168ce2bb556..a0b3b97939f3 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.124 2015/03/29 16:09:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.125 2015/04/07 06:25:39 jlec Exp $
+
+*aufs3-3_p20150406 (07 Apr 2015)
+
+  07 Apr 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150406.ebuild:
+  Bump to latest aufs
 
 *aufs3-3_p20150330 (29 Mar 2015)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 8f86dddbd093..f6cdae118103 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -24,6 +24,7 @@ DIST aufs3-standalone-3_p20150223.tar.xz 2767600 SHA256 9bb4b5ff884a907876bc4236
 DIST aufs3-standalone-3_p20150309.tar.xz 2773040 SHA256 293cba514dc2b046d75ed4f092dabcdea707a4d23f2baccad62851140083aa0d SHA512 56a4e6a2d29e2ba9f24fe5213465d16956e0a3a22699fdab27881990c28e2e8f33d50e63996dc94714712f63fc34eff0fe069c1053acd2200e7c66e0ce2c6cb5 WHIRLPOOL 39c6f9347ed76de7e2430b6d57e8c54a85a4ce87834126e93692c1a41e3f213405d62eb11b05a5b29db6c1a817664735cf6b4599676f9b0649574549555f46f2
 DIST aufs3-standalone-3_p20150323.tar.xz 2810356 SHA256 9c9eb976647f37bed9a4455d98a1ae01cc3567abc17196edd142c12f62f7425b SHA512 2695cecef739eb63baf4759ac115d172df12d5a0b2ed7320781dbf21bde3b49b29440057099e17de161e0eeb36be394939f0e7764cea5a0c05cd1c3a08ce849b WHIRLPOOL ff1b9b97aeedcbfadb99d47ef9557c32a320ce783ebfd1eeefcb6c0126be5ce1263dbaf7f2e5ba48045e696db6b51af6af56aa17adbff4ac7e487458e9f2888e
 DIST aufs3-standalone-3_p20150330.tar.xz 2858192 SHA256 7e953a4b62442ba1faa5b0e2b52d567b623e1ca1cb17ea50e4efa7b0d954a353 SHA512 33b05d9fac11b9cd2d66d23db7392fca5b533a3a8736bb380943099a0afd689281cc42970dc03676f2a3c58009a8ce67aa8fbfa60b10d1b6a0cc61ac85f467a0 WHIRLPOOL 984b32cc9c0c26650a4a1e79ff9297ed547d17fe5a6ac29bf13380a0a3e72246a5f4fc08d4a6d5b1b641f0a566b9455961fd957673a761eb8b1c91b127b74164
+DIST aufs3-standalone-3_p20150406.tar.xz 2863952 SHA256 e2de4fcdb086ab33bc182b084bf534891cc31a7d3ffc805d40dc087c37ab464b SHA512 c843999798f99fef5c16232935606ca438774104dc04c58982bb2b3f9ae371d9f2173b5454d366481de22fd3e658ee9e67f6981504c5c8157af20a8f15f269d1 WHIRLPOOL 0d2efaa6918c6f90339cae02a9ef3908921e8d1903364aaff9af034262f439886a02a639f9eaae27a28093fc6bf451bbc9fe7072a766a36e51f75c779378095d
 EBUILD aufs3-3_p20140811.ebuild 5289 SHA256 90423edfc0dc22d1142b3cf29cff610ed0a9a8101a200a9333195e6e75f41d38 SHA512 d2fd015adee71aeb5cc5937b2f3dbfd682525d5c127ae23aa7c3531276420f675f08460bc3ce36e5fc49acc1ce38bb97d5f9dd2a0833770376ff0383653d65e3 WHIRLPOOL b7d8a2c3df0549725ba2fe8bc4d3a009101b239de8a3ff7553bba36097d74487ee1c7737eabf8b593b419a1b284ffc1e5aaaa1e7d2391f5df9bc5254d51bdd49
 EBUILD aufs3-3_p20140818.ebuild 5289 SHA256 1ec07186d0b8c186fcfeec3af7ba6380a23c42ed9a9b92c2b83135f4b3e4e493 SHA512 8668411990b4e184ead86d4e2d670243a52885e9cbc4434b1129d6c6a172ccfdc93276277e320f366cb8fc41c461229e9c68d5598d94b6f756c51f70879efe1c WHIRLPOOL 1948e50544ebdf819120ca7480cf3f584fb3d98b4f0550de994682a4cccee47daa4d84b9589df06c396ada53f58d098cb132c3d4c14005f1f176c83492a3007a
 EBUILD aufs3-3_p20140908.ebuild 5289 SHA256 7f710603aa95a8fe1e5ee9927db6107b0212e292c10d7bbf3da2cdf2e6d60f87 SHA512 4e44d470bfcf4e04764ff640bcb5ca61196ae796e1ba41a8884cdd3a5d7484b1e79c5c93f56264bbf72f5099048d4bb7f35e787c4e185da57d7149575fc4372b WHIRLPOOL ffd516d99b7acffd6b308a3cea3ced65545780515e86a89f7b80991001a05ffd059b5320204b559ab4099e419a9ffcfd262b31b87d369e7b798e9716a45bb96a
@@ -43,24 +44,25 @@ EBUILD aufs3-3_p20150223.ebuild 5323 SHA256 36405dc483520fb3534bc92f0763cee9c4f0
 EBUILD aufs3-3_p20150309.ebuild 5323 SHA256 8aeb671032f3d83e12826026ca429fcc155fa8e18100e2b5b811daeca11d94e4 SHA512 0e56373ad894657147406e945e237643d41a8f35bc1fe0f8c64e1c077b4fe290a8ac7fe66f7f56803ad911eb495b3c604d7b52ace1d6e709d36925e9a8e31ead WHIRLPOOL fe39a1f36480a4840bf09e59241910e3dd07a25929850ae565fa8fd52f3f07bd74bef7e1e6c750859389e9714a623f9ca37e5565b53490f26745802edefed1ed
 EBUILD aufs3-3_p20150323.ebuild 5323 SHA256 6d081c700a815e901176c6c5b5307b0d2d249badd9f40c5683321d990fa81588 SHA512 33e0cc0f056fe9a0b40aae9768113b2668ce7cfb2b96b3692dad6a7f6fcb1c154e22486920e5849138f54a5fc2735efee0a32bd128cf3b52ba105b3a768f6256 WHIRLPOOL bb8587c351c35e768e698872cfff63631863d196d0ece02ca75cd68a6697a863df1016cb751ba35c114a168617109a125d871631729a3c14d2c1531ab4eea30c
 EBUILD aufs3-3_p20150330.ebuild 5323 SHA256 cdc08aedc4dedceee0c49e1835c140b7b8a640283ca2f2bce347949f232205d3 SHA512 2ab52212c034bb7f735ff07d10f62a41e6b241221f929ff11d5b094fcef753dec16f2d6d4e1e5107c44d1d7c3a3de04e6aa7d9c160ba43e22aebe9e1c8d89304 WHIRLPOOL 449ba2603b2927f563559e1e34a485a3cf25d3a8bbeccfca9bc62566eb1e2c212c2e50edd35cc13563a9c8b597e9b9bcbbcf8e40bd5165c8366d2aef4b6ed813
-MISC ChangeLog 28376 SHA256 9219fd71af8468a449c98db4e688aead291e164c62a98082302f258707250624 SHA512 e38ab1711657874a1e39d350e16a9d9bfebd39ef5bb28cd8c459d565fc75a6d17adc7ee5f9fac0931d441d553fde770dd0f5a1815ccef96b6d6212babe915273 WHIRLPOOL aca7c8e5b4759f3a75ba45ef8e76f85c8e935779bdb0c4c3961af6354c618de5cbc05991a0c1cb470bb8644c4932acbd659add875fcfc70832ffa00f315a9472
+EBUILD aufs3-3_p20150406.ebuild 5323 SHA256 5bbf053f74c6c97ea218ab5c777eaebc8bbab7dc303d2ff565ba88f7a3d002cf SHA512 d8c93555a3222a6b42dd124d8665169c71005fac399f74bb6f74aa8dc4cea5a9fa7aea0015f7dbe347d88fec77dc59fe21faa748e13ab33196da6857c788ddab WHIRLPOOL d8f55ef1541fa3d7c4d02e7de2b164885eeb59f5cdfae1d95db0275f2f69ca9fced1cdd5b83115ce5097fd76ecf12341257c4c4e27dc59f7099ae8e920464934
+MISC ChangeLog 28507 SHA256 13e2d28f789cab48527172f4172ac6e963cd5df75c2c19799e2797311bd8f318 SHA512 9469fe1816aac23fdb01fbcc54dcc2201611d62a17d6b2ba372c3b88c3abc2338d807c7295fd8d26226e8092bfcec244fc09ed7667d3a02158d33a330ee19cca WHIRLPOOL 0d239f628250e60292f3c860501dc9f107465166565c4f53e6907c5612e9292e65dc61b74ed015bd432e9ce9b9e4f62093527772db124885b6230157d0793d2c
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVGCPcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVI3hgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViriFEP/2KO7OBDW0VPw0JQHWgig6PF
-/1xw8hhg8T4YaQn3vDDViAOAlaYHiwxCL6zC34ulL+Hn1lggEmtvVUbewoVlnydN
-aIbrr5I7UydEI94ZTSg6S0NayJRROCkPBJVckeDJvD33WKYzV6NgTCwpHwpZYMM6
-9Z6ds6/axrOMoX0TryfOaPq1GBEKoWYcWM57y+n+m4v1FTLcX5sBiZLaj0XMm+kW
-k6Y6nIJwgltsG6Ixt300+9XX27QJEmDLdijL5AYjWMcTeluJVUFKp9z60kKpSAYw
-GZ/K7YMWLYCGhbkQhnBESPmFM3pSZjuGqH7i6IEPQyx9sHEu9UyuapxIqVtRUNBe
-jf3AtBpuRaKeKORFVEnPX236nYmVd/E05cFkjIuOeMhTp8cttzfmvoyf4nOYLmGQ
-a+OEYFjeVxL3FtdGoxvRiRUhWk5q1yaw3TXqWAy7VCq4NQftoev/ZYbfoi8sAMx9
-tSJXEPeWYQflVgvxhsgVmNvBw6GWQrXKOWjo1Ww51/YPp9TMuf4nU5i80DZWDtvi
-5tO3D+iJCCxjv60Txoi5e9bcGce54qyaXAJ2yFqsIFVe8d9CPKfVDpDyNcRVoY98
-nVsTVqF1yv24nyHPT7tgsa8n702Yec/WBInosqIKKJgIkR/C1uWgTB/7tdiFGC+H
-uGd+v2KWZIdqzfOUxqgY
-=QiK6
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirPcIP/jHjGNxNWNL3rCaLu/yKR7AC
+/F5rJXxiz4jnJiZzoDnVPdlN3L+qCOfZucFqAE1qUiX97YBV6uqliFhWRagD6CN1
+sPOra3GQ59r6jWr/V8MI2sZ6Mt7TANc29lLb6FfQ6HD7L/5rdGIPH+19dzpbJrfG
+LnXxYZnXV59yaZ+WGihudKUYBJmuvbXImsC26hd4rtbUr58dkQbwSnubnHhEQ65H
+od542RND1puwyo2BPHTR+o4rxJoGL/PGJXkm8A/iXT9T1p9Iq/NRhgkoNys0ftKo
+R3TsqFiRNH/7VWwVcFp9clDfANKaSNqJV5YF+1wQlfCIMUeg40OmzsMvixvVAJG8
+cIn1uoWbPkalf6bMTeV1N0NLu5uiFSGc1n+QcfOZRnytDp69/G63+Sk3RwGz9ghJ
+Dvnh9VI1QRuGvO87ahF1bvSQ+jyUM/GbY0OGxFwsn/AoXRZ7T7LbTWEAhEWBxrty
+Vd8sstsI+jdhWKGXikAvWqdMo6J/xwq4+ihAp+bdoCeRY/cwCsUudQVOEVw2cC5J
+2n1UIGoRrXqVvv2OuFalHtaJrS9pEH6UgI9LgAYgEibLj1hOkGy+bs3eKcpG2DES
+oRIeu+6sUY7zutMO3OmeSTXpc3DMQnn0lW3kDqVDuZ82aLRaa1/fLTUzt1jeVBR+
+3ZQWAX+zdODqT+Y8lNXo
+=ltO0
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150406.ebuild b/sys-fs/aufs3/aufs3-3_p20150406.ebuild
new file mode 100644
index 000000000000..ce4cb72af6e7
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150406.ebuild
@@ -0,0 +1,173 @@
+# 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_p20150406.ebuild,v 1.1 2015/04/07 06:25:39 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=18
+# highest supported version
+KERN_MAX_VER=19
+# 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"
+
+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}" == "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
+}