diff options
| -rw-r--r-- | dev-python/pyopengl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyopengl/Manifest | 16 | ||||
| -rw-r--r-- | dev-python/pyopengl/pyopengl-2.0.0.44.ebuild | 30 | ||||
| -rw-r--r-- | dev-python/pyopengl/pyopengl-2.0.1.09.ebuild | 11 |
4 files changed, 22 insertions, 41 deletions
diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog index 0735a8e16d76..3ba7258948f5 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.7 2005/01/25 20:36:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.8 2005/01/26 01:27:30 fserb Exp $ + + 25 Jan 2005; Fernando Serboncini <fserb@gentoo.org> + pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: + Fixed opengl-update switch on both ebuilds. Fixes #76928 25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest index b8c59fd2f08b..b76e39701ddb 100644 --- a/dev-python/pyopengl/Manifest +++ b/dev-python/pyopengl/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 -MD5 f41d85b6971705e0ca0b1aa1c5d8c588 pyopengl-2.0.0.44.ebuild 1656 MD5 e1e1b85d6fda02b91925dd39a8386bd8 ChangeLog 3928 -MD5 f56f143795197308b23ca12614f10124 pyopengl-2.0.1.09.ebuild 818 +MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159 +MD5 1ec6575b2df0aef6dea9ad94b452fed5 pyopengl-2.0.0.44.ebuild 1095 +MD5 aaa6edbba2b622394e88fd25e4f3ac06 pyopengl-2.0.1.09.ebuild 954 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.4.0 (GNU/Linux) - -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 07f89562b945..55f70c303cb5 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.6 2005/01/25 20:36:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.7 2005/01/26 01:27:30 fserb Exp $ MY_P=${P/pyopengl/PyOpenGL} S=${WORKDIR}/${MY_P} @@ -40,32 +40,10 @@ src_install() { } pkg_setup() { - 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)" - X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}" - X11_IMPLEM="${X11_IMPLEM##*\/}" - einfo "X11 implementation is ${X11_IMPLEM}." - - VOID=$(cat ${ENVFILE} | grep ${X11_IMPLEM}) - - USING_X11=$? - if [ "${USING_X11}" -eq "1" ] - then - GL_IMPLEM=$(cat ${ENVFILE} | cut -f5 -d/) - opengl-update ${X11_IMPLEM} - fi - else - die "Could not find ${ENVFILE}. Please run opengl-update." - fi + CURRENT="$(opengl-update --get-implementation)" + opengl-update xorg-x11 } pkg_postinst() { - if [ "${USING_X11}" -eq "1" ] - then - opengl-update ${GL_IMPLEM} - fi + opengl-update ${CURRENT} } diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild index 658f3ec3f82a..00dee374233f 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.2 2005/01/25 20:36:39 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.3 2005/01/26 01:27:30 fserb Exp $ MY_P=${P/pyopengl/PyOpenGL} S=${WORKDIR}/${MY_P} @@ -32,3 +32,12 @@ src_install() { export python="virtualmake" distutils_src_install } + +pkg_setup() { + CURRENT="$(opengl-update --get-implementation)" + opengl-update xorg-x11 +} + +pkg_postinst() { + opengl-update ${CURRENT} +} |