Rev bump and rewrite to work with new Makefile standard. waiting on ppc patch from...

Package-Manager: portage-2.0.52-r1

diff --git a/media-tv/ivtv/ChangeLog b/media-tv/ivtv/ChangeLog
index 407bbda16b2c1a8e4f4f79b45d73f2dc8ac60924..97780ec044cb5eaac6c4674579d66ff7bb354014 100644 (file)
--- a/media-tv/ivtv/ChangeLog
+++ b/media-tv/ivtv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/ivtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.30 2005/08/13 19:46:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ChangeLog,v 1.31 2005/09/15 05:53:56 cardoe Exp $
+
+*ivtv-0.3.8 (15 Sep 2005)
+
+  15 Sep 2005; Doug Goldstein <cardoe@gentoo.org> +files/ivtv,
+  -ivtv-0.3.7c.ebuild, +ivtv-0.3.8.ebuild:
+  Rev bump and rewrite to work with new Makefile standard. waiting on ppc
+  patch from pvdabeel
 
 *ivtv-0.3.7c (13 Aug 2005)
 

diff --git a/media-tv/ivtv/Manifest b/media-tv/ivtv/Manifest
index 3cd0ae4159cc4f544b15624ac12b100ef45e4283..7c570869deb84f7329080a10d4970dad53f9c028 100644 (file)
--- a/media-tv/ivtv/Manifest
+++ b/media-tv/ivtv/Manifest
@@ -1,8 +1,19 @@
-MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c1e598bb799c5236e53b57a8c386c185 ChangeLog 4733
+MD5 81c8de3519498bf234585646c05fe005 ivtv-0.3.8.ebuild 3416
 MD5 1b5dfd233a54a22de87bcb47627a7265 ivtv-0.2.0_rc3-r4.ebuild 3964
+MD5 71007461e2e10f367a6a8f7a0b0d7d6a metadata.xml 465
 MD5 28b327ad3b268ad20a14a516c72e9908 ivtv-0.2.0_rc3-r5.ebuild 3964
-MD5 ea0c53a3414cbd9e79f8d1786d1d588d ivtv-0.3.7c.ebuild 4306
-MD5 0940dde91568a89a0bc207a1666bf637 ChangeLog 4503
+MD5 5f97e4d78b855eae89899058a0fa855e files/digest-ivtv-0.3.8 132
+MD5 d1e2b26c51bdb67983cf3194153edb7b files/ivtv 63
 MD5 994d47620b6a826a5d2cf84b3cb1bc5c files/digest-ivtv-0.2.0_rc3-r4 134
 MD5 5458ad51769cecb853e0afb00ab63930 files/digest-ivtv-0.2.0_rc3-r5 134
-MD5 a8e5872e973e678055f33614dec981c0 files/digest-ivtv-0.3.7c 130
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKQyPBtvusYtCZMsRAkHRAJ0VagupLbEX88zjFYOmF2UhMs1TuQCbBp6t
+n3jFsFIxPM23LOBuAupEdo4=
+=goiu
+-----END PGP SIGNATURE-----

diff --git a/media-tv/ivtv/files/digest-ivtv-0.3.7c b/media-tv/ivtv/files/digest-ivtv-0.3.8
similarity index 53%
rename from media-tv/ivtv/files/digest-ivtv-0.3.7c
rename to media-tv/ivtv/files/digest-ivtv-0.3.8
index 4dbf8e674d7a55ed6de252ae76dc128c8fcdc905..58023b1f87217b59cfcd9bd8318513f71be2327b 100644 (file)
--- a/media-tv/ivtv/files/digest-ivtv-0.3.7c
+++ b/media-tv/ivtv/files/digest-ivtv-0.3.8
@@ -1,2 +1,2 @@
-MD5 c6dc03b82fb386ba7488d12014a7474d ivtv-0.3.7c.tgz 665905
+MD5 6b03f5253f70cb9e4e32c3de835708f3 ivtv-0.3.8.tar.gz 484009
 MD5 173c5ce2c0f16da42a5316ef7cee6834 pvr_1.18.21.22168_inf.zip 676578

diff --git a/media-tv/ivtv/files/ivtv b/media-tv/ivtv/files/ivtv
new file mode 100644 (file)
index 0000000..4afb4e7
--- /dev/null
+++ b/media-tv/ivtv/files/ivtv
@@ -0,0 +1,3 @@
+alias char-major-81     videodev
+alias char-major-81-0   ivtv
+

diff --git a/media-tv/ivtv/ivtv-0.3.7c.ebuild b/media-tv/ivtv/ivtv-0.3.8.ebuild
similarity index 66%
rename from media-tv/ivtv/ivtv-0.3.7c.ebuild
rename to media-tv/ivtv/ivtv-0.3.8.ebuild
index 0594feb78f0779774351eebb1f68d402d839c096..ee506670e7a2ff874f1e08b91386b2a2baaf4135 100644 (file)
--- a/media-tv/ivtv/ivtv-0.3.7c.ebuild
+++ b/media-tv/ivtv/ivtv-0.3.8.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.3.7c.ebuild,v 1.3 2005/08/17 05:30:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/ivtv/ivtv-0.3.8.ebuild,v 1.1 2005/09/15 05:53:56 cardoe Exp $
 
 inherit eutils linux-mod
 
 DESCRIPTION="ivtv driver for Hauppauge PVR PCI cards"
-HOMEPAGE="http://ivtv.writeme.ch"
+HOMEPAGE="http://www.ivtvdriver.org"
 
-MY_P="${P/_/-}"
 FW_VER="pvr_1.18.21.22168_inf.zip"
 
-SRC_URI="http://www.ivtv.tv/releases/ivtv-0.3/${MY_P}.tgz
+SRC_URI="http://dl.ivtvdriver.org/${PN}/${P}.tar.gz
        ftp://ftp.shspvr.com/download/wintv-pvr_250-350/inf/${FW_VER}"
 
 RESTRICT="nomirror"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-*"
-# THIS EBUILD IS FOR DEVELOPMENT PURPOSES ONLY. IT IS UNSUPPORTED
+KEYWORDS="~x86"
 
 IUSE=""
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${P}"
 
 BUILD_TARGETS="all"
 BUILD_PARAMS="KDIR=${KERNEL_DIR}"
@@ -37,26 +35,19 @@ pkg_setup() {
                saa7127(extra:${S}/driver)
                cx25840(extra:${S}/driver)"
        linux_chkconfig_present FB && MODULE_NAMES="${MODULE_NAMES}"
-
-       einfo "Unsupported development ebuild"
 }
 
 src_unpack() {
-       unpack ${MY_P}.tgz
+       unpack ${P}.tar.gz
 
        sed -e "s:^VERS26=.*:VERS26=${KV_MAJOR}.${KV_MINOR}:g" \
                -i ${S}/driver/Makefile || die "sed failed"
 
-       sed -e "s:^KERNVER = .*:KERNVER = ${KV_FULL}:g" \
-               -i ${S}/driver/Makefile2.* || die "sed failed"
-
        # This powerpc patch patches the source of the driver to disable DMA on ppc,
        # instead PIO is used. Also, it force enables -fsigned-char and does not
        # build some modules that contain x86 asm.
 
-       use ppc && epatch ${FILESDIR}/ppc-odw.patch
-
-       convert_to_m ${S}/driver/Makefile2.6
+       use ppc && epatch ${FILESDIR}/ppc-odw.patch || die "ppc patch failed"
 }
 
 src_compile() {
@@ -64,7 +55,7 @@ src_compile() {
        linux-mod_src_compile || die "failed to build driver "
 
        cd ${S}/utils
-       make KERNELDIR=${KV_OUT_DIR} ||  die "failed to build utils "
+       emake ||  die "failed to build utils "
 }
 
 src_install() {
@@ -83,33 +74,19 @@ src_install() {
 
        cd ${S}/utils
        #should work... no idea why its not
-       #make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} INSTALLDIR=/usr/bin install-sane || die "failed to install"
-       newbin fwapi ivtv-fwapi
-       newbin radio ivtv-radio
-       dobin ivtvctl
+       make KERNELDIR=${KERNEL_DIR} DESTDIR=${D} INSTALLDIR=/usr/bin install || die "failed to install"
 
        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
 
-       einfo "You now have a driver for the Hauppauge PVR PCI cards."
-       echo
-       einfo "In general, the following instructions suffice to conclude the"
-       einfo "installation. For more detailed instructions, please refer to the"
-       einfo "ivtv wiki listed as the home page of this ebuild."
-       echo
-       einfo "1) Ignore the above commands, only add 'ivtv' to /etc/modules.autoload.d/kernel-2.X"
-       echo
-       einfo "2) Also add a files called 'ivtv' to /etc/modules.d which contains"
-       einfo "   the two lines:"
-       einfo "     alias char-major-81 videodev"
-       einfo "     alias char-major-81-0 ivtv"
-       echo
-       einfo "3) Then perform a 'update-modules'."
-       echo
        # 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