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 09D3E1382A6 for ; Fri, 4 Jan 2013 10:59:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1384D21C069; Fri, 4 Jan 2013 10:59:04 +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 9443521C069 for ; Fri, 4 Jan 2013 10:59:03 +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 7EE0833D883 for ; Fri, 4 Jan 2013 10:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 186ECE5439 for ; Fri, 4 Jan 2013 10:59:01 +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: <1357297128.e4ff9f0653225e14443d8ced71b4a7fc5f8864fc.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: e4ff9f0653225e14443d8ced71b4a7fc5f8864fc X-VCS-Branch: master Date: Fri, 4 Jan 2013 10:59:01 +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: 37527aa4-dbc8-4c67-9263-deb6e71b60b5 X-Archives-Hash: d0dd394930c4742b924335fa0fe01f10 commit: e4ff9f0653225e14443d8ced71b4a7fc5f8864fc Author: Yuta SATOH gentoo gr jp> AuthorDate: Fri Jan 4 10:58:48 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Fri Jan 4 10:58:48 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e4ff9f06 freebsd.eclass: Changed from if to case, conditional branching --- eclass/freebsd.eclass | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index c9a433e..c709f91 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -31,18 +31,24 @@ RV="$(get_version_component_range 1-2)" if [[ "${PV}" == *9999* ]]; then inherit subversion - if [ "${PV%.9999}" != "${PV}" ]; then - if [[ "${PV%.9999}" == *\.* ]]; then + case ${PV%.9999} in + *.*.*) + ESVN_REPO_URI="svn://svn.freebsd.org/base/release/${PV%.9999}" + ESVN_PROJECT="freebsd-release" + ;; + *.*) ESVN_REPO_URI="svn://svn.freebsd.org/base/releng/${PV%.9999}" ESVN_PROJECT="freebsd-releng" - else + ;; + 9999) + ESVN_REPO_URI="svn://svn.freebsd.org/base/head" + ESVN_PROJECT="freebsd-head" + ;; + *) ESVN_REPO_URI="svn://svn.freebsd.org/base/stable/${PV%.9999}" ESVN_PROJECT="freebsd-stable" - fi - else - ESVN_REPO_URI="svn://svn.freebsd.org/base/head" - ESVN_PROJECT="freebsd-head" - fi + ;; + esac fi if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then @@ -108,11 +114,10 @@ freebsd_rename_libraries() { freebsd_src_unpack() { if [[ ${PV} == *9999* ]]; then S="${WORKDIR}" subversion_src_unpack - cd "${S}" else unpack ${A} - cd "${S}" fi + cd "${S}" dummy_mk ${REMOVE_SUBDIRS}