Don't call linux-mod_pkg_setup until after kernel version is verified, bug 156418

(Portage version: 2.1.1-r2)

9 files changed, 52 insertions, 39 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 735f40bab5ef..ea0a168ba2bd 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.59 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.60 2006/11/28 03:39:32 beandog Exp $
+
+  28 Nov 2006; Steve Dibb <beandog@gentoo.org> ivtv-0.4.5.ebuild,
+  ivtv-0.4.7.ebuild, ivtv-0.6.3.ebuild, ivtv-0.6.4.ebuild,
+  ivtv-0.7.0.ebuild, ivtv-0.7.1.ebuild, ivtv-0.8.0.ebuild,
+  ivtv-0.8.1.ebuild:
+  Don't call linux-mod_pkg_setup until after kernel version is verified, bug
+  156418
 
   28 Nov 2006; Steve Dibb <beandog@gentoo.org> metadata.xml,
   ivtv-0.4.5.ebuild, ivtv-0.4.7.ebuild, ivtv-0.6.3.ebuild,
diff --git a/media-tv/ivtv/ivtv-0.4.5.ebuild b/media-tv/ivtv/ivtv-0.4.5.ebuild
index 576c9681b484..22578db54a8a 100644
--- a/media-tv/ivtv/ivtv-0.4.5.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.5.ebuild,v 1.5 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.5.ebuild,v 1.6 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -30,7 +30,6 @@ RDEPEND="sys-apps/hotplug"
 DEPEND="app-arch/unzip"
 
 pkg_setup() {
-	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
 	if kernel_is gt 2 6 15; then
 		ewarn "You must use 0.6.x with a 2.6.16 kernel. However the kernel is broken"
@@ -55,6 +54,8 @@ pkg_setup() {
 		die "This does not work with kernel versions higher then 2.6.15"
 	fi
 
+	MODULE_NAMES="ivtv(extra:${S}/driver)"
+
 	if kernel_is le 2 6 14; then
 		MODULE_NAMES="${MODULE_NAMES}
 		msp3400(extra:${S}/driver)
diff --git a/media-tv/ivtv/ivtv-0.4.7.ebuild b/media-tv/ivtv/ivtv-0.4.7.ebuild
index 429fb46c69e9..0cf53a53aa90 100644
--- a/media-tv/ivtv/ivtv-0.4.7.ebuild
+++ b/media-tv/ivtv/ivtv-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.7.ebuild,v 1.3 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.4.7.ebuild,v 1.4 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -21,7 +21,6 @@ DEPEND="app-arch/unzip"
 PDEPEND="media-tv/pvr-firmware"
 
 pkg_setup() {
-	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
 	if kernel_is gt 2 6 15; then
 		eerror "Each IVTV driver branch will only work with a specific"
@@ -43,6 +42,8 @@ pkg_setup() {
 		die "This does not work with kernel versions higher then 2.6.15"
 	fi
 
+	MODULE_NAMES="ivtv(extra:${S}/driver)"
+
 	if kernel_is le 2 6 14; then
 		MODULE_NAMES="${MODULE_NAMES}
 		msp3400(extra:${S}/driver)
diff --git a/media-tv/ivtv/ivtv-0.6.3.ebuild b/media-tv/ivtv/ivtv-0.6.3.ebuild
index 783bf32967e1..6a80f743dd7f 100644
--- a/media-tv/ivtv/ivtv-0.6.3.ebuild
+++ b/media-tv/ivtv/ivtv-0.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.3.ebuild,v 1.3 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.3.ebuild,v 1.4 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -30,12 +30,8 @@ RDEPEND="sys-apps/hotplug"
 DEPEND="app-arch/unzip"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
-	if kernel_is 2 6 16; then
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
-	else
+	if ! kernel_is 2 6 16; then
 		eerror "Each IVTV driver branch will only work with a specific"
 		eerror "linux kernel branch."
 		eerror ""
@@ -54,6 +50,10 @@ pkg_setup() {
 		die "This only works on 2.6.16 kernels"
 	fi
 
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver)"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
diff --git a/media-tv/ivtv/ivtv-0.6.4.ebuild b/media-tv/ivtv/ivtv-0.6.4.ebuild
index 2953e1497f62..0a5352982d8a 100644
--- a/media-tv/ivtv/ivtv-0.6.4.ebuild
+++ b/media-tv/ivtv/ivtv-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.4.ebuild,v 1.3 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.6.4.ebuild,v 1.4 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -21,12 +21,8 @@ DEPEND="app-arch/unzip"
 PDEPEND="media-tv/pvr-firmware"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver)"
 
-	if kernel_is 2 6 16; then
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
-	else
+	if ! kernel_is 2 6 16; then
 		eerror "Each IVTV driver branch will only work with a specific"
 		eerror "linux kernel branch."
 		eerror ""
@@ -44,6 +40,10 @@ pkg_setup() {
 		die "This only works on 2.6.16 kernels"
 	fi
 
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver)"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_DECODER VIDEO_AUDIO_DECODER VIDEO_BT848"
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
diff --git a/media-tv/ivtv/ivtv-0.7.0.ebuild b/media-tv/ivtv/ivtv-0.7.0.ebuild
index 70c4637c16e5..cef40806b808 100644
--- a/media-tv/ivtv/ivtv-0.7.0.ebuild
+++ b/media-tv/ivtv/ivtv-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.0.ebuild,v 1.5 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.0.ebuild,v 1.6 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -29,15 +29,8 @@ RDEPEND="sys-apps/hotplug"
 DEPEND="app-arch/unzip"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver) \
-			saa717x(extra:${S}/i2c-drivers)"
 
-	if kernel_is 2 6 17; then
-		CONFIG_CHECK="EXPERIMENTAL VIDEO_DEV I2C VIDEO_V4L1 VIDEO_V4L2 FW_LOADER"
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_TVEEPROM"
-	else
+	if ! kernel_is 2 6 17; then
 		eerror "Each IVTV driver branch will only work with a specific"
 		eerror "linux kernel branch."
 		eerror ""
@@ -55,6 +48,14 @@ pkg_setup() {
 		die "This only works on 2.6.17 kernels"
 	fi
 
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver) \
+			saa717x(extra:${S}/i2c-drivers)"
+
+	CONFIG_CHECK="EXPERIMENTAL VIDEO_DEV I2C VIDEO_V4L1 VIDEO_V4L2 FW_LOADER"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_TVEEPROM"
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
diff --git a/media-tv/ivtv/ivtv-0.7.1.ebuild b/media-tv/ivtv/ivtv-0.7.1.ebuild
index 48070ce1a903..6d12609c4092 100644
--- a/media-tv/ivtv/ivtv-0.7.1.ebuild
+++ b/media-tv/ivtv/ivtv-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.1.ebuild,v 1.3 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.7.1.ebuild,v 1.4 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -20,15 +20,8 @@ DEPEND="app-arch/unzip"
 PDEPEND="media-tv/pvr-firmware"
 
 pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver) \
-			saa717x(extra:${S}/i2c-drivers)"
 
-	if kernel_is 2 6 17; then
-		CONFIG_CHECK="EXPERIMENTAL VIDEO_DEV I2C VIDEO_V4L1 VIDEO_V4L2 FW_LOADER"
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
-		CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_TVEEPROM"
-	else
+	if ! kernel_is 2 6 17; then
 		eerror "Each IVTV driver branch will only work with a specific"
 		eerror "linux kernel branch."
 		eerror ""
@@ -46,6 +39,14 @@ pkg_setup() {
 		die "This only works on 2.6.17 kernels"
 	fi
 
+	linux-mod_pkg_setup
+	MODULE_NAMES="ivtv(extra:${S}/driver) \
+			saa717x(extra:${S}/i2c-drivers)"
+
+	CONFIG_CHECK="EXPERIMENTAL VIDEO_DEV I2C VIDEO_V4L1 VIDEO_V4L2 FW_LOADER"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
+	CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_SAA7127 VIDEO_TVEEPROM"
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
diff --git a/media-tv/ivtv/ivtv-0.8.0.ebuild b/media-tv/ivtv/ivtv-0.8.0.ebuild
index 119ca85d3fc5..12bb4d9b64c6 100644
--- a/media-tv/ivtv/ivtv-0.8.0.ebuild
+++ b/media-tv/ivtv/ivtv-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.0.ebuild,v 1.5 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.0.ebuild,v 1.6 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -25,7 +25,6 @@ CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_CX2341X VIDEO_SAA7127 VIDEO_TV
 #CONFIG_CHECK="${CONFIG_CHECK} VIDEO_UPD64083"
 
 pkg_setup() {
-	linux-mod_pkg_setup
 
 	if ! kernel_is 2 6 18; then
 		eerror "Each IVTV driver branch will only work with a specific"
@@ -45,6 +44,8 @@ pkg_setup() {
 		die "This only works on 2.6.18 kernels"
 	fi
 
+	linux-mod_pkg_setup
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
diff --git a/media-tv/ivtv/ivtv-0.8.1.ebuild b/media-tv/ivtv/ivtv-0.8.1.ebuild
index e39bfb803495..1e77a7b840d4 100644
--- a/media-tv/ivtv/ivtv-0.8.1.ebuild
+++ b/media-tv/ivtv/ivtv-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.1.ebuild,v 1.2 2006/11/28 03:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.1.ebuild,v 1.3 2006/11/28 03:39:32 beandog Exp $
 
 inherit eutils linux-mod
 
@@ -25,7 +25,6 @@ CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_CX2341X VIDEO_SAA7127 VIDEO_TV
 #CONFIG_CHECK="${CONFIG_CHECK} VIDEO_UPD64083"
 
 pkg_setup() {
-	linux-mod_pkg_setup
 
 	if ! kernel_is 2 6 18; then
 		eerror "Each IVTV driver branch will only work with a specific"
@@ -45,6 +44,8 @@ pkg_setup() {
 		die "This only works on 2.6.18 kernels"
 	fi
 
+	linux-mod_pkg_setup
+
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"