/[gentoo-x86]/eclass/cvs.eclass
Gentoo

Diff of /eclass/cvs.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.56 Revision 1.76
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2010 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.56 2005/07/06 20:20:03 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.76 2010/08/25 19:57:53 vapier Exp $
4 4
5# Current Maintainer: Tal Peer <coredumb@gentoo.org> 5# @ECLASS: cvs.eclass
6# Original Author: Dan Armak <danarmak@gentoo.org> 6# @MAINTAINER:
7 7# vapier@gentoo.org (and anyone who wants to help)
8# SSH auth code by Danny <danny.milo@gmx.net> 8# @BLURB: This eclass provides generic cvs fetching functions
9 9# @DESCRIPTION:
10# SSH password authentication support and host key verification
11# support by Jeremy Maitin-Shepard <jbms@gentoo.org>
12
13
14# This eclass provides the generic cvs fetching functions. To use 10# This eclass provides the generic cvs fetching functions. To use this from an
15# this from an ebuild, set the `ebuild-configurable settings' as 11# ebuild, set the ECLASS VARIABLES as specified below in your ebuild before
16# specified below in your ebuild before inheriting. Then either leave 12# inheriting. Then either leave the default src_unpack or extend over
17# the default src_unpack or extend over cvs_src_unpack. If you find 13# cvs_src_unpack. If you find that you need to call the cvs_* functions
18# that you need to call the cvs_* functions directly, I'd be
19# interested to hear about it. 14# directly, I'd be interested to hear about it.
15
16inherit eutils
20 17
21# TODO: 18# TODO:
22 19
23# Implement more auth types (gserver?, kserver?) 20# Implement more auth types (gserver?, kserver?)
24 21
25# Support additional remote shells with `ext' authentication (does 22# Support additional remote shells with `ext' authentication (does
26# anyone actually need to use it with anything other than SSH?) 23# anyone actually need to use it with anything other than SSH?)
27 24
28
29INHERITED="$INHERITED $ECLASS"
30 25
31# Users shouldn't change these settings! The ebuild/eclass inheriting 26# Users shouldn't change these settings! The ebuild/eclass inheriting
32# this eclass will take care of that. If you want to set the global 27# this eclass will take care of that. If you want to set the global
33# KDE cvs ebuilds' settings, see the comments in kde-source.eclass. 28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
34 29
35# --- begin ebuild-configurable settings 30# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
31# @DESCRIPTION:
32# Set the default compression level. Has no effect when ECVS_CVS_COMMAND
33# is defined by ebuild/user.
34: ${ECVS_CVS_COMPRESS:=-z1}
36 35
37# ECVS_CVS_COMMAND -- CVS command to run 36# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
37# @DESCRIPTION:
38# Additional options to the cvs commands. Has no effect when ECVS_CVS_COMMAND
39# is defined by ebuild/user.
40: ${ECVS_CVS_OPTIONS:=-q -f}
41
42# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
43# @DESCRIPTION:
44# CVS command to run
38# 45#
39# You can set, for example, "cvs -t" for extensive debug information 46# You can set, for example, "cvs -t" for extensive debug information
40# on the cvs connection. The default of "cvs -q -f -z4" means to be 47# on the cvs connection. The default of "cvs -q -f -z4" means to be
41# quiet, to disregard the ~/.cvsrc config file and to use maximum 48# quiet, to disregard the ~/.cvsrc config file and to use maximum
42# compression. 49# compression.
50: ${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}}
43 51
44[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 52# @ECLASS-VARIABLE: ECVS_UP_OPTS
53# @DESCRIPTION:
54# CVS options given after the cvs update command. Don't remove "-dP" or things
55# won't work.
56: ${ECVS_UP_OPTS:=-dP}
45 57
58# @ECLASS-VARIABLE: ECVS_CO_OPTS
59# @DEFAULT_UNSET
60# @DESCRIPTION:
61# CVS options given after the cvs checkout command.
46 62
47# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs 63# @ECLASS-VARIABLE: ECVS_OFFLINE
48# command (update or checkout). 64# @DESCRIPTION:
49# 65# Set this variable to a non-empty value to disable the automatic updating of
50# Don't remove -dP from update or things won't work. 66# a CVS source tree. This is intended to be set outside the cvs source
67# tree by users.
68: ${ECVS_OFFLINE:=${ESCM_OFFLINE}}
51 69
52[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP" 70# @ECLASS-VARIABLE: ECVS_LOCAL
53[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS="" 71# @DEFAULT_UNSET
54 72# @DESCRIPTION:
55
56# ECVS_LOCAL -- If this is set, the CVS module will be fetched 73# If this is set, the CVS module will be fetched non-recursively.
57# non-recursively. Refer to the information in the CVS man page 74# Refer to the information in the CVS man page regarding the -l
58# regarding the -l command option (not the -l global option). 75# command option (not the -l global option).
59 76
60 77# @ECLASS-VARIABLE: ECVS_LOCALNAME
78# @DEFAULT_UNSET
79# @DESCRIPTION:
61# ECVS_LOCALNAME -- local name of checkout directory 80# Local name of checkout directory
62# 81#
63# This is useful if the module on the server is called something 82# This is useful if the module on the server is called something
64# common like 'driver' or is nested deep in a tree, and you don't like 83# common like 'driver' or is nested deep in a tree, and you don't like
65# useless empty directories. 84# useless empty directories.
66# 85#
67# WARNING: Set this only from within ebuilds! If set in your shell or 86# WARNING: Set this only from within ebuilds! If set in your shell or
68# some such, things will break because the ebuild won't expect it and 87# some such, things will break because the ebuild won't expect it and
69# have e.g. a wrong $S setting. 88# have e.g. a wrong $S setting.
70 89
71 90# @ECLASS-VARIABLE: ECVS_TOP_DIR
91# @DESCRIPTION:
72# ECVS_TOP_DIR -- The directory under which CVS modules are checked 92# The directory under which CVS modules are checked out.
73# out.
74
75[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 93[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
76 94
77# ECVS_SERVER -- CVS path 95# @ECLASS-VARIABLE: ECVS_SERVER
96# @DESCRIPTION:
97# CVS path
78# 98#
79# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde". 99# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
80# Remove the other parts of the full CVSROOT, which might look like 100# Remove the other parts of the full CVSROOT, which might look like
81# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated 101# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
82# using other settings also. 102# using other settings also.
83# 103#
84# Set this to "offline" to disable fetching (i.e. to assume the module 104# Set this to "offline" to disable fetching (i.e. to assume the module
85# is already checked out in ECVS_TOP_DIR). 105# is already checked out in ECVS_TOP_DIR).
86
87[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 106[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
88 107
89 108# @ECLASS-VARIABLE: ECVS_MODULE
109# @REQUIRED
110# @DESCRIPTION:
90# ECVS_MODULE -- the name of the CVS module to be fetched 111# The name of the CVS module to be fetched
91# 112#
92# This must be set when cvs_src_unpack is called. This can include 113# This must be set when cvs_src_unpack is called. This can include
93# several directory levels, i.e. "foo/bar/baz" 114# several directory levels, i.e. "foo/bar/baz"
94 115
95#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 116#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
96 117
97 118# @ECLASS-VARIABLE: ECVS_BRANCH
119# @DEFAULT_UNSET
120# @DESCRIPTION:
98# ECVS_BRANCH -- the name of the branch/tag to use 121# The name of the branch/tag to use
99 122#
100# The default is "HEAD". The following default _will_ reset your 123# The default is "HEAD". The following default _will_ reset your
101# branch checkout to head if used. 124# branch checkout to head if used.
102 125
103#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 126#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
104 127
105 128# @ECLASS-VARIABLE: ECVS_AUTH
129# @DESCRIPTION:
106# ECVS_AUTH -- authentication method to use 130# Authentication method to use
107# 131#
108# Possible values are "pserver" and "ext". If `ext' authentication is 132# Possible values are "pserver" and "ext". If `ext' authentication is
109# used, the remote shell to use can be specified in CVS_RSH (SSH is 133# used, the remote shell to use can be specified in CVS_RSH (SSH is
110# used by default). Currently, the only supported remote shell for 134# used by default). Currently, the only supported remote shell for
111# `ext' authentication is SSH. 135# `ext' authentication is SSH.
… …
116# e.g. 140# e.g.
117# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System" 141# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
118# ( from gnustep-apps/textedit ) 142# ( from gnustep-apps/textedit )
119[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 143[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
120 144
145# @ECLASS-VARIABLE: ECVS_USER
146# @DESCRIPTION:
121# ECVS_USER -- Username to use for authentication on the remote server 147# Username to use for authentication on the remote server.
122[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 148[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
123 149
124 150# @ECLASS-VARIABLE: ECVS_PASS
151# @DESCRIPTION:
125# ECVS_PASS -- Password to use for authentication on the remote server 152# Password to use for authentication on the remote server
126[ -z "$ECVS_PASS" ] && ECVS_PASS="" 153[ -z "$ECVS_PASS" ] && ECVS_PASS=""
127 154
128 155# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
129# ECVS_SSH_HOST_KEY 156# @DEFAULT_UNSET
130# 157# @DESCRIPTION:
131# If SSH is used for `ext' authentication, use this variable to 158# If SSH is used for `ext' authentication, use this variable to
132# specify the host key of the remote server. The format of the value 159# specify the host key of the remote server. The format of the value
133# should be the same format that is used for the SSH known hosts file. 160# should be the same format that is used for the SSH known hosts file.
134# 161#
135# WARNING: If a SSH host key is not specified using this variable, the 162# WARNING: If a SSH host key is not specified using this variable, the
136# remote host key will not be verified. 163# remote host key will not be verified.
137 164
138 165# @ECLASS-VARIABLE: ECVS_CLEAN
166# @DEFAULT_UNSET
167# @DESCRIPTION:
139# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the 168# Set this to get a clean copy when updating (passes the
140# -C option to cvs update) 169# -C option to cvs update)
141 170
142 171# @ECLASS-VARIABLE: ECVS_RUNAS
143# ECVS_RUNAS 172# @DEFAULT_UNSET
144# 173# @DESCRIPTION:
145# Specifies an alternate (non-root) user to use to run cvs. Currently 174# Specifies an alternate (non-root) user to use to run cvs. Currently
146# b0rked and wouldn't work with portage userpriv anyway without 175# b0rked and wouldn't work with portage userpriv anyway without
147# special magic. 176# special magic.
148 177
149# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 178# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
150 179
151
152# ECVS_SUBDIR -- deprecated, do not use 180# ECVS_SUBDIR -- deprecated, do not use
153[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild." 181[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
154
155
156# --- end ebuild-configurable settings ---
157 182
158# add cvs to deps 183# add cvs to deps
159# ssh is used for ext auth 184# ssh is used for ext auth
160# sudo is used to run as a specified user 185# sudo is used to run as a specified user
161DEPEND="$DEPEND dev-util/cvs app-admin/sudo" 186DEPEND="dev-vcs/cvs"
187
188[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
162 189
163if [ "$ECVS_AUTH" == "ext" ]; then 190if [ "$ECVS_AUTH" == "ext" ]; then
164 #default to ssh 191 #default to ssh
165 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh" 192 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
166 if [ "$CVS_RSH" != "ssh" ]; then 193 if [ "$CVS_RSH" != "ssh" ]; then
167 die "Support for ext auth with clients other than ssh has not been implemented yet" 194 die "Support for ext auth with clients other than ssh has not been implemented yet"
168 fi 195 fi
169 DEPEND="$DEPEND net-misc/openssh" 196 DEPEND="${DEPEND} net-misc/openssh"
170fi 197fi
171 198
172# called from cvs_src_unpack 199# called from cvs_src_unpack
173cvs_fetch() { 200cvs_fetch() {
174 201
… …
177 204
178 local ECVS_COMMAND="${ECVS_COMMAND}" 205 local ECVS_COMMAND="${ECVS_COMMAND}"
179 local ECVS_UP_OPTS="${ECVS_UP_OPTS}" 206 local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
180 local ECVS_CO_OPTS="${ECVS_CO_OPTS}" 207 local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
181 208
182 # Fix for sourceforge which doesnt want -z>3 anymore.
183
184 (echo $ECVS_SERVER | grep -q sourceforge) \
185 && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
186 && ECVS_CVS_COMMAND="cvs -q -f -z3"
187
188 debug-print-function $FUNCNAME $* 209 debug-print-function $FUNCNAME $*
189 210
190 # Update variables that are modified by ebuild parameters, which 211 # Update variables that are modified by ebuild parameters, which
191 # should be effective every time cvs_fetch is called, and not just 212 # should be effective every time cvs_fetch is called, and not just
192 # every time cvs.eclass is inherited 213 # every time cvs.eclass is inherited
193 214
194
195 # Handle parameter for local (non-recursive) fetching 215 # Handle parameter for local (non-recursive) fetching
196 216
197 if [ -n "$ECVS_LOCAL" ]; then 217 if [ -n "$ECVS_LOCAL" ]; then
198 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 218 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
199 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 219 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
200 fi 220 fi
201 221
202 # Handle ECVS_BRANCH option 222 # Handle ECVS_BRANCH option
203 # 223 #
204 # Because CVS auto-switches branches, we just have to pass the 224 # Because CVS auto-switches branches, we just have to pass the
205 # correct -rBRANCH option when updating. 225 # correct -rBRANCH option when updating.
206 226
207 if [ -n "$ECVS_BRANCH" ]; then 227 if [ -n "$ECVS_BRANCH" ]; then
208 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 228 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
… …
278 # be put in Root 298 # be put in Root
279 if [ "$ECVS_AUTH" == "no" ] 299 if [ "$ECVS_AUTH" == "no" ]
280 then 300 then
281 local server="${ECVS_USER}@${ECVS_SERVER}" 301 local server="${ECVS_USER}@${ECVS_SERVER}"
282 else 302 else
303 local connection="${ECVS_AUTH}"
304 [[ -n ${ECVS_PROXY} ]] && connection="${connection};proxy=${ECVS_PROXY}"
305 [[ -n ${ECVS_PROXY_PORT} ]] && connection="${connection};proxyport=${ECVS_PROXY_PORT}"
283 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 306 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
284 fi 307 fi
285 308
286 # Switch servers automagically if needed 309 # Switch servers automagically if needed
287 if [ "$mode" == "update" ]; then 310 if [ "$mode" == "update" ]; then
288 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 311 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
… …
339 eval $cmdlogin || die "cvs login command failed" 362 eval $cmdlogin || die "cvs login command failed"
340 if [ "${mode}" == "update" ]; then 363 if [ "${mode}" == "update" ]; then
341 einfo "Running $cmdupdate" 364 einfo "Running $cmdupdate"
342 eval $cmdupdate || die "cvs update command failed" 365 eval $cmdupdate || die "cvs update command failed"
343 elif [ "${mode}" == "checkout" ]; then 366 elif [ "${mode}" == "checkout" ]; then
344 einfo "Running $cmdcheckout" 367 einfo "Running $cmdcheckout"
345 eval $cmdcheckout|| die "cvs checkout command failed" 368 eval $cmdcheckout|| die "cvs checkout command failed"
346 fi 369 fi
347 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then 370 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
348 371
349 # Hack to support SSH password authentication 372 # Hack to support SSH password authentication
… …
414 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ 437 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
415 >> "${CVS_RSH}" 438 >> "${CVS_RSH}"
416 echo "os.execv('/usr/bin/ssh', newarglist)" \ 439 echo "os.execv('/usr/bin/ssh', newarglist)" \
417 >> "${CVS_RSH}" 440 >> "${CVS_RSH}"
418 441
419 chmod a+x "${CVS_RSH}" 442 chmod a+x "${CVS_RSH}"
420 443
421 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 444 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
422 # if DISPLAY is not set) 445 # if DISPLAY is not set)
423 446
424 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 447 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
425 export DISPLAY 448 export DISPLAY
426 449
427 # Create a dummy executable to echo $ECVS_PASS 450 # Create a dummy executable to echo $ECVS_PASS
428 451
429 export SSH_ASKPASS="${T}/cvs_sshechopass" 452 export SSH_ASKPASS="${T}/cvs_sshechopass"
430 if [ "${ECVS_AUTH}" != "no" ]; then 453 if [ "${ECVS_AUTH}" != "no" ]; then
431 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 454 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
432 > "${SSH_ASKPASS}" 455 > "${SSH_ASKPASS}"
433 else 456 else
434 echo -en "#!/bin/bash\nreturn\n" \ 457 echo -en "#!/bin/bash\nreturn\n" \
435 > "${SSH_ASKPASS}" 458 > "${SSH_ASKPASS}"
436 459
437 fi 460 fi
438 chmod a+x "${SSH_ASKPASS}" 461 chmod a+x "${SSH_ASKPASS}"
439 fi 462 fi
440 463
441 if [ "${mode}" == "update" ]; then 464 if [ "${mode}" == "update" ]; then
442 einfo "Running $cmdupdate" 465 einfo "Running $cmdupdate"
443 eval $cmdupdate || die "cvs update command failed" 466 eval $cmdupdate || die "cvs update command failed"
444 elif [ "${mode}" == "checkout" ]; then 467 elif [ "${mode}" == "checkout" ]; then
445 einfo "Running $cmdcheckout" 468 einfo "Running $cmdcheckout"
446 eval $cmdcheckout|| die "cvs checkout command failed" 469 eval $cmdcheckout|| die "cvs checkout command failed"
447 fi 470 fi
448 471
449 # Restore environment variable values 472 # Restore environment variable values
450 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 473 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
451 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 474 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
452 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 475 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
453 else 476 else
… …
467 chown `whoami` "${T}/cvspass" 490 chown `whoami` "${T}/cvspass"
468 fi 491 fi
469 492
470} 493}
471 494
472 495# @FUNCTION: cvs_src_unpack
496# @DESCRIPTION:
497# The cvs src_unpack function, which will be exported
473cvs_src_unpack() { 498cvs_src_unpack() {
474 499
475 debug-print-function $FUNCNAME $* 500 debug-print-function $FUNCNAME $*
476 501
477 debug-print "$FUNCNAME: init: 502 debug-print "$FUNCNAME: init:
… …
490 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 515 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
491 516
492 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 517 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
493 518
494 if [ -z "$ECVS_LOCALNAME" ]; then 519 if [ -z "$ECVS_LOCALNAME" ]; then
495 ECVS_LOCALNAME="$ECVS_MODULE" 520 ECVS_LOCALNAME="$ECVS_MODULE"
496 fi 521 fi
497 522
498 if [ "$ECVS_SERVER" == "offline" ]; then 523 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
524 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
525 if [[ -n ${!offline_pkg_var}${ECVS_OFFLINE} ]] || [[ "$ECVS_SERVER" == "offline" ]] ; then
499 # We're not required to fetch anything; the module already 526 # We're not required to fetch anything; the module already
500 # exists and shouldn't be updated. 527 # exists and shouldn't be updated.
501 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 528 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
502 debug-print "$FUNCNAME: offline mode" 529 debug-print "$FUNCNAME: offline mode"
503 else 530 else
504 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 531 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
505 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." 532 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
506 fi 533 fi
… …
520 if [ -n "$ECVS_LOCAL" ]; then 547 if [ -n "$ECVS_LOCAL" ]; then
521 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME" 548 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
522 else 549 else
523 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.." 550 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
524 fi 551 fi
552
553 # Not exactly perfect, but should be pretty close #333773
554 export ECVS_VERSION=$(find "$ECVS_TOP_DIR/$ECVS_LOCALNAME/" -ipath '*/CVS/Entries' -exec cat {} + | LC_ALL=C sort | sha1sum | awk '{print $1}')
555 export ESCM_VERSION=${ECVS_VERSION}
525 556
526 # If the directory is empty, remove it; empty directories cannot 557 # If the directory is empty, remove it; empty directories cannot
527 # exist in cvs. This happens when, for example, kde-source 558 # exist in cvs. This happens when, for example, kde-source
528 # requests module/doc/subdir which doesn't exist. Still create 559 # requests module/doc/subdir which doesn't exist. Still create
529 # the empty directory in workdir though. 560 # the empty directory in workdir though.
… …
535 # Implement some of base_src_unpack's functionality; note however 566 # Implement some of base_src_unpack's functionality; note however
536 # that base.eclass may not have been inherited! 567 # that base.eclass may not have been inherited!
537 if [ -n "$PATCHES" ]; then 568 if [ -n "$PATCHES" ]; then
538 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 569 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
539 cd "$S" 570 cd "$S"
540 for x in $PATCHES; do 571 epatch ${PATCHES}
541 debug-print "patching from $x"
542 patch -p0 < "$x"
543 done
544 # Make sure we don't try to apply patches more than once, 572 # Make sure we don't try to apply patches more than once,
545 # since cvs_src_unpack is usually called several times from 573 # since cvs_src_unpack is usually called several times from
546 # e.g. kde-source_src_unpack 574 # e.g. kde-source_src_unpack
547 export PATCHES="" 575 export PATCHES=""
548 fi 576 fi
549 577
550 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 578 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
551} 579}
552 580
553EXPORT_FUNCTIONS src_unpack 581EXPORT_FUNCTIONS src_unpack
Legend:
Removed from v.1.56  
changed lines
  Added in v.1.76
  ViewVC Help
Powered by ViewVC 1.1.13