diff options
43 files changed, 120 insertions, 100 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index cfe6ab889b94..e1e87d69d9d9 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.413 2012/09/27 15:41:56 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.414 2012/09/27 16:35:41 axs Exp $ + + 27 Sep 2012; Ian Stakenvicius <axs@gentoo.org> fortran-2.eclass, + selinux-policy-2.eclass, vdr-plugin-2.eclass, xorg-2.eclass, + autotools-utils.eclass, base.eclass, bash-completion-r1.eclass, + boost-utils.eclass, check-reqs.eclass, cmake-utils.eclass, emboss.eclass, + emul-linux-x86.eclass, enlightenment.eclass, fox.eclass, games.eclass, + games-ggz.eclass, git.eclass, gnome2-utils.eclass, gnome2.eclass, + gst-plugins-bad.eclass, gtk-sharp-module.eclass, haskell-cabal.eclass, + kde4-functions.eclass, leechcraft.eclass, mozlinguas.eclass, mysql.eclass, + mysql-v2.eclass, obs-service.eclass, office-ext.eclass, perl-module.eclass, + php-ext-source-r2.eclass, python-distutils-ng.eclass, qt4-build.eclass, + qt4-r2.eclass, ruby-ng.eclass, scons-utils.eclass, systemd.eclass, + vcs-snapshot.eclass, vdr-plugin.eclass, virtuoso.eclass, waf-utils.eclass, + xfconf.eclass: + naive bump of all EAPI-specific checks in eclasses to permit EAPI=5 where + EAPI=4 was previously allowed 27 Sep 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: Allow usage of EAPI 5. diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass index eda93556d51a..b035dc5907be 100644 --- a/eclass/autotools-utils.eclass +++ b/eclass/autotools-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.56 2012/06/08 17:50:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.57 2012/09/27 16:35:41 axs Exp $ # @ECLASS: autotools-utils.eclass # @MAINTAINER: @@ -89,7 +89,7 @@ # Keep variable names synced with cmake-utils and the other way around! case ${EAPI:-0} in - 2|3|4) ;; + 2|3|4|5) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/base.eclass b/eclass/base.eclass index 3a51a7cdb345..bc93795b3f5f 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.57 2012/07/09 02:38:05 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.58 2012/09/27 16:35:41 axs Exp $ # @ECLASS: base.eclass # @MAINTAINER: @@ -18,7 +18,7 @@ inherit eutils BASE_EXPF="src_unpack src_compile src_install" case "${EAPI:-0}" in - 2|3|4) BASE_EXPF+=" src_prepare src_configure" ;; + 2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;; *) ;; esac diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass index 04651df96447..8af46ee16033 100644 --- a/eclass/bash-completion-r1.eclass +++ b/eclass/bash-completion-r1.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.2 2011/09/08 20:28:29 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion-r1.eclass,v 1.3 2012/09/27 16:35:41 axs Exp $ # @ECLASS: bash-completion-r1.eclass # @MAINTAINER: @@ -19,7 +19,7 @@ # @CODE case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "EAPI ${EAPI} unsupported (yet)." esac diff --git a/eclass/boost-utils.eclass b/eclass/boost-utils.eclass index d32385879156..9a959d75f21c 100644 --- a/eclass/boost-utils.eclass +++ b/eclass/boost-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/boost-utils.eclass,v 1.1 2012/09/19 09:37:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/boost-utils.eclass,v 1.2 2012/09/27 16:35:41 axs Exp $ if [[ ! ${_BOOST_ECLASS} ]]; then @@ -24,7 +24,7 @@ if [[ ! ${_BOOST_ECLASS} ]]; then # and -L$(boost-utils_get_libdir) to LDFLAGS. case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." esac diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 0f2416a5eab4..c739fd09ff61 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.10 2011/09/06 13:57:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/check-reqs.eclass,v 1.11 2012/09/27 16:35:41 axs Exp $ # @ECLASS: check-reqs.eclass # @MAINTAINER: @@ -63,7 +63,7 @@ inherit eutils EXPORT_FUNCTIONS pkg_setup case "${EAPI:-0}" in 0|1|2|3) ;; - 4) EXPORT_FUNCTIONS pkg_pretend ;; + 4|5) EXPORT_FUNCTIONS pkg_pretend ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 3ddb3533603b..ae34738c01ba 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.81 2012/09/20 10:32:40 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.82 2012/09/27 16:35:41 axs Exp $ # @ECLASS: cmake-utils.eclass # @MAINTAINER: @@ -61,7 +61,7 @@ inherit toolchain-funcs multilib flag-o-matic base CMAKE_EXPF="src_compile src_test src_install" case ${EAPI:-0} in - 4|3|2) CMAKE_EXPF+=" src_configure" ;; + 2|3|4|5) CMAKE_EXPF+=" src_configure" ;; 1|0) ;; *) die "Unknown EAPI, Bug eclass maintainers." ;; esac diff --git a/eclass/emboss.eclass b/eclass/emboss.eclass index 7182014a15f6..f2fd9452c118 100644 --- a/eclass/emboss.eclass +++ b/eclass/emboss.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/emboss.eclass,v 1.2 2011/08/22 04:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emboss.eclass,v 1.3 2012/09/27 16:35:41 axs Exp $ # @ECLASS: emboss.eclass # @MAINTAINER: @@ -45,7 +45,7 @@ # Extra config options passed to econf, similar to EXTRA_ECONF. case ${EAPI:-0} in - 4) ;; + 4|5) ;; *) die "this eclass doesn't support < EAPI 4" ;; esac diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index a89bdba445f9..a8a468414b07 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.10 2011/12/27 17:55:12 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.11 2012/09/27 16:35:41 axs Exp $ # # Original Author: Mike Doty <kingtaco@gentoo.org> @@ -20,7 +20,7 @@ case "${EAPI:-0}" in 0|1) EXPORT_FUNCTIONS src_unpack src_install ;; - 2|3|4) + 2|3|4|5) EXPORT_FUNCTIONS src_unpack src_prepare src_install ;; *) die "EAPI=${EAPI} is not supported" ;; diff --git a/eclass/enlightenment.eclass b/eclass/enlightenment.eclass index 8263ebc7f6cb..a18de25c2198 100644 --- a/eclass/enlightenment.eclass +++ b/eclass/enlightenment.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.93 2012/09/12 06:03:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/enlightenment.eclass,v 1.94 2012/09/27 16:35:41 axs Exp $ # @ECLASS: enlightenment.eclass # @MAINTAINER: @@ -76,7 +76,7 @@ fi ENLIGHTENMENT_EXPF="src_unpack src_compile src_install" case "${EAPI:-0}" in - 2|3|4) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;; + 2|3|4|5) ENLIGHTENMENT_EXPF+=" src_prepare src_configure" ;; *) ;; esac EXPORT_FUNCTIONS ${ENLIGHTENMENT_EXPF} diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 62341fbb52c4..d6ae14272c26 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.5 2011/08/22 04:46:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v 1.6 2012/09/27 16:35:41 axs Exp $ # @ECLASS: fortran-2.eclass # @MAINTAINER: @@ -149,6 +149,6 @@ fortran-2_pkg_setup() { } case ${EAPI:-0} in - 0|1|2|3|4) EXPORT_FUNCTIONS pkg_setup ;; + 0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/fox.eclass b/eclass/fox.eclass index 63d2c51ef715..0fd2bd23ad1a 100644 --- a/eclass/fox.eclass +++ b/eclass/fox.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.16 2012/08/13 15:54:08 mabi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.17 2012/09/27 16:35:41 axs Exp $ # @ECLASS: fox.eclass # @MAINTAINER: @@ -33,7 +33,7 @@ inherit autotools versionator FOX_EXPF="src_unpack src_compile src_install pkg_postinst" case "${EAPI:-0}" in - 2|3|4) FOX_EXPF+=" src_prepare src_configure" ;; + 2|3|4|5) FOX_EXPF+=" src_prepare src_configure" ;; *) ;; esac EXPORT_FUNCTIONS ${FOX_EXPF} diff --git a/eclass/games-ggz.eclass b/eclass/games-ggz.eclass index e9465073721c..290a68946dca 100644 --- a/eclass/games-ggz.eclass +++ b/eclass/games-ggz.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games-ggz.eclass,v 1.8 2012/04/23 07:16:34 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games-ggz.eclass,v 1.9 2012/09/27 16:35:41 axs Exp $ inherit base @@ -8,7 +8,7 @@ inherit base GAMES_GGZ_EXPF="src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in - 2|3|4) GAMES_GGZ_EXPF+=" src_configure" ;; + 2|3|4|5) GAMES_GGZ_EXPF+=" src_configure" ;; 0|1) : ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/games.eclass b/eclass/games.eclass index b7b3739a4fba..a1380dfdbfab 100644 --- a/eclass/games.eclass +++ b/eclass/games.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.152 2012/09/15 16:16:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.153 2012/09/27 16:35:41 axs Exp $ # devlist: games@gentoo.org # @@ -15,7 +15,7 @@ inherit base multilib toolchain-funcs eutils user case ${EAPI:-0} in 0|1) EXPORT_FUNCTIONS pkg_setup src_compile pkg_preinst pkg_postinst ;; - 2|3|4) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_configure src_compile pkg_preinst pkg_postinst ;; *) die "no support for EAPI=${EAPI} yet" ;; esac diff --git a/eclass/git.eclass b/eclass/git.eclass index 308870915e80..99c7125bb0ff 100644 --- a/eclass/git.eclass +++ b/eclass/git.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.58 2011/12/14 23:40:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.59 2012/09/27 16:35:41 axs Exp $ # @DEPRECATED # This eclass has been superseded by git-2 eclass. @@ -26,7 +26,7 @@ DEPEND=">=dev-vcs/git-1.6" EXPORTED_FUNCTIONS="src_unpack" case "${EAPI:-0}" in - 4|3|2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;; + 2|3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;; 1|0) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 4dcee9860c51..91386c61bdb9 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.28 2012/06/21 15:10:59 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2-utils.eclass,v 1.29 2012/09/27 16:35:41 axs Exp $ # @ECLASS: gnome2-utils.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ # * scrollkeeper (old Gnome help system) management case "${EAPI:-0}" in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 393fa9423dfe..97f1d59eb745 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.106 2012/05/09 08:23:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.107 2012/09/27 16:35:41 axs Exp $ # @ECLASS: gnome2.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ case "${EAPI:-0}" in 0|1) EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; - 2|3|4) + 2|3|4|5) EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_preinst pkg_postinst pkg_postrm ;; *) die "EAPI=${EAPI} is not supported" ;; diff --git a/eclass/gst-plugins-bad.eclass b/eclass/gst-plugins-bad.eclass index fae6b163af8f..80007ee48d64 100644 --- a/eclass/gst-plugins-bad.eclass +++ b/eclass/gst-plugins-bad.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.44 2012/06/20 08:49:27 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gst-plugins-bad.eclass,v 1.45 2012/09/27 16:35:41 axs Exp $ # # Original Author: Saleem Abdulrasool <compnerd@gentoo.org> @@ -13,7 +13,7 @@ inherit eutils multilib versionator gst-plugins10 GSTBAD_EXPF="src_unpack src_compile src_install" case "${EAPI:-0}" in - 2|3|4) GSTBAD_EXPF+=" src_prepare src_configure" ;; + 2|3|4|5) GSTBAD_EXPF+=" src_prepare src_configure" ;; 0|1) ;; *) die "EAPI=\"${EAPI}\" is not supported yet" ;; esac diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass index 40c26e1cc4b7..84cd04c69a56 100644 --- a/eclass/gtk-sharp-module.eclass +++ b/eclass/gtk-sharp-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.35 2012/05/02 18:31:42 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.36 2012/09/27 16:35:41 axs Exp $ # @ECLASS: gtk-sharp-module.eclass # @MAINTAINER: @@ -17,7 +17,7 @@ WANT_AUTOCONF=none inherit eutils mono multilib libtool autotools base versionator case ${EAPI:-0} in - 2|3|4) ;; + 2|3|4|5) ;; *) die "Unknown EAPI." ;; esac diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 28e840fa5e8f..0e4b051aa624 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.33 2012/07/08 19:16:46 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.34 2012/09/27 16:35:41 axs Exp $ # @ECLASS: haskell-cabal.eclass # @MAINTAINER: @@ -57,7 +57,7 @@ inherit ghc-package multilib HASKELL_CABAL_EXPF="pkg_setup src_compile src_test src_install" case "${EAPI:-0}" in - 2|3|4) HASKELL_CABAL_EXPF+=" src_configure" ;; + 2|3|4|5) HASKELL_CABAL_EXPF+=" src_configure" ;; *) ;; esac diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index ff5fe307e320..a3f84289a0b7 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.61 2012/08/19 11:12:35 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.62 2012/09/27 16:35:41 axs Exp $ inherit versionator @@ -16,7 +16,7 @@ inherit versionator # @DESCRIPTION: # Currently kde4 eclasses support EAPI 3 and 4. case ${EAPI:-0} in - 4|3) : ;; + 3|4|5) : ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass index cbbcddd455ad..55d35d693af0 100644 --- a/eclass/leechcraft.eclass +++ b/eclass/leechcraft.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.5 2012/07/17 04:29:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/leechcraft.eclass,v 1.6 2012/09/27 16:35:41 axs Exp $ # # @ECLASS: leechcraft.eclass # @MAINTAINER: @@ -22,7 +22,7 @@ # Only EAPI >1 supported case ${EAPI:-0} in - 4|3|2) ;; + 2|3|4|5) ;; 0|1) die "EAPI not supported, bug ebuild mantainer" ;; *) die "Unknown EAPI, bug eclass maintainers" ;; esac diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass index 1c2304d353da..3e0183697bf0 100644 --- a/eclass/mozlinguas.eclass +++ b/eclass/mozlinguas.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.4 2012/07/19 12:09:05 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.5 2012/09/27 16:35:41 axs Exp $ # @ECLASS: mozlinguas.eclass # @MAINTAINER: @@ -17,7 +17,7 @@ inherit mozextension case "${EAPI:-0}" in 0|1) die "EAPI ${EAPI:-0} does not support the '->' SRC_URI operator";; - 2|3|4) + 2|3|4|5) EXPORT_FUNCTIONS src_unpack src_install;; *) die "EAPI ${EAPI} is not supported, contact eclass maintainers";; diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index 6d613a9ff760..0fd86447f01f 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.18 2012/09/10 02:07:08 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.19 2012/09/27 16:35:41 axs Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx # case "${EAPI:-0}" in - 3|4) ;; + 3|4|5) ;; *) die "Unsupported EAPI: ${EAPI}" ;; esac diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 7f2c242e3c88..0448cbe9d78f 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.174 2012/09/10 02:07:08 ferringb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.175 2012/09/27 16:35:41 axs Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -33,7 +33,7 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; then fi case "${EAPI:-0}" in - 2 | 3 | 4) + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup \ src_unpack src_prepare \ src_configure src_compile \ diff --git a/eclass/obs-service.eclass b/eclass/obs-service.eclass index b0fee632b77f..b1b3bf0e1297 100644 --- a/eclass/obs-service.eclass +++ b/eclass/obs-service.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.3 2012/08/17 13:04:25 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/obs-service.eclass,v 1.4 2012/09/27 16:35:41 axs Exp $ # @ECLASS: obs-service.eclass # @MAINTAINER: @@ -40,7 +40,7 @@ # If any additional files are needed. case "${EAPI:-0}" in - 4) : ;; + 4|5) : ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/office-ext.eclass b/eclass/office-ext.eclass index 84ee6ae2b94b..66034197624c 100644 --- a/eclass/office-ext.eclass +++ b/eclass/office-ext.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.6 2012/06/08 03:36:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/office-ext.eclass,v 1.7 2012/09/27 16:35:41 axs Exp $ # @ECLASS: office-ext.eclass # @MAINTAINER: @@ -12,7 +12,7 @@ # Eclass for easing maitenance of libreoffice/openoffice extensions. case "${EAPI:-0}" in - 4) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;; + 4|5) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 84e6fc00493c..82301580f396 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.134 2012/09/15 16:16:53 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.135 2012/09/27 16:35:41 axs Exp $ # @ECLASS: perl-module.eclass # @MAINTAINER: @@ -21,7 +21,7 @@ case "${EAPI:-0}" in 0|1) PERL_EXPF+=" pkg_setup pkg_preinst pkg_postinst pkg_prerm pkg_postrm" ;; - 2|3|4) + 2|3|4|5) PERL_EXPF+=" src_prepare src_configure" [[ ${CATEGORY} == "perl-core" ]] && \ PERL_EXPF+=" pkg_postinst pkg_postrm" diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index ae04aaad6ed1..efca332efe93 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.29 2012/08/22 15:06:20 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.30 2012/09/27 16:35:41 axs Exp $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -26,7 +26,7 @@ RDEPEND="" # Because of USE deps, we require at least EAPI 2 case ${EAPI} in - 2|3|4) ;; + 2|3|4|5) ;; *) die "php-ext-source-r2 is not compatible with EAPI=${EAPI}" esac diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass index f3ab7b0177af..d957b1d77735 100644 --- a/eclass/python-distutils-ng.eclass +++ b/eclass/python-distutils-ng.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.27 2012/09/26 12:07:45 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.28 2012/09/27 16:35:41 axs Exp $ # @ECLASS: python-distutils-ng # @MAINTAINER: @@ -76,7 +76,7 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install case "${EAPI}" in 0|1|2|3) die "Unsupported EAPI=${EAPI} (too old) for python-distutils-ng.eclass" ;; - 4) + 4|5) # EAPI=4 needed for REQUIRED_USE S="${S:-${WORKDIR}/${P}}" ;; diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass index a39865816216..2fd5cb149cc8 100644 --- a/eclass/qt4-build.eclass +++ b/eclass/qt4-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.135 2012/09/06 08:30:00 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.136 2012/09/27 16:35:41 axs Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -10,7 +10,7 @@ # This eclass contains various functions that are used when building Qt4. case ${EAPI} in - 2|3|4) : ;; + 2|3|4|5) : ;; *) die "qt4-build.eclass requires EAPI 2, 3 or 4." ;; esac diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass index 50dc6934a138..0e36a82112ad 100644 --- a/eclass/qt4-r2.eclass +++ b/eclass/qt4-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.21 2012/07/23 12:53:13 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.22 2012/09/27 16:35:41 axs Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -11,7 +11,7 @@ # dealing with packages using Qt4 libraries. Requires EAPI=2 or later. case ${EAPI} in - 2|3|4) : ;; + 2|3|4|5) : ;; *) die "EAPI=${EAPI} is not supported by ${ECLASS} eclass." ;; esac diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index 8af34662b043..7963af688b56 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.50 2012/08/13 22:21:26 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.51 2012/09/27 16:35:41 axs Exp $ # @ECLASS: ruby-ng.eclass # @MAINTAINER: @@ -77,7 +77,7 @@ case ${EAPI} in 0|1) die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;; 2|3) ;; - 4) + 4|5) # S is no longer automatically assigned when it doesn't exist. S="${WORKDIR}" ;; @@ -314,13 +314,17 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then DEPEND="${DEPEND} $(ruby_implementations_depend)" RDEPEND="${RDEPEND} $(ruby_implementations_depend)" - [[ ${EAPI:-0} -ge 4 ]] && REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" + case ${EAPI:-0} in + 4|5) + REQUIRED_USE+=" || ( $(ruby_get_use_targets) )" + ;; + esac fi _ruby_invoke_environment() { old_S=${S} case ${EAPI} in - 4) + 4|5) if [ -z ${RUBY_S} ]; then sub_S=${P} else diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 99ea918fa4f1..c458af5d0aef 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.10 2011/12/13 18:37:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.11 2012/09/27 16:35:42 axs Exp $ # @ECLASS: scons-utils.eclass # @MAINTAINER: @@ -73,7 +73,7 @@ # -- EAPI support check -- case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "EAPI ${EAPI} unsupported." esac @@ -105,7 +105,7 @@ escons() { "${@}" ret=${?} - [[ ${ret} -ne 0 && ${EAPI} == 4 ]] && die "escons failed." + [[ ${ret} -ne 0 ]] && has "${EAPI:-0}" 4 5 && die "escons failed." return ${ret} } diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index 5a4e47bd6542..86cf6280518e 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.14 2012/09/08 18:36:12 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.15 2012/09/27 16:35:42 axs Exp $ # Eclass for installing SELinux policy, and optionally # reloading the reference-policy based modules. @@ -100,7 +100,7 @@ DEPEND="${RDEPEND} SELINUX_EXPF="src_unpack src_compile src_install pkg_postinst" case "${EAPI:-0}" in - 2|3|4) SELINUX_EXPF+=" src_prepare" ;; + 2|3|4|5) SELINUX_EXPF+=" src_prepare" ;; *) ;; esac diff --git a/eclass/systemd.eclass b/eclass/systemd.eclass index f5e0523ab8ad..0f1dab53f034 100644 --- a/eclass/systemd.eclass +++ b/eclass/systemd.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.14 2012/08/27 21:55:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/systemd.eclass,v 1.15 2012/09/27 16:35:42 axs Exp $ # @ECLASS: systemd.eclass # @MAINTAINER: @@ -26,7 +26,7 @@ # @CODE case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "${ECLASS}.eclass API in EAPI ${EAPI} not yet established." esac diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass index 1c8e31d1ba7c..a1bc5e25782e 100644 --- a/eclass/vcs-snapshot.eclass +++ b/eclass/vcs-snapshot.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vcs-snapshot.eclass,v 1.4 2012/06/11 14:22:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vcs-snapshot.eclass,v 1.5 2012/09/27 16:35:42 axs Exp $ # @ECLASS: vcs-snapshot.eclass # @MAINTAINER: @@ -36,7 +36,7 @@ # in ${WORKDIR}/${P}. case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "vcs-snapshot.eclass API in EAPI ${EAPI} not yet established." esac diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index fc7787b48096..05dcdefa8d6d 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.11 2012/09/19 17:54:46 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin-2.eclass,v 1.12 2012/09/27 16:35:42 axs Exp $ # @ECLASS: vdr-plugin-2.eclass # @MAINTAINER: @@ -46,7 +46,7 @@ inherit base eutils flag-o-matic multilib toolchain-funcs case ${EAPI:-0} in - 4) ;; + 4|5) ;; *) die "EAPI ${EAPI} unsupported." esac diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass index 8add011e28d6..61bed8e4247b 100644 --- a/eclass/vdr-plugin.eclass +++ b/eclass/vdr-plugin.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.89 2012/09/19 17:54:46 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.90 2012/09/27 16:35:42 axs Exp $ # @ECLASS: vdr-plugin.eclass # @MAINTAINER: @@ -45,7 +45,7 @@ inherit base multilib eutils flag-o-matic -if ! has "${EAPI:-0}" 0 1 2 3 4; then +if ! has "${EAPI:-0}" 0 1 2 3 4 5; then die "API of vdr-plugin.eclass in EAPI=\"${EAPI}\" not established" fi @@ -450,7 +450,7 @@ vdr-plugin_src_unpack() { fi if [ -z "$1" ]; then case "${EAPI:-0}" in - 2|3|4) + 2|3|4|5) vdr-plugin_src_util unpack ;; *) @@ -592,7 +592,7 @@ vdr-plugin_pkg_config() { } case "${EAPI:-0}" in - 2|3|4) + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_compile src_install pkg_postinst pkg_postrm pkg_config ;; *) diff --git a/eclass/virtuoso.eclass b/eclass/virtuoso.eclass index 20d26285858e..553f20c4c335 100644 --- a/eclass/virtuoso.eclass +++ b/eclass/virtuoso.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.13 2012/05/13 18:53:58 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/virtuoso.eclass,v 1.14 2012/09/27 16:35:42 axs Exp $ # @ECLASS: virtuoso.eclass # @MAINTAINER: @@ -12,7 +12,7 @@ # This eclass provides common code for splitting Virtuoso OpenSource database case ${EAPI:-0} in - 2|3|4) : ;; + 2|3|4|5) : ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 700c9b9094ed..2c4ef2055cf1 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.13 2012/07/20 01:37:43 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.14 2012/09/27 16:35:42 axs Exp $ # @ECLASS: waf-utils.eclass # @MAINTAINER: @@ -18,7 +18,7 @@ inherit base eutils multilib toolchain-funcs multiprocessing case ${EAPI:-0} in - 4|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;; + 4|5|3) EXPORT_FUNCTIONS src_configure src_compile src_install ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass index 0842273d7056..b4e6f31741ab 100644 --- a/eclass/xfconf.eclass +++ b/eclass/xfconf.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.43 2012/09/02 07:58:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xfconf.eclass,v 1.44 2012/09/27 16:35:42 axs Exp $ # @ECLASS: xfconf.eclass # @MAINTAINER: @@ -40,7 +40,7 @@ unset _xfconf_deps unset _xfconf_m4 case ${EAPI:-0} in - 4) ;; + 4|5) ;; *) die "Unknown EAPI." ;; esac diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index a0ae12ea5f80..87d31f623c58 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.58 2012/08/14 06:34:16 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/xorg-2.eclass,v 1.59 2012/09/27 16:35:42 axs Exp $ # @ECLASS: xorg-2.eclass # @MAINTAINER: @@ -43,7 +43,7 @@ inherit autotools autotools-utils eutils libtool multilib toolchain-funcs \ EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in - 3|4) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; + 3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; *) die "EAPI=${EAPI} is not supported" ;; esac |