Gentoo Archives: gentoo-dev

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