Fixes Bug #49698 and Bug #48959; version bump and dependency fix respectively

6 files changed, 77 insertions, 8 deletions

diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
index 77faeb82f6ee..ce062d5ed66f 100644
--- a/media-tv/nvtv/ChangeLog
+++ b/media-tv/nvtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/nvtv
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.5 2004/03/26 16:43:42 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.6 2004/06/06 16:15:08 blauwers Exp $
+
+*nvtv-0.4.7 (06 Jun 2004)
+
+  06 Jun 2004; Bart Lauwers <blauwers@gentoo.org> nvtv-0.4.7.ebuild:
+  Version bump per request in Bug #49698
+
+  06 Jun 2004; Bart Lauwers <blauwers@gentoo.org> nvtv-0.4.5.ebuild, nvtv-0.4.6.ebuild:
+  Changed dep from Xfree to virtual/x11 per Bug #48959
 
 *nvtv-0.4.6 (26 Mar 2004)
 
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index 4f260dd2633b..50a71f86a44d 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -1,7 +1,9 @@
-MD5 07f27d7f7e78d394dfd61a03f496ec5b nvtv-0.4.6.ebuild 1212
-MD5 64416fc46de7fb874d0a84876595aef2 nvtv-0.4.5.ebuild 1210
+MD5 4fa132c3adf1065b134222c005ac89d6 nvtv-0.4.6.ebuild 1203
+MD5 f29347b4b774af3d63451f3128816ea9 nvtv-0.4.5.ebuild 1201
 MD5 f691708ddf9faed17b657dc03253f20a metadata.xml 383
-MD5 c37341f7f921d9a96136f8b5af2af5ec ChangeLog 1808
+MD5 3c1f2dafcc991b2c2cc041a9991deeb1 ChangeLog 2090
+MD5 4fa132c3adf1065b134222c005ac89d6 nvtv-0.4.7.ebuild 1203
 MD5 7733a550f1987aebccb1b0765697a827 files/nvtv.start 538
 MD5 adc49002cf7b7b0274f7b51ba7e0749d files/digest-nvtv-0.4.5 62
 MD5 100984154e7d0abd397f9180eac2e191 files/digest-nvtv-0.4.6 62
+MD5 3efd64b27ba09b15639638f067915d24 files/digest-nvtv-0.4.7 62
diff --git a/media-tv/nvtv/files/digest-nvtv-0.4.7 b/media-tv/nvtv/files/digest-nvtv-0.4.7
new file mode 100644
index 000000000000..f0dc85ce23ad
--- /dev/null
+++ b/media-tv/nvtv/files/digest-nvtv-0.4.7
@@ -0,0 +1 @@
+MD5 35348d7608f94b7d114cd6ef46b66fc7 nvtv-0.4.7.tar.gz 419564
diff --git a/media-tv/nvtv/nvtv-0.4.5.ebuild b/media-tv/nvtv/nvtv-0.4.5.ebuild
index 6e0d5211888d..929c711cc511 100644
--- a/media-tv/nvtv/nvtv-0.4.5.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.5.ebuild,v 1.4 2004/03/23 16:37:05 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.5 2004/06/06 16:15:08 blauwers Exp $
 
 IUSE="X gtk gtk2"
 
@@ -17,7 +17,7 @@ DEPEND="sys-apps/pciutils
 		gtk2? ( =x11-libs/gtk+-2* )
 		!gtk2? ( =x11-libs/gtk+-1.2* )
 	)
-	X? ( >=x11-base/xfree-4.0 )"
+	X? ( virtual/x11 )"
 
 src_compile() {
 	local myconf
diff --git a/media-tv/nvtv/nvtv-0.4.6.ebuild b/media-tv/nvtv/nvtv-0.4.6.ebuild
index 8826fd6179c9..4d33f4249035 100644
--- a/media-tv/nvtv/nvtv-0.4.6.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.6.ebuild,v 1.1 2004/03/26 16:43:42 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.6.ebuild,v 1.2 2004/06/06 16:15:08 blauwers Exp $
 
 IUSE="X gtk gtk2"
 
@@ -17,7 +17,7 @@ DEPEND="sys-apps/pciutils
 		gtk2? ( =x11-libs/gtk+-2* )
 		!gtk2? ( =x11-libs/gtk+-1.2* )
 	)
-	X? ( >=x11-base/xfree-4.0 )"
+	X? ( virtual/x11 )"
 
 src_compile() {
 	local myconf
diff --git a/media-tv/nvtv/nvtv-0.4.7.ebuild b/media-tv/nvtv/nvtv-0.4.7.ebuild
new file mode 100644
index 000000000000..2af0a23492ff
--- /dev/null
+++ b/media-tv/nvtv/nvtv-0.4.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2004 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.7.ebuild,v 1.1 2004/06/06 16:15:08 blauwers Exp $
+
+IUSE="X gtk gtk2"
+
+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 ~amd64"
+
+DEPEND="sys-apps/pciutils
+	gtk? (
+		gtk2? ( =x11-libs/gtk+-2* )
+		!gtk2? ( =x11-libs/gtk+-1.2* )
+	)
+	X? ( virtual/x11 )"
+
+src_compile() {
+	local myconf
+
+	if use gtk
+	then
+		if use gtk2
+			then
+				myconf="${myconf} --with-gtk=gtk2"
+			else
+				myconf="${myconf} --with-gtk=gtk1"
+			fi
+	else
+		myconf="${myconf} --without-gtk"
+	fi
+
+	use X \
+		&& myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x"
+
+	econf ${myconf} || die
+
+	# 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
+}