sys-fs/aufs3: Bump to latest aufs3

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

3 files changed, 182 insertions, 2 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 736c29443c77..2f1d6dda2545 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.105 2014/09/13 13:35:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.106 2014/09/14 17:18:53 jlec Exp $
+
+*aufs3-3_p20140915 (14 Sep 2014)
+
+  14 Sep 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140915.ebuild:
+  Bump to latest aufs3
 
 *aufs3-3_p20140908 (13 Sep 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index ec64ac69a22c..d45425690562 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -5,8 +5,10 @@ AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9a
 DIST aufs3-standalone-3_p20140811.tar.xz 2261132 SHA256 a9180890c095989aa93ee3a7762b918dd3330ad82262b90cc07c33e900d21977 SHA512 b98a89683526e6afe27f7438af952ab0fe690907c8366ea05411c091b43038ce48a2b065b66c235d919101db5ee71681d9d8fe99a4b417ddfab6b5c468f24098 WHIRLPOOL e4287b2e059dd0d2a860a221be6f1a7d30c549130b9f1c9182fb607f363cf2868dd080dcd9622ea2de98aeee91ee59092c3e9be36670facb8935bb2e6b230225
 DIST aufs3-standalone-3_p20140818.tar.xz 2289080 SHA256 73db5ebf08bdfe44345c7ff646dd19d57111215e8692598c362b26b81b85c605 SHA512 d1ab33a367484dcec885ff7c8ba8277cc78ffac6e73b5becdf7c52e3ba4cf7c3a56c03ac2bbc3ea6f8120d03dbd32fb0eadf2532c8e716e31ef56e46b43cbe59 WHIRLPOOL 79f62a0051870cd13b3a999b23f6876e45c6739bac34658f0a42a6b6294c97b45073832801d6f4ce637de2f491c75565aa324f2739ed3de1ba5af1f2a25ccffe
 DIST aufs3-standalone-3_p20140908.tar.xz 2402056 SHA256 849c307eca9a6116506f6ae66f419d8a5ab76a92cb36ab4df7f74c1f3f6ad13f SHA512 1917c776b4a90676ad79cd9c2110f8e480ab2e9a793c1fa4fc8f2b1aa44f6dde7abffa525f7d5766c49b8f84ac6687b171894446f8b4868aee258801f515bd2b WHIRLPOOL 9fc6898a76adf1a9f5e9e16ce7b776d0a878a0dbc8c678cde7f298e3e8dae1575f650c262aa0ccd17092b684196facf478c97e30f575a27c0a606f0dbde42dcb
+DIST aufs3-standalone-3_p20140915.tar.xz 2424024 SHA256 e06c24c963a22848d0079669ada1edc3687da5d243e2846074e4d432ceb15da6 SHA512 621bb42880c3ab413289a8785c2a8e09ad13acdcf952363e2e5eacc730ca8985ba9f389e732b595dbd9932299229c5ea2c921c3bf47d7b55adabd71258622234 WHIRLPOOL f4508937ea3779e4b8e31405cbd4bb24f2778f6b2cdc1200f58cb50f07a575d949cf05a642d86aaa8eaf3b32215799854dddcc3a6c88d9539a4450fc0411cd0f
 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
-MISC ChangeLog 25907 SHA256 7d5bdb817264c84ea4247663975d455273c550abb3b793dac6b3ffe331ebb37d SHA512 fcc5b70fcf4fee0a37b88e7c5175c3790969e6bd46f59fec5a3d93c6af86b0c0de6a7f01cdb5f56bb113495beb28860e52887e2174b04154c06feba1038b595b WHIRLPOOL 3bc57fab0c778ed05d92b5489d260a11db3515d8c164fe403b44779c13e15d6315b507aa8b0661b23be90dace2ce8943296b0ad5283d18e63f9d6b1d3363f505
+EBUILD aufs3-3_p20140915.ebuild 5289 SHA256 ff0343fc8331ddf826fbc475cc8b5f29070e6ee2576a10718bc5d551561caf09 SHA512 59295b0a6fc920010bd8525b153fda3e3426bce5c1b9ebf7d6bd6d724e3556df875edf839b1b9c0f2a18d01c45abe7174c91d6ae7954b403bc1ca86065bb433b WHIRLPOOL 0f726088a18cd09df295666add309055711df15aeb069d9f0a2364c982d0d929d18a7954818aa1e293fc831215f0670aa9d55c6d653d89e18c6b694318c2154e
+MISC ChangeLog 26039 SHA256 bdeb551d39cbd485937df1d4dd117a5105a4f361b69dc3bcfbef2186ca5676c5 SHA512 af3a8940e4dd80b91a6008fddceac8f67995b91888a653e64d03257270fe1f8022da102ed31cc48afed4c6fa86e43630da24d3abdfe35ee41c8bcd4b668699db WHIRLPOOL b6bb93cabc8178ce4b52eef903b4da4d20b80d70abcf7a8900144ea37065410675fe95d19c8ac7ba8635aaa29bc225f8596e75361ff4ad52e0315f02ee6b4d54
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
diff --git a/sys-fs/aufs3/aufs3-3_p20140915.ebuild b/sys-fs/aufs3/aufs3-3_p20140915.ebuild
new file mode 100644
index 000000000000..ed9809a1847f
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140915.ebuild
@@ -0,0 +1,173 @@
+# 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_p20140915.ebuild,v 1.1 2014/09/14 17:18:53 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=16
+# highest supported version
+KERN_MAX_VER=17
+# 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
+	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
+}