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: ChangeLog enlightenment.eclass
Date: Sat, 31 Aug 2013 12:29:29
Message-Id: 20130831122926.5C88F2004B@flycatcher.gentoo.org
1 tommy 13/08/31 12:29:26
2
3 Modified: ChangeLog enlightenment.eclass
4 Log:
5 Add git support for live packages using enlightenment.eclass
6
7 Revision Changes Path
8 1.942 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.942&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.942&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.941&r2=1.942
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.941
18 retrieving revision 1.942
19 diff -u -r1.941 -r1.942
20 --- ChangeLog 28 Aug 2013 22:04:16 -0000 1.941
21 +++ ChangeLog 31 Aug 2013 12:29:26 -0000 1.942
22 @@ -1,6 +1,10 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.941 2013/08/28 22:04:16 mgorny Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.942 2013/08/31 12:29:26 tommy Exp $
27 +
28 + 31 Aug 2013; Thomas Sachau (Tommy[D]) <tommy@g.o>
29 + enlightenment.eclass:
30 + Add git support for live packages using enlightenment.eclass
31
32 28 Aug 2013; Michał Górny <mgorny@g.o> python-utils-r1.eclass:
33 Introduce python_is_python3() to replace the common checks.
34
35
36
37 1.100 eclass/enlightenment.eclass
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.100&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?rev=1.100&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/enlightenment.eclass?r1=1.99&r2=1.100
42
43 Index: enlightenment.eclass
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v
46 retrieving revision 1.99
47 retrieving revision 1.100
48 diff -u -r1.99 -r1.100
49 --- enlightenment.eclass 28 Aug 2013 02:51:18 -0000 1.99
50 +++ enlightenment.eclass 31 Aug 2013 12:29:26 -0000 1.100
51 @@ -1,6 +1,6 @@
52 -# Copyright 1999-2012 Gentoo Foundation
53 +# Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.99 2013/08/28 02:51:18 vapier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.100 2013/08/31 12:29:26 tommy Exp $
57
58 # @ECLASS: enlightenment.eclass
59 # @MAINTAINER:
60 @@ -46,19 +46,33 @@
61 # S EURI_STATE
62
63 E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
64 +E_LIVE_SERVER_DEFAULT_GIT="git://git.enlightenment.org"
65
66 E_STATE="release"
67 if [[ ${PV} == *9999* ]] ; then
68 - E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
69 + if [[ ${ESVN_URI_APPEND} ]] ; then
70 + E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
71 +
72 + ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
73 + ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
74 + ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
75 + E_S_APPEND=${ESVN_URI_APPEND}
76 + E_LIVE_SOURCE="svn"
77 + inherit subversion
78 + elif [[ ${EGIT_URI_APPEND} ]] ; then
79 + E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}
80 + EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}}
81 + EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}"
82 + EGIT_REPO_URI=${EGIT_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}}/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}.git
83 + E_S_APPEND=${EGIT_URI_APPEND}
84 + E_LIVE_SOURCE="git"
85 + inherit git-2
86 + else
87 + die "Either ESVN_URI_APPEND or EGIT_URI_APPEND need to be defined"
88 + fi
89 E_STATE="live"
90 WANT_AUTOTOOLS="yes"
91
92 - ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
93 - ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
94 - ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
95 - E_S_APPEND=${ESVN_URI_APPEND}
96 - E_LIVE_SOURCE="svn"
97 - inherit subversion
98 elif [[ -n ${E_SNAP_DATE} ]] ; then
99 E_STATE="snap"
100 else
101 @@ -118,6 +132,7 @@
102 if [[ ${E_STATE} == "live" ]] ; then
103 case ${E_LIVE_SOURCE} in
104 svn) subversion_src_unpack;;
105 + git) git-2_src_unpack;;
106 *) die "eek!";;
107 esac
108 else