Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 27 Jan 2018 10:07:52
Message-Id: 1517047648.d5feacc008fe7b7b07b61dfcfe2b2b8a1702d6ed.mgorny@gentoo
1 commit: d5feacc008fe7b7b07b61dfcfe2b2b8a1702d6ed
2 Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
3 AuthorDate: Wed Sep 27 18:54:17 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 27 10:07:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5feacc0
7
8 eclass/enlightenment.eclass: Remove svn references
9
10 SVN for E is long gone.
11
12 eclass/enlightenment.eclass | 16 ++--------------
13 1 file changed, 2 insertions(+), 14 deletions(-)
14
15 diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
16 index 23b6ffcc9f5..c374af34cb1 100644
17 --- a/eclass/enlightenment.eclass
18 +++ b/eclass/enlightenment.eclass
19 @@ -37,7 +37,7 @@ E_ECONF=()
20 #
21 # live $PV has a 9999 marker
22 # KEYWORDS ""
23 -# SRC_URI svn/etc... up
24 +# SRC_URI git/etc... up
25 # S $WORKDIR/$E_S_APPEND
26 #
27 # Overrides:
28 @@ -45,7 +45,6 @@ E_ECONF=()
29 # SRC_URI EURI_STATE
30 # S EURI_STATE
31
32 -E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
33 E_LIVE_SERVER_DEFAULT_GIT="https://git.enlightenment.org"
34
35 E_STATE="release"
36 @@ -58,15 +57,6 @@ if [[ ${PV} == *9999* ]] ; then
37 E_S_APPEND=${EGIT_URI_APPEND}
38 E_LIVE_SOURCE="git"
39 inherit git-2
40 - else
41 - E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
42 -
43 - ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
44 - ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}"
45 - ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND}
46 - E_S_APPEND=${ESVN_URI_APPEND}
47 - E_LIVE_SOURCE="svn"
48 - inherit subversion
49 fi
50 E_STATE="live"
51 WANT_AUTOTOOLS="yes"
52 @@ -126,7 +116,6 @@ esac
53 enlightenment_src_unpack() {
54 if [[ ${E_STATE} == "live" ]] ; then
55 case ${E_LIVE_SOURCE} in
56 - svn) subversion_src_unpack;;
57 git) git-2_src_unpack;;
58 *) die "eek!";;
59 esac
60 @@ -147,7 +136,6 @@ enlightenment_src_prepare() {
61 # autotools require README, when README.in is around, but README
62 # is created later in configure step
63 [[ -f README.in ]] && touch README
64 - export SVN_REPO_PATH=${ESVN_WC_PATH}
65 eautoreconf
66 fi
67 epunt_cxx
68 @@ -178,7 +166,7 @@ enlightenment_src_compile() {
69
70 enlightenment_src_install() {
71 V=1 emake install DESTDIR="${D}" || die
72 - find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
73 + find "${D}" '(' -name CVS -o -name -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
74 for d in AUTHORS ChangeLog NEWS README TODO ${EDOCS}; do
75 [[ -f ${d} ]] && dodoc ${d}
76 done