diff options
author | Christoph Mende <angelos@gentoo.org> | 2007-11-30 22:04:39 +0000 |
---|---|---|
committer | Christoph Mende <angelos@gentoo.org> | 2007-11-30 22:04:39 +0000 |
commit | beb4eab5d7dd2101716a809fc6eeb74c8080457f (patch) | |
tree | 5b136aa4915958e9598d92951e22f897b579ad36 /app-emulation | |
parent | Fix cross compile, bug#200367, thanks to Joakim Tjernlund (diff) | |
download | gentoo-2-beb4eab5d7dd2101716a809fc6eeb74c8080457f.tar.gz gentoo-2-beb4eab5d7dd2101716a809fc6eeb74c8080457f.tar.bz2 gentoo-2-beb4eab5d7dd2101716a809fc6eeb74c8080457f.zip |
fix the collision on libGL.so
(Portage version: 2.1.4_rc4, RepoMan options: --force)
Diffstat (limited to 'app-emulation')
3 files changed, 36 insertions, 1 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog index 31f691d5f6e7..1d743e277ae9 100644 --- a/app-emulation/emul-linux-x86-xlibs/ChangeLog +++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-xlibs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.69 2007/11/28 23:17:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.70 2007/11/30 22:04:38 angelos Exp $ + +*emul-linux-x86-xlibs-20071128-r2 (30 Nov 2007) + + 30 Nov 2007; Christoph Mende <angelos@gentoo.org> + +emul-linux-x86-xlibs-20071128-r2.ebuild: + Revbump to fix the collision on libGL.so 28 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> emul-linux-x86-xlibs-20071128-r1.ebuild: diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20071128-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20071128-r2.ebuild new file mode 100644 index 000000000000..456b23cd3bd0 --- /dev/null +++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20071128-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20071128-r2.ebuild,v 1.1 2007/11/30 22:04:38 angelos Exp $ + +inherit emul-linux-x86 + +LICENSE="fontconfig FTL GPL-2 LGPL-2 glut libdrm libICE libSM libX11 libXau + libXaw libXcomposite libXcursor libXdamage libXdmcp libXext libXfixes libXft + libXi libXinerama libXmu libXp libXpm libXrandr libXrender libXScrnSaver libXt + libXtst libXv libXvMC libXxf86dga libXxf86dga libXxf86vm" +KEYWORDS="-* amd64" +IUSE="opengl" + +DEPEND="opengl? ( app-admin/eselect-opengl )" +RDEPEND=">=app-emulation/emul-linux-x86-baselibs-20071114 + x11-libs/libX11" + +src_unpack() { + emul-linux-x86_src_unpack + rm -f "${S}/usr/lib32/libGL.so" +} + +pkg_postinst() { + #update GL symlinks + use opengl && eselect opengl set --use-old +} diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-20071128-r2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-20071128-r2 new file mode 100644 index 000000000000..3d932ca0ff15 --- /dev/null +++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-20071128-r2 @@ -0,0 +1,3 @@ +MD5 4fe0511c717b874c00f3426320e60305 emul-linux-x86-xlibs-20071128.tar.bz2 20608838 +RMD160 9161b0f6e826ce91a5bb9e1958deb3fce826000f emul-linux-x86-xlibs-20071128.tar.bz2 20608838 +SHA256 84b15195f47ffd0e0d64ca7ba2c273ab65f31adef0ada4befb82c8bccadfb675 emul-linux-x86-xlibs-20071128.tar.bz2 20608838 |