From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D5DB91387C3 for ; Fri, 1 Feb 2013 11:25:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A196FE063F; Fri, 1 Feb 2013 11:25:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39F73E063F for ; Fri, 1 Feb 2013 11:25:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D97833DC5E for ; Fri, 1 Feb 2013 11:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9FF6AE4073 for ; Fri, 1 Feb 2013 11:25:19 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1359717895.e119079aa78c460c20757a8c95d711a4be30fbcf.yuta_satoh@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: eclass/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: eclass/freebsd.eclass X-VCS-Directories: eclass/ X-VCS-Committer: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: e119079aa78c460c20757a8c95d711a4be30fbcf X-VCS-Branch: master Date: Fri, 1 Feb 2013 11:25:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c0629872-091f-4256-8431-be1e49036974 X-Archives-Hash: cbc1d8120ccded3a11487288a520e298 commit: e119079aa78c460c20757a8c95d711a4be30fbcf Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Feb 1 11:24:55 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Fri Feb 1 11:24:55 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e119079a freebsd.eclass: added support svn revision --- eclass/freebsd.eclass | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 3785a7d..bfc757a 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -31,17 +31,20 @@ RV="$(get_version_component_range 1-2)" if [[ "${PV}" == *9999* ]]; then inherit subversion + MY_PR=${PR/r/} + [[ -n ${MY_PR} ]] && [[ ${MY_PR} -gt 10000 ]] && ESVN_REVISION="${MY_PR}" + [[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1" + case ${PV%.9999} in - *.*.*) branch="release";; - *.*) branch="releng" ;; - 9999) branch="head" ;; - *) branch="stable" ;; + *.*.*) BRANCH="release";; + *.*) BRANCH="releng" ;; + 9999) BRANCH="head" ;; + *) BRANCH="stable" ;; esac - [[ "${branch}" == "head" ]] || sub_uri="${branch}/${PV%.9999}" - [[ "${branch}" == "head" ]] && sub_uri="${branch}" - ESVN_REPO_URI="svn://svn.freebsd.org/base/${sub_uri}" - ESVN_PROJECT="freebsd-${branch}" - [[ ${PN} == "freebsd-mk-defs" ]] || ESVN_OFFLINE="1" + [[ "${BRANCH}" == "head" ]] || SVN_SUB_URI="${BRANCH}/${PV%.9999}" + [[ "${BRANCH}" == "head" ]] && SVN_SUB_URI="${BRANCH}" + ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" + ESVN_PROJECT="freebsd-${BRANCH}" fi if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then