sys-fs/aufs3: Version BUmp

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 160 insertions, 5 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 7a5623e8e6e3..2f72aea172cd 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.53 2013/03/21 08:39:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.54 2013/03/30 13:31:00 jlec Exp $
+
+*aufs3-3_p20130325 (30 Mar 2013)
+
+  30 Mar 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130325.ebuild:
+  Version BUmp
 
   21 Mar 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20130318.ebuild:
   Fix kernel patching, thanks likewhoa for the patch
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index fd8841f760a0..a9b4ef1bd982 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -62,18 +62,20 @@ DIST aufs3-3_p20130114.tar.xz 2390020 SHA256 6adf0504a6599685ad3757399a44875aae0
 DIST aufs3-3_p20130207.tar.xz 2440192 SHA256 69b23941605adc9dd7eb03c789b6368acf1cb498df29dc917e9cc56df2dbfdce SHA512 88048c2419b459a169b7a114d242476cf52770121428d7de2fbcee1869e87ead7a6a1a9f9a6fa3b9be6b19459544f0d8bba014d3c2cd8a1b1bc4a2015e25c02e WHIRLPOOL 0f9ee7664d61856d35b99d475ebf872ee9c8a197909b9ab4f4bc51e0be1a26f182cc69588f801e3dbcee9e1d46de172aea9dea6e275787e2275b9659dafb8bd8
 DIST aufs3-3_p20130306.tar.xz 2569220 SHA256 0511c77a337d33d958fd684dec0d3fdd9f1c307850dad68acc11e6d9c0433bab SHA512 087a2b2972962f9214c4fba0ac1ddec74c1786f9a5573a297aa5985dfd8d2924d37b877e4835e5cbd39eaff4f776ed0001edac17e64988a95bea3bbcd32bbc87 WHIRLPOOL bd62325388f66ac608064b1f87779ae530539ba5267700b1d3511eca8f26a853b949007011e38e42ab95a69b4e1efd10a52647d3703abcd72788a592d2256256
 DIST aufs3-standalone-3_p20130318.tar.xz 2396080 SHA256 1c2e473581e64597c8ba3937c65242cf79fa7a842a35830a852ed4b29bc7e78e SHA512 67ab11d69249fdf2e83eb4945823f2e3bd35bc1e4c673870e9496284969f0b123f823ef73f43913d4e6cc1fcea8f230b8d64e18f47b3e1816d422702d926008c WHIRLPOOL 024fc2526192e98441c112667c513980dff475d5922ac4b0be5e832fb457e633b38ae2cee0e305065fbc9636cc78d0a1ef11222277333d1c135f0bb2fe7aaada
+DIST aufs3-standalone-3_p20130325.tar.xz 2431832 SHA256 5d03b452ce7834f34621df84ee110ad9659f9a2175ce1dc33426baecfd44d883 SHA512 cc7cd1e9ea501d683220e1c01c0a5eba17f638c3c0ca7bbeef7ecb9079b54050744d07b5386d2d78013ea60cfa8abf059da6677032e32be9c97fde5ea0102bae WHIRLPOOL d09d7dc687de4dccd5916f99b10c89edfed606b84d857dd00b1aaef12b796e497934b867931d4aa2ffd2705ccb3180032d9640fda9cbf5d1e1849704b5270c83
 EBUILD aufs3-3_p20121210.ebuild 4840 SHA256 1d6c10de0f810598997b5c20c4e57e1277f99e29dcf632a3d07a0a2c01735843 SHA512 1286b95e209381391f3e9d6670979fceb162a1bd11361024d4d3b9105c98bf7486ee55bb7b4a0294a4f379b66e2ca5e2f458c76152ba27238675a3f27f4b18b2 WHIRLPOOL 3cb7e2444a5632db73b13b7f0849f930663c3a1fa08d8c19f52d0e9df3c6ba2a30dc2d04097849195f240133976c30c5cf9fdc3c8f14eef01e82fa641fda3ee6
 EBUILD aufs3-3_p20130107.ebuild 4949 SHA256 62437ba8b78bf5ff7414b91a7d4890e4373b7e4cb7efc213b8a5167b3b22581c SHA512 233889afe9e035f9af3ea83d95396ff22b23205b4d8e65f89ec30a2a30866857ba49969af62d8485747535401496b276ac86cb2a9a75f753057f19b2f425a8a1 WHIRLPOOL 3e31c06cd17cba042f66b3d3d0dde2f1648cf562247ced757d1a69c7acbd76ad4a4440e8b56c1150a2b3db279159be84cac8c1b8b930e1d8296e5bd3a8c51b8f
 EBUILD aufs3-3_p20130114.ebuild 5047 SHA256 087b4b9a69879eb1938675f99359ee6571fd88c5bc24609d6e44a23ab17c80b5 SHA512 ec94c997fd5ef33a5947d65dcbdc4d40fa44f3e74518131bbfef76d2f4784ad520f9a37c4012f1479bdf0fd0e5d5633c5f2b9a48a3436d695d96a1082365eb6a WHIRLPOOL d55e7bc8a3ecd72dfaf53896c4a19bfcb190a91ed7e6848ffa03380889fd257fa3c81173abc61cbeea22ed6a74fca667f17fabd58fd6683a01669126d12c716e
 EBUILD aufs3-3_p20130207.ebuild 5066 SHA256 bdf68e34ff24bd7c01116a37ff73a34c046c11f08427d26fa689ca212428f352 SHA512 b42af22f361cb18ed33462f32fe0791720d29bb8c376ee210870df7ab051a83fa596818dadac22bef4ca6d1f45b24bdc8135fade9f237fd1bef2d7c83d6e9ca4 WHIRLPOOL 48d13caafc6f94f3e2f1b037baae2693437b6da9c94643d264d704c36f2d33c864442dd977cb8e42ff98b02bfb0a86c498683190720be881f3df5ba64de91075
 EBUILD aufs3-3_p20130306.ebuild 5066 SHA256 f6281b5715f113a2424e21369505c85fb329c6c188c125d2900ac1be5a054bc6 SHA512 04f9e6e1a241b8683296aebca81748d78cc5a8d972d9185a2cd27331589b5d935fec058f97dcc1a877cfe195549a4f9c70fc3946191052d74b91147c15d78e12 WHIRLPOOL 524953390d042b91b38af8c9bfee6c541513a868113822c67888143a93ff7bccf916385d94677a93950ca99f2f76a5edb672cfa142fc00ac180154a0f1fd9d31
 EBUILD aufs3-3_p20130318.ebuild 4386 SHA256 b254577db75f150b9ec931085f2702d5b92e43cc603d26198644d1ef7c5587a4 SHA512 c39b6c0cae9fa9f35bef08235a7d854ea59bb4c4a1b6495e0f3901007ae5f2ce00f2ab2e050fa97eb46ca6829f34a5662ac06d9550789e7314e8a555179177a1 WHIRLPOOL 8c985dfc0dd476669f38b553e4706344eb9d45eaa6b5de3bd3970e4a358f88f81c20836c000b00c09dcc94ace0e9826721e1a56a4135e3a04bf59db2dd517bec
-MISC ChangeLog 14629 SHA256 277e0e381fff0e395d8153082ab5802db254c9eb3f9ad086710c9e01a3420918 SHA512 96c0f26f997bc3776db62d762a5a0b13fbcca5247e9c5831c5310e504af3d8d65a3d3f270d5f43fddf2840f2f1684490a4f427691e95beab93697f4c0448a966 WHIRLPOOL 018351431ee69a6fb4de69e15927c1a081805cef2595632470da843094d4341bd1169b4bc445e96aeefc5a20a0284a9761e6c18683b20108ca5a45891509e5e9
+EBUILD aufs3-3_p20130325.ebuild 4386 SHA256 a8004547727160fac8879f197f42aec3530cb5902e0dbebea069224b28381073 SHA512 982257f0bbf23ade7c990c5d6356308040be605dc5775177918299d98787777864a373fc3005e92eb2428aa594b8cb8e36a3f26f0da5608b31fed189497fe2f8 WHIRLPOOL d3fb3fa41dea96d0e8e57a28065d596ee151a9e3797b9d76175350898c6671980b2aa082a54ba26b239786a4f426ad94102b4fbdc471402bf051de35ca4d99fd
+MISC ChangeLog 14753 SHA256 52436c6b937b03d4f5cae08361c9ab352805c8ffa498d1ac993a0fbc2bccda5a SHA512 6b85660a4ee7d66e623f9efc51b8abe5da3b7e33f475f2208d1ec87bc0f112e491daccdbe4db29e2352173016b58ad516a371e0e875fe04111d0696089c6ec9d WHIRLPOOL ef98f3b0d5aa2906ba56ff72354a99294bc82a63bf197f98695196fa33795978f1222f1ee3e2535007f74631df4024173a69ccef273a9b14e88bbf4706cddbef
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlFKxzoACgkQgAnW8HDreRaZsgCgrhmzgWHjeFB2CR93LkWp+VjL
-NlUAn29R5hH2KpygcEuPk9yoWYTrkLqa
-=D9Mn
+iEYEAREKAAYFAlFW6RYACgkQgAnW8HDreRZ6eQCgqKBG99CXtCPre/+TWIVvEykF
+Bb0AoMCZHzBRks26N4BjPchDQzVOHXMe
+=BJHZ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130325.ebuild b/sys-fs/aufs3/aufs3-3_p20130325.ebuild
new file mode 100644
index 000000000000..e5cbf9feb3e0
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130325.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130325.ebuild,v 1.1 2013/03/30 13:31:00 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=8
+# highest supported version
+KERN_MAX_VER=9
+# 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/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+=" ~EXPERIMENTAL !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 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
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-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-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-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 ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-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}
+	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 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-2.patch
+
+	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-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}