diff options
| -rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.10.3.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.11.2.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.11.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.9.2.ebuild | 8 |
5 files changed, 24 insertions, 12 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 1e815248f4f4..2dfd8e586864 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.386 2012/03/03 12:33:08 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.387 2012/03/04 09:40:23 jlec Exp $ + + 04 Mar 2012; Justin Lecher <jlec@gentoo.org> mesa-7.9.2.ebuild, + mesa-7.10.3.ebuild, mesa-7.11.ebuild, mesa-7.11.2.ebuild: + block x11-libs/libGLw with USE=motif *mesa-8.0.1-r2 (03 Mar 2012) diff --git a/media-libs/mesa/mesa-7.10.3.ebuild b/media-libs/mesa/mesa-7.10.3.ebuild index 09f71d9f64c5..d86a6355cc41 100644 --- a/media-libs/mesa/mesa-7.10.3.ebuild +++ b/media-libs/mesa/mesa-7.10.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.11 2011/12/03 22:57:19 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.12 2012/03/04 09:40:23 jlec Exp $ EAPI=3 @@ -72,7 +72,9 @@ RDEPEND="${EXTERNAL_DEPEND} x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) + motif? ( + x11-libs/openmotif + !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) diff --git a/media-libs/mesa/mesa-7.11.2.ebuild b/media-libs/mesa/mesa-7.11.2.ebuild index 83f96683fa08..630453b04ba0 100644 --- a/media-libs/mesa/mesa-7.11.2.ebuild +++ b/media-libs/mesa/mesa-7.11.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.8 2012/02/19 14:20:28 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.9 2012/03/04 09:40:23 jlec Exp $ EAPI=3 @@ -70,7 +70,9 @@ RDEPEND="${EXTERNAL_DEPEND} x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) + motif? ( + x11-libs/openmotif + !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) diff --git a/media-libs/mesa/mesa-7.11.ebuild b/media-libs/mesa/mesa-7.11.ebuild index 73ceb12769c9..da77ebcac210 100644 --- a/media-libs/mesa/mesa-7.11.ebuild +++ b/media-libs/mesa/mesa-7.11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.14 2011/12/03 22:57:19 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.15 2012/03/04 09:40:23 jlec Exp $ EAPI=3 @@ -70,7 +70,9 @@ RDEPEND="${EXTERNAL_DEPEND} x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) + motif? ( + x11-libs/openmotif + !x11-libs/libGLw ) gallium? ( llvm? ( <sys-devel/llvm-3 ) ) diff --git a/media-libs/mesa/mesa-7.9.2.ebuild b/media-libs/mesa/mesa-7.9.2.ebuild index d058d28a1bc3..ca7b47fe9d01 100644 --- a/media-libs/mesa/mesa-7.9.2.ebuild +++ b/media-libs/mesa/mesa-7.9.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.2.ebuild,v 1.10 2011/09/16 19:32:56 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.9.2.ebuild,v 1.11 2012/03/04 09:40:23 jlec Exp $ EAPI=3 @@ -65,7 +65,9 @@ RDEPEND=" x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) + motif? ( + x11-libs/openmotif + !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) |