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
commitba69468349fecb83d46a794cf47977e3638303aa (patch)
tree11ac872308e2c159d7cb010b7d4f2264c012b9e4 /dev-python
parentfix digest, Manifest (diff)
downloadhistorical-ba69468349fecb83d46a794cf47977e3638303aa.tar.gz
historical-ba69468349fecb83d46a794cf47977e3638303aa.tar.bz2
historical-ba69468349fecb83d46a794cf47977e3638303aa.zip
Use proper env.d file.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/pyopengl/ChangeLog6
-rw-r--r--dev-python/pyopengl/Manifest14
-rw-r--r--dev-python/pyopengl/pyopengl-2.0.0.44.ebuild12
-rw-r--r--dev-python/pyopengl/pyopengl-2.0.1.09.ebuild3
4 files changed, 20 insertions, 15 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/Manifest b/dev-python/pyopengl/Manifest
index 43e97dbb3c17..b8c59fd2f08b 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,18 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 78caf81280e874b3781c32f0644f1245 ChangeLog 3786
MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 4a7c1b4e3eb8eb7ae98e2cb62d89e875 pyopengl-2.0.0.44.ebuild 1593
-MD5 be7bb302fd9c594ba126593dfa62c37e pyopengl-2.0.1.09.ebuild 814
+MD5 f41d85b6971705e0ca0b1aa1c5d8c588 pyopengl-2.0.0.44.ebuild 1656
+MD5 e1e1b85d6fda02b91925dd39a8386bd8 ChangeLog 3928
+MD5 f56f143795197308b23ca12614f10124 pyopengl-2.0.1.09.ebuild 818
MD5 67d2ad027cfd6d411a585b0e346606a8 files/config.diff 1175
MD5 9feca450998c720327067463fea8cdc0 files/digest-pyopengl-2.0.0.44 70
MD5 ba0f0760a4a22fa7666205b8a5f4f514 files/pyopengl-2.0.0.44-disable_togl.patch 406
MD5 1160aa70c95cda6bac58711ef532c929 files/digest-pyopengl-2.0.1.09 70
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
-iD8DBQFB9a7AxtZcznfol0URAsDCAJ0dxbT3d8kMWoBhwIvkFpKaI/PBsQCbB68A
-F59kbKGn439W2MVNQ+c4VQs=
-=Ixr/
+iD8DBQFB9q3hArHZZzCEUG0RAsOGAJ9Mhy2sRfEUwh5F5iEdL6EuXvM7bgCfXVT8
+JZcTH3IQaV9oClM0aSMvUew=
+=WZK2
-----END PGP SIGNATURE-----
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
}
-