sys-fs/aufs3: Version Bump, add comments on version handling

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 162 insertions, 16 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 914278b68229..beeb938607e6 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.17 2012/05/24 02:55:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.18 2012/05/31 16:13:46 jlec Exp $
+
+*aufs3-3_p20120531 (31 May 2012)
+
+  31 May 2012; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20120531.ebuild:
+  Version Bump, add comments on version handling
 
   24 May 2012; Mike Frysinger <vapier@gentoo.org> aufs3-3_p20120109.ebuild,
   aufs3-3_p20120430.ebuild, aufs3-3_p20120523.ebuild:
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 4a71e8ca26a1..924d65f0814e 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX aufs-util-31.patch 852 RMD160 bc4eaf23e62a0634e204cf25acb412b6c856c39b SHA1 51f7b18407295fe952f87a1f30678b3d84f4e366 SHA256 8729b765bf48143a12e8038b4141a27e24ab72f0dee2a60c1b1ac01e58dbcbd0
 AUX aufs3-base-0.patch 2711 RMD160 bf3995e925b25d97c02673dfad596ea35ee4f0f5 SHA1 f193efb6a1f44a0bb5630974e6b209877097970d SHA256 4d6e669f9bebc301d0acf3e0dedaaff84aaa19ef7633da3c11cc3430d232ce86
@@ -20,25 +20,18 @@ AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d
 DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444
 DIST aufs3-3_p20120430.tar.xz 1085556 RMD160 3d6d8f8a11f1bf3a958036c079b55b268710f24b SHA1 375ea311f5540c57eed0636f1c0f13accafaf1df SHA256 1b6ce1cf87377033e3741111db4f40cafdcb969b22f80b406c9407535e71788c
 DIST aufs3-3_p20120523.tar.xz 1108480 RMD160 3b0db00430b934301b68fcf945856debe6ccbc0c SHA1 de3b0d2a1fc49e9196075e760ae76be64516e247 SHA256 694d0a89653959d6175ee52cfd29e5bb7a8c026d00200310b198fff57ad188f0
+DIST aufs3-3_p20120531.tar.xz 1135072 RMD160 1a5daf321aa50da8b16bad93dc0abb77695977b4 SHA1 b06e8768cab2a42a296c618961c6e9fd8ec9b840 SHA256 b7c0aa54867451df191ecc9fa497ba99618cde3a9135cc2f465490ca34d43728
 EBUILD aufs3-3_p20120109.ebuild 4617 RMD160 8a706375b323a0eed7cbb804f07bc7d74c737638 SHA1 0b4b81699ca36d07294821a7ec6f6c9f81ed98d4 SHA256 c82fab58ad78eb4c98e7d89ffdcb6fe77885bf1e3368e7dabe4550a962d5a370
 EBUILD aufs3-3_p20120430.ebuild 4526 RMD160 6e2fe2f662b21d6c9321ca68b4c39be3a0e8ec40 SHA1 0cee4e1b73fd7592258f78149ab44a588a262454 SHA256 989a7c7c51402597d684601ab276a2395fc0394016f1963f019d9cae93c0c6cf
 EBUILD aufs3-3_p20120523.ebuild 4522 RMD160 65c0a1fcf71b9120ae4d0ac83f7e8994164cb0c4 SHA1 0ff58ad9829c4a03858cc709f6c66a2a2c5097c1 SHA256 f3aa201a2d0074106dbcf63bc09653205a2128635c970e7c7013504fdc013cc1
-MISC ChangeLog 4620 RMD160 d9ec2b415396599edf493e0e76746bfc701822fa SHA1 647d4ee1bfb62f39448e4eca12a8fb36907fffad SHA256 30a0e18751361182d0b1574addfa5b65c2020b56c486698df235269e3596ace4
+EBUILD aufs3-3_p20120531.ebuild 4632 RMD160 02ea4688964f13aaaa4fb11dbcafadcc37e73761 SHA1 18098a6c5313c5f78d51b448f1282075946d820b SHA256 f9ef7f6e4bf5660f7e875a38bbcc07db4ea304d5b80001db10882841749b2952
+MISC ChangeLog 4776 RMD160 8329ff650da5c2f558c2cb1f0c771f8e4a904c14 SHA1 9bd7c5c86012f4c7301352cc90bb8657e186e3d3 SHA256 1134e64a061403627f36b5265b4d37dc3c1585338d4054173063b80a8a746d4c
 MISC metadata.xml 758 RMD160 f05821007d4e2f7d58dd9b3c8aac840f85ddb9dc SHA1 988f050899dfed3593cc5d3f65caa02275c4bdb9 SHA256 7107603a0759e5737aa5d9b674155f39b79695c4f582df4976b825be5e7b5536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iQIcBAEBAgAGBQJPvaOCAAoJELEHsLL7fEFWU1kQAKuYB0rJjVoq5neY/W/MB6uu
-voWV0A4if0MZER0JSVON/jG0CgUbEi2AUVRvjGBCIeGxgpNJpCfLHKNBNVktAB76
-nAGgBKe8VT/RhviJaapCs1s4d20Diugz7GTGSoZmb7jtZU3urHQJ6MYcc7tdm2mv
-MlkYfm+AcXrz41LMHyDf/zsxfZvmfV5tTdxD1jD0V/XEReU7fte4bkYz5Zbeqz++
-9OLgkKn+Zae780b32BVoptgqOvRoCPaN95t3KeMm8TRWNnu6s+WlmeTQ5oclapyy
-6Y6uQ6XYzc09T6Uq5+CFul4clKJAD3JthJznOZvL+fQPYB3wtMvtRB9mHT72c3u+
-SQZGrPsST+9JwcH9x177bkIiQHvpfDTGDTBTXmsNOAQYYsQIZiCTCnKMTt4unDBU
-VN5/a/I/5xqAKkq1jMcpRmU9O1UiJrfLECGeCoYwZldI8+jj+hZ1y4wzOF8EP5o5
-RK5cW5Spr7fEtw/fw5FF39adQvDjUBY+Zh7WWWKV8ALohjs6TFdl1FW/2KyXCPJm
-VFMYFBEga241RvRFudkWlnLn8YUOelfx2r3kc6GBaGO4HkIEmvkllPjAJRrnGr9H
-K6wK1jqGiR6Bgm+Wx9uycAeJufyNaJfOvYrRTze6ecRCq8IRWPo4iHu5ZZ4ij0nr
-LeFPNX6NOBMxw8bD9lrN
-=br+a
+iEYEAREKAAYFAk/HmL8ACgkQgAnW8HDreRb0AACgn6SMnvRIt4LLiY3Z0IqwdVoP
+M80AoJng12q6WoARPklc1nHaTF/GjVlp
+=9ryO
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20120531.ebuild b/sys-fs/aufs3/aufs3-3_p20120531.ebuild
new file mode 100644
index 000000000000..6f5994f778ab
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20120531.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120531.ebuild,v 1.1 2012/05/31 16:13:46 jlec Exp $
+
+EAPI=4
+
+inherit linux-mod multilib toolchain-funcs eutils
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=4
+# highest supported version
+KERN_MAX_VER=5
+# highest util branch version
+UTIL_MAX_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
+
+DEPEND="dev-vcs/git"
+RDEPEND="
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
+	use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
+	use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
+	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
+	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
+
+	# 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 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	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
+
+	if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
+		UTIL_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
+		UTIL_BRANCH="${UTIL_MAX_VER}"
+	else
+		UTIL_BRANCH="${KV_MINOR}"
+	fi
+
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
+		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.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} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
+			epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.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 ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
+			eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	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}
+	local util_branch=origin/${PN}.${UTIL_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 && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax.patch
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed -i "s:__user::g" include/linux/aufs_type.h || die
+
+	cd "${WORKDIR}"/${PN/3}-util
+
+	einfo "Using for utils building branch ${util_branch}"
+	git checkout -b local-gentoo ${util_branch} || die
+	sed -i "/LDFLAGS += -static -s/d" Makefile || die
+	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
+
+	cd "${WORKDIR}"/${PN/3}-util
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	dodoc Documentation/filesystems/aufs/README
+
+	cd "${WORKDIR}"/${PN/3}-util
+	emake DESTDIR="${D}" KDIR=${KV_DIR} install
+
+	newdoc README README-utils
+}