* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2011-12-27 22:40 Jesus Rivero (neurogeek)
0 siblings, 0 replies; 13+ messages in thread
From: Jesus Rivero (neurogeek) @ 2011-12-27 22:40 UTC (permalink / raw
To: gentoo-commits
neurogeek 11/12/27 22:40:50
Modified: ChangeLog subversion.eclass
Log:
Handle UUID mismatch by deleting working copy and checking out it again. Patch by Arfrever.
Revision Changes Path
1.60 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.59&r2=1.60
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog 27 Dec 2011 17:55:12 -0000 1.59
+++ ChangeLog 27 Dec 2011 22:40:50 -0000 1.60
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.59 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.60 2011/12/27 22:40:50 neurogeek Exp $
+
+ 27 Dec 2011; Jesus Rivero <neurogeek@gentoo.org> subversion.eclass:
+ Handle UUID mismatch by deleting working copy and checking out it again.
+ Patch by Arfrever.
27 Dec 2011; Christian Faulhammer <fauli@gentoo.org> rox-0install.eclass,
apache-2.eclass, common-lisp-common-2.eclass, gnustep-2.eclass,
1.72 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.71&r2=1.72
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- subversion.eclass 14 Dec 2011 23:40:18 -0000 1.71
+++ subversion.eclass 27 Dec 2011 22:40:50 -0000 1.72
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.71 2011/12/14 23:40:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.72 2011/12/27 22:40:50 neurogeek Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -283,7 +283,25 @@
fi
if [[ -z ${esvn_up_freq} ]]; then
- if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
+ if [[ ${ESVN_WC_UUID} != $(subversion__svn_info "${repo_uri}" "Repository UUID") ]]; then
+ # UUID mismatch. Delete working copy and check out it again.
+ einfo "subversion recheck out start -->"
+ einfo " old UUID: ${ESVN_WC_UUID}"
+ einfo " new UUID: $(subversion__svn_info "${repo_uri}" "Repository UUID")"
+ einfo " repository: ${repo_uri}${revision:+@}${revision}"
+
+ rm -fr "${ESVN_PROJECT}" || die
+
+ debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
+
+ mkdir -m 775 -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
+ cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
+ if [[ -n "${ESVN_USER}" ]]; then
+ ${ESVN_FETCH_CMD} ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
+ else
+ ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch to ${wc_path} from ${repo_uri}."
+ fi
+ elif [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
einfo "subversion switch start -->"
einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
einfo " new repository: ${repo_uri}${revision:+@}${revision}"
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-02-02 3:17 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-02-02 3:17 UTC (permalink / raw
To: gentoo-commits
floppym 12/02/02 03:17:56
Modified: ChangeLog subversion.eclass
Log:
Introduce ESVN_UMASK variable to override default umask. Patch by Arfrever.
Revision Changes Path
1.111 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.110&r2=1.111
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog 31 Jan 2012 23:02:00 -0000 1.110
+++ ChangeLog 2 Feb 2012 03:17:56 -0000 1.111
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.110 2012/01/31 23:02:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.111 2012/02/02 03:17:56 floppym Exp $
+
+ 02 Feb 2012; Mike Gilbert <floppym@gentoo.org> subversion.eclass:
+ Introduce ESVN_UMASK variable to override default umask. Patch by Arfrever.
31 Jan 2012; Markos Chandras <hwoarang@gentoo.org> qt4-build.eclass:
Initial EAPI4 support in qt4-build eclass
1.73 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.72&r2=1.73
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- subversion.eclass 27 Dec 2011 22:40:50 -0000 1.72
+++ subversion.eclass 2 Feb 2012 03:17:56 -0000 1.73
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.72 2011/12/27 22:40:50 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.73 2012/02/02 03:17:56 floppym Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -156,6 +156,12 @@
# tree by users.
ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}"
+# @ECLASS-VARIABLE: ESVN_UMASK
+# @DESCRIPTION:
+# Set this variable to custom umask.
+# This is intended to be set by users.
+ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}"
+
# @ECLASS-VARIABLE: ESVN_UP_FREQ
# @DESCRIPTION:
# Set the minimum number of hours between svn up'ing in any given svn module. This is particularly
@@ -215,6 +221,10 @@
addread "/etc/subversion"
addwrite "${ESVN_STORE_DIR}"
+ if [[ -n "${ESVN_UMASK}" ]]; then
+ eumask_push "${ESVN_UMASK}"
+ fi
+
if [[ ! -d ${ESVN_STORE_DIR} ]]; then
debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
@@ -331,6 +341,10 @@
fi
fi
+ if [[ -n "${ESVN_UMASK}" ]]; then
+ eumask_pop
+ fi
+
einfo " working copy: ${wc_path}"
if ! has "export" ${ESVN_RESTRICT}; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-02-21 18:03 Justin Lecher (jlec)
0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher (jlec) @ 2012-02-21 18:03 UTC (permalink / raw
To: gentoo-commits
jlec 12/02/21 18:03:49
Modified: ChangeLog subversion.eclass
Log:
Respect ESVN_USER, ESVN_PASSWORD and ESVN_OPTIONS on repo update, #401737
Revision Changes Path
1.140 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.139&r2=1.140
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- ChangeLog 20 Feb 2012 10:14:44 -0000 1.139
+++ ChangeLog 21 Feb 2012 18:03:49 -0000 1.140
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.139 2012/02/20 10:14:44 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.140 2012/02/21 18:03:49 jlec Exp $
+
+ 21 Feb 2012; Justin Lecher <jlec@gentoo.org> subversion.eclass:
+ Respect ESVN_USER, ESVN_PASSWORD and ESVN_OPTIONS on repo update, #401737
20 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass:
Use WORKDIR instead of T for temporary GNUstep.conf, fixes bug #389859
1.75 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.74&r2=1.75
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- subversion.eclass 14 Feb 2012 16:08:11 -0000 1.74
+++ subversion.eclass 21 Feb 2012 18:03:49 -0000 1.75
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.74 2012/02/14 16:08:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.75 2012/02/21 18:03:49 jlec Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -473,7 +473,9 @@
local target="${1}"
local key="${2}"
- env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2-
+ env LC_ALL=C svn info \
+ ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" \
+ "${target}" | grep -i "^${key}" | cut -d" " -f2-
}
## -- subversion__get_repository_uri() --------------------------------------- #
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-04-01 19:19 Mike Gilbert (floppym)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Gilbert (floppym) @ 2012-04-01 19:19 UTC (permalink / raw
To: gentoo-commits
floppym 12/04/01 19:19:40
Modified: ChangeLog subversion.eclass
Log:
ESCM_OFFLINE -> EVCS_OFFLINE. Bug 410471.
Revision Changes Path
1.196 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.196&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.196&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.195&r2=1.196
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- ChangeLog 30 Mar 2012 16:41:40 -0000 1.195
+++ ChangeLog 1 Apr 2012 19:19:40 -0000 1.196
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.195 2012/03/30 16:41:40 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.196 2012/04/01 19:19:40 floppym Exp $
+
+ 01 Apr 2012; Mike Gilbert <floppym@gentoo.org> subversion.eclass:
+ ESCM_OFFLINE -> EVCS_OFFLINE. Bug 410471.
30 Mar 2012; Krzysztof Pawlik <nelchael@gentoo.org>
python-distutils-ng.eclass:
1.76 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.75&r2=1.76
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- subversion.eclass 21 Feb 2012 18:03:49 -0000 1.75
+++ subversion.eclass 1 Apr 2012 19:19:40 -0000 1.76
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.75 2012/02/21 18:03:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.76 2012/04/01 19:19:40 floppym Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -154,7 +154,7 @@
# Set this variable to a non-empty value to disable the automatic updating of
# an svn source tree. This is intended to be set outside the subversion source
# tree by users.
-ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}"
+ESVN_OFFLINE="${ESVN_OFFLINE:-${EVCS_OFFLINE}}"
# @ECLASS-VARIABLE: ESVN_UMASK
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-06-10 10:08 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-06-10 10:08 UTC (permalink / raw
To: gentoo-commits
hattya 12/06/10 10:08:36
Modified: ChangeLog subversion.eclass
Log:
update @MAINTAINER and minor cleanup.
Revision Changes Path
1.301 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.301&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.301&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.300&r2=1.301
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- ChangeLog 9 Jun 2012 22:14:03 -0000 1.300
+++ ChangeLog 10 Jun 2012 10:08:36 -0000 1.301
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.300 2012/06/09 22:14:03 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.301 2012/06/10 10:08:36 hattya Exp $
+
+ 10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ update @MAINTAINER and minor cleanup.
09 Jun 2012; Julian Ospald <hasufell@gentoo.org> games.eclass:
fix for games.eclass wrt bug #336626 #c21
1.77 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.76&r2=1.77
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- subversion.eclass 1 Apr 2012 19:19:40 -0000 1.76
+++ subversion.eclass 10 Jun 2012 10:08:36 -0000 1.77
@@ -1,12 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.76 2012/04/01 19:19:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.77 2012/06/10 10:08:36 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
# Akinori Hattori <hattya@gentoo.org>
-# Bo Ørsted Andresen <zlin@gentoo.org>
-# Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
# @AUTHOR:
# Original Author: Akinori Hattori <hattya@gentoo.org>
# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
@@ -203,7 +201,6 @@
# check for the protocol
local protocol="${repo_uri%%:*}"
-
case "${protocol}" in
http|https)
if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
@@ -276,6 +273,7 @@
svn upgrade "${wc_path}" &>/dev/null
svn cleanup "${wc_path}" &>/dev/null
subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
+
if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
fi
@@ -364,7 +362,6 @@
fi
popd > /dev/null
-
echo
}
@@ -379,42 +376,32 @@
cd "${S}"
if [[ -n ${ESVN_PATCHES} ]]; then
- einfo "apply patches -->"
-
local patch fpatch
-
+ einfo "apply patches -->"
for patch in ${ESVN_PATCHES}; do
if [[ -f ${patch} ]]; then
epatch "${patch}"
-
else
for fpatch in ${FILESDIR}/${patch}; do
if [[ -f ${fpatch} ]]; then
epatch "${fpatch}"
-
else
die "${ESVN}: ${patch} not found"
-
fi
done
-
fi
done
-
echo
fi
if [[ -n ${ESVN_BOOTSTRAP} ]]; then
einfo "begin bootstrap -->"
-
if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
-
else
einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
-
fi
fi
}
@@ -423,7 +410,7 @@
# @DESCRIPTION:
# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
subversion_src_unpack() {
- subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
+ subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
if has "${EAPI:-0}" 0 1; then
subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
fi
@@ -473,28 +460,25 @@
local target="${1}"
local key="${2}"
- env LC_ALL=C svn info \
- ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" \
- "${target}" | grep -i "^${key}" | cut -d" " -f2-
+ env LC_ALL=C svn info ${options} --username "${ESVN_USER}" --password "${ESVN_PASSWORD}" "${target}" \
+ | grep -i "^${key}" \
+ | cut -d" " -f2-
}
## -- subversion__get_repository_uri() --------------------------------------- #
#
# param $1 - a repository URI.
subversion__get_repository_uri() {
- local repo_uri="${1}"
+ local repo_uri="${1}"
debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
-
if [[ -z ${repo_uri} ]]; then
die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
fi
-
# delete trailing slash
if [[ -z ${repo_uri##*/} ]]; then
repo_uri="${repo_uri%/}"
fi
-
repo_uri="${repo_uri%@*}"
echo "${repo_uri}"
@@ -516,19 +500,17 @@
# param $1 - a repository URI.
subversion__get_peg_revision() {
local repo_uri="${1}"
+ local peg_rev=
debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
-
- # repo_uri has peg revision ?
- if [[ ${repo_uri} != *@* ]]; then
+ # repo_uri has peg revision?
+ if [[ ${repo_uri} = *@* ]]; then
+ peg_rev="${repo_uri##*@}"
+ debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
+ else
debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
fi
- local peg_rev=
- [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
-
- debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
-
echo "${peg_rev}"
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-06-10 11:05 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-06-10 11:05 UTC (permalink / raw
To: gentoo-commits
hattya 12/06/10 11:05:46
Modified: ChangeLog subversion.eclass
Log:
fixes bug #416743.
Revision Changes Path
1.302 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.302&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.302&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.301&r2=1.302
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- ChangeLog 10 Jun 2012 10:08:36 -0000 1.301
+++ ChangeLog 10 Jun 2012 11:05:46 -0000 1.302
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.301 2012/06/10 10:08:36 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.302 2012/06/10 11:05:46 hattya Exp $
+
+ 10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ fixes bug #416743.
10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
update @MAINTAINER and minor cleanup.
1.78 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.77&r2=1.78
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- subversion.eclass 10 Jun 2012 10:08:36 -0000 1.77
+++ subversion.eclass 10 Jun 2012 11:05:46 -0000 1.78
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.77 2012/06/10 10:08:36 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.78 2012/06/10 11:05:46 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -231,7 +231,7 @@
mkdir -m 775 -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
fi
- pushd "${ESVN_STORE_DIR}" > /dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
+ pushd "${ESVN_STORE_DIR}" >/dev/null || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
local wc_path="$(subversion__get_wc_path "${repo_uri}")"
local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
@@ -361,7 +361,7 @@
rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
fi
- popd > /dev/null
+ popd >/dev/null
echo
}
@@ -522,16 +522,15 @@
# config protection.
subversion_pkg_preinst() {
local pkgdate=$(date "+%Y%m%d %H:%M:%S")
- subversion_wc_info "${1:-${ESVN_REPO_URI}}"
+ subversion_wc_info "${1}"
if [[ -n ${ESCM_LOGDIR} ]]; then
local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
if [[ ! -d ${dir} ]]; then
- mkdir -p "${dir}" || \
- eerror "Failed to create '${dir}' for logging svn revision to '${PORTDIR_SCM}'"
+ mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
fi
local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
if [[ -d ${dir} ]]; then
- echo "${logmessage}" >> "${dir}/${PN}.log"
+ echo "${logmessage}" >>"${dir}/${PN}.log"
else
eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-06-10 11:31 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-06-10 11:31 UTC (permalink / raw
To: gentoo-commits
hattya 12/06/10 11:31:12
Modified: ChangeLog subversion.eclass
Log:
reorder public functions
Revision Changes Path
1.303 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.303&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.303&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.302&r2=1.303
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- ChangeLog 10 Jun 2012 11:05:46 -0000 1.302
+++ ChangeLog 10 Jun 2012 11:31:12 -0000 1.303
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.302 2012/06/10 11:05:46 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.303 2012/06/10 11:31:12 hattya Exp $
+
+ 10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ reorder public functions
10 Jun 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
fixes bug #416743.
1.79 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.78&r2=1.79
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- subversion.eclass 10 Jun 2012 11:05:46 -0000 1.78
+++ subversion.eclass 10 Jun 2012 11:31:12 -0000 1.79
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.78 2012/06/10 11:05:46 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.79 2012/06/10 11:31:12 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -406,23 +406,6 @@
fi
}
-# @FUNCTION: subversion_src_unpack
-# @DESCRIPTION:
-# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
-subversion_src_unpack() {
- subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
- if has "${EAPI:-0}" 0 1; then
- subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
- fi
-}
-
-# @FUNCTION: subversion_src_prepare
-# @DESCRIPTION:
-# Default src_prepare. Bootstrap.
-subversion_src_prepare() {
- subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
-}
-
# @FUNCTION: subversion_wc_info
# @USAGE: [repo_uri]
# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
@@ -449,6 +432,46 @@
export ESVN_WC_PATH="${wc_path}"
}
+# @FUNCTION: subversion_src_unpack
+# @DESCRIPTION:
+# Default src_unpack. Fetch and, in older EAPIs, bootstrap.
+subversion_src_unpack() {
+ subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
+ if has "${EAPI:-0}" 0 1; then
+ subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
+ fi
+}
+
+# @FUNCTION: subversion_src_prepare
+# @DESCRIPTION:
+# Default src_prepare. Bootstrap.
+subversion_src_prepare() {
+ subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
+}
+
+# @FUNCTION: subversion_pkg_preinst
+# @USAGE: [repo_uri]
+# @DESCRIPTION:
+# Log the svn revision of source code. Doing this in pkg_preinst because we
+# want the logs to stick around if packages are uninstalled without messing with
+# config protection.
+subversion_pkg_preinst() {
+ local pkgdate=$(date "+%Y%m%d %H:%M:%S")
+ subversion_wc_info "${1}"
+ if [[ -n ${ESCM_LOGDIR} ]]; then
+ local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
+ if [[ ! -d ${dir} ]]; then
+ mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
+ fi
+ local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
+ if [[ -d ${dir} ]]; then
+ echo "${logmessage}" >>"${dir}/${PN}.log"
+ else
+ eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
+ fi
+ fi
+}
+
## -- Private Functions
## -- subversion__svn_info() ------------------------------------------------- #
@@ -513,26 +536,3 @@
echo "${peg_rev}"
}
-
-# @FUNCTION: subversion_pkg_preinst
-# @USAGE: [repo_uri]
-# @DESCRIPTION:
-# Log the svn revision of source code. Doing this in pkg_preinst because we
-# want the logs to stick around if packages are uninstalled without messing with
-# config protection.
-subversion_pkg_preinst() {
- local pkgdate=$(date "+%Y%m%d %H:%M:%S")
- subversion_wc_info "${1}"
- if [[ -n ${ESCM_LOGDIR} ]]; then
- local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
- if [[ ! -d ${dir} ]]; then
- mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
- fi
- local logmessage="svn: ${pkgdate} - ${PF}:${SLOT} was merged at revision ${ESVN_WC_REVISION}"
- if [[ -d ${dir} ]]; then
- echo "${logmessage}" >>"${dir}/${PN}.log"
- else
- eerror "Could not log the message '${logmessage}' to '${dir}/${PN}.log'"
- fi
- fi
-}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-07-29 3:37 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-07-29 3:37 UTC (permalink / raw
To: gentoo-commits
hattya 12/07/29 03:37:37
Modified: ChangeLog subversion.eclass
Log:
remove DESCRIPTION variable wrt bug #428304
Revision Changes Path
1.358 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.358&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.358&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.357&r2=1.358
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- ChangeLog 28 Jul 2012 15:52:23 -0000 1.357
+++ ChangeLog 29 Jul 2012 03:37:36 -0000 1.358
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.357 2012/07/28 15:52:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.358 2012/07/29 03:37:36 hattya Exp $
+
+ 29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ remove DESCRIPTION variable wrt bug #428304
28 Jul 2012; Julian Ospald <hasufell@gentoo.org> games.eclass:
omg, we checked the dirs in ${S} instead of ${D} which accidentially
1.80 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.79&r2=1.80
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- subversion.eclass 10 Jun 2012 11:31:12 -0000 1.79
+++ subversion.eclass 29 Jul 2012 03:37:37 -0000 1.80
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.79 2012/06/10 11:31:12 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.80 2012/07/29 03:37:37 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -25,8 +25,6 @@
;;
esac
-DESCRIPTION="Based on the ${ECLASS} eclass"
-
SUBVERSION_DEPEND="dev-vcs/subversion
net-misc/rsync"
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-07-29 4:26 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-07-29 4:26 UTC (permalink / raw
To: gentoo-commits
hattya 12/07/29 04:26:10
Modified: ChangeLog subversion.eclass
Log:
remove obsolete workaround (ESVN_DISABLE_DEPENDENCIES)
Revision Changes Path
1.359 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.359&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.359&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.358&r2=1.359
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- ChangeLog 29 Jul 2012 03:37:36 -0000 1.358
+++ ChangeLog 29 Jul 2012 04:26:10 -0000 1.359
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.358 2012/07/29 03:37:36 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.359 2012/07/29 04:26:10 hattya Exp $
+
+ 29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ remove obsolete workaround (ESVN_DISABLE_DEPENDENCIES)
29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
remove DESCRIPTION variable wrt bug #428304
1.81 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.80&r2=1.81
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- subversion.eclass 29 Jul 2012 03:37:37 -0000 1.80
+++ subversion.eclass 29 Jul 2012 04:26:10 -0000 1.81
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.80 2012/07/29 03:37:37 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.81 2012/07/29 04:26:10 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -25,13 +25,9 @@
;;
esac
-SUBVERSION_DEPEND="dev-vcs/subversion
+DEPEND="dev-vcs/subversion
net-misc/rsync"
-if [[ -z "${ESVN_DISABLE_DEPENDENCIES}" ]]; then
- DEPEND="${SUBVERSION_DEPEND}"
-fi
-
# @ECLASS-VARIABLE: ESVN_STORE_DIR
# @DESCRIPTION:
# subversion sources store directory. Users may override this in /etc/make.conf
@@ -139,12 +135,6 @@
# don't export the working copy to S.
ESVN_RESTRICT="${ESVN_RESTRICT:-}"
-# @ECLASS-VARIABLE: ESVN_DISABLE_DEPENDENCIES
-# @DESCRIPTION:
-# Set this variable to a non-empty value to disable the automatic inclusion of
-# Subversion in dependencies.
-ESVN_DISABLE_DEPENDENCIES="${ESVN_DISABLE_DEPENDENCIES:-}"
-
# @ECLASS-VARIABLE: ESVN_OFFLINE
# @DESCRIPTION:
# Set this variable to a non-empty value to disable the automatic updating of
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-07-29 5:38 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-07-29 5:38 UTC (permalink / raw
To: gentoo-commits
hattya 12/07/29 05:38:42
Modified: ChangeLog subversion.eclass
Log:
replace built_with_use by USE deps wrt bug #242100
Revision Changes Path
1.360 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.360&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.360&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.359&r2=1.360
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog 29 Jul 2012 04:26:10 -0000 1.359
+++ ChangeLog 29 Jul 2012 05:38:42 -0000 1.360
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.359 2012/07/29 04:26:10 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.360 2012/07/29 05:38:42 hattya Exp $
+
+ 29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ replace built_with_use by USE deps wrt bug #242100
29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
remove obsolete workaround (ESVN_DISABLE_DEPENDENCIES)
1.82 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.81&r2=1.82
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- subversion.eclass 29 Jul 2012 04:26:10 -0000 1.81
+++ subversion.eclass 29 Jul 2012 05:38:42 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.81 2012/07/29 04:26:10 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.82 2012/07/29 05:38:42 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -19,14 +19,15 @@
case "${EAPI:-0}" in
0|1)
EXPORT_FUNCTIONS src_unpack pkg_preinst
+ DEPEND="dev-vcs/subversion"
;;
*)
EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
+ DEPEND="|| ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] )"
;;
esac
-DEPEND="dev-vcs/subversion
- net-misc/rsync"
+DEPEND+=" net-misc/rsync"
# @ECLASS-VARIABLE: ESVN_STORE_DIR
# @DESCRIPTION:
@@ -191,14 +192,6 @@
local protocol="${repo_uri%%:*}"
case "${protocol}" in
http|https)
- if ! built_with_use -o dev-vcs/subversion webdav-neon webdav-serf; then
- echo
- eerror "In order to emerge this package, you need to"
- eerror "reinstall Subversion with support for WebDAV."
- eerror "Subversion requires either Neon or Serf to support WebDAV."
- echo
- die "${ESVN}: reinstall Subversion with support for WebDAV."
- fi
;;
svn|svn+ssh)
;;
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2012-07-29 5:54 Akinori Hattori (hattya)
0 siblings, 0 replies; 13+ messages in thread
From: Akinori Hattori (hattya) @ 2012-07-29 5:54 UTC (permalink / raw
To: gentoo-commits
hattya 12/07/29 05:54:17
Modified: ChangeLog subversion.eclass
Log:
add support for file:// URI scheme wrt bug #416649
Revision Changes Path
1.361 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.361&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.361&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.360&r2=1.361
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.360
retrieving revision 1.361
diff -u -r1.360 -r1.361
--- ChangeLog 29 Jul 2012 05:38:42 -0000 1.360
+++ ChangeLog 29 Jul 2012 05:54:17 -0000 1.361
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.360 2012/07/29 05:38:42 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.361 2012/07/29 05:54:17 hattya Exp $
+
+ 29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
+ add support for file:// URI scheme wrt bug #416649
29 Jul 2012; Akinori Hattori <hattya@gentoo.org> subversion.eclass:
replace built_with_use by USE deps wrt bug #242100
1.83 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.82&r2=1.83
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- subversion.eclass 29 Jul 2012 05:38:42 -0000 1.82
+++ subversion.eclass 29 Jul 2012 05:54:17 -0000 1.83
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.82 2012/07/29 05:38:42 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.83 2012/07/29 05:54:17 hattya Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -61,11 +61,12 @@
#
# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
#
-# supported protocols:
+# supported URI schemes:
# http://
# https://
# svn://
# svn+ssh://
+# file://
#
# to peg to a specific revision, append @REV to the repo's uri
ESVN_REPO_URI="${ESVN_REPO_URI:-}"
@@ -188,15 +189,17 @@
[[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
- # check for the protocol
- local protocol="${repo_uri%%:*}"
- case "${protocol}" in
+ # check for the scheme
+ local scheme="${repo_uri%%:*}"
+ case "${scheme}" in
http|https)
;;
svn|svn+ssh)
;;
+ file)
+ ;;
*)
- die "${ESVN}: fetch from '${protocol}' is not yet implemented."
+ die "${ESVN}: fetch from '${scheme}' is not yet implemented."
;;
esac
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2013-07-27 10:18 Michal Gorny (mgorny)
0 siblings, 0 replies; 13+ messages in thread
From: Michal Gorny (mgorny) @ 2013-07-27 10:18 UTC (permalink / raw
To: gentoo-commits
mgorny 13/07/27 10:18:13
Modified: ChangeLog subversion.eclass
Log:
Export working copy information after the update rather than in pkg_preinst(). This makes it possible for ebuild to reference e.g. ESVN_WC_REVISION properly. Bug #282486.
Revision Changes Path
1.895 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.895&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.895&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.894&r2=1.895
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -r1.894 -r1.895
--- ChangeLog 25 Jul 2013 13:13:18 -0000 1.894
+++ ChangeLog 27 Jul 2013 10:18:13 -0000 1.895
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.894 2013/07/25 13:13:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.895 2013/07/27 10:18:13 mgorny Exp $
+
+ 27 Jul 2013; Michał Górny <mgorny@gentoo.org> subversion.eclass:
+ Export working copy information after the update rather than in
+ pkg_preinst(). This makes it possible for ebuild to reference e.g.
+ ESVN_WC_REVISION properly. Bug #282486.
25 Jul 2013; Peter Volkov <pva@gentoo.org> font.eclass:
Droped media-libs/fontconfig dependency, bug 446012.
1.85 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.84&r2=1.85
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- subversion.eclass 28 Apr 2013 16:15:33 -0000 1.84
+++ subversion.eclass 27 Jul 2013 10:18:13 -0000 1.85
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.84 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.85 2013/07/27 10:18:13 mgorny Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -324,6 +324,9 @@
${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update ${wc_path} from ${repo_uri}."
fi
fi
+
+ # export updated information for the working copy
+ subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
fi
fi
@@ -441,7 +444,6 @@
# config protection.
subversion_pkg_preinst() {
local pkgdate=$(date "+%Y%m%d %H:%M:%S")
- subversion_wc_info "${1}"
if [[ -n ${ESCM_LOGDIR} ]]; then
local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
if [[ ! -d ${dir} ]]; then
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass
@ 2013-10-17 22:53 Christoph Junghans (ottxor)
0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans (ottxor) @ 2013-10-17 22:53 UTC (permalink / raw
To: gentoo-commits
ottxor 13/10/17 22:53:59
Modified: ChangeLog subversion.eclass
Log:
added prefix support (bug #485534)
Revision Changes Path
1.1027 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1027&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1027&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1026&r2=1.1027
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1026
retrieving revision 1.1027
diff -u -r1.1026 -r1.1027
--- ChangeLog 15 Oct 2013 05:36:26 -0000 1.1026
+++ ChangeLog 17 Oct 2013 22:53:59 -0000 1.1027
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1026 2013/10/15 05:36:26 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1027 2013/10/17 22:53:59 ottxor Exp $
+
+ 17 Oct 2013; Christoph Junghans <ottxor@gentoo.org> subversion.eclass:
+ added prefix support (bug #485534)
15 Oct 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Remove .la files for libasan and libtsan. They reference non-existent
1.86 eclass/subversion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/subversion.eclass?r1=1.85&r2=1.86
Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- subversion.eclass 27 Jul 2013 10:18:13 -0000 1.85
+++ subversion.eclass 17 Oct 2013 22:53:59 -0000 1.86
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.85 2013/07/27 10:18:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.86 2013/10/17 22:53:59 ottxor Exp $
# @ECLASS: subversion.eclass
# @MAINTAINER:
@@ -443,9 +443,10 @@
# want the logs to stick around if packages are uninstalled without messing with
# config protection.
subversion_pkg_preinst() {
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
local pkgdate=$(date "+%Y%m%d %H:%M:%S")
if [[ -n ${ESCM_LOGDIR} ]]; then
- local dir="${ROOT}/${ESCM_LOGDIR}/${CATEGORY}"
+ local dir="${EROOT}/${ESCM_LOGDIR}/${CATEGORY}"
if [[ ! -d ${dir} ]]; then
mkdir -p "${dir}" || eerror "Failed to create '${dir}' for logging svn revision"
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-10-17 22:54 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-27 10:18 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog subversion.eclass Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2013-10-17 22:53 Christoph Junghans (ottxor)
2012-07-29 5:54 Akinori Hattori (hattya)
2012-07-29 5:38 Akinori Hattori (hattya)
2012-07-29 4:26 Akinori Hattori (hattya)
2012-07-29 3:37 Akinori Hattori (hattya)
2012-06-10 11:31 Akinori Hattori (hattya)
2012-06-10 11:05 Akinori Hattori (hattya)
2012-06-10 10:08 Akinori Hattori (hattya)
2012-04-01 19:19 Mike Gilbert (floppym)
2012-02-21 18:03 Justin Lecher (jlec)
2012-02-02 3:17 Mike Gilbert (floppym)
2011-12-27 22:40 Jesus Rivero (neurogeek)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox