--- enlightenment.eclass.orig	2007-04-20 06:35:41.000000000 +0200
+++ enlightenment.eclass	2008-09-16 22:11:54.845104460 +0200
@@ -6,7 +6,7 @@
 
 inherit eutils libtool
 
-# ECVS_STATE's:
+# ESVN_STATE's:
 #	release      [default]
 #		KEYWORDS arch
 #		SRC_URI  $P.tar.gz
@@ -19,35 +19,34 @@
 #
 #	live         $PV has a 9999 marker
 #		KEYWORDS ""
-#		SRC_URI  `cvs up`
-#		S        $WORKDIR/$ECVS_MODULE
+#		SRC_URI  `svn up`
+#		S        $WORKDIR/$ESVN_PROJECT/${PN}
 #
 # 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"
+E17_DEFAULT_SVN="http://svn.enlightenment.org/svn/e/trunk"
 
-ECVS_STATE="release"
+ESVN_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
+	ESVN_PROJECT="enlightenment"
+	if [[ -z ${MY_PN} ]] ; then
+		MY_PN="${PN}"
 	fi
-	ECVS_SERVER=${E17_ECVS_SERVER:-${ECVS_SERVER:-${E17_DEFAULT_CVS}}}
-	ECVS_STATE="live"
+	if [[ ${PN} =~ "e_modules" ]]; then
+		MY_PN="E-MODULES-EXTRA/${MY_PN#e_modules-}"
+		ESVN_PROJECT="${ESVN_PROJECT}/e_modules"
+	fi
+	ESVN_REPO_URI=${E17_ESVN_REPO_URI:-${ESVN_REPO_URI:-${E17_DEFAULT_SVN}}}/${MY_PN}
+	ESVN_STATE="live"
 	WANT_AUTOTOOLS="yes"
-	inherit cvs
+	inherit subversion
 elif [[ ${PV/.200[3-9][0-1][0-9][0-3][0-9]/} != ${PV} ]] ; then
-	ECVS_STATE="snap"
+	ESVN_STATE="snap"
 elif [[ ${PV%%.[0-9][0-9][0-9]} != ${PV} ]] ; then
-	ECVS_STATE="snap"
+	ESVN_STATE="snap"
 	EURI_STATE="release"
 fi
 if [[ ${WANT_AUTOTOOLS} == "yes" ]] ; then
@@ -58,7 +57,7 @@
 
 DESCRIPTION="A DR17 production"
 HOMEPAGE="http://www.enlightenment.org/"
-case ${EURI_STATE:-${ECVS_STATE}} in
+case ${EURI_STATE:-${ESVN_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 +65,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-case ${EKEY_STATE:-${ECVS_STATE}} in
+case ${EKEY_STATE:-${ESVN_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 +75,23 @@
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-case ${EURI_STATE:-${ECVS_STATE}} in
+case ${EURI_STATE:-${ESVN_STATE}} in
 	release) S=${WORKDIR}/${P};;
 	snap)    S=${WORKDIR}/${PN};;
-	live)    S=${WORKDIR}/${ECVS_MODULE};;
+	live)    ;;
 esac
 
 enlightenment_warning_msg() {
-	if [[ -n ${E17_ECVS_SERVER} ]] ; then
-		einfo "Using user cvs server: ${E17_ECVS_SERVER}"
+	if [[ -n ${E17_ESVN_REPO_URI} ]] ; then
+		einfo "Using user svn server: ${E17_ESVN_REPO_URI}"
 	fi
-	if [[ ${ECVS_STATE} == "snap" ]] ; then
+	if [[ ${ESVN_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 SVN only code so dont cry when"
 		ewarn "I break you :)."
-	elif [[ ${ECVS_STATE} == "live" ]] ; then
-		eerror "This is a LIVE CVS ebuild."
+	elif [[ ${ESVN_STATE} == "live" ]] ; then
+		eerror "This is a LIVE SVN 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 +117,8 @@
 }
 
 enlightenment_src_unpack() {
-	if [[ ${ECVS_STATE} == "live" ]] ; then
-		cvs_src_unpack
+	if [[ ${ESVN_STATE} == "live" ]] ; then
+		subversion_src_unpack
 	else
 		unpack ${A}
 	fi