Fix ivtv-fb build foo, bug 156163

Package-Manager: portage-2.1.1-r2

4 files changed, 98 insertions, 5 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index ea0a168ba2bd..5abb5a9dd556 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.60 2006/11/28 03:39:32 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.61 2006/11/29 19:22:45 beandog Exp $
+
+*ivtv-0.8.1-r1 (29 Nov 2006)
+
+  29 Nov 2006; Steve Dibb <beandog@gentoo.org> +ivtv-0.8.1-r1.ebuild:
+  Build ivtv-fb driver as well, bug 156163
 
   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,
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 71df4a48cd3c..859b1664469d 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -41,14 +41,18 @@ EBUILD ivtv-0.8.0.ebuild 2147 RMD160 5cc41d62f8b7ce0d7b8662f2041acc21ffee1b2c SH
 MD5 0e42cfd84d05efb8325ac63ef6cdbde2 ivtv-0.8.0.ebuild 2147
 RMD160 5cc41d62f8b7ce0d7b8662f2041acc21ffee1b2c ivtv-0.8.0.ebuild 2147
 SHA256 0a872c7ab3d17a18f77bb442b3c58e48dd574867f1e07718ba0c20cf6829d073 ivtv-0.8.0.ebuild 2147
+EBUILD ivtv-0.8.1-r1.ebuild 2083 RMD160 a1bd47116449c739fc5383fbc8440eb42e01773b SHA1 3d0632632a9521748739918adf8d5bc79bc46f8e SHA256 f3047f23ac497cb8f99d1413a0b08d3120f9a7feed23ddf93cd01af4319018ae
+MD5 1d4b5791b180bab29aa7f585f8ef7ee2 ivtv-0.8.1-r1.ebuild 2083
+RMD160 a1bd47116449c739fc5383fbc8440eb42e01773b ivtv-0.8.1-r1.ebuild 2083
+SHA256 f3047f23ac497cb8f99d1413a0b08d3120f9a7feed23ddf93cd01af4319018ae ivtv-0.8.1-r1.ebuild 2083
 EBUILD ivtv-0.8.1.ebuild 2149 RMD160 16c916726e596a97c9824b946027e60d162905c1 SHA1 bcf131d1f01b427334a4f6aa5b85b48c62ce81ac SHA256 bd0636b65ac2af2c3cca92a49f7f987d2bf6e4ebbeb999999e4944edbd88fa63
 MD5 285002d25873436daa14cf778d3041dc ivtv-0.8.1.ebuild 2149
 RMD160 16c916726e596a97c9824b946027e60d162905c1 ivtv-0.8.1.ebuild 2149
 SHA256 bd0636b65ac2af2c3cca92a49f7f987d2bf6e4ebbeb999999e4944edbd88fa63 ivtv-0.8.1.ebuild 2149
-MISC ChangeLog 10160 RMD160 953970b146869ba29b394fb1d2637e6b4938549e SHA1 4004d8f3aef820802dff6fbb0559d60f99dac5b9 SHA256 6f4235c9e9c12d7ae2aaec3c6da1f383aa7217d6f2096b0926a435ac0a5ff548
-MD5 666873199516b148cfec10f51957a3a7 ChangeLog 10160
-RMD160 953970b146869ba29b394fb1d2637e6b4938549e ChangeLog 10160
-SHA256 6f4235c9e9c12d7ae2aaec3c6da1f383aa7217d6f2096b0926a435ac0a5ff548 ChangeLog 10160
+MISC ChangeLog 10304 RMD160 7065de37f5966e4814ab3c93d4c28f3fa33c7f03 SHA1 c20bdd56da286ba5dfabc3fcac550c3637dadc40 SHA256 02d7e4c1613c66a02eb553ccd34f0024d071607e82ea05bb944e1f123117e327
+MD5 ceba577bf3cb14b7563726c5af1e6dcd ChangeLog 10304
+RMD160 7065de37f5966e4814ab3c93d4c28f3fa33c7f03 ChangeLog 10304
+SHA256 02d7e4c1613c66a02eb553ccd34f0024d071607e82ea05bb944e1f123117e327 ChangeLog 10304
 MISC metadata.xml 495 RMD160 fce120b898530aef1984964ee4fe82552325e976 SHA1 fa493a7f5069abe278527eb46051adc04a0dfb32 SHA256 af459e1dca4aa34e999427a5aa2b3d8bf90986b2b8fbd98063f74eed35a9d1cb
 MD5 cd7dcb9388e6d4cd6406a80b7b7c59a5 metadata.xml 495
 RMD160 fce120b898530aef1984964ee4fe82552325e976 metadata.xml 495
@@ -77,3 +81,6 @@ SHA256 0829db1eb42c80d36c44dc32526c3b99f14594639d1a7b95cfec2585b43f199e files/di
 MD5 97feaa846238ff66025548eb67fd8010 files/digest-ivtv-0.8.1 232
 RMD160 ac084503d28418c8ac1342e256def657cb58a2e6 files/digest-ivtv-0.8.1 232
 SHA256 eeed341d7f9589009fafc90fbc95b453c2d3cd5079721c858b065d1511a6fea3 files/digest-ivtv-0.8.1 232
+MD5 97feaa846238ff66025548eb67fd8010 files/digest-ivtv-0.8.1-r1 232
+RMD160 ac084503d28418c8ac1342e256def657cb58a2e6 files/digest-ivtv-0.8.1-r1 232
+SHA256 eeed341d7f9589009fafc90fbc95b453c2d3cd5079721c858b065d1511a6fea3 files/digest-ivtv-0.8.1-r1 232
diff --git a/media-tv/ivtv/files/digest-ivtv-0.8.1-r1 b/media-tv/ivtv/files/digest-ivtv-0.8.1-r1
new file mode 100644
index 000000000000..9777186a4549
--- /dev/null
+++ b/media-tv/ivtv/files/digest-ivtv-0.8.1-r1
@@ -0,0 +1,3 @@
+MD5 466a27ef1f956ebf1b3ea18dfcc0581e ivtv-0.8.1.tar.gz 403984
+RMD160 5458bf7a29d399782c7a5cfb45f3ed148e010e73 ivtv-0.8.1.tar.gz 403984
+SHA256 10e4ce21cd02493a99bf91f96371c295787c121116b0fe8d9d2bb18f5c1061ad ivtv-0.8.1.tar.gz 403984
diff --git a/media-tv/ivtv/ivtv-0.8.1-r1.ebuild b/media-tv/ivtv/ivtv-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..58816bf21cb1
--- /dev/null
+++ b/media-tv/ivtv/ivtv-0.8.1-r1.ebuild
@@ -0,0 +1,78 @@
+# 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-r1.ebuild,v 1.1 2006/11/29 19:22:45 beandog Exp $
+
+inherit eutils linux-mod
+
+DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
+HOMEPAGE="http://www.ivtvdriver.org"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.8.x/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="fbcon"
+
+RDEPEND="sys-apps/hotplug"
+DEPEND="app-arch/unzip"
+PDEPEND="media-tv/pvr-firmware"
+
+pkg_setup() {
+
+	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 VIDEO_WM8775 VIDEO_MSP3400 VIDEO_CX25840 VIDEO_TUNER
+		VIDEO_SAA711X VIDEO_CX2341X VIDEO_SAA7127 VIDEO_TVEEPROM"
+
+	if use fbcon; then
+		MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
+		CONFIG_CHECK="${CONFIG_CHECK} FB"
+	fi
+
+	if ! kernel_is 2 6 18; then
+		eerror "Each IVTV driver branch will only work with a specific"
+		eerror "linux kernel branch."
+		eerror ""
+		eerror "You will need to either:"
+		eerror "a) emerge a different kernel"
+		eerror "b) emerge a different driver"
+		eerror ""
+		eerror "ivtv branch <--> kernel branch"
+		eerror "0.8.x <--> 2.6.18.x"
+		eerror "0.7.x <--> 2.6.17.x"
+		eerror "0.6.x <--> 2.6.16.x"
+		eerror "0.4.x <--> 2.6.15.x"
+		eerror ""
+		eerror "See http://ivtvdriver.org/ for more information"
+		die "This only works on 2.6.18 kernels"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+}
+
+src_compile() {
+
+	cd "${S}/driver"
+	linux-mod_src_compile || die "failed to build driver"
+
+	cd "${S}/utils"
+	emake INCDIR="${KV_DIR}/include" || die "failed to build utils "
+}
+
+src_install() {
+	cd "${S}/utils"
+	make DESTDIR="${D}" PREFIX="/usr" install || die "failed to install utils"
+
+	cd "${S}"
+	dodoc README doc/* utils/README.X11
+
+	cd "${S}/driver"
+	linux-mod_src_install || die "failed to install modules"
+
+	# Add the aliases
+	insinto /etc/modules.d
+	newins "${FILESDIR}"/ivtv ivtv
+}