fix the collision on libGL.so

Package-Manager: portage-2.1.4_rc4
RepoMan-Options: --force

4 files changed, 50 insertions, 8 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/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 244c4e7b6518..8d19cd845315 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -64,6 +64,10 @@ EBUILD emul-linux-x86-xlibs-20071128-r1.ebuild 900 RMD160 91c103d967ff09b5c99ab9
 MD5 893cd43c18c62fd4c3ab9faf8782a0cf emul-linux-x86-xlibs-20071128-r1.ebuild 900
 RMD160 91c103d967ff09b5c99ab94f8aef0e09cb5755ec emul-linux-x86-xlibs-20071128-r1.ebuild 900
 SHA256 b9de1b200447270fc0d481f2383a0fdfe6c2a6822238f41e420799af6d82ef85 emul-linux-x86-xlibs-20071128-r1.ebuild 900
+EBUILD emul-linux-x86-xlibs-20071128-r2.ebuild 898 RMD160 43d2069df9a9d8a3e84fd9756daadb1d71a72b20 SHA1 ea3eecd410a00119a5e0bf71f4a39a8ecf42ef96 SHA256 644bb8205f5af654fb39c67afe01c7d759dfe632811bfc0b14da4c7fc30de90a
+MD5 959d17751ab5741705136cbb1023abd4 emul-linux-x86-xlibs-20071128-r2.ebuild 898
+RMD160 43d2069df9a9d8a3e84fd9756daadb1d71a72b20 emul-linux-x86-xlibs-20071128-r2.ebuild 898
+SHA256 644bb8205f5af654fb39c67afe01c7d759dfe632811bfc0b14da4c7fc30de90a emul-linux-x86-xlibs-20071128-r2.ebuild 898
 EBUILD emul-linux-x86-xlibs-20071128.ebuild 819 RMD160 46499ddfcc2b4635f0c4e8b3f093f050cd351d1e SHA1 18886af12fe3cd78802a3f5b1b9fe4e9d5cb2e4a SHA256 4ca9994c37415efcb5f699c500b119389ae3f72c10558227d59a1068c1ee3254
 MD5 9f8bc2481b00f5479cb4a1178ede6481 emul-linux-x86-xlibs-20071128.ebuild 819
 RMD160 46499ddfcc2b4635f0c4e8b3f093f050cd351d1e emul-linux-x86-xlibs-20071128.ebuild 819
@@ -72,10 +76,10 @@ EBUILD emul-linux-x86-xlibs-7.0-r8.ebuild 2589 RMD160 25be0fb9356d5e1c3403a43dd6
 MD5 721c37a4ccc53e9d64ebbbbefd32bada emul-linux-x86-xlibs-7.0-r8.ebuild 2589
 RMD160 25be0fb9356d5e1c3403a43dd64796538333d333 emul-linux-x86-xlibs-7.0-r8.ebuild 2589
 SHA256 63d377b79c4113450534098d5308a7ce757be5683af12bdd1f0e6f611280c44c emul-linux-x86-xlibs-7.0-r8.ebuild 2589
-MISC ChangeLog 12582 RMD160 4221a6e0baab9629ee34f954c2e751e70d976960 SHA1 caea7e365ac2cf57cf7e96086262a32c9a100a10 SHA256 1f55e361b972353d61aeb409c255be859727f15273ba639a8cfe0cc11dc4928c
-MD5 2daae26c195487687b2ad98b27d23018 ChangeLog 12582
-RMD160 4221a6e0baab9629ee34f954c2e751e70d976960 ChangeLog 12582
-SHA256 1f55e361b972353d61aeb409c255be859727f15273ba639a8cfe0cc11dc4928c ChangeLog 12582
+MISC ChangeLog 12770 RMD160 d961652c735a3190af3bb0683042b3649ae4ab66 SHA1 37a83cc1e1b45616b69a0ecdaf49183492ab4e98 SHA256 d7f14aa5da10f060afdd6e55a87564bea97f6260b172b1a1b5ad5630d94bf13a
+MD5 979ba1b8482dac1f3762aa505352363d ChangeLog 12770
+RMD160 d961652c735a3190af3bb0683042b3649ae4ab66 ChangeLog 12770
+SHA256 d7f14aa5da10f060afdd6e55a87564bea97f6260b172b1a1b5ad5630d94bf13a ChangeLog 12770
 MISC metadata.xml 226 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d SHA1 1cf50e178ffc19ba9c83c1440bb7affa225058a0 SHA256 ec696441bfd66c7ba1bd8f257fb8b28eebd35325a99a861becdcce4ab22fcb78
 MD5 e862ce865a1f6d796ddca407af1230b0 metadata.xml 226
 RMD160 8b5e8dfb5cb187694ac54de32e888f915617761d metadata.xml 226
@@ -95,13 +99,16 @@ SHA256 681ba607674882454ce3fb9fc099808e0cd9777d5190e7c290c9eee228a2425e files/di
 MD5 2695931d38169b0c599e70aadc7f944e files/digest-emul-linux-x86-xlibs-20071128-r1 298
 RMD160 55d28514c481333f4bcf91dce43d0ac9e069112e files/digest-emul-linux-x86-xlibs-20071128-r1 298
 SHA256 681ba607674882454ce3fb9fc099808e0cd9777d5190e7c290c9eee228a2425e files/digest-emul-linux-x86-xlibs-20071128-r1 298
+MD5 2695931d38169b0c599e70aadc7f944e files/digest-emul-linux-x86-xlibs-20071128-r2 298
+RMD160 55d28514c481333f4bcf91dce43d0ac9e069112e files/digest-emul-linux-x86-xlibs-20071128-r2 298
+SHA256 681ba607674882454ce3fb9fc099808e0cd9777d5190e7c290c9eee228a2425e files/digest-emul-linux-x86-xlibs-20071128-r2 298
 MD5 a55c4f343d9618bc1a4a150a5e8cb5b7 files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 RMD160 b2aa26190ce707dd4b76781411a330eb969fad6d files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 SHA256 d55a7ea48c2d304b9c92b8e50d8232e023aa53f2ba7b6a2cbbf33d4aa399d72a files/digest-emul-linux-x86-xlibs-7.0-r8 3347
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHTfbvkT4lNIS36YERAsOUAJ9twa2WFm6Fqa9coqc3bUjNQYa7MgCfUElx
-cYy5twpU5kU9sYwy0p//13M=
-=11v0
+iD8DBQFHUIj9KhnDs22gwa8RApeoAKCE3c4Qaxw475z3bQ038q+by7SzQACfQyPv
+SOIGbf8EMORJ63lNQo6TfbA=
+=qDnU
 -----END PGP SIGNATURE-----
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