diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-14 04:07:37 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-02-14 04:07:37 +0000 |
| commit | 7c291d2d6e94e2eb341163be26b26355130ee848 (patch) | |
| tree | 417bb89ecd23564c35881655e8cc5b77f4cdb30f | |
| parent | Added ~amd64. (diff) | |
| download | gentoo-2-7c291d2d6e94e2eb341163be26b26355130ee848.tar.gz gentoo-2-7c291d2d6e94e2eb341163be26b26355130ee848.tar.bz2 gentoo-2-7c291d2d6e94e2eb341163be26b26355130ee848.zip | |
Fix dependencies for modular X (bug #122487).
(Portage version: 2.1_pre4-r1)
| -rw-r--r-- | games-kids/gcompris/ChangeLog | 8 | ||||
| -rw-r--r-- | games-kids/gcompris/gcompris-6.5.3-r1.ebuild | 6 | ||||
| -rw-r--r-- | games-kids/gcompris/gcompris-7.2.ebuild | 9 |
3 files changed, 14 insertions, 9 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/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" |