* [gentoo-commits] eselect r813 - trunk/extern/modules
@ 2011-04-09 17:58 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; only message in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2011-04-09 17:58 UTC (permalink / raw
To: gentoo-commits
Author: chithanh
Date: 2011-04-09 17:58:38 +0000 (Sat, 09 Apr 2011)
New Revision: 813
Modified:
trunk/extern/modules/mesa.eselect
Log:
mesa.eselect: remove code from global scope, bug #362747
Modified: trunk/extern/modules/mesa.eselect
===================================================================
--- trunk/extern/modules/mesa.eselect 2011-03-15 14:51:32 UTC (rev 812)
+++ trunk/extern/modules/mesa.eselect 2011-04-09 17:58:38 UTC (rev 813)
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id: $
@@ -6,7 +6,7 @@
MAINTAINER="x11@gentoo.org"
SVN_DATE='$Date: $'
VERSION=$(svn_date_to_version "${SVN_DATE}" )
-EBUILD_VERSION="0.0.9"
+EBUILD_VERSION="0.0.10"
MESA_CONF_DIR="${EROOT}/usr/share/mesa"
MESA_DIR_64="${EROOT}/usr/lib/mesa"
@@ -14,8 +14,6 @@
MESA_DIR_32="${EROOT}/usr/lib32/mesa"
DRI_DIR_32="${EROOT}/usr/lib32/dri"
-source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config"
-
# receives a filename of the driver as argument, outputs the architecture (classic or gallium)
drivername_to_architecture() {
local drivername=$1
@@ -99,6 +97,7 @@
}
do_show() {
+ source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config"
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " doshow_helper
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " doshow_helper
@@ -130,6 +129,7 @@
}
do_list() {
+ source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config"
if [[ -d "${MESA_DIR_32}" && -d "${DRI_DIR_32}" ]]; then
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="64bit " dolist_helper
MESA_DIR=${MESA_DIR_32} DRI_DIR=${DRI_DIR_32} multiarch="32bit " dolist_helper
@@ -199,6 +199,7 @@
}
do_set() {
+ source "${MESA_CONF_DIR}"/eselect-mesa.conf || die "Failed to source config"
if [[ $1 == "64bit" ]]; then
if [[ -d "${MESA_DIR_64}" && -d "${DRI_DIR_64}" ]]; then
MESA_DIR=${MESA_DIR_64} DRI_DIR=${DRI_DIR_64} multiarch="$1 " doset_helper $2 $3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-04-09 17:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-09 17:58 [gentoo-commits] eselect r813 - trunk/extern/modules Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox