Pinpoint virtual/x11 version to less than 7.

Package-Manager: portage-2.1.1_pre2-r6

4 files changed, 26 insertions, 22 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 85f2bbbce109..be327b44ab03 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.56 2006/06/28 19:45:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.57 2006/07/09 05:58:45 flameeyes Exp $
+
+  09 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kaffeine-0.7.1-r2.ebuild, kaffeine-0.8.1.ebuild:
+  Pinpoint virtual/x11 version to less than 7.
 
   28 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kaffeine-0.8.1.ebuild:
   Remove configure to avoid double-configure.
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 21ca55f134ca..13eb25aae0c1 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -19,18 +19,18 @@ RMD160 f2249fa4b723b68a68c3373df179af6a2a3355a7 files/kaffeine-0.7.1-xinerama.pa
 SHA256 b1509c9fd21dd163cd0db5a7b02a3dd393d0e30993b943da0495adb69ff034c8 files/kaffeine-0.7.1-xinerama.patch 863
 DIST kaffeine-0.7.1.tar.bz2 2276747 RMD160 b609bc47dd7cc11753c016bf0da3214f54fa8df0 SHA1 ae91768ca9f2542ba9c287371109ef9095146270 SHA256 7e2611ba4fb4cc5b6a1802250a5c404b22cca434ce1d3bbe83088f6189bfa145
 DIST kaffeine-0.8.1.tar.bz2 2703094 RMD160 0a8ec4980b5ddce55640543763ae22215a1c5287 SHA1 b593fdc3afeee71eb60c2ac5b9c6e41057f5d12a SHA256 eda787214563cee684aa868cb82ef198144fe247a3ffd9032d7ae312e2d9bcd2
-EBUILD kaffeine-0.7.1-r2.ebuild 1245 RMD160 dd6b7b708787ca3a7fae283ee8c9ee0f4a73a7cc SHA1 aad42c54766908a1e22770eb4b92dbd0d1e0e5c7 SHA256 61e478c49cd6d0a9babeceb8c47e6fbf5fea534aaf495a2ca05be06b60f04ef7
-MD5 16ed59bf03d995f63e7754ae3be85d63 kaffeine-0.7.1-r2.ebuild 1245
-RMD160 dd6b7b708787ca3a7fae283ee8c9ee0f4a73a7cc kaffeine-0.7.1-r2.ebuild 1245
-SHA256 61e478c49cd6d0a9babeceb8c47e6fbf5fea534aaf495a2ca05be06b60f04ef7 kaffeine-0.7.1-r2.ebuild 1245
-EBUILD kaffeine-0.8.1.ebuild 1454 RMD160 14155cf58d94a8a9899b107ca5483c1d6d2cb1fa SHA1 e6e440cebc9f73af3c9fe6fd3290a263e0b726ae SHA256 7cfa91c95646f7ebedcff26340324379513cd0ccf8a1030b0dc8768ad6ad3d44
-MD5 fd045307176d917a3d15d46ec20d46bf kaffeine-0.8.1.ebuild 1454
-RMD160 14155cf58d94a8a9899b107ca5483c1d6d2cb1fa kaffeine-0.8.1.ebuild 1454
-SHA256 7cfa91c95646f7ebedcff26340324379513cd0ccf8a1030b0dc8768ad6ad3d44 kaffeine-0.8.1.ebuild 1454
-MISC ChangeLog 8364 RMD160 cb4d5d27a6802170565f526379c6fd8dd16bcf1c SHA1 fef6d2e78da89c57f61aabb2473b97ef0159cd91 SHA256 0e309d915928d92baf7d1b79c699db12009d2351fc4ccee9cc579b748ca7a745
-MD5 f78ecadcaf13d391a351bebcd8388942 ChangeLog 8364
-RMD160 cb4d5d27a6802170565f526379c6fd8dd16bcf1c ChangeLog 8364
-SHA256 0e309d915928d92baf7d1b79c699db12009d2351fc4ccee9cc579b748ca7a745 ChangeLog 8364
+EBUILD kaffeine-0.7.1-r2.ebuild 1251 RMD160 bf83871489cf398fee05cf74cdaeb35860b97362 SHA1 210f905a2528e1636a6dffe6e7717ba62a73e2ef SHA256 156e2b1cbcdd7132b50d40d15f869276caf3642f331482f2d3e552636e7f7326
+MD5 2b86f7aa8a3234ebe8b9780f38469e81 kaffeine-0.7.1-r2.ebuild 1251
+RMD160 bf83871489cf398fee05cf74cdaeb35860b97362 kaffeine-0.7.1-r2.ebuild 1251
+SHA256 156e2b1cbcdd7132b50d40d15f869276caf3642f331482f2d3e552636e7f7326 kaffeine-0.7.1-r2.ebuild 1251
+EBUILD kaffeine-0.8.1.ebuild 1460 RMD160 599fc2488480c84b105c8ea005b552f0be882bf9 SHA1 3c0c0304aa8c7b985a001df9f3f4ade70d540f95 SHA256 a968d2bd3d92af5ee26ad3bd8f0a0d240c40d4aef29b3a0356f4e3cfe98dd768
+MD5 d76cf2a9daea723f4ae086a51e808d71 kaffeine-0.8.1.ebuild 1460
+RMD160 599fc2488480c84b105c8ea005b552f0be882bf9 kaffeine-0.8.1.ebuild 1460
+SHA256 a968d2bd3d92af5ee26ad3bd8f0a0d240c40d4aef29b3a0356f4e3cfe98dd768 kaffeine-0.8.1.ebuild 1460
+MISC ChangeLog 8516 RMD160 493cc07a03dd43b8f526dba94f328787498592e9 SHA1 08398977b37c549d7a6ae07315adf91a8b7ecde7 SHA256 f4dab241ad5b9a2431cebcace5af67f2fbef84075c3c43fbc28fcf95ba2df2e5
+MD5 75cd582b3ffbcbf5ae9d41426992ac18 ChangeLog 8516
+RMD160 493cc07a03dd43b8f526dba94f328787498592e9 ChangeLog 8516
+SHA256 f4dab241ad5b9a2431cebcace5af67f2fbef84075c3c43fbc28fcf95ba2df2e5 ChangeLog 8516
 MISC metadata.xml 175 RMD160 4e4c9dfa9b5102163a4f7b231f95672bd2266c0d SHA1 ea1bcf3e3090182e13f9d6211de688e9cae1ddcf SHA256 ee81a2309bd9eae88d896b77f0d87adbb941cf18f82eea08c025eb583ac6043d
 MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
 RMD160 4e4c9dfa9b5102163a4f7b231f95672bd2266c0d metadata.xml 175
@@ -44,7 +44,7 @@ SHA256 5bad66e8667f400b3b29e08e0af7fc80f7f2fec8d34cd589abcf772806250796 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEotx/AiZjviIA2XgRAnRaAJ0fOFmpvkW6rzu5EPS7/q5wowlkxwCg5fBv
-pqulUIU+cOEQOU0CEci2Q4U=
-=UI/e
+iD8DBQFEsJsdAiZjviIA2XgRAqO1AKCIzQ2LwKzoDPxThNIhwy8H33FtiwCeLC0v
+Qel1aYRyh7t/3GGudTRkzMc=
+=p3UH
 -----END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
index 7f087fe442e0..28374b3c772e 100644
--- a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
+++ b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.4 2006/05/29 18:17:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.5 2006/07/09 05:58:45 flameeyes Exp $
 
 inherit eutils kde
 
@@ -18,10 +18,10 @@ RDEPEND="|| ( x11-base/xorg-server
 	>=media-libs/xine-lib-1
 	gstreamer? ( =media-libs/gstreamer-0.8*
 		=media-libs/gst-plugins-0.8* )
-	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
+	xinerama? ( || ( x11-libs/libXinerama <virtual/x11-7 ) )"
 
 DEPEND="${RDEPEND}
-	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	xinerama? ( || ( x11-proto/xineramaproto <virtual/x11-7 ) )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	dev-util/pkgconfig"
 
diff --git a/media-video/kaffeine/kaffeine-0.8.1.ebuild b/media-video/kaffeine/kaffeine-0.8.1.ebuild
index dbf861a92a54..1431aca84bca 100644
--- a/media-video/kaffeine/kaffeine-0.8.1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.1.ebuild,v 1.5 2006/06/28 19:45:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.1.ebuild,v 1.6 2006/07/09 05:58:45 flameeyes Exp $
 
 inherit eutils kde
 
@@ -25,14 +25,14 @@ RDEPEND="|| ( x11-base/xorg-server
 	|| ( (
 			x11-libs/libXtst
 			xinerama? ( x11-libs/libXinerama )
-		) virtual/x11 )"
+		) <virtual/x11-7 )"
 
 DEPEND="${RDEPEND}
 	|| ( (
 			x11-proto/xproto
 			x11-proto/xextproto
 			xinerama? ( x11-proto/xineramaproto )
-		) virtual/x11 )
+		) <virtual/x11-7 )
 	dvb? ( media-tv/linuxtv-dvb-headers )
 	dev-util/pkgconfig"