Fix dependencies for modular X (bug #122487).

Package-Manager: portage-2.1_pre4-r1

4 files changed, 29 insertions, 12 deletions

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 6c53e5094a9e..026a03fe2d05 100644
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/gcompris
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.22 2005/12/13 23:14:29 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.23 2006/02/14 04:07:37 joshuabaergen Exp $
+
+  14 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  gcompris-6.5.3-r1.ebuild, gcompris-7.2.ebuild:
+  Fix dependencies for modular X (bug #122487).
 
 *gcompris-7.2 (13 Dec 2005)
 
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 1b41cce53d26..fe11479360ab 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,6 +1,18 @@
-MD5 ae6a77bd686f038363fb5dda827406f6 ChangeLog 3386
+MD5 88aafc5f313c657abaf8a3848510032a ChangeLog 3545
+RMD160 833825d565c141a5fbdccb4882d3985d4e7d1f0b ChangeLog 3545
+SHA256 8beaca4621f23afe84799839fac47f6b5785fd3fe77196bc373c562e2c05ca30 ChangeLog 3545
 MD5 557b7f4481b6c30ca79251c8a19af714 files/digest-gcompris-6.5.3-r1 68
+RMD160 82329f6aede31d8269df52198bd63257feb556d3 files/digest-gcompris-6.5.3-r1 68
+SHA256 19150b5300a31a98813e251f63a08994f72c3a30d70fcd8f930b9efc1dad74ed files/digest-gcompris-6.5.3-r1 68
 MD5 c1515fbf0f65f17d1700414a6c2170b2 files/digest-gcompris-7.2 66
-MD5 fe3c32d12e59a1ca0cc3b1f2dc9eb953 gcompris-6.5.3-r1.ebuild 1797
-MD5 15cb905a952c866051bf2183c8782698 gcompris-7.2.ebuild 1401
+RMD160 6732fd04afd8ba9163699e1da29d237702433f76 files/digest-gcompris-7.2 66
+SHA256 73cc1690470c4b5742db7f234ae4f8f15a07fd0db68d715818e633728e4f0681 files/digest-gcompris-7.2 66
+MD5 3e8e2d67c17fe9bb83e330fbe952ddb3 gcompris-6.5.3-r1.ebuild 1827
+RMD160 bd478cb8fa3244e226c007d1974b1f26a635bcf5 gcompris-6.5.3-r1.ebuild 1827
+SHA256 300daf5c3a0dc0b5077de7221777b2c7b7bb638f76444735a7505c7d00bad5af gcompris-6.5.3-r1.ebuild 1827
+MD5 0660f2ad84542f36c16b18b7b462ff38 gcompris-7.2.ebuild 1466
+RMD160 460972fd9334f76ab497ecab83fa30d7c13bf904 gcompris-7.2.ebuild 1466
+SHA256 d4bcf2d4d388bc4b1d11f4b531d1e3ebc6ef1e177d73df65f509c4af2f27caa6 gcompris-7.2.ebuild 1466
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-kids/gcompris/gcompris-6.5.3-r1.ebuild b/games-kids/gcompris/gcompris-6.5.3-r1.ebuild
index 631124beacf5..4d3c9c2b18d3 100644
--- a/games-kids/gcompris/gcompris-6.5.3-r1.ebuild
+++ b/games-kids/gcompris/gcompris-6.5.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-6.5.3-r1.ebuild,v 1.1 2005/11/21 17:51:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-6.5.3-r1.ebuild,v 1.2 2006/02/14 04:07:37 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ppc x86"
 #IUSE="python editor" #editor didn't compile for me.; doesn't like python-2.4
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXrandr virtual/x11 )
 	>=dev-libs/glib-2.0
 	=x11-libs/gtk+-2*
 	>=gnome-base/libgnomecanvas-2.0.2
diff --git a/games-kids/gcompris/gcompris-7.2.ebuild b/games-kids/gcompris/gcompris-7.2.ebuild
index 79da8d86665d..d8933441a28e 100644
--- a/games-kids/gcompris/gcompris-7.2.ebuild
+++ b/games-kids/gcompris/gcompris-7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-7.2.ebuild,v 1.1 2005/12/13 23:14:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-7.2.ebuild,v 1.2 2006/02/14 04:07:37 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 #IUSE="python " #doesn't like python-2.4
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXrandr virtual/x11 )
 	>=dev-libs/glib-2.0
 	=x11-libs/gtk+-2*
 	>=gnome-base/libgnomecanvas-2.0.2
@@ -24,7 +24,8 @@ RDEPEND="virtual/x11
 	dev-libs/popt"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo
-	app-text/texi2html"
+	app-text/texi2html
+	|| ( x11-libs/libXt virtual/x11 )"
 RDEPEND="${RDEPEND}
 	games-board/gnuchess"