From c68b9e347d6c4dd577371036cc72d466f42e9f03 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@gentoo.org>
Date: Mon, 9 Nov 2009 19:38:31 +0000
Subject: add some blockers against the themes packages to make the upgrade
 path smoother Package-Manager: portage-2.1.7.4/cvs/Linux x86_64

---
 media-tv/mythtv/ChangeLog                 |  7 ++++++-
 media-tv/mythtv/Manifest                  | 12 ++++++------
 media-tv/mythtv/mythtv-0.22_p22764.ebuild |  6 ++++--
 media-tv/mythtv/mythtv-0.22_p22772.ebuild |  6 ++++--
 4 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'media-tv')

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 96ffbcfd40a0..77a8fb86fd8b 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.287 2009/11/08 05:22:43 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.288 2009/11/09 19:38:31 cardoe Exp $
+
+  09 Nov 2009; Doug Goldstein <cardoe@gentoo.org> mythtv-0.22_p22764.ebuild,
+  mythtv-0.22_p22772.ebuild:
+  add some blockers against the themes packages to make the upgrade path
+  smoother
 
   08 Nov 2009; Doug Goldstein <cardoe@gentoo.org>
   -mythtv-0.22_rc22588.ebuild, -mythtv-0.22_rc22679.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 3a28fa291a58..67470237b0e8 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -18,14 +18,14 @@ DIST mythtv-0.22_p22764.zip 26490830 RMD160 5e45453478ffb9c9a4be15529e9f555629ff
 DIST mythtv-0.22_p22772.zip 26490429 RMD160 373e187d86241adfbaf15e1bc63ad5da84eb4318 SHA1 745cff39b6dcec4629bccd50030efc9f236be7bb SHA256 2bdb64543678afee45e129cd20a1c666ff8138393773ad8b887451406418978d
 EBUILD mythtv-0.21_p19961-r2.ebuild 8812 RMD160 1107bdc3d12b051feec2aff580fbcf65583a6784 SHA1 e018ed02b9e1d25e1296704df0821870fff80c30 SHA256 b8c2585072aa022d181736c2bcc33a7a61c4697712504fd304974dc2d1996ee0
 EBUILD mythtv-0.21_p20877.ebuild 8844 RMD160 07e9079645f385d3abf0ed1e2182abc5b0bf0bdf SHA1 975df4ed94356d88fa74cabb0183af47230b5ccb SHA256 bef2828b900dec0310e76dc9d0e9ba6dac91ae76662948f815bdac9248ee8487
-EBUILD mythtv-0.22_p22764.ebuild 9195 RMD160 1d6ea822b0454ae983db00dcd7d9f4173d50e94e SHA1 13dba9b98b26af47360a40608212345db3d6fbf5 SHA256 780e785cc160611cc9e068556eab30df73c3d9fe728ef227033aa930f1b0bfe3
-EBUILD mythtv-0.22_p22772.ebuild 9195 RMD160 676147f655bff4fcefa6b96993b2b198aac07921 SHA1 3bde1b7076866b1c9a7c14613dcd9e9bf4d983c8 SHA256 f43c87332bf213709b6cbede4e9691d36dae6b80a7ddcc9b21e5480872d742bc
-MISC ChangeLog 57199 RMD160 297078170f8b438cb8c1122cbdc518bea94f6062 SHA1 6831bb2487c7a96e59364ce430f9643e69bc771b SHA256 7e0349da7225c105a78a027e13e9d81fe84c4e1dc596d75e9562bf11b2c45534
+EBUILD mythtv-0.22_p22764.ebuild 9267 RMD160 78af4f397bdb6bb3372b21ca0f368483ee768bb0 SHA1 a85e55cb57210987ee4a2dfef8715d4ea70d3739 SHA256 5064bce236b59095a0dee574495e6d6c5a45eec55a0b7605883b4a877bdd90e1
+EBUILD mythtv-0.22_p22772.ebuild 9267 RMD160 c0487f6e31902467c2535b422f34b1735b19ef74 SHA1 6cf7206485f0608e01f78caead58a4a3f73eb874 SHA256 3a72bfbcfe3a47b557f5bf7605e1458a6f02dcd476a7700e6494ca02d2a1bc1c
+MISC ChangeLog 57390 RMD160 829bbde0869fa99f53cd98bb9cbb664e55085940 SHA1 9a6e63a841970aa62fa31a4b9816367ff64326f9 SHA256 8ed02f01ca2aa225c36542d21dedcec094856dfa75fe2acf0d88be704f01031a
 MISC metadata.xml 3336 RMD160 e84d87ad5c775f55030e52da2621553cd18c0e3b SHA1 a5307073956deb376491eec55b6914443189e2d9 SHA256 e008e5e04ca42ee1bb171aac900376cf93ba277f8987db4a42cc23a5910c891f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr2VasACgkQoeSe8B0zEfxrRwCfauwnalUZNMd7XK6pLX69byHz
-fGcAnR7jzEJ8662dlkFg0FmEm0cNULL0
-=dxa7
+iEYEARECAAYFAkr4b8AACgkQoeSe8B0zEfwtygCfWRtWQ8XHIED1tPlwI4aaiHI+
+LhAAmwQ2AwY7xvZZ8t0glsSdhrh5IujJ
+=BA/y
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_p22764.ebuild b/media-tv/mythtv/mythtv-0.22_p22764.ebuild
index 95dd346ee143..abcf37a0ce19 100644
--- a/media-tv/mythtv/mythtv-0.22_p22764.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_p22764.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22764.ebuild,v 1.1 2009/11/08 01:53:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22764.ebuild,v 1.2 2009/11/09 19:38:31 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -55,7 +55,9 @@ DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	x11-proto/xf86vidmodeproto
 	x11-apps/xinit
-	!<media-plugins/mythcontrols-0.22"
+	!<media-plugins/mythcontrols-0.22
+	!<x11-themes/mythtv-themes-0.22
+	!<x11-themes/mythtv-themes-extra-0.22"
 
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
diff --git a/media-tv/mythtv/mythtv-0.22_p22772.ebuild b/media-tv/mythtv/mythtv-0.22_p22772.ebuild
index b887480296a6..d923cfe9c59a 100644
--- a/media-tv/mythtv/mythtv-0.22_p22772.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_p22772.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22772.ebuild,v 1.1 2009/11/08 04:59:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_p22772.ebuild,v 1.2 2009/11/09 19:38:31 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -55,7 +55,9 @@ DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	x11-proto/xf86vidmodeproto
 	x11-apps/xinit
-	!<media-plugins/mythcontrols-0.22"
+	!<media-plugins/mythcontrols-0.22
+	!<x11-themes/mythtv-themes-0.22
+	!<x11-themes/mythtv-themes-extra-0.22"
 
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
-- 
cgit v1.2.3-65-gdbad