summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-04-11 18:54:49 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-04-11 18:54:49 +0000
commit3de0b7e7f94f604a7cdd9b20e043ef4b562e38fc (patch)
tree7d2c20efb11cfcc846987c1a86a68296651e63fe /dev-python
parentAdded metadata (Manifest recommit) (diff)
downloadgentoo-2-3de0b7e7f94f604a7cdd9b20e043ef4b562e38fc.tar.gz
gentoo-2-3de0b7e7f94f604a7cdd9b20e043ef4b562e38fc.tar.bz2
gentoo-2-3de0b7e7f94f604a7cdd9b20e043ef4b562e38fc.zip
Fixes for xorg-x11 compatibility.
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/PyOpenGL/ChangeLog6
-rw-r--r--dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild18
2 files changed, 17 insertions, 7 deletions
diff --git a/dev-python/PyOpenGL/ChangeLog b/dev-python/PyOpenGL/ChangeLog
index b5769eac3672..6d4652163864 100644
--- a/dev-python/PyOpenGL/ChangeLog
+++ b/dev-python/PyOpenGL/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/PyOpenGL
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyOpenGL/ChangeLog,v 1.22 2004/04/10 04:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyOpenGL/ChangeLog,v 1.23 2004/04/11 18:54:49 spyderous Exp $
+
+ 11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ PyOpenGL-2.0.0.44.ebuild:
+ Fixes for xorg-x11 compatibility.
09 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
PyOpenGL-2.0.0.44.ebuild:
diff --git a/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild b/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild
index 974a2b67326d..18b4e08764ed 100644
--- a/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild
+++ b/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild,v 1.23 2004/04/10 04:35:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyOpenGL/PyOpenGL-2.0.0.44.ebuild,v 1.24 2004/04/11 18:54:49 spyderous Exp $
inherit eutils distutils virtualx
@@ -38,13 +38,19 @@ src_install () {
pkg_setup () {
if [ -e /etc/env.d/09opengl ]
then
- VOID=$(cat /etc/env.d/09opengl | grep xfree)
+ # Set up X11 implementation
+ X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+ X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+ X11_IMPLEM="${X11_IMPLEM##*\/}"
+ einfo "X11 implementation is ${X11_IMPLEM}."
- USING_XFREE=$?
- if [ ${USING_XFREE} -eq 1 ]
+ VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
+
+ USING_X11=$?
+ if [ ${USING_X11} -eq 1 ]
then
GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
- opengl-update xfree
+ opengl-update ${X11_IMPLEM}
fi
else
die "Could not find /etc/env.d/09opengl. Please run opengl-update."
@@ -52,7 +58,7 @@ pkg_setup () {
}
pkg_postinst () {
- if [ ${USING_XFREE} -eq 1 ]
+ if [ ${USING_X11} -eq 1 ]
then
opengl-update ${GL_IMPLEM}
fi