Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro.gentoo@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: eclass/
Date: Fri, 01 Feb 2013 11:25:23
Message-Id: 1359717895.e119079aa78c460c20757a8c95d711a4be30fbcf.yuta_satoh@gentoo
1 commit: e119079aa78c460c20757a8c95d711a4be30fbcf
2 Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
3 AuthorDate: Fri Feb 1 11:24:55 2013 +0000
4 Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
5 CommitDate: Fri Feb 1 11:24:55 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e119079a
7
8 freebsd.eclass: added support svn revision
9
10 ---
11 eclass/freebsd.eclass | 21 ++++++++++++---------
12 1 files changed, 12 insertions(+), 9 deletions(-)
13
14 diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
15 index 3785a7d..bfc757a 100644
16 --- a/eclass/freebsd.eclass
17 +++ b/eclass/freebsd.eclass
18 @@ -31,17 +31,20 @@ RV="$(get_version_component_range 1-2)"
19
20 if [[ "${PV}" == *9999* ]]; then
21 inherit subversion
22 + MY_PR=${PR/r/}
23 + [[ -n ${MY_PR} ]] && [[ ${MY_PR} -gt 10000 ]] && ESVN_REVISION="${MY_PR}"
24 + [[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
25 +
26 case ${PV%.9999} in
27 - *.*.*) branch="release";;
28 - *.*) branch="releng" ;;
29 - 9999) branch="head" ;;
30 - *) branch="stable" ;;
31 + *.*.*) BRANCH="release";;
32 + *.*) BRANCH="releng" ;;
33 + 9999) BRANCH="head" ;;
34 + *) BRANCH="stable" ;;
35 esac
36 - [[ "${branch}" == "head" ]] || sub_uri="${branch}/${PV%.9999}"
37 - [[ "${branch}" == "head" ]] && sub_uri="${branch}"
38 - ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}"
39 - ESVN_PROJECT="freebsd-${branch}"
40 - [[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1"
41 + [[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${PV%.9999}"
42 + [[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}"
43 + ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
44 + ESVN_PROJECT="freebsd-${BRANCH}"
45 fi
46
47 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then