sys-fs/aufs3: Bump to latest aufs3

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

3 files changed, 196 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index f76c2ad92a3c..a98ae554fc29 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.118 2015/01/18 18:38:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.119 2015/01/25 17:37:25 jlec Exp $
+
+*aufs3-3_p20150126 (25 Jan 2015)
+
+  25 Jan 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150126.ebuild:
+  Bump to latest aufs3
 
 *aufs3-3_p20150119 (18 Jan 2015)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index b2219dba5ef7..fb0f407a6610 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -18,6 +18,7 @@ DIST aufs3-standalone-3_p20141208.tar.xz 2562260 SHA256 28c772a8f665f534e85965e4
 DIST aufs3-standalone-3_p20141215.tar.xz 2609084 SHA256 5f40f5b4b47c69932e1f2fbb6119edad3422baee0ffa2d2840f667af0b243414 SHA512 0cc995c8e1a5354c52bd25bde550258c8d37a01ca441b79ed054948238be4175279894784c66d0c8418fd8e48c5c39f3fb9f153c0bec693d91ba8d1ba072fe93 WHIRLPOOL 12e2fa49d93c8e7403639d10fef12a689999bda2c23829ced66ec08dff83d720a509462af203e03f9852fcacf71659e3118af8ed617020373eeef88ba75d5e44
 DIST aufs3-standalone-3_p20150106.tar.xz 2630436 SHA256 47bcdb0b9eab31115ff306870dab178f91e2fd04ee31c31d17112bc677fac378 SHA512 5834834cfaed7a4a6e47f53656b1302d1e603e2095dc4939d627fd3316e9878b0296ce3df3f7d3939f877c3a03115444fb69be007748de04d38a3df68b47f11a WHIRLPOOL 52a71da7b7a928b0eccba6e466f1b946dff4f2b7bb4b8580063218b1d66384e3dde0ec693257d9553362853b35ea9414f724431ef49c4e285547c98669ae5c44
 DIST aufs3-standalone-3_p20150119.tar.xz 2664080 SHA256 8758d15b49487e5339c61c4c0b0babd06fc76f66b821f4998964f3d9d39a71c7 SHA512 d10c978aa013adaa9ad70da83cd6d3e3f11c85e2857ebbf74d647cdf031fedced0befc6870e669ccf9248734b11fbdd5da7c840f078c19ad431cec54382c6546 WHIRLPOOL d937909fd47fff0dab6c25b18e21ec8d22e199003853d21fcdfb7cefae6f6044e28880d408acfc05289b1657df2e93e1346f548ac072ec67649ff40242bc6f30
+DIST aufs3-standalone-3_p20150126.tar.xz 2726476 SHA256 8799abb92c27f7ba54f1119d16e50f4f6afd134e8e8510954f09ef96aaff3fb0 SHA512 238364ce5ad513a608d2aa9e22a1da69f6e9c7322e9450818366eebd48f998c2820dd30ab16c010da40de2ae992aef5d90d2883510b3798fcd0db882804751c2 WHIRLPOOL 113bc8316ab3eba8224450bc9b668b29b714104e115e67f286352658b4e998840889f0d99b396a43981d3d890bbeac97b100bf8a1878ddce4c83e9a5b7d6896e
 EBUILD aufs3-3_p20140811.ebuild 5289 SHA256 90423edfc0dc22d1142b3cf29cff610ed0a9a8101a200a9333195e6e75f41d38 SHA512 d2fd015adee71aeb5cc5937b2f3dbfd682525d5c127ae23aa7c3531276420f675f08460bc3ce36e5fc49acc1ce38bb97d5f9dd2a0833770376ff0383653d65e3 WHIRLPOOL b7d8a2c3df0549725ba2fe8bc4d3a009101b239de8a3ff7553bba36097d74487ee1c7737eabf8b593b419a1b284ffc1e5aaaa1e7d2391f5df9bc5254d51bdd49
 EBUILD aufs3-3_p20140818.ebuild 5289 SHA256 1ec07186d0b8c186fcfeec3af7ba6380a23c42ed9a9b92c2b83135f4b3e4e493 SHA512 8668411990b4e184ead86d4e2d670243a52885e9cbc4434b1129d6c6a172ccfdc93276277e320f366cb8fc41c461229e9c68d5598d94b6f756c51f70879efe1c WHIRLPOOL 1948e50544ebdf819120ca7480cf3f584fb3d98b4f0550de994682a4cccee47daa4d84b9589df06c396ada53f58d098cb132c3d4c14005f1f176c83492a3007a
 EBUILD aufs3-3_p20140908.ebuild 5289 SHA256 7f710603aa95a8fe1e5ee9927db6107b0212e292c10d7bbf3da2cdf2e6d60f87 SHA512 4e44d470bfcf4e04764ff640bcb5ca61196ae796e1ba41a8884cdd3a5d7484b1e79c5c93f56264bbf72f5099048d4bb7f35e787c4e185da57d7149575fc4372b WHIRLPOOL ffd516d99b7acffd6b308a3cea3ced65545780515e86a89f7b80991001a05ffd059b5320204b559ab4099e419a9ffcfd262b31b87d369e7b798e9716a45bb96a
@@ -31,24 +32,25 @@ EBUILD aufs3-3_p20141208.ebuild 5499 SHA256 a81211c6c06e1a5ba0d5524b3ca4c70ded88
 EBUILD aufs3-3_p20141215.ebuild 5499 SHA256 85c1dcee37f380f22db842c6b490293c5de449100b638f432057e7fc64213dd1 SHA512 c316fa3019e4a82b092acb4b7bd69a6639d057dd2bb2ca38147fbb93c76758a7c780bc7d8ddc5bcbb45254725b4b799c43bfded12cfb9dd51e73eb4d954576c9 WHIRLPOOL 7a59be1242a4eb8771efbbe1f65645d47866cb7b65b3ee1b4deba4af9efca5787003a9b4d41e55a50482068ae2fc8fc89c51e0ecb05fe46461a2da6a910d5bd4
 EBUILD aufs3-3_p20150106.ebuild 5323 SHA256 069da636a0ef51a295bbd5e3da78ce24be3e86191b773b7e8937a0893643f0a2 SHA512 f5119e4bbfef9519d5c46ee479b782ff2b3079cc94223c9871af108fca5c816a27d10f9942c14cd2cd08667700b1e24694fa1a9e5fab121560fb5633830d251f WHIRLPOOL c8b7cff283404b51fd0330959a9d90ef531efda592f4b0d367ba619937c89289196c4a3aab2684cbffd4dfad26883798e719faa27930f865a9d41f52df76da78
 EBUILD aufs3-3_p20150119.ebuild 5323 SHA256 5e5ac54da78108d65831b4065a93b14f66666a8caeced300a35716e66a89acf8 SHA512 2ae993985ce722ee5a885bc5222cb295eb177251d389983de36085ec3503703363e723c3f315a3d07a51e39d36a2afc717f27a046cda23fd8e160f6a8dedc955 WHIRLPOOL ecad072efb457fa02acc2e3eb7ffc4ed5c8e7f57c5188c5c55fef7572182eeb96d2d71ca8b377cda6420885799138c167e7a4aeb03be9cdb9cd536fd26775750
-MISC ChangeLog 27561 SHA256 aa2af01834e6d8ece712e293b3a7ccb9f4650104b3c56be20bb48d1b6bd0c103 SHA512 5447048a2b9c8ace6e4e880958ec23ca112768b362307bde99ee84af6a74b0a73e01a064adaaa7df1d131b512dc28524ed45fdf3b543d2b001eb6b8b442d31fb WHIRLPOOL d508583b8fed006f99afd192ec07b05ba93caf07e0b51a81b66857fc0fea53106afb4b551e513e97309d6dc03456510c1c9fb7fff63922dc5707fc64ba1f6b62
+EBUILD aufs3-3_p20150126.ebuild 5323 SHA256 b654d605967dbef9991fee2b74166fc56ff166b11bad3894d5d4e5d7163c3d4b SHA512 d4d9e3a2bbd077daec384a8d498098e028b903fb426eaba615e1b40ed94ef70676f0d1da2af09d47768fde3e77599f082f571ce9e6db54465dcf319a74eb2f20 WHIRLPOOL 73a77dd9f482bcbc90a0d53943958e12bbb740ad49ea8c9776b391ef7f0aa5770f12f44b3b5cff9cba6de7283e040ed7c56d9832237f5e82dec7d529676f8ce1
+MISC ChangeLog 27693 SHA256 72a519b537ada3a0dd211053534b27b84c66e53c56884104f45a05392a8db26c SHA512 c2e175cb0303390d7eabcc60b2421f465eb62067efe0aea9b1c3980f78c4fa9263a969693d1960802a0cba03bd383017603ad89d109b0dabd3ce699170f167b6 WHIRLPOOL c7e12d6a3465cd6bce0efe01cc66f1d78eb34f21b5779982c2079cb77f9a656b01a19827e8bee50dabcb4f402802209113bf22f9de737899a84ac00f09691c07
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUu/5KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUxSqAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVqEP/jP5goU9pH4Jd1k6tS2IVtNB
-YuzMKppmX7PQeB+Ye02U9F0eTCDWX+fQ+Wbf168sCfFsEFnhPhMGwRy3NeT6h73u
-38cppLZg3Y1UwbGwlDMbFfB9RrxMHjpijN7tok6BvPWtPSyxlTQB/Mhxw2FJVbX0
-F2ajLStXQsOZzCXGAPUJnLlteC2KoY6StFuE7JceqtPT4K6mhIhB4MOkWVSCaCeI
-zdgHekw4Wcf6OGRxeY51O46O0b0upbRqM6gnyx3LY+N/tJXQSA0tb1LLExlofHks
-XFzNptaN7T5xjgcD5PcbAS4PLucTT81C59Zn/y5tLEt7gjAvhX0vxLtF+V8mMyUC
-wc4LDueEVPla13dfmpVOW1uYydHDZQPwdZOBj0k+xgtUoLy7/mIWVzBp5nIC7RWH
-bW/cYo4wL3VlA/iz150M2uexYKk5oWcYK6i93u+1BIbC7d/KK9/I8b8K45zI8/pp
-sfJek+ADOyiQEpxaKUJPJGfwumbMK7NiHtmFq5Qez0BMd/rP9Ht66ZFsEUsAP9SJ
-0T9AGHvQBevGpayjuy3YzPpbvk/VdPayJRUz6dbgz8Hvka+DKZwxHm+RXy+3AiMX
-bDUXPdr9j2nzmebpk89Vbbpr3upfLDfyBEn3jd7w3Wfgr6HsqGwTRk1B0f5UOQYI
-cCJPQSonC5mdjeoqGaJt
-=QyMS
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirVIgP/1sGeLFp4V/H+a/RdM0fnSHI
+CO/Ip2HcwwT7rqreY3iaaIhnmpMNz9439oUcV2oE0AOkvVc8/e6DbIBTCNzkydkf
+YttR6vmzo8IOvhn0PSDq7rGcIHfCZAgpAK9j5m2ylsRZ1p/FleVdq3YV0/j0g6Xy
+4p8RH4UBt8UR/KZuWhI3jqw8mjugVUMTk8Hp3Js8Hdg2SpYJeEitGwUOUNpJsaG0
+ssCGNAh2jOmxA0XnthQm81OYoOLRu44htKqPA+IQQh40mP4ouuIwLpc7gAEJOV+t
+7pFxXajppJNxZOtTkRVSB4wUggbfgKXhxNCEygWuCVnmxZJ78q0elRlo/w03Wslg
+D36NLRmOvdYu55l279V18KYh2xfbLvPjcywDKvgDg1SjiqTsRW/AAvPReLWQwJE0
+DCgvCHPATO/2qxK0z+Tkb1o1/7rrgzONGihEl6nkxtlma0exVgi42W524AwWixbg
++S3qt7OfzWDwuMB6IuaoHb9WZAWULvsKYs8TzxQCEA9NZQ2yD+d1jCC6D95PJ3bg
+gYZDsR1tt9Tnqu594d/uejOoX87lBGWqjrlhCRWfigrqs2jm0mi5asXiMVf+vC8A
+IGRbH79SNHmgtL7a+mOWPjdqiA1iLku/jo7qjb8dF4CrrsLsFL2MK5q5Pf1npBa5
+x75k6rnyxaxuiGvuzUeg
+=j0zV
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150126.ebuild b/sys-fs/aufs3/aufs3-3_p20150126.ebuild
new file mode 100644
index 000000000000..380460e9d21c
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150126.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20150126.ebuild,v 1.1 2015/01/25 17:37:25 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=18
+# highest supported version
+KERN_MAX_VER=19
+# lowest supported version
+KERN_MIN_VER=14
+
+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}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".12+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	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
+}