moved to media-tv

52 files changed, 1447 insertions, 47 deletions

diff --git a/media-tv/aatv/ChangeLog b/media-tv/aatv/ChangeLog
new file mode 100644
index 000000000000..63e0dc4fd040
--- /dev/null
+++ b/media-tv/aatv/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for media-tv/aatv
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/aatv/ChangeLog,v 1.1 2003/06/18 11:58:24 seemant Exp $
+
+*aatv-0.2 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> aatv-0.2.ebuild:
+  moved to media-tv
+
+*aatv-0.2 (11 Feb 2003)
+
+  11 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ChangeLog
+  aatv-0.2.ebuild files/digest-aatv-0.2 :
+
+  new ebuild for watching tv in console, using aalib. Thanks to: Matthias
+  Schwarzott <zzam@gmx.de> in bug #14997
diff --git a/media-tv/aatv/Manifest b/media-tv/aatv/Manifest
index b8a93e2bca76..45a930cf2794 100644
--- a/media-tv/aatv/Manifest
+++ b/media-tv/aatv/Manifest
@@ -1,3 +1,3 @@
-MD5 33595990a0fd00a1321ce5409e1d66a9 ChangeLog 460
-MD5 b8e5bc8bfbe7ff9c2daaf33f8ea73727 aatv-0.2.ebuild 577
+MD5 0ec1a6b2ac1e34a0043e578f3b27f00d aatv-0.2.ebuild 574
+MD5 a405d6a3b0e44770f63b46b9a0a0851a ChangeLog 569
 MD5 78b9cf8f2d537196234368b751d23c0f files/digest-aatv-0.2 59
diff --git a/media-tv/aatv/aatv-0.2.ebuild b/media-tv/aatv/aatv-0.2.ebuild
new file mode 100644
index 000000000000..fde046905c54
--- /dev/null
+++ b/media-tv/aatv/aatv-0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/aatv/aatv-0.2.ebuild,v 1.1 2003/06/18 11:58:24 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="watch TV on a text console rendered by aalib"
+HOMEPAGE="http://n00n.free.fr/aatv/"
+SRC_URI="http://n00n.free.fr/aatv/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="media-libs/aalib"
+
+src_install () {
+	make DESTDIR=${D} AATV_CONFIGFILE=${D}/etc/${PN}.conf install || die
+
+	dodoc AUTHORS NEWS README TODO
+}
diff --git a/media-tv/aatv/files/digest-aatv-0.2 b/media-tv/aatv/files/digest-aatv-0.2
new file mode 100644
index 000000000000..231328fd107f
--- /dev/null
+++ b/media-tv/aatv/files/digest-aatv-0.2
@@ -0,0 +1 @@
+MD5 e078855d098de93b52884d654a658753 aatv-0.2.tar.gz 56324
diff --git a/media-tv/atitvout/ChangeLog b/media-tv/atitvout/ChangeLog
new file mode 100644
index 000000000000..9c8f8d825c6a
--- /dev/null
+++ b/media-tv/atitvout/ChangeLog
@@ -0,0 +1,17 @@
+# ChangeLog for media-tv/atitvout
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/atitvout/ChangeLog,v 1.1 2003/06/18 11:58:44 seemant Exp $
+
+*atitvout-0.4 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> atitvout-0.4.ebuild:
+  moved to media-tv
+
+  05 Dez 2002; Hanno Boeck <hanno@gentoo.org> :
+  Moved from sys-apps/atitvout to media-tv/atitvout.
+  Resolves bug #11518.
+
+*atitvout-0.4 (07 Nov 2002)
+
+  07 Nov 2002; Hanno Boeck <hanno@gentoo.org> atitvout-0.4.ebuild :
+  Added ebuild for atitvout, a little tool to enable the TV-Out of ATI cards.
diff --git a/media-tv/atitvout/Manifest b/media-tv/atitvout/Manifest
index 0e0d7d9b797c..a9088170aa30 100644
--- a/media-tv/atitvout/Manifest
+++ b/media-tv/atitvout/Manifest
@@ -1,3 +1,3 @@
-MD5 c60f00abd636c7475b00b6eee25e6507 ChangeLog 525
-MD5 b0a6daa14186edd777e31299a5c7932c atitvout-0.4.ebuild 670
+MD5 98690e6527f396e8409b0f4e07e0d4ca atitvout-0.4.ebuild 669
+MD5 54e781a0773c4d82f6f88197d89b5aae ChangeLog 640
 MD5 6638c15e609de98272dd13d9003af123 files/digest-atitvout-0.4 63
diff --git a/media-tv/atitvout/atitvout-0.4.ebuild b/media-tv/atitvout/atitvout-0.4.ebuild
new file mode 100644
index 000000000000..fdf91b22874e
--- /dev/null
+++ b/media-tv/atitvout/atitvout-0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/atitvout/atitvout-0.4.ebuild,v 1.1 2003/06/18 11:58:44 seemant Exp $
+
+DESCRIPTION="Linux ATI TV Out support program"
+HOMEPAGE="http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/"
+SRC_URI="http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/${P}.tar.gz"
+IUSE=""
+KEYWORDS="x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	sys-libs/lrmi"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin atitvout
+	dodoc HARDWARE README
+}
diff --git a/media-tv/atitvout/files/digest-atitvout-0.4 b/media-tv/atitvout/files/digest-atitvout-0.4
new file mode 100644
index 000000000000..b74526c9cd7f
--- /dev/null
+++ b/media-tv/atitvout/files/digest-atitvout-0.4
@@ -0,0 +1 @@
+MD5 f2915a435844aadcd4d8f9f62411283b atitvout-0.4.tar.gz 27163
diff --git a/media-tv/kwintv/ChangeLog b/media-tv/kwintv/ChangeLog
new file mode 100644
index 000000000000..c29055d4843b
--- /dev/null
+++ b/media-tv/kwintv/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for media-tv/kwintv
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kwintv/ChangeLog,v 1.1 2003/06/18 11:59:01 seemant Exp $
+
+*kwintv-0.8.11 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> kwintv-0.8.11.ebuild:
+  moved to media-tv
+
+*kwintv-0.8.11 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/media-tv/kwintv/Manifest b/media-tv/kwintv/Manifest
index e11dac56bf52..05d93a179bcb 100644
--- a/media-tv/kwintv/Manifest
+++ b/media-tv/kwintv/Manifest
@@ -1,3 +1,3 @@
-MD5 695b56d0e4f09d1ac21cebd62b097c03 ChangeLog 679
-MD5 323cc719333ddde7e023e43bb1b033c3 kwintv-0.8.11.ebuild 475
+MD5 850c66b308fbc47122cb6281f474a9d4 kwintv-0.8.11.ebuild 473
+MD5 f15e902a32ca48dab8679b73a3cd8930 ChangeLog 799
 MD5 542e96a3373aaf07c27fa8b5b74509a7 files/digest-kwintv-0.8.11 66
diff --git a/media-tv/kwintv/files/digest-kwintv-0.8.11 b/media-tv/kwintv/files/digest-kwintv-0.8.11
new file mode 100644
index 000000000000..a70dadb7f5b0
--- /dev/null
+++ b/media-tv/kwintv/files/digest-kwintv-0.8.11
@@ -0,0 +1 @@
+MD5 d9e4d098b05e54cc51488df860cd9218 kwintv-0.8.11.tar.bz2 697144
diff --git a/media-tv/kwintv/kwintv-0.8.11.ebuild b/media-tv/kwintv/kwintv-0.8.11.ebuild
new file mode 100644
index 000000000000..c624e3927d79
--- /dev/null
+++ b/media-tv/kwintv/kwintv-0.8.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kwintv/kwintv-0.8.11.ebuild,v 1.1 2003/06/18 11:59:01 seemant Exp $
+
+inherit kde-base || die
+
+need-kde 2.1
+
+
+LICENSE="GPL-2"
+KEYWORDS="x86"
+DESCRIPTION="a KDE application that allows you to watch television."
+SRC_URI="http://www.staikos.on.ca/~staikos/kwintv/latest/${P}.tar.bz2"
+HOMEPAGE="http://www.kwintv.org"
diff --git a/media-tv/linuxtv-dvb/ChangeLog b/media-tv/linuxtv-dvb/ChangeLog
new file mode 100644
index 000000000000..05bf23b7daca
--- /dev/null
+++ b/media-tv/linuxtv-dvb/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for media-tv/linuxtv-dvb
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/ChangeLog,v 1.1 2003/06/18 11:59:10 seemant Exp $
+
+*linuxtv-dvb-1.0.0_pre2-r1 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2-r1.ebuild, linuxtv-dvb-1.0.0_pre2-r2.ebuild,
+  files/dvb:
+  moved to media-tv
+
+*linuxtv-dvb-1.0.0_pre2-r2 (03 Apr 2003)
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2-r2.ebuild, files/dvb:
+  Added file for autoload all modules. Thx to Ronald Steininger
+  (ronald.steininger@gmx.at) for submitting in #18055
+
+*linuxtv-dvb-1.0.0_pre2-r1 (25 Mar 2003)
+  25 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org>
+  new release to fix bug #18100 (dvbnet installed in /dvbnet)
+	
+*linuxtv-dvb-1.0.0_pre2 (19 Mar 2003)
+
+  22 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2.ebuild:
+  added more docs and einfos to make it userfriendly
+
+  19 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2.ebuild:
+  Added info for your kernel config.
+
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org>
+  linuxtv-dvb-1.0.0_pre2.ebuild : Added virtual/linux-sources to DEPEND.
+
+  06 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org>: linuxtv-dvb-1.0.0_pre2:
+  initial ebuild
diff --git a/media-tv/linuxtv-dvb/Manifest b/media-tv/linuxtv-dvb/Manifest
index 0c6fa07efd99..41886bcb947d 100644
--- a/media-tv/linuxtv-dvb/Manifest
+++ b/media-tv/linuxtv-dvb/Manifest
@@ -1,6 +1,6 @@
-MD5 10c147173d5e143c6e2e62f8d91c620a ChangeLog 1165
-MD5 e78a9f7b79d684397b708c5266ec2066 linuxtv-dvb-1.0.0_pre2-r1.ebuild 3054
-MD5 a8a0583b1afdd00108a05eda7607dc08 linuxtv-dvb-1.0.0_pre2-r2.ebuild 3300
+MD5 fd619d32823c9423ab31698432d50cb4 linuxtv-dvb-1.0.0_pre2-r2.ebuild 3297
+MD5 72180e307c468d76b79cd3d59f82fb9c linuxtv-dvb-1.0.0_pre2-r1.ebuild 3051
+MD5 f1f99aaec97e539697705225c4e75524 ChangeLog 1357
+MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
 MD5 f7b660880f7e9eb4f5fdafaf794dfbe6 files/digest-linuxtv-dvb-1.0.0_pre2-r1 74
 MD5 66b431d6eaf4602db12b6c0647ee70f9 files/digest-linuxtv-dvb-1.0.0_pre2-r2 202
-MD5 e1f301cd0191586916bc7c3cd2b02288 files/dvb 179
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1
new file mode 100644
index 000000000000..aca5e6ecbd81
--- /dev/null
+++ b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r1
@@ -0,0 +1 @@
+MD5 ebe57b9cd27535c98df4017abff6d20f linuxtv-dvb-1.0.0-pre2.tar.gz 627453
diff --git a/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2 b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2
new file mode 100644
index 000000000000..b08481898008
--- /dev/null
+++ b/media-tv/linuxtv-dvb/files/digest-linuxtv-dvb-1.0.0_pre2-r2
@@ -0,0 +1,3 @@
+MD5 e1f301cd0191586916bc7c3cd2b02288 /files/dvb 179
+MD5 a8a0583b1afdd00108a05eda7607dc08 /linuxtv-dvb-1.0.0_pre2-r2.ebuild 3300
+MD5 ebe57b9cd27535c98df4017abff6d20f linuxtv-dvb-1.0.0-pre2.tar.gz 627453
diff --git a/media-tv/linuxtv-dvb/files/dvb b/media-tv/linuxtv-dvb/files/dvb
new file mode 100644
index 000000000000..acecff0d0742
--- /dev/null
+++ b/media-tv/linuxtv-dvb/files/dvb
@@ -0,0 +1,4 @@
+probeall /dev/dvb dvb-ttpci
+alias /dev/dvb/* /dev/dvb
+below dvb-ttpci alps_bsrv2 grundig_29504-401 grundig_29504-491 \
+                ves1820 alps_tdmb7 alps_tdlb7 stv0299 evdev
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild
new file mode 100644
index 000000000000..d0f9d9ad70aa
--- /dev/null
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r1.ebuild,v 1.1 2003/06/18 11:59:10 seemant Exp $
+
+DESCRIPTION="Standalone DVB driver for Linux kernel 2.4.x"
+HOMEPAGE="http://www.linuxtv.org"
+SRC_URI="http://www.linuxtv.org/download/dvb/${PN}-1.0.0-pre2.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="virtual/linux-sources"
+#RDEPEND=""
+S=${WORKDIR}/${PN}-1.0.0-pre2
+
+pkg_setup() {
+	einfo ""
+	einfo "Please make sure that the following option is enabled"
+	einfo "in your current kernel 'Multimedia devices'"
+	einfo "and /usr/src/linux point's to your current kernel"
+	einfo ""
+}
+
+src_compile() {
+    emake
+}
+
+src_install() {
+    # install the driver
+    cd ${S}/driver
+    mv Makefile Makefile.orig
+    # don't run depmod now!
+    sed s/'depmod'/'#depmod'/ Makefile.orig > Makefile
+    make DESTDIR=${D} install || die
+
+    # install av7110_loadkeys
+    dobin ${S}/apps/av7110_loadkeys/av7110_loadkeys \
+	  ${S}/apps/av7110_loadkeys/evtest
+
+    # install dvbnet
+    cd ${S}/apps/dvbnet
+    make DESTDIR=${D}usr/bin install || die
+
+    # install scan
+    dobin ${S}/apps/scan/scan
+
+    # install szap
+    dobin ${S}/apps/szap/[tsc]zap
+	dodoc ${S}/apps/szap/channels.conf-dvb*
+
+    # 'install' test
+    dodir /usr/share/doc/${P}/test
+    insinto /usr/share/doc/${P}/test
+    doins ${S}/apps/test/*
+
+    # install headers
+    dodir /usr/include/linux
+    insinto /usr/include/linux
+    doins ${S}/include/linux/em8300.h
+
+    dodir /usr/include/linux/dvb
+    insinto /usr/include/linux/dvb
+    doins ${S}/include/linux/dvb/*.h
+
+
+    # install docs
+    dodoc ${S}/doc/* 
+    dodoc ${S}/driver/makedev.napi
+	dodir /usr/share/doc/${P}/dvbapi
+	insinto /usr/share/doc/${P}/dvbapi
+	doins ${S}/doc/dvbapi/*
+
+    # install av7110_loadkeys docs
+    dodir /usr/share/doc/${P}/av7110_loadkeys
+    insinto /usr/share/doc/${P}/av7110_loadkeys
+    cd ${S}/apps/av7110_loadkeys
+    doins README *.rc5 *.rcmm
+
+    # install dvbnet scripts
+    dodir /usr/share/doc/${P}/dvbnet
+    insinto /usr/share/doc/${P}/dvbnet
+    doins ${S}/apps/dvbnet/net_start.*
+
+    # install scan docs
+    dodir /usr/share/doc/${P}/scan
+    insinto /usr/share/doc/${P}/scan
+    doins ${S}/apps/scan/README
+
+    # install test docs
+    dodir /usr/share/doc/${P}/test
+    insinto /usr/share/doc/${P}/test
+    doins ${S}/apps/test/README
+	
+	cd ${S}
+	dodoc CONTRIBUTORS COPYING INSTALL README NEWS BUGS
+
+}
+
+pkg_postinst() {
+    depmod -a
+	einfo ""
+    einfo "If you don't use devfs, execute makedev.napi o create"
+    einfo "the device nodes. The file is in /usr/share/doc/${PV}/"
+	einfo ""
+ 	einfo "now copy an appropriate from"
+	einfo "/usr/share/doc/${P}/channels.conf-XXX"
+	einfo "channel list for DVB-S/C/T"
+    einfo "		to ~/.szap/channels.conf"
+	einfo "		~/.czap/channels.conf"
+	einfo "		~/.tzap/channels.conf"
+	einfo "and then call szap for DVB-S, czap for DVB-C or tzap for DVB-T"
+	einfo ""
+}
+
+pkg_postrm() {
+    depmod -a
+}
diff --git a/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild
new file mode 100644
index 000000000000..a866001de34c
--- /dev/null
+++ b/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb/linuxtv-dvb-1.0.0_pre2-r2.ebuild,v 1.1 2003/06/18 11:59:10 seemant Exp $
+
+DESCRIPTION="Standalone DVB driver for Linux kernel 2.4.x"
+HOMEPAGE="http://www.linuxtv.org"
+SRC_URI="http://www.linuxtv.org/download/dvb/${PN}-1.0.0-pre2.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="virtual/linux-sources"
+#RDEPEND=""
+S=${WORKDIR}/${PN}-1.0.0-pre2
+
+pkg_setup() {
+	einfo ""
+	einfo "Please make sure that the following option is enabled"
+	einfo "in your current kernel 'Multimedia devices'"
+	einfo "and /usr/src/linux point's to your current kernel"
+	einfo "or make will die."
+	einfo ""
+}
+
+src_compile() {
+    emake
+}
+
+src_install() {
+    # install the driver
+    cd ${S}/driver
+    mv Makefile Makefile.orig
+    # don't run depmod now!
+    sed s/'depmod'/'#depmod'/ Makefile.orig > Makefile
+    make DESTDIR=${D} install || die
+
+    # install av7110_loadkeys
+    dobin ${S}/apps/av7110_loadkeys/av7110_loadkeys \
+	  ${S}/apps/av7110_loadkeys/evtest
+
+    # install dvbnet
+    cd ${S}/apps/dvbnet
+    make DESTDIR=${D}usr/bin install || die
+
+    # install scan
+    dobin ${S}/apps/scan/scan
+
+    # install szap
+    dobin ${S}/apps/szap/[tsc]zap
+	dodoc ${S}/apps/szap/channels.conf-dvb*
+
+    # 'install' test
+    dodir /usr/share/doc/${P}/test
+    insinto /usr/share/doc/${P}/test
+    doins ${S}/apps/test/*
+
+    # install headers
+    dodir /usr/include/linux
+    insinto /usr/include/linux
+    doins ${S}/include/linux/em8300.h
+
+    dodir /usr/include/linux/dvb
+    insinto /usr/include/linux/dvb
+    doins ${S}/include/linux/dvb/*.h
+
+
+    # install docs
+    dodoc ${S}/doc/* 
+    dodoc ${S}/driver/makedev.napi
+	dodir /usr/share/doc/${P}/dvbapi
+	insinto /usr/share/doc/${P}/dvbapi
+	doins ${S}/doc/dvbapi/*
+
+    # install av7110_loadkeys docs
+    dodir /usr/share/doc/${P}/av7110_loadkeys
+    insinto /usr/share/doc/${P}/av7110_loadkeys
+    cd ${S}/apps/av7110_loadkeys
+    doins README *.rc5 *.rcmm
+
+    # install dvbnet scripts
+    dodir /usr/share/doc/${P}/dvbnet
+    insinto /usr/share/doc/${P}/dvbnet
+    doins ${S}/apps/dvbnet/net_start.*
+
+    # install scan docs
+    dodir /usr/share/doc/${P}/scan
+    insinto /usr/share/doc/${P}/scan
+    doins ${S}/apps/scan/README
+
+    # install test docs
+    dodir /usr/share/doc/${P}/test
+    insinto /usr/share/doc/${P}/test
+    doins ${S}/apps/test/README
+	
+	cd ${S}
+	dodoc CONTRIBUTORS COPYING INSTALL README NEWS BUGS
+	dodoc ${FILESDIR}/dvb
+
+}
+
+pkg_postinst() {
+    depmod -a
+	einfo ""
+    einfo "If you don't use devfs, execute makedev.napi o create"
+    einfo "the device nodes. The file is in /usr/share/doc/${PV}/"
+	einfo ""
+ 	einfo "now copy an appropriate from"
+	einfo "/usr/share/doc/${PF}/channels.conf-XXX"
+	einfo "channel list for DVB-S/C/T"
+    einfo "		to ~/.szap/channels.conf"
+	einfo "		~/.czap/channels.conf"
+	einfo "		~/.tzap/channels.conf"
+	einfo "and then call szap for DVB-S, czap for DVB-C or tzap for DVB-T"
+	einfo ""
+	einfo "If you'd like to load all modules at once, unpack and add"
+	einfo "/usr/share/doc/${PF}/dvb.gz to /etc/modules.d/"
+	einfo "then run #update-modules to update your modules.conf"
+	einfo ""
+}
+
+pkg_postrm() {
+    depmod -a
+}
diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
new file mode 100644
index 000000000000..2e0df5c989b8
--- /dev/null
+++ b/media-tv/nvtv/ChangeLog
@@ -0,0 +1,40 @@
+# ChangeLog for media-tv/nvtv
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.1 2003/06/18 11:59:23 seemant Exp $
+
+*nvtv-0.4.4 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> nvtv-0.4.4.ebuild,
+  files/nvtv.start:
+  moved to media-tv
+
+*nvtv-0.4.4 (16 Mar 2003)
+
+  16 Mar 2003; phoen][x <phoenix@gentoo.org> nvtv-0.4.4.ebuild :
+  Version bump.
+
+*nvtv-0.4.3-0 (10 Feb 2003)
+
+  10 Feb 2003; B.Lauwers <blauwers@gentoo.org> nvtv-0.4.3.ebuild :
+  New version from prior ebuild
+
+*nvtv-4.2.0-0 (09 Dec 2002)
+
+  17 Dec 2002; B.Lauwers <blauwers@gentoo.org> nvtv-0.4.2r1.ebuild :
+  Depency bug fixed per Bug#12067
+
+  9 Dec 2002; B.Lauwers <blauwers@gentoo.org> nvtv-0.4.2.ebuild :
+  New version from prior ebuild plus various cleanups
+
+*nvtv-0.4.0-0 (04 Jun 2002)
+
+  4 Jun 2002; B.Lauwers <blauwers@gentoo.org> nvtv-0.4.0.ebuild :
+  New version from prior ebuild plus various cleanups
+
+*nvtv-0.3.0-0 (03 May 2002)
+
+  3 May 2002; Arcady Genkin <agenkin@thpoon.com> nvtv-0.3.0.ebuild :
+  Cleaned up a few things.
+
+  3 May 2002; B.Lauwers <blauwers@gentoo.com> ChangeLog, nvtv-0.3.0.ebuild :
+  Intial ebuild for nvtv from http://sourceforge.net/projects/nv-tv-out
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index 5dcf8aa75b12..f1431ca9f354 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -1,12 +1,4 @@
-MD5 87186ee3a56c1f7c5df3fa9f962d0e42 ChangeLog 1132
-MD5 4950392c319991ca7875976ed748f409 nvtv-0.4.0.ebuild 1072
-MD5 5064d7a953a326e4f300d00c9589317a nvtv-0.4.2-r1.ebuild 1181
-MD5 1d9a6a71a5f86ab59ed8b836d380eaf3 nvtv-0.4.2.ebuild 1062
-MD5 690543ea796b2b60cfd7ecbb2628e33c nvtv-0.4.3.ebuild 1178
-MD5 254d60521f583b1e65ca58f2a805add4 nvtv-0.4.4.ebuild 1179
-MD5 60b5426ddb549a68c6b748753d997972 files/digest-nvtv-0.4.0 62
-MD5 57460ca795faa6a6236e75f78a87e3f3 files/digest-nvtv-0.4.2 62
-MD5 57460ca795faa6a6236e75f78a87e3f3 files/digest-nvtv-0.4.2-r1 62
-MD5 fb73360503403af233ab9db4afb2e23c files/digest-nvtv-0.4.3 62
+MD5 6e7ed6b686a40817f72c64e3462396fc nvtv-0.4.4.ebuild 1174
+MD5 b1e6f7c646455d478c4b1bc46be05e0f ChangeLog 1265
 MD5 5f2bf6c79b70ba39b3c942a63dc046e9 files/digest-nvtv-0.4.4 62
-MD5 6bf1bc6c8ac044e309137bc96f9a7064 files/nvtv.start 551
+MD5 9ab4a460e891477b0f575c2fb123c641 files/nvtv.start 549
diff --git a/media-tv/nvtv/files/digest-nvtv-0.4.4 b/media-tv/nvtv/files/digest-nvtv-0.4.4
new file mode 100644
index 000000000000..c955f76a363d
--- /dev/null
+++ b/media-tv/nvtv/files/digest-nvtv-0.4.4
@@ -0,0 +1 @@
+MD5 46188ffd2a30ef152f7e3c6dc4bf678a nvtv-0.4.4.tar.gz 763349
diff --git a/media-tv/nvtv/files/nvtv.start b/media-tv/nvtv/files/nvtv.start
new file mode 100644
index 000000000000..ed52011dd66d
--- /dev/null
+++ b/media-tv/nvtv/files/nvtv.start
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/files/nvtv.start,v 1.1 2003/06/18 11:59:23 seemant Exp $
+
+depend() {
+	use modules logger
+}
+
+start() {
+	ebegin "Starting NVidia TV-Out Server"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nvtvd \
+		--background 1>&2
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping NVidia TV-Out Server"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nvtvd 1>&2
+	eend $?
+}
diff --git a/media-tv/nvtv/nvtv-0.4.4.ebuild b/media-tv/nvtv/nvtv-0.4.4.ebuild
new file mode 100644
index 000000000000..8cf27a52a471
--- /dev/null
+++ b/media-tv/nvtv/nvtv-0.4.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.4.ebuild,v 1.1 2003/06/18 11:59:23 seemant Exp $
+
+IUSE="X gtk gtk2"
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="TV-Out for NVidia cards"
+HOMEPAGE="http://sourceforge.net/projects/nv-tv-out/"
+SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="sys-apps/pciutils
+	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk2? ( =x11-libs/gtk+-2* )
+	X? ( >=x11-base/xfree-4.0 )"
+
+src_compile() {
+	local myconf
+
+	if use gtk2; then
+		myconf="${myconf} --with-gtk=gtk2"
+	elif use gtk; then
+		myconf="${myconf} --with-gtk=gtk1"
+	else
+		myconf="${myconf} --without-gtk";
+	fi
+
+	use X && myconf="${myconf} --with-x" || myconf="${myconf} --without-x"
+
+	econf ${myconf}
+
+	# The CFLAGS don't seem to make it into the Makefile.
+	cd src
+	emake CXFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dobin src/nvtv
+	dosbin src/nvtvd
+
+	dodoc ANNOUNCE BUGS FAQ INSTALL README \
+		doc/USAGE doc/chips.txt doc/overview.txt \
+		doc/timing.txt xine/tvxine
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/nvtv.start nvtv
+}
diff --git a/media-tv/rivatv/ChangeLog b/media-tv/rivatv/ChangeLog
new file mode 100644
index 000000000000..b5beea60914f
--- /dev/null
+++ b/media-tv/rivatv/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for media-tv/rivatv
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/ChangeLog,v 1.1 2003/06/18 11:59:36 seemant Exp $
+
+*rivatv-0.8.1 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> rivatv-0.8.0-r1.ebuild,
+  rivatv-0.8.1.ebuild, rivatv-0.8.2.ebuild:
+  moved to media-tv
+
+  12 Jun 2003; <msterret@gentoo.org> rivatv-0.8.0-r1.ebuild,
+  rivatv-0.8.1.ebuild:
+  fix Header
+
+*rivatv-0.8.2 (10 Feb 2003)
+
+  10 Feb 2003; B.Lauwers <blauwers@gentoo.org> rivatv-0.8.2.ebuild:
+  Version bump from old ebuild to add new driver support and bugfixes
+
+*rivatv-0.8.1 (09 Dec 2002)
+
+  9 Dec 2002; B.Lauwers <blauwers@gentoo.org> rivatv-0.8.1.ebuild:
+
+  Version bump from old ebuild to add new driver support and bugfixes
+
+*rivatv-0.8.0 (16 Jun 2002)
+
+  16 June 2002; Doug Goldstein (Cardoe) <dougg@ufl.edu> rivatv-0.8.0-r1.ebuild:
+ 
+  cleaned up ebuild and fixed it so it'll actually emerge without giving a whole long error msg
+  about how we changed the kernel ebuild names and then need to be emerged --nodeps to get it to work
+
+*rivatv-0.8.0-0 (07/06/2002)
+
+  7 Jun 2002; B.Lauwers <blauwers@gentoo.org> ChangeLog, rivatv-0.8.0.ebuild :
+  
+  Intial ebuild for rivatv from http://drama.obuda.kando.hu/~fero/cgi-bin/rivatv.php
diff --git a/media-tv/rivatv/Manifest b/media-tv/rivatv/Manifest
index b69044811923..fff16774a102 100644
--- a/media-tv/rivatv/Manifest
+++ b/media-tv/rivatv/Manifest
@@ -1,7 +1,7 @@
-MD5 4c17d1bc8e012d2cc93079a1d6bdc992 ChangeLog 1161
-MD5 18463df326d65c0301677229e74e2c5e rivatv-0.8.0-r1.ebuild 1215
-MD5 0a8ddfe1ecf92fe957a8dde2c8af24b9 rivatv-0.8.1.ebuild 1213
-MD5 2cd90a369739384dccfcc9691aeee4cc rivatv-0.8.2.ebuild 994
-MD5 94dc3c0091e479d11d285de52267521d files/digest-rivatv-0.8.0-r1 63
+MD5 26f4c0813963c615ef19ccb96d57196f rivatv-0.8.2.ebuild 992
+MD5 c5a9ff50ebe1212527c106569ff2f653 rivatv-0.8.0-r1.ebuild 1211
+MD5 6de764daf493b9b7e0406754ea8064e4 rivatv-0.8.1.ebuild 1209
+MD5 11a3d5355bf4d7e4b403bf58dd375336 ChangeLog 1324
 MD5 c70f4f5b9e57a7ab53345aa005ac3733 files/digest-rivatv-0.8.1 64
 MD5 675738a65f00503869783cd7f88ce0b1 files/digest-rivatv-0.8.2 64
+MD5 94dc3c0091e479d11d285de52267521d files/digest-rivatv-0.8.0-r1 63
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.0-r1 b/media-tv/rivatv/files/digest-rivatv-0.8.0-r1
new file mode 100644
index 000000000000..91e5decdb748
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.0-r1
@@ -0,0 +1 @@
+MD5 b6b86afefa0735fb4948486983949a28 rivatv-0.8.0.tar.gz 87030
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.1 b/media-tv/rivatv/files/digest-rivatv-0.8.1
new file mode 100644
index 000000000000..18b2f2d2aa66
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.1
@@ -0,0 +1 @@
+MD5 5192518916b4343effadad542fd37734 rivatv-0.8.1.tar.gz 121671
diff --git a/media-tv/rivatv/files/digest-rivatv-0.8.2 b/media-tv/rivatv/files/digest-rivatv-0.8.2
new file mode 100644
index 000000000000..aaaab7f7f088
--- /dev/null
+++ b/media-tv/rivatv/files/digest-rivatv-0.8.2
@@ -0,0 +1 @@
+MD5 4b96cdec91acba3bc007bf8500b6ad71 rivatv-0.8.2.tar.gz 136718
diff --git a/media-tv/rivatv/rivatv-0.8.0-r1.ebuild b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..c77e6021b2d1
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.0-r1.ebuild,v 1.1 2003/06/18 11:59:36 seemant Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
+HOMEPAGE="http://rivatv.sourceforge.net/"
+DEPEND="virtual/x11
+	>=virtual/linux-sources-2.4.17"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+src_compile() {
+	#cd rivatv/linux/drivers/media/video
+	emake KERNEL="/usr/src/linux" || die
+}
+
+src_install () {
+	insinto /lib/modules/${KV}/kernel/drivers/media/video
+	doins *.o
+
+	dodoc README
+}
+
+pkg_postinst() {
+	depmod -a
+	einfo "You will need support for videodev, i2c-core, i2c-algo-bit"
+	einfo "for this driver to work, plus your cards' specific modules"
+	einfo "from /lib/modules/${KV}/kernel/drivers/media/video"
+	einfo
+	einfo "To load the module automatically at boot up, add these and"
+	einfo "\"rivatv\" to your /etc/modules.autoload."
+	einfo
+	einfo "Also, see ${HOMEPAGE} for more information."
+	einfo
+	einfo "NOTE: Your kernel must not include framebuffer support."
+}
diff --git a/media-tv/rivatv/rivatv-0.8.1.ebuild b/media-tv/rivatv/rivatv-0.8.1.ebuild
new file mode 100644
index 000000000000..21d3acbd7f06
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.1.ebuild,v 1.1 2003/06/18 11:59:36 seemant Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
+HOMEPAGE="http://rivatv.sourceforge.net/"
+DEPEND="virtual/x11
+	>=virtual/linux-sources-2.4.17"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+src_compile() {
+	#cd rivatv/linux/drivers/media/video
+	emake KERNEL="/usr/src/linux" || die
+}
+
+src_install () {
+	insinto /lib/modules/${KV}/kernel/drivers/media/video
+	doins *.o
+
+	dodoc README
+}
+
+pkg_postinst() {
+	depmod -a
+	einfo "You will need support for videodev, i2c-core, i2c-algo-bit"
+	einfo "for this driver to work, plus your cards' specific modules"
+	einfo "from /lib/modules/${KV}/kernel/drivers/media/video"
+	einfo
+	einfo "To load the module automatically at boot up, add these and"
+	einfo "\"rivatv\" to your /etc/modules.autoload."
+	einfo
+	einfo "Also, see ${HOMEPAGE} for more information."
+	einfo
+	einfo "NOTE: Your kernel must not include framebuffer support."
+}
diff --git a/media-tv/rivatv/rivatv-0.8.2.ebuild b/media-tv/rivatv/rivatv-0.8.2.ebuild
new file mode 100644
index 000000000000..52a35467d648
--- /dev/null
+++ b/media-tv/rivatv/rivatv-0.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/rivatv/rivatv-0.8.2.ebuild,v 1.1 2003/06/18 11:59:36 seemant Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="kernel driver for nVidia based cards with video-in"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/rivatv/${P/_/-}.tar.gz"
+HOMEPAGE="http://rivatv.sourceforge.net/"
+DEPEND="virtual/x11
+	>=virtual/linux-sources-2.4.17"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+src_compile() {
+	#cd rivatv/linux/drivers/media/video
+	econf || die
+	emake || die
+}
+
+src_install () {
+	modp=`awk '/^MODULES/{ print "'${D}'"  $3}' Makefile` || die
+	mkdir -p ${modp} || die
+	emake MODULES=${modp} DEPMOD=":" install || die
+	dodoc README
+}
+
+pkg_postinst() {
+	depmod -a
+	einfo "To load the module automatically at boot up, add these and"
+	einfo "\"rivatv\" to your /etc/modules.autoload."
+	einfo
+	einfo "Also, see ${HOMEPAGE} for more information."
+}
diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
new file mode 100644
index 000000000000..1d4b0bdc481d
--- /dev/null
+++ b/media-tv/tvtime/ChangeLog
@@ -0,0 +1,49 @@
+# ChangeLog for media-tv/tvtime
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header
+
+*tvtime-0.9.8.2 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> tvtime-0.9.8.1.ebuild,
+  tvtime-0.9.8.2.ebuild:
+  moved to media-tv
+
+  12 Jun 2003; <msterret@gentoo.org> tvtime-0.9.5.ebuild, tvtime-0.9.6.ebuild,
+  tvtime-0.9.7.ebuild, tvtime-0.9.8.1.ebuild, tvtime-0.9.8.2.ebuild:
+  fix Header
+
+*tvtime-0.9.8.2 (09 May 2003)
+
+  09 May 2003; mkeadle <mkeadle@gentoo.org> tvtime-0.9.8.2.ebuild
+  Bump to latest release. Fixes issues with gcc 2.95x and now
+  pulls in all required deps. lirc will only be installed if lirc
+  is set in use (bug #20653).
+
+*tvtime-0.9.8.1 (07 May 2003)
+
+  07 May 2003; mkeadle <mkeadle@gentoo.org> tvtime-0.9.8.1.ebuild
+  Bump to latest release. Config files changing to XML so they need
+  to be looked at.
+
+*tvtime-0.9.7 (01 Mar 2003)
+
+  01 Mar 2003; Matt Keadle <mkeadle@gentoo.org> tvtime-0.9.7.ebuild
+  files/digest-tvtime-0.9.7 :
+
+  Bump to latest release. Default /etc/tvtime/tvtimerc is now installed
+  as well as the man pages
+
+*tvtime-0.9.6 (13 Dec 2002)
+
+  13 Dec 2002; Matt Keadle <mkeadle@gentoo.org> tvtime-0.9.6.ebuild
+  files/digest-tvtime-0.9.6
+
+  Bump to latest stable
+
+*tvtime-0.9.5 (6 Nov 2002)
+  
+  6 Nov 2002; Matt Keadle <mkeadle@gentoo.org> tvtime-0.9.5.ebuild
+  ChangeLog files/digest-tvtime-0.9.5:
+
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way.
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index e1b9b93d127e..c77f0a5dc134 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,11 +1,5 @@
-MD5 19e42bb5c8ac87c431cc3db83dc6a6df ChangeLog 1339
-MD5 09f88be581b4f86124de598e05401819 tvtime-0.9.5.ebuild 774
-MD5 33c2a52dbdd0fcdcbbad9a57f462f280 tvtime-0.9.6.ebuild 774
-MD5 327371890545930b315a47e26c275d93 tvtime-0.9.7.ebuild 1008
-MD5 cabdd2627494bc3b10bdac9df77fe9fa tvtime-0.9.8.1.ebuild 1258
-MD5 7b9f2d88a71e300486679f05bd4c0226 tvtime-0.9.8.2.ebuild 1354
-MD5 3169d594d875731a2d9bb1605fbe6f9e files/digest-tvtime-0.9.5 64
-MD5 222b234af2891e79dc9552128b0d4ddd files/digest-tvtime-0.9.6 64
-MD5 6317dd2793a6d0b5ff7d48c0108a5c53 files/digest-tvtime-0.9.7 65
+MD5 af2eeabfd4b3acc0f7073a9869e3be0d tvtime-0.9.8.2.ebuild 1350
+MD5 457f17342a796e215ad511e29d44a551 tvtime-0.9.8.1.ebuild 1254
+MD5 07444db6c0aee49673a02b3b2a2e718a ChangeLog 1488
 MD5 97fca80da78d36caaf4e11df40e10404 files/digest-tvtime-0.9.8.1 67
 MD5 c83d458bba6126a4d0e6b941654ce549 files/digest-tvtime-0.9.8.2 67
diff --git a/media-tv/tvtime/files/digest-tvtime-0.9.8.1 b/media-tv/tvtime/files/digest-tvtime-0.9.8.1
new file mode 100644
index 000000000000..43f1c854c41d
--- /dev/null
+++ b/media-tv/tvtime/files/digest-tvtime-0.9.8.1
@@ -0,0 +1 @@
+MD5 7033699e348b4d5cbd5b575f81adc09f tvtime-0.9.8.1.tar.gz 5466530
diff --git a/media-tv/tvtime/files/digest-tvtime-0.9.8.2 b/media-tv/tvtime/files/digest-tvtime-0.9.8.2
new file mode 100644
index 000000000000..52d214b5f892
--- /dev/null
+++ b/media-tv/tvtime/files/digest-tvtime-0.9.8.2
@@ -0,0 +1 @@
+MD5 aa8edf485e18a940fbfc2e2efc9a85a8 tvtime-0.9.8.2.tar.gz 5467869
diff --git a/media-tv/tvtime/tvtime-0.9.8.1.ebuild b/media-tv/tvtime/tvtime-0.9.8.1.ebuild
new file mode 100644
index 000000000000..7497307cca02
--- /dev/null
+++ b/media-tv/tvtime/tvtime-0.9.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.8.1.ebuild,v 1.1 2003/06/18 11:59:47 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="High quality television application for use with video capture cards."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://tvtime.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SLOT="0"
+
+IUSE=""
+
+DEPEND="virtual/x11
+		app-misc/lirc"
+
+src_compile() {
+
+	econf || die
+	emake || die
+	
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog AUTHORS NEWS README
+	cd docs
+	doman tvtime.1 tvtime.xml.5 tvtime-command.1 stationlist.xml.5
+	insinto /etc/tvtime
+	newins default.tvtime.xml tvtime.xml
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "              :: !!Attention!! ::"
+	ewarn "The format of the config file has changed since the"
+	ewarn "last version. Please migrate your changes to the"
+	ewarn "new format!"
+	ewarn
+	einfo "A default setup for ${PN} has been saved as"
+	einfo "/etc/tvtime/tvtime.xml. You may need to modify it"
+	einfo "for your needs."
+	einfo
+	einfo "Detailed information on ${PN} setup can be"
+	einfo "found at ${HOMEPAGE}help.html"
+	einfo
+}
diff --git a/media-tv/tvtime/tvtime-0.9.8.2.ebuild b/media-tv/tvtime/tvtime-0.9.8.2.ebuild
new file mode 100644
index 000000000000..3257ae6e0dab
--- /dev/null
+++ b/media-tv/tvtime/tvtime-0.9.8.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-0.9.8.2.ebuild,v 1.1 2003/06/18 11:59:47 seemant Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="High quality television application for use with video capture cards."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://tvtime.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SLOT="0"
+
+IUSE="lirc"
+
+DEPEND="virtual/x11
+		>=media-libs/freetype-2*
+		sys-libs/zlib
+		media-libs/libpng
+		dev-libs/libxml2
+		lirc? ( app-misc/lirc )"
+
+src_compile() {
+
+	econf || die
+	emake || die
+	
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog AUTHORS NEWS README
+	cd docs
+	doman tvtime.1 tvtime.xml.5 tvtime-command.1 stationlist.xml.5
+	insinto /etc/tvtime
+	newins default.tvtime.xml tvtime.xml
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "              :: !!Attention!! ::"
+	ewarn "The format of the config file has changed since the"
+	ewarn "last version. Please migrate your changes to the"
+	ewarn "new format!"
+	ewarn
+	einfo "A default setup for ${PN} has been saved as"
+	einfo "/etc/tvtime/tvtime.xml. You may need to modify it"
+	einfo "for your needs."
+	einfo
+	einfo "Detailed information on ${PN} setup can be"
+	einfo "found at ${HOMEPAGE}help.html"
+	einfo
+}
diff --git a/media-tv/xawdecode/ChangeLog b/media-tv/xawdecode/ChangeLog
new file mode 100644
index 000000000000..4ad1ffc0bc4f
--- /dev/null
+++ b/media-tv/xawdecode/ChangeLog
@@ -0,0 +1,21 @@
+# ChangeLog for media-tv/xawdecode
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/ChangeLog,v 1.1 2003/06/18 12:02:19 seemant Exp $
+
+*xawdecode-1.6.7 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xawdecode-1.6.7.ebuild,
+  xawdecode-1.6.8.ebuild:
+  moved to media-tv
+
+*xawdecode-1.6.8 (18 May 2003)
+
+  18 May 2003; Seemant Kulleen <seemant@gentoo.org> xawdecode-1.6.8.ebuild:
+  version bump, thanks to: Theofilos Intzoglou <oscar10@yifan.net>  in bug #20751
+
+*xawdecode-1.6.7 (16 Mar 2003)
+
+  16 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawdecode-1.6.7.ebuild:
+  new package for TV viewing, thanks to: Christian Loitsch
+  <gentoo-bug@loitsch.org> in bug #9674
+
diff --git a/media-tv/xawdecode/Manifest b/media-tv/xawdecode/Manifest
index 87033c754b15..2e302041729d 100644
--- a/media-tv/xawdecode/Manifest
+++ b/media-tv/xawdecode/Manifest
@@ -1,5 +1,5 @@
-MD5 e6be8f75eca6e74b28f96cb50c840f0b xawdecode-1.6.7.ebuild 1664
-MD5 240855e607baf714e8ed8446572c2a86 ChangeLog 624
-MD5 befae01bd769c67c704a1dd11e4dfb9f xawdecode-1.6.8.ebuild 1664
+MD5 8435e7122bb1a38a29be597b41cf6ce6 xawdecode-1.6.7.ebuild 1661
+MD5 40f0dd4e3f3f0621e478b7932e9c124e ChangeLog 773
+MD5 9fce20192b1ee4c8c3e7980c2327c8da xawdecode-1.6.8.ebuild 1661
 MD5 13b346a7d4513b655067597980af046e files/digest-xawdecode-1.6.7 67
 MD5 7ac89f854fed418595b44f2375de9c8f files/digest-xawdecode-1.6.8 67
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.6.7 b/media-tv/xawdecode/files/digest-xawdecode-1.6.7
new file mode 100644
index 000000000000..6ff37a1c0a62
--- /dev/null
+++ b/media-tv/xawdecode/files/digest-xawdecode-1.6.7
@@ -0,0 +1 @@
+MD5 03f2836ea1820f13c8db5c1b07c329e7 xawdecode-1.6.7.tar.gz 481227
diff --git a/media-tv/xawdecode/files/digest-xawdecode-1.6.8 b/media-tv/xawdecode/files/digest-xawdecode-1.6.8
new file mode 100644
index 000000000000..ac7fa9d57c8f
--- /dev/null
+++ b/media-tv/xawdecode/files/digest-xawdecode-1.6.8
@@ -0,0 +1 @@
+MD5 c386504d4060fcfd7b0291e287be21f1 xawdecode-1.6.8.tar.gz 519543
diff --git a/media-tv/xawdecode/xawdecode-1.6.7.ebuild b/media-tv/xawdecode/xawdecode-1.6.7.ebuild
new file mode 100644
index 000000000000..a35da0893927
--- /dev/null
+++ b/media-tv/xawdecode/xawdecode-1.6.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.6.7.ebuild,v 1.1 2003/06/18 12:02:19 seemant Exp $
+
+inherit eutils
+
+IUSE="alsa jpeg dga encode"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="TV application for the bttv driver allowing decoding"
+HOMEPAGE="http://xawdecode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xawdecode/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=sys-apps/sed-4.0.5"
+
+RDEPEND="virtual/x11
+	media-libs/divx4linux
+	media-video/avifile
+	encode? ( media-sound/lame )
+	jpeg? ( media-libs/jpeg )
+	alsa? ( media-libs/alsa-lib )"
+
+
+src_compile() {
+	local myconf
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use dga \
+		&& myconf="${myconf} --enable-xfree-ext" \
+		|| myconf="${myconf} --disable-xfree-ext"
+
+
+	# if lame is installed xawdecode will use it (there's no configure-flag)
+	# if lirc is installed it will also be used
+	# the same goes for ffmpeg libraries (not media-video/ffmpeg)
+	#   (don't know how to install them)
+
+	econf ${myconf} || die
+
+	emake PERF_FLAGS2="${CFLAGS}" || die
+}
+
+src_install() {
+	
+	sed -i \
+		"s:^SUBDIRS.*:SUBDIRS = alevt src:" Makefile
+	
+	insinto /usr/X11R6/lib/X11/fonts/misc
+	doins font/led-fixed.pcf
+
+	einstall \
+		ROOT=${D} || die
+
+	dodoc COPYING ChangeLog
+	dodoc FAQ* README.* lisez-moi*
+	dodoc xawdecoderc.sample
+
+}
+
+pkg_postinst() {
+	einfo "Please note that this ebuild created a suid-binary: /usr/bin/v4l-conf"
+}
diff --git a/media-tv/xawdecode/xawdecode-1.6.8.ebuild b/media-tv/xawdecode/xawdecode-1.6.8.ebuild
new file mode 100644
index 000000000000..e6e94bfa2e9e
--- /dev/null
+++ b/media-tv/xawdecode/xawdecode-1.6.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawdecode/xawdecode-1.6.8.ebuild,v 1.1 2003/06/18 12:02:19 seemant Exp $
+
+inherit eutils
+
+IUSE="alsa jpeg dga encode"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="TV application for the bttv driver allowing decoding"
+HOMEPAGE="http://xawdecode.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xawdecode/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND=">=sys-apps/sed-4.0.5"
+
+RDEPEND="virtual/x11
+	media-libs/divx4linux
+	media-video/avifile
+	encode? ( media-sound/lame )
+	jpeg? ( media-libs/jpeg )
+	alsa? ( media-libs/alsa-lib )"
+
+
+src_compile() {
+	local myconf
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+	use jpeg \
+		&& myconf="${myconf} --enable-jpeg" \
+		|| myconf="${myconf} --disable-jpeg"
+
+	use dga \
+		&& myconf="${myconf} --enable-xfree-ext" \
+		|| myconf="${myconf} --disable-xfree-ext"
+
+
+	# if lame is installed xawdecode will use it (there's no configure-flag)
+	# if lirc is installed it will also be used
+	# the same goes for ffmpeg libraries (not media-video/ffmpeg)
+	#   (don't know how to install them)
+
+	econf ${myconf} || die
+
+	emake PERF_FLAGS2="${CFLAGS}" || die
+}
+
+src_install() {
+	
+	sed -i \
+		"s:^SUBDIRS.*:SUBDIRS = alevt src:" Makefile
+	
+	insinto /usr/X11R6/lib/X11/fonts/misc
+	doins font/led-fixed.pcf
+
+	einstall \
+		ROOT=${D} || die
+
+	dodoc COPYING ChangeLog
+	dodoc FAQ* README.* lisez-moi*
+	dodoc xawdecoderc.sample
+
+}
+
+pkg_postinst() {
+	einfo "Please note that this ebuild created a suid-binary: /usr/bin/v4l-conf"
+}
diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
new file mode 100644
index 000000000000..cb13cccdbee2
--- /dev/null
+++ b/media-tv/xawtv/ChangeLog
@@ -0,0 +1,155 @@
+# ChangeLog for media-tv/xawtv
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.1 2003/06/18 12:00:02 seemant Exp $
+
+*xawtv-3.88 (18 Jun 2003)
+
+  18 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild,
+  xawtv-3.88.ebuild, files/tv-fonts-1.0-gentoo.diff, files/webcamrc:
+  moved to media-tv
+
+*xawtv-3.88 (18 Apr 2003)
+
+  18 Apr 2003; Daniel Robbins <drobbins@gentoo.org> A new upstream version
+  of xawtv.
+
+*xawtv-3.86-r1 (06 Apr 2003)
+
+  07 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild:
+  using virtualx eclass, because the fonts now want to run sometihng in X --
+  thanks to rommel in #gentoo for finding this
+
+  06 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86-r1.ebuild:
+  TV fonts are installed this time. Thanks to: Paul Kronenwetter
+  <kronenpj@netzero.net> for catching it and reporting to bug #18822
+
+*xawtv-3.86 (21 Mar 2003)
+
+  01 Apr 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild,
+  xawtv-3.85.ebuild, xawtv-3.86.ebuild:
+  removed xpm from DEPEND -- xfree86 provides it
+
+  27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86.ebuild:
+  mark stable on x86
+
+  21 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.86.ebuild:
+  version bump
+
+*xawtv-3.85 (09 Mar 2003)
+
+  13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild,
+  xawtv-3.85.ebuild:
+  Added quicktime to IUSE. Thanks to: Matt Taylor <liverbugg@juno.com> in bug
+  #17409
+
+  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.85.ebuild:
+  plugins directory fixed. thanks to Patrick Kursawe <phosphan@gentoo.org> in
+  bug #17195
+
+  09 Mar 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.85.ebuild:
+  version bump, thanks to: Chayim I. Kirshen <ckirshen@gnupower.net> in bug
+  #17037; also, webcam stuff is only installed if /home/httpd exists, otherwise
+  not: closes bug #16875 by David Bryson <mutex@kerneli.org>
+
+*xawtv-3.83 (02 Feb 2003)
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Added media-libs/xpm to DEPEND, closing bug #15300 by Susie Edgeworth
+  <arienadean@yahoo.com>
+
+  02 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.83.ebuild
+  files/digest-xawtv-3.83 :
+
+  Version bump to newest bugfix release
+
+*xawtv-3.82 (06 Jan 2003)
+
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> xawtv-3.82.ebuild
+  files/digest-xawtv-3.82 :
+
+  Version bump to newest upstream.
+
+*xawtv-3.81 (12 Dec 2002)
+
+  06 Jan 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  changed to DEPEND on virtual/motif.
+
+  15 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.81.ebuild :
+
+  Added app-text/recode for the MoTV portion of this (which is compiled only
+  if "motif" in USE).  Closes bug #12214 by rajiv@gentoo.org (Rajiv Manglani)
+
+  15 Dec 2002; Rajiv Manglani <rajiv@gentoo.org> xawtv-3.81.ebuild :
+  added ~ppc keyword.
+
+  15 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.80.ebuild
+  xawtv-3.81.ebuild :
+
+  Sed out #define MMX for non-MMX enabled architectures (USE based).  Thanks
+  to rajiv@gentoo.org (Rajiv Manglani) in bug #12179.
+
+  12 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.81.ebuild
+  files/digest-xawtv-3.81 :
+
+  Version bump, same bug report. Font problems really shouldn't exist...
+
+*xawtv-3.80 (12 Dec 2002)
+
+  12 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.80.ebuild
+  files/digest-xawtv-3.80 :
+
+  Version bump, thanks to: jordanmeek@yahoo.com (Jordan Meek) in bug #11143.
+  Also, this solves the issue with 3.78, where the fonts would screw up X
+  completely, closing bug #10238 by googleplex@wi.rr.com (Dave Berenson)
+
+  Later, same day: some small fixes for fonts again.
+
+*xawtv-3.78 (04 Nov 2002)
+
+  04 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xawtv-3.78.ebuild
+  files/tv-fonts-1.0-gentoo.diff files/digest-xawtv-3.78 files/webcamrc :
+
+  Version bump.  This release depends on libquicktime instead and the fonts
+  package is downloaded separately.  Thanks to: jmarcet@pobox.com (Javier
+  Marcet) in bug #7345 for informing us.  Also provided a default webcamrc
+  in the docs directory.  Thanks to: sascha@killerhippy.de (Sascha
+  Wuestemann) in bug #9895 for that.  Thanks to kev@kvance.com (Kev Vance)
+  in bug #7651 for the libquicktime heads up.
+
+*xawtv-3.73-r1 (14 July 2002)
+
+  14 July 2002; Brandon Low <lostlogic@gentoo.org> xawtv-3.73-r1.ebuild:
+
+  Add lirc support thanks goes to George Sauthoff, he did great work 
+  preparing the lirc ebuild.
+        
+*xawtv-3.73 (23 April 2002)
+
+  23 April 2002; Bart Verwilst <verwilst@gentoo.org> xawtv-3.73.ebuild:
+        
+  New version, removed old versions from the Portage tree
+
+*xawtv-3.65-r1 (30 Mar 2002)
+  11 Apr 2002; Spider <spider@gentoo.org> xawtv-3.65-r2.ebuild :
+  Changed the libpng dependency 
+
+*xawtv-3.65-r1 (30 Mar 2002)
+
+  30 Mar 2002; Aron Griffis <agriffis@gentoo.org> xawtv-3.65-r1.ebuild :
+
+  Added "use alsa" and corrected installation of fonts.  Now the font
+  installation doesn't violate the sandbox, and mkfontdir is properly run
+  after merge/unmerge.
+
+*xawtv-3.65 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that
+  the comments should well explained and written in clean English. The
+  details about writing correct changelogs are explained in the
+  skel.ChangeLog file which you can find in the root directory of the
+  portage repository.
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index b2e5485a368b..933bb38b63b3 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -1,12 +1,6 @@
-MD5 36f92532bce89a2e6254aa5460a6d096 xawtv-3.86-r1.ebuild 2442
-MD5 fc4832eae33571b73108a5ec9bdfba38 xawtv-3.86.ebuild 2366
-MD5 5fb1fcda80302119c2d555141a56f72c xawtv-3.88.ebuild 2436
-MD5 9da1a0e2bd46cdfe2081e79518d8d4ed xawtv-3.83.ebuild 2521
-MD5 43ff7b2f698eeabba98b332cccc86349 ChangeLog 5370
-MD5 bcb35e4266a891a59869deb26a1e1441 xawtv-3.85.ebuild 2618
-MD5 ca6ab4e596f6d61ed41594532f30a515 files/digest-xawtv-3.83 393
-MD5 134ef9ef0ced355e42d63a65cecef783 files/digest-xawtv-3.85 396
-MD5 951789823d1daef8c8a68b32146b7f3e files/digest-xawtv-3.86 396
+MD5 baff2000f79ce2adc0cafc5ece17371c xawtv-3.86-r1.ebuild 2439
+MD5 a39ba393b0689ee98002bac2989ecf0c xawtv-3.88.ebuild 2432
+MD5 442c6fd33abd0af1e1c0018522649138 ChangeLog 5553
 MD5 2d7c5b5b3bb0b4ebfe507c800e5b5e21 files/digest-xawtv-3.88 205
 MD5 e4dcb4819e11ae2fb4fa72f4f8420bca files/tv-fonts-1.0-gentoo.diff 426
 MD5 6a07c4c744b1c6004fb3d6504359ed50 files/digest-xawtv-3.86-r1 399
diff --git a/media-tv/xawtv/files/digest-xawtv-3.86-r1 b/media-tv/xawtv/files/digest-xawtv-3.86-r1
new file mode 100644
index 000000000000..331bd117f4f2
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.86-r1
@@ -0,0 +1,6 @@
+MD5 e4dcb4819e11ae2fb4fa72f4f8420bca /files/tv-fonts-1.0-gentoo.diff 426
+MD5 04a2ce4d8937cc7dfc255082396fa5fe /files/webcamrc 597
+MD5 36f92532bce89a2e6254aa5460a6d096 /xawtv-3.86-r1.ebuild 2442
+MD5 1a87beb0f7c9ccf06b54a6a5d0c003cc xawtv_3.86.tar.gz 549653
+MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
+MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-tv/xawtv/files/digest-xawtv-3.88 b/media-tv/xawtv/files/digest-xawtv-3.88
new file mode 100644
index 000000000000..098293f00490
--- /dev/null
+++ b/media-tv/xawtv/files/digest-xawtv-3.88
@@ -0,0 +1,3 @@
+MD5 9f43ae410965101f77c7c5d847c6842c xawtv_3.88.tar.gz 554924
+MD5 46c68df4976306e25a1526a762371770 tv-fonts-1.0.tar.bz2 140781
+MD5 80a7a2779c4c521f5e9a28583d27c736 xaw-deinterlace-3.76-0.1.1.diff.bz2 3858
diff --git a/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff b/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff
new file mode 100644
index 000000000000..25b49a609499
--- /dev/null
+++ b/media-tv/xawtv/files/tv-fonts-1.0-gentoo.diff
@@ -0,0 +1,16 @@
+--- Makefile.orig	2002-11-04 15:51:42.000000000 -0800
++++ Makefile	2002-11-04 15:51:56.000000000 -0800
+@@ -23,12 +23,7 @@
+ ##################################################################
+ 
+ all: $(LED_PCF) $(TT_PCF) $(LED_BDF) $(TT_BDF)
+-	mkfontdir
+-ifneq ($(DISPLAY),)
+-	-xset fp- "`pwd`:unscaled"
+-	xset fp+ "`pwd`:unscaled"
+-	xset fp rehash
+-endif
++	echo "fonts created"
+ 
+ clean distclean:
+ 	rm -f $(LED_PCF) $(TT_PCF)
diff --git a/media-tv/xawtv/files/webcamrc b/media-tv/xawtv/files/webcamrc
new file mode 100644
index 000000000000..6773a673cb4c
--- /dev/null
+++ b/media-tv/xawtv/files/webcamrc
@@ -0,0 +1,30 @@
+       [ftp]
+       host = www
+       user = webcam
+       pass = xxxxxx
+       dir  = public_html/images
+       file = webcam.jpeg
+       tmp  = uploading.jpeg
+       passive = 1
+       debug = 0
+       auto = 0
+       local = 0
+       ssh = 0
+
+       [grab]
+       device = /dev/video0
+       text = "webcam %Y-%m-%d %H:%M:%S"
+       infofile = filename
+       width = 320
+       height = 240
+       delay = 3
+       input = composite1
+       norm = pal
+       rotate = 0
+       top = 0
+       left = 0
+       bottom = -1
+       right = -1
+       quality = 75
+       trigger = 0
+       once = 0
diff --git a/media-tv/xawtv/xawtv-3.86-r1.ebuild b/media-tv/xawtv/xawtv-3.86-r1.ebuild
new file mode 100644
index 000000000000..74f83c59bf96
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.86-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.86-r1.ebuild,v 1.1 2003/06/18 12:00:02 seemant Exp $
+
+inherit virtualx
+
+IUSE="aalib motif alsa opengl nls quicktime"
+
+MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
+S=${WORKDIR}/${P}
+MY_FONT=tv-fonts-1.0
+DESCRIPTION="TV application for the bttv driver"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://bytesex.org/xawtv/${PN}_${PV}.tar.gz
+	http://bytesex.org/xawtv/${MY_FONT}.tar.bz2
+	mirror://gentoo/${MY_PATCH}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	media-libs/zvbi
+	virtual/x11
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	motif? ( virtual/motif
+		app-text/recode )
+	opengl? ( virtual/opengl )
+	quicktime? ( media-libs/libquicktime )"
+
+src_compile() {
+	local myconf
+	use motif \
+		&& myconf="--enable-motif" \
+		|| myconf="--disable-motif"
+
+	use aalib \
+		&& myconf="${myconf} --enable-aa" \
+		|| myconf="${myconf} --disable-aa"
+
+	use quicktime \
+		&& myconf="${myconf} --enable-quicktime" \
+		|| myconf="${myconf} --disable-quicktime"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+
+	use opengl \
+		&& myconf="${myconf} --enable-gl" \
+		|| myconf="${myconf} --disable-gl"
+
+	use mmx || \
+		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
+
+	econf \
+		--with-x \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--enable-zvbi \
+		${myconf} || die "xawtv failed"
+
+	make || die
+
+	cd ${WORKDIR}/${MY_FONT}
+	Xmake || die "tvfonts failed"
+}
+
+src_install() {
+	cd ${S}
+	einstall \
+		libdir=${D}/usr/lib/xawtv \
+		resdir=${D}/etc/X11 || die
+
+	dodoc COPYING Changes README* TODO
+
+	if [ -d /home/httpd ]
+	then
+		exeinto /home/httpd/cgi-bin
+		doexe scripts/webcam.cgi
+		dodoc ${FILESDIR}/webcamrc
+	fi
+
+	if [ -z "`use nls`" ]
+	then
+		rm -f ${D}/usr/share/man/fr
+		rm -f ${D}/usr/share/man/es
+	fi
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv ${D}/usr/share/*.list ${D}/usr/share/${PN}
+	mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
+
+	cd ${WORKDIR}/${MY_FONT}
+	insinto /usr/X11R6/lib/X11/fonts/xawtv
+	doins *.gz fonts.alias
+}
+
+pkg_postinst() {
+
+	ebegin "installing teletype fonts into /usr/X11R6/lib/X11/fonts/xawtv"
+	cd /usr/X11R6/lib/X11/fonts/xawtv
+	mkfontdir
+	eend
+}
diff --git a/media-tv/xawtv/xawtv-3.88.ebuild b/media-tv/xawtv/xawtv-3.88.ebuild
new file mode 100644
index 000000000000..376ebda46f0f
--- /dev/null
+++ b/media-tv/xawtv/xawtv-3.88.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/xawtv-3.88.ebuild,v 1.1 2003/06/18 12:00:02 seemant Exp $
+
+inherit virtualx
+
+IUSE="aalib motif alsa opengl nls quicktime"
+
+MY_PATCH="xaw-deinterlace-3.76-0.1.1.diff.bz2"
+S=${WORKDIR}/${P}
+MY_FONT=tv-fonts-1.0
+DESCRIPTION="TV application for the bttv driver"
+HOMEPAGE="http://bytesex.org/xawtv/"
+SRC_URI="http://bytesex.org/xawtv/${PN}_${PV}.tar.gz
+	http://bytesex.org/xawtv/${MY_FONT}.tar.bz2
+	mirror://gentoo/${MY_PATCH}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-libs/ncurses-5.1
+	>=media-libs/jpeg-6b
+	media-libs/libpng
+	media-libs/zvbi
+	virtual/x11
+	alsa? ( media-libs/alsa-lib )
+	aalib? ( media-libs/aalib )
+	motif? ( virtual/motif
+		app-text/recode )
+	opengl? ( virtual/opengl )
+	quicktime? ( media-libs/libquicktime )"
+
+src_compile() {
+	local myconf
+	use motif \
+		&& myconf="--enable-motif" \
+		|| myconf="--disable-motif"
+
+	use aalib \
+		&& myconf="${myconf} --enable-aa" \
+		|| myconf="${myconf} --disable-aa"
+
+	use quicktime \
+		&& myconf="${myconf} --enable-quicktime" \
+		|| myconf="${myconf} --disable-quicktime"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+
+	use opengl \
+		&& myconf="${myconf} --enable-gl" \
+		|| myconf="${myconf} --disable-gl"
+
+	use mmx || \
+		sed -i "s:#define MMX::" libng/plugins/linear_blend.c
+
+	econf \
+		--with-x \
+		--enable-xfree-ext \
+		--enable-xvideo \
+		--enable-zvbi \
+		${myconf} || die "xawtv failed"
+
+	make || die
+
+	cd ${WORKDIR}/${MY_FONT}
+	Xmake || die "tvfonts failed"
+}
+
+src_install() {
+	cd ${S}
+	einstall \
+		libdir=${D}/usr/lib/xawtv \
+		resdir=${D}/etc/X11 || die
+
+	dodoc COPYING Changes README* TODO
+
+	if [ -d /home/httpd ]
+	then
+		exeinto /home/httpd/cgi-bin
+		doexe scripts/webcam.cgi
+		dodoc ${FILESDIR}/webcamrc
+	fi
+
+	if [ -z "`use nls`" ]
+	then
+		rm -f ${D}/usr/share/man/fr
+		rm -f ${D}/usr/share/man/es
+	fi
+
+	# The makefile seems to be fubar'd for some data
+	dodir /usr/share/${PN}
+	mv ${D}/usr/share/*.list ${D}/usr/share/${PN}
+	mv ${D}/usr/share/Index* ${D}/usr/share/${PN}
+
+	cd ${WORKDIR}/${MY_FONT}
+	insinto /usr/X11R6/lib/X11/fonts/xawtv
+	doins *.gz fonts.alias
+}
+
+pkg_postinst() {
+
+	ebegin "installing teletype fonts into /usr/X11R6/lib/X11/fonts/xawtv"
+	cd /usr/X11R6/lib/X11/fonts/xawtv
+	mkfontdir
+	eend
+}