sys-fs/aufs3: Bump to latest aufs3

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

3 files changed, 200 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 2c4f5ce390e4..0c93e9f33bfc 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.113 2014/12/08 07:43:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.114 2014/12/15 08:25:09 jlec Exp $
+
+*aufs3-3_p20141215 (15 Dec 2014)
+
+  15 Dec 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20141215.ebuild:
+  Bump to latest aufs3
 
 *aufs3-3_p20141208 (08 Dec 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 479d4813bbfe..6fa860f68032 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -15,6 +15,7 @@ DIST aufs3-standalone-3_p20141020.tar.xz 2490912 SHA256 7bf64e2f119a4bfb2d1a275c
 DIST aufs3-standalone-3_p20141103.tar.xz 2485948 SHA256 d945f143956e6d32d2ffe89337fbf8687acf8178b6355e9ccf06e25861ce055b SHA512 e1a5c4b0a665a2d7c6f06413837bf732ce09ea6c59551d9eb741024fc201314eeffaf75d8b768d6d254fd0b563a44f905adba1291ce95eb2b0db34b550588e35 WHIRLPOOL 6402d72b4e1b91cc2bb7e08845d565acdd379553120cf20c8af3ee0148c75e785a54dcf03485b959462647542a0e1517ad7623914c3271df0cf8f2d2e5b664eb
 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 2608388 SHA256 9422c329199bb268363013d3d70bc2ad6886577b1863a1fdaa83cf8c896d2634 SHA512 c510cd7418a816834d67b37f3abc27c869c504d2435f95abb9dd991f06c407d4b95094206795e5119f2b57dca92fa6902c3f7cde44458921df152d0dba01534e WHIRLPOOL 1284fc42a0b36415c523fe91d13ce10c7764e46c32d11cfe1303190c0dabaf396f5c87d3cdb756d0fdf3a6fd73bb1e5dd4930d41be7e262e93ea11c63bf2eed8
 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
@@ -25,24 +26,25 @@ EBUILD aufs3-3_p20141020.ebuild 5362 SHA256 f9ed3035bff6bb7889240de972e6f9337da0
 EBUILD aufs3-3_p20141103.ebuild 5499 SHA256 7c5621fd2c7dd855d60cbfb506c872978e289283e0bdfbad31388f1da3b674d2 SHA512 7504500eac278d365a7208fe4b91502d646bc2662734f60ddfed6120f24d1a72b26535add7310aefa47795b5ca9e5b4cff763839fc0bf87e5dff78eacb0f8f5a WHIRLPOOL 087ce2f1307d70a7d35522fba3edb5fd876a113be6cbd6493b2705612bd2f939f00e605481b53cd437e06126cce610c7fb312d54331a33dfab81f29a67aec8f7
 EBUILD aufs3-3_p20141110.ebuild 5499 SHA256 6622a6f1e4114777af9982ea89636e5087800e68fb712b75738906798f20eb80 SHA512 8cc804f6e9509f75122b156a47299ba202bfd9b9c3ae496b467d70758de15235dd26748db4bf03255cbf421ef2085e2a664341bfb3bb27102986eb5ee48451a8 WHIRLPOOL 0aa3188585f63603d2c1599486f1bc9a090ff9ca6200bdef6db6bd79620a6afe455dfed08b5fc46ad5e76a1f9296f9d484b38ed6e3e47292489e710563283e9a
 EBUILD aufs3-3_p20141208.ebuild 5499 SHA256 a81211c6c06e1a5ba0d5524b3ca4c70ded881019326ca5b6a2ed5e77d75091a7 SHA512 9e2ceff4ec976cd73b818d5a5c6fb4f329256080c2b130241d4015e4d8a7692e61dbe70626e8af72cdef765af7eeaf184c37de5c07ea1abaa77973f7618f9030 WHIRLPOOL 4c9be3faacd5070f6a6b399ad0574e93dc8b4a018aa1ce7fe73a0a263176c75263df4b0f36df9b57d4a3be1b791ff41b194071cff595df819e0f12373ff193bd
-MISC ChangeLog 26921 SHA256 c6291e463068b42e28944cdad53bf15ef9813cccb38673d1f9d8f3e40932399a SHA512 93a1d07a1e16158259fc4f6e49d7d1ef6808d527b67b40d154576a2858ccbef254df87f9c96df22fa9777e1b896aba07ea4f2eef3373e18be7b7ba273a78e2fe WHIRLPOOL a2291eda15b7d66a5aa1abe0d704e311048f4e837c9afaa95f21efaf786ee87e4e6f3e762a6be13520665e581f61b757ab9a5c7eab5c989c64881e01510108bf
+EBUILD aufs3-3_p20141215.ebuild 5499 SHA256 85c1dcee37f380f22db842c6b490293c5de449100b638f432057e7fc64213dd1 SHA512 c316fa3019e4a82b092acb4b7bd69a6639d057dd2bb2ca38147fbb93c76758a7c780bc7d8ddc5bcbb45254725b4b799c43bfded12cfb9dd51e73eb4d954576c9 WHIRLPOOL 7a59be1242a4eb8771efbbe1f65645d47866cb7b65b3ee1b4deba4af9efca5787003a9b4d41e55a50482068ae2fc8fc89c51e0ecb05fe46461a2da6a910d5bd4
+MISC ChangeLog 27053 SHA256 b8d46765bdda1c9151de6a4d84d96abf5e0c1d9719cc96a69469418d73f2685a SHA512 1cb331f8faf5dca2811edd1dfc489bc2c6911f216686a1428f80f93013100b920153dcef07887ac556d3541af003fb9dfdbd0ff2d8a40fef494039d0d86e11cf WHIRLPOOL 2dc1b002d1e783611d53c257a4d17f332a2458a6b7583630634d2348064a8df49f6c7d466db4a81ff20fc241f111687af7b70c3e9839b301eb89f87f65f82e1c
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUhVaqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUjprlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirV9cP/0xSuQDl+ZPleK02NkRSjVyS
-t9QBeJvUofc9P0uj5YffFWhlxFhutVGzao2y8nrA9G/MCegB0krIY419oeMEnBPs
-aGIH2PDXXZCOXN8SiqSPMwD9UwF2Po4mHwaYY6iBnb5bDAYBHIPCttTbYIdL+DEo
-sUNFmaiMu7wK3BXZRLgoZ4+tdB/29rZlEIP5uyg+G/Bzse+GkVxnrv5zNfm6Qcx7
-Cqy14BmUyhSdBcczBdFiPtjiuB50XHMYaA+De13AcQndBaaIh77ep05NeE+ivh2P
-CK6NmiH1uFDfdbrWPE2pQ9mIgQybuBQJ515Me2BaBt6aNrZQt0/BTYrB8sP6VTGm
-LSbGYVFHJ86glOkw1Qj205gGdHopFhq5Zy94I+6SRSfHPCL06x/DZP3w1R90FQaa
-rKPG4gqGKBFhL3FSJDSzRei2HMLC5CRoh/fouY9NmDUy4zVbT7NdPLPpqZIuLgH1
-DyWUApdHDnC3OpTms2U+Vij0So3T+FJIGXSS1czVKpCRHHjknjFV+hdgeXz93j3P
-FT5donO+tHl72OalUMMaHUNbHGKbdbDssA5A1xGj30lKa+VmJ6Ex8MbSnD3xMhbL
-PADZlvZts1yVKchd0ZZT9+3kgPNpMlaGhJqn8MNT6CqmUg25HsMiVU5nC7zdmrBJ
-KNTJYz5YAU+ByOd5Agd3
-=F34B
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrRoP/1UoAC31BlqdO+bgx5lY6VOk
+CWkF/sgQJm3wDKUrAuH1Yx/J07dtol+hb2aIh70rfOg77p7Ijc3DEW5eLsR2rj6X
+D8WYBSnEbT/ejyo8ztzQxaagt6Xb+16ZdWaLOj5YSI/aHdk5LeDyD5lJA5R9En47
+ublhKCyhU6AdV/2jzLzfu19hx8w67nOg5R5VMpARsZpCd+TsBFgjmW24xMJawCzE
+6WnyMQZL3EYfOp0oHxjSFH1ALOl3UXie2Jo19oAkdOjCzA85c0gUj2rkRX/4RnRi
+dEV8AGfhsolD0votE7kXh1Ed87XwJPbtng5MT2/8+ZYe6c6PGiLOInQeZ+Ir6Sjt
+HSFCEnDeSzZ9luTWqCt+23JM4yzkQQ+20LcQmagT3fj3Q8Kf9Wg1vFqWRszxckRy
+/9cyoE0u1YQ168mSDTSlPtvH6prCTXE1VfcSOVVRozyl4+ATD5tfkGPZwokDrqJD
+uEC43vNSCXEg54tN65ZzSr351o6DX7RK8xgw+J1oW/DJ1PrnbjsVhRdi2XkTwPOi
+LUDWJ4sRURUzONZQAfsAAW+nhsORduWhzIABHR5wFbapz/kr47UzbjnUBJncwfBg
+A+LsmrRrDW7ZIf9IEh14r6d4pue4DWhl2Dl1fKi1AioRMc1cYhiSRZx5BVC3Rbz4
+nVQNU03al/dBSWvPga3Y
+=eEL8
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20141215.ebuild b/sys-fs/aufs3/aufs3-3_p20141215.ebuild
new file mode 100644
index 000000000000..3058dd7bfcba
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20141215.ebuild
@@ -0,0 +1,177 @@
+# 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_p20141215.ebuild,v 1.1 2014/12/15 08:25:09 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=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
+	elif [[ "${KV_MINOR}" == "12" ]] && [[ "${KV_PATCH}" -ge "31" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".31+
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".12+
+	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
+}