diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2008-05-27 18:42:33 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2008-05-27 18:42:33 +0000 |
commit | 45e3c51cbb6fd4d20b1f1ffe36df457f78814fd7 (patch) | |
tree | 7f1b2b12b0f4b4d6cb71501318d0764b04819e43 /eclass/x-modular.eclass | |
parent | Typo: CONFIGURE_OPTIONS, not CONFIGURE_OPTIONTS. Custom configure options wer... (diff) | |
download | gentoo-2-45e3c51cbb6fd4d20b1f1ffe36df457f78814fd7.tar.gz gentoo-2-45e3c51cbb6fd4d20b1f1ffe36df457f78814fd7.tar.bz2 gentoo-2-45e3c51cbb6fd4d20b1f1ffe36df457f78814fd7.zip |
Allow ebuilds to override the module they download from, so we need less special-casing in here.
Diffstat (limited to 'eclass/x-modular.eclass')
-rw-r--r-- | eclass/x-modular.eclass | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/eclass/x-modular.eclass b/eclass/x-modular.eclass index f6586a1fadfd..2329bc65241f 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.98 2008/05/27 18:40:19 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.99 2008/05/27 18:42:33 dberkholz Exp $ # # @ECLASS: x-modular.eclass # @MAINTAINER: @@ -45,27 +45,35 @@ fi # Set up SRC_URI for individual modular releases BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" -if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then - MODULE="app" -elif [[ ${CATEGORY} = app-doc ]]; then - MODULE="doc" -# x11-misc contains data and util, x11-themes contains data -elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then - if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then - MODULE="data" - else - MODULE="util" +if [[ -z ${MODULE} ]]; then +# @ECLASS-VARIABLE: MODULE +# @DESCRIPTION: +# 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. + MODULE="" + if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then + MODULE="app" + elif [[ ${CATEGORY} = app-doc ]]; then + MODULE="doc" + # x11-misc contains data and util, x11-themes contains data + elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then + if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then + MODULE="data" + else + MODULE="util" + fi + elif [[ ${CATEGORY} = x11-drivers ]]; then + MODULE="driver" + elif [[ ${CATEGORY} = media-fonts ]]; then + MODULE="font" + elif [[ ${CATEGORY} = x11-libs ]]; then + MODULE="lib" + elif [[ ${CATEGORY} = x11-proto ]]; then + MODULE="proto" + elif [[ ${CATEGORY} = x11-base ]]; then + MODULE="xserver" fi -elif [[ ${CATEGORY} = x11-drivers ]]; then - MODULE="driver" -elif [[ ${CATEGORY} = media-fonts ]]; then - MODULE="font" -elif [[ ${CATEGORY} = x11-libs ]]; then - MODULE="lib" -elif [[ ${CATEGORY} = x11-proto ]]; then - MODULE="proto" -elif [[ ${CATEGORY} = x11-base ]]; then - MODULE="xserver" fi if [[ -n ${GIT_ECLASS} ]]; then |