add support for svn #237852 by Thomas 'gimpel' Kuther and Night Nord

1 files changed, 47 insertions, 36 deletions

diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass
index 6446ece4ea14..7f06fd05a6ac 100644
--- a/eclass/enlightenment.eclass
+++ b/eclass/enlightenment.eclass
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.72 2007/04/20 04:30:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.73 2008/09/20 20:35:00 vapier Exp $
 #
 # Author: vapier@gentoo.org
 
 inherit eutils libtool
 
-# ECVS_STATE's:
+# E_STATE's:
 #	release      [default]
 #		KEYWORDS arch
 #		SRC_URI  $P.tar.gz
@@ -19,46 +19,53 @@ inherit eutils libtool
 #
 #	live         $PV has a 9999 marker
 #		KEYWORDS ""
-#		SRC_URI  `cvs up`
-#		S        $WORKDIR/$ECVS_MODULE
+#		SRC_URI  cvs/svn/etc... up
+#		S        $WORKDIR/$E_S_APPEND
 #
 # Overrides:
 #	KEYWORDS    EKEY_STATE
 #	SRC_URI     EURI_STATE
 #	S           EURI_STATE
 
-#E17_DEFAULT_CVS="cvs.sourceforge.net:/cvsroot/enlightenment"
-E17_DEFAULT_CVS="anoncvs.enlightenment.org:/var/cvs/e"
+#E_LIVE_DEFAULT_CVS="cvs.sourceforge.net:/cvsroot/enlightenment"
+E_LIVE_SERVER_DEFAULT_CVS="anoncvs.enlightenment.org:/var/cvs/e"
+E_LIVE_SERVER_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
 
-ECVS_STATE="release"
+E_STATE="release"
 if [[ ${PV/9999} != ${PV} ]] ; then
-	if [[ -z ${ECVS_MODULE} ]] ; then
-		ECVS_MODULE=${PN}
-		if [[ ${CATEGORY/libs} != ${CATEGORY} ]] ; then
-			ECVS_MODULE="e17/libs/${PN}"
-		else
-			ECVS_MODULE="e17/apps/${PN}"
-		fi
-	fi
-	ECVS_SERVER=${E17_ECVS_SERVER:-${ECVS_SERVER:-${E17_DEFAULT_CVS}}}
-	ECVS_STATE="live"
+	E_LIVE_SERVER=${E_LIVE_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}
+	E_STATE="live"
 	WANT_AUTOTOOLS="yes"
-	inherit cvs
+
+	# force people to opt-in to legacy cvs
+	if [[ -n ${ECVS_MODULE} ]] ; then
+		ECVS_SERVER=${ECVS_SERVER:-${E_LIVE_SERVER_DEFAULT_CVS}}
+		E_LIVE_SOURCE="cvs"
+		E_S_APPEND=${ECVS_MODULE}
+		inherit cvs
+	else
+		ESVN_URI_APPEND=${ESVN_URI_APPEND:-${PN}}
+		ESVN_PROJECT="enlightenment"
+		ESVN_REPO_URI=${ESVN_SERVER:-${E_LIVE_SERVER_DEFAULT_SVN}}/${ESVN_URI_APPEND}
+		E_S_APPEND=${ESVN_URI_APPEND}
+		E_LIVE_SOURCE="svn"
+		inherit subversion
+	fi
 elif [[ ${PV/.200[3-9][0-1][0-9][0-3][0-9]/} != ${PV} ]] ; then
-	ECVS_STATE="snap"
+	E_STATE="snap"
 elif [[ ${PV%%.[0-9][0-9][0-9]} != ${PV} ]] ; then
-	ECVS_STATE="snap"
+	E_STATE="snap"
 	EURI_STATE="release"
 fi
 if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
-	WANT_AUTOCONF=${E17_WANT_AUTOCONF:-latest}
-	WANT_AUTOMAKE=${E17_WANT_AUTOMAKE:-latest}
+	WANT_AUTOCONF=${E_WANT_AUTOCONF:-latest}
+	WANT_AUTOMAKE=${E_WANT_AUTOMAKE:-latest}
 	inherit autotools
 fi
 
 DESCRIPTION="A DR17 production"
 HOMEPAGE="http://www.enlightenment.org/"
-case ${EURI_STATE:-${ECVS_STATE}} in
+case ${EURI_STATE:-${E_STATE}} in
 	release) SRC_URI="http://enlightenment.freedesktop.org/files/${P}.tar.gz mirror://sourceforge/enlightenment/${P}.tar.gz";;
 	snap)    SRC_URI="mirror://gentoo/${P}.tar.bz2";;
 	live)    SRC_URI="";;
@@ -66,7 +73,7 @@ esac
 
 LICENSE="BSD"
 SLOT="0"
-case ${EKEY_STATE:-${ECVS_STATE}} in
+case ${EKEY_STATE:-${E_STATE}} in
 	release) KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd";;
 	snap)    KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd";;
 	live)    KEYWORDS="";;
@@ -76,23 +83,23 @@ IUSE="nls doc"
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-case ${EURI_STATE:-${ECVS_STATE}} in
+case ${EURI_STATE:-${E_STATE}} in
 	release) S=${WORKDIR}/${P};;
 	snap)    S=${WORKDIR}/${PN};;
-	live)    S=${WORKDIR}/${ECVS_MODULE};;
+	live)    S=${WORKDIR}/${E_S_APPEND};;
 esac
 
 enlightenment_warning_msg() {
-	if [[ -n ${E17_ECVS_SERVER} ]] ; then
-		einfo "Using user cvs server: ${E17_ECVS_SERVER}"
+	if [[ -n ${E_LIVE_SERVER} ]] ; then
+		einfo "Using user server for live sources: ${E_LIVE_SERVER}"
 	fi
-	if [[ ${ECVS_STATE} == "snap" ]] ; then
+	if [[ ${E_STATE} == "snap" ]] ; then
 		ewarn "Please do not contact the E team about bugs in Gentoo."
 		ewarn "Only contact vapier@gentoo.org via e-mail or bugzilla."
-		ewarn "Remember, this stuff is CVS only code so dont cry when"
+		ewarn "Remember, this stuff is DEV only code so dont cry when"
 		ewarn "I break you :)."
-	elif [[ ${ECVS_STATE} == "live" ]] ; then
-		eerror "This is a LIVE CVS ebuild."
+	elif [[ ${E_STATE} == "live" ]] ; then
+		eerror "This is a LIVE SOURCES ebuild."
 		eerror "That means there are NO promises it will work."
 		eerror "If it fails to build, FIX THE CODE YOURSELF"
 		eerror "before reporting any issues."
@@ -118,8 +125,12 @@ gettext_modify() {
 }
 
 enlightenment_src_unpack() {
-	if [[ ${ECVS_STATE} == "live" ]] ; then
-		cvs_src_unpack
+	if [[ ${E_STATE} == "live" ]] ; then
+		case ${E_LIVE_SOURCE} in
+			cvs) cvs_src_unpack;;
+			svn) subversion_src_unpack;;
+			*)   die "eek!";;
+		esac
 	else
 		unpack ${A}
 	fi
@@ -157,7 +168,7 @@ enlightenment_src_compile() {
 
 enlightenment_src_install() {
 	emake install DESTDIR="${D}" || enlightenment_die
-	find "${D}" -name CVS -type d -exec rm -rf '{}' \; 2>/dev/null
+	find "${D}" '(' -name CVS -o -name .svn -o -name .git ')' -type d -exec rm -rf '{}' \; 2>/dev/null
 	dodoc AUTHORS ChangeLog NEWS README TODO ${EDOCS}
 	use doc && [[ -d doc ]] && dohtml -r doc/*
 }