3 files changed, 35 insertions, 40 deletions
diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index ce11c968a6b7..f760387b9431 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,10 @@
 # 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.52 2006/10/06 00:09:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.53 2006/10/17 16:31:20 cardoe Exp $
+
+  17 Oct 2006; Doug Goldstein <cardoe@gentoo.org> ivtv-0.8.0.ebuild:
+  Additional checks since people like bug #151357 play around with kernel
+  settings without understanding them. Re-wrote most of the ebuild.
 
 *ivtv-0.8.0 (06 Oct 2006)
 *ivtv-0.7.1 (06 Oct 2006)
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 7e72765bc052..e169549f6efc 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -39,14 +39,14 @@ EBUILD ivtv-0.7.1.ebuild 1772 RMD160 90ebaca285f80f99f1309635a11bd12932987e62 SH
 MD5 885b6795cb8d94ad39f1aa7c4a3009d6 ivtv-0.7.1.ebuild 1772
 RMD160 90ebaca285f80f99f1309635a11bd12932987e62 ivtv-0.7.1.ebuild 1772
 SHA256 9aee3d10eda5b4e23ce26e66690f25fa49f753b105b2028e7d6d342498df769e ivtv-0.7.1.ebuild 1772
-EBUILD ivtv-0.8.0.ebuild 1771 RMD160 25a0bc230efb8469202020daa6958293016514eb SHA1 4a7cc7827a45b97eb6d27dcad848feab5ef411c6 SHA256 31e7c06b0b51a2788e6573d7c9c7359b3bf1743ddd776fea5db38a38309dc95b
-MD5 57765d624b1a38424dd5989e2884bce0 ivtv-0.8.0.ebuild 1771
-RMD160 25a0bc230efb8469202020daa6958293016514eb ivtv-0.8.0.ebuild 1771
-SHA256 31e7c06b0b51a2788e6573d7c9c7359b3bf1743ddd776fea5db38a38309dc95b ivtv-0.8.0.ebuild 1771
-MISC ChangeLog 8873 RMD160 76b1d5d8c4faced16a698835cbf1613ad15aeb85 SHA1 2168fe8ea2de39a79964008f8d5a306102fe46b1 SHA256 9094952b0dc116da6df41a4f49095d2235bf73d06b7e0047b5c7bdc83335a9cb
-MD5 ce3fad5c1155235619cc19218a4bfb08 ChangeLog 8873
-RMD160 76b1d5d8c4faced16a698835cbf1613ad15aeb85 ChangeLog 8873
-SHA256 9094952b0dc116da6df41a4f49095d2235bf73d06b7e0047b5c7bdc83335a9cb ChangeLog 8873
+EBUILD ivtv-0.8.0.ebuild 1672 RMD160 2f0418aa34f2e01659adac1256b69eaba812caaf SHA1 59e76e2e67e418ec66f2a0ad2458c192c5a565da SHA256 bf5ca85fa58fc4cc222a3afe6501e801b4560db64a08c483aa2aab856696385f
+MD5 73e4bfe5bb2b00cbedce109f13035547 ivtv-0.8.0.ebuild 1672
+RMD160 2f0418aa34f2e01659adac1256b69eaba812caaf ivtv-0.8.0.ebuild 1672
+SHA256 bf5ca85fa58fc4cc222a3afe6501e801b4560db64a08c483aa2aab856696385f ivtv-0.8.0.ebuild 1672
+MISC ChangeLog 9085 RMD160 88ec27d68d9b2de6a65be429ab9be31c603435a9 SHA1 da0c69777cc5f8eaf1ab57be37e16f3a95f2c121 SHA256 21e6411e78eaaa1f6b46faa84138407b348a80707811ea29b92b0737772664a1
+MD5 0a0b58b219c1bdcda0ddc0de1d161d2c ChangeLog 9085
+RMD160 88ec27d68d9b2de6a65be429ab9be31c603435a9 ChangeLog 9085
+SHA256 21e6411e78eaaa1f6b46faa84138407b348a80707811ea29b92b0737772664a1 ChangeLog 9085
 MISC metadata.xml 465 RMD160 968deaeb110cec9b925349e9057f64a7c78b3cb1 SHA1 87dd7591c4be3e0d2b697636a3fd327d00b4e2cf SHA256 7fdf7857ba65e74299881f392155fa800167db2ed15b924d344524c3ada74bbb
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
 RMD160 968deaeb110cec9b925349e9057f64a7c78b3cb1 metadata.xml 465
@@ -75,7 +75,7 @@ SHA256 0829db1eb42c80d36c44dc32526c3b99f14594639d1a7b95cfec2585b43f199e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJZ7NoeSe8B0zEfwRAtpYAJ9B0pRKvURy5mEEsx1ODqN4VuiUzgCeLTb+
-OvSKyuWrlj0Ow6+n7KVuPOw=
-=UKAj
+iD8DBQFFNQVdoeSe8B0zEfwRAmh6AJ46u/HiE8Kf80bqQ7I8KL3VeN8H1gCfZGiE
+B2Q7shs8TYcjS3PsiTb0lxQ=
+=EGnC
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/ivtv-0.8.0.ebuild b/media-tv/ivtv/ivtv-0.8.0.ebuild
index 40fb3ffe9e92..4b92177431fa 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.1 2006/10/06 00:09:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.8.0.ebuild,v 1.2 2006/10/17 16:31:20 cardoe Exp $
 
 inherit eutils linux-mod
 
@@ -12,56 +12,47 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86 ~ppc"
 IUSE=""
 
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-
 RDEPEND="sys-apps/hotplug"
 DEPEND="app-arch/unzip"
 PDEPEND="media-tv/pvr-firmware"
 
+MODULE_NAMES="ivtv(extra:${S}/driver) \
+		saa717x(extra:${S}/i2c-drivers)"
+BUILD_TARGETS="all"
+CONFIG_CHECK="EXPERIMENTAL KMOD VIDEO_DEV I2C VIDEO_V4L1_COMPAT VIDEO_V4L2 FW_LOADER"
+CONFIG_CHECK="${CONFIG_CHECK} VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER"
+CONFIG_CHECK="${CONFIG_CHECK} VIDEO_SAA711X VIDEO_CX2341X VIDEO_SAA7127 VIDEO_TVEEPROM"
+#CONFIG_CHECK="${CONFIG_CHECK} VIDEO_UPD64083"
+
 pkg_setup() {
 	linux-mod_pkg_setup
-	MODULE_NAMES="ivtv(extra:${S}/driver) \
-			saa717x(extra:${S}/i2c-drivers)"
 
-	if kernel_is 2 6 18; 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 18; then
 		die "This only works on 2.6.18 kernels"
 	fi
 
 	linux_chkconfig_present FB && \
 	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
 
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
-		-i ${S}/driver/Makefile || die "sed failed"
+	BUILD_PARAMS="KDIR=${KV_DIR}"
 }
 
 src_compile() {
-	cd ${S}/driver
-	linux-mod_src_compile || die "failed to build driver "
+	cd "${S}/driver"
+	linux-mod_src_compile || die "failed to build driver"
 
-	cd ${S}/utils
-	emake ||  die "failed to build utils "
+	cd "${S}/utils"
+	emake INCDIR="${KV_DIR}/include" || die "failed to build utils "
 }
 
 src_install() {
-	cd ${S}/utils
-	make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install \
-		|| die"failed to install utils"
+	cd "${S}/utils"
+	make DESTDIR="${D}" PREFIX="/usr" install || die "failed to install utils"
 
-	cd ${S}
+	cd "${S}"
 	dodoc README doc/* utils/README.X11
 
-	cd ${S}/driver
+	cd "${S}/driver"
 	linux-mod_src_install || die "failed to install modules"
 
 	# Add the aliases