summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2014-10-19 20:59:15 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2014-10-19 20:59:15 +0000
commit155021a98acf3b2ecf7452ea18a1ed978e22fa0e (patch)
tree048df501d6d53a94cd60c99a2349a7cf4abd97a2 /eclass
parentMake both live and release to work with ruby20 and not jruby. (diff)
downloadhistorical-155021a98acf3b2ecf7452ea18a1ed978e22fa0e.tar.gz
historical-155021a98acf3b2ecf7452ea18a1ed978e22fa0e.tar.bz2
historical-155021a98acf3b2ecf7452ea18a1ed978e22fa0e.zip
Move EAPI=0,1,2,3 warning into global scope to become ultra-annoying. Add QA deprecation warning about EAPI=4.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/perl-module.eclass27
2 files changed, 24 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 61d269575753..bb8ead008a28 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1388 2014/10/18 22:36:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1389 2014/10/19 20:59:15 dilfridge Exp $
+
+ 19 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass:
+ Move EAPI=0,1,2,3 warning into global scope to become ultra-annoying. Add QA
+ deprecation warning about EAPI=4.
18 Oct 2014; Mike Gilbert <floppym@gentoo.org> python-utils-r1.eclass:
Improve error messaging when python_export is called without a defined python
diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass
index 5b9e45381464..7aded7205307 100644
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.141 2014/09/27 20:54:42 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.142 2014/10/19 20:59:15 dilfridge Exp $
# @ECLASS: perl-module.eclass
# @MAINTAINER:
@@ -52,6 +52,19 @@ case "${EAPI:-0}" in
;;
esac
+case "${EAPI:-0}" in
+ 4|5)
+ ;;
+ *)
+ ewarn
+ ewarn "******************************************************************"
+ ewarn "Support for EAPI=${EAPI:-0} in perl-module.eclass will be removed"
+ ewarn "on 1/Nov/2014. Please fix your overlay ebuilds to use EAPI=5."
+ ewarn "******************************************************************"
+ ewarn
+ ;;
+esac
+
case "${PERL_EXPORT_PHASE_FUNCTIONS:-yes}" in
yes)
EXPORT_FUNCTIONS ${PERL_EXPF}
@@ -89,15 +102,13 @@ perl-module_src_unpack() {
debug-print-function $FUNCNAME "$@"
case "${EAPI:-0}" in
- 4|5)
+ 5)
+ ;;
+ 4)
+ eqawarn "Support for EAPI=${EAPI:-0} in perl-module.eclass is deprecated."
+ eqawarn "Please fix your ebuilds to use EAPI=5."
;;
*)
- ewarn
- ewarn "******************************************************************"
- ewarn "Support for EAPI=${EAPI:-0} in perl-module.eclass will be removed"
- ewarn "on 1/Nov/2014. Please fix your overlay ebuilds to use EAPI=5."
- ewarn "******************************************************************"
- ewarn
;;
esac