[gentoo-commits] proj/betagarden:master commit in: sys-fs/aufs3/

[gentoo-commits] proj/betagarden:master commit in: sys-fs/aufs3/

[Justin Lecher]

commit:     947fada3f175db9b4c880114f2608f4ed769e5f8
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 19:19:45 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 19:19:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=947fada3

Changed USE hardened to pax_kernel, #375811

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sys-fs/aufs3/ChangeLog                |    4 ++++
 sys-fs/aufs3/aufs3-3_p20110815.ebuild |    4 ++--
 sys-fs/aufs3/metadata.xml             |    5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 6410057..9f366f4 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Aug 2011; Justin Lecher <jlec@gentoo.org> aufs3-3_p20110815.ebuild,
+  metadata.xml:
+  Changed USE hardened to pax_kernel, #375811
+
 *aufs3-3_p20110815 (15 Aug 2011)
 
   15 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/aufs3-base-0.patch,

diff --git a/sys-fs/aufs3/aufs3-3_p20110815.ebuild b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
index 954be5b..04505e0 100644
--- a/sys-fs/aufs3/aufs3-3_p20110815.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse hardened hfs inotify kernel-patch nfs ramfs"
+IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
 
 DEPEND="dev-vcs/git"
 RDEPEND="
@@ -87,7 +87,7 @@ src_prepare() {
 	use nfs && use amd64 && set_config INO_T_64
 	use ramfs && set_config BR_RAMFS
 
-	if use hardened ; then
+	if use pax_kernel ; then
 		epatch "${FILESDIR}"/pax.patch
 	fi
 

diff --git a/sys-fs/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml
index c2ca689..5916c9f 100644
--- a/sys-fs/aufs3/metadata.xml
+++ b/sys-fs/aufs3/metadata.xml
@@ -10,11 +10,12 @@
 	</maintainer>
 	<use>
 		<flag name="debug">Enable additional debugging support</flag>
+		<flag name="hfs">Enable hfs support</flag>
+		<flag name="fuse">Enable fuse support</flag>
 		<flag name="inotify">Enable inotify support</flag>
 		<flag name="kernel-patch">Patch the current kernel for aufs2 support</flag>
 		<flag name="nfs">Enable support for nfs export</flag>
+		<flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
 		<flag name="ramfs">Enable initramfs/rootfs support</flag>
-		<flag name="fuse">Enable fuse support</flag>
-		<flag name="hfs">Enable hfs support</flag>
 	</use>
 </pkgmetadata>

[gentoo-commits] proj/betagarden:master commit in: sys-fs/aufs3/

[Justin Lecher]

commit:     7f5c730bee442d13ddea5c4a8e3ea6e4993d2e6a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 06:35:40 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 06:35:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=7f5c730b

Corrected to new kernel versioning scheme

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sys-fs/aufs3/ChangeLog                |    3 +++
 sys-fs/aufs3/aufs3-3_p20110815.ebuild |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 886f5e6..1fba1b6 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Aug 2011; Justin Lecher <jlec@gentoo.org> aufs3-3_p20110815.ebuild:
+  Corrected to new kernel versioning scheme
+
   16 Aug 2011; Justin Lecher <jlec@gentoo.org> files/aufs3-standalone-1.patch:
   Fix missing upstream export of symbols
 

diff --git a/sys-fs/aufs3/aufs3-3_p20110815.ebuild b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
index 04505e0..4106d50 100644
--- a/sys-fs/aufs3/aufs3-3_p20110815.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
@@ -37,8 +37,8 @@ pkg_setup() {
 	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
 
 	get_version
-	kernel_is lt 3 0 0 && die "kernel too old"
-	kernel_is gt 3 0 1 && die "kernel too new"
+	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	kernel_is gt 3 0 99 && die "kernel too new"
 
 	linux-mod_pkg_setup
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_PATCH}.patch >/dev/null && \

[gentoo-commits] proj/betagarden:master commit in: sys-fs/aufs3/

[Justin Lecher]

commit:     010cc4caf5d7e3da573c1377fc94c55b5f3a3566
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 22:56:37 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 22:56:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=010cc4ca

Make CONFIG check for EXPORTFS matadory for USE=nfs

(Portage version: 2.2.0_alpha51/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sys-fs/aufs3/ChangeLog                |    3 +++
 sys-fs/aufs3/aufs3-3_p20110815.ebuild |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index 0f1d84e..c91da4c 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Aug 2011; Justin Lecher <jlec@gentoo.org> aufs3-3_p20110815.ebuild:
+  Make CONFIG check for EXPORTFS matadory for USE=nfs
+
   19 Aug 2011; Justin Lecher <jlec@gentoo.org> files/aufs3-standalone-0.patch,
   -files/aufs3-base-1.patch, -files/aufs3-standalone-1.patch,
   aufs3-3_p20110815.ebuild:

diff --git a/sys-fs/aufs3/aufs3-3_p20110815.ebuild b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
index 84b4302..1d733cb 100644
--- a/sys-fs/aufs3/aufs3-3_p20110815.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
@@ -29,7 +29,7 @@ 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 nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
 	use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
 	use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"