Removed check for USE=build since it did nothing because cryptsetup isn't in stage1. Removed call to linux-info_pkg_setup to remove requirement on a configured kernel. This fixes bug #148390 from this end, but changes are still needed in linux-info.eclass, which is tracked at bug #192556.

(Portage version: 2.1.3.7)

7 files changed, 29 insertions, 38 deletions

diff --git a/sys-fs/cryptsetup-luks/ChangeLog b/sys-fs/cryptsetup-luks/ChangeLog
index d04647061087..3a786e00f1e7 100644
--- a/sys-fs/cryptsetup-luks/ChangeLog
+++ b/sys-fs/cryptsetup-luks/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/cryptsetup-luks
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.59 2007/07/02 19:38:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/ChangeLog,v 1.60 2007/09/14 21:34:31 wolf31o2 Exp $
+
+  14 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  cryptsetup-luks-1.0.1-r1.ebuild, cryptsetup-luks-1.0.1-r2.ebuild,
+  cryptsetup-luks-1.0.3-r3.ebuild, cryptsetup-luks-1.0.4.ebuild,
+  cryptsetup-luks-1.0.4-r1.ebuild, cryptsetup-luks-1.0.4-r3.ebuild:
+  Removed check for USE=build since it did nothing because cryptsetup isn't in
+  stage1. Removed call to linux-info_pkg_setup to remove requirement on a
+  configured kernel. This fixes bug #148390 from this end, but changes are
+  still needed in linux-info.eclass, which is tracked at bug #192556.
 
   02 Jul 2007; Raúl Porcel <armin76@gentoo.org>
   cryptsetup-luks-1.0.4-r3.ebuild:
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
index abd77a87d104..136ce9203adc 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild,v 1.10 2006/03/30 10:16:09 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r1.ebuild,v 1.11 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit linux-info eutils flag-o-matic
 
@@ -39,7 +39,6 @@ dm-crypt_check() {
 }
 
 pkg_setup() {
-	linux-info_pkg_setup
 	dm-crypt_check;
 }
 
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild
index 05a56efbad97..e3276a06633e 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild,v 1.3 2006/03/30 10:16:09 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.1-r2.ebuild,v 1.4 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit linux-info eutils flag-o-matic
 
@@ -39,7 +39,6 @@ dm-crypt_check() {
 }
 
 pkg_setup() {
-	linux-info_pkg_setup
 	dm-crypt_check;
 }
 
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild
index 9263296b6ca0..b252781f71fe 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild,v 1.2 2007/07/02 15:33:24 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.3-r3.ebuild,v 1.3 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit autotools linux-info eutils flag-o-matic multilib
 
@@ -34,12 +34,8 @@ crypto_check() {
 }
 
 pkg_setup() {
-	# Bug 148390
-	if ! use build ; then
-		linux-info_pkg_setup
-		dm-crypt_check
-		crypto_check
-	fi
+	dm-crypt_check
+	crypto_check
 }
 
 src_unpack() {
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild
index 1b50515ef944..11febeed284d 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild,v 1.3 2007/07/02 15:33:24 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r1.ebuild,v 1.4 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -42,13 +42,9 @@ cbc_check() {
 }
 
 pkg_setup() {
-	# Bug 148390
-	if ! use build ; then
-		linux-info_pkg_setup
-		dm-crypt_check
-		crypto_check
-		cbc_check
-	fi
+	dm-crypt_check
+	crypto_check
+	cbc_check
 }
 
 src_compile() {
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild
index 9a57da2c40c5..5d430f869ca6 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild,v 1.11 2007/07/02 19:38:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4-r3.ebuild,v 1.12 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -42,13 +42,9 @@ cbc_check() {
 }
 
 pkg_setup() {
-	# Bug 148390
-	if ! use build ; then
-		linux-info_pkg_setup
-		dm-crypt_check
-		crypto_check
-		cbc_check
-	fi
+	dm-crypt_check
+	crypto_check
+	cbc_check
 }
 
 src_compile() {
diff --git a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild
index dd37adac95ad..69f4c3b4ef32 100644
--- a/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild
+++ b/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild,v 1.5 2007/07/02 15:33:24 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup-luks/cryptsetup-luks-1.0.4.ebuild,v 1.6 2007/09/14 21:34:31 wolf31o2 Exp $
 
 inherit linux-info eutils flag-o-matic multilib
 
@@ -42,13 +42,9 @@ cbc_check() {
 }
 
 pkg_setup() {
-	# Bug 148390
-	if ! use build ; then
-		linux-info_pkg_setup
-		dm-crypt_check
-		crypto_check
-		cbc_check
-	fi
+	dm-crypt_check
+	crypto_check
+	cbc_check
 }
 
 src_compile() {