sys-fs/aufs3: Version BUmp

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

3 files changed, 175 insertions, 6 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index d7167be377a0..8af457a4f6be 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.49 2013/01/31 07:15:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.50 2013/02/07 08:19:45 jlec Exp $
+
+*aufs3-3_p20130207 (07 Feb 2013)
+
+  07 Feb 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130207.ebuild:
+  Version BUmp
 
   31 Jan 2013; Justin Lecher <jlec@gentoo.org> -aufs3-3_p20120813-r1.ebuild:
   Drop old
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 3cf76e3f24f1..248559769652 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 3_p20121210/aufs3-base-0.patch 2711 SHA256 4d6e669f9bebc301d0acf3e0dedaaff84aaa19ef7633da3c11cc3430d232ce86 SHA512 4736efcbb130516341305db5ef05ad041d7e29b13cc65f5164481f4ca11e2d4599684564965289e8f9028e0ff3db6b9a5249b90936997ee67531af961f872d43 WHIRLPOOL d584edda240b3b710c05dca1ae9689d6a18a4e57db84409c6056d3932544145edc098fb668ce29ef8fe589a5852fbbf4d6a89f14867610242bd6af4ac68b14aa
 AUX 3_p20121210/aufs3-base-1.patch 2734 SHA256 70c4c17b12ad6edb7e7f29f1643c0348fd8a961fc7f960740cb4d17f3e380e08 SHA512 26c4a5bc2789e5d7d4ee8a940ab8978873ef65aca553a4ea4e3ec5476afcce1d26a8a686534c64ca3ac51fda9445beb7d2b4afc0c6bca8fd0b8562f96e211f0f WHIRLPOOL 0d0ae1f51d96a333e73217c17bd68e3ca1a9a9ba68fe42ad4062d174dd529a4b13e5ce2effe1b3140e449aa02c39dfa99d93c1c0a7a6e4e12bbd41ddf29e5af1
@@ -59,15 +59,17 @@ AUX pax.patch 4821 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75
 DIST aufs3-3_p20121210.tar.xz 1932988 SHA256 931488f2880d2ea26108328777d56ab0ad56764af15f3094fcc02263f9b75e4a SHA512 436719a0a92ca9732edbca19953d586ae3517c1884965ad4e2fccb2638065a51086184e4a0fd1abe1039b8345b2c19b7c5949468c978570e9517549459566c4d WHIRLPOOL d0bdf0c10217dce7dd255f8be7f53b87ce77d403ae099ad87a3ba2dcec107d39e408232501c997baaa3d37921922f2d34b6b62e9fe8af4ab4ce52712148b8072
 DIST aufs3-3_p20130107.tar.xz 2311936 SHA256 6a40835128ca30233035dc08dca4eee0e37218e61e8cdfdd7fef6d3b660e4052 SHA512 a900543b8ca2ee7ebe39371963622d59c14a5ba1be95c045dd067cb9500912f3347064bbe1234c5774f958430b5b807b6c32633c650b155c399c16fc13fea73b WHIRLPOOL e429d0617123ce0a5ce943269474da0996d9fdb80cd4fe8a00190b8c37f993a22c73c8a33cda82b2507ed7f9207f04e9ee01d694f348cbffb7cc04733a6311d8
 DIST aufs3-3_p20130114.tar.xz 2390020 SHA256 6adf0504a6599685ad3757399a44875aae0a44cd70a04f7de7a780cf4d095e90 SHA512 0c8ea9be38ec64d0462f9a4b33934487654abf71f51d9bcd7df0a4a3e868f47b2489bd981805cc3b1615c41e57c7ec614dedcb6d921ace91360cd70207fcf4ba WHIRLPOOL 3954f3abc878051beef4d251dfd7dbf49f1a188b42aeb1509a3c1523a5aeb48dce0a5ec0bf757f55e4e886b760b7d65494ef9ba92f05fd1f66ee46d01c5d0f87
+DIST aufs3-3_p20130207.tar.xz 2440192 SHA256 69b23941605adc9dd7eb03c789b6368acf1cb498df29dc917e9cc56df2dbfdce SHA512 88048c2419b459a169b7a114d242476cf52770121428d7de2fbcee1869e87ead7a6a1a9f9a6fa3b9be6b19459544f0d8bba014d3c2cd8a1b1bc4a2015e25c02e WHIRLPOOL 0f9ee7664d61856d35b99d475ebf872ee9c8a197909b9ab4f4bc51e0be1a26f182cc69588f801e3dbcee9e1d46de172aea9dea6e275787e2275b9659dafb8bd8
 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
-MISC ChangeLog 14130 SHA256 bbea43ee69d6a52fbba95b085d7a43dbf372b5016aa26ecd74ab22a950fb4de4 SHA512 7a098e9532ced961bfc6e6f21ee35baa03736e9b337024d148c86ed285568b3f4f4e102cfc6eee2892b310d503576181ea6acecf7d764b2a506d49cdf60f39cc WHIRLPOOL 5e0aada81161325769b369476ed3f7315b4f8a377135d1d40f6fefbf71fbd93719befaf0100cfb40fa5078c1e658bf45446036e0bff920684265a2497bdf72a1
+EBUILD aufs3-3_p20130207.ebuild 5066 SHA256 bdf68e34ff24bd7c01116a37ff73a34c046c11f08427d26fa689ca212428f352 SHA512 b42af22f361cb18ed33462f32fe0791720d29bb8c376ee210870df7ab051a83fa596818dadac22bef4ca6d1f45b24bdc8135fade9f237fd1bef2d7c83d6e9ca4 WHIRLPOOL 48d13caafc6f94f3e2f1b037baae2693437b6da9c94643d264d704c36f2d33c864442dd977cb8e42ff98b02bfb0a86c498683190720be881f3df5ba64de91075
+MISC ChangeLog 14254 SHA256 cf8fcd07e79ab23bce3b3b534b7049d9170a84022c4229f58775f47f8924752c SHA512 7166a08c12057cdac5f766e3f98d97c206bb4e85ede047ac432099e84441c0204d226c647b7f7578c61ba1387e2e06818c1702926115af531403cc0e41601c71 WHIRLPOOL 995e325fffabfa013fa754ec249cc5049a141b06cdf32e2584e4a1a22bcd42bb4cb806934eae9229736bac022aa15248e2dda81aaffac86074bc119723aa4243
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEKGhQACgkQgAnW8HDreRbTdQCgikgXtGWfioSmyvyk6Z7v4rx8
-CtwAnA724NZnb3IM8HKc2cdarsvHFYHn
-=olna
+iEYEAREKAAYFAlETY7oACgkQgAnW8HDreRZwQQCgk72OyTTVhKnrih8WrV9lsg+v
+5VMAn2iue9QSTjJqWUYWXblNF/XH28Ps
+=Y2BQ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130207.ebuild b/sys-fs/aufs3/aufs3-3_p20130207.ebuild
new file mode 100644
index 000000000000..3fe132dd3aa9
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130207.ebuild
@@ -0,0 +1,162 @@
+# 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_p20130207.ebuild,v 1.1 2013/02/07 08:19:45 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=7
+# highest supported version
+KERN_MAX_VER=8
+# 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 hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	!sys-fs/aufs
+	!sys-fs/aufs-util
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${P}/${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 ${P}/${PN}-standalone
+	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}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null
+			epatch "${T}"/${P}/${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
+	if [[ ${KV_MINOR} -lt 7 ]]; then
+		sed -i "s:__user::g" include/linux/aufs_type.h || die
+	else
+		sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die
+	fi
+
+	cd "${WORKDIR}"/${P}/${PN/3}-util || die
+
+	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) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR}
+
+	cd "${WORKDIR}"/${P}/${PN/3}-util || die
+	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+
+	cd "${WORKDIR}"/${P}/${PN/3}-util || die
+	emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install
+
+	newdoc README README-utils
+}