| 1 |
commit: 8504220bd56d70e8e3780a8b33366c063acd08cc |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 6 15:13:05 2011 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 6 15:48:37 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8504220b |
| 7 |
|
| 8 |
[eclass] Simplify -- put the slash in MODULE instead of PACKAGE. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/xorg-2.eclass | 24 +++++++++++------------- |
| 12 |
1 files changed, 11 insertions(+), 13 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass |
| 15 |
index b160be8..f9a267e 100644 |
| 16 |
--- a/eclass/xorg-2.eclass |
| 17 |
+++ b/eclass/xorg-2.eclass |
| 18 |
@@ -68,30 +68,28 @@ BASE_INDIVIDUAL_URI="http://xorg.freedesktop.org/releases/individual" |
| 19 |
# inherit to override the default autoconfigured module. |
| 20 |
if [[ -z ${MODULE} ]]; then |
| 21 |
case ${CATEGORY} in |
| 22 |
- app-doc) MODULE="doc" ;; |
| 23 |
- media-fonts) MODULE="font" ;; |
| 24 |
- x11-apps|x11-wm) MODULE="app" ;; |
| 25 |
- x11-misc|x11-themes) MODULE="util" ;; |
| 26 |
- x11-drivers) MODULE="driver" ;; |
| 27 |
- x11-base) MODULE="xserver" ;; |
| 28 |
- x11-proto) MODULE="proto" ;; |
| 29 |
- x11-libs) MODULE="lib" ;; |
| 30 |
- *) MODULE="" ;; |
| 31 |
+ app-doc) MODULE=doc/ ;; |
| 32 |
+ media-fonts) MODULE=font/ ;; |
| 33 |
+ x11-apps|x11-wm) MODULE=app/ ;; |
| 34 |
+ x11-misc|x11-themes) MODULE=util/ ;; |
| 35 |
+ x11-drivers) MODULE=driver/ ;; |
| 36 |
+ x11-base) MODULE=xserver/ ;; |
| 37 |
+ x11-proto) MODULE=proto/ ;; |
| 38 |
+ x11-libs) MODULE=lib/ ;; |
| 39 |
+ *) MODULE= ;; |
| 40 |
esac |
| 41 |
fi |
| 42 |
|
| 43 |
# @ECLASS-VARIABLE: PACKAGE_NAME |
| 44 |
# @DESCRIPTION: |
| 45 |
-# For git checkout the git repository migth differ from package name. |
| 46 |
+# For git checkout the git repository might differ from package name. |
| 47 |
# This variable can be used for proper directory specification |
| 48 |
: ${PACKAGE_NAME:=${PN}} |
| 49 |
-# PACKAGE_NAME can be empty value |
| 50 |
-[[ -n ${PACKAGE_NAME} ]] && PACKAGE_NAME="/${PACKAGE_NAME}" |
| 51 |
|
| 52 |
if [[ -n ${GIT_ECLASS} ]]; then |
| 53 |
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/${MODULE}${PACKAGE_NAME}" |
| 54 |
else |
| 55 |
- SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}/${P}.tar.bz2" |
| 56 |
+ SRC_URI+=" ${BASE_INDIVIDUAL_URI}/${MODULE}${P}.tar.bz2" |
| 57 |
fi |
| 58 |
|
| 59 |
: ${SLOT:=0} |
Archives