Fix patching of latest stable gentoo-sources , #499756

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

3 files changed, 184 insertions, 15 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index be79584eff8f..be5e80aa7f97 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.84 2014/01/28 11:20:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.85 2014/02/04 17:31:30 jlec Exp $
+
+*aufs3-3_p20140127-r1 (04 Feb 2014)
+
+  04 Feb 2014; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20140127-r1.ebuild:
+  Fix patching of latest stable gentoo-sources , #499756
 
 *aufs3-3_p20140127 (28 Jan 2014)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index f87ed581d125..b1a7dd5d1ee4 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -18,23 +18,24 @@ EBUILD aufs3-3_p20131111-r1.ebuild 4900 SHA256 65ec0f45707a05b26a7312224a795cf2d
 EBUILD aufs3-3_p20131223.ebuild 4846 SHA256 4f03951751c036891be9c405d7c09b4ac75ca74e450a41be81fcd155a4269a61 SHA512 4d8a36623eeada50b2c55b3e516a9e9ee6d7ec522eeb7d10e3acd2547f3d0d0da2e1cf9d1e106651d0c02e0689bfbf2fefb68c4c84a257cabfd87f35c056aed7 WHIRLPOOL 9f80628bdb174c989374428011d69bea0ea6007c50a846d2eeaba4cbfeb26006990f28013a6f35a9abd325be4f18b50fa59ef6fed510bce053e30ee852eef1db
 EBUILD aufs3-3_p20140114.ebuild 4846 SHA256 e2d4e80f6414f96c7a9d08c7293a04d06ce0b039e31574817339e1438239caf2 SHA512 54a60ac7f7e1320dffc2af1beed3f5bde72d14c58cf478569ed72b3f95a89a428fb0cb07e261df17dd9ef8f427c2184f2d10f5cccad2e6de20c9d62984158c4f WHIRLPOOL b00c4effb4e2729849949ec0828e1dbea326b9aff19ad0eef8d4c0ac807b36f31bdbcb74dd1939c3220137a8d398efb83b5d703b009cfb4e08f8e765f85e7a0f
 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 22220 SHA256 8bd06b3b68966db7037e0e228626f585eb32017d82d17ca5b1d946f991074858 SHA512 9491ff0d07f439be4b6b090bb509e6a6159387309a505c48518fcd14b24cddaaa4ef582612d725bcb39f73672ea6d13442277368e3184279cb3621b9cec4b96d WHIRLPOOL 629f0d7e232a2d912a9f82933afc249dc8b7db2fa437bf3bca27910cf113e4ec046a8cb80c16737881227873db18859a94dbcb2c0b80a10c77670101ae956876
+MISC ChangeLog 22392 SHA256 912504ea82dfd2c66550fa09b646b415bff0aa4358376d8397a4fc341ac727c1 SHA512 8ba36cd61a9649ae5d9763212351b180104213eb75cbd5c101fb81c27c13498b9a757ef5065d9e177d95e96fe3d4847e0e23021f4a69459819c4b5a00f18a24a WHIRLPOOL 1fb2868f7df6fb8c0704a2e80aa96cfbba6a95add4f3e4392a5b21ed91494425e51801af13d82708f2f1bd3369470fbc1bd534ebde738822d4f1b5e6b5d4118a
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS55JjAAoJELnU8jG9FVird/0QAJbJv5qB8vZGc9DMMKBFOkEG
-3ggLtCl+LKle5To3FObPNa2RZoFfte7B83nT+CQbcNlwg+tUSxDYVdogklMjflkm
-XKcaO6sS/cxHYPMO6bN6CZargF7tbSjVx1R0bC/qY8tr8bviodbF4LWmgMqk9VQg
-hIgVGhUma0hhaZuLwQP4she4U7hVKWUtWKGTIybpcpx2L+pDThH7/muUasucTACP
-Ud9AO6rTB65CnrWIiyX5pMgd/VOdxzHA6XA2IGZRh9D2+8N1fh8FCPeepCOmNrw5
-7iVvaETj121CYe2ttXR/J0nSnNYC15rLSbLxbNsgoSZDmtgvT5k8UZrwqfmnRNeH
-EkB1GXA0SriRWyjlsVI7l4vSovDHSkLC+CEowMs0PGkEtCw8aZQaqxAwAu6RNShZ
-gK8n6DLwa4lDWxdNyIT0ysXZDk8/AXn0zI8ge11MQz+b3pab95aWj7yScRptrnO+
-p37JS+r+6h3i6RwL1dB1vEq1F3+L99fpmU8IPvfkjVbh2gVAyuG/04Mlec/NLWmA
-pPANWgbbS8nDH5BoRn/jQlnOdEe5Qo2+lfyKM3+eW40LlJKZcvvxbMi4ixAsE+6N
-zubK2xY2/xsl/5/Sdya4iW8XO9qWnWAGeNoN//5h2zPe8vKAYO/xIngh7csUIuc7
-wcaL7m+ivK8viA9Y2TcM
-=tPkH
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20140127-r1.ebuild
new file mode 100644
index 000000000000..a36ce3df7004
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20140127-r1.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_p20140127-r1.ebuild,v 1.1 2014/02/04 17:31:30 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
+}