Don't install linux headers, bug 271365; Remove installation of v4l2-ctl to be in separate ebuild, bug 278255

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 105 insertions, 12 deletions

diff --git a/media-tv/ivtv-utils/ChangeLog b/media-tv/ivtv-utils/ChangeLog
index 3908669af751..2af0a4ad283a 100644
--- a/media-tv/ivtv-utils/ChangeLog
+++ b/media-tv/ivtv-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/ivtv-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.7 2010/01/19 05:18:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ChangeLog,v 1.8 2010/05/20 15:31:31 beandog Exp $
+
+*ivtv-utils-1.4.0-r1 (20 May 2010)
+
+  20 May 2010; Steve Dibb <beandog@gentoo.org> +ivtv-utils-1.4.0-r1.ebuild:
+  Don't install linux headers, bug 271365; Remove installation of v4l2-ctl
+  to be in separate ebuild, bug 278255
 
 *ivtv-utils-1.4.0 (19 Jan 2010)
 *ivtv-utils-1.3.0-r2 (19 Jan 2010)
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index 7b1b54f06468..d0b4b2d5af29 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ivtv-utils-1.3.0-2.6.27.patch 5014 RMD160 7a1e3982cab722ac8858ec4989d2e1fd6f3d3081 SHA1 c5e6ca21d3578dfa708ff33f125f6c331fee3185 SHA256 b08e9449c67c279a30e324d435d421ff748109af909bb39dc8549784784ebcfb
 DIST ivtv-utils-1.3.0.tar.gz 173745 RMD160 b42572277babd840868adb641d8434b180d43315 SHA1 bc4d7003ce9fb75ee137e8f79c880e4fb45d1137 SHA256 66daf16ae2f124e31131451e52295072c2615d9931a95f7eccee58c5351af498
 DIST ivtv-utils-1.4.0.tar.gz 192733 RMD160 841b46c64dc57e04e603a1a074a55be1d6ea5ea3 SHA1 ea046eec2511ad00395e9de5ba693c069190d2c4 SHA256 702c365da723ce419bd49f25f88eb3a028f0594699f9c9710c713eba022ac911
 EBUILD ivtv-utils-1.3.0-r1.ebuild 3464 RMD160 c9b8d4640e1276a290d3f582a9d760b73a747831 SHA1 4bc304dbf684921b12c86215f9c22543ae6edbcd SHA256 982a71066354dbef76d5ae9d1a33f2043f9a596a16fdd5c7b426520f94f6194c
 EBUILD ivtv-utils-1.3.0-r2.ebuild 3011 RMD160 9d2e23aba890a01cb3a0c4ccbf0a0938fe8b6b77 SHA1 d0a9331ad2a943278eae6fab6bd3b46d313516fc SHA256 b1cd7cee5591682f7251f630c1a902d5453835f188dbd2a5b480ce111455a67e
+EBUILD ivtv-utils-1.4.0-r1.ebuild 3075 RMD160 175f2692f5d04fe3da8e2c999932603dc142e420 SHA1 d0de24aed06e6348047d409f4db42549e426eafc SHA256 b430c1c44d12af68bb13f6c1cadc7ad8e85921063fd39417f71605e6f52b42c2
 EBUILD ivtv-utils-1.4.0.ebuild 2880 RMD160 da4d1d5b749ee4eb23ed3f0f3cd4112fd4b3c6bb SHA1 49f2488e4ff3d756fcf3d4aeab7a0eda060977f1 SHA256 6bd25fe7111ea34c17baa8350461ecc39936ddc277a91a5ae4d5cba1ccbce317
-MISC ChangeLog 1560 RMD160 5ad0e3c8a2ec2402930b7b3574b92505aa018b75 SHA1 6c40d95ff56fa5af7099a8adde49b75486a1faa7 SHA256 b12ba5543a6800ddb71c248467259870148580f473e81445e955c59a2b9df70e
+MISC ChangeLog 1788 RMD160 3e1aef39f9cd485de3a44c763b4c4ea26ff952a4 SHA1 80cc04cc1a35333528a38acfbe18f1cf77af0aad SHA256 3352cb05137a36df2c06a9e68ffd8c2329103c76dbb6dd78f338d50e77474b0d
 MISC metadata.xml 494 RMD160 a8c45c9e2ad783198d04b68c755398d915270499 SHA1 1a04f1e7b3be80d5a875559fddbc5b681ba9254b SHA256 99e7a214b2abd11188552236eb67309ccde04d0a66209ed0fd48589eed258bb4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktVQJ4ACgkQoeSe8B0zEfzaggCeMC8cFQ3fpy3SvmZNPyyXUFfz
-TgMAnjWDhHFXETCAqdNS880AtwAiQ7Tj
-=4w+n
------END PGP SIGNATURE-----
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..fa95bfcbb7f5
--- /dev/null
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv-utils/ivtv-utils-1.4.0-r1.ebuild,v 1.1 2010/05/20 15:31:31 beandog Exp $
+
+EAPI=2
+
+inherit eutils linux-mod linux-info
+
+DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
+HOMEPAGE="http://www.ivtvdriver.org"
+SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/1.4.x/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl"
+RDEPEND=">=sys-fs/udev-103"
+DEPEND="app-arch/unzip
+	>=sys-kernel/linux-headers-2.6.29
+	!media-tv/ivtv"
+PDEPEND=">=media-tv/ivtv-firmware-20070217
+	perl? (
+		dev-perl/Video-Frequencies
+		dev-perl/Video-ivtv
+		dev-perl/Config-IniFiles
+		virtual/perl-Getopt-Long
+		dev-perl/perl-tk )"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	### Commented out following line because it causes failure and because the module should already be in the kernel
+	#       MODULE_NAMES="saa717x(extra:${S}/i2c-drivers)"
+	BUILD_TARGETS="all"
+	CONFIG_CHECK="~EXPERIMENTAL ~MODULES ~HAS_IOMEM ~FW_LOADER ~I2C ~I2C_ALGOBIT
+		~VIDEO_DEV ~VIDEO_CAPTURE_DRIVERS ~VIDEO_V4L1 ~VIDEO_V4L2 ~VIDEO_IVTV"
+
+	if ! ( kernel_is ge 2 6 29 ); then
+		eerror "This package is only for the fully in-kernel"
+		eerror "IVTV driver shipping with kernel 2.6.29 or newer"
+		eerror ""
+		eerror "You will need to either:"
+		eerror "a) emerge a 2.6.29 or newer kernel"
+		eerror "b) emerge media-tv/ivtv or media-tv/ivtv-utils for"
+		eerror "your kernel"
+		eerror ""
+		eerror "See http://ivtvdriver.org/ for more information"
+		die "This only works on 2.6.29 or newer kernels"
+	fi
+	
+	ewarn "Make sure that your I2C and V4L kernel drivers are loaded as"
+	ewarn "modules, and not compiled into the kernel, or IVTV will not"
+	ewarn "work."
+	
+	linux-mod_pkg_setup
+	
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+}
+
+src_install() {
+	make DESTDIR="${D}" PREFIX="/usr" install || die "failed to install"
+	use perl && dobin utils/perl/*.pl
+
+	# Shouldn't be installing linux headers, bug 273165
+	rm "${D}"/usr/include/linux/ivtv.h
+	rm "${D}"/usr/include/linux/ivtvfb.h
+
+	# Installed separately now
+	rm "${D}"/usr/bin/v4l2-ctl
+	
+	cd "${S}"
+	dodoc README doc/* ChangeLog
+	use perl && dodoc utils/perl/README.ptune
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	
+	elog ""
+	elog "This version of the IVTV utils supports hardware listed at:"
+	elog "http://www.ivtvdriver.org/index.php/Supported_hardware"
+	ewarn ""
+	ewarn "IMPORTANT: In case of problems first read the following:"
+	ewarn "http://www.ivtvdriver.org/index.php/Troubleshooting"
+	ewarn "/usr/share/doc/${PF}/README.*"
+	ewarn ""
+	ewarn " - Using MythTV, a PVR-350 and the ivtvfb module"
+	ewarn " - Using the ivtv X driver and the ivtvfb module"
+	ewarn " - You want to manually build ivtv against v4l-dvb"
+	ewarn ""
+	ewarn "Also, the ivtv package comes with lots of documentation regarding "
+	ewarn "setup, proper use and debugging utilities."
+	ewarn "They are also located in /usr/share/doc/${PF}/"
+	ewarn ""
+	elog "For more information, see the IVTV driver homepage at:"
+	elog "http://www.ivtvdriver.org/"
+}