diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-04-03 13:12:19 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2013-04-03 13:12:19 +0000 |
| commit | 5836cd1f057e6db5022846e9669439ebeccabe1e (patch) | |
| tree | 50a0a2a01979da0441e2b457ed72e6e57b248a1a /x11-apps | |
| parent | Add zoneminder support to latest version. (diff) | |
| download | gentoo-2-5836cd1f057e6db5022846e9669439ebeccabe1e.tar.gz gentoo-2-5836cd1f057e6db5022846e9669439ebeccabe1e.tar.bz2 gentoo-2-5836cd1f057e6db5022846e9669439ebeccabe1e.zip | |
Block old gnash for file collision, bug #463654.
(Portage version: 2.1.11.55/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/mesa-progs/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/x11-apps/mesa-progs/ChangeLog b/x11-apps/mesa-progs/ChangeLog index fb547159b8a8..28c340a607fd 100644 --- a/x11-apps/mesa-progs/ChangeLog +++ b/x11-apps/mesa-progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/mesa-progs # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.95 2013/03/28 21:01:34 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/ChangeLog,v 1.96 2013/04/03 13:12:19 chithanh Exp $ + + 03 Apr 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + mesa-progs-8.1.0.ebuild: + Block old gnash for file collision, bug #463654. 28 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> mesa-progs-8.1.0.ebuild: diff --git a/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild index 90200f5f5bbd..68a9567a6394 100644 --- a/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild +++ b/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild,v 1.2 2013/03/28 21:01:34 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild,v 1.3 2013/04/03 13:12:19 chithanh Exp $ EAPI=5 @@ -29,16 +29,19 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="egl gles1 gles2" -RDEPEND=" +COMMON_DEPEND=" media-libs/mesa[egl?,gles1?,gles2?] virtual/opengl x11-libs/libX11" # glew and glu are only needed by the configure script when building. # They are not actually required by the installed programs. -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} media-libs/glew virtual/glu x11-proto/xproto" +# old gnash installs eglinfo too, bug #463654 +RDEPEND="${COMMON_DEPEND} + egl? ( !<=www-plugins/gnash-0.8.10_p20120903[egl] )" S=${WORKDIR}/${MY_P} |