diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-05-31 18:59:42 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-05-31 18:59:42 +0000 |
| commit | 3482c7593156930b06d63ab92655f5d425905c63 (patch) | |
| tree | 425053358b5ddba8a13eae9637a89d201ae680fb /x11-base | |
| parent | Fix kloeri's name in changelog. (diff) | |
| download | historical-3482c7593156930b06d63ab92655f5d425905c63.tar.gz historical-3482c7593156930b06d63ab92655f5d425905c63.tar.bz2 historical-3482c7593156930b06d63ab92655f5d425905c63.zip | |
Added livecd check from spyderous. Since this only affects livecd users, the version/revision has not been changed.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/opengl-update/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-base/opengl-update/Manifest | 10 | ||||
| -rw-r--r-- | x11-base/opengl-update/files/opengl-update-2.2.1 | 17 |
3 files changed, 24 insertions, 10 deletions
diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog index e1ca6467e4d8..2665970605e7 100644 --- a/x11-base/opengl-update/ChangeLog +++ b/x11-base/opengl-update/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/opengl-update # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.94 2005/05/27 06:49:38 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.95 2005/05/31 18:59:42 wolf31o2 Exp $ + + 31 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> + files/opengl-update-2.2.1: + Added livecd check from spyderous. Since this only affects livecd users, the + version/revision has not been changed. 27 May 2005; Joseph Jezak <josejx@gentoo.org> opengl-update-2.2.1.ebuild: Marked ppc stable. diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest index 21a50606b19b..3f8a5d978d89 100644 --- a/x11-base/opengl-update/Manifest +++ b/x11-base/opengl-update/Manifest @@ -1,9 +1,9 @@ -MD5 9bf2eedae21caa6883cba8adadecf9ac ChangeLog 17429 -MD5 6cae34c9865539c34b8b126a72572fde opengl-update-2.1.1-r1.ebuild 2327 +MD5 6f3b521b1b2eeb86ce70ce20652554ab ChangeLog 17635 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366 MD5 390e390c55fef1c8422291224e928a0d opengl-update-2.2.1.ebuild 2676 -MD5 ca73e0f8c9b114553216930eb0eb601a files/glxext.h-inttypes.patch 677 -MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1-r1 116 +MD5 6cae34c9865539c34b8b126a72572fde opengl-update-2.1.1-r1.ebuild 2327 MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.1 116 -MD5 8a6efc292494ae5d925a37fa10fcc7c7 files/opengl-update-2.2.1 9642 MD5 91d9c17541be018d065a7838d7149c86 files/opengl-update-2.1.1 9110 +MD5 78f2778d5b41874016deb3135122b189 files/opengl-update-2.2.1 9849 +MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1-r1 116 +MD5 ca73e0f8c9b114553216930eb0eb601a files/glxext.h-inttypes.patch 677 diff --git a/x11-base/opengl-update/files/opengl-update-2.2.1 b/x11-base/opengl-update/files/opengl-update-2.2.1 index 759a8c042c17..28ca4d5e8313 100644 --- a/x11-base/opengl-update/files/opengl-update-2.2.1 +++ b/x11-base/opengl-update/files/opengl-update-2.2.1 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.1,v 1.2 2005/04/27 21:45:29 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.1,v 1.3 2005/05/31 18:59:42 wolf31o2 Exp $ # Author: Martin Schlemmer <azarah@gentoo.org> # Further modifications by Donnie Berkholz <spyderous@gentoo.org> # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org> @@ -31,9 +31,18 @@ check_user() { } check_version() { - if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then - eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" - exit 1 + # Don't die if we're booting from CD, since we probably lack portageq + for opt in $(</proc/cmdline); do + case ${opt} in + cdroot) local cdroot="true" ;; + esac + done + + if [[ -z "${cdroot}" ]]; then + if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then + eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" + exit 1 + fi fi } |