sys-fs/aufs3: Bump to latest aufs release

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

3 files changed, 160 insertions, 5 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index a32f68d72b00..9feb3bf24d01 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.61 2013/05/25 12:36:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.62 2013/07/08 06:29:49 jlec Exp $
+
+*aufs3-3_p20130708 (08 Jul 2013)
+
+  08 Jul 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130708.ebuild:
+  Bump to latest aufs release
 
   25 May 2013; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20121210.ebuild,
   -aufs3-3_p20130107.ebuild, -aufs3-3_p20130114.ebuild,
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index c3dc55fbeb4f..13f945be6c8c 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -4,14 +4,26 @@ Hash: SHA512
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 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
+DIST aufs3-standalone-3_p20130708.tar.xz 1213564 SHA256 e1b111f13a0ba5b1f4c58cd7e8c7d043a810322216621f5212492083d19fc5bf SHA512 cf13e83704d89609308715f116a60fe6c22d3017bcd8f5d1ecefeb49320224147697f2f395824b8317542102cf874e875504be16f6e7807dfabcfb58ada4fdaa WHIRLPOOL 69a6d6ed97b86a9dc221a5dd3a7021013570a330732f89eb14beda61eaa03fe860b01cfc55b8750e2b0fe2ef3f423f3f4169d77e4e4001f0c45733a2e442fb14
 EBUILD aufs3-3_p20130506.ebuild 4138 SHA256 527e3e85b96cb8a2928300298ca5d95a39ac8dea43bc56a43aafa823635ebbee SHA512 54eda09ac029e38801388fdb046337e1aacb4bc7d8cd5a2566abb1e2e5e5e484330aab9d2ceaa1824923a9a31ebf553be5d4a3a9582bedcafacc0de079fc327d WHIRLPOOL 0dc37640db64606b1921dcd9c8151d77660cc9e481e03bab3b2a113ad149a0fa135423ba9dbf1bdf600aa3bc817b08bf1ddf008dab6de0443f01708b6eaf81e8
 EBUILD aufs3-3_p20130519.ebuild 4138 SHA256 e1831fd4163a0b6de71d6bbc02145525ee46706b62fb0372595eb78d0a166136 SHA512 da4243d308842332d92b830aa8329f249c33c68f868af2f9f60ba14e35c8636ebf8e3d3630762f198ce9141c842f2d120697fb10ff3e024a7effe78919ecdb7d WHIRLPOOL d019c7c51bffe51f2b0542098da795277c6cf90af9c690af0e9ae27f6484fcbc76601c08e5a81e5792b23d3eb21d3457c4bcf09cdc15d1a63bc3ed450690f7a7
-MISC ChangeLog 18256 SHA256 3e45725ca86043bf8fecbaf60f9cde02f31643aca8f1e7a9edffcf89b9666c25 SHA512 daa63f985a4c3fbe84d91687ea99af6e096a548b3497e30eeac0024a1b6c1b0a35974faa3dcfc97726320cc369b95f52e05921f0b551bc9d5dd6e38c47e355c3 WHIRLPOOL af2514eb09b743c9c80a319019d76ff41fbbfbfb9237c61fd3f26107173750a5585ceaaee0c92c1113dd80f5de5e52bc0f5ab973d15fe727211d4c352ea33a21
+EBUILD aufs3-3_p20130708.ebuild 4142 SHA256 b1f17d53de2e4b6c394c3e636110fde01d2210c4e05b70523c81042752578deb SHA512 8ca0f3cde8557f9a40a4e04f7cac9e6968a4d2d8fd73a74cf0d36d82000df8c21211ad81b4242cf1c4a2f91ee3b3d5d3b9c3e38a2218a0466451802b17d90970 WHIRLPOOL 5406b9e2032019cc8f01c2c95acc886e28b46f1b499f499cdfb29c241483ac094069bed654e9da02440fe29a681ea6f5efda389a678556782156aef44430cfd2
+MISC ChangeLog 18395 SHA256 ff064ff278f1783eed3635271d04c3bd795f3e9a257ccfe7997ca7d39a27da02 SHA512 e601627bb4de4bf63d2df563c19c24c1491bffce4b10065e600b507da6045a98e35970aab2296157beb4e02451d791018e08e811cf9a039391d819f3e7be10b2 WHIRLPOOL 2c467c57dc8d9ee02c6edbc9af39f78a879af3507f8895740c76e9c406e357a3dc413bb2c0ef4d8261b50f9648285735c4153b2dbaaf287d93589ea79d2e9633
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREKAAYFAlGgsF0ACgkQgAnW8HDreRasogCeJ3d3c7BfWz89e6Bfoy5XVDaW
-KyAAn0lNpab5E+sdjrriuo+JTQJpH0nw
-=mOwv
+iQIcBAEBCgAGBQJR2lxeAAoJELnU8jG9FVirR/8P/0y/MHoSyKhdzHZxG2yVdVOQ
+LYbkxdFPb+6zHK8EGKqh6Aw1SoMu9njOTaUcOsUB9PlyaT0isLKNMPBj7z9jgVYx
+ov8TAN4aojfpl8T0ZRhEOY0KHZ7/a73ENMVIkxl9JigaVHJBUQQrrcPQ8S4N1lQ9
+M8Az230Z9Uz3uRcX5kuq1emTjSBYRZpjYHeFzq8zEYedMYjlGvEMl/Zd6GrhLzBr
+3FKWbKDXsOENW4hXoScj9D13ymytPaKGaFCAc/AOPROdfwqyKkCv6v+dIwMYvAxW
+8vmDZzFqBoDNqXcoy4VzfKWt4mZOmgMaazFKstTmBxiwSrR1nAAeYIa1My5vVx21
+Ng1onrqJ91Gb+Na+ueSZA/2vZ58OnxfDj2SlFS1qqz95ZdhufE6zv7/xQkwJjOyH
++A8GYleqvpY5J5uuZcTn5gBLuY88ctIYs35g/bWOGiavC8s9cAZ2hvAZmFQ0HdyB
+yDg6xUQhLIXSQbEj7pgYT+R06vVNsZzeGV3hWwUxxIQkUvVQ66Pr4Xo3YPpFX/j2
+NjBs6yWBt2HO141FkTUXnl+lXvLz2IBHqjdXcdy/wgeh4LnCxonk5ETOOo1K1AeK
+3QRTT+LZhmnrCoKm0L+m9Xjh/jeXKcjjT8hyoVvk0JZqukwdJYmJfVFJs2OW0juy
+t5jhSK8Rb3nd4ze0kJdr
+=BlZ8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130708.ebuild b/sys-fs/aufs3/aufs3-3_p20130708.ebuild
new file mode 100644
index 000000000000..897e69d514dc
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130708.ebuild
@@ -0,0 +1,138 @@
+# 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_p20130708.ebuild,v 1.1 2013/07/08 06:29:49 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=10
+# highest supported version
+KERN_MAX_VER=11
+
+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
+
+	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
+}