sys-fs/aufs3: Bump to latest release

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

3 files changed, 181 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 037ff83ad6f4..1bd1f6f37605 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.79 2013/11/19 14:03:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.80 2013/12/26 14:57:59 jlec Exp $
+
+*aufs3-3_p20131223 (26 Dec 2013)
+
+  26 Dec 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20131223.ebuild:
+  Bump to latest release
 
 *aufs3-3_p20131111-r1 (19 Nov 2013)
 *aufs3-3_p20131104-r1 (19 Nov 2013)
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 865e30d3a50d..7ad6c1035e11 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -7,26 +7,28 @@ DIST aufs3-standalone-3_p20131007.tar.xz 1953352 SHA256 3916a1c34a604a688e92a3c1
 DIST aufs3-standalone-3_p20131014.tar.xz 1505556 SHA256 257211ecb9288f0f547418353d5bca7811b0e40b935730bc370fd7e98aacacd3 SHA512 b03417e370077bdb3e42634402d1eef5a934058fbf8b84ca96729d5eab31e5cf3a3e0d67ced40daa295b1719c5c2d89fba166c8e7469e36c196f2865ee4b5d34 WHIRLPOOL 6ebc782b517f7116e428c48fd1a35f8eb6ed29cd0387332efb95d051abb108f3c839f6d1f20c920832337afc6a8ab619b30426b53a043d8dd50cd1c2a24fed90
 DIST aufs3-standalone-3_p20131104.tar.xz 2073160 SHA256 2a55ece940e4f949482879b7296d34394b15f5409d8e91ef27a903130ba3b443 SHA512 768d84b115f0a5dd378f1c2f695fe72730014d008e4a6bbe1bc4fa530233ad992308014f2f110eebfa5a3af7c8246ee7576242dd91e4228ee79011d81b7c6d7b WHIRLPOOL 53baa7db8eddf4fdb102e5ae71ec717c32eb5c094683e449a818f04f32010c496af984d6fea086b45f076baa62bf11f83196bd4ecec37111d1e2924341cf49f4
 DIST aufs3-standalone-3_p20131111.tar.xz 1610788 SHA256 5ea5b080fa8b68f4921fc9fc9247e456c3740321445e5d455ac1eb00454a6d7f SHA512 bf3b35a30164a4f5856db7a66c898e7e3491a5dab05252207fc402b9ef9a946be4cd6fe71370c52c1bc5168653c7323f3ce039f062d9da7f01a84a1ef33c7475 WHIRLPOOL 364b732719d24139eb450275ef9819b58dd8e3fa8bbbc0cd4e4ca5cee5d9beb622931233022f70621887c245dde2d4b879067c68ba8910fdfd8c4fc2f43c1037
+DIST aufs3-standalone-3_p20131223.tar.xz 1612628 SHA256 62872509098ccf57056a1045cd75c83cd25b7f517da8222cb4abf174e6f923af SHA512 28f0490f4c87de07e77208003f511c7e8f7af8a59e4660f6229ed459fa5c2db9c56bcb15d9ae8291106b0b565ec6a8296ddb804799f02c0876d314eae229d28e WHIRLPOOL 66e70e6c8f3212b771062ef48be20db28769adcc846ccdee49c12787e77ae31955586509bb88cf98dc16c1e257e3aebe04e462e039c3a768f3911bd08d72701f
 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
 EBUILD aufs3-3_p20131111-r1.ebuild 4900 SHA256 65ec0f45707a05b26a7312224a795cf2db4c13817eb57a79d0241d2b1e075963 SHA512 d5b3ca6385b5f700c159595168b27632f7ea6c0852f815ab1148b7a4cca0d7a8fe30527a343bbfe3a155444c16b69c9a8ade486e843795ca7061c776e86a6915 WHIRLPOOL 496ee7abc8f34c5fd4ba979e85d8e998be9ca870f5a46b09ab9453f1646254ba4222b5e4e86a8ef1620255707429c73e89076a74efa5f833746837ec07b08413
-MISC ChangeLog 21509 SHA256 718f27de5f6aea1a3145747b6bab9018dbc1281674a65838009f6ac06714705c SHA512 eb1afb7d36767ef34e45284e6145c4c532e002fe8374797b38de69a8d3aafd8eca1a114f1fa6a4d6280ade0d50a49b92367a70eae5b5d50c267e783a89d74fdc WHIRLPOOL 667a0e8708d571df3b42365fd66c4e2d8bd4a8f1d327ceac55817dfe96c9ac9acfcab86db86e83e026e089947818effea6e36117570b142951c227c872d7ef7f
+EBUILD aufs3-3_p20131223.ebuild 4846 SHA256 4f03951751c036891be9c405d7c09b4ac75ca74e450a41be81fcd155a4269a61 SHA512 4d8a36623eeada50b2c55b3e516a9e9ee6d7ec522eeb7d10e3acd2547f3d0d0da2e1cf9d1e106651d0c02e0689bfbf2fefb68c4c84a257cabfd87f35c056aed7 WHIRLPOOL 9f80628bdb174c989374428011d69bea0ea6007c50a846d2eeaba4cbfeb26006990f28013a6f35a9abd325be4f18b50fa59ef6fed510bce053e30ee852eef1db
+MISC ChangeLog 21643 SHA256 add6d387390b0c1036cafa07d673493fc744f2644ff54bd03e5288ec1a5dc0d4 SHA512 acec025c3991266098b543437018f1695a76c172b1ee66c9f570f28373c667c6636d1096b778af649d515ede7909a4759099348cc4c9905166e3a667bc610e2e WHIRLPOOL d618b87e4fecc3c457349de3a9c0c4543c41986b1bc0d8f7c2c0fa18c3512c2f90f017d04b0e068adb940408e0a82c9fbe9948dce5560a6b0bd5cd142e75495a
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSi2+fAAoJELnU8jG9FVir8yQP/i3OLE1D16LjBSAWm4+L4lLC
-hk74nMB1iOqB5uHZT5Yc/k6NGeWtZFu+9hpfXdqKmP0MojDV43sGCnlDe0s4hCIk
-/tr6R9kR9Cxbvjz833/zRINtriWOBvqlafajEo/+3qt3zfbHL9o0lFDGZwrt92Ya
-XR0JuxHv417V6k9oo0RZ4DQr/a4nmsKmMWiI07lsQGmiZQEbWslN83HmU7ljZqJw
-VlwvMiNgGzyiALLpXtyL10sPwbkUcvK9iM0ztQJZcSVjvYUCdkEOfdLAI+l0NhmV
-NsWkCTyF7T+UE6/E1CP0fZ3tB+AZzIqfnaOPWG7q7qoXw8wLDOEfHf3jOZ42NgYQ
-7+ss2maiwVMrvgI9WIcwApMnbs2q0buWfjgIayb3Mk3iBWPCsH0OGvgD7H7CTxeE
-+9hKqPwszZ0HhTRDe+hmiFGzmP0fpMA/igX5uwjis+tsrUFfukrnbX+DSE/qryXU
-cq0xFmKQxd7GM0o/gXQ16B+pODB5A7ySV8S8N65sAcw0oS69Ajs1N5WROJmWOVRq
-0SskNds+YC2YqNEtLjeHNVgXErRuWGXj4I9TRUD/lFNGbk9ewcTKoKOxFib6rPrE
-mJAChTRXoGsftgkSauGDTyFEbmuCmyzc/p8HJwig/E3syXQ9S49JgbsXFvw5Vxkv
-NsJLh6dp+DdNgbD7aIpM
-=oFVX
+iQIcBAEBCgAGBQJSvEP8AAoJELnU8jG9FVirF34P/i/ffZfO/SHMjc6oVwj9Rw02
+FYDm2HqGXgH8vOjqH++5pahvcybH4ULzY3GjoQB9uStWntJK6zXByMFxjx97F99k
+jw1dQnrZ3wnMjyIU5pvf0eY6poY8hIUUZMtnO2RvfhZ1PQWukCNUeE/pToRYajp/
+O08NDFT9bUigW2hDYI+RMXfcMQVSktID4JmSkLgHAW8mtabQFA4BzdSWBTHmX+dr
+OsQWOl+bTKPa+6kEp5mR8k9stJDaslWxvsKDFLuOZ6p/fnceXjhjL71hwoVpvqWA
+sgoT6U96vG3IJhNkoYFFqCqSfpXYsX3WHiIkmdscxEGUxhzSWELg3PYFpQAPBrm0
+SDEoo/+RK+ZxhXA3VnL29tVWlN7CznZUkvAQgjUX9gRDZMM1DBaHVEFzcE9FR1Sa
+sw5aW0X0M7WAk1ynRi1iyF99DqzfLDzWrAfsv7ALnEKeHZMELlLkrB8ptVlXJVLu
+Epoz2Q0FpHixcG0LIp4AyfzKa5loMPe6b6TMSvkYQCPuxNtyN6ZiMxCLup5rCV0K
+aWIuU3yJ7CLP30cPxnAFEfW4GtNWzmzO4N6Glh+XMJSQDRKw5ywbFNr09WLWWy+C
+7MF2+rexcweKAG2a/ZOX0Tm3TZaKdGExCjOjYSQsRnH5QNpCF5bxuq2dB80vW376
+tbz/HmHeMKZF9Vxbk9NL
+=HFpL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20131223.ebuild b/sys-fs/aufs3/aufs3-3_p20131223.ebuild
new file mode 100644
index 000000000000..29895039e28a
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20131223.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20131223.ebuild,v 1.1 2013/12/26 14:57:59 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=12
+# highest supported version
+KERN_MAX_VER=13
+# 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"
+	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-gentoo ${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
+}