Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: enlightenment.eclass
Date: Sat, 31 Aug 2013 13:04:55
Message-Id: 20130831130451.D46D52004B@flycatcher.gentoo.org
1 tommy 13/08/31 13:04:51
2
3 Modified: enlightenment.eclass
4 Log:
5 Default to svn, avoid breaking existing live ebuilds
6
7 Revision Changes Path
8 1.101 eclass/enlightenment.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.101&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.101&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?r1=1.100&r2=1.101
13
14 Index: enlightenment.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v
17 retrieving revision 1.100
18 retrieving revision 1.101
19 diff -u -r1.100 -r1.101
20 --- enlightenment.eclass 31 Aug 2013 12:29:26 -0000 1.100
21 +++ enlightenment.eclass 31 Aug 2013 13:04:51 -0000 1.101
22 @@ -1,6 +1,6 @@
23 -# Copyright 1999-2013 Gentoo Foundation
24 +# Copyright 1999-2012 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.100 2013/08/31 12:29:26 tommy Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.101 2013/08/31 13:04:51 tommy Exp $
28
29 # @ECLASS: enlightenment.eclass
30 # @MAINTAINER:
31 @@ -50,16 +50,7 @@
32
33 E_STATE="release"
34 if [[ ${PV} == *9999* ]] ; then
35 - if [[ ${ESVN_URI_APPEND} ]] ; then
36 - E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
37 -
38 - ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
39 - ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
40 - ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
41 - E_S_APPEND=${ESVN_URI_APPEND}
42 - E_LIVE_SOURCE="svn"
43 - inherit subversion
44 - elif [[ ${EGIT_URI_APPEND} ]] ; then
45 + if [[ ${EGIT_URI_APPEND} ]] ; then
46 E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}
47 EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}}
48 EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}"
49 @@ -68,7 +59,14 @@
50 E_LIVE_SOURCE="git"
51 inherit git-2
52 else
53 - die "Either ESVN_URI_APPEND or EGIT_URI_APPEND need to be defined"
54 + E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
55 +
56 + ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
57 + ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
58 + ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
59 + E_S_APPEND=${ESVN_URI_APPEND}
60 + E_LIVE_SOURCE="svn"
61 + inherit subversion
62 fi
63 E_STATE="live"
64 WANT_AUTOTOOLS="yes"