diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2013-08-31 13:04:51 +0000 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2013-08-31 13:04:51 +0000 |
| commit | 9e739b586c5a209d79da1615682a2a835abc32b5 (patch) | |
| tree | 7021b47767268a4a7bd20c708abc3d361c491f24 /eclass | |
| parent | Stable for HPPA (bug #483092). (diff) | |
| download | gentoo-2-9e739b586c5a209d79da1615682a2a835abc32b5.tar.gz gentoo-2-9e739b586c5a209d79da1615682a2a835abc32b5.tar.bz2 gentoo-2-9e739b586c5a209d79da1615682a2a835abc32b5.zip | |
Default to svn, avoid breaking existing live ebuilds
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/enlightenment.eclass | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass index ab704f1b9deb..299d8fa0d9da 100644 --- a/eclass/enlightenment.eclass +++ b/eclass/enlightenment.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.100 2013/08/31 12:29:26 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.101 2013/08/31 13:04:51 tommy Exp $ # @ECLASS: enlightenment.eclass # @MAINTAINER: @@ -50,16 +50,7 @@ E_LIVE_SERVER_DEFAULT_GIT="git://git.enlightenment.org" E_STATE="release" if [[ ${PV} == *9999* ]] ; then - if [[ ${ESVN_URI_APPEND} ]] ; then - E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}} - - ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}} - ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}" - ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND} - E_S_APPEND=${ESVN_URI_APPEND} - E_LIVE_SOURCE="svn" - inherit subversion - elif [[ ${EGIT_URI_APPEND} ]] ; then + if [[ ${EGIT_URI_APPEND} ]] ; then E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_GIT}} EGIT_URI_APPEND=${EGIT_URI_APPEND:-${PN}} EGIT_PROJECT="enlightenment/${EGIT_SUB_PROJECT}/${EGIT_URI_APPEND}" @@ -68,7 +59,14 @@ if [[ ${PV} == *9999* ]] ; then E_LIVE_SOURCE="git" inherit git-2 else - die "Either ESVN_URI_APPEND or EGIT_URI_APPEND need to be defined" + E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}} + + ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}} + ESVN_PROJECT="enlightenment/${ESVN_SUB_PROJECT}" + ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_SUB_PROJECT}/${ESVN_URI_APPEND} + E_S_APPEND=${ESVN_URI_APPEND} + E_LIVE_SOURCE="svn" + inherit subversion fi E_STATE="live" WANT_AUTOTOOLS="yes" |