diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-04-10 13:49:46 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-04-10 13:49:46 +0000 |
| commit | 83b66dd85581ed10cda1d6f4efb6cf0d3cc580c0 (patch) | |
| tree | 159c19ec962cb202ac9b30f668790741a10cda36 /app-emulation/emul-linux-x86-opengl | |
| parent | arm/ia64/sh/sparc stable wrt #288166 (diff) | |
| download | gentoo-2-83b66dd85581ed10cda1d6f4efb6cf0d3cc580c0.tar.gz gentoo-2-83b66dd85581ed10cda1d6f4efb6cf0d3cc580c0.tar.bz2 gentoo-2-83b66dd85581ed10cda1d6f4efb6cf0d3cc580c0.zip | |
Block <app-emulation/emul-linux-x86-xlibs-20100409 to allow Portage to resolve file collisions.
(Portage version: HEAD/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/emul-linux-x86-opengl')
| -rw-r--r-- | app-emulation/emul-linux-x86-opengl/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-opengl/ChangeLog b/app-emulation/emul-linux-x86-opengl/ChangeLog index 24611967806e..36e50bb59a8c 100644 --- a/app-emulation/emul-linux-x86-opengl/ChangeLog +++ b/app-emulation/emul-linux-x86-opengl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/emul-linux-x86-opengl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.1 2010/04/09 17:32:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/ChangeLog,v 1.2 2010/04/10 13:49:46 arfrever Exp $ + + 10 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + emul-linux-x86-opengl-20100409.ebuild: + Block <app-emulation/emul-linux-x86-xlibs-20100409 to allow Portage to + resolve file collisions. *emul-linux-x86-opengl-20100409 (09 Apr 2010) diff --git a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild index 343a18596498..1fc9bd89eb25 100644 --- a/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild +++ b/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild,v 1.1 2010/04/09 17:32:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild,v 1.2 2010/04/10 13:49:46 arfrever Exp $ inherit emul-linux-x86 @@ -11,6 +11,7 @@ IUSE="" DEPEND="app-admin/eselect-opengl" RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100409 + !<app-emulation/emul-linux-x86-xlibs-20100409 media-libs/mesa" src_unpack() { |