diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2008-06-13 16:40:21 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-06-13 16:40:21 +0000 |
| commit | 91a25b67d70a3e5bb26804afc96e3420117e9818 (patch) | |
| tree | 0c0c5f7f94602b28cd0eb2ffde1dfdbe274a3a12 /eclass | |
| parent | alpha/ia64/sparc/x86 stable (diff) | |
| download | gentoo-2-91a25b67d70a3e5bb26804afc96e3420117e9818.tar.gz gentoo-2-91a25b67d70a3e5bb26804afc96e3420117e9818.tar.bz2 gentoo-2-91a25b67d70a3e5bb26804afc96e3420117e9818.zip | |
(#226187) The MODULE override wasn't working correctly because of a logic error made when refactoring.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/x-modular.eclass | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index 271d31520870..1a24aaa285ad 100644 --- a/eclass/x-modular.eclass +++ b/eclass/x-modular.eclass @@ -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/eclass/x-modular.eclass,v 1.100 2008/05/28 01:48:10 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.101 2008/06/13 16:40:21 dberkholz Exp $ # # @ECLASS: x-modular.eclass # @MAINTAINER: @@ -50,17 +50,19 @@ BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" # The subdirectory to download source from. Possible settings are app, # doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. -[[ -z ${MODULE} ]] && MODULE="" -case ${CATEGORY} in - app-doc) MODULE="doc" ;; - media-fonts) MODULE="font" ;; - x11-apps|x11-wm) MODULE="app" ;; - x11-misc|x11-themes) MODULE="util" ;; - x11-drivers) MODULE="driver" ;; - x11-base) MODULE="xserver" ;; - x11-proto) MODULE="proto" ;; - x11-libs) MODULE="lib" ;; -esac +if [[ -z ${MODULE} ]]; then + MODULE="" + case ${CATEGORY} in + app-doc) MODULE="doc" ;; + media-fonts) MODULE="font" ;; + x11-apps|x11-wm) MODULE="app" ;; + x11-misc|x11-themes) MODULE="util" ;; + x11-drivers) MODULE="driver" ;; + x11-base) MODULE="xserver" ;; + x11-proto) MODULE="proto" ;; + x11-libs) MODULE="lib" ;; + esac +fi if [[ -n ${GIT_ECLASS} ]]; then EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}/${PN}" |