sys-fs/aufs3: Bump to latest aufs3

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

3 files changed, 197 insertions, 17 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 5c60519c2f3c..425ff75e6e59 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.115 2014/12/15 13:27:13 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.116 2015/01/05 07:54:40 jlec Exp $
+
+*aufs3-3_p20150105 (05 Jan 2015)
+
+  05 Jan 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150105.ebuild:
+  Bump to latest aufs3
 
   15 Dec 2014; Justin Lecher <jlec@gentoo.org> Manifest:
   Fix checksums, #532642
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 3ce1a46a52ca..8d8b5327fac8 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -16,6 +16,7 @@ DIST aufs3-standalone-3_p20141103.tar.xz 2485948 SHA256 d945f143956e6d32d2ffe893
 DIST aufs3-standalone-3_p20141110.tar.xz 2484416 SHA256 7832f2ee3f088340250bedc05ac56f2fe2488e6d603f3206733626bca704cf2e SHA512 50e812e50a6206b0b1184c654f97b7e7da913c323aeb8462bb2315bee7ef960da70f8c8b22bc0857a72b206773c1c802c070b1230a9c7b1974a2512ddcfe380b WHIRLPOOL bf5b993e94763b6e051ed0167fab19703f42574fbc6708ffdd8f9ad9cd2e22b85e508b21ebf2d43a8e4093d40ce59bf527282b6e0c0d0c3481660aa947093ac4
 DIST aufs3-standalone-3_p20141208.tar.xz 2562260 SHA256 28c772a8f665f534e85965e4da79b46abf16382f04ef858f427cd44fe242d83c SHA512 baf387375ae84c996926ea7c59b73a4e7a9f82ba7a7b940a61096dc3183c8ebbb7da6b7123f258a9a74d31565b4969b1a4b39fe0bd729a630bf79df96ca56aa6 WHIRLPOOL 4ff701d47aa998325eaa39cfceda06d9ec046472d7e8a8ff69953b32bffc196104f8e7166d6b057131bc388861328e0a2dce1d8e5c459aaf9745d9f122087dfd
 DIST aufs3-standalone-3_p20141215.tar.xz 2609084 SHA256 5f40f5b4b47c69932e1f2fbb6119edad3422baee0ffa2d2840f667af0b243414 SHA512 0cc995c8e1a5354c52bd25bde550258c8d37a01ca441b79ed054948238be4175279894784c66d0c8418fd8e48c5c39f3fb9f153c0bec693d91ba8d1ba072fe93 WHIRLPOOL 12e2fa49d93c8e7403639d10fef12a689999bda2c23829ced66ec08dff83d720a509462af203e03f9852fcacf71659e3118af8ed617020373eeef88ba75d5e44
+DIST aufs3-standalone-3_p20150105.tar.xz 2630544 SHA256 0f0a1ac73e23b0bd3bb614c9fde8ed9cdcf2b1b5f10fe2fd5e187c7d3b066a53 SHA512 98946fcdbdaacfdcb9087db6f592586dac2b5b38a2868bf2fe93521d4d7e06b2a395d9709ea9556a1453062fd55155128ec856588c5ebf9bbc8af9969c58dd59 WHIRLPOOL 3fbb4000f608d00db1204cfd1b9eec88b8422cfe5b741dfc0968645517667bf55b035d61180d28765bb0d3e7ddd8c18838f7376fa49b4acc0a29b19a56b553f6
 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
@@ -27,24 +28,25 @@ EBUILD aufs3-3_p20141103.ebuild 5499 SHA256 7c5621fd2c7dd855d60cbfb506c872978e28
 EBUILD aufs3-3_p20141110.ebuild 5499 SHA256 6622a6f1e4114777af9982ea89636e5087800e68fb712b75738906798f20eb80 SHA512 8cc804f6e9509f75122b156a47299ba202bfd9b9c3ae496b467d70758de15235dd26748db4bf03255cbf421ef2085e2a664341bfb3bb27102986eb5ee48451a8 WHIRLPOOL 0aa3188585f63603d2c1599486f1bc9a090ff9ca6200bdef6db6bd79620a6afe455dfed08b5fc46ad5e76a1f9296f9d484b38ed6e3e47292489e710563283e9a
 EBUILD aufs3-3_p20141208.ebuild 5499 SHA256 a81211c6c06e1a5ba0d5524b3ca4c70ded881019326ca5b6a2ed5e77d75091a7 SHA512 9e2ceff4ec976cd73b818d5a5c6fb4f329256080c2b130241d4015e4d8a7692e61dbe70626e8af72cdef765af7eeaf184c37de5c07ea1abaa77973f7618f9030 WHIRLPOOL 4c9be3faacd5070f6a6b399ad0574e93dc8b4a018aa1ce7fe73a0a263176c75263df4b0f36df9b57d4a3be1b791ff41b194071cff595df819e0f12373ff193bd
 EBUILD aufs3-3_p20141215.ebuild 5499 SHA256 85c1dcee37f380f22db842c6b490293c5de449100b638f432057e7fc64213dd1 SHA512 c316fa3019e4a82b092acb4b7bd69a6639d057dd2bb2ca38147fbb93c76758a7c780bc7d8ddc5bcbb45254725b4b799c43bfded12cfb9dd51e73eb4d954576c9 WHIRLPOOL 7a59be1242a4eb8771efbbe1f65645d47866cb7b65b3ee1b4deba4af9efca5787003a9b4d41e55a50482068ae2fc8fc89c51e0ecb05fe46461a2da6a910d5bd4
-MISC ChangeLog 27136 SHA256 c4a1686d5802bb0e6a774a4b71359aaaa2468089fb80c9bb64738b30546d1ca1 SHA512 86b088af2df13c7335bd88e1b1a74f1a478cf84d04f755c575614bd166c6f4b1ae9dd94204717c715822a718abf59dbbd254d4a6412a8d1f33434c7f888f88bf WHIRLPOOL ada5a672a17805d819298359df26b2819a011e655207a6c762cf70bf533101461df6701829384791e18e7ea472bd2fd96d7dad1869ef36f5d185827bf358dc7e
+EBUILD aufs3-3_p20150105.ebuild 5323 SHA256 c9f447102e1945c5b4aeb2bb5f2633650aa6f8a46bed1c31d9e5273590ee65dd SHA512 83cf12af0ecd7b0bee35c08342d9e354147d946ca4266e125377b6c265a6b728e38f2a0c544d71e8ae649ff1eaea9e4b8c3ad14933da24da6504a6978816be9e WHIRLPOOL b6d01d0513f797a5037b60d21ae9400e91d97da2c855044b37a39796038a0e05fdf2897b76190d1306d9253aaf427e69a64ccc219be4dc1fd4fec69621159edd
+MISC ChangeLog 27268 SHA256 da3de2a82f8629b6a5dd07c3b34776b1d5fadaa8b61bf9535b9c3b35b2b8bb9f SHA512 eac1922d7924a1760dfb1b77f654850aa507e09f11f7561ce6bb461c2b3893f42abc2ae35831654e8d1cfb223eb1da005b24089fdeb4b09cd31cdb8260539c18 WHIRLPOOL 94f7d1f4524e0289bb25311c3080b758713f074314ff7c4de44a83b73ec6967e7228bcf1d9df34bb9eacdbdd816ec2924c08032f8e1085e71a68d2916c6636e7
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUjuGyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUqkMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0hsP/jvXdYYtd9X2yFPuOYrRG9Jb
-bjyY8jqjOcIx7DEICvWRsbOQSf6NBySP+h6sf6T+SvZuxTA04sbragwGslpgVp57
-W9gVsd5OCHZrXwdCGDi0fGIMycEOTpJpkCwpg65EW3tsZBEoToEW2UHF2aLoe4ym
-f/6pvBzNJOzNp6EX7VRbx2GNWN1OOUASc1a2LYapiLXmtAkLQMx0r38JVPsTvXQn
-THwYnZBgp77oyYAHHBHieUs8q3CctTKxU9GkmaNoFjA0IXke8v1XpLmD/y5sLq8B
-JQFJlq6mqtTvG2z8R9MmMloLVXwuzL/BTxLBm7PAEf5T9CApg0ioozKtkmA9oLED
-JKYlCOfQxcpVCTbE/fsokf2ugbi6GqQt2ClfWSeUiqjFRKaqwHpa1ueHgp2jcJgu
-d+dcnzJgcwcs1v9GxRQD7DI5sZU9QJzRGAx/htYtEvCDFVIbap0+Cv0Mf0wHG/WA
-geESWVp64PW3Bj5ghPF40+fu62/q/Xl1mn2iprjUDiLLEBMul7xIhxTRgTtRqyXy
-kOATJg/Xw8P4qAIrfr8u65i5UELWBnMT7GmFPkixZulCJYr6NiQX988Z5j1i8y3C
-738IFCdAB8+kFS9wGCMliAH6x8HAfrXT0b3Qs2xkKoj74xTDBBJTpVlN3tOeFGj9
-mcy2EtpX1OxMSSO5cSSW
-=Qj7N
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViruoMQAKKptsVn/hVUhSrDHSu5fwac
+BDptnjBT45gKJLfihz06KFMbQo4EA/2ytnlIZ8DMofF8AxVlQOoaP5hrIBeGGSom
+gBf+n69Wp6kYTpnGyXwQHxIvUP8E/SpcUPCb1sBPQcHnKAO6pkyhnczai67yt13C
+pzuo5aVkqOOufNuIHJoCJ24jphPXOD8p/NFrVSFojktrEXPeNin2/MaeThs9VnWd
+k2o8qt82PlqJgzwpJshW0CJGGc1gCkthb9OHZFNT/R2ymjzvhB8kx7hYKM/YbIiI
+391/oxiNlY7wzHT6ZfQ53aRXH4GP8w4L0oTZxXtjv+Esq4TJ/TrsBvqUJUuTv4xO
+HZhkDyYZGSsOUODT9rGz0gZNmZ0FY0FSjCN3HCMGLXWWZzIK06jzNBg0JTdVlH1b
+hyzC6uzQAMewoBEPJQCYBs864cuhG/tImj640b4AoMzUP9ar+Up2crh9iUL65YSk
+pz4vbn67IAgSxeS0turVSetLXGwUY8bKzGymxBac+skrtTRdA3ah8BXater9bAAZ
+AMkdf4uj5O50Zy4/XNL1ajQwdegxfBr0J1auR+i/gFm1hOjFPuMVAyhTI9wuokHY
+31mCqSdZF/A2wVQb5urTnEW1Xgid6Mj7wrGHQDWQ8oGT3KGdUXVVE2eW9YBOXj2M
+2cgns+l110CEm5po3TPb
+=gqd9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150105.ebuild b/sys-fs/aufs3/aufs3-3_p20150105.ebuild
new file mode 100644
index 000000000000..cc304774a6cc
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150105.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_p20150105.ebuild,v 1.1 2015/01/05 07:54:40 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
+}