diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-08-10 05:42:06 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-08-10 05:42:06 +0000 |
| commit | 473b7cb51a587d0a6fe23e36287ad8db954ad948 (patch) | |
| tree | d7ae71ac60e77aaf7235ee207284ecc486842861 /media-libs/mesa | |
| parent | Make compatible with opengl-update. Reported by Georgi Georgiev <chutz@gg3.net>. (diff) | |
| download | gentoo-2-473b7cb51a587d0a6fe23e36287ad8db954ad948.tar.gz gentoo-2-473b7cb51a587d0a6fe23e36287ad8db954ad948.tar.bz2 gentoo-2-473b7cb51a587d0a6fe23e36287ad8db954ad948.zip | |
Stop cleaning out /usr/lib/opengl/xorg-x11, now that two other packages also install to it.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'media-libs/mesa')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.3.1.1.ebuild | 19 |
2 files changed, 6 insertions, 19 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index b09f71cfe87c..ba80c2e9d7ae 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/mesa # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.10 2005/08/10 05:20:38 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.11 2005/08/10 05:42:06 spyderous Exp $ + + 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild: + Stop cleaning out /usr/lib/opengl/xorg-x11, now that two other packages also + install to it. 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-3.5.ebuild: Drop old version. diff --git a/media-libs/mesa/mesa-6.3.1.1.ebuild b/media-libs/mesa/mesa-6.3.1.1.ebuild index f8bdf821ffd1..c5e1207d6170 100644 --- a/media-libs/mesa/mesa-6.3.1.1.ebuild +++ b/media-libs/mesa/mesa-6.3.1.1.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/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.1 2005/08/10 05:17:10 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.2 2005/08/10 05:42:06 spyderous Exp $ inherit eutils toolchain-funcs @@ -102,10 +102,6 @@ src_install() { # as the default libGL.so.1 } -pkg_preinst() { - dynamic_libgl_preinst -} - pkg_postinst() { switch_opengl_implem } @@ -132,19 +128,6 @@ dynamic_libgl_install() { eend 0 } -dynamic_libgl_preinst() { - # clean the dynamic libGL stuff's home to ensure - # we don't have stale libs floating around - if [ -d ${ROOT}/usr/$(get_libdir)/opengl/${PN} ]; then - rm -rf ${ROOT}/usr/$(get_libdir)/opengl/${PN}/* - fi - - # make sure we do not have any stale files lying around - # that could break things. Check old and new locations. - rm -f ${ROOT}/usr/X11R6/$(get_libdir)/libGL\.* \ - ${ROOT}/usr/$(get_libdir)/libGL\.* -} - switch_opengl_implem() { # Switch to the xorg implementation. # Use new opengl-update that will not reset user selected |