diff options
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/autotools-multilib.eclass | 6 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index d0fbf98d382c..9450b49da542 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.820 2013/05/11 12:46:32 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.821 2013/05/14 17:33:08 mgorny Exp $ + + 14 May 2013; Michał Górny <mgorny@gentoo.org> autotools-multilib.eclass, + multilib-build.eclass: + Enable EAPI=4 on multilib eclasses. 11 May 2013; Sergei Trofimovich <slyfox@gentoo.org> ghc-package.eclass, haskell-cabal.eclass: diff --git a/eclass/autotools-multilib.eclass b/eclass/autotools-multilib.eclass index 5ca81126ab93..ab06e9122003 100644 --- a/eclass/autotools-multilib.eclass +++ b/eclass/autotools-multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.15 2013/04/07 16:56:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-multilib.eclass,v 1.16 2013/05/14 17:33:08 mgorny Exp $ # @ECLASS: autotools-multilib.eclass # @MAINTAINER: @@ -19,9 +19,9 @@ # enabled. Thus, it is impossible to use AUTOTOOLS_IN_SOURCE_BUILD with # it. -# EAPI=5 is required for meaningful MULTILIB_USEDEP. +# EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 5) ;; + 4|5) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 5e8cb54344bc..392993adc4a0 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.11 2013/04/07 16:56:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.12 2013/05/14 17:33:08 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -17,9 +17,9 @@ if [[ ! ${_MULTILIB_BUILD} ]]; then -# EAPI=5 is required for meaningful MULTILIB_USEDEP. +# EAPI=4 is required for meaningful MULTILIB_USEDEP. case ${EAPI:-0} in - 5) ;; + 4|5) ;; *) die "EAPI=${EAPI} is not supported" ;; esac |