summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-25 20:36:39 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-25 20:36:39 +0000
commita3d7782768b38a7f41e25da8900cc1d76e0d3965 (patch)
treee4533e3239c5d25aa0f8b45a5ccc8c59cd011963 /dev-python/pyopengl
parentfix digest, Manifest (diff)
downloadgentoo-2-a3d7782768b38a7f41e25da8900cc1d76e0d3965.tar.gz
gentoo-2-a3d7782768b38a7f41e25da8900cc1d76e0d3965.tar.bz2
gentoo-2-a3d7782768b38a7f41e25da8900cc1d76e0d3965.zip
Use proper env.d file.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-python/pyopengl')
-rw-r--r--dev-python/pyopengl/ChangeLog6
-rw-r--r--dev-python/pyopengl/pyopengl-2.0.0.44.ebuild12
-rw-r--r--dev-python/pyopengl/pyopengl-2.0.1.09.ebuild3
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog
index 988b35ce10b9..0735a8e16d76 100644
--- a/dev-python/pyopengl/ChangeLog
+++ b/dev-python/pyopengl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pyopengl
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.6 2005/01/25 02:27:51 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.7 2005/01/25 20:36:39 eradicator Exp $
+
+ 25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
+ Use proper env.d file.
*pyopengl-2.0.1.09 (25 Jan 2005)
diff --git a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
index c657de0eb8d5..07f89562b945 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-2005 Gentoo Foundation
# 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.5 2005/01/25 02:27:51 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.6 2005/01/25 20:36:39 eradicator Exp $
MY_P=${P/pyopengl/PyOpenGL}
S=${WORKDIR}/${MY_P}
@@ -40,7 +40,9 @@ src_install() {
}
pkg_setup() {
- if [ -e /etc/env.d/09opengl ]
+ local ENVFILE=/etc/env.d/03opengl
+ [ -f /etc/env.d/09opengl ] && ENVFILE=/etc/env.d/09opengl
+ if [ -e ${ENVFILE} ]
then
# Set up X11 implementation
X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
@@ -48,16 +50,16 @@ pkg_setup() {
X11_IMPLEM="${X11_IMPLEM##*\/}"
einfo "X11 implementation is ${X11_IMPLEM}."
- VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
+ VOID=$(cat ${ENVFILE} | grep ${X11_IMPLEM})
USING_X11=$?
if [ "${USING_X11}" -eq "1" ]
then
- GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
+ GL_IMPLEM=$(cat ${ENVFILE} | cut -f5 -d/)
opengl-update ${X11_IMPLEM}
fi
else
- die "Could not find /etc/env.d/09opengl. Please run opengl-update."
+ die "Could not find ${ENVFILE}. Please run opengl-update."
fi
}
diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
index 9946fc46010a..658f3ec3f82a 100644
--- a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
+++ b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.1 2005/01/25 02:27:51 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.2 2005/01/25 20:36:39 eradicator Exp $
MY_P=${P/pyopengl/PyOpenGL}
S=${WORKDIR}/${MY_P}
@@ -32,4 +32,3 @@ src_install() {
export python="virtualmake"
distutils_src_install
}
-