[gentoo-commits] gentoo-x86 commit in eclass: subversion.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/04/29 22:26:31

  Modified:             subversion.eclass
  Log:
  Update eapi2 issues reported by subversion eclass users. Agreed with yngwin to rather fix this fast and apologize maint. later.

Revision  Changes    Path
1.65                 eclass/subversion.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/subversion.eclass?r1=1.64&r2=1.65

Index: subversion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- subversion.eclass	26 Apr 2009 02:33:36 -0000	1.64
+++ subversion.eclass	29 Apr 2009 22:26:31 -0000	1.65
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.64 2009/04/26 02:33:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.65 2009/04/29 22:26:31 scarabeus Exp $
 
 # @ECLASS: subversion.eclass
 # @MAINTAINER:
@@ -19,11 +19,13 @@
 
 ESVN="${ECLASS}"
 
-if has "${EAPI}" 0 1; then
-	EXPORT_FUNCTIONS src_unpack src_prepare pkg_preinst
-else
-	EXPORT_FUNCTIONS src_unpack pkg_preinst
-fi
+EXPORTED_FUNCTIONS="src_unpack pkg_preinst"
+case "${EAPI:-0}" in
+	2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
+	1|0) ;;
+	*) die "Unknown EAPI, Bug eclass maintainers." ;;
+esac
+EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
@@ -373,9 +375,7 @@
 # Default src_unpack. Fetch and, in older EAPIs, bootstrap.
 subversion_src_unpack() {
 	subversion_fetch     || die "${ESVN}: unknown problem occurred in subversion_fetch."
-	if has "${EAPI}" 0 1; then
-		subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
-	fi
+	has src_prepare ${EXPORTED_FUNCTIONS} || git_src_prepare
 }
 
 # @FUNCTION: subversion_src_prepare