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 | 23290cce829ee7d4d562c7f18c908faacd136d8f (patch) | |
| tree | e392edb9290b7ef8c2df743fc5efcb7c31ecb9e6 /app-emulation | |
| parent | arm/ia64/sh/sparc stable wrt #288166 (diff) | |
| download | historical-23290cce829ee7d4d562c7f18c908faacd136d8f.tar.gz historical-23290cce829ee7d4d562c7f18c908faacd136d8f.tar.bz2 historical-23290cce829ee7d4d562c7f18c908faacd136d8f.zip | |
Block <app-emulation/emul-linux-x86-xlibs-20100409 to allow Portage to resolve file collisions.
Package-Manager: portage-HEAD/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/emul-linux-x86-opengl/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-opengl/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20100409.ebuild | 3 |
3 files changed, 10 insertions, 14 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/Manifest b/app-emulation/emul-linux-x86-opengl/Manifest index 7c1e7f747fe6..69ffaf430464 100644 --- a/app-emulation/emul-linux-x86-opengl/Manifest +++ b/app-emulation/emul-linux-x86-opengl/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST emul-linux-x86-opengl-20100409.tar.bz2 14176719 RMD160 90eb25357fe38dadd257da366e04c6989bc882cc SHA1 e69475e36bd8de7b14fb96462da40ed43d8fc346 SHA256 17c36bc9d09d0f398e1735bed3685734164c495aeb1c43325e9d3f7ee7e02cf4 -EBUILD emul-linux-x86-opengl-20100409.ebuild 607 RMD160 c952446d9a59bf2d448f768a0cbe266f758a74c7 SHA1 a4437dc325ee682f5419e5c8a5c24651a8d3981a SHA256 1c470a9383c611ef6bd1d3d21744496e5cf5afea6b71f4bcd7ececfcb661cf92 -MISC ChangeLog 564 RMD160 e558f456f17146a3b3566747fa0f7fa6bee1f76d SHA1 23a5ad2e7ac87e219202d3e8d611980b5e75a528 SHA256 5167818e221504b1a4a5cdc025c43ef0a71e6ab481390b9dcfb456046d28a20e +EBUILD emul-linux-x86-opengl-20100409.ebuild 657 RMD160 f2333ad3d0c7469f9e2509b5dc2fd1b7e46273b4 SHA1 190f67c3b41cb7cf102e120bbf62dd4d377e7773 SHA256 6df41c51de3a91e98d43ecc145e67a2f8668bbf630cf55b3e5b1b8ae76acb447 +MISC ChangeLog 782 RMD160 262b3178e5f0313ac8f21f545676955d96cbdadf SHA1 174e324b6896843927256744ac60d657731d6ded SHA256 930de24a997056208f4475bed6405f1ac198b4aba7606c9df5cbc0ed886dc977 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAku/ZKQACgkQCaWpQKGI+9TrWgCdEoNEuOmHK/7OCt3xWO+/r4KA -6fYAmwXtLEReKEV335I41dur9+zRnv2r -=RBxZ ------END PGP SIGNATURE----- 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() { |