sys-fs/aufs3: Bump to latest aufs3 release

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

3 files changed, 160 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index fd0893d79e07..0a2f0b5eba69 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.66 2013/08/21 07:54:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.67 2013/09/16 12:56:20 jlec Exp $
+
+*aufs3-3_p20130915 (16 Sep 2013)
+
+  16 Sep 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130915.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20130821 (21 Aug 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index cd4d73ed6ddb..9f3de340a2e8 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -9,6 +9,7 @@ DIST aufs3-standalone-3_p20130722.tar.xz 1375380 SHA256 cf2914e20c36f63f117e5d52
 DIST aufs3-standalone-3_p20130811.tar.xz 1438432 SHA256 0dad6694ba73c88d37f3cf2266dbcce6e16fb74c75c21bb37465287bad5b58eb SHA512 8325a2747ff0f20cd00f29249f3e151f42281ba18aa18e9c5cd815618b20bca12faa93063d94bb7de75bf273fdf07ca802dab8f5ecefda7b36cf0d84bcad97ef WHIRLPOOL 26530b40a3953b44facde02cf3c02e3aeec0dd04af853ce5211552a0ade448e81e17a68778ea45bc7efb7556dc01d0e2465d8dea9396977f6a6d7da7168c2ad4
 DIST aufs3-standalone-3_p20130812.tar.xz 1517136 SHA256 985e7e5578567d6b8c64f2c820605bd702ff49a3fca28e465da696c60ab076fe SHA512 c4a6375babd0771526b2f51608182323b6eff2455852d1140de25fc1fc958b08c7f324313c727daa7844e43f836b0a4104b8938c33ebf50d9fb6db00f7fc3196 WHIRLPOOL e63851376c8827abbd8676a4231f3ce82bfa92321e3ddd9ad68e6d674d79a1d034cd34155e44de75b30d579ff2bc38b857ee0e2d4d63f8779a28a187449bb2a0
 DIST aufs3-standalone-3_p20130821.tar.xz 1656216 SHA256 5826558e703f8636765d17f69cb7e69d755c4dd48d8c8aa290f33f836e9d46f9 SHA512 24fb360106f2e6be8d1a4dd40f4b6e15a75c22cacfda346270f51e2163f9f830ad5181945628ca85dcb57471d909572e3e9512c115cbcccc93a9aa054be741f6 WHIRLPOOL c6675f5ed55e75a40a07fddb61e8ca3d05a47b3be4a2c08d698fcf400c0148fae0581b0e67d6c99d06ad035618860c3400860ca20ec961d7657b1b7f431152f8
+DIST aufs3-standalone-3_p20130915.tar.xz 1900020 SHA256 8f6ea717e7ced211c909a329c73c639afdec8cd67094e649d6e72c4833a8a5aa SHA512 798fa5ae0b368052de638a5900ac9343fffde58d455b4e4f8dd75e8e82d571acff1fe5e854acb9c31f49001431484e6ba993003edbf1462ec33c39fbbac93f97 WHIRLPOOL fb7588c3fe06cf48f878ef5017782b8392ccc7628b667b5e662a552132f7aa43f32819a2ecae2d0b90c1bec43d19b193faa69081bf61084be789bb7e24d2c317
 EBUILD aufs3-3_p20130506.ebuild 4138 SHA256 527e3e85b96cb8a2928300298ca5d95a39ac8dea43bc56a43aafa823635ebbee SHA512 54eda09ac029e38801388fdb046337e1aacb4bc7d8cd5a2566abb1e2e5e5e484330aab9d2ceaa1824923a9a31ebf553be5d4a3a9582bedcafacc0de079fc327d WHIRLPOOL 0dc37640db64606b1921dcd9c8151d77660cc9e481e03bab3b2a113ad149a0fa135423ba9dbf1bdf600aa3bc817b08bf1ddf008dab6de0443f01708b6eaf81e8
 EBUILD aufs3-3_p20130519.ebuild 4138 SHA256 e1831fd4163a0b6de71d6bbc02145525ee46706b62fb0372595eb78d0a166136 SHA512 da4243d308842332d92b830aa8329f249c33c68f868af2f9f60ba14e35c8636ebf8e3d3630762f198ce9141c842f2d120697fb10ff3e024a7effe78919ecdb7d WHIRLPOOL d019c7c51bffe51f2b0542098da795277c6cf90af9c690af0e9ae27f6484fcbc76601c08e5a81e5792b23d3eb21d3457c4bcf09cdc15d1a63bc3ed450690f7a7
 EBUILD aufs3-3_p20130708.ebuild 4142 SHA256 b1f17d53de2e4b6c394c3e636110fde01d2210c4e05b70523c81042752578deb SHA512 8ca0f3cde8557f9a40a4e04f7cac9e6968a4d2d8fd73a74cf0d36d82000df8c21211ad81b4242cf1c4a2f91ee3b3d5d3b9c3e38a2218a0466451802b17d90970 WHIRLPOOL 5406b9e2032019cc8f01c2c95acc886e28b46f1b499f499cdfb29c241483ac094069bed654e9da02440fe29a681ea6f5efda389a678556782156aef44430cfd2
@@ -16,22 +17,23 @@ EBUILD aufs3-3_p20130722.ebuild 4142 SHA256 badbc8e770dbe19b9dac24bb7994886fdab3
 EBUILD aufs3-3_p20130811.ebuild 4142 SHA256 b8a6b033816e6a709231efc61ad909cf070a33892d70ffcef5656102f5e33ab8 SHA512 c07d4b1c0cf32d24cd9b0ed43680f39d1d8a2545189b547a6b31a619b248746a25f4d6bf02532d46585783f99a0ace469f56897c0cfb0879ca889a0e7990fad0 WHIRLPOOL ecfde02300a8536c9714f355fb666c63b44fd7d5c943c160c459d4b5f59ccb5671ccdecf56ce92c0136b76020f1c3533aebc4ba7b2a588ca57721a3eaf0eecd1
 EBUILD aufs3-3_p20130812.ebuild 4142 SHA256 a13696d88aac3950a3f77b2a38bda6e527ab9e560cf7a8aebae5d6dd901d5245 SHA512 a1c4944675acda6e79bc50cad3644f2a6f4c97c88db2a75344cbcabf577d9c3d890b8139fda8f315bb8e7fc58286f0858ca3135e0e4720f7afbc98b80ca44ca8 WHIRLPOOL 5ce7749cf9e9708db8ebca65b355bc84217e82fcb1fa727aefdf0e26128262829da2f6df343444f82e96860d3b9cd927ae7c5e09fc47c325b5c028fc92ae294e
 EBUILD aufs3-3_p20130821.ebuild 4142 SHA256 139301c062c0f119193e97175d56772fbac4b12bf90f686fc1340326d52f4f0b SHA512 1baebe9a034e52a23eec889174c5fd9b763a2d4505aa5dd7bca43d4b5e8c18f047c7e37727c2cc093a7e1c6c09c60437937bdcad010a9a2e578988f4556d150a WHIRLPOOL 24d6233d74a51daf57bc6eaa61aefb100a9c1392c1aa74c4f93695892b47de1114aa2b57c3ccaf65a37b1dcb51ac10193df33309e3133d418a9a327aea1845a2
-MISC ChangeLog 18922 SHA256 d8c30f2ee5c0dcf3c897618759f36687839ccab57cb7f90806d833701790fd5f SHA512 941c0a74766c958c9cb6a7dd3599e80fdb6ba16533cc9dfccc8f66766f2f231679316db0cb11541023d8dea1d4c59fe13a338041f3e185103a13ab927cb41911 WHIRLPOOL 4fa54968e43630d5560547faf6341f089b7519b38a956654f9c23c743c6030b3c3e56937d98cd8f0ff56c5213a017ee12727bbc00d2e0742f4e9332a85aec7fe
+EBUILD aufs3-3_p20130915.ebuild 4142 SHA256 7f23d06cd81d9ef70e821cbbbafa17d51a08c1f981d59ecd298ab1c8e70b1278 SHA512 b1967fcc879d244491a281cc34905e9461bf1cc1ac285de8b812438ad5650899a4ce5a5026fb4788aeea2cd4829001d1201a548149191348357176b6bd830f2a WHIRLPOOL da4fa6ccbd3067fd6cc13490eb65c128a367c3f3330c03e4659901d88d172fc713cab480afbb371a8f83002dceb0e64e1369652593c140546ddce7c46fb780cc
+MISC ChangeLog 19062 SHA256 700e4a34daafde7445273a81c1a85ab664ad671463d07f874f6934eb283ff676 SHA512 b35df70715393eb8e1b67572a309502e19afb8115ed8389ffc0772744852d600ca4d6daf91e468df7d1c42c342edd69845ca5d3e3c5a59d7c1b0db99fc76a3a2 WHIRLPOOL 022d86215a2d9f4c35f12add5281cdbaad0be35c0d10cd7aa93907437bd3c983892a8ef53b0349debb2540d374b1f93b6b1c3e5a35d4a53f3887f97363418cb2
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSFHInAAoJELnU8jG9FVirsFoQAKTL6uPnKyUYaCejTy6sV2Qo
-zIildm6OmNi+PzPDznsPUkSrEUtcKcy7+7Rr4CgBlx0j4yZ6c0YtAU8clWunuGl4
-eSxvRC5f4ubPkqzO0uvpOJ7KWeVAApwR0rlbd7DU6xn7XgEV1USsOlwALNvKbWZI
-vmucvF43GUrNFjVV5GrbzTXS0MwVlmr+HdSNTDua0W6lBOdsYkw0cj4Mq/j9zIN5
-2QLrn9WfT7mQtT8geWlD40eQwgk7x0yk3MuW3hlFJhk4b+R6AKYaEkFh9+CtyeK/
-hsmz41OxPukRiitgE8pWeOEPvpctDNFgPvac1lnQ3nmWodJT08pgNECmhLycxb+V
-V2UBQUdLE1FejGU/FZs7kF8CeO72Zzkjpav9fT48HRT1cePi074XJdKXkkIqC+DR
-8SvGlu/83jPcvltfdY4g3tW79stuQLhKwpJuS5VpzL3sDfOoUHHMA05xX4qMdyK2
-+OAVhdCEgkoQ6ceMUo5M/NvfjbrC+pmyVMo2qVgh87a88bb7kAIl2osQG5HW00/Z
-r4BXcThDFslMcicx9N12kQ8RAzsbI8TluBXSjqDk5RDTLyxZeew0mhTTr4pAGfJ7
-/Eiu4QqGj/gDiNgOXhZ3xh9YrRmIKyMQFG59P2gzr/uhTqflquzqhga599krnMBM
-M+9kGbzzl9buJJ8AV6oC
-=fRqO
+iQIcBAEBCgAGBQJSNv/YAAoJELnU8jG9FVirzIAP/R5/pR7LiieVthlKnV6PIDmK
+Ol5wJQJe1G2+/S7mjcWLizY29AxCGvHMDYVvKIprthepIheug4zG+qLKlcojiZUF
+0fhzp7ZiAyQtETdiukP0dTlVA321VEqoZUVJOs6IzT5XbXkWDAdU8l0kBG/tGHAW
+ywkoT8U0j1t/vtGdMcLYZWyfh7rT/ERNLmQUFPn11PkbHfLdamlwZkr7uzRJUD+V
+++AJC+/BfU77C7WTdDw8FlDfwGKxt5dAMz2g9Ip4cXMuXzPNWcd10W/Uil0GW2l8
+UwU4d5U9XJ9c792u9QF6NPtVYan3IG69EVaHQkCqUGg5AQ579FUnDxwFggCwZTvs
+EL+7o2+LIl7Jo2gSKDELkP0ity12Skh2za2LO04szbJElyRJ+P/BYnK8DWhDE+X8
+nfmRlfIXvGSEQ9vPMS76ElzUAdySq5bx+2yUloxx1ahEq9hrg/BCCEp7nq1roInH
+zDadaEatUsDTwYRlmvSx/mU6uqzfLBJquM1W+TbYbPpngRnXCcnoVuhE3nHf+UbK
+VgZVFk2RdBCP55xU/ukAxjtPwL/kt7LWMifJvIQZw3m+O2oa4sGCtCHwiKZuHuQh
+DK54vAPuWmcfhVvxpK4QICciDlpJluRtQmxQ15CcNhrqyFmQIRoa84crpcF97jEz
+2wQLo4UuVQ63knSyBcR+
+=2q9t
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130915.ebuild b/sys-fs/aufs3/aufs3-3_p20130915.ebuild
new file mode 100644
index 000000000000..ea813443104c
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130915.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_p20130915.ebuild,v 1.1 2013/09/16 12:56:20 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=11
+# highest supported version
+KERN_MAX_VER=12
+
+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
+}