Drop old, drop stable keywords, fix zlib dep, bug 187588

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo x86_64)

4 files changed, 13 insertions, 112 deletions

diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
index 7620a813832d..a80758e5aef0 100644
--- a/media-tv/nvtv/ChangeLog
+++ b/media-tv/nvtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/nvtv
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.11 2007/11/27 10:47:09 zzam Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.12 2009/01/10 12:32:33 beandog Exp $
+
+*nvtv-0.4.7-r1 (10 Jan 2009)
+
+  10 Jan 2009; Steve Dibb <beandog@gentoo.org> -nvtv-0.4.5.ebuild,
+  -nvtv-0.4.6.ebuild, -nvtv-0.4.7.ebuild, +nvtv-0.4.7-r1.ebuild:
+  Drop old, drop stable keywords, fix zlib dep, bug 187588
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> nvtv-0.4.5.ebuild,
   nvtv-0.4.6.ebuild, nvtv-0.4.7.ebuild:
diff --git a/media-tv/nvtv/nvtv-0.4.5.ebuild b/media-tv/nvtv/nvtv-0.4.5.ebuild
deleted file mode 100644
index 7a68e52c77dc..000000000000
--- a/media-tv/nvtv/nvtv-0.4.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# 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.10 2007/11/27 10:47:09 zzam Exp $
-
-IUSE="X gtk"
-
-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"
-
-RDEPEND="sys-apps/pciutils
-	gtk? ( x11-libs/gtk+ )
-	X? ( x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm )"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86vidmodeproto )"
-
-src_compile() {
-	local myconf
-
-	if use gtk
-	then
-		myconf="${myconf} --with-gtk"
-	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
-
-	newinitd "${FILESDIR}"/nvtv.start nvtv
-}
diff --git a/media-tv/nvtv/nvtv-0.4.6.ebuild b/media-tv/nvtv/nvtv-0.4.7-r1.ebuild
index 462ad1f29415..fb176317faf6 100644
--- a/media-tv/nvtv/nvtv-0.4.6.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.7-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # 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.8 2007/11/27 10:47:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.7-r1.ebuild,v 1.1 2009/01/10 12:32:33 beandog Exp $
+
+EAPI="2"
 
 IUSE="X gtk"
 
@@ -12,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
-RDEPEND="sys-apps/pciutils
+RDEPEND="sys-apps/pciutils[-zlib]
 	gtk? ( x11-libs/gtk+ )
 	X? ( x11-libs/libXi
 		x11-libs/libXmu
diff --git a/media-tv/nvtv/nvtv-0.4.7.ebuild b/media-tv/nvtv/nvtv-0.4.7.ebuild
deleted file mode 100644
index 5156555695fd..000000000000
--- a/media-tv/nvtv/nvtv-0.4.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# 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.6 2007/11/27 10:47:09 zzam Exp $
-
-IUSE="X gtk"
-
-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"
-
-RDEPEND="sys-apps/pciutils
-	gtk? ( x11-libs/gtk+ )
-	X? ( x11-libs/libXi
-		x11-libs/libXmu
-		x11-libs/libXxf86vm )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xf86vidmodeproto )"
-
-src_compile() {
-	local myconf
-
-	if use gtk
-	then
-		myconf="${myconf} --with-gtk"
-	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
-
-	newinitd "${FILESDIR}"/nvtv.start nvtv
-}