Rev bump

(Portage version: 2.1.1_pre1-r1)
 (Signed Manifest commit)

4 files changed, 22 insertions, 195 deletions

diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index d41f6e5bffe8..718caf6e70fc 100644
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ivtv 152 RMD160 0261d991ec2e1db04f4408e3ce30b7e2088057f7 SHA1 1bbd5f926be903e759e16a4e5a11dbbf2f806693 SHA256 828831443387297fbad1e21cbd979c378a0f16063cde8e0abcf86f4cf01e31d9
 MD5 161f909fd1d12453ef38f5eb6771b154 files/ivtv 152
 RMD160 0261d991ec2e1db04f4408e3ce30b7e2088057f7 files/ivtv 152
@@ -10,15 +13,11 @@ AUX ivtv-0.4.0-ppc-odw.patch 1467 RMD160 6facbc2ca1468cda1c1c16b5662c27a49510233
 MD5 ccbc6a2572b5e7f2798bfd77e6e23f67 files/ivtv-0.4.0-ppc-odw.patch 1467
 RMD160 6facbc2ca1468cda1c1c16b5662c27a495102335 files/ivtv-0.4.0-ppc-odw.patch 1467
 SHA256 ba76dca1aea5bd333c0c29a634104d94dc675fe25ce474fef6f18bd5c3419791 files/ivtv-0.4.0-ppc-odw.patch 1467
-AUX ivtv-0.6.2-ppc-fix.patch 1592 RMD160 d5d352ff296b39fb750779e59d0c903725a3ec01 SHA1 95acf18a406173bdd2a970fb8e1caaf8873db681 SHA256 7327bf9a37ca269e898492074bcc819a1e59cfd2f43e22433522698383c10faa
-MD5 ec55fcdc0ed0e60740d6015311fe4d01 files/ivtv-0.6.2-ppc-fix.patch 1592
-RMD160 d5d352ff296b39fb750779e59d0c903725a3ec01 files/ivtv-0.6.2-ppc-fix.patch 1592
-SHA256 7327bf9a37ca269e898492074bcc819a1e59cfd2f43e22433522698383c10faa files/ivtv-0.6.2-ppc-fix.patch 1592
 DIST ivtv-0.4.0.tar.gz 475881
 DIST ivtv-0.4.2.tar.gz 500961
 DIST ivtv-0.4.4.tar.gz 502468 RMD160 89ebc5cdcefd339e18c6e24575a6dc0eb3cd1af3 SHA1 9a37071cb9066810e7865493799cfce9307ae30d SHA256 b311fc7131f748df048e4672c024fe32b544aff08745f4ac2efe723ab9c0da61
 DIST ivtv-0.4.5.tar.gz 502679 RMD160 8b6c1bf532797ec19ec148a26515fd38a0d983e7 SHA1 882277f2ef602156ba6c8bbfddde43ae51f7ea3f SHA256 a600339247f16f0b3028581f3f84154e6b352f166b238b0c5c282a11fc1a603d
-DIST ivtv-0.6.2.tar.gz 432308 RMD160 69d64a40bd861902aab982c2e047372ebbcf217c SHA1 40bb68a73eede8340a24f0c5d00ff1da7f1b8ff5 SHA256 3cdae3e8f7d2e67e2c8be3474130e4d6fea2f7576ac62823d7e47eb7475c6756
+DIST ivtv-0.6.3.tar.gz 433472 RMD160 57143da9b921b3da5d4ff7b9468130abf390c983 SHA1 599b22f88b53ae8bd9161ddfe7276a79f38c4da5 SHA256 b4a74a225b9947b52ab4dc5b0b3d67536f5d77acc6da3af39f7f3b16116c353f
 DIST pvr_1.18.21.22254_inf.zip 593441 RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 SHA1 9eaceaca5341cb6771777281459f36b8450b922e SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1
 DIST pvr_2.0.24.23035.zip 281620 RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 SHA1 8c0bd923be52064c5149f78213cdaa1aaced0cb5 SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95
 EBUILD ivtv-0.4.0-r3.ebuild 3960 RMD160 02c4ba6d1cd82f1d8ee2cb63263b330807e99654 SHA1 14be57f43a47947b96042f4466d9c2e0dc6f5785 SHA256 09ab46313945c07f5590627f72977dbd8ca68b34c17824a21b68ceaaa6039ab7
@@ -37,14 +36,14 @@ EBUILD ivtv-0.4.5.ebuild 4133 RMD160 9c4d5967139805f6e9be60719a8f28b24fed3029 SH
 MD5 3eb0fcbc0f4f9b6d11461b4521f7999f ivtv-0.4.5.ebuild 4133
 RMD160 9c4d5967139805f6e9be60719a8f28b24fed3029 ivtv-0.4.5.ebuild 4133
 SHA256 65a296c188dcba702865a788bef5f8d3ecc88a1b1178997db42b0aa0de3b58cd ivtv-0.4.5.ebuild 4133
-EBUILD ivtv-0.6.2.ebuild 3623 RMD160 5d678281d9133e85d655ff126b3fbd05669e3636 SHA1 658cc8d87187d84f5877b28b3de1e92b9fe382bd SHA256 096d8ac5d85a94f07899c36492c63296e2366ce59156f2c490d82e85811f7ee9
-MD5 5a2b39512df478010279e311995f2d56 ivtv-0.6.2.ebuild 3623
-RMD160 5d678281d9133e85d655ff126b3fbd05669e3636 ivtv-0.6.2.ebuild 3623
-SHA256 096d8ac5d85a94f07899c36492c63296e2366ce59156f2c490d82e85811f7ee9 ivtv-0.6.2.ebuild 3623
-MISC ChangeLog 7937 RMD160 d2277cdf4718979858df720d84d30be9694990f0 SHA1 c043c1678cba8de825871e748907ddfea4ba0552 SHA256 9dceab140ad140b5f8bd831d5edf357ca51d7a874ad15c632d24a40a61d086f1
-MD5 a9633904236b2a7ded6b370d1d4643c3 ChangeLog 7937
-RMD160 d2277cdf4718979858df720d84d30be9694990f0 ChangeLog 7937
-SHA256 9dceab140ad140b5f8bd831d5edf357ca51d7a874ad15c632d24a40a61d086f1 ChangeLog 7937
+EBUILD ivtv-0.6.3.ebuild 3581 RMD160 de7fb083d2a07b1d53753e9dc06152fcf57ea258 SHA1 96dddaf14f48a3c67d62291ab9dbc946f3e50b81 SHA256 9796e55f959454ec83d1c3537e23a033f6e90d12a908f8fd83b8c862d97440ad
+MD5 8d1b142f845f4aa79a8ad81b63ed65f2 ivtv-0.6.3.ebuild 3581
+RMD160 de7fb083d2a07b1d53753e9dc06152fcf57ea258 ivtv-0.6.3.ebuild 3581
+SHA256 9796e55f959454ec83d1c3537e23a033f6e90d12a908f8fd83b8c862d97440ad ivtv-0.6.3.ebuild 3581
+MISC ChangeLog 8099 RMD160 d333aee7969d4be52676902932bb3647b60f13ec SHA1 908db037809650fe0a89492cc71a8e880c1d3970 SHA256 a41f04bb0cfec525ba12813ced1a7b073736076386536d04fb459ae00185aa28
+MD5 b4513f99f4ccc7b79c45ded56685ff82 ChangeLog 8099
+RMD160 d333aee7969d4be52676902932bb3647b60f13ec ChangeLog 8099
+SHA256 a41f04bb0cfec525ba12813ced1a7b073736076386536d04fb459ae00185aa28 ChangeLog 8099
 MISC metadata.xml 465 RMD160 968deaeb110cec9b925349e9057f64a7c78b3cb1 SHA1 87dd7591c4be3e0d2b697636a3fd327d00b4e2cf SHA256 7fdf7857ba65e74299881f392155fa800167db2ed15b924d344524c3ada74bbb
 MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
 RMD160 968deaeb110cec9b925349e9057f64a7c78b3cb1 metadata.xml 465
@@ -61,6 +60,13 @@ SHA256 de1c013a94e11f56029e4cf6e2429cc4c35369a705e22631313a91fe52539ef1 files/di
 MD5 cdf0129db1f0a6850b86dc30cf1ca61c files/digest-ivtv-0.4.5 729
 RMD160 a2d83774abe96f159b83f1f5b109f87776d80f36 files/digest-ivtv-0.4.5 729
 SHA256 22e7eacf8b6b3f9e35d4417db91c399138946f9f86135825fba55c8a62b57248 files/digest-ivtv-0.4.5 729
-MD5 10fb8b616ae1f5afc6e46465ca89336b files/digest-ivtv-0.6.2 729
-RMD160 cb64c387078da3e2536f119fbe57b8065715b5fb files/digest-ivtv-0.6.2 729
-SHA256 e76ebab35f082ae91db6d47aff3f01fc17bb697690f222bfa17eecb585892f84 files/digest-ivtv-0.6.2 729
+MD5 6b645b8a5438c8f194288c2365580af3 files/digest-ivtv-0.6.3 729
+RMD160 90f50f0b5e53a0acdc232449ca0d7c626de52ed6 files/digest-ivtv-0.6.3 729
+SHA256 60b09f4a3eeecb82fa0ddbe412517b25aa11ca99c56c6862750d18fd5d8caac7 files/digest-ivtv-0.6.3 729
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEoJ3foeSe8B0zEfwRAkBdAJwIw52hl9LyVdwisy04A8ZfbISKWgCfeE0/
+O0dzApioOwRUsnnXwIUlRqk=
+=UUq/
+-----END PGP SIGNATURE-----
diff --git a/media-tv/ivtv/files/digest-ivtv-0.6.2 b/media-tv/ivtv/files/digest-ivtv-0.6.2
deleted file mode 100644
index 3cc3524e537b..000000000000
--- a/media-tv/ivtv/files/digest-ivtv-0.6.2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 93ce8acbb3008956486ee30ff21f7e14 ivtv-0.6.2.tar.gz 432308
-RMD160 69d64a40bd861902aab982c2e047372ebbcf217c ivtv-0.6.2.tar.gz 432308
-SHA256 3cdae3e8f7d2e67e2c8be3474130e4d6fea2f7576ac62823d7e47eb7475c6756 ivtv-0.6.2.tar.gz 432308
-MD5 f48ad2cda962879bc093cc6867dc86d2 pvr_1.18.21.22254_inf.zip 593441
-RMD160 9549dddfddacf6bee3c73def508a2c347c5e25f2 pvr_1.18.21.22254_inf.zip 593441
-SHA256 156c0cfaa2cb3f482b48f95b94a9247690e4ed2d0cb8962a52db8846c683bff1 pvr_1.18.21.22254_inf.zip 593441
-MD5 dc84a41b3b296b856da3d0f9edbb7a08 pvr_2.0.24.23035.zip 281620
-RMD160 fbd439efa5793e9a65fd6fac2093c523cd458027 pvr_2.0.24.23035.zip 281620
-SHA256 2387e7a042342f7b401222aac7f99a19b733fded8118339edd402a58279e5f95 pvr_2.0.24.23035.zip 281620
diff --git a/media-tv/ivtv/files/ivtv-0.6.2-ppc-fix.patch b/media-tv/ivtv/files/ivtv-0.6.2-ppc-fix.patch
deleted file mode 100644
index c3ce8d249c71..000000000000
--- a/media-tv/ivtv/files/ivtv-0.6.2-ppc-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: /ivtv/branches/0.6/utils/Makefile
-===================================================================
---- utils/Makefile (revision 3212)
-+++ utils/Makefile (revision 3284)
-@@ -3,7 +3,10 @@
- HDRDIR = /usr/include/linux
- 
--EXES := ivtvctl ivtvfbctl ivtvplay ivtv-detect ivtv-radio \
--        ivtv-mpegindex ivtv-encoder
-+EXES := ivtvctl ivtv-detect ivtv-radio 
-+EXES := $(shell if echo - | $(CC) -E -dM - | grep __powerpc__ > /dev/null; \
-+	then echo $(EXES); else \
-+	echo $(EXES) ivtvfbctl ivtvplay ivtv-mpegindex ivtv-encoder; fi)
- BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl
-+
- 
- HEADERS := ../driver/ivtv.h
-Index: /ivtv/branches/0.6/driver/ivtv-driver.h
-===================================================================
---- driver/ivtv-driver.h (revision 3263)
-+++ driver/ivtv-driver.h (revision 3284)
-@@ -186,6 +186,9 @@
- /* ========================== START USER SETTABLE DMA VARIABLES =========== */
- /* ======================================================================== */
--
-+#ifdef __powerpc__
-+#define DYNAMIC_MEMORY_ALLOC	0 /* PowerPC doesn't work with DMA currently */
-+#else
- #define DYNAMIC_MEMORY_ALLOC 	1 /* Allocate memory each stream use */
-+#endif
- 
- /* DMA Buffers Sizes */
-@@ -211,7 +214,14 @@
- 
- /* Decoder DMA or PIO, 1=PIO, 0=DMA */
-+/* PowerPC does not work with DMA currently */
-+#ifdef __powerpc__
-+#define IVTV_VBI_PIO		1
-+#define IVTV_ENC_PIO		1
-+#define IVTV_DEC_PIO		1
-+#else
- #define IVTV_VBI_PIO		0
- #define IVTV_ENC_PIO		0
- #define IVTV_DEC_PIO		0
-+#endif
- /* This sometimes times out, seems to  kill
- 					   encoding sometimes */
diff --git a/media-tv/ivtv/ivtv-0.6.2.ebuild b/media-tv/ivtv/ivtv-0.6.2.ebuild
deleted file mode 100644
index e2b96d8ad527..000000000000
--- a/media-tv/ivtv/ivtv-0.6.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# 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.2.ebuild,v 1.4 2006/06/13 10:25:23 uberlord Exp $
-
-inherit eutils linux-mod
-
-DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
-HOMEPAGE="http://www.ivtvdriver.org"
-
-FW_VER_DEC="pvr_1.18.21.22254_inf.zip"
-FW_VER_ENC="pvr_2.0.24.23035.zip"
-#Switched to recommended firmware by driver
-
-SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/0.6.x/${P}.tar.gz
-	ftp://ftp.shspvr.com/download/wintv-pvr_150-500/inf/${FW_VER_ENC}
-	ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER_DEC}"
-
-RESTRICT="nomirror"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~ppc"
-
-IUSE=""
-
-BUILD_TARGETS="all"
-BUILD_PARAMS="KDIR=${KERNEL_DIR}"
-CONFIG_CHECK="I2C_ALGOBIT VIDEO_DEV I2C_CHARDEV I2C"
-
-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
-		die "This only works on 2.6.16 kernels"
-	fi
-
-	linux_chkconfig_present FB && \
-	MODULE_NAMES="${MODULE_NAMES} ivtv-fb(extra:${S}/driver)"
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	unpack ${FW_VER_ENC}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-ppc-fix.patch
-
-	sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
-		-i ${S}/driver/Makefile || die "sed failed"
-}
-
-src_compile() {
-	cd ${S}/driver
-	linux-mod_src_compile || die "failed to build driver "
-
-	cd ${S}/utils
-	emake ||  die "failed to build utils "
-}
-
-src_install() {
-	cd ${S}/utils
-	dodir /lib/firmware
-	./ivtvfwextract.pl "${DISTDIR}"/${FW_VER_DEC} \
-		"${D}"/lib/firmware/v4l-cx2341x-enc.fw \
-		"${D}"/lib/firmware/v4l-cx2341x-dec.fw
-
-	make KERNELDIR="${KERNEL_DIR}" DESTDIR="${D}" PREFIX=/usr install || die "failed to install"
-
-	insinto /lib/firmware
-	newins "${WORKDIR}"/HcwMakoA.ROM v4l-cx25840.fw
-	newins ${S}/v4l-cx2341x-init.mpg v4l-cx2341x-init.mpg
-
-	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
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# The MCE versions of the PVR cards come without remote control because (I
-	# assume) a remote control is included in Windows Media Center Edition. It
-	# is probably a good idea to just say that if your package comes with a
-	# remote then emerge lirc. Lirc should build all drivers anyway.
-	#
-	# einfo "To get the ir remote working, you'll need to emerge lirc"
-	# einfo "with the following set:"
-	# einfo "LIRC_OPTS=\"--with-x --with-driver=hauppauge --with-major=61 "
-	# einfo "	--with-port=none --with-irq=none\" emerge lirc"
-	# echo
-	# einfo "You can also add the above LIRC_OPTS line to /etc/make.conf for"
-	# einfo "it to remain there for future updates."
-	# echo
-	# einfo "To use vbi, you'll need a few other things, check README.vbi in the docs dir"
-	# echo
-
-	# Similar checks are performed by the make install in the drivers directory.
-	BADMODS="msp3400 tda9887 tuner tveeprom"
-
-	if [ ${KV_PATCH} -le 14 ]; then
-		for MODNAME in ${BADMODS}; do
-			if [ -f "${ROOT}/lib/modules/${KV_FULL}/kernel/drivers/media/video/${MODNAME}.ko" ] ; then
-				ewarn "You have the ${MODNAME} module that comes with the kernel. It isn't compatible"
-				ewarn "with ivtv. You need to back it up to somewhere else, then run 'modules-update'"
-				ewarn "The file to remove is ${ROOT}/lib/modules/${KV_FULL}/kernel/drivers/media/video/${MODNAME}.ko"
-				echo
-			fi
-		done
-	fi
-}