[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     f2eb785b6831053adc11e68c01d202e861910ecc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 20:09:34 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 20:13:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2eb785b

aspell-dict.eclass: Some tweaks so the eclass works with EAPI>0 ebuilds.

 eclass/aspell-dict.eclass | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/eclass/aspell-dict.eclass b/eclass/aspell-dict.eclass
index 6207f6a..5600d9a 100644
--- a/eclass/aspell-dict.eclass
+++ b/eclass/aspell-dict.eclass
@@ -24,7 +24,10 @@
 # @DESCRIPTION:
 # What major version of aspell is this dictionary for?
 
-EXPORT_FUNCTIONS src_compile src_install
+case ${EAPI} in
+       0|1) EXPORT_FUNCTIONS src_compile src_install ;;
+       *) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
+esac
 
 #MY_P=${PN}-${PV%.*}-${PV#*.*.}
 MY_P=${P%.*}-${PV##*.}
@@ -46,11 +49,20 @@ else
        DEPEND="${RDEPEND}"
 fi
 
+# @FUNCTION: aspell-dict_src_configure
+# @DESCRIPTION:
+# The aspell-dict src_configure function which is exported.
+aspell-dict_src_configure() {
+       ./configure || die
+}
+
 # @FUNCTION: aspell-dict_src_compile
 # @DESCRIPTION:
 # The aspell-dict src_compile function which is exported.
 aspell-dict_src_compile() {
-       ./configure || die
+       case ${EAPI} in
+               0|1) aspell-dict_src_configure ;;
+       esac
        emake || die
 }