Bump to latest aufs

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

3 files changed, 195 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index d38eaaa5349f..b7e7f0adf31e 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.129 2015/04/20 07:17:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.130 2015/04/22 06:25:04 jlec Exp $
+
+*aufs3-3_p20150420 (22 Apr 2015)
+
+  22 Apr 2015; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20150420.ebuild:
+  Bump to latest aufs
 
   20 Apr 2015; Justin Lecher <jlec@gentoo.org> aufs3-3_p20150406.ebuild:
   Fix Versions
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index ff6dc2da79bb..a708758eb814 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -5,25 +5,27 @@ AUX README.gentoo 911 SHA256 9b9eb681f692f052105bf3d3d15e689685a5fcfba1d90a88b33
 AUX pax-3.11.patch 2722 SHA256 133d80384de031c73d989a36b4e88571a5b1084c51366cfec3f5234e7e1ef446 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 WHIRLPOOL e329ea70448d30510b5dc64ba9eca54c969c6781dc75ed326714ad0de90d10f43844e62e840cf1bfaed0ebb166b9f8a3cdef295ff06f5b38b4e5d75857e3fb46
 AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 DIST aufs3-standalone-3_p20150406.tar.xz 2863952 SHA256 e2de4fcdb086ab33bc182b084bf534891cc31a7d3ffc805d40dc087c37ab464b SHA512 c843999798f99fef5c16232935606ca438774104dc04c58982bb2b3f9ae371d9f2173b5454d366481de22fd3e658ee9e67f6981504c5c8157af20a8f15f269d1 WHIRLPOOL 0d2efaa6918c6f90339cae02a9ef3908921e8d1903364aaff9af034262f439886a02a639f9eaae27a28093fc6bf451bbc9fe7072a766a36e51f75c779378095d
+DIST aufs3-standalone-3_p20150420.tar.xz 2864092 SHA256 0f592b3c84b149d0842c518b83656be61a627f5bb9c953b824fd1631e24a2224 SHA512 ad383f37c5201a6a6e53e91f18d63648b3768b8327f07c36a207eb90b63b13779709a0f18696896c833866a30e1010c70ad8aa1259ae08dca5465a68f91d48e5 WHIRLPOOL 029f0cb665e0aa5f8d8bc2a93177e73d8ee7d80d68326f4f38018cec5678ff70378e70473f48bde1ba4f8096331eae4e40949b7c732f22789d09c690cd5cfce7
 EBUILD aufs3-3_p20150406.ebuild 5310 SHA256 5577be022e8319c4bbcd7fe5e97317c96c4c6af55ce2b49399592a945d4f9aac SHA512 b1fa9f91ed61c1e299dc798544078377ea043d4cb5ca821acd06f172cad227f2ee42e5bd773ed682713c1f7cc30bf8e814d1920384413f51afecd2a5d6a37fc0 WHIRLPOOL db231654ef119992785e5e35fc91ea6760e7cf5aa5efe14001214fb916224bbdd6da823d907d0ee6b83f9dfce8082ae37fe62da2c92816f7c9ed264b2f8efa23
-MISC ChangeLog 29373 SHA256 16428c6344ca63b6921b4810855025be0ea738fa9776850fe2dca082bb778d5c SHA512 700e7ef188d6ff1d52caf9e69f03208644c0be160e54d7bab92a67a5749d5c2f5173ed6ecc8bfe60a009533e2976f20d77a79cd8cd2552bd520e6bde9d87ae75 WHIRLPOOL 9eec4f2c8a96e9d8d64c93b9c81bcc646f7a74cd3c2e012c9947074c816cde116cdf8709ba8fcc150e2c3cd39ecdb3bbc88e1d47eae9f7bfc9fbcd05c395d0a0
+EBUILD aufs3-3_p20150420.ebuild 5310 SHA256 3239b19a3faba15d48689f9b981aaf308a0d9084685d6a577b43d5cf5bdbb359 SHA512 e956ba3468042c0118b0e6be27deb06b99cc0a51a17fb4b78ca0cea6d2fb4ab546a62c026874717c7570dedb8f63768d9111c579b260b1186329c07aeacf11fd WHIRLPOOL f668d9139a38ba4878f10ad9005fa8faa34a72abb1d14c394a940dab7708015f0e6b16b390be88ae34c9cfd751c9d0021abbaed4f35bf81d6d5db0f2169a0ae2
+MISC ChangeLog 29504 SHA256 c352babe480195e8b8321595ebd64d55b73f0f50fc8b90683c2a369faea4f4e0 SHA512 2fafe319bd57ec8e93c8ceee2824fb0fe078f52df969eef51b751d9cdc338e7b54197c607a864e5b439f558b7b67a51b5c93dde674d7c65e4d80ee3154f76392 WHIRLPOOL a817d471475626d8e0bcb25f0f9a678d8b3ab316a05929c92a5cabbd0b6fc2d823e0891a772631bbed2e62724aeba12643ad4d654601cee3b85ff6a66edffe66
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVNKfyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVNz7BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir630P/jNFZH/3TxpUIkEpYqwCAqSk
-/SH+ciZVM+9qNgMgPG9h5yTth3r1EFIC4LVZZd/3HjV33wheIbAeI0X3KQLJ6S+O
-SBT6DtdvjIpA/KjwfqY6kvTuYqPOTcnuTesvUzYBmVL7eXV1uejZmAYLij6KkVU2
-kStSilw7xHFS8z68VoC3vU4DH7+fl9u33Q1hsPU8M1ZvP1txCtiZ+stCwOaG5jrJ
-xURnvM5C26zsSHwhy83OmYDmdN+k48GGGAtglsef3bYPET5Ur7RyeOUW0p0Hn6Uh
-ZXoGcxKOtVbei0EQmEdIpTRRWuZbL5ubVM1xksBd/3tySeS5nba7rgnqFBuGlpMD
-zD4oFBTIkwEMSxtDQ/OxwvuRLAtrHpTK+zoni4PJoaZTKUFkZb16Zb8n9KKP9gPn
-5t7vlknyPDXyamGZrBrhjWKl0qUCpTTFIIHmYmDPLhMc3BNOC1pbOekvqVOrZVxW
-UeP9vjfcNoHr84ZoRgcYA/0Q/bn3RwNxywLI/1KZmxN9h13x6YuHzmaKBRMCpUUv
-WMFtFS27U+SO6dQ9YoWJJEM0i8IZ+mxwth1KqyKrm9qbiZqr+h+DBu+Fr9gDF38c
-I4Fcf9n8m9PCJ1hWNK2874glKMLz6egz2ej4g/dZ/+zKyoHK5YPp+eBj+gte8D/n
-NEJUCz/++BgKEHHj1jow
-=H057
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirBQcQAJzno847+ypi5vQFWcWNbAs5
+EfkMgZIGITSQvJVnHhBus0Icv9FGMsHO9ZEfq8Svba25X31mkljgf1lVb5+swGH1
+JG2r3N9CjZGbWN2ZittsJQD08maK8ybXxxiKGoHdZZDUIu7ZwjLQga4tDyN8U/Wp
+rM1KaYWRJWpKpnO6gDrGOSorKOjfQzQjll8B5/aMWhfdwC7A7m4XkUIoHfruQTQJ
+O/FBgeTqucCMqnaqsdXkGONMP1RfULAptMvqNUHdzqSa8PE703FfORMQdkytvcSy
+iET4bdhkHzT3WqZrDXztNCLQxQBwRD7W7A6IT3ig9nc3RULxZM6XBuriuWElXYci
+SRznCZBMi2o9F2XQo/4heyplFzeQfBAHv4YRkaImhZPfRN21OwBMdHMxUrh4wivM
+gXgmwjgs3FVQCtYNZlt+PQxxMpoy6N4kIQBfZ/86yFp1zjshs7eTq0lArnIPaM3Z
+dfvn+uTG4nzgLUDPcI/OtaH86LU1iSBt7JW2cKwm0cu3cvXTehXaRNZ5VuYFgguz
++bfc+eQu+2as0my+3NFmYMQFlyI7xkMo1pIweimOpY1x0PPhwLh9PGA67qwwubY7
+q2SeepRYAdQuWIv0XOBBID+Jhpuuo56XOlCPqqaJlky5NflWYyIKHHrGoeiQ3onb
+bAAbjfcdliU/1rST46Bx
+=Lnpx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20150420.ebuild b/sys-fs/aufs3/aufs3-3_p20150420.ebuild
new file mode 100644
index 000000000000..fd14db38d62b
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20150420.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_p20150420.ebuild,v 1.1 2015/04/22 06:25:04 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
+}