sys-fs/aufs3: Bump to latest aufs3 release

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 150 insertions, 6 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 46fbf098d5a9..20b18fa03821 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.58 2013/05/09 19:37:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.59 2013/05/20 18:23:25 jlec Exp $
+
+*aufs3-3_p20130519 (20 May 2013)
+
+  20 May 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130519.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20130506 (09 May 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index fe021617e5de..6e0beb7728cc 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -68,6 +68,7 @@ DIST aufs3-standalone-3_p20130401.tar.xz 2504256 SHA256 787405a1135ba5f95bf3980d
 DIST aufs3-standalone-3_p20130422.tar.xz 1023220 SHA256 f5fb6a98feadf2ecafe44865716bd8e6be32a529b735f8a2f3302e9ce83a8c78 SHA512 9e3d2f19ff0d7ce1f876dc2e041e1113a493ade4e05ebfb1aba1df7483afb7812861c21dd331dcc4ecc5806f66791f8efd1fa0cd238c7c2627908a40ec91b85e WHIRLPOOL 78b2f86f53f183b3921b5e57d0217230ea7a269e26e7e4041cfff4c9626b05f531c0fa6f8a3093c315b33fd44ec1af5fb7a7c81994af70e4f6d97c927e3d3acc
 DIST aufs3-standalone-3_p20130429.tar.xz 1107196 SHA256 37138fe099c2cd4f79e665887fe8c53147a08d422e00e3a714f3931c0935d278 SHA512 570cbac6d296f1f2a8a6307b83aaa554030c53e98fe9802991837ff3b6384098088b680b16c3e434367c600def03d2d5da253e5430fb1ec7222199ab7f1f9e80 WHIRLPOOL fe796f7afcfec7e798d6ad6241775a69ed08c6bdd6bce8ad605849cdca8951c919a5ca7d958c2c21a6fd0f875d2ed0b858356d4631ce166454d59a0302042914
 DIST aufs3-standalone-3_p20130506.tar.xz 1188700 SHA256 f8ab3c8978ded7f919155378a5476baf7580312de9c46da2553bffc0e4b81182 SHA512 d9246fc77c60a256fae0998d46f101d449150cdbc988feac5ac338f06b6ad6a13a4965c2cbc5a79f6ea26f512060954adfc34c1e81949de4e39dad68fbd5d680 WHIRLPOOL 97d5943818e987aca3888475c04ed6d94c9e5d5c4148daf5ed32b5845802635ee0fbc82d17aa006dc34c2eb136804c408d2934805d4780673768801a9e378ea2
+DIST aufs3-standalone-3_p20130519.tar.xz 1276192 SHA256 282e49afab0061e055a69729cb06d2f68da2e614e5adb22b862a5bd870b1a897 SHA512 0465e04a903c8087fa4af44c3b8a02eca8695e10f96b1c9b30d12feed0a9538fb893119bd7bdb64c72ae633276e0663f955e53d55506857a49eee16a5eb85940 WHIRLPOOL 0e48ba72a019d0e3c6e6b546be0b3ed5ad6e58fb02191076653303b405a0f4819ca5474474b290d933dc7de4f4533a99bfaf471701c2d0fe5e538f8b9166550f
 EBUILD aufs3-3_p20121210.ebuild 4840 SHA256 1d6c10de0f810598997b5c20c4e57e1277f99e29dcf632a3d07a0a2c01735843 SHA512 1286b95e209381391f3e9d6670979fceb162a1bd11361024d4d3b9105c98bf7486ee55bb7b4a0294a4f379b66e2ca5e2f458c76152ba27238675a3f27f4b18b2 WHIRLPOOL 3cb7e2444a5632db73b13b7f0849f930663c3a1fa08d8c19f52d0e9df3c6ba2a30dc2d04097849195f240133976c30c5cf9fdc3c8f14eef01e82fa641fda3ee6
 EBUILD aufs3-3_p20130107.ebuild 4949 SHA256 62437ba8b78bf5ff7414b91a7d4890e4373b7e4cb7efc213b8a5167b3b22581c SHA512 233889afe9e035f9af3ea83d95396ff22b23205b4d8e65f89ec30a2a30866857ba49969af62d8485747535401496b276ac86cb2a9a75f753057f19b2f425a8a1 WHIRLPOOL 3e31c06cd17cba042f66b3d3d0dde2f1648cf562247ced757d1a69c7acbd76ad4a4440e8b56c1150a2b3db279159be84cac8c1b8b930e1d8296e5bd3a8c51b8f
 EBUILD aufs3-3_p20130114.ebuild 5047 SHA256 087b4b9a69879eb1938675f99359ee6571fd88c5bc24609d6e44a23ab17c80b5 SHA512 ec94c997fd5ef33a5947d65dcbdc4d40fa44f3e74518131bbfef76d2f4784ad520f9a37c4012f1479bdf0fd0e5d5633c5f2b9a48a3436d695d96a1082365eb6a WHIRLPOOL d55e7bc8a3ecd72dfaf53896c4a19bfcb190a91ed7e6848ffa03380889fd257fa3c81173abc61cbeea22ed6a74fca667f17fabd58fd6683a01669126d12c716e
@@ -79,12 +80,13 @@ EBUILD aufs3-3_p20130401.ebuild 4386 SHA256 2ce359775560b895869365eeafb54a1fc035
 EBUILD aufs3-3_p20130422.ebuild 4102 SHA256 8a1efea0bcf4e737bf9d6dadc8f1a1e8a728dcd7f271f61096dad66e169fbc87 SHA512 ce992fdef3b9d0f162040fa476b8a0924962ba1c8b43d068b6fe347f85baf9dccdb733b13216c58a32988612bd5fbaf4bb9abd05f66f38518106ad02aece2681 WHIRLPOOL a9abd6f2080e87b789f522ca69da1a59d19e8e62a03c2666fe067aaf3cc920d8707d47ccc8e434127b64247eb868aaceff75b1aed380b40707e5449d9ee1c312
 EBUILD aufs3-3_p20130429.ebuild 4102 SHA256 ad6fe777f5d5b7d29c5f3a5cc5bc402c58e6737f517a33708fe295b24eef6b2f SHA512 fc6691a2db8a8f70bac7d30e65b090f05a2dca3c83a4ebccd8a9a746970bec45e1779d01b3ab9fe77dbc9c82de5b1a8f6f27f4fa923dbf04d86a241cca03f4d2 WHIRLPOOL 0a0886b5121c73c53b4ef180059c802c883bb84275c4227005d275c1026620bde49ee33cceae5f5f049f9207d057b3ad9935f15cc32fc17194a6d9b4cb97270f
 EBUILD aufs3-3_p20130506.ebuild 4103 SHA256 a47527406d6058760ff19036f256bc88cb5de8a6987608060b8707e9d0b96df1 SHA512 35d325be8966ead131804eeffed27bb32d06a64db2b4471aa557dd1bce118b75279d2b6f853785e4b059c889120c90e0fee621d89c495f81df7873569e716f8f WHIRLPOOL dbe9aac7656ec7c9692007325f9a422b1516fc42508dee7717aa3b6e9c2f838c1dcda2c7f414cde0b21e704df666477af924f7a6baff1a3ae60cc21d2149644c
-MISC ChangeLog 15363 SHA256 b78da188c626effe84b7d144e985b19b31b9884396c537815e849d99d8f00812 SHA512 40b7371f3216b8d0efb28b5fd0850db8f5960415af04424a174e76c941bc2c06e30e2b80259cd5bdb21f00b980712b35515bd46b7fcb46924cd5ddee8fc8c3e4 WHIRLPOOL b6deb7ac466538828280ae0d1b5a6752b3d818b654f7266fb4333967839fdfbac4442af142e0f4731942721d8b128ca30730df8026fff4b3d6ce85f4e10b40ea
+EBUILD aufs3-3_p20130519.ebuild 4103 SHA256 e0fc338acd1cfc3a22e5fae031261b056f88aaab35af8233a56e785799b6cf23 SHA512 55fc7ae6efa17690057190a78c7b34812660ccf7878af1d649c32ea7f1a3dc32829801426ae484eb94c84542d8ece76493a301a11c4c8317303936ef7eddfa89 WHIRLPOOL 3462431d579d6293ebfb3ff53595576a82491c437f04a57359851bdcea9657fa45869405792635d9846f319360d032d607f2481d3cd519ba82b202cb0d596649
+MISC ChangeLog 15503 SHA256 1a9e808b91dce47bf14eeadce63192ffbce8a9a6a83063d346bad6d2d9b80245 SHA512 b3364e06f62e0111b9a112b05ebddc17decce64a16e31f3ce18d716bd35f6f72d1abf8b9d80cd2c8abbabdc0d33f2d60e5c5557969dcbcf913c8a24b84d5439d WHIRLPOOL 888a9f4e8ff50963c93b9965dd0be6f2159ffc0c2ef1792153eb47ff253dee4cd34907c8abdc51f184c6f5db9c8f2e98fca909d71df3b634a49daf7586a424ab
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGL+vwACgkQgAnW8HDreRYCCwCfYan7FrFcIuH0oy/JwXA5ucUa
-sH0AoKXRQsyU2nfafJb+GfxCIMYBlr9t
-=np9I
+iEYEAREKAAYFAlGaah4ACgkQgAnW8HDreRYL7gCgl31fMHvTJpBkZ/uxL5LbtXSk
+fScAn3swBZCOXsqVY+9vc6N/xzER4vhf
+=WF0C
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130519.ebuild b/sys-fs/aufs3/aufs3-3_p20130519.ebuild
new file mode 100644
index 000000000000..4f8e60748526
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130519.ebuild
@@ -0,0 +1,137 @@
+# 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_p20130519.ebuild,v 1.1 2013/05/20 18:23:25 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=9
+# highest supported version
+KERN_MAX_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+=" ~EXPERIMENTAL !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
+
+	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 ${EPRFIX}/usr/share/doc/${PF}/${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
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.patch
+
+	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
+}