diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2008-10-03 14:59:42 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2008-10-03 14:59:42 +0000 |
| commit | 65ddaf89d093f87930b0995ddc223cd0efca0691 (patch) | |
| tree | 5dcf1930551a601db1685759f815501cb603579d /eclass | |
| parent | Bump (diff) | |
| download | gentoo-2-65ddaf89d093f87930b0995ddc223cd0efca0691.tar.gz gentoo-2-65ddaf89d093f87930b0995ddc223cd0efca0691.tar.bz2 gentoo-2-65ddaf89d093f87930b0995ddc223cd0efca0691.zip | |
Add EAPI=2 support (src_configure) in gnustep eclasses
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gnustep-2.eclass | 3 | ||||
| -rw-r--r-- | eclass/gnustep-base.eclass | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass index 473b19868ca7..3059b4b96794 100644 --- a/eclass/gnustep-2.eclass +++ b/eclass/gnustep-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.2 2008/01/06 19:30:24 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.3 2008/10/03 14:59:42 voyageur Exp $ inherit gnustep-base @@ -15,6 +15,7 @@ RDEPEND="${DEPEND} # The following gnustep-based EXPORT_FUNCTIONS are available: # * gnustep-base_pkg_setup +# * gnustep-base_src_configure (EAPI=2 only) # * gnustep-base_src_compile # * gnustep-base_src_install # * gnustep-base_pkg_postinst diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index e5296cee0a13..de577ba47157 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.7 2008/09/04 08:04:47 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.8 2008/10/03 14:59:42 voyageur Exp $ inherit eutils flag-o-matic @@ -57,11 +57,19 @@ gnustep-base_src_unpack() { fi } -gnustep-base_src_compile() { +gnustep-base_src_configure() { egnustep_env if [[ -x ./configure ]] ; then econf || die "configure failed" fi +} + +gnustep-base_src_compile() { + egnustep_env + case ${EAPI:-0} in + 0|1) gnustep-base_src_configure ;; + esac + egnustep_make } @@ -212,4 +220,7 @@ EOF doexe "${T}"/${cfile} } -EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst +case ${EAPI:-0} in + 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst ;; + 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_install pkg_postinst ;; +esac |