Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: freebsd.eclass
Date: Wed, 28 Aug 2013 15:56:19
Message-Id: 20130828155611.DEFE52004C@flycatcher.gentoo.org
1 aballier 13/08/28 15:56:11
2
3 Modified: freebsd.eclass
4 Log:
5 Add live build support. Bug #458570 by Yuta SATOH
6
7 Revision Changes Path
8 1.35 eclass/freebsd.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.35&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?rev=1.35&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/freebsd.eclass?r1=1.34&r2=1.35
13
14 Index: freebsd.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v
17 retrieving revision 1.34
18 retrieving revision 1.35
19 diff -u -r1.34 -r1.35
20 --- freebsd.eclass 9 Aug 2013 20:10:20 -0000 1.34
21 +++ freebsd.eclass 28 Aug 2013 15:56:11 -0000 1.35
22 @@ -1,11 +1,15 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.34 2013/08/09 20:10:20 aballier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/freebsd.eclass,v 1.35 2013/08/28 15:56:11 aballier Exp $
27 #
28 # Diego Pettenò <flameeyes@g.o>
29
30 inherit versionator eutils flag-o-matic bsdmk
31
32 +# Drop patch level from ${PV}
33 +MY_PV=${PV/_p*}
34 +PLEVEL=${PV##*_p}
35 +
36 LICENSE="BSD"
37 HOMEPAGE="http://www.freebsd.org/"
38
39 @@ -28,7 +32,39 @@
40 SECURE="freebsd-secure-${PV}"
41
42 # Release version (5.3, 5.4, 6.0, etc)
43 -RV="$(get_version_component_range 1-2)"
44 +RV="$(get_version_component_range 1-2 ${MY_PV})"
45 +
46 +# SVN ebuild support.
47 +# 9.1.0.9999 --> release/9.1.0
48 +# 9.1.9999 --> releng/9.1
49 +# 9.9999 --> stable/9
50 +# 9999 --> head
51 +#
52 +# svn revision can be specified by patch level:
53 +# freebsd-lib-9.9999_p247000 --> set svn -r 247000
54 +
55 +if [[ ${MY_PV} == *9999* ]]; then
56 + inherit subversion
57 +
58 + # Set SVN revision using patch level.
59 + [[ ${PV} == *_p* ]] && ESVN_REVISION="${PLEVEL}"
60 +
61 + case ${MY_PV%.9999} in
62 + *.*.*) BRANCH="release";;
63 + *.*) BRANCH="releng" ;;
64 + 9999) BRANCH="head" ;;
65 + *) BRANCH="stable" ;;
66 + esac
67 +
68 + if [[ ${BRANCH} == head ]] ; then
69 + SVN_SUB_URI="${BRANCH}"
70 + else
71 + SVN_SUB_URI="${BRANCH}/${MY_PV%.9999}"
72 + fi
73 +
74 + ESVN_REPO_URI="svn://svn.freebsd.org/base/${SVN_SUB_URI}"
75 + ESVN_PROJECT="freebsd-${BRANCH}"
76 +fi
77
78 if [[ ${PN} != "freebsd-share" ]] && [[ ${PN} != freebsd-sources ]]; then
79 IUSE="profile"
80 @@ -91,7 +127,11 @@
81 }
82
83 freebsd_src_unpack() {
84 - unpack ${A}
85 + if [[ ${MY_PV} == *9999* ]]; then
86 + S="${WORKDIR}" subversion_src_unpack
87 + else
88 + unpack ${A}
89 + fi
90 cd "${S}"
91
92 dummy_mk ${REMOVE_SUBDIRS}