diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-29 22:26:31 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-04-29 22:26:31 +0000 |
| commit | 5e23ac25cb04207f3eebd32cf6986b5acb8f068e (patch) | |
| tree | 77e7a505437c65d88d8a476da9d595e187f3f9a5 /eclass/subversion.eclass | |
| parent | Because ncurses5-config --terminfo returns /usr/share/terminfo we keepdir it ... (diff) | |
| download | historical-5e23ac25cb04207f3eebd32cf6986b5acb8f068e.tar.gz historical-5e23ac25cb04207f3eebd32cf6986b5acb8f068e.tar.bz2 historical-5e23ac25cb04207f3eebd32cf6986b5acb8f068e.zip | |
Update eapi2 issues reported by subversion eclass users. Agreed with yngwin to rather fix this fast and apologize maint. later.
Diffstat (limited to 'eclass/subversion.eclass')
| -rw-r--r-- | eclass/subversion.eclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index f76bb6dbdf3f..040bb6e95a52 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -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 @@ inherit eutils 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 @@ subversion_bootstrap() { # 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 |