diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-15 17:50:51 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-08-15 17:50:51 +0000 |
| commit | aa108397266f662da56c8b6b2d550726f6868a01 (patch) | |
| tree | f3cc35b32e70db3e3f2bf3a9b85c7ef7bf2bc51e /x11-base | |
| parent | fix manifest (diff) | |
| download | historical-aa108397266f662da56c8b6b2d550726f6868a01.tar.gz historical-aa108397266f662da56c8b6b2d550726f6868a01.tar.bz2 historical-aa108397266f662da56c8b6b2d550726f6868a01.zip | |
Further style cleanups.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/opengl-update/Manifest | 10 | ||||
| -rw-r--r-- | x11-base/opengl-update/files/opengl-update-3.0.0.eselect | 22 |
2 files changed, 13 insertions, 19 deletions
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest index 982e4c396f69..78a5b15d932c 100644 --- a/x11-base/opengl-update/Manifest +++ b/x11-base/opengl-update/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 MD5 5a759a7a2ac05a74c6db8744e6b7ed08 ChangeLog 19162 MD5 69eeef9cee49974bcaae3cb9ddce8abd metadata.xml 366 -MD5 97763afc6c6c1ede790cc49d3b64f2e2 opengl-update-3.0.0.ebuild 2683 MD5 47e72283d661e1735ac1b23e65bebf74 opengl-update-2.2.1.ebuild 2661 +MD5 97763afc6c6c1ede790cc49d3b64f2e2 opengl-update-3.0.0.ebuild 2683 MD5 9ee8e7fcccc74e1ee7e79a75cbeeb4ee opengl-update-2.2.3.ebuild 2671 MD5 78f2778d5b41874016deb3135122b189 files/opengl-update-2.2.1 9849 MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.1 116 MD5 ae5b820a1034139870f7b0867f37be17 files/opengl-update-2.2.2 9702 -MD5 d46282d2702875eda8bb4ee151f8abb3 files/opengl-update-3.0.0.eselect 9565 +MD5 5e28e892bcf0594e5c3b0291753cf32d files/opengl-update-3.0.0.eselect 9552 MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.3 116 MD5 541a391b04dd49521480458bac48529d files/opengl-update-2.2.3 9859 MD5 91d9c17541be018d065a7838d7149c86 files/opengl-update-2.1.1 9110 @@ -19,7 +19,7 @@ MD5 d6b4a7de2926d22a6b52f4d129ce3e7f files/digest-opengl-update-3.0.0 116 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFC/lhXArHZZzCEUG0RAjW9AJ9VdoEtZd3YqEyOx9HAf5GPuxX+YwCfUqEv -g/QKcIFSWtG/7DN+ojdt5ok= -=DpxM +iD8DBQFDANYXArHZZzCEUG0RAiWBAKCK+tWy6L4nWZeCZlqZC1M7tAETAgCfUetz +SBH9xDAhwFngWfU/WtYXcME= +=9LuH -----END PGP SIGNATURE----- diff --git a/x11-base/opengl-update/files/opengl-update-3.0.0.eselect b/x11-base/opengl-update/files/opengl-update-3.0.0.eselect index 3538e12e6c86..92613933e3d6 100644 --- a/x11-base/opengl-update/files/opengl-update-3.0.0.eselect +++ b/x11-base/opengl-update/files/opengl-update-3.0.0.eselect @@ -1,6 +1,6 @@ # 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-3.0.0.eselect,v 1.3 2005/08/13 20:29:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-3.0.0.eselect,v 1.4 2005/08/15 17:50:51 eradicator 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> @@ -18,12 +18,6 @@ PREFIX="${ROOT}/usr" DST_PREFIX="${ROOT}/usr" USE_PROFILE_HEADERS="no" -check_user() { - if [[ $(id -u) -ne 0 ]]; then - die -q "Must be run as root." - fi -} - check_version() { if portageq has_version / 'x11-base/xorg-x11'; then if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then @@ -67,7 +61,7 @@ set_new_implementation() { local AVAIL_IMPLEMS=$(get_implementations) check_version - check_user + check_root # Set a sane umask... bug #83115 umask 022 @@ -108,11 +102,11 @@ set_new_implementation() { # linked just needs the .so for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/libGL{,core}.{so,a,la}; do [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} + [[ -f "$(basename ${file})" ]] && rm -f $(basename ${file}) # Fix libtool archives (#48297) if [[ "${file%.la}" != "${file}" ]]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} + sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > $(basename ${file}) else ln -s ${file} fi @@ -129,11 +123,11 @@ set_new_implementation() { for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/lib/tls/libGL{,core}.{so,a,la}; do [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} + [[ -f "$(basename ${file})" ]] && rm -f $(basename ${file}) # Fix libtool archives (#48297) if [ "${file%.la}" != "${file}" ]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} + sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > $(basename ${file}) else ln -s ${file} fi @@ -158,11 +152,11 @@ set_new_implementation() { for file in ${PREFIX}/${LIBDIR}/opengl/${GL_LOCAL}/extensions/*.{so,a,la}; do [[ -f "${file}" ]] || continue - [[ -f "${file##*/}" ]] && rm -f ${file##*/} + [[ -f "$(basename ${file})" ]] && rm -f $(basename ${file}) # Fix libtool archives (#48297) if [[ "${file%.la}" != "${file}" ]]; then - sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > ${file##*/} + sed "s:${PREFIX}/[^/]*/opengl/[^/]*/lib:${DST_PREFIX}/${LIBDIR}:g" ${file} > $(basename ${file}) else ln -s ${file} fi |