sys-fs/aufs3: Bump to latest aufs3 release

Package-Manager: portage-2.2.0/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 aa7d0dab060c..2c599f34c4ad 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.64 2013/08/11 12:55:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.65 2013/08/15 06:17:08 jlec Exp $
+
+*aufs3-3_p20130812 (15 Aug 2013)
+
+  15 Aug 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130812.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20130811 (11 Aug 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 8e63f9da6f02..37421c175294 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -7,27 +7,29 @@ DIST aufs3-standalone-3_p20130519.tar.xz 1276192 SHA256 282e49afab0061e055a69729
 DIST aufs3-standalone-3_p20130708.tar.xz 1213564 SHA256 e1b111f13a0ba5b1f4c58cd7e8c7d043a810322216621f5212492083d19fc5bf SHA512 cf13e83704d89609308715f116a60fe6c22d3017bcd8f5d1ecefeb49320224147697f2f395824b8317542102cf874e875504be16f6e7807dfabcfb58ada4fdaa WHIRLPOOL 69a6d6ed97b86a9dc221a5dd3a7021013570a330732f89eb14beda61eaa03fe860b01cfc55b8750e2b0fe2ef3f423f3f4169d77e4e4001f0c45733a2e442fb14
 DIST aufs3-standalone-3_p20130722.tar.xz 1375380 SHA256 cf2914e20c36f63f117e5d52d33b69582b5e528f90f3b35be8eec29ecae1516e SHA512 d02e7a12bb3869da0948fcf4dab025472c297317fc41246c23db84cd2dfd0ae94c8c9692efc2a2e8d80e576c6d27b594056668fe1b17b81de47764f7529bb73d WHIRLPOOL 70ef77d4576c01a768312972b0a303205f77e3712a5a9c327a985f43d812f2e7719c2563b923d246d335b6e5bbbd836facb2bd2f89171001d4b2f84594b82ed4
 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
 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
 EBUILD aufs3-3_p20130722.ebuild 4142 SHA256 badbc8e770dbe19b9dac24bb7994886fdab3118300f57bc4de6f76817e89e808 SHA512 fa3f06375ac1250d9ad84febce98cfeb6fbcf4c56398da5d9e94ee9eed6788f12c37acb5f4d09355c266d234275e472cf4cbdd5f2c1d234ca5940b910e00f717 WHIRLPOOL 007f370a796f3ac83b580782fb3fe3805823112c5f0463ebd9181a57c24318ff94deea57932940140904dc986513947067049d9b98d12ecc05ce1e8365cfddc1
 EBUILD aufs3-3_p20130811.ebuild 4142 SHA256 b8a6b033816e6a709231efc61ad909cf070a33892d70ffcef5656102f5e33ab8 SHA512 c07d4b1c0cf32d24cd9b0ed43680f39d1d8a2545189b547a6b31a619b248746a25f4d6bf02532d46585783f99a0ace469f56897c0cfb0879ca889a0e7990fad0 WHIRLPOOL ecfde02300a8536c9714f355fb666c63b44fd7d5c943c160c459d4b5f59ccb5671ccdecf56ce92c0136b76020f1c3533aebc4ba7b2a588ca57721a3eaf0eecd1
-MISC ChangeLog 18658 SHA256 27d775ea3e0eed00a20c7936fc44c92a0767f77906e420e5a42da4bce10754d5 SHA512 91db3e4ddd869dde68618a5959468072ece934db40735c3444b4771aedfe819f5ef330c800f07eea5b533088b1f04d38e9ca1366af9b6ef7fbd890a680976b13 WHIRLPOOL 9496e3de225185a5fd0767e4aab2c2a692ea5c0badcbef0fa43f9d95f4e42bed7b0c04b0dc38b6deaabe61d35bc5f5dcd2669f6ec960e0f766e02f732f51a870
+EBUILD aufs3-3_p20130812.ebuild 4142 SHA256 a13696d88aac3950a3f77b2a38bda6e527ab9e560cf7a8aebae5d6dd901d5245 SHA512 a1c4944675acda6e79bc50cad3644f2a6f4c97c88db2a75344cbcabf577d9c3d890b8139fda8f315bb8e7fc58286f0858ca3135e0e4720f7afbc98b80ca44ca8 WHIRLPOOL 5ce7749cf9e9708db8ebca65b355bc84217e82fcb1fa727aefdf0e26128262829da2f6df343444f82e96860d3b9cd927ae7c5e09fc47c325b5c028fc92ae294e
+MISC ChangeLog 18798 SHA256 e6426c5090acfeec7f8dca0a64921a4ae662e7235bfbbbb22e3f0292752179ad SHA512 c17dc8a9ff05a6bea9eeb83ab6e0ef4b13f8eba762f49c3051fa6898190ef8a6e8765a46aae6ae2d373f1bbb679807d9869553659a6cfc38c95b6a7c39a39ea8 WHIRLPOOL 01849b8e9e3985faa7b1b28ea1c13ccdf27d5e550f9e2679403444f45eea9757a1bb95e6a998542dc23d99f649eb08ea9e67fad6704963a3e9f387c09cfc25a5
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSB4nUAAoJELnU8jG9FVirK3oQAJ++I1A4r1AaKkzKy5MlOPiX
-rRAZsw/DSANOSBXzD9qdLTFhcY+zUFCpu1Qw5M9PnEQjMT6q9rE0j8qTek9roovs
-ylqGK2F2v5xlLHz70+oe5MMeVgmnHk8WSnEPmFCchICv7AeTyiF+CsxAQC2VdxhI
-ip7PF0okUYAOUHVXlCpkaKsER1ooAjLFB3/JZn37HTZFVeDZKwNioBTgTqGvZ/2A
-0Ki/MzjuscBWhU6t1pWsH0C6Jcfs5L/on78flaicGlWWLH/cvnDTUOJ8dJQlLCC/
-9hvCGG68LFVQzFHHsZsJTVXViAihJJ5/ZxdsablNikqIkBh1DVxUAAE1PaMGHOrq
-MZjgLeCudiJ7RRZiZ2YUvIwHIcDAYhtxQXwfcYi3ErvPD/KNlsR+5vO8/8Lmk1kd
-KRdTEc4Ewx9sKhTKwSNisxXSetZxd88VZFBgdf2uu6KS9hvdbMag9sgapYkP0wkh
-BKj+ScH/wvnFBB/MR2lJsmP4MvU84OBc3SQ48r+0bWOTmKOXUpnhe7+g35MUNoRw
-VjD0mVAPhMgdZ96OkG8IG7g3a6QhHvBXJPi8mAQmOXCjSRd6vG1B48HRx1TFPJ0p
-ItLGBytMrIEJjWU65jPqgQfY8FeDLiZx4WnEFxjvMH0BUztv7O3S2hMroCrv//Pa
-7w4sfWOGezC/JScH3TlI
-=Orxg
+iQIcBAEBCgAGBQJSDHJlAAoJELnU8jG9FVirZIcP/RjVEsYbR2mOcIVARVeTgiOI
+3GJok4EcY28DRF3DN89MDaTYRoCq+2VtKQkNBhHCaMecj3FVjCKT2LrPbDPZTYJr
+1lA1Wg3mfOn/U0AY12eqjG6wIkSHe8CCxd18pYrPw0i5BIzkOCa+abam1DIqzaUx
+KF9vy1j01g/Ga94Fyk07X7eOlY+6qL4PikKq3mwmpIER5dXnJtrnoJZ9AVBes0ur
+3r0PALdvIdjmOARWP8oyS0uHe2kIUwsxKQMu7RU7kWivlsQ7tGd9S27zQHQtv/sw
+laPEKFwbwkaX2pYegQxVjf51VK5iCHxAHivGQN64KdHRyNZpUBruorQ77yNRb9s4
+l59khTEN5vhtIDmH/Fl/tavg9PAnB5sSgDGgNA/Snowa/8i5NMA3h+PX/Km17q54
+WZr9T7CJL/NEtGaRxrwZBoNew0Ljc7YAFtEavjxOSI2rnCxRzruKDLVOSb9ZJKB/
+BKr0ldPvFpt1BYOjE6lrF7caBE+U/JD6YU9EfmTNHVDwVpqYBF8x6y0QaZRJn/bd
+H4qZSc4F2P6IieTKMeb8/q8/95azsVeuhCy55y2H+PMyI3nzF9EwBg0iRX7wulqa
+GeQJdktpah1pigAeg0aRXWf9WehwTyTPE9eyHdGcJiMnhOCjMWEB6M0CT5TP67Yr
+n7BfEdZn3MoVA+Y6AzEt
+=9GhX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130812.ebuild b/sys-fs/aufs3/aufs3-3_p20130812.ebuild
new file mode 100644
index 000000000000..e4a1671bed43
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130812.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_p20130812.ebuild,v 1.1 2013/08/15 06:17:08 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
+}