diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2008-09-14 19:21:27 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-09-14 19:21:27 +0000 |
commit | 9cb58f90320cd7bdd2050c10a3b62fe7d3f999d9 (patch) | |
tree | b36039d33ac5762e91d259a6a42c98bc01dc659a /media-libs/mesa | |
parent | Depend on gnome-python components (gconf, gnome-vfs, libgnome), rather than a... (diff) | |
download | gentoo-2-9cb58f90320cd7bdd2050c10a3b62fe7d3f999d9.tar.gz gentoo-2-9cb58f90320cd7bdd2050c10a3b62fe7d3f999d9.tar.bz2 gentoo-2-9cb58f90320cd7bdd2050c10a3b62fe7d3f999d9.zip |
mesa-progs has to be in PDEPEND to avoid a circular dependency through freeglut (reported by Javier Villavicencio).
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64)
Diffstat (limited to 'media-libs/mesa')
-rw-r--r-- | media-libs/mesa/ChangeLog | 7 | ||||
-rw-r--r-- | media-libs/mesa/mesa-7.1.ebuild | 4 | ||||
-rw-r--r-- | media-libs/mesa/mesa-7.2_rc1.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index a0a60caf8b6d..160c35782a89 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.184 2008/09/14 18:38:41 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.185 2008/09/14 19:21:27 dberkholz Exp $ + + 14 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.1.ebuild, + mesa-7.2_rc1.ebuild: + mesa-progs has to be in PDEPEND to avoid a circular dependency through + freeglut (reported by Javier Villavicencio). *mesa-7.2_rc1 (14 Sep 2008) diff --git a/media-libs/mesa/mesa-7.1.ebuild b/media-libs/mesa/mesa-7.1.ebuild index 310d864522c0..492637c24ef5 100644 --- a/media-libs/mesa/mesa-7.1.ebuild +++ b/media-libs/mesa/mesa-7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1.ebuild,v 1.3 2008/09/11 17:19:47 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1.ebuild,v 1.4 2008/09/14 19:21:27 dberkholz Exp $ GIT= if [[ ${PV} = 9999* ]]; then @@ -62,7 +62,6 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.6-r1 >=x11-libs/libICE-1.0.4 motif? ( >=x11-libs/openmotif-2.3.1-r1 ) doc? ( >=app-doc/opengl-manpages-20001215 ) - >=x11-apps/mesa-progs-7.1 !<=x11-base/xorg-x11-6.9" DEPEND="${RDEPEND} !<=x11-proto/xf86driproto-2.0.3 @@ -75,6 +74,7 @@ DEPEND="${RDEPEND} >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/glproto-1.4.9 motif? ( >=x11-proto/printproto-1.0.4 )" +PDEPEND=">=x11-apps/mesa-progs-7.1" S="${WORKDIR}/${MY_P}" diff --git a/media-libs/mesa/mesa-7.2_rc1.ebuild b/media-libs/mesa/mesa-7.2_rc1.ebuild index 4c3b880cd274..2d17e4e63e26 100644 --- a/media-libs/mesa/mesa-7.2_rc1.ebuild +++ b/media-libs/mesa/mesa-7.2_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.2_rc1.ebuild,v 1.1 2008/09/14 18:38:41 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.2_rc1.ebuild,v 1.2 2008/09/14 19:21:27 dberkholz Exp $ GIT= if [[ ${PV} = 9999* ]]; then @@ -62,7 +62,6 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.6-r1 >=x11-libs/libICE-1.0.4 motif? ( >=x11-libs/openmotif-2.3.1-r1 ) doc? ( >=app-doc/opengl-manpages-20001215 ) - >=x11-apps/mesa-progs-7.1 !<=x11-base/xorg-x11-6.9" DEPEND="${RDEPEND} !<=x11-proto/xf86driproto-2.0.3 @@ -74,6 +73,7 @@ DEPEND="${RDEPEND} >=x11-proto/xf86vidmodeproto-2.2.2 >=x11-proto/glproto-1.4.9 motif? ( >=x11-proto/printproto-1.0.4 )" +PDEPEND=">=x11-apps/mesa-progs-7.1" S="${WORKDIR}/${MY_P}" |