sys-fs/aufs3: Bump to latest aufs3 release

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

3 files changed, 194 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 9d53927ee659..9d002302a613 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.96 2014/06/15 17:31:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.97 2014/06/23 07:01:57 jlec Exp $
+
+*aufs3-3_p20140623 (23 Jun 2014)
+
+  23 Jun 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140623.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20140616 (15 Jun 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 1bf6a630f6d1..fb0a4e5ed839 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -21,6 +21,7 @@ DIST aufs3-standalone-3_p20140526.tar.xz 1762352 SHA256 b859cc0961b1937d12de3b52
 DIST aufs3-standalone-3_p20140602.tar.xz 1835304 SHA256 3ff598a2bda18bc66010bf9b39dc35b9a83834d91b20e62448a276ca808dff2e SHA512 b961506a09980703e96a303994fb78718d17f9d59cabe3d17aedb601ad32607669564c4b003eb97a98b97c1d131553f06918f857f9df11811617999da2d88c61 WHIRLPOOL 8462e4b41e4cee2cd510a6cebbf30127ae6a561909233249ffc4b295c6ca84f138988d6d30f966d870957d46e7aaca34709037320755705d61a0b39f6892c91a
 DIST aufs3-standalone-3_p20140609.tar.xz 1837512 SHA256 b54796e6fd79bcf2a51444cc93177cc379b6fae4c957eb315981091ac999dbc3 SHA512 772acb13208bd9d70504bfae3fc3263fd67ff1707340e60bc8c22d621c13a2167de9462e9adf0ab77b18ddaf98e69e16793e5de572d42f96fad0d658881fe796 WHIRLPOOL f807f40e092e4fab18ebd54b39d548128d898da67a541df2c106561d7ed8b647e12259a1bebaad5781755898b385304dc76e3973fedd975adec6436f2e58a3b8
 DIST aufs3-standalone-3_p20140616.tar.xz 1883700 SHA256 25ac09681bcbec4a4e6931d84ca75734f9a4ab45930a29ce274858867b77579e SHA512 c6acabe0ef27fa1f008aa7580606c99270cac0dd2bc0400300926cbe732d926059e9738f5b57b25925846fee178721baac7963ac891e58ff397b2dccd31c1ed0 WHIRLPOOL f4804e07d3c8ce6243c6ee4cd196420b80d85d47b77e1ff4c630c1fe1d9838a92f4db23c7b91ed9fbf91018e91882394133aa81e692c8df71af7bac53155c664
+DIST aufs3-standalone-3_p20140623.tar.xz 1916776 SHA256 2b1a6140d21cb52ab8bbb6b6ad62a42fe1dfea4ac47f0aaa0ff5aa4f2ab20b88 SHA512 415eefd7837f962ceef6d1c041632408c89b1eab5ddcf2487a72df6ab145bcfa8feba6334a466eacdaddebef481201b3d7f8d75c113e950dc4df76b62f865644 WHIRLPOOL e13139057a333d4096f28f53fa89468af29fb41ea0046f0d3653defc7ac6482ca9df015c967376183c244ab2eb5f0e1d9c43813f9c75eda91d88f13d7be0b77b
 EBUILD aufs3-3_p20131007.ebuild 4698 SHA256 9f443498a9de7e6c238aebc2bd9be4353686c11878f1ffe46c53f7c1f082b710 SHA512 0f38101a85be0724f599e357ca1a9721fa127b5523acb0a2a704a665adb7118cc6eb13f55a89f39ab1e30713e85afab0fe5b5f3b5186e80282eab08d74776889 WHIRLPOOL 23c597f3dc1cc736a77792906b64fcaed150b998fa2c7c93ef8190615a9ff7711738ca7b2cdf8e749265ba467dd6af6d9bf6c810ac43123afa770d0e2452bef3
 EBUILD aufs3-3_p20131014.ebuild 4698 SHA256 ffcd8421f15e90df7e79f0a799b594b2a6e4d1f843ad4f571091077931972dd0 SHA512 acfb8d87f742da0418b43ffaa79390a1d374b64da3ed31652a67a57cddb94d63df6a144fe13cbdfbb9e4f08f02f1c318f44b07bee3faa936d5699f871b7567fb WHIRLPOOL 3bee56dee7da38fd55af4493a7400e336e0521e9780dd2bf791b22bbeec66870243102e718d7cde4689f25a00ce461c9ed1318a80e810680c9fcd33580805e5d
 EBUILD aufs3-3_p20131104-r1.ebuild 4812 SHA256 5264e3ddaed1ed9547215e3e7f6b459c2f261980ae60900ca5d0f57a49e1a5a8 SHA512 0f826d4d200a4cb5074a5274b5d20f5e56edfbb19cefa812cbb68436af25ae2744c559a3adadf06910e6e983ec079b66ed072ad8124b28a958b92d8466ad1619 WHIRLPOOL 8e8d3ab45dc8c0532c140f9becbdd4dcd00d5c8ef0fa07af9c7c5d8f2624cb529ed9b2d39b98791af223dd35e98e22aef83ffbdb90a10b2fdd4c46df6448c3e5
@@ -39,24 +40,25 @@ EBUILD aufs3-3_p20140526.ebuild 5265 SHA256 c2fab1893ed9895cb5d65864575d71ce52e4
 EBUILD aufs3-3_p20140602.ebuild 5265 SHA256 527c38f361619ac7491ee43260642cea9cda2f00c6ea0dd0a9f37b398867d86e SHA512 a7f289973bed5f4f2b8e90ca1273834d1b6ee3b071ae81e77fa83a95c3612a6e914d8277354d0bbece3db68b331e16457a7d65cd4018879fc8d40de6c1b65c1e WHIRLPOOL 1b77cea9b408adde6c212eb90708b9980eaa1b461670d8f85d0a02d12615632fefacba839728cbc7cfc50a666af466687569408ab97ed5233b6bb92e50718bf2
 EBUILD aufs3-3_p20140609.ebuild 5261 SHA256 2d10448d6155427362ffd7601fa028f338335eeee76317dd8d65e7d76c6ac414 SHA512 7d94275b1e3d9c1e7ebf135e336a89f5e74a600db6c356ebc30927ca42656ef4093a069ee42a969b4bbb4f3901852050176bd74cdd5123c4946fef5842803543 WHIRLPOOL e2ed103e328b34eeca49bf4dbb9e08f5412182b4e743c68c5b2ae999a134c28999dd95e2bb364785dcbb6a7be4474ecc75c7c2ffb780043f5267bbe015379038
 EBUILD aufs3-3_p20140616.ebuild 5261 SHA256 6dde099d37091445d61db98ecafdf2afaac1c89092e911b0c8da458c27d8a16d SHA512 abde0946b1b02ec3b0e4779e4a8e7403ea4e61c4f73e33fb326c93fcba2080c7bdcaad28980b162f81c6ab1347df6fc7b147fcce8c224accd1ee5151b15dc253 WHIRLPOOL 0e1b96eb8f664585a8c53c90d65e25363557f93a3fa5facdf7d7e0c27893bc6c48079fbaae8e320f5dd7ead80b7064710cffab43a726874521abd78367f94726
-MISC ChangeLog 23929 SHA256 a594f1fe98c70fcb48ab2ddc3da51487f6b4c93464e209df5422858ab7cb2191 SHA512 f13a8b6ebc00f59697c5b499bc8b03787ed7c93075708a12efdd166a5c190d20ac975684a37539e251641575de2b37fa9d478aeda9495f19551570e1665297e2 WHIRLPOOL 3ec09cbce164f72829753de0fcb59c34601562734b78b3a6e282dd689204e3315fa683d37d76a55d4586866519d98ac7f3348da9e4354f988d51b56cea29c159
+EBUILD aufs3-3_p20140623.ebuild 5261 SHA256 363c4a35f33ae0c3e91a63fa80b5844fc49107e85077a89b60ff7978411485d6 SHA512 0c5965cf037aca0c139d2c8d4d4f41128f9de8acb58e8ea7a7ce2f9c7af46f665f8af817ef5ab4837b04aca9e29c6c9851de9577f74d57d5c444d68735c97f3a WHIRLPOOL 4bf20de2ea160fe6b557d84285f84ce45604b6ae93f0adb004ee9311e880d270654ca86777cf72e84062d2ebaaa0b456336d3e20032345e04265d9ad80534a38
+MISC ChangeLog 24069 SHA256 38c35f29f7fa66e220a6081d7c37d1c914c5938e53c32af8dca88e005f4c33e1 SHA512 6b2b272bf7b988750c52929e143aad6c31bc9e7c94faae78fa67287c2e79e073fd37d209aecfcfa9d30147177a400c41611b000ece1019794a7904f6962b6ded WHIRLPOOL a58668b19a0cc1fed371846cea4cb57d86bcaccdb3cf77b61d4345deb250aac461eec7ec08c53964bdd16417c5d28dfb364bd07a04129086d8d50d4da1244599
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJTndiQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTp9DnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVc0QAJtkZRLdVXXtXQSTX3NxlU6g
-2e3jzviBArODD6MlQ/QpX94BqLPJIUUFmRhayjVmzF9phQo63ee/jIWO5MklJYk0
-ix4UJP0o1uZDwApRvdud6ue+TiEcRni44mW1wI0jxmYjiQITWaGlY+Uex0rQ7ZQA
-k7fNLypCVq12ZscYKeTPKOZyW8+DzL6HW4acqi3CfpH/mOuKRlIy6R0lO17TM1sb
-JSTkbL12TXybGo60VrgaMR9g6cY08uJ1GXoV36mnBhKnvxg1h+/qJKaugH7L8XYZ
-Hk3gj2WmgI/jLGDY+aJX16/EhbnFvJhDaG3QvREdoIVM/gY/6Gz1Mi7s1d5Mani6
-UCh7zFebaGkEphvWI9kWxIGRfOJlsLua9cLp7wcb+a9V9vvRyM8MqLKqoycl6SfR
-FG3Cvmd354Z6tz3UDmM8rcA4qEnUKc/ys0YNVxvgeS7ZDK5wWjb51qErnoo39eF4
-yplq5HFdtf+RsuYLChg79ZFTAj5GmMrrPZ3Y0V6F541FoU8K5+A31D7IFcIirYpz
-GTIru1J/HA2cVqJYZUMjtuM1WtAo2GM5jOkh5YV1Fd6iWNC9Afzx20oFCk6FB8T9
-/lJFHwzVkJ5ft/tr9CEENSyV3lCeuJ/y1nf4xcWNMqMPnWqxQjMt2i6mv0/8fvXU
-b0ao7GBr3s9B7P/xsOEe
-=24pF
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirOyMQAIPWDO45yGvF4ReySR3zfa3k
+YeVuWk00GNPbBHDiUBzMAirDpyuh3YuESy29e85BilnxxGtVQXVMFcUFVZbQOlrU
+/cI7DqLeAb5FHT7zJlBc75wOt8DWP7OpTj/mn+2rNS1Lm5txCmtEbpLT8wRpTHXS
+ywSmnzi3XXSbBM/I5cMDcfdkbqj0bT3L6jmj6aUQEQIu3k5hCJRkdvC3GXUWLLJY
+XPSIx66jRHENfAtCE9pbRbq782f4L5VLHPUKhbIgxiZucwyftgdPu0d0AKFV2JT/
+yXYZroBL26OGiue8mvzYAHtcMIcalJ04i8NSHjkaOHYZyJzb0jWT2iBX1kJGdcs/
+f8WHTBxvvCA7jI8sKTCt6SCrmpcsbuHNyOpRnaw6UVVwGi+8eM0KMAMoE+lQjFd8
+Mx+VIvl0I5hIe68f0cPmGx18pccLJpicYgSLHKAk9y2Tt8jwPkBD21NmcV036soC
+oHuQndRBs/vmMkUXogMvN3EP3+hfaxX13jCfO0zi3zs/iJFu+vXab4nbOeiqs45f
+vCCbXC7UWkOS1CZ0Qa0QlLqDlT1mtU6zNynTsxD6TVHeX/oH4tzSZ6dKOzknSxbz
+vx5WJTX8fpslokSKkyj1VcsInItuyvJ2c5wl0W5Pz2tGF2G9X1Zo7hXVmEQ9ga3z
+KENfUi4+DNA3FEqhVEEQ
+=iRTV
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140623.ebuild b/sys-fs/aufs3/aufs3-3_p20140623.ebuild
new file mode 100644
index 000000000000..2d69afbdc0f0
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140623.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140623.ebuild,v 1.1 2014/06/23 07:01:58 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=15
+# highest supported version
+KERN_MAX_VER=16
+# lowest supported version
+KERN_MIN_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+=" !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}" == "10" ]] && [[ "${KV_PATCH}" -ge "28" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	elif [[ "${KV_MINOR}" == "12" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".x
+	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
+}