nvidia-legacy-drivers has merged with nvidia-drivers

Package-Manager: portage-2.1.3_rc9

6 files changed, 44 insertions, 33 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index f390dbf41531..c3570222a2a3 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.160 2007/07/02 15:31:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.161 2007/07/31 13:52:59 cardoe Exp $
+
+  31 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.20.1_p13344.ebuild, mythtv-0.20.1_p13783.ebuild,
+  mythtv-0.21_pre13285.ebuild, mythtv-0.21_pre13775.ebuild:
+  nvidia-legacy-drivers has merged with nvidia-drivers
 
   02 Jul 2007; Doug Goldstein <cardoe@gentoo.org>
   files/mythtv-trunk-mcpu-march-2.patch:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b468b9a5f624..b91228f3c03e 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_profile 63 RMD160 71ed6a00c824f8d2704b65371e54adb85ca6d861 SHA1 cd4bc03298d30fadb759d1a2463e930441c5a5e7 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9
 MD5 0f9058a6fad116cbcbd46db7b6b5f461 files/bash_profile 63
 RMD160 71ed6a00c824f8d2704b65371e54adb85ca6d861 files/bash_profile 63
@@ -41,26 +44,26 @@ SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94 files/xi
 DIST mythtv-0.20.1.tar.bz2 12429721 RMD160 7aecb245cbd94796ce311543d744042ceacd8e13 SHA1 48848bce345aa2e40d99506d6e98f256d380dd8a SHA256 6990d86ce17c93ff39d24ba27094c09e2a2ec78d044e57b7406216b51145237c
 DIST mythtv-0.20.1_svn13344.patch.bz2 967 RMD160 885bde4753d66202c4bc64777be032939db714ef SHA1 230da6ae663302b225e234b86ff4b6a1f5d68f10 SHA256 af1f5183adcf0354f9bb4412e93abd99cc7ae4e95af2c555c0e066efef993af2
 DIST mythtv-0.20.1_svn13783.patch.bz2 4286 RMD160 21cfef35f92064cf111f84ca13d64642dc6739b7 SHA1 31bfd77d2747c02f56dcdfaf7d64ccdf8441e4b2 SHA256 ff6acd80b23b36cf2c97cf587c05fe90972ee8005f775768479d4d9919e5e225
-EBUILD mythtv-0.20.1_p13344.ebuild 8233 RMD160 6d8610ae2b12b189328ce9fd4e7f9b58fda22564 SHA1 917368562a5766d7d6e85250d161f6dbead2f0e1 SHA256 2ce6663cbc9f186a09ffef981b6a3d44972ad87d6d29cc862237a1357720b21a
-MD5 23a1326b1dba1d5ff65347cd8193aab8 mythtv-0.20.1_p13344.ebuild 8233
-RMD160 6d8610ae2b12b189328ce9fd4e7f9b58fda22564 mythtv-0.20.1_p13344.ebuild 8233
-SHA256 2ce6663cbc9f186a09ffef981b6a3d44972ad87d6d29cc862237a1357720b21a mythtv-0.20.1_p13344.ebuild 8233
-EBUILD mythtv-0.20.1_p13783.ebuild 8236 RMD160 f80b543a76aa91666de4e4a0ed256dc7e76c7c90 SHA1 5bbbf677a5059a977b54d4bd359a131b3d09e0c2 SHA256 ec8dfe8f560a8cdc7b7c23dfb570629eedd23a1a7e94054398f4dd8fbbcea8f9
-MD5 110f07acb1f9915743e021785a8e02b5 mythtv-0.20.1_p13783.ebuild 8236
-RMD160 f80b543a76aa91666de4e4a0ed256dc7e76c7c90 mythtv-0.20.1_p13783.ebuild 8236
-SHA256 ec8dfe8f560a8cdc7b7c23dfb570629eedd23a1a7e94054398f4dd8fbbcea8f9 mythtv-0.20.1_p13783.ebuild 8236
-EBUILD mythtv-0.21_pre13285.ebuild 7296 RMD160 b34e0ba51176949b2321a6c182e913af24a98892 SHA1 b8caac22b64737a8158323a1da98ad283b050464 SHA256 49846b5ec343ff40dbc47d2e0130f890ae95eed89502eb5dbb660a2e10ba70f7
-MD5 5112ee08ed4bbb14d73849d23729d0fc mythtv-0.21_pre13285.ebuild 7296
-RMD160 b34e0ba51176949b2321a6c182e913af24a98892 mythtv-0.21_pre13285.ebuild 7296
-SHA256 49846b5ec343ff40dbc47d2e0130f890ae95eed89502eb5dbb660a2e10ba70f7 mythtv-0.21_pre13285.ebuild 7296
-EBUILD mythtv-0.21_pre13775.ebuild 7300 RMD160 30b352588acbf133dcfa364aadc88b960e7ba6f0 SHA1 8c8a84ae1f3a1944f78821b44829f7825ee42b4d SHA256 dc9cfe057cd926fa4dd4b1166e259b57ecb40466e6e9de5bf0499ba388795351
-MD5 0002b9de8d7e49e8f6f686fdedf2cd72 mythtv-0.21_pre13775.ebuild 7300
-RMD160 30b352588acbf133dcfa364aadc88b960e7ba6f0 mythtv-0.21_pre13775.ebuild 7300
-SHA256 dc9cfe057cd926fa4dd4b1166e259b57ecb40466e6e9de5bf0499ba388795351 mythtv-0.21_pre13775.ebuild 7300
-MISC ChangeLog 29514 RMD160 a7c58462941ac8f3bb2dd3ced29d805ed44018e8 SHA1 1fbeaf3adeb71aa046afc12cac300b20fcb646f3 SHA256 6d5a1547ca5c01d16fa6ff09e73b365c7f32e168c7ce1799e6969a2e07930a7a
-MD5 6a112edc3ead89f03e9aa8983da2ed05 ChangeLog 29514
-RMD160 a7c58462941ac8f3bb2dd3ced29d805ed44018e8 ChangeLog 29514
-SHA256 6d5a1547ca5c01d16fa6ff09e73b365c7f32e168c7ce1799e6969a2e07930a7a ChangeLog 29514
+EBUILD mythtv-0.20.1_p13344.ebuild 8180 RMD160 ae6d215795afcba8c7e3fa53d4d60a1407af988e SHA1 f944a9a26f434ec384d2e9ab0d6a91fc68f7fd73 SHA256 01813c4c11936290c7fb27ac817cdbd073effaa8ad060bdf2a9ea2f1c4098a5d
+MD5 8aff87fd93c9727455d99ad2472b6ee8 mythtv-0.20.1_p13344.ebuild 8180
+RMD160 ae6d215795afcba8c7e3fa53d4d60a1407af988e mythtv-0.20.1_p13344.ebuild 8180
+SHA256 01813c4c11936290c7fb27ac817cdbd073effaa8ad060bdf2a9ea2f1c4098a5d mythtv-0.20.1_p13344.ebuild 8180
+EBUILD mythtv-0.20.1_p13783.ebuild 8183 RMD160 5c740088aa35743968a132727c8be13b13094d16 SHA1 997d02fcf4c1fa6fe57b1cd2a0db8d52c365c2dd SHA256 f7a0888137db3463d9025081e7913565686f5b968f9d45618ee5e16bf0b63d3d
+MD5 dbbc6b6b827f5a457e55ccca391bc2f9 mythtv-0.20.1_p13783.ebuild 8183
+RMD160 5c740088aa35743968a132727c8be13b13094d16 mythtv-0.20.1_p13783.ebuild 8183
+SHA256 f7a0888137db3463d9025081e7913565686f5b968f9d45618ee5e16bf0b63d3d mythtv-0.20.1_p13783.ebuild 8183
+EBUILD mythtv-0.21_pre13285.ebuild 7243 RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 SHA1 a026fedbe1d2cfeccd87d8f5a355ca1a42430c0b SHA256 a62c28e4622edddac483434a7dc78b7c8a4244be70da4ebb8b6b24017f3f732c
+MD5 d2fb98ee05600d3d3175d195b5369041 mythtv-0.21_pre13285.ebuild 7243
+RMD160 1bfb7148a8e2f002a153145626f0283d92a635a8 mythtv-0.21_pre13285.ebuild 7243
+SHA256 a62c28e4622edddac483434a7dc78b7c8a4244be70da4ebb8b6b24017f3f732c mythtv-0.21_pre13285.ebuild 7243
+EBUILD mythtv-0.21_pre13775.ebuild 7247 RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02441a0be SHA1 1a880f98122fedaf3caafa4c79aff61d190d3b34 SHA256 a0550434c82157b8bfb877db79ab21cbbc8fc80a38977d5c051e444471e49b32
+MD5 f5e4311b740fa6ac5dfc72050e0034e7 mythtv-0.21_pre13775.ebuild 7247
+RMD160 84fd8ba1ee456c4bf7c77c7ab3460de02441a0be mythtv-0.21_pre13775.ebuild 7247
+SHA256 a0550434c82157b8bfb877db79ab21cbbc8fc80a38977d5c051e444471e49b32 mythtv-0.21_pre13775.ebuild 7247
+MISC ChangeLog 29740 RMD160 a59bcc5f0b987e69b3aaaf66bd0a10053a1dea4f SHA1 8cd17eb110a84329fda92b1df7b70d9a7a76d8b0 SHA256 dcd5be5501cf6e5f9de8b426986be5e77f21e1d0fb7bdf42b9ebfde4731f1f8e
+MD5 9a554f8f2bda1971ff27e7c6e7850a3a ChangeLog 29740
+RMD160 a59bcc5f0b987e69b3aaaf66bd0a10053a1dea4f ChangeLog 29740
+SHA256 dcd5be5501cf6e5f9de8b426986be5e77f21e1d0fb7bdf42b9ebfde4731f1f8e ChangeLog 29740
 MISC metadata.xml 222 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e SHA1 c6bd979f236f5e6fe9332eb6568bee402efc793f SHA256 8b2065fecfbbdd0caa3c5eb86b98c22766db07f555edbf3127e9454b468ecff6
 MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 RMD160 effccac2541ac4d0954899784d7d64c60a9c020e metadata.xml 222
@@ -77,3 +80,10 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mythtv-0.21_pre13775 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mythtv-0.21_pre13775 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mythtv-0.21_pre13775 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGrz8hoeSe8B0zEfwRAiQvAJ0aysEm5FH4kY00G2MLiSFo+hZd8wCbBHsM
+iCpdgFG+Ue0KwUpkjeBXegA=
+=jolS
+-----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild b/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild
index 2eb91c3eb284..dccccb5196f2 100644
--- a/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild,v 1.4 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p13344.ebuild,v 1.5 2007/07/31 13:52:59 cardoe Exp $
 
 inherit mythtv flag-o-matic multilib eutils qt3
 
@@ -22,8 +22,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXxf86vm
 	xvmc? (
 		x11-libs/libXvMC
-		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
-								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 		video_cards_via? ( x11-drivers/xf86-video-via )
 		video_cards_i810? ( x11-drivers/xf86-video-i810 )
 	)
diff --git a/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild b/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
index bf9f4c60e303..f8fe6220d9ba 100644
--- a/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
+++ b/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild,v 1.2 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.20.1_p13783.ebuild,v 1.3 2007/07/31 13:52:59 cardoe Exp $
 
 inherit mythtv flag-o-matic multilib eutils qt3
 
@@ -22,8 +22,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXxf86vm
 	xvmc? (
 		x11-libs/libXvMC
-		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
-								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 		video_cards_via? ( x11-drivers/xf86-video-via )
 		video_cards_i810? ( x11-drivers/xf86-video-i810 )
 	)
diff --git a/media-tv/mythtv/mythtv-0.21_pre13285.ebuild b/media-tv/mythtv/mythtv-0.21_pre13285.ebuild
index 4c89a9b43bd7..af235176966c 100644
--- a/media-tv/mythtv/mythtv-0.21_pre13285.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre13285.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13285.ebuild,v 1.3 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13285.ebuild,v 1.4 2007/07/31 13:52:59 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion
 
@@ -22,8 +22,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXxf86vm
 	xvmc? (
 		x11-libs/libXvMC
-		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
-								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 		video_cards_via? ( x11-drivers/xf86-video-via )
 		video_cards_i810? ( x11-drivers/xf86-video-i810 )
 	)
diff --git a/media-tv/mythtv/mythtv-0.21_pre13775.ebuild b/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
index c93c9cfcae88..4825badae883 100644
--- a/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
+++ b/media-tv/mythtv/mythtv-0.21_pre13775.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13775.ebuild,v 1.3 2007/07/13 05:03:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.21_pre13775.ebuild,v 1.4 2007/07/31 13:52:59 cardoe Exp $
 
 inherit flag-o-matic multilib eutils qt3 mythtv subversion
 
@@ -22,8 +22,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXxf86vm
 	xvmc? (
 		x11-libs/libXvMC
-		video_cards_nvidia? ( || ( x11-drivers/nvidia-drivers
-								 x11-drivers/nvidia-legacy-drivers ) )
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers )
 		video_cards_via? ( x11-drivers/xf86-video-via )
 		video_cards_i810? ( x11-drivers/xf86-video-i810 )
 	)