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 5BDDF138A85 for ; Sat, 16 Feb 2013 15:05:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E72DE002D; Sat, 16 Feb 2013 15:05:19 +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 BB688E002D for ; Sat, 16 Feb 2013 15:05:18 +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 6173C335E2D for ; Sat, 16 Feb 2013 15:05:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EA3E8E4073 for ; Sat, 16 Feb 2013 15:05:15 +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: <1361027103.59a53df52c86b08f02201de2039db2cd8e5549e7.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: 59a53df52c86b08f02201de2039db2cd8e5549e7 X-VCS-Branch: master Date: Sat, 16 Feb 2013 15:05:15 +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: 5f5ca61c-b5d6-4611-9378-d6dd9d1ece24 X-Archives-Hash: 3ca8e6f0aef0bc235245466d0258ca68 commit: 59a53df52c86b08f02201de2039db2cd8e5549e7 Author: Yuta SATOH gentoo gr jp> AuthorDate: Sat Feb 16 15:05:03 2013 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Sat Feb 16 15:05:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=59a53df5 freebsd.eclass: define ${MY_PV} and ${PLEVEL} in all case. --- eclass/freebsd.eclass | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass index 8f94128..04ac641 100644 --- a/eclass/freebsd.eclass +++ b/eclass/freebsd.eclass @@ -6,6 +6,9 @@ inherit versionator eutils flag-o-matic bsdmk +MY_PV=${PV/_p*} +PLEVEL=${PV##*_p} + LICENSE="BSD" HOMEPAGE="http://www.freebsd.org/" @@ -27,17 +30,14 @@ RESCUE="freebsd-rescue-${PV}" CDDL="freebsd-cddl-${PV}" # Release version (5.3, 5.4, 6.0, etc) -RV="$(get_version_component_range 1-2)" +# Drop patch level from RV using ${MY_PV}. +RV="$(get_version_component_range 1-2 ${MY_PV})" if [[ ${PV} == *9999* ]]; then inherit subversion - MY_PV=${PV/_p*} # Set SVN revision using patch level. - PLEVEL=${PV##*_p} [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}" - # Drop patch level from RV, -9999 (head) ebuild is required. - [[ ${MY_PV} == 9999 ]] && RV="9999" # freebsd-mk-defs is always run svn checkout/update. # Other packages use sources that it checked out. @@ -49,8 +49,8 @@ if [[ ${PV} == *9999* ]]; then 9999) BRANCH="head" ;; *) BRANCH="stable" ;; esac - [[ ${BRANCH} == "head" ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" - [[ ${BRANCH} == "head" ]] && SVN_SUB_URI="${BRANCH}" + [[ ${BRANCH} == head ]] || SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}" + [[ ${BRANCH} == head ]] && SVN_SUB_URI="${BRANCH}" ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}" ESVN_PROJECT="freebsd-${BRANCH}" fi