fix binpkg merging support for aufs2; you don't need an unpacked kernel to merge the sucker

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 14 insertions, 3 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 32d2d6301645..24ee840824a0 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.18 2010/04/05 12:37:30 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.19 2010/05/13 01:45:28 ferringb Exp $
+
+  13 May 2010; Brian Harring <ferringb@gentoo.org> aufs2-0_p20100308.ebuild,
+  aufs2-0_p20100405.ebuild:
+  re-enable merging of aufs2 binpkgs on systems lacking an unpacked kernel
 
 *aufs2-0_p20100405 (05 Apr 2010)
 
diff --git a/sys-fs/aufs2/aufs2-0_p20100308.ebuild b/sys-fs/aufs2/aufs2-0_p20100308.ebuild
index 12c6ab4f21b2..35d4bdd29849 100644
--- a/sys-fs/aufs2/aufs2-0_p20100308.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20100308.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.2 2010/03/17 15:42:57 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100308.ebuild,v 1.3 2010/05/13 01:45:28 ferringb Exp $
 
 EAPI="2"
 
@@ -23,6 +23,8 @@ S=${WORKDIR}/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
+	# uesd to allow merging of binpkg aufs2 on systems lacking kernel sources
+	[ -n "$PKG_SETUP_HAS_ALREADY_BEEN_RAN" ] && return
 	get_version
 	kernel_is lt 2 6 27 && die "kernel too old"
 	kernel_is gt 2 6 33 && die "kernel too new"
@@ -46,6 +48,7 @@ pkg_setup() {
 		fi
 	fi
 	linux-mod_pkg_setup
+	export PKG_SETUP_HAS_ALREADY_BEEN_RAN=1
 }
 
 src_prepare() {
diff --git a/sys-fs/aufs2/aufs2-0_p20100405.ebuild b/sys-fs/aufs2/aufs2-0_p20100405.ebuild
index 23442a49ef1b..2c5f297c9cde 100644
--- a/sys-fs/aufs2/aufs2-0_p20100405.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20100405.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.1 2010/04/05 12:37:30 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.2 2010/05/13 01:45:28 ferringb Exp $
 
 EAPI="2"
 
@@ -23,6 +23,9 @@ S=${WORKDIR}/${PN}-standalone
 MODULE_NAMES="aufs(misc:${S})"
 
 pkg_setup() {
+	# this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
 	get_version
 	kernel_is lt 2 6 27 && die "kernel too old"
 	kernel_is gt 2 6 33 && die "kernel too new"
@@ -46,6 +49,7 @@ pkg_setup() {
 		fi
 	fi
 	linux-mod_pkg_setup
+	export PKG_SETUP_HAS_BEEN_RAN=1
 }
 
 src_prepare() {