| 1 |
dberkholz 08/05/27 18:42:33 |
| 2 |
|
| 3 |
Modified: x-modular.eclass |
| 4 |
Log: |
| 5 |
Allow ebuilds to override the module they download from, so we need less special-casing in here. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.99 eclass/x-modular.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.99&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.99&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.98&r2=1.99 |
| 13 |
|
| 14 |
Index: x-modular.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v |
| 17 |
retrieving revision 1.98 |
| 18 |
retrieving revision 1.99 |
| 19 |
diff -u -r1.98 -r1.99 |
| 20 |
--- x-modular.eclass 27 May 2008 18:40:19 -0000 1.98 |
| 21 |
+++ x-modular.eclass 27 May 2008 18:42:33 -0000 1.99 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2005 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.98 2008/05/27 18:40:19 dberkholz Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.99 2008/05/27 18:42:33 dberkholz Exp $ |
| 27 |
# |
| 28 |
# @ECLASS: x-modular.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -45,27 +45,35 @@ |
| 31 |
|
| 32 |
# Set up SRC_URI for individual modular releases |
| 33 |
BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" |
| 34 |
-if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then |
| 35 |
- MODULE="app" |
| 36 |
-elif [[ ${CATEGORY} = app-doc ]]; then |
| 37 |
- MODULE="doc" |
| 38 |
-# x11-misc contains data and util, x11-themes contains data |
| 39 |
-elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then |
| 40 |
- if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then |
| 41 |
- MODULE="data" |
| 42 |
- else |
| 43 |
- MODULE="util" |
| 44 |
+if [[ -z ${MODULE} ]]; then |
| 45 |
+# @ECLASS-VARIABLE: MODULE |
| 46 |
+# @DESCRIPTION: |
| 47 |
+# The subdirectory to download source from. Possible settings are app, |
| 48 |
+# doc, data, util, driver, font, lib, proto, xserver. Set above the |
| 49 |
+# inherit to override the default autoconfigured module. |
| 50 |
+ MODULE="" |
| 51 |
+ if [[ ${CATEGORY} = x11-apps ]] || [[ ${CATEGORY} = x11-wm ]]; then |
| 52 |
+ MODULE="app" |
| 53 |
+ elif [[ ${CATEGORY} = app-doc ]]; then |
| 54 |
+ MODULE="doc" |
| 55 |
+ # x11-misc contains data and util, x11-themes contains data |
| 56 |
+ elif [[ ${CATEGORY} = x11-misc ]] || [[ ${CATEGORY} = x11-themes ]]; then |
| 57 |
+ if [[ ${PN} == xbitmaps || ${PN} == xcursor-themes || ${PN} == xkbdata ]]; then |
| 58 |
+ MODULE="data" |
| 59 |
+ else |
| 60 |
+ MODULE="util" |
| 61 |
+ fi |
| 62 |
+ elif [[ ${CATEGORY} = x11-drivers ]]; then |
| 63 |
+ MODULE="driver" |
| 64 |
+ elif [[ ${CATEGORY} = media-fonts ]]; then |
| 65 |
+ MODULE="font" |
| 66 |
+ elif [[ ${CATEGORY} = x11-libs ]]; then |
| 67 |
+ MODULE="lib" |
| 68 |
+ elif [[ ${CATEGORY} = x11-proto ]]; then |
| 69 |
+ MODULE="proto" |
| 70 |
+ elif [[ ${CATEGORY} = x11-base ]]; then |
| 71 |
+ MODULE="xserver" |
| 72 |
fi |
| 73 |
-elif [[ ${CATEGORY} = x11-drivers ]]; then |
| 74 |
- MODULE="driver" |
| 75 |
-elif [[ ${CATEGORY} = media-fonts ]]; then |
| 76 |
- MODULE="font" |
| 77 |
-elif [[ ${CATEGORY} = x11-libs ]]; then |
| 78 |
- MODULE="lib" |
| 79 |
-elif [[ ${CATEGORY} = x11-proto ]]; then |
| 80 |
- MODULE="proto" |
| 81 |
-elif [[ ${CATEGORY} = x11-base ]]; then |
| 82 |
- MODULE="xserver" |
| 83 |
fi |
| 84 |
|
| 85 |
if [[ -n ${GIT_ECLASS} ]]; then |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
-- |
| 90 |
gentoo-commits@l.g.o mailing list |
Archives