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, 204 insertions, 2 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 6dd6092e3feb..be025ad0b227 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.99 2014/07/06 19:21:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.100 2014/07/14 08:56:03 jlec Exp $
+
+*aufs3-3_p20140714 (14 Jul 2014)
+
+  14 Jul 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140714.ebuild:
+  Bump to latest aufs3 release
 
 *aufs3-3_p20140707 (06 Jul 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index e98c284018ee..0f7e68372cbb 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX README.gentoo 915 SHA256 c4344c4eb6a1a38ddf86bf271c61b7514700cd986be16bfd3555a99fa2bdff88 SHA512 26a1c7389c1a5ccf0bad3fe496461048deea2dc0d627e2ad65c51404b6f3b74439e6a13c6531e501d442c281f5582524229faeaa5df22d43cb4dc7eecdb61399 WHIRLPOOL 58eab5b45c464518794d47f800b8de0ec7975094fd983be6988abe1806b3b19de831ce59dd7da4a2d3323cd93a6705827bc2c66ea852327ea443709987ba9803
 AUX README.gentoo-r1 911 SHA256 9b9eb681f692f052105bf3d3d15e689685a5fcfba1d90a88b3351158d4cebd97 SHA512 f22f1e1fae62c7a03230194c05701dc03502b84a52cfc8aacb5fbfab2c1f8bed9d4f3f97d0095578d497b09f818a3a45a04ef8527983e0cbfa9db10baeb1b691 WHIRLPOOL 73c88b3df5e691659e2e2044bda00119e742178868fa74ca7990c3d0204eaca495bc625353c22804c7420db807774941cdddd2e901c2cbceb36aa220ee3d4d95
 AUX pax-3.11.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec3f5234e7e1ef446 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 WHIRLPOOL e329ea70448d30510b5dc64ba9eca54c969c6781dc75ed326714ad0de90d10f43844e62e840cf1bfaed0ebb166b9f8a3cdef295ff06f5b38b4e5d75857e3fb46
@@ -22,6 +25,7 @@ DIST aufs3-standalone-3_p20140616.tar.xz 1883700 SHA256 25ac09681bcbec4a4e6931d8
 DIST aufs3-standalone-3_p20140623.tar.xz 1916776 SHA256 2b1a6140d21cb52ab8bbb6b6ad62a42fe1dfea4ac47f0aaa0ff5aa4f2ab20b88 SHA512 415eefd7837f962ceef6d1c041632408c89b1eab5ddcf2487a72df6ab145bcfa8feba6334a466eacdaddebef481201b3d7f8d75c113e950dc4df76b62f865644 WHIRLPOOL e13139057a333d4096f28f53fa89468af29fb41ea0046f0d3653defc7ac6482ca9df015c967376183c244ab2eb5f0e1d9c43813f9c75eda91d88f13d7be0b77b
 DIST aufs3-standalone-3_p20140630.tar.xz 2007452 SHA256 ee8f28f448eab08e7c13226e553e5f4be8618b0eace12b9410751f603a405818 SHA512 b40c4478672b0b59f43a5dd04e5d936000c4b9f7b84393e14bb3125f2d356b6a7f34fde6d796b684e80f15f9a3a12de82bd7ebd5a85fb03fe9be7fe721365f19 WHIRLPOOL 1fc706f9c0c99a096af7064160d92396079df11155d91da8052525151513e0b9e172acc1579868cf32f313ec329842d2b5013fe1d7f8946d9c0861c6cc7d98fe
 DIST aufs3-standalone-3_p20140707.tar.xz 2035532 SHA256 e1c080a02a1c8334451be3bb68ac685541ea68a22954aa5288114373f4ecc873 SHA512 c95bc90dcb2778a5d72cfa7f8ada886b148baea75ab4fcbb256636068b2b14e3d606b93fbfd4a66e21bb550a57a6cc3d13f1d1bf34e4b9da91907c32313114ac WHIRLPOOL e50beccb3101885c82a4f219e91daa6398d153a4ff39291d04e0732f62a462c7efcecbc7b845f2688f9aa528c2e5c72d2d359f1b3193ffe97696a7abf4240b20
+DIST aufs3-standalone-3_p20140714.tar.xz 2079184 SHA256 f2a7b2c04e29a7268ce155f12604f1c5a27de5d4c9d7f6b4d5b3ce6a578f6758 SHA512 edcc2e6802bd045597721f4e768d8c8bae13d77d869832c2fff898c03dce682fe865ea23fa306c2bb6e3a2e86811bb47488947765976f7316e222bdb0b75baf2 WHIRLPOOL 65b9c7e8ec85e031096fabacabc4098ebb8183cd72150f6298fffa3e8af78f862d9f7ccc4c7453dbe3343351614554b1cfa088459105b3339d3c96da1d9fc4ca
 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
@@ -43,5 +47,25 @@ EBUILD aufs3-3_p20140616.ebuild 5261 SHA256 6dde099d37091445d61db98ecafdf2afaac1
 EBUILD aufs3-3_p20140623.ebuild 5289 SHA256 990edaaaa1b226908a37b39e0f9099e95d6147168b239b7c06d9c31e87796d19 SHA512 aa31653b49858e1a6e0bc7a0e5fea4f9cfd196e87dc251a62b62b071bdf2833da5a0b1171506767a279889e06c1b9f9c9a9f6e41442df10f29599c7f35318faa WHIRLPOOL a7921ecfd5faedb6924afede4dadd2c1a4a4564391bf5e77a2267be2742e15538a45fdf62794b7a66b497b980982beb04049e03fffd8315acc295acae1f8b899
 EBUILD aufs3-3_p20140630.ebuild 5289 SHA256 1b84dfc92872167d1a368c97d78ae89d97573b04acb94f7bffd2e62361c7436d SHA512 5947564d0cd37cc85813c246c40637baf190ab5fc1256ebc0b9adf503a465237d39ed734c4f0242d81f49b0e5f1f684f82c52605e632b580d8d31cb8dba3f15e WHIRLPOOL cefd0d6c1503e73daf6bc0cb50d260ffe31a725e0bdf3643bf9f595faad9338c5fd464efcb94c77e9022416d2914fceaa2a53eeb35c9f23474480addfbc1b820
 EBUILD aufs3-3_p20140707.ebuild 5289 SHA256 93f06afaf76487d502ea60c926f4c926f967c10006af03c8220d0a662d8cd7e2 SHA512 153506ade84de27fde05ca90a7d55f534954f6b3cd46fccebda126d1a4d1cdccdaea6b9c963cd519dbbdf7773a612a902c01b3c6600f53451a25be579d8246c2 WHIRLPOOL c48ef4fcef0843d05f2e491e104cfe5a7e6344ec631e741b3d388119b5486d8e29b5ee8a4d60433da1457d663b84b4cd8f9e36d2c97499b3c45175a5b60210a6
-MISC ChangeLog 24415 SHA256 73385a187d16fb07bad078501d96ee0aa1e5699187cf79d610e422353c37338c SHA512 9fc33b85bfcb7fef0ae4437523f0bc61abd75239da1c890709d8f4d2fa71d856a9768eb524ec27b0e4f0e170344e303a8c84148c2017ec9349eded11f76c160a WHIRLPOOL 0131adadcf745c169619890df2ec3366b9fc236a708054db4e57cd3c4268f0ff94ea53da74f947fd2ca117c45162ea093329a71e864e559bb031c1d45a0a37cc
+EBUILD aufs3-3_p20140714.ebuild 5289 SHA256 c2e601d9d76d5e1338d2ea7a8a14ed88dc63bf8c0a809c1c7abfc75eb3b64541 SHA512 2198c23c72998555bbb34f230143a1a941695dd78af08fb4cc909b7ded4064cfa5ff78b142aaa38514c0b30b5b2fbe6539bb40956c39d3402b4be42ac93088a7 WHIRLPOOL 341f7861a8875e0d10fc8ef9dd90d185645456feac152b0418d4c35ffab8f14a2c131e5c94afca24dfb1599a5bcef6998c0b07d51598077323a09ea94546e249
+MISC ChangeLog 24556 SHA256 a7a2414fd2cab5d7206e9fdde7554984eebc3ae9a9b60be416058c8539225e65 SHA512 ec8d9d39168264a6e6f8e86bb449c2bb1d62bd1f27c0219f1a09af8c8beab41e1550ba0cf4e4235c41844188cb08970ff80df3a33a5bc3e3e4d756747b4d2910 WHIRLPOOL 50d523a99f31ee2c1a592c2c2d35657165d6c891552028773f5ba45532aa1a0dab6a9371f632ffb303ad12f152fd89aee9083596268c028265636cbe84bfea66
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJTw5sjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirZTEP/3gLHNQBCprTYgMJ/w8Wi/jH
+vWQJQ1DdQ84yZJQANGIISyQIPsH/yyxpS1v6xZVLBd9raWm2/moctUGW8j+9xT51
+WqrmxY7aahb52FvTyRGlSBbvy2tJfxi5ct+/DaQDU0z3Lu2KJG8GoclGg15Oe1+T
+Ee4oWDIJnDfBcP+EQTV6mJReYK9flDUAPEl9Ly2oefbOzc6jO+/h+JZLy/Tb5++A
+EbsIA+UUODLTYjVze5QsSM1rVmqKfSPZ7ApTaSVUj87rH81RA/pB3P90g6OUoTS+
+QxV9xj4DrHqXjTP2HV+9qd1o72bYh0Z6o8BoboQo1tVeoro+MQsE/MmV44rVB/xj
+euK9twSJRZePaD4BAErUHNoLfACODK8YPCoC+F5rb2Y2YszZcGYTXI6os770Ay0O
+U9LTnyPKJ11QRadxTR2d27uLIwslqpPM9YPUdqhXqlwNAVbRw/O3UupdDl2AZo1u
+PvqNQZjKCzxiF+WHkkG37IxLPySGrl0UuRRyLjfGDCW8Ys8VoHFxEmi9EV16q4p7
+d3na/UTZcywX4M9fc9Knq3D8u8uyVvUCP0nb3GIW1UyC6iAckZi3eUxLeXUsJvnX
+TjNo6+9zQ2L9hYXSu9YjQSmx8MQ6ozUFWbi5vQTiVM3a8GSAJNhkRSERh14KZA7T
+DEzKhv6kN7yV5101eO6/
+=nYcX
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140714.ebuild b/sys-fs/aufs3/aufs3-3_p20140714.ebuild
new file mode 100644
index 000000000000..81221678cb38
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140714.ebuild
@@ -0,0 +1,173 @@
+# 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_p20140714.ebuild,v 1.1 2014/07/14 08:56:03 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})"
+
+README_GENTOO_SUFFIX="-r1"
+
+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
+}