Use SLOT dependencies for x11-libs/gtk+.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

4 files changed, 20 insertions, 14 deletions

diff --git a/media-tv/nvtv/ChangeLog b/media-tv/nvtv/ChangeLog
index 7d21fca0ea4b..a9455fd87015 100644
--- a/media-tv/nvtv/ChangeLog
+++ b/media-tv/nvtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/nvtv
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.13 2009/01/21 14:56:27 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/ChangeLog,v 1.14 2011/03/24 06:53:01 ssuominen Exp $
+
+  24 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> nvtv-0.4.5.ebuild,
+  nvtv-0.4.7-r1.ebuild:
+  Use SLOT dependencies for x11-libs/gtk+.
 
   21 Jan 2009; Steve Dibb <beandog@gentoo.org> +nvtv-0.4.5.ebuild:
   Readd old stable ebuild
diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest
index a09b0f74ac6e..15e56d983a4b 100644
--- a/media-tv/nvtv/Manifest
+++ b/media-tv/nvtv/Manifest
@@ -1,7 +1,7 @@
 AUX nvtv.start 531 RMD160 3fff55c74ffc9806979a1872964605d0fa756b58 SHA1 28ff0faf58f05c341e41ddf0ad71a48ba44769c9 SHA256 614d245b6b44cf21f33aa879ad4a20b71950cfbfa95e161983c622ffdaa2be79
 DIST nvtv-0.4.5.tar.gz 383497 RMD160 b41f3c8e027bf959725bd0a104bed38484167fb8 SHA1 8b2791301da4af4894b136595fecad7ff91282e6 SHA256 62becad2c2171567a9b2025a68e6de524af01f6386d18a67ce47eac8e0d1e1d3
 DIST nvtv-0.4.7.tar.gz 419564 RMD160 866128297f30b36758e8dadfd04a562515bfc8e3 SHA1 5ea23e4bfcdf91766ec4600a90866a3ccede252b SHA256 f044c6de2df66196fa589ed0d33203bd10d88604f447befce1a6f62eb7b08dac
-EBUILD nvtv-0.4.5.ebuild 1137 RMD160 fbefe85b067309894a08336cfe97a108b8dc5ae9 SHA1 3b5ae767ea42d346fe4c2443877ef3350a84ab30 SHA256 8748a7ea1699986947cbde87bcc165c0cf1083de54a4a272839bf08b3e584241
-EBUILD nvtv-0.4.7-r1.ebuild 1159 RMD160 53656e437bb25420b027ce7c1c4e3c7c45d10241 SHA1 aff4661fc086f145923654c532e5455e2313a19c SHA256 b605798c19ece1d3b949e5c82b5971925287775e06821f1d0a9447686a10c45b
-MISC ChangeLog 2914 RMD160 7906fe0a7e8a74011cf53d17291813116a7939bf SHA1 7304c6a4d48c9e3109b52349484e4243f29a295a SHA256 5160a598dea4cc56819b85b13e7c3ec653a9d6a53dcbd5ce65175e08a2277d49
+EBUILD nvtv-0.4.5.ebuild 1149 RMD160 a1c8e9a5b3b97f014ef5063a69f2f46c2051f0e2 SHA1 39fa4d6f267edefeb4dc106ec44c8ee0a86d3d0b SHA256 b10420ac9c6d65cd0eb05a2ce18eddabb2799db4e26e88c29e57270b55b68545
+EBUILD nvtv-0.4.7-r1.ebuild 1170 RMD160 aeba57c543fc213417f5cdf2664a918ee86de903 SHA1 ce816e1be0b5e94864caf664fbceed5a13651364 SHA256 354981f95c394c8ebec51779cb73a0d5db45c9e1b54867f205a01d5534cb8a87
+MISC ChangeLog 3057 RMD160 7c6006df532b2eaa1011bb68d6f659179e4bfeab SHA1 597d758cdd2c9a0d322adaf47690fed9a97f2336 SHA256 6f325f43e1a142bbdce5f771d13f2d44cbff6884e896d4c434b0bb9ecbec22d0
 MISC metadata.xml 312 RMD160 fd480c071f3cae8a5a7aef76c21d5efd6a8020d8 SHA1 529a9d7a450d53a9b41971c496f33f4a99a2b83f SHA256 f9fd1c3e47569e52e4e7e9a70a991332e3fbc92d6d83048021928e81fc02023b
diff --git a/media-tv/nvtv/nvtv-0.4.5.ebuild b/media-tv/nvtv/nvtv-0.4.5.ebuild
index 1a5027f088b8..26c2f07eafe4 100644
--- a/media-tv/nvtv/nvtv-0.4.5.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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.12 2009/01/21 14:56:27 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.5.ebuild,v 1.13 2011/03/24 06:53:01 ssuominen Exp $
+
+EAPI=1
 
 IUSE="X gtk"
 
@@ -13,7 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 amd64"
 
 RDEPEND="sys-apps/pciutils
-	gtk? ( x11-libs/gtk+ )
+	gtk? ( x11-libs/gtk+:2 )
 	X? ( x11-libs/libXi
 		x11-libs/libXmu
 		x11-libs/libXxf86vm )"
diff --git a/media-tv/nvtv/nvtv-0.4.7-r1.ebuild b/media-tv/nvtv/nvtv-0.4.7-r1.ebuild
index fb176317faf6..e1770b1a371f 100644
--- a/media-tv/nvtv/nvtv-0.4.7-r1.ebuild
+++ b/media-tv/nvtv/nvtv-0.4.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2009/01/10 12:32:33 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/nvtv/nvtv-0.4.7-r1.ebuild,v 1.2 2011/03/24 06:53:01 ssuominen Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
 
 RDEPEND="sys-apps/pciutils[-zlib]
-	gtk? ( x11-libs/gtk+ )
+	gtk? ( x11-libs/gtk+:2 )
 	X? ( x11-libs/libXi
 		x11-libs/libXmu
 		x11-libs/libXxf86vm )"
@@ -37,7 +37,7 @@ src_compile() {
 		&& myconf="${myconf} --with-x" \
 		|| myconf="${myconf} --without-x"
 
-	econf ${myconf} || die
+	econf ${myconf}
 
 	# The CFLAGS don't seem to make it into the Makefile.
 	cd src
@@ -45,8 +45,8 @@ src_compile() {
 }
 
 src_install() {
-	dobin src/nvtv
-	dosbin src/nvtvd
+	dobin src/nvtv || die
+	dosbin src/nvtvd || die
 
 	dodoc ANNOUNCE BUGS FAQ INSTALL README \
 		doc/USAGE doc/chips.txt doc/overview.txt \