1 |
commit: f9a3f3e22a845cda8c58d5d6b66e0141f0c3ca31 |
2 |
Author: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 4 15:05:50 2011 +0000 |
4 |
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 4 15:05:50 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f9a3f3e22a845cda8c58d5d6b66e0141f0c3ca31 |
7 |
|
8 |
Rather preffer EGIT_SOURCEDIR instead of SOURCE. |
9 |
|
10 |
--- |
11 |
eclass/git-2.eclass | 22 +++++++++++----------- |
12 |
1 files changed, 11 insertions(+), 11 deletions(-) |
13 |
|
14 |
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass |
15 |
index 07322a9..e5a0dc9 100644 |
16 |
--- a/eclass/git-2.eclass |
17 |
+++ b/eclass/git-2.eclass |
18 |
@@ -17,7 +17,7 @@ DEPEND="dev-vcs/git" |
19 |
|
20 |
# This static variable is for storing the data in WORKDIR. |
21 |
# Sometimes we might want to redefine S. |
22 |
-SOURCE="${WORKDIR}/${PN}-${PV}" |
23 |
+EGIT_SOURCEDIR="${WORKDIR}/${P}" |
24 |
|
25 |
# @FUNCTION: git-2_init_variables |
26 |
# @DESCRIPTION: |
27 |
@@ -161,8 +161,8 @@ git-2_submodules() { |
28 |
git-2_branch() { |
29 |
debug-print-function ${FUNCNAME} "$@" |
30 |
|
31 |
- debug-print "${FUNCNAME}: working in \"${SOURCE}\"" |
32 |
- pushd "${SOURCE}" &> /dev/null |
33 |
+ debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\"" |
34 |
+ pushd "${EGIT_SOURCEDIR}" &> /dev/null |
35 |
|
36 |
local branchname=branch-${ESCM_BRANCH} src=origin/${ESCM_BRANCH} |
37 |
if [[ "${ESCM_COMMIT}" != "${ESCM_BRANCH}" ]]; then |
38 |
@@ -235,18 +235,18 @@ git-2_prepare_storedir() { |
39 |
|
40 |
# @FUNCTION: git-2_move_source |
41 |
# @DESCRIPTION: |
42 |
-# Internal function moving sources from the EGIT_DIR to SOURCE dir. |
43 |
+# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir. |
44 |
git-2_move_source() { |
45 |
debug-print-function ${FUNCNAME} "$@" |
46 |
|
47 |
if [[ -n ${ESCM_HAS_SUBMODULES} ]]; then |
48 |
pushd "${EGIT_DIR}" &> /dev/null |
49 |
- debug-print "${FUNCNAME}: rsync -rlpgo . \"${SOURCE}\"" |
50 |
- rsync -rlpgo . "${SOURCE}" || die "${FUNCNAME}: sync of git data to \"${SOURCE}\" failed" |
51 |
+ debug-print "${FUNCNAME}: rsync -rlpgo . \"${EGIT_SOURCEDIR}\"" |
52 |
+ rsync -rlpgo . "${EGIT_SOURCEDIR}" || die "${FUNCNAME}: sync of git data to \"${EGIT_SOURCEDIR}\" failed" |
53 |
popd &> /dev/null |
54 |
else |
55 |
- debug-print "${FUNCNAME}: git clone -l -s -n \"${EGIT_DIR}\" \"${SOURCE}\"" |
56 |
- git clone -l -s -n "${EGIT_DIR}" "${SOURCE}" || die "${FUNCNAME}: sync of git data to \"${SOURCE}\" failed" |
57 |
+ debug-print "${FUNCNAME}: git clone -l -s -n \"${EGIT_DIR}\" \"${EGIT_SOURCEDIR}\"" |
58 |
+ git clone -l -s -n "${EGIT_DIR}" "${EGIT_SOURCEDIR}" || die "${FUNCNAME}: sync of git data to \"${EGIT_SOURCEDIR}\" failed" |
59 |
fi |
60 |
} |
61 |
|
62 |
@@ -349,7 +349,7 @@ git-2_bootstrap() { |
63 |
# combination with --keep-going it would lead in not-updating |
64 |
# pakcages that are up-to-date. |
65 |
if [[ -n ${ESCM_BOOTSTRAP} ]] ; then |
66 |
- pushd "${SOURCE}" &> /dev/null |
67 |
+ pushd "${EGIT_SOURCEDIR}" &> /dev/null |
68 |
einfo "Starting bootstrap" |
69 |
|
70 |
if [[ -f ${ESCM_BOOTSTRAP} ]]; then |
71 |
@@ -389,7 +389,7 @@ git-2_src_unpack() { |
72 |
git-2_gc |
73 |
git-2_move_source |
74 |
git-2_branch |
75 |
- git-2_submodules "${SOURCE}" |
76 |
+ git-2_submodules "${EGIT_SOURCEDIR}" |
77 |
git-2_bootstrap |
78 |
- echo ">>> Unpacked to ${SOURCE}" |
79 |
+ echo ">>> Unpacked to ${EGIT_SOURCEDIR}" |
80 |
} |