sys-fs/aufs3: Versin Bump

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

3 files changed, 187 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index be5e80aa7f97..40c3823ab457 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.85 2014/02/04 17:31:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.86 2014/02/24 09:15:53 jlec Exp $
+
+*aufs3-3_p20140224 (24 Feb 2014)
+
+  24 Feb 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140224.ebuild:
+  Versin Bump
 
 *aufs3-3_p20140127-r1 (04 Feb 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index b1a7dd5d1ee4..f316e506c542 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -11,6 +11,7 @@ DIST aufs3-standalone-3_p20131223.tar.xz 1612628 SHA256 62872509098ccf57056a1045
 DIST aufs3-standalone-3_p20140114.tar.xz 1995600 SHA256 0010f7ccfcc8c79cd8a708ee56d8619daecf4a692a2226c62f2c6b6855288ab3 SHA512 ff3ea064a2ffdc80f13e3c561ad87f3d396b5636c14dcf42bb584b8f9680e43bd3158829958052954d7de7abf178ee628575c4fb949f0b67d89a6426386720a9 WHIRLPOOL 09bbb6921d2f22bd314d5737809bfb78cc87a13cc76888faa4b6da44f59c16f9202acd1eab1d461a08bdb5d036271dfb1de80fea7ed0b64b655d9513ffdf5209
 DIST aufs3-standalone-3_p20140119.tar.xz 1655840 SHA256 c7c25614455edf72c3eb516cfc3311becedcc24cd0ddbfe442e86938f4943589 SHA512 169ec3129a4e24cbe9293852906d172835942910f5bcbefd35a66669d23a2d0dc5bb59ee432f77ca76ced0b29c84ff814577fa86a1ccc0b27a2d96b2b81963b6 WHIRLPOOL 74ee3fddfd1bb2bd47fae61229bb53d90bd2f602feff0936eec652423aa2cc3b10febd8df10bef073d6f3d45d599516548f43d7b794d26427fbd2a9e26c2e482
 DIST aufs3-standalone-3_p20140127.tar.xz 1681488 SHA256 8dd99e178e8f4cabb0a755d9ec45b5390a4890dc027a974d95716365e4b13c19 SHA512 f5a4f717cb81c0ee77ba911d1f38ad773b69b4e5f2a80e1ca15f5f13c0a68d14222f8f8b751fdc3232f0a5a49a2fd96a6b3657c6aca4aa7daac5cf71a1b8829f WHIRLPOOL d479b8702eb6a4c407e2a7b21a2cc3f7c3f51f22151c46ea1ccef4ae19a17e9c79d01b9ca797e84a3cba36f8e786e75e7836a5e08b1062b8cbc27d9aa1853832
+DIST aufs3-standalone-3_p20140224.tar.xz 1685640 SHA256 4dbfeb433d957dd3bc8019b3ea61222c42f25e315ec52ee436b544fe4bc691f3 SHA512 3f126735a1e45ca997310f878d19f5bfac2bdc854794ea44949a532aec145845d015aa5360b8599a2fd65adda705cd7a41603dd408ec31d93a3092866a0607e2 WHIRLPOOL b8c21f408fbbb38c61f2c14224ef5efa4a114124d8d2c552da65855145b8c5b7e2a371d839127f35e9d0690a2b8e77c784219099c3d135ee70ffc2269ea6b069
 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
@@ -20,22 +21,25 @@ EBUILD aufs3-3_p20140114.ebuild 4846 SHA256 e2d4e80f6414f96c7a9d08c7293a04d06ce0
 EBUILD aufs3-3_p20140119.ebuild 4948 SHA256 e199eda18aaa6d800b7ed565ee7b81626cb775085961da717db516e13af26931 SHA512 e7d0ffcc905c6582de3195b802710e14117b20dcc88f176a9a5e4675cb2f4c381e4cc3b616e4232753b2a3222a339c9fbb7f5a9e26d6730e15ecf8169d1659b9 WHIRLPOOL 18b4584e8565242c1dc2ca92c018c21580d11faae110666aa38a48c646989abd5f19cb18a29a20dc4efde9a90b85381291afa79776002d6902ba9e8d8ddef67b
 EBUILD aufs3-3_p20140127-r1.ebuild 5037 SHA256 147db8035b56b0970eef6ed0979e41a340ce150d3eb3591c36fa2f307adabfc7 SHA512 39ed88a7b1b6a004e9de8d133d654f9ddcf1ca7407edb66d5e11f6ba0b670a0469863408ad5656f8befa967d77b09074b0bb647f4cd30f7a2903726b99b51733 WHIRLPOOL f999c50d001ed120dad749821fc1f42049e5a7adecfbfbb13c1b0d326943b72a1d1b5c70261caba7e26d3229f2d522ab9d33a11419fd6c1c0d66ab1f5f4ab9a7
 EBUILD aufs3-3_p20140127.ebuild 4948 SHA256 bad0bf05cad9046943eb8c2fd32021f362116d8bedc272867398dd631980e0b2 SHA512 4b46fb4712920e9e6a93507f3915707b6f5b89591e6c423091fece76ca3d179bf31b2079a577f8087657e74aa5708b8369f7bb544d38a2bd2209dea5ecf695b1 WHIRLPOOL 80694b2f503ad624bf7045ef625de546329ca2c514d5d215a68aeb2fb2fc4512735d3b803ec67994acdaafe6f86db32ec5c05e444ad4d06a521f97bf6a5521de
-MISC ChangeLog 22392 SHA256 912504ea82dfd2c66550fa09b646b415bff0aa4358376d8397a4fc341ac727c1 SHA512 8ba36cd61a9649ae5d9763212351b180104213eb75cbd5c101fb81c27c13498b9a757ef5065d9e177d95e96fe3d4847e0e23021f4a69459819c4b5a00f18a24a WHIRLPOOL 1fb2868f7df6fb8c0704a2e80aa96cfbba6a95add4f3e4392a5b21ed91494425e51801af13d82708f2f1bd3369470fbc1bd534ebde738822d4f1b5e6b5d4118a
+EBUILD aufs3-3_p20140224.ebuild 5034 SHA256 b385489aef8402e908a7839554637d8f4537002b01f72b1dcdd1d88801a68979 SHA512 19e377e76572690d1a196bc45d1461fc465c852b58e7e4015397f3c00bd156223f78e15fb976e3c040267174f7eaed2e4aba2ccfbf922a3444e22d4fbee9f560 WHIRLPOOL af24a75acc170eae319b5f2721eabe6291492a8f13a36155c81b0b2d8da32fa5aaf8b636960b059084a32222710305114c9898e16ea2acfeb6091ca1c5485620
+MISC ChangeLog 22515 SHA256 c84ab690c8aa8e309f3549ec500b65294c045639de8f9a4a2de4b289bbf819d6 SHA512 1a69b0a8beb2cb1aeaa430e7422f5e405793be97fba5d75d26dbef4003f9987dc0f46d2680f1a5636f390dbfb77683da102fbb795ab0717a7f09c7f83bae9799 WHIRLPOOL 453692c7f4bbbd38287c00a0f675596f22f2209071af3d392ab60128de627e49e964076ba6d3938a14c754cd0a9a4fd7892424a07cc3227d36d21b7076f62bed
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS8SPzAAoJELnU8jG9FVirFkEP/0oPJ6cD4fczhJiOOG/qjI9m
-fUYnFCRjz9l18wan2AK+7wo7fiszunBE10KMcUaAGoTbJWPL8SHSueVv3ZeO9Do7
-gspvCUY7Bcad/y+BiUilQ2eQnA1arkXEZgHPfPdeYhn0qYAde7rqoZ8bswPk79/f
-BnvQdwPEaNy8SawFGJBcfQXsesb5dfjhQd1RkpdjUT9Mvb4I6IrSH34PXyKQqY3+
-Z/K/cQFdPSoUJ0EXHjUQx2AL4IG+ljtTyWpgQ524DYjMFUvrTfZbiQOhjSklq8sd
-beMe4MTRbkj+0AxhXe9xS83C1+QhtO2cYr/Zof1+hr6/ap5UIuWCods/eFaWrW8k
-qBzsWYTvrjeB3jagcnscBHFvOVyDbGQjc9cv8S+ta4kFO6DcUdowyx5zi/rS9bwO
-ja4sKYyUUa4YZ4WUz6dVKb7LX0QSN5ffv8j0w/DPqtzSangQnnkj2COeI2oHk+8s
-Zyn6bB4UVow+CgV+ni1xrJDiZ3zl3d8mOdzrjhi5i3nlayfG/W/Dxa4HbR2FjUlV
-IoddxJP4ZUvarGYO1E+xligMBc6hsnBiVdRtU0D6RuUfsKk2GQAnEDOBIXQ7mtVi
-SwjJjLfVwUW1FqCCe1V9An2PZY+Ndew35iX3Y23H0GiCNppFHUFgXosUOU4zA4ug
-PA/OrcOLqkNlmAJlidgp
-=9kGf
+iQJ8BAEBCgBmBQJTCw3LXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirA/IP/jZLmxhX2EbWP135mwO6LqXD
+NR+z0JipnxzybMf/YHRtwIFfxc5PTh8I9+yF83QJgFeowD1iVj+geE2MubUaQeKR
+H1qIk7pypsTHnEAV4rxS3ksoyUejbUS1MTo7fcHMLXpbgoOyaLw5bNKb4adgNIrP
+ZnfeQZ2/2Q3MjeyTyKffMLBKY0I5+KOKDJDFeBldrNll4z6Vk6HlUWply1Ufe729
+qvY49LhZWQNdukxf39To60hgB53gKuUAg3QWt26qSY8dOWpxhTyF8OH41Go1tAv5
+c6ZJ5ivafTcneFgg+dVAvnASwz2Zun8Z8RzDo0sE/+CqFgbMP8bLHg2BXqemkIBR
+YkviOpj7eOV/QoQYhrvTogao4GA28V6U52/y6iuwT3VfoELsGB8/G0Fo22IksXYS
+qsR08ljUyFxBNHHSJrkBUWHAZUo+g1iFHP4UXGbPqn10Y9qQoniC44r89Ofv9O8c
+Y9hcaBu0BOQgz3ziMFEikg3GmKxmj1vO9fEwjLEhHfMmI92/yUyRkY12qiPuAgn0
+R1QYdQI+irr15e+kb9Rh/oMElWiXBxgfCVihM3PyzuR48qi6Zi9aZzBuaegE/R0y
+BBjyTb2rZctgmpUQ6VZFdWk0LkIDBnjLg9GJQh4oPA737aDI6x5+clrzZdT8fSZt
+GeJqSYpI56VbQaJD6XNg
+=I3T6
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140224.ebuild b/sys-fs/aufs3/aufs3-3_p20140224.ebuild
new file mode 100644
index 000000000000..54b866162e7d
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140224.ebuild
@@ -0,0 +1,163 @@
+# 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_p20140224.ebuild,v 1.1 2014/02/24 09:15:53 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=13
+# highest supported version
+KERN_MAX_VER=14
+# 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})"
+
+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}" == "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}
+	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
+}