add support for 2.6.24 and 2.6.25 with two new versions

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

4 files changed, 248 insertions, 5 deletions

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index d6c55a82b2fd..4784b918f90a 100644
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.103 2008/06/27 16:36:47 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.104 2008/06/27 16:40:21 cardoe Exp $
+
+*ivtv-1.2.0 (27 Jun 2008)
+*ivtv-1.1.0 (27 Jun 2008)
+
+  27 Jun 2008; Doug Goldstein <cardoe@gentoo.org> +ivtv-1.1.0.ebuild,
+  +ivtv-1.2.0.ebuild:
+  add support for 2.6.24 and 2.6.25 with two new versions
 
   27 Jun 2008; Doug Goldstein <cardoe@gentoo.org> -ivtv-0.4.5.ebuild,
   -ivtv-0.4.7.ebuild, -ivtv-0.4.8.ebuild, -ivtv-0.4.9.ebuild,
diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index e48f257d24ea..c2dcc0fda4e8 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -5,16 +5,20 @@ AUX ivtv 152 RMD160 0261d991ec2e1db04f4408e3ce30b7e2088057f7 SHA1 1bbd5f926be903
 DIST ivtv-1.0.1.tar.gz 302883 RMD160 c7259d94513bab12ffc99cb369e9e37e085e9806 SHA1 212c2bb217fda7e3adaf6ff8d2bceabecaa88fbd SHA256 93c15a46b283f1d4c2ff2514752cfc21de089a6e76479b556f521222642a8896
 DIST ivtv-1.0.2.tar.gz 303754 RMD160 8064a395f975a96869593ee9146967cff20994bd SHA1 32cbc3f891cad54f8705f61780c05bd7bc536bba SHA256 7acfc2264ea6788076e4d8202c81c5f884958418b79b3f3ac0cf6eb271e5c510
 DIST ivtv-1.0.3.tar.gz 290171 RMD160 8893b2c33b2b870c7e9c5969dcf3e6346c9e5692 SHA1 c2268f0b611378cbb180904cd6cc5774a17a978c SHA256 925083406a5bb6bb676e643b0c229eda722f5a1c36baf5526d7ee1c915e29e8d
+DIST ivtv-1.1.0.tar.gz 514337 RMD160 60e61716fa0f385a807af1b00bffc851c52473cc SHA1 d7c1ffcfff00080bb1d9f4666d4502e46f00da9f SHA256 629fc73adb591e859d46eb0bfbe3b2ac35858a01d2f7c703f4287e52c2f11ea8
+DIST ivtv-1.2.0.tar.gz 481927 RMD160 042cda9b694e0b3ad57084aa3a829be8dfcb30c2 SHA1 5df6ec6b6f9722aae2bbe8fe5d730ce2df93c56c SHA256 bcfcbaa33b9bc33d94b51685f38c6bca03fcbf02cdf427fe2f3b2f66ede7a236
 EBUILD ivtv-1.0.1.ebuild 4508 RMD160 6ee134cd6b4140710b54c4efd7b447c181c85ff7 SHA1 d9b16ac4552c24c8c0837ebc3f11d3cafa8cb696 SHA256 4aa3b50f9b14252e24a90c345cb59bc4d52d1505b6cda8b042de050d70865202
 EBUILD ivtv-1.0.2.ebuild 4537 RMD160 4aac1c3ea4f5a7f80e1077388981952344e0e229 SHA1 16134bd38b4c912d5aac5738ecaec9247e5b2d1f SHA256 ed80e5662a05e5e38f69f2f8c5c5cbaeedec2b73229d4981dc7a1fd698206483
 EBUILD ivtv-1.0.3-r1.ebuild 4519 RMD160 b63440fbfe8e720aec0ef56c68b8ecb5b2087d96 SHA1 beb7381e555b1cf2f33279cacb98e6cce0005640 SHA256 901dab1aad3345ece2f1dcec2ac8bfccfa0b5cc74270895443080c3deb53c974
 EBUILD ivtv-1.0.3-r2.ebuild 4690 RMD160 3112eaf4792894c7c5c7a267b117753e93e0a476 SHA1 2748971f4a8477973f15ec66066c831cbc254d30 SHA256 15680245f170e47be0490c7f9a8685622f17c638a4799b45042b77a9503eeb0a
-MISC ChangeLog 18120 RMD160 ffcd9f6a0d4f91a81fc048982d35c2660c6e3d60 SHA1 bba95f5fca974bffd12a8fdf50824b39e21c9d88 SHA256 de79ac16fc7c297f6970bc396416553bf66e8464b00d59e7f78a710ffa5dcce5
+EBUILD ivtv-1.1.0.ebuild 3509 RMD160 6ea3dfa747ba2891ba1ded9260b8a8ed6ab71081 SHA1 d0b4258bbbcb217c49776bd10c000faaed85cbb7 SHA256 ae89fd29df3563207b0e6c1de89e8bd3c04e2f0333fb85bea910786031b4018d
+EBUILD ivtv-1.2.0.ebuild 3509 RMD160 d60a67f7b3fdb389037ada9ca9f9c880786b7e5c SHA1 7d2f85d898a9a16272e234098c77924c04737464 SHA256 d6d470965245b3daaaf2706cec137367e23060a33b7739ddf71901c6c256b806
+MISC ChangeLog 18324 RMD160 859a13eff2c59a95df7b3e03c2df3a7798630678 SHA1 c3256b0e71caa7972515af5e18b8d4bbfd76ede8 SHA256 14e285e781d6f150496520f30b594e4bf0362ae7775d3872dd7f697713baa97d
 MISC metadata.xml 494 RMD160 a8c45c9e2ad783198d04b68c755398d915270499 SHA1 1a04f1e7b3be80d5a875559fddbc5b681ba9254b SHA256 99e7a214b2abd11188552236eb67309ccde04d0a66209ed0fd48589eed258bb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhlFz4ACgkQoeSe8B0zEfwcggCcDXwt3XkCYmC8C6ERgmBmrKht
-Q0QAn1zfmZsl7LYU9MRJhGq/wqN7dDje
-=NA4n
+iEYEARECAAYFAkhlF/sACgkQoeSe8B0zEfwxPgCfVnYc75o7NmAocgqyZeFqp1bv
+DuwAnRXDpbZyrI2m1gLF3HitOzPdXeOf
+=TUlc
 -----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/ivtv-1.1.0.ebuild b/media-tv/ivtv/ivtv-1.1.0.ebuild
new file mode 100644
index 000000000000..f60aa99b363f
--- /dev/null
+++ b/media-tv/ivtv/ivtv-1.1.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-1.1.0.ebuild,v 1.1 2008/06/27 16:40:21 cardoe 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/1.1.x/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl"
+RDEPEND=">=sys-fs/udev-103"
+DEPEND="app-arch/unzip"
+PDEPEND="=media-tv/pvr-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() {
+
+	MODULE_NAMES="saa717x(extra:${S}/i2c-drivers)"
+	BUILD_TARGETS="all"
+	CONFIG_CHECK="EXPERIMENTAL KMOD HAS_IOMEM FW_LOADER I2C I2C_ALGOBIT
+		VIDEO_DEV VIDEO_CAPTURE_DRIVERS VIDEO_V4L1 VIDEO_V4L2
+		!VIDEO_HELPER_CHIPS_AUTO VIDEO_IVTV"
+
+	if ! ( kernel_is 2 6 24 ); 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 ivtv driver"
+		eerror ""
+		eerror "See http://ivtvdriver.org/ for more information"
+		die "This only works on 2.6.24 kernels"
+	fi
+
+	ewarn ""
+	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."
+	ewarn ""
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+}
+
+src_compile() {
+	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"
+	use perl && dobin perl/*.pl
+
+	cd "${S}"
+	dodoc README* doc/* ChangeLog*
+	use perl && dodoc utils/perl/README.ptune
+
+	linux-mod_src_install || die "failed to install modules"
+}
+
+pkg_postinst() {
+
+	linux-mod_pkg_postinst
+
+	elog ""
+	elog "This version of the IVTV driver supports the following hardware:"
+	elog "Hauppauge WinTV PVR-250"
+	elog "Hauppauge WinTV PVR-350"
+	elog "Hauppauge WinTV PVR-150"
+	elog "Hauppauge WinTV PVR-500"
+	elog "AVerMedia M179"
+	elog "Yuan MPG600/Kuroutoshikou iTVC16-STVLP"
+	elog "Yuan MPG160/Kuroutoshikou iTVC15-STVLP"
+	elog "Yuan PG600/DiamondMM PVR-550 (CX Falcon 2)"
+	elog "Adaptec AVC-2410"
+	elog "Adaptec AVC-2010"
+	elog "Nagase Transgear 5000TV"
+	elog "AOpen VA2000MAX-STN6"
+	elog "Yuan MPG600GR/Kuroutoshikou CX23416GYC-STVLP"
+	elog "I/O Data GV-MVP/RX"
+	elog "I/O Data GV-MVP/RX2E"
+	elog "Gotview PCI DVD (preliminary support only)"
+	elog "Gotview PCI DVD2 Deluxe"
+	elog "Yuan MPC622"
+	elog ""
+	ewarn ""
+	ewarn "IMPORTANT: In case of problems first read this page:"
+	ewarn "http://www.ivtvdriver.org/index.php/Troubleshooting"
+	ewarn ""
+	ewarn "If any of these conditions match your setup, you may want to look at the"
+	ewarn "README in /usr/share/doc/${PF}/"
+	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 setup,"
+	ewarn "proper use and debugging utilities."
+	ewarn "They are also located in /usr/share/doc/${PF}/"
+	ewarn ""
+	ewarn "For more information, see the IVTV driver homepage at:"
+	ewarn "http://www.ivtvdriver.org/"
+}
diff --git a/media-tv/ivtv/ivtv-1.2.0.ebuild b/media-tv/ivtv/ivtv-1.2.0.ebuild
new file mode 100644
index 000000000000..fdcaf4283af8
--- /dev/null
+++ b/media-tv/ivtv/ivtv-1.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-1.2.0.ebuild,v 1.1 2008/06/27 16:40:21 cardoe 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/1.2.x/${P}.tar.gz"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl"
+RDEPEND=">=sys-fs/udev-103"
+DEPEND="app-arch/unzip"
+PDEPEND="=media-tv/pvr-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() {
+
+	MODULE_NAMES="saa717x(extra:${S}/i2c-drivers)"
+	BUILD_TARGETS="all"
+	CONFIG_CHECK="EXPERIMENTAL KMOD HAS_IOMEM FW_LOADER I2C I2C_ALGOBIT
+		VIDEO_DEV VIDEO_CAPTURE_DRIVERS VIDEO_V4L1 VIDEO_V4L2
+		!VIDEO_HELPER_CHIPS_AUTO VIDEO_IVTV"
+
+	if ! ( kernel_is 2 6 25 ); 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 ivtv driver"
+		eerror ""
+		eerror "See http://ivtvdriver.org/ for more information"
+		die "This only works on 2.6.25 kernels"
+	fi
+
+	ewarn ""
+	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."
+	ewarn ""
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+}
+
+src_compile() {
+	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"
+	use perl && dobin perl/*.pl
+
+	cd "${S}"
+	dodoc README* doc/* ChangeLog*
+	use perl && dodoc utils/perl/README.ptune
+
+	linux-mod_src_install || die "failed to install modules"
+}
+
+pkg_postinst() {
+
+	linux-mod_pkg_postinst
+
+	elog ""
+	elog "This version of the IVTV driver supports the following hardware:"
+	elog "Hauppauge WinTV PVR-250"
+	elog "Hauppauge WinTV PVR-350"
+	elog "Hauppauge WinTV PVR-150"
+	elog "Hauppauge WinTV PVR-500"
+	elog "AVerMedia M179"
+	elog "Yuan MPG600/Kuroutoshikou iTVC16-STVLP"
+	elog "Yuan MPG160/Kuroutoshikou iTVC15-STVLP"
+	elog "Yuan PG600/DiamondMM PVR-550 (CX Falcon 2)"
+	elog "Adaptec AVC-2410"
+	elog "Adaptec AVC-2010"
+	elog "Nagase Transgear 5000TV"
+	elog "AOpen VA2000MAX-STN6"
+	elog "Yuan MPG600GR/Kuroutoshikou CX23416GYC-STVLP"
+	elog "I/O Data GV-MVP/RX"
+	elog "I/O Data GV-MVP/RX2E"
+	elog "Gotview PCI DVD (preliminary support only)"
+	elog "Gotview PCI DVD2 Deluxe"
+	elog "Yuan MPC622"
+	elog ""
+	ewarn ""
+	ewarn "IMPORTANT: In case of problems first read this page:"
+	ewarn "http://www.ivtvdriver.org/index.php/Troubleshooting"
+	ewarn ""
+	ewarn "If any of these conditions match your setup, you may want to look at the"
+	ewarn "README in /usr/share/doc/${PF}/"
+	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 setup,"
+	ewarn "proper use and debugging utilities."
+	ewarn "They are also located in /usr/share/doc/${PF}/"
+	ewarn ""
+	ewarn "For more information, see the IVTV driver homepage at:"
+	ewarn "http://www.ivtvdriver.org/"
+}