summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-03-24 19:15:12 +0000
committerFabian Groffen <grobian@gentoo.org>2012-03-24 19:15:12 +0000
commitbcc86a992ae28f419c61f4d3abf714ae9831d097 (patch)
tree501eaa7d0fcb47e5d304dc2a0bcb67bd2138aaae /app-admin
parentsys-kernel/hardened-sources: Based on 3.2.12 + genpatches-3.2-12 + grsecurity... (diff)
downloadhistorical-bcc86a992ae28f419c61f4d3abf714ae9831d097.tar.gz
historical-bcc86a992ae28f419c61f4d3abf714ae9831d097.tar.bz2
historical-bcc86a992ae28f419c61f4d3abf714ae9831d097.zip
Make activation work on Darwin, where libGL.so doesn't exist (but libGL.dylib does), bug #408517
Package-Manager: portage-2.2.01.20271-prefix/cvs/Darwin i386
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect-opengl/ChangeLog7
-rw-r--r--app-admin/eselect-opengl/Manifest22
-rw-r--r--app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild9
3 files changed, 20 insertions, 18 deletions
diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog
index 2e3711fe1706..7eabdd28839b 100644
--- a/app-admin/eselect-opengl/ChangeLog
+++ b/app-admin/eselect-opengl/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-admin/eselect-opengl
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.92 2012/03/05 10:53:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.93 2012/03/24 19:15:12 grobian Exp $
+
+ 24 Mar 2012; Fabian Groffen <grobian@gentoo.org>
+ eselect-opengl-1.2.5-r1.ebuild:
+ Make activation work on Darwin, where libGL.so doesn't exist (but libGL.dylib
+ does), bug #408517
*eselect-opengl-1.2.5-r1 (05 Mar 2012)
diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest
index b4d8c71293e1..348453fa71a5 100644
--- a/app-admin/eselect-opengl/Manifest
+++ b/app-admin/eselect-opengl/Manifest
@@ -12,23 +12,13 @@ DIST glxext.h.33.xz 7328 RMD160 2d21c49d41041da5ea962b65e8d10415dbb3ce8c SHA1 09
EBUILD eselect-opengl-1.2.1.ebuild 1399 RMD160 c6a4d90c4aca0771e36f96f9e3f1dc72a0550e8f SHA1 4936a8a0906021ea98165e3b0d4b7663daa3b3be SHA256 30b93a406483f47e0b46eb70115d790bef9169a13b29c165910751d7f0687140
EBUILD eselect-opengl-1.2.3.ebuild 1387 RMD160 0be35eda99937bbbf7b2ce9e76c6d99c2d90acf2 SHA1 ee6effb6d4e6dbba08565559a3ba3629f948e226 SHA256 9b242ec80da919fe182a5296c05f635ff5bbe5e2009a86cbcce6de19ca6b8d0e
EBUILD eselect-opengl-1.2.4.ebuild 1374 RMD160 033ed28585b0e3b536445aeb4f1e346c8e83ae9e SHA1 f8967fb23ccedef768342f267aa03cd4334463a3 SHA256 bcc832ec284494d58dc74e6a9d0d02e43d7500b26dac5a846852c2d4a591c42f
-EBUILD eselect-opengl-1.2.5-r1.ebuild 1416 RMD160 3875f3b9801c87f0b451e30d853839c525b0b476 SHA1 d3de4ee6b809797e4dd6dc01ebcd8094fda908ab SHA256 a2491ebedc5754a0e8dd3c79348d78b2f6e08695ba118c887cfb8db152a3fcab
-MISC ChangeLog 14041 RMD160 a7318d1126e2ec4a16fd2ae06b1cc8f9ac3d2179 SHA1 0e68876aadac9b8bd13cef2fba0103f16b88f999 SHA256 6789d3cd264a21f5386c069d59a24dec7edd8804a57d7dbb0ed3d62f7136d598
+EBUILD eselect-opengl-1.2.5-r1.ebuild 1566 RMD160 ebc6c78eda22c38c55959c5eb465efef114aa396 SHA1 c26f0385cc60e5a767f7aa0df4bd7d51020de028 SHA256 d377e1f37f676963289886a8414d4d11694341cc232185257e64adac759f9fa5
+MISC ChangeLog 14226 RMD160 d45dcce15914a4dd3cb81bff008a9b466b726227 SHA1 c57297628603bb663fb787380d4d9120bc3ea6e2 SHA256 a85c5fd21bb1f833c1240d9f170ffd5ee5774eb3ebfe8b553e567318d3b25a3d
MISC metadata.xml 259 RMD160 382e7a1f4d02a39797bef61cec79bdd7e2406c8a SHA1 fd3ba970c6901523e731ab8dcfeb162fe26417de SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
-iQIcBAEBAgAGBQJPVJs4AAoJEOSiRoyO7jvosSUQAJB7h+DeKjuRLz9YdbjLiPcG
-5knLUnNJcTHCnGrcEFEk66efJdO/sc5hGs2u8SOKGB+ykWl8z6HDEqSyzVFmOp+T
-UiaKQlLt3O3s/amJfT4OViSOZF/GHi9uDV09NafpXKZIockIYX3ZBVvPmLfPmi8w
-NPCWAS53mWR60dy7NlGzSgfQcISmKREnGQTc2bSl2ZeWeHA55kU+4GwHjk5UEE75
-4YwX54H+JqPvj9gkSMSHicwx2xMTSQaeAb3fC4NsRi3wiJFclE34vL4lYpw8jsLT
-1hZ4+QQON/rQVYPs9O5xf/KkrR96l+thlmBO59vV7smkv6Lof4iOGThsfpBwMhKR
-CuphmyHDPeYajorZTZJyHTa3FVp9NbmSPgGRan6hUc9NtsRdSFZRRAS6Wtr/A6UN
-C9ZRHSvTJVtEzdq0UtXhXFIDbiBvQnSi+3PlZDhqINvk5G/xFvVElve8cpgfhBG9
-jGhMt4HH9zLQIdIjZ2EPdzEXkwYWIG7FZ7DZP9Rh0pa4J3sV9UWVwXmigyMNJKX5
-p5PNOBrHg8VSnhTQ4UkPXUbnjce3K0Jt1CfsZndqEO/prMsFXPUF3hUwFw7npDkz
-y2EG/ZDMxpgHGKuFfIbmXb2lma0F/jVUVPPgyetbS0ggCEGCkxXtdZB7sN2f8Q33
-HtVlPDJyFuBJqDC/dKYv
-=pDXt
+iEYEARECAAYFAk9uHWgACgkQX3X2B8XHTolmvACfYXLv522uEPJMuWW2eeYs/qIe
+h64AnA7F2J5Zdi8CNNwPskHdqHWJfXSz
+=fV6S
-----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
index 10661a2874f7..2ad11ce0a04c 100644
--- a/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
+++ b/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.1 2012/03/05 10:53:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild,v 1.2 2012/03/24 19:15:12 grobian Exp $
EAPI=4
@@ -35,6 +35,13 @@ pkg_postinst() {
fi
}
+src_prepare() {
+ # don't die on Darwin users
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ sed -i -e 's/libGL\.so/libGL.dylib/' opengl.eselect || die
+ fi
+}
+
src_install() {
insinto "/usr/share/eselect/modules"
doins opengl.eselect