sys-fs/aufs3: Version Bump

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

3 files changed, 187 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 8d32b927ef15..73e7df0a1e26 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.89 2014/03/10 07:30:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.90 2014/04/24 12:00:12 jlec Exp $
+
+*aufs3-3_p20140420 (24 Apr 2014)
+
+  24 Apr 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140420.ebuild:
+  Version Bump
 
 *aufs3-3_p20140310 (10 Mar 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index d37396ddab84..49dc4c59fd5b 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -14,6 +14,7 @@ DIST aufs3-standalone-3_p20140127.tar.xz 1681488 SHA256 8dd99e178e8f4cabb0a755d9
 DIST aufs3-standalone-3_p20140224.tar.xz 1685640 SHA256 4dbfeb433d957dd3bc8019b3ea61222c42f25e315ec52ee436b544fe4bc691f3 SHA512 3f126735a1e45ca997310f878d19f5bfac2bdc854794ea44949a532aec145845d015aa5360b8599a2fd65adda705cd7a41603dd408ec31d93a3092866a0607e2 WHIRLPOOL b8c21f408fbbb38c61f2c14224ef5efa4a114124d8d2c552da65855145b8c5b7e2a371d839127f35e9d0690a2b8e77c784219099c3d135ee70ffc2269ea6b069
 DIST aufs3-standalone-3_p20140303.tar.xz 1701264 SHA256 9d5c3c1bdb3ca1132ec3b11cb88d43309970c8f3277275a380c265b536bbeb40 SHA512 077a03db09de8195015c3530d62ea1cc98071c969057b19866c8c81e44054eda5a15e53c98f684ed51097c118a30141179355fa1171e1d450f43f363780346d6 WHIRLPOOL 0a2bb202d8dc099d9f5a746bc6a3092470a5fc8542d149e9ac6903dbc99c9f3827ae99d93ffefaea4434257033d62454588e0da708d0cf42bf878823455415ac
 DIST aufs3-standalone-3_p20140310.tar.xz 1697212 SHA256 708dd73eeb43a364b80557bbf97d9c9d87ea21c9033b7a6b8d49e387973b1737 SHA512 556638c120ae05f95aa0a4d0eb4ad5fa01954193afbe3bca0605ceb74b8d5f75b6f01b2aa70578fb93f30a05538a7a85dd4f83618546ab13703b874cf9f318bc WHIRLPOOL 0f836452348b2cb282739b44a5e193a8904272314f6f3fdf2f6756730048d6eb8940fa5119f7fc36245a7abff0cbf53c11d7fc043445b041451ad50b88d07113
+DIST aufs3-standalone-3_p20140420.tar.xz 1706528 SHA256 196340c20b080ab2eb458d55d2c43838761cc849ac4715d0cbcbf91dae07cccc SHA512 db826206d4311ceb65b96351b167801c9e7581d5d16c8c25140eac66ddd70fd82151619bc7269fefc5eb16b53d15343969136acba12eb96d07c1d4773e926a4f WHIRLPOOL 27f3b37d012f9db861cd47b13f5d48650d80cbc318c5d9e52f3253d8a50c2f89403947199fe10d7418979dab2611353b2104cfe081acf9a610b11b7d54be0216
 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
@@ -26,24 +27,25 @@ EBUILD aufs3-3_p20140127.ebuild 4948 SHA256 bad0bf05cad9046943eb8c2fd32021f36211
 EBUILD aufs3-3_p20140224.ebuild 5034 SHA256 b385489aef8402e908a7839554637d8f4537002b01f72b1dcdd1d88801a68979 SHA512 19e377e76572690d1a196bc45d1461fc465c852b58e7e4015397f3c00bd156223f78e15fb976e3c040267174f7eaed2e4aba2ccfbf922a3444e22d4fbee9f560 WHIRLPOOL af24a75acc170eae319b5f2721eabe6291492a8f13a36155c81b0b2d8da32fa5aaf8b636960b059084a32222710305114c9898e16ea2acfeb6091ca1c5485620
 EBUILD aufs3-3_p20140303.ebuild 5083 SHA256 13ce4d58e04d31ac959057ac5a7950a8b79e8a3267329cf612d68c9c2a75ea3c SHA512 a0fbc34fe412d4f8379d236c16f61fd019be0a4d0716388a5ac9d441bb85538863f60d3d9061c0c44fcf466679717d16bbcd2c3cd4cc35207ee559f2bdf90a41 WHIRLPOOL 1ba73e476d507824910af022bc6cf62dced0e661402db8d1d1d70a36c9d91d5c54a04018a6f902646d999d95fd86743a562da88d0c03b1522a9d25fecc388a2d
 EBUILD aufs3-3_p20140310.ebuild 5083 SHA256 536dc15adca75852f1cc56acd2179a2ca123453955e2e4450cd55a1ebf57d8ab SHA512 538bf0ca02e2ea9927ad5b3c12946543f5fbad2ef6106eff41353c67d296db81b14a8b78fdb5cf1a593864eb06ab01abde06771253b0d60b8ccfb426a639da59 WHIRLPOOL a5daaa3d5621d8adc503354a5d7dfc7acc3f26e7ce224936d10abaee1f1a728159de1c02b5d62dd0d28ea1e9f65b4e36562b81dc35d1ad94f6d0d735988f1f61
-MISC ChangeLog 22897 SHA256 e9102852bb6bccb174a45d946db759d80a5bb7d8731db362f71bdb4ae4dab286 SHA512 430b56e24f0490766103fb42be4f87730427774808f4943a4e95a1bc86bcffd8712e69ed40f24561aa099ae6c992be607e60e91e8b13d1f0b93c66b22616f1b9 WHIRLPOOL 7c41f6cae8e8fdba85311b0d0d955970f2b1caee30b0f99c777217a83139ccc9690cc35d47b1bf9f1d9248719607725e10bd66b127adfddf5169550678521c21
+EBUILD aufs3-3_p20140420.ebuild 5083 SHA256 e047e2558ff9a2140045e203f6ad2d2571b3b7ad30d17b6786bb252f7d52889d SHA512 805d16ee377b46a5b1b960cc58be164c11810972e2f7ee216c33449815cde9dc85940022dfc34bebe8806fb6f3363f9cee6ced8a45625c78212f747127c5c127 WHIRLPOOL be81c80536b4a3e57386b6cf7fe9ab3c9e0782a19b6004800c8f1ad2de3eb7142e9c6bbffcbb79651093eb13522820bba083d872ac3acb10a06747239966ac42
+MISC ChangeLog 23021 SHA256 ccdb96481d17ab832c0e78cec731999e94d9135be4d91209774502f2b590bcde SHA512 0c464ff0f3e6d57bd7fb5d12768576f454a1aec4b214f74cd25001ae1d14532a7b644e48f6f2fb0c0cf460609943112712c1ee4cd09379dd7546ef5fd4815cea WHIRLPOOL c4bdccf4adfc3678d8fcca2aaef4e05ab0487cef7c0ca5319c9922d9926ad7825091fcc980598c74e88c91ea9a8848accceafe6548390c4c94aa83563facfafb
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCgBmBQJTHWolXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJTWPzQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirra0P/jhhEB6jqNiXnZWKIzrfjFL3
-EP0/nwRVizSNc0VvpSkmdd10a1Yvf7m3rA9hzW/O6i1ZCSm86tHHD9hgFmszoADH
-C9PNUJ3WOts1bvk6lfNBvICH5bqw2EXv7CKvTomjOae5KUtbDwpczf7MHoREQCyM
-AmbDSbm2AImPtlga42FGJKf3bIGPuvOnNIiUna+SnwVqwit4rDj5yn+P4nzlBo8F
-Mbrc0wwFcGijHAQTleA1x/lVz0a1PZrv/sAn4J3A0e4IIgqeEmRI6bLtLUg2G70X
-EKNY2Alq68PtPSEf9J4piJgk4ry5F/BtAoMWMbFiqlDvJ8x5SUYDtG4iHI/b5fKU
-pcWRRbKUZMy2L0Zk19N3uds8bz8d340lLRp/eom4vuDVFuflqXzjAr/9qLU4zq/X
-2sXGjE5y8vnQFw6kWvu9FlUi334aXvs32k3UQ5QBNEvKj3JiTcjcbDBXMoTGHKEv
-lXD/iip0ABnuJY5EYGqtH0ymBmfJQCVkGB9A2ZWjxIn+4QGBQ8kZK1l5Lf0gErVu
-daB0MKm56Ig6LiRObD6uMrtf4zYt8erL47bbUwlUahFB02pmWFpvvH/GNFybT4VQ
-sLgAUUtrw8x91OQsH96Of8jtTW8un0MLTFdljdWiM7rXbGuPjsMJcr3l0wNf2E0I
-46Y1Y2TQX1VDBdV9Xjif
-=qTVF
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirSC4P/1w4ZHBqqEXr4tMLjRraPQyS
+TP5Zec0Y8tkoi+gGvtpfXuvYV24kaTQR3zNxSCMGkC11nJKlOIkvyCJwL198T0yt
+ew4ymIe+RzEUdOqUU+1TZlsK+a46H9ZcjqUa2K0Nh/9eezTtA91AFFtFsUxVdCDb
+y8LNxDMApG2Hk0lo1Jtbg3hCRNO9Q8Osdr/u3bbYLTZAv819MjGksr1BtWhwQNw+
+whdKXPAmUT+DGBGArOBTx9DLdqJilb3EmdoHUJE44dDGD0755tqKuyaPunqcyi11
+CtavVbBG45Rjlrd4NfSp8YmfHfCCT33vuw13b6CwWWcfHGh1b66kSw+DOPmDyEP+
+zBKOWEOzAv4Rjm8bz1C30/wbEG8ri4p+pc/6c109sA3GvzyWcJnMMd/9KzpWN0bI
+1GXERryv2PBjONIcnA/ZtR0zyhyr2I0d0qxJ2CK6Y33FdZRk5OYLB1DvZ1UeTDG1
++Vj/ARPmgdm72VnJxwyloGVKkBae7CqiGFFTUMxPUdvwsfPnKqxnww2Km9Npgrp/
+8jWBrv4SH5o5SYQLWj8qWbxwKD8feUGCRFL6HIMXrboBm8sFd3IVtpHDiH8eyTbu
+Oazqtr4Go9rH/RWCdoqe1/3eUeTAiTnvcuf5FlrMzCOQN/xJ23IJFwHnpvpSnCPX
+CQ3xLNHiVRw+hQgenkr9
+=bZee
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140420.ebuild b/sys-fs/aufs3/aufs3-3_p20140420.ebuild
new file mode 100644
index 000000000000..b3b3eb3124fe
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140420.ebuild
@@ -0,0 +1,164 @@
+# 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_p20140420.ebuild,v 1.1 2014/04/24 12:00:12 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=14
+# highest supported version
+KERN_MAX_VER=15
+# 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}" -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
+}