Bump to latest aufs

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

3 files changed, 196 insertions, 17 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 94b81081c654..38a08f3ceb34 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.133 2015/05/18 06:15:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.134 2015/05/25 08:47:19 jlec Exp $
+
+*aufs3-3_p20150525 (25 May 2015)
+
+  25 May 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150525.ebuild:
+  Bump to latest aufs
 
 *aufs3-3_p20150518 (18 May 2015)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 04e22c2c555d..df553b5ba659 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -9,29 +9,31 @@ DIST aufs3-standalone-3_p20150420.tar.xz 2864092 SHA256 0f592b3c84b149d0842c518b
 DIST aufs3-standalone-3_p20150504.tar.xz 2886004 SHA256 f88435f8fa5d0316a5d87cc8c99012a5504e4f52deee518ae6d4b48152a38071 SHA512 acb863eb197a089e7720237f4b1f1a28be150eee751cb6930e16d96053c1dee84333479ac5f2e5eee2107fe73f9563fe4864c01d07a9de452cff1b7fd283844c WHIRLPOOL d6dcea3e86d0eb5636fe6026c9d8e887e8c15283f364aaf41fe1b7eb4ebfe51caae8dcad26162353e90a28e27587a777fa6d7d6e710c1d1006f2b597bd39c06e
 DIST aufs3-standalone-3_p20150511.tar.xz 2940252 SHA256 c3f67eff4fa23a1734e94733d7d7f9e7be1564525e70c8207995a02f96c75ab3 SHA512 c66c6450596f5f5dd6223b7945cbd5a6bf8117c2c0c98547a7debae6e78965cce1cc5e681d60efa798f93f94f67c0129c5372d9fbcbd313abfc5a6bbf89d28df WHIRLPOOL e56fbac3edff29bcc2653683ceaa6e94f18f0764d435e454e981b9f728b03a7cb7562f5a1005455a764cfaf001c7db87d3b74e9a433165d51d53097f45f9cf75
 DIST aufs3-standalone-3_p20150518.tar.xz 2967016 SHA256 f938bdcc461dacf2b59c807b31fca70f166007a3973c50076b60c6d2e53b163c SHA512 7aede4db3135949a7f3098a29ff9234e21eb78534c0aec3b8fdcd63782110f48c76734752857bd157b29cbd16fdb7e844cc50992e4750cfb05ccfba2d9247b64 WHIRLPOOL bdf559b43d2cede70c334621574f62f123a481cefbec091f3e9e3bd12a499ea985e885a941e24634c2d8e9e9a83acb2c149da29038db00562824647ca6e8db78
+DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174afaa347c4f9e9414200899b5c43a8ec0b91c7d03 SHA512 ea6031ff9231ce68b95450e428989ad81b1c6ce4a9a21f718f73dbafd3aa1e12191d7abd57829e0f80cc0cf0aa412e35b2cad4e14430078b88b2e17312d7b708 WHIRLPOOL 81aeff069ebc6122856c74fcdd38784bd7a231c99726a73ddaad04f145978053fd3ff8b788ac0995fa261cfbf62d461c43f8dca887525df887fdb0011a417f40
 EBUILD aufs3-3_p20150406.ebuild 5310 SHA256 5577be022e8319c4bbcd7fe5e97317c96c4c6af55ce2b49399592a945d4f9aac SHA512 b1fa9f91ed61c1e299dc798544078377ea043d4cb5ca821acd06f172cad227f2ee42e5bd773ed682713c1f7cc30bf8e814d1920384413f51afecd2a5d6a37fc0 WHIRLPOOL db231654ef119992785e5e35fc91ea6760e7cf5aa5efe14001214fb916224bbdd6da823d907d0ee6b83f9dfce8082ae37fe62da2c92816f7c9ed264b2f8efa23
 EBUILD aufs3-3_p20150420.ebuild 5310 SHA256 3239b19a3faba15d48689f9b981aaf308a0d9084685d6a577b43d5cf5bdbb359 SHA512 e956ba3468042c0118b0e6be27deb06b99cc0a51a17fb4b78ca0cea6d2fb4ab546a62c026874717c7570dedb8f63768d9111c579b260b1186329c07aeacf11fd WHIRLPOOL f668d9139a38ba4878f10ad9005fa8faa34a72abb1d14c394a940dab7708015f0e6b16b390be88ae34c9cfd751c9d0021abbaed4f35bf81d6d5db0f2169a0ae2
 EBUILD aufs3-3_p20150504.ebuild 5310 SHA256 6cb0fa1578b6fc5f73832d1354c8f74febbf95c8289a813f986aaf8a1c7d33ad SHA512 9e627f9ca209e2dff5037eab2310b4cce4608c82a790319854faaa5ac6a447cfdf04e3b14e3a56cdee7be6682667020cf59ebe63149abc4b0f565f36755a8f8f WHIRLPOOL 05d6fa22671a95f21e47c41cf8ce823fbbb4d5e6da88c9f10c0c0c96002c4dd60bf819258e09eaa7ac9776d3912e23329d4eccc3adbd44700f846ad9ba6484ef
 EBUILD aufs3-3_p20150511.ebuild 5310 SHA256 6202ea434ae3d5b035465c79a289b431d52a11bc51c2ba659c8391c49d6f789a SHA512 a2d894bfdc9e5677b45f2870306d0cbd28d8792198597019d899497bb7843143c00738ab0f01caeb7a7b12b463e3844ba376e5449ddc09abe85c57128e6e1913 WHIRLPOOL ae72bd2b31ab5589b217a92f7afa6034a13472a21ec79ebcd352f27686c61a82ee12df82fd6daf2ccbc165a2fa8b07ea037d92357b2cf19f98361f59d167077b
 EBUILD aufs3-3_p20150518.ebuild 5310 SHA256 354abdbcccdffb584d4d189acbdeb1964d2d7404f832ad8a826ce5b42a49b356 SHA512 172c5811708958ebcf690ee7766ced7bdb804c5b36da6441a373f14b495cd6c8eb4f02b29fdc602ca1e40e6276291a34c0f02cd0f037ad2e436c5f8120b10bb9 WHIRLPOOL a7fb5c23935209b6dbee07aae0e02ada5e30cd23fd65325a9723a24d8a1ce0906e5fe29b22bca2578e275411ab1695f7992ab19b8a1331e3fa9173e9bf8c01ee
-MISC ChangeLog 29913 SHA256 cc82dbd6e91f0cd9be56cb2258ae5da2d6a60243689cb3ec9333505e2224439d SHA512 32bce8a7a86935e6111ee6133dbe546e01ff48f107fb029b5fc58793f515c85eda1c72be9ace923113bb66cb5cd1ce607ec4c666d6760d00b32bb29c522acb9d WHIRLPOOL 8980b0080691223f4679d7ab6b48e1b7278757d4e30a815c309d4aa5f4a40f59ce6484763e320f578e0032bb03095b6b047855f2c9b29fc13b85483cffd9c244
+EBUILD aufs3-3_p20150525.ebuild 5310 SHA256 8280c758a871ad47c1c6d3fafd1c1641c2e720c2192199f137b756ae52099fd7 SHA512 8d4c0ff6b7656da7b05f8a240aacf9d00602e2d7a97d395fd506ab5a6783f38d86c09d91ad599d2e12a82e379bb0164faa67fdd76bf54957dbc80d1739ff8030 WHIRLPOOL 277013bfba6780ffe15a053993f6a0f8afd6851ce0fd3d73e34268852cc22897959269779a6600533ff18a10119428a6ce43e29227118cc11dfc01ee2dc0d9c3
+MISC ChangeLog 30044 SHA256 b8dd0a5e726e56bbe7dd4fffc6364f126abb75c5b1a00d9633fcde3f0d3e572a SHA512 f38ef56da90c672ca03aced4f5d69b39549394bc30246cc5770e9fa24c6090af30768defcbe2df311f543d9476276f61e157f68738dfe1cd89ac6935e4ed6ada WHIRLPOOL 220a5e2b41cdb7e8e12228825b351ee526479aab310be21b89895a2b3170c56a9acd45991e558aa408fe2000b8633f19aa7e76ae2179b6507b160ebf83705a4e
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJVWYOEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVYuGkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEOIP/Rgu+jRf+AJwdLFynTy5sYAO
-lbkBNkCgRTzGQ+aCUSd522rNPN4yaOS7AaiRtW6rG+g0Nod+QPsPhQRYBsghcHlv
-Gpb1EbpqXC13y8yEIn5hUBdIQa499PeqpjH7anWpce4AKNwuuFkaZBQjE71AuC37
-8mQszvorKl1H87ASEFd7L/DcEWiCm8l01Ak6ok8NQEWk+Rqntov29HRYmQtt7Cnm
-fn9h27hZmS2rXyiCk0cQnW4Eb5V5I6Px6FjQVfbHWpkylQv7IpgkFGQB3pR0+rWp
-c3NQv3IKnJQGrjoqYfGRzuE4XreOq2ax349ZPAipobsDfBvTEnb9niYFeITYK2ow
-/cpHKp9F5kFJmnHwUJ0xrgiYRc5MqmJW25PQo+uuCJluYGSDm4qTHin9peylFxPt
-BJGmLpjruBYdU4EzHEFnOFVl2FASuTUGBap7cqqCLtKKrCmGmJ8N7+MfW7+/B3yd
-hfHjWE/hyWQ8NnJ5pniMLA6PTMA+EIzegIFhbTXA+xa7F4VJw1NTJ25hKQuBgVSu
-n/QSGR9zfjSw49SeGArY9SB7bfAWd56J1oQ17uZMFBkh5YtrNc8LZ4Wa1G6rDLy/
-mAC2ZpPhgJZ0GdVaBgux8XrhWK+MI1LIcBWmAsrIhvCuTiiBxqAxDX3nvCit1os/
-hxrb/DPWde0W6i9eCMfl
-=dobd
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOUoQAL447h95wQMx7P8j98ke87Wu
+uVOfeNwwEJeOfETC9oNaMOZb34l1aMKDMm6osR9+gb7f+MZDojTKwR8Mcn0K3soU
+HxTTu9YiuP5lm5Yuj2OXLO2yJ79MQhVZKnJ2EXrkExGqT9VME7oFBv7QaY0A5A79
+HiinTQHU01vlogVa1OUncagaCUd7i5eNvW9Km6M4cN9aOffcVlT2WdugadjbLyhO
+u9vcv4olsOYeRhzj86LqJFMM0jHPpUWCcJfdc2nDz8gi+j0ORmpRdtiv1iAJyR5V
+ZHEcreTsMYXQ6B+AAd0R8OMz4GjIGLDeK7MjQOgVjDCiUgv+UYzNaqgOlgo1/Rtv
+tLYr5PPNM4nKJG2hlaQ5PKfsQylRsXA58etH499ndQp0i5kQfHZLBVqaoSmOKEyd
+9DkyW3CZBNmi9s4U61aNjysd6JKdMUVf8Azf5K94grr0IoEwO+LpPd/Zb7We/50b
+ZE/Tz76b8uji0lv8DiriJ5w26+QOle4mOTNrIVciWA3MIJU3LSDnUgMgrRhYZj9M
+Sne9DdPlmzlyqAW5aqWISA3t+ZeraM1zRG0P77xqw7UlWneNq+qVBRiTX4og7Htc
+pZsRpbCdthg3ld6DCI390BENj1ybBwRJirkTAAycv2khc2oFfbtPjgNg8BWXiFNX
++Rzlnu9YGyxRV6wx/N9/
+=Z+kE
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150525.ebuild b/sys-fs/aufs3/aufs3-3_p20150525.ebuild
new file mode 100644
index 000000000000..9740f4b60513
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150525.ebuild
@@ -0,0 +1,172 @@
+# 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_p20150525.ebuild,v 1.1 2015/05/25 08:47:19 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=19
+# highest supported version
+KERN_MAX_VER=20
+# 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
+	!sys-fs/aufs4"
+
+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}" == "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
+}